diff --git a/UI/Templates/MailerUI/UIxMailListView.wox b/UI/Templates/MailerUI/UIxMailListView.wox
index 1ccccdfe3..f6b566ab6 100644
--- a/UI/Templates/MailerUI/UIxMailListView.wox
+++ b/UI/Templates/MailerUI/UIxMailListView.wox
@@ -15,10 +15,9 @@
       onselectionchange="onMessageSelectionChange();">
       <tbody>
         <tr class="tableview"
-          ><td class="tbtv_headercell"
-            ><var:entity const:name="nbsp"
-              /></td
-            ><td class="tbtv_headercell">
+          ><td class="tbtv_headercell messageFlagColumn"
+            ><var:entity const:name="nbsp" /></td
+            ><td class="tbtv_headercell messageFlagColumn">
             <img rsrc:src="title_attachment_14x14.png" width="14"
               height="14"
               /></td
@@ -45,7 +44,7 @@
                 var:queryDictionary="context.request.formValues"
                 /></var:if
               ></td
-            ><td class="tbtv_headercell"
+            ><td class="tbtv_headercell messageFlagColumn"
             ><img rsrc:src="title_read_14x14.png" width="14" height="14"
               /></td
             ><td class="tbtv_headercell"
diff --git a/UI/Templates/SchedulerUI/UIxCalAptListView.wox b/UI/Templates/SchedulerUI/UIxCalAptListView.wox
new file mode 100644
index 000000000..057682efd
--- /dev/null
+++ b/UI/Templates/SchedulerUI/UIxCalAptListView.wox
@@ -0,0 +1,58 @@
+<?xml version="1.0" standalone="yes"?>
+  <table
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:var="http://www.skyrix.com/od/binding"
+    xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:rsrc="OGo:url"
+    xmlns:label="OGo:label"
+    id="appointmentsList"
+    multiselect="yes"
+    onselectionchange="onAppointmentsSelectionChange();"
+    >
+    <tr class="tableview"
+      ><td class="tbtv_headercell tbtv_subject_headercell"
+        ><var:component className="UIxSortableTableHeader"
+          label:label="Title"
+          const:sortKey="Title"
+          const:href="aptlist"
+          var:queryDictionary="context.request.formValues"
+          /></td
+        ><td class="tbtv_headercell"
+        ><var:component className="UIxSortableTableHeader"
+          label:label="Start"
+          const:sortKey="Start"
+          const:href="aptlist"
+          var:queryDictionary="context.request.formValues"
+          /></td
+        ><td class="tbtv_headercell"
+        ><var:component className="UIxSortableTableHeader"
+          label:label="End"
+          const:sortKey="End"
+          const:href="aptlist"
+          var:queryDictionary="context.request.formValues"
+          /></td
+        ><td class="tbtv_headercell"
+        ><var:component className="UIxSortableTableHeader"
+          label:label="Location"
+          const:sortKey="Location"
+          const:href="aptlist"
+          var:queryDictionary="context.request.formValues"
+          /></td
+        ></tr>
+
+    <var:foreach list="fetchCoreInfos" item="currentAppointment"
+      ><tr class="tableview"
+        var:id="currentAppointment.uid"
+        onclick="return onRowClick(event);"
+        oncontextmenu="return onAppointmentContextMenu(event, this);"
+        ><td onmousedown="return false;"
+          ><var:string value="currentAppointment.title"/></td
+          ><td onmousedown="return false;"
+          ><var:string value="currentStartTime"/></td
+          ><td onmousedown="return false;"
+          ><var:string value="currentEndTime"/></td
+          ><td onmousedown="return false;"
+          ><var:string value="currentLocation"/></td
+          ></tr
+        ></var:foreach>
+  </table>
diff --git a/UI/Templates/SchedulerUI/UIxCalDateSelector.wox b/UI/Templates/SchedulerUI/UIxCalDateSelector.wox
new file mode 100644
index 000000000..9b6327b06
--- /dev/null
+++ b/UI/Templates/SchedulerUI/UIxCalDateSelector.wox
@@ -0,0 +1,59 @@
+<?xml version='1.0' standalone='yes'?>
+  <div xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:var="http://www.skyrix.com/od/binding"
+    xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:rsrc="OGo:url"
+    xmlns:label="OGo:label"
+    id="dateSelector">
+
+<!--  const:style="weekcolumnsview_cal"
+const:headerStyle="weekcolumnsview_cal_title"
+const:weekStyle="weekcolumnsview_cal_week"
+:dayHeaderStyle="weekcolumnsview_cal_day_header"
+:dayBodyStyle="weekcolumnsview_cal_content"
+:todayBodyStyle="weekcolumnsview_cal_content_hilite"
+:inactiveDayBodyStyle="weekcolumnsview_cal_content_dimmed" -->
+
+    <div id="header">
+      <a href="#"
+        id="leftArrow"
+        var:date="prevMonthAsString"
+        onclick="return onDateSelectorGotoMonth(this);"
+        ><img id="previous" rsrc:src="arrow-lft-sharp.gif" />
+      </a
+        ><span id="monthLabel">
+        <var:string value="headerString" />
+      </span>
+      <a href="#"
+        id="rightArrow"
+        var:date="nextMonthAsString"
+        onclick="return onDateSelectorGotoMonth(this);"
+        ><img id="next" rsrc:src="arrow-rit-sharp.gif"
+          /></a>
+    </div>
+    
+    <var:month-overview
+      currentDay="currentDay"
+      index="dayIndex"
+      year="year"
+      month="month"
+      const:startDateKey="startDate"
+      const:endDateKey="endDate"
+      ><var:month-label
+        const:orientation="top"
+        dayOfWeek="dayOfWeek"
+        class="dayHeaderStyle"
+        ><span class="dayOfWeek"
+          ><var:string value="localizedDayOfWeekName"
+            /></span
+          ></var:month-label>
+      <var:month-title class="contentStyle"
+        ><span var:class="extraStyle"
+          ><a href="#"
+            onclick="return onDaySelect(this);"
+            var:day="currentDayQueryParameters.day"
+            ><var:string value="currentDay.dayOfMonth"/></a
+            ></span
+          ></var:month-title
+        ></var:month-overview>
+  </div>
diff --git a/UI/Templates/SchedulerUI/UIxCalDayView.wox b/UI/Templates/SchedulerUI/UIxCalDayView.wox
new file mode 100644
index 000000000..3e3324e3f
--- /dev/null
+++ b/UI/Templates/SchedulerUI/UIxCalDayView.wox
@@ -0,0 +1,114 @@
+<?xml version="1.0" standalone="yes"?>
+  <container
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:var="http://www.skyrix.com/od/binding"
+    xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:rsrc="OGo:url"
+    xmlns:label="OGo:label">
+    <a href="#"
+      class="leftNavigationArrow"
+      var:date="prevDayQueryParameters.day"
+      onclick="return onCalendarGotoDay(this);"
+      ><img rsrc:src="arrow-lft-sharp.gif"/></a>
+    <span class="daysHeader">
+      <span class="day2"><a href="#"
+          var:date="dayBeforePrevDayQueryParameters.day"
+          onclick="return onCalendarGotoDay(this);"
+          ><var:string value="dayBeforeYesterdayName"
+            /></a></span
+        ><span class="day1"><a href="#"
+          var:date="prevDayQueryParameters.day"
+          onclick="return onCalendarGotoDay(this);"
+          ><var:string value="yesterdayName"
+            /></a></span
+        ><span class="day0"><var:string value="currentDayName" /></span
+        ><span class="day1"><a href="#"
+          var:date="nextDayQueryParameters.day"
+          onclick="return onCalendarGotoDay(this);"
+          ><var:string value="tomorrowName"
+            /></a></span
+        ><span class="day2"><a href="#"
+          var:date="dayAfterNextDayQueryParameters.day"
+          onclick="return onCalendarGotoDay(this);"
+          ><var:string value="dayAfterTomorrowName"
+            /></a></span
+        ></span>
+    <a href="#"
+      class="rightNavigationArrow"
+      var:date="nextDayQueryParameters.day"
+      onclick="return onCalendarGotoDay(this);"
+      ><img rsrc:src="arrow-rit-sharp.gif"/></a>
+
+    <div id="calendarContent">
+      <table class="dayoverview_content">
+        <tr>
+          <td class="nullHeader">
+          </td>
+          <td class="header">
+            coucou
+          </td>
+        </tr>
+
+        <var:if condition="hasHolidayInfo">
+          <tr>
+            <td class="dayoverview_content_time" colspan="2">
+              <b><var:string value="holidayInfo.title" /></b>
+            </td>
+          </tr>
+        </var:if>
+        <var:foreach list="allDayApts" item="appointment">
+          <tr>
+            <td class="dayoverview_content_time">
+              <var:entity name="nbsp" />
+            </td>
+            <td class="dayoverview_content_apts" width="90%">
+              <var:foreach list="allDayApts" item="appointment">
+                <var:component className="UIxCalInlineAptView"
+                  appointment="appointment"
+                  formatter="aptFormatter"
+                  tooltipFormatter="aptTooltipFormatter"
+                  url="appointmentViewURL"
+                  const:style="dayoverview"
+                  queryDictionary="currentDateQueryParameters"
+                  referenceDate="selectedDate"
+                  canAccess="canAccessApt"
+                  />
+                <br />
+              </var:foreach>
+            </td>
+          </tr>
+        </var:foreach>
+        <var:foreach list="dateRange" item="currentDate">
+          <tr>
+            <td class="dayoverview_content_time">
+              <var:string value="currentDate"
+                const:dateformat="%H:%M"
+                />
+              <br />
+            </td>
+            <td class="dayoverview_content_apts"
+              ondblclick="return newEvent(this);"
+              var:day="currentDayQueryParameters.day"
+              >
+              <var:foreach
+                list="aptsForCurrentDate"
+                item="appointment"
+                >
+                <var:component className="UIxCalInlineAptView"
+                  appointment="appointment"
+                  formatter="aptFormatter"
+                  tooltipFormatter="aptTooltipFormatter"
+                  url="appointmentViewURL"
+                  const:style="dayoverview"
+                  queryDictionary="currentDayQueryParameters"
+                  referenceDate="currentDate"
+                  canAccess="canAccessApt"
+                  />
+                <br />
+              </var:foreach>
+            </td>
+          </tr>
+        </var:foreach>
+      </table>
+    </div>
+  </container>
diff --git a/UI/Templates/SchedulerUI/UIxCalFilterPanel.wox b/UI/Templates/SchedulerUI/UIxCalFilterPanel.wox
new file mode 100644
index 000000000..c4c012bd8
--- /dev/null
+++ b/UI/Templates/SchedulerUI/UIxCalFilterPanel.wox
@@ -0,0 +1,26 @@
+<?xml version='1.0' standalone='yes'?>
+  <container 
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:var="http://www.skyrix.com/od/binding"
+    xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:label="OGo:label"
+    >
+    <div class="menu" id="searchMenu">
+      <ul id="searchOptions">
+        <li id="name_or_address"
+          onmousedown="return false;"
+          onmouseup="setSearchCriteria(event);"><var:string label:value="Title or Description"/></li>
+      </ul>
+    </div>
+
+    <div id="filterPanel">
+      <span class="searchBox" style="float: right">
+        <input id="searchCriteria" name="criteria" type="hidden" var:value="searchCriteria" />
+        <input id="searchValue" autocomplete="off" name="search" type="text" var:value="searchText" onmousedown="onSearchMouseDown(event, this);" onclick="popupSearchMenu(event, 'searchMenu');" onblur="onSearchBlur(this);" onfocus="onSearchFocus(this);" onkeydown="onSearchKeyDown(this);" />
+      </span>
+
+      <script type="text/javascript">
+        initCriteria();
+      </script>
+    </div>
+  </container>
diff --git a/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox b/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox
index 7dee5a704..1d04494c4 100644
--- a/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox
@@ -12,8 +12,8 @@
       ><var:if condition="appointment.ispublic" const:negate="YES">
         <img rsrc:src="apt_icon_private.gif"
           /></var:if
