diff --git a/UI/Templates/MailerUI/UIxMailFilterPanel.wox b/UI/Templates/MailerUI/UIxMailFilterPanel.wox
index d970772e1..0d84e21d1 100644
--- a/UI/Templates/MailerUI/UIxMailFilterPanel.wox
+++ b/UI/Templates/MailerUI/UIxMailFilterPanel.wox
@@ -31,7 +31,14 @@
       <var:if condition="hideFrame" const:negate="YES"
         ><span class="searchBox" style="float: right">
           <input id="searchCriteria" name="criteria" type="hidden" var:value="searchCriteria" />
-          <input id="searchValue" onmousedown="onSearchMouseDown(event);" onclick="popupSearchMenu(event, 'searchMenu');" autocomplete="off" name="search" type="text" var:value="searchText" onchange="onSearchChange();" onblur="onSearchBlur();" onfocus="onSearchFocus(event);" />
+          <input id="searchValue"
+            autocomplete="off" name="search" type="text" var:value="searchText"
+            onmousedown="onSearchMouseDown(event, this);"
+            onclick="popupSearchMenu(event, 'searchMenu');"
+            onchange="onSearchChange();"
+            onblur="onSearchBlur(this);"
+            onfocus="onSearchFocus(this);"
+            onkeydown="onSearchKeyDown(this);" />
         </span>
 
         <script type="text/javascript">
@@ -39,7 +46,7 @@
           document.pageform.search.focus();
         </script>
 
-        <var:string label:value="View" />:
+        <var:string label:value="View:" />
         <var:popup list="filters" 
           item="filter" string="filterLabel" value="filter"
           selection="selectedFilter"
diff --git a/UI/Templates/SchedulerUI/UIxCalAptListView.wox b/UI/Templates/SchedulerUI/UIxCalAptListView.wox
index 057682efd..d5336ac3e 100644
--- a/UI/Templates/SchedulerUI/UIxCalAptListView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalAptListView.wox
@@ -44,9 +44,12 @@
       ><tr class="tableview"
         var:id="currentAppointment.uid"
         onclick="return onRowClick(event);"
+        ondblclick="return editDoubleClickedEvent(this);"
         oncontextmenu="return onAppointmentContextMenu(event, this);"
         ><td onmousedown="return false;"
-          ><var:string value="currentAppointment.title"/></td
+          var:title="currentAppointment.title"
+          ><var:string value="currentTitle" const:escapeHTML="NO"
+            /></td
           ><td onmousedown="return false;"
           ><var:string value="currentStartTime"/></td
           ><td onmousedown="return false;"
diff --git a/UI/Templates/SchedulerUI/UIxCalFilterPanel.wox b/UI/Templates/SchedulerUI/UIxCalFilterPanel.wox
index c4c012bd8..0997532e9 100644
--- a/UI/Templates/SchedulerUI/UIxCalFilterPanel.wox
+++ b/UI/Templates/SchedulerUI/UIxCalFilterPanel.wox
@@ -16,11 +16,26 @@
     <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);" />
+        <input id="searchValue"
+          autocomplete="off" name="search" type="text" var:value="searchText"
+          onmousedown="onSearchMouseDown(event, this);"
+          onclick="popupSearchMenu(event, 'searchMenu');"
+          onchange="onSearchChange();"
+          onblur="onSearchBlur(this);"
+          onfocus="onSearchFocus(this);"
+          onkeydown="onSearchKeyDown(this);" />
       </span>
 
       <script type="text/javascript">
         initCriteria();
       </script>
+
+      <var:string label:value="View:" />
+      <var:popup list="filters"
+        const:id="filterpopup"
+        item="filter" string="filterLabel" value="filter"
+        selection="selectedFilter"
+        const:name="filterpopup" 
+        const:onchange="return onListFilterChange();" />
     </div>
   </container>
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 29f3c78c6..f96b6feb7 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -8,60 +8,37 @@
     title="title"
     popup="isPopup"
     >
-    <div class="menu" id="messageListMenu">
+    <div class="menu" id="appointmentsListMenu">
       <ul id="sourceList">
         <li
           onmousedown="return false;"
-          onmouseup="onMenuOpenMessage(event);"><var:string label:value="Open Message In New Window"/></li>
+          onmouseup="newEvent(this);"><var:string label:value="New Event..."/></li>
         <li class="separator"></li>
         <li
           onmousedown="return false;"
-          onmouseup="onMenuReplyToSender(event);"><var:string label:value="Reply to Sender Only"/></li>
+          onmouseup="newTask(this);"><var:string label:value="New Task..."/></li>
         <li
           onmousedown="return false;"
-          onmouseup="onMenuReplyToAll(event);"><var:string label:value="Reply to All"/></li>
+          onmouseup="editEvent();"
+          ><var:string label:value="Edit Selected Event..."/></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>
+          onmouseup="onDeleteSelectedEvent();"
+          ><var:string label:value="Delete Selected Event"/></li>
         <li class="separator"></li>
         <li
           onmousedown="return false;"
-          onmouseup="onMenuSaveMessageAs(event);"><var:string label:value="Save As..."/></li>
+          onmouseup="onSelectAll(this);"
+          ><var:string label:value="Select All"/></li>
+        <li class="separator"></li>
         <li
           onmousedown="return false;"
-          onmouseup="onMenuPreviewPrintMessage(event);"><var:string label:value="Print Preview"/></li>
+          onmouseup="onToggleWorkweekDaysOnly();"
+          ><var:string label:value="Workweek days only" /></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>
+          onmouseup="onToggleTasksInView();"
+            ><var:string label:value="Tasks in View"/></li>
       </ul>
     </div>