-        ><a var:href="url"
-        onclick="return displayAppointment(this);"
+        ><a href="#"
+        ondblclick="return displayAppointment(this);"
         var:aptId="appointment.uid"
         var:title="tooltip"
         var:queryDictionary="queryDictionary"
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
new file mode 100644
index 000000000..29f3c78c6
--- /dev/null
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -0,0 +1,115 @@
+<?xml version="1.0" standalone="yes"?>
+  <var:component xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:var="http://www.skyrix.com/od/binding"
+    xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:uix="OGo:uix"
+    xmlns:label="OGo:label"
+    className="UIxPageFrame"
+    title="title"
+    popup="isPopup"
+    >
+    <div class="menu" id="messageListMenu">
+      <ul id="sourceList">
+        <li
+          onmousedown="return false;"
+          onmouseup="onMenuOpenMessage(event);"><var:string label:value="Open Message In New Window"/></li>
+        <li class="separator"></li>
+        <li
+          onmousedown="return false;"
+          onmouseup="onMenuReplyToSender(event);"><var:string label:value="Reply to Sender Only"/></li>
+        <li
+          onmousedown="return false;"
+          onmouseup="onMenuReplyToAll(event);"><var:string label:value="Reply to All"/></li>
+        <li
+          onmousedown="return false;"
+          onmouseup="onMenuForwardMessage(event);"><var:string label:value="Forward"/></li>
+        <li
+          onmousedown="return false;"
+          onmouseup="onMenuEditMessageAsNew(event);"><var:string label:value="Edit As New..."/></li>
+        <li class="separator"></li>
+        <li
+          class="submenu"
+          mailboxaction="move"
+          submenu="mailboxes-menu"
+          onmouseover="dropDownSubmenu(event);"
+          onmousedown="return false;"><var:string label:value="Move To"/></li>
+        <li
+          class="submenu"
+          mailboxaction="copy"
+          submenu="mailboxes-menu"
+          onmouseover="dropDownSubmenu(event);"
+          onmousedown="return false;"><var:string label:value="Copy To"/></li>
+        <li
+          class="submenu"
+          submenu="label-menu"
+          onmouseover="dropDownSubmenu(event);"
+          onmousedown="return false;"><var:string label:value="Label"/></li>
+        <li
+          class="submenu"
+          submenu="mark-menu"
+          onmouseover="dropDownSubmenu(event);"
+          onmousedown="return false;"><var:string label:value="Mark"/></li>
+        <li class="separator"></li>
+        <li
+          onmousedown="return false;"
+          onmouseup="onMenuSaveMessageAs(event);"><var:string label:value="Save As..."/></li>
+        <li
+          onmousedown="return false;"
+          onmouseup="onMenuPreviewPrintMessage(event);"><var:string label:value="Print Preview"/></li>
+        <li
+          onmousedown="return false;"
+          onmouseup="onMenuPrintMessage(event);"><var:string label:value="Print..."/></li>
+        <li
+          onmousedown="return false;"
+          onmouseup="onMenuDeleteMessage(event);"><var:string label:value="Delete Message"/></li>
+      </ul>
+    </div>
+
+    <div id="leftPanel">
+      <div id="dateSelectorView"
+        ><var:component className="UIxCalDateSelector"
+          selectedDate="thisMonth"
+          /></div>
+
+      <div id="leftDragHandle"
+        class="dragHandle"
+        onmousedown="startHandleDragging(event);"
+        onmousemove=""
+        upperblock="dateSelectorView"
+        lowerblock="tasksView">
+      </div>
+
+      <div id="tasksView">
+        Here are the tasks...
+      </div>
+    </div>
+
+    <div id="verticalDragHandle"
+      class="dragHandle"
+      onmousedown="startHandleDragging(event);"
+      onmousemove=""
+      leftblock="leftPanel"
+      rightblock="rightPanel">
+    </div>
+
+    <div id="rightPanel">
+      <var:component className="UIxCalFilterPanel" />
+
+      <div id="appointmentsListView"
+        ><var:component className="UIxCalAptListView"
+          /></div>
+
+      <div id="rightDragHandle"
+        class="dragHandle"
+        onmousedown="startHandleDragging(event);"
+        onmousemove=""
+        upperblock="appointmentsListView"
+        lowerblock="calendarView">
+      </div>
+
+      <div id="calendarView"
+        ><var:component className="UIxCalDayView"
+          selectedDate="selectedDate"
+          /></div>
+    </div>
+  </var:component>
diff --git a/UI/Templates/SchedulerUI/UIxDatePicker.wox b/UI/Templates/SchedulerUI/UIxDatePicker.wox
index ea5294217..917f870f9 100644
--- a/UI/Templates/SchedulerUI/UIxDatePicker.wox
+++ b/UI/Templates/SchedulerUI/UIxDatePicker.wox
@@ -3,17 +3,18 @@
     xmlns:var="http://www.skyrix.com/od/binding"
     xmlns:const="http://www.skyrix.com/od/constant"
     xmlns:rsrc="OGo:url"
-    >
-    <input type="text"
+    ><input type="text"
       var:name="dateID"
       var:id="dateID"
       var:value="formattedDateString"
       size="12"
       /><a href="#"
-      var:onclick="jsPopup"
+      var:inputId="dateID"
+      var:dateFormat="jsDateFormat"
+      onclick="return popupCalendar(this);"
       ><img rsrc:src="icon_popupcalendar.gif"
         var:title="label"
         var:alt="label"
         border="0"
-        /></a>
-  </span>
+        /></a
+      ></span>
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index e81fde1d7..04e88e4dc 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -49,6 +49,7 @@
           <div id="logConsole">
           </div>
           <script type="text/javascript">
+            initQueryParameters();
             initLogConsole();
           </script>