diff --git a/UI/Templates/MailerUI/UIxMailAccountView.wox b/UI/Templates/MailerUI/UIxMailAccountView.wox
deleted file mode 100644
index 269472a12..000000000
--- a/UI/Templates/MailerUI/UIxMailAccountView.wox
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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:rsrc="OGo:url"
-    xmlns:label="OGo:label"
-    className="UIxMailAccountViewContainer"
-    title="title"
-    >
-    <div style="padding: 1em;" oncontextmenu="return false;">
-      <h2>
-        SOGo Mail - <var:string value="objectTitle" />
-        
-        <var:if condition="clientObject.isSharedAccount">
-          <var:string label:value="Shared Account: " />
-        </var:if>
-        
-        <!--	<div class="titlediv">
-        <var:if condition="clientObject.isSharedAccount">
-        <var:string label:value="Share: " />
-      </var:if>
-        <var:if condition="clientObject.isSharedAccount" const:negate="1">
-        <var:string label:value="Account: " />
-      </var:if>
-        <var:string value="objectTitle"/>
-      </div>
-        -->
-      </h2>
-      <var:if condition="clientObject.isSharedAccount">
-        <div>
-          <var:string label:value="Share: " />
-          <var:string value="clientObject.sharedAccountName" />
-        </div>
-      </var:if>
-      
-      <h3>Email</h3>
-      <p>
-        <a href="INBOX/" onclick="initMailboxSelection(currentMailbox + '/INBOX'); openMailbox(currentMailbox + '/INBOX'); return false;"><img rsrc:src="read-messages.png" /><var:string label:value="Read messages" /></a><br />
-        <a href="#" onclick="clickedCompose(this);"><img rsrc:src="write-message.png" /><var:string label:value="Write a new message" /></a><br />
-      </p>
-
-      <h3>Accounts</h3>
-      <p>
-        <a href=""><img rsrc:src="account-settings.png" />View settings for this account</a><br />
-        <a href=""><img rsrc:src="create-account.png" />Create a new account</a> [TBD: not in Agenor]<br />
-      </p>
-      
-      <h3>Advanced Features</h3>
-      <p>
-        <a href=""><img rsrc:src="search-messages.png" />Search messages</a><br />
-        <a href=""><img rsrc:src="manage-filters.png" />Manage message filters</a><br />
-        <a href=""><img rsrc:src="manage-imap.png" />Manage folder subscriptions</a><br />
-        <a href=""><img rsrc:src="offline-settings.png" />Offline settings</a> [TBD: not in Agenor]<br />
-      </p>
-    </div>
-  </var:component>
diff --git a/UI/Templates/MailerUI/UIxMailAccountViewContainer.wox b/UI/Templates/MailerUI/UIxMailAccountViewContainer.wox
deleted file mode 100644
index ae4f93ec7..000000000
--- a/UI/Templates/MailerUI/UIxMailAccountViewContainer.wox
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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:rsrc="OGo:url"
-    xmlns:label="OGo:label"
-    className="UIxMailMainFrame"
-    title="name"
-    >
-
-    <var:if condition="hideFrame" const:negate="YES">
-      <div id="mailboxContent" style="visibility: hidden;">
-      </div>
-
-      <div class="dragHandle" id="mailboxDragHandle"
-        style="visibility: hidden;"
-        onmousedown="startHandleDragging(event);"
-        onmousemove=""
-        ondblclick="dragHandleDoubleClick(event);"
-        upperblock="mailboxContent"
-        lowerblock="messageContent">
-      </div>
-      
-      <div id="messageContent"
-        style="top: 0px;">
-        <var:component-content />
-      </div>
-
-      <script type="text/javascript">
-        initMailboxSelection('<var:string value="mailFolderName" />');
-      </script>
-    </var:if>
-
-    <var:if condition="hideFrame">
-      <var:component-content />
-    </var:if>
-  </var:component>
diff --git a/UI/Templates/MailerUI/UIxMailAccountsView.wox b/UI/Templates/MailerUI/UIxMailAccountsView.wox
deleted file mode 100644
index 1fa717274..000000000
--- a/UI/Templates/MailerUI/UIxMailAccountsView.wox
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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"
-  xmlns:rsrc="OGo:url"
-  className="UIxMailMainFrame"
-  title="name"
->
-    <div id="mailboxContent" style="visibility: hidden;">
-    </div>
-
-    <div class="dragHandle" id="mailboxDragHandle"
-      style="visibility: hidden;"
-      onmousedown="startHandleDragging(event);"
-      onmousemove=""
-      ondblclick="dragHandleDoubleClick(event);"
-      upperblock="mailboxContent"
-      lowerblock="messageContent">
-    </div>
-
-    <div id="messageContent"
-      style="top: 0px;">
-      <div style="padding: 1em;">
-        <var:string label:value="Welcome to the SOGo Mailer. Use the folder tree on the left to browse your mail accounts!" />
-      </div>
-    </div>
-  </var:component>
diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index 01945e49d..97c87337f 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -6,7 +6,7 @@
     xmlns:uix="OGo:uix"
     xmlns:rsrc="OGo:url"
     xmlns:label="OGo:label"
-    className="UIxMailMainFrame"
+    className="UIxPageFrame"
     title="panelTitle"
     const:popup="YES"
     >
diff --git a/UI/Templates/MailerUI/UIxMailFilterPanel.wox b/UI/Templates/MailerUI/UIxMailFilterPanel.wox
index 17ae1818e..0e3805a46 100644
--- a/UI/Templates/MailerUI/UIxMailFilterPanel.wox
+++ b/UI/Templates/MailerUI/UIxMailFilterPanel.wox
@@ -42,11 +42,6 @@
             onkeydown="onSearchKeyDown(this);" />
         </span>
 
-        <script type="text/javascript">
-          initCriteria();
-          document.pageform.search.focus();
-        </script>
-
         <var:string label:value="View:" />
         <var:popup list="filters" 
           item="filter" string="filterLabel" value="filter"
diff --git a/UI/Templates/MailerUI/UIxMailFolderACLEditor.wox b/UI/Templates/MailerUI/UIxMailFolderACLEditor.wox
index 3f01eabe6..421c98cad 100644
--- a/UI/Templates/MailerUI/UIxMailFolderACLEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailFolderACLEditor.wox
@@ -1,14 +1,13 @@
 <?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:rsrc="OGo:url"
-  xmlns:label="OGo:label"
-  className="UIxMailMainFrame"
-  title="panelTitle"
-  const:hideFolderTree="1"
->
-  TODO: IMAP4 ACL editor
-</var:component>
+  <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:rsrc="OGo:url"
+    xmlns:label="OGo:label"
+    className="UIxPageFrame"
+    title="panelTitle"
+    const:popup="YES">
+    TODO: IMAP4 ACL editor
+  </var:component>
diff --git a/UI/Templates/MailerUI/UIxMailListView.wox b/UI/Templates/MailerUI/UIxMailListView.wox
index 85d3b958e..a66e0d832 100644
--- a/UI/Templates/MailerUI/UIxMailListView.wox
+++ b/UI/Templates/MailerUI/UIxMailListView.wox
@@ -1,159 +1,133 @@
 <?xml version='1.0' standalone='yes'?>
-  <var:component
+  <table multiselect="yes" id="messageList"
     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:rsrc="OGo:url"
-    xmlns:label="OGo:label"
-    className="UIxMailListViewContainer"
-    title="name"
-    >
-    <var:component className="UIxMailFilterPanel" qualifier="qualifier" />
-
-    <table multiselect="yes" id="messageList">
-      <tbody>
-        <tr class="tableview"
-          ><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
-            ><td class="tbtv_headercell tbtv_subject_headercell"
+    xmlns:label="OGo:label">
+    <tbody>
+      <tr class="tableview"
+        ><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
+          ><td class="tbtv_headercell tbtv_subject_headercell"
+          ><var:component className="UIxSortableTableHeader"
+            label:label="Subject"
+            const:sortKey="subject"
+            const:href="view"
+            var:queryDictionary="context.request.formValues"
+            /></td
+          ><td class="tbtv_headercell"
+          ><var:if condition="showToAddress" const:negate="YES"
             ><var:component className="UIxSortableTableHeader"
-              label:label="Subject"
-              const:sortKey="subject"
+              label:label="From"
+              const:sortKey="from"
               const:href="view"
               var:queryDictionary="context.request.formValues"
-              /></td
-            ><td class="tbtv_headercell"
-            ><var:if condition="showToAddress" const:negate="YES"
-              ><var:component className="UIxSortableTableHeader"
-                label:label="From"
-                const:sortKey="from"
-                const:href="view"
-                var:queryDictionary="context.request.formValues"
-                /></var:if
-              ><var:if condition="showToAddress"
-              ><var:component className="UIxSortableTableHeader"
-                label:label="To"
-                const:sortKey="to"
-                const:href="view"
-                var:queryDictionary="context.request.formValues"
+              /></var:if
+            ><var:if condition="showToAddress"
+            ><var:component className="UIxSortableTableHeader"
+              label:label="To"
+              const:sortKey="to"
+              const:href="view"
+              var:queryDictionary="context.request.formValues"
+              /></var:if
+            ></td
+          ><td class="tbtv_headercell messageFlagColumn"
+          ><img rsrc:src="title_read_14x14.png" width="14" height="14"
+            /></td
+          ><td class="tbtv_headercell"
+          ><var:component className="UIxSortableTableHeader"
+            label:label="Date"
+            const:sortKey="date"
+            const:href="view"
+            var:queryDictionary="context.request.formValues"
+            const:isDefault="YES"
+            /></td
+          ></tr>
+      <var:if condition="showsAllMessages" const:negate="YES"
+        ><tr class="tableview"
+          ><td colspan="6" class="tbtv_navcell"
+            ><var:if condition="hasPrevious">
+              <a href="#"
+                onclick="openMailboxAtIndex(this);"
+                idx="1"><var:string label:value="first"/></a> |
+              <a href="#"
+                onclick="openMailboxAtIndex(this);"
+                var:idx="prevFirstMessageNumber"
+                ><var:string label:value="previous"/></a> |
+            </var:if>
+            <var:string value="firstMessageNumber" />
+            <var:string label:value="msgnumber_to" />
+            <var:string value="lastMessageNumber" />
+            <var:string label:value="msgnumber_of" />
+            <var:string value="sortedUIDs.count" />
+            <var:if condition="hasNext"
+              >| <a href="#"
+                onclick="openMailboxAtIndex(this);"
+                var:idx="nextFirstMessageNumber"
+                ><var:string label:value="next" /></a>
+            </var:if
+              ></td
+            ></tr
+          ></var:if>
+      <var:foreach list="messages" item="message"
+        ><tr class="tableview" var:id="msgRowID"
+          ><td></td
+            ><td><var:if condition="hasMessageAttachment"
+              ><img rsrc:src="title_attachment_14x14.png"
                 /></var:if
               ></td
-            ><td class="tbtv_headercell messageFlagColumn"
-            ><img rsrc:src="title_read_14x14.png" width="14" height="14"
+            
+            ><td
+            var:class="messageSubjectCellStyleClass"
+            var:id="msgDivID"
+            ><var:string value="message.envelope.subject"
+              formatter="context.mailSubjectFormatter"
               /></td
-            ><td class="tbtv_headercell"
-            ><var:component className="UIxSortableTableHeader"
-              label:label="Date"
-              const:sortKey="date"
-              const:href="view"
-              var:queryDictionary="context.request.formValues"
-              const:isDefault="YES"
+
+            ><td
+            var:class="messageCellStyleClass"
+            ><var:if condition="showToAddress" const:negate="YES"
+              ><var:string value="message.envelope.from"
+                formatter="context.mailEnvelopeAddressFormatter"
+                /></var:if
+              ><var:if condition="showToAddress"
+              ><var:string value="message.envelope.to"
+                formatter="context.mailEnvelopeAddressFormatter"
+                /></var:if
+              ></td
+            
+            ><td var:class="messageCellStyleClass"
+            ><var:if condition="isMessageRead"
+              ><img rsrc:src="icon_read.gif"
+                class="mailerReadIcon"
+                label:title="Mark Unread"
+                label:title-markread="Mark Read"
+                label:title-markunread="Mark Unread"
+                var:id="msgIconReadImgID"
+                /></var:if
+              ><var:if condition="isMessageRead" const:negate="YES"
+              ><img rsrc:src="icon_unread.gif"
+                class="mailerUnreadIcon"
+                label:title="Mark Read"
+                label:title-markread="Mark Read"
+                label:title-markunread="Mark Unread"
+                var:id="msgIconUnreadImgID"
+                /></var:if
+              ></td
+            
+            ><td var:class="messageCellStyleClass"
+            ><span class="mailer_datefield"
+              ><var:string value="message.envelope.date" 
+                formatter="context.mailDateFormatter"
+                /></span
+              ><entity name="nbsp"
               /></td
             ></tr>
-        <var:if condition="showsAllMessages" const:negate="YES"
-          ><tr class="tableview"
-            ><td colspan="6" class="tbtv_navcell"
-              ><var:if condition="hasPrevious">
-                <a href="#"
-                  onclick="openMailboxAtIndex(this);"
-                  idx="1"><var:string label:value="first"/></a> |
-                <a href="#"
-                  onclick="openMailboxAtIndex(this);"
-                  var:idx="prevFirstMessageNumber"
-                  ><var:string label:value="previous"/></a> |
-              </var:if>
-              <var:string value="firstMessageNumber" />
-              <var:string label:value="msgnumber_to" />
-              <var:string value="lastMessageNumber" />
-              <var:string label:value="msgnumber_of" />
-              <var:string value="sortedUIDs.count" />
-              <var:if condition="hasNext"
-                >| <a href="#"
-                  onclick="openMailboxAtIndex(this);"
-                  var:idx="nextFirstMessageNumber"
-                  ><var:string label:value="next" /></a>
-              </var:if
-            ></td
-              ></tr
-            ></var:if>
-        <var:foreach list="messages" item="message"
-          ><tr class="tableview" var:id="msgRowID"
-            ><td></td
-              ><td><var:if condition="hasMessageAttachment"
-                ><img rsrc:src="title_attachment_14x14.png"
-                  /></var:if
-                ></td
-              
-              ><td
-              var:class="messageSubjectCellStyleClass"
-              var:id="msgDivID"
-              ><var:string value="message.envelope.subject"
-                formatter="context.mailSubjectFormatter"
-                /></td
-
-              ><td
-              var:class="messageCellStyleClass"
-              ><var:if condition="showToAddress" const:negate="YES"
-                ><var:string value="message.envelope.from"
-                  formatter="context.mailEnvelopeAddressFormatter"
-                  /></var:if
-                ><var:if condition="showToAddress"
-                ><var:string value="message.envelope.to"
-                  formatter="context.mailEnvelopeAddressFormatter"
-                  /></var:if
-                ></td
-              
-              ><td var:class="messageCellStyleClass"
-              ><var:if condition="isMessageRead"
-                ><img rsrc:src="icon_read.gif"
-                  class="mailerReadIcon"
-                  label:title="Mark Unread"
-                  label:title-markread="Mark Read"
-                  label:title-markunread="Mark Unread"
-                  var:id="msgIconReadImgID"
-                  /></var:if
-                ><var:if condition="isMessageRead" const:negate="YES"
-                ><img rsrc:src="icon_unread.gif"
-                  class="mailerUnreadIcon"
-                  label:title="Mark Read"
-                  label:title-markread="Mark Read"
-                  label:title-markunread="Mark Unread"
-                  var:id="msgIconUnreadImgID"
-                  /></var:if
-                ></td
-              
-              ><td var:class="messageCellStyleClass"
-              ><span class="mailer_datefield"
-                ><var:string value="message.envelope.date" 
-                  formatter="context.mailDateFormatter"
-                  /></span
-		><entity name="nbsp"
-                /></td
-              ></tr>
-        </var:foreach>
-      </tbody>
-    </table>
-    <!--
-    <tr class="tableview">
-    <td colspan="6" class="tbtv_actcell">
-    <! TODO: fix used tree, treeNavigationNodes is the _wrong_ choice
-    <var:component className="UIxMailMoveToPopUp"
-    const:identifier="moveto"
-    const:callback="moveTo"
-    rootNodes="clientObject.treeNavigationNodes"
-    />
-    >
-    <! enable once we have buttons and functionality to actually move sth #1211
-    <var:popup const:name="moveto" const:id="moveto"
-    list="clientObject.mailAccountFolder.allFolderPathes"
-    item="item" value="item" displayString="item" />
-    ->
-  </td>
-  </tr>
-    -->
-  </var:component>
+      </var:foreach>
+    </tbody>
+  </table>
diff --git a/UI/Templates/MailerUI/UIxMailListViewContainer.wox b/UI/Templates/MailerUI/UIxMailListViewContainer.wox
deleted file mode 100644
index 01017ac79..000000000
--- a/UI/Templates/MailerUI/UIxMailListViewContainer.wox
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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:rsrc="OGo:url"
-    xmlns:label="OGo:label"
-    className="UIxMailMainFrame"
-    title="name"
-    >
-    <var:if condition="hideFrame" const:negate="YES">
-      <div id="mailboxContent">
-        <var:component-content/>
-      </div>
-
-      <div class="dragHandle" id="mailboxDragHandle"><!-- space --></div>
-
-      <div id="messageContent">
-      </div>
-
-      <script type="text/javascript">
-        initMailboxSelection('<var:string value="mailFolderName" />');
-      </script>
-    </var:if>
-
-    <var:if condition="hideFrame">
-      <var:component-content/>
-    </var:if>
-  </var:component>
diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index e460a06bc..4c1afc879 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -8,265 +8,216 @@
     title="title"
     popup="isPopup"
     >
-    <var:if condition="hideFrame" const:negate="YES">
-      <div class="menu" id="accountIconMenu">
-        <ul id="sourceList">
-          <li
-            onmouseup="return false;"><var:string label:value="Subscribe..." /></li>
-          <li
-            onmouseup="return false;"><var:string label:value="Get Messages for Account" /></li>
-          <li
-            onmouseup="return false;"><var:string label:value="New Folder..." /></li>
-          <li class="separator"></li>
-          <li
-            onmouseup="return false;"><var:string label:value="Search Messages..." /></li>
-          <li
-            onmouseup="return false;"><var:string label:value="Properties..." /></li>
-        </ul>
-      </div>
+    <div class="menu" id="accountIconMenu">
+      <ul id="sourceList">
+        <li><var:string label:value="Subscribe..." /></li>
+        <li><var:string label:value="Get Messages for Account" /></li>
+        <li><var:string label:value="New Folder..." /></li>
+        <li class="separator"></li>
+        <li><var:string label:value="Search Messages..." /></li>
+        <li><var:string label:value="Properties..." /></li>
+      </ul>
+    </div>
 
-      <div class="menu" id="inboxIconMenu">
-        <ul id="sourceList">
-          <li
-            onmouseup="return false;"><var:string label:value="Open in New Mail Window" /></li>
-          <li
-            onmouseup="return false;"><var:string label:value="Copy Folder Location" /></li>
-          <li
-            onmouseup="return false;"><var:string label:value="Subscribe..." /></li>
-          <li class="separator"></li>
-          <li
-            onmouseup="return false;"><var:string label:value="Mark Folder Read..." /></li>
-          <li
-            onmouseup="return false;"><var:string label:value="New Folder..." /></li>
-          <li
-            onmouseup="return false;"><var:string label:value="Compact This Folder" /></li>
-          <li class="separator"></li>
-          <li
-            onmouseup="return false;"><var:string label:value="Search Messages..." /></li>
-          <li
-            onmouseup="return false;"><var:string label:value="Properties..." /></li>
-        </ul>
-      </div>
+    <div class="menu" id="inboxIconMenu">
+      <ul id="sourceList">
+        <li><var:string label:value="Open in New Mail Window" /></li>
+        <li><var:string label:value="Copy Folder Location" /></li>
+        <li><var:string label:value="Subscribe..." /></li>
+        <li class="separator"></li>
+        <li><var:string label:value="Mark Folder Read..." /></li>
+        <li><var:string label:value="New Folder..." /></li>
+        <li><var:string label:value="Compact This Folder" /></li>
+        <li class="separator"></li>
+        <li><var:string label:value="Search Messages..." /></li>
+        <li><var:string label:value="Properties..." /></li>
+      </ul>
+    </div>
       
-      <div class="menu" id="trashIconMenu">
-        <ul id="sourceList">
-          <li
-            onmouseup="return false;"><var:string label:value="Open in New Mail Window" /></li>
-          <li
-            onmouseup="return false;"><var:string label:value="Copy Folder Location" /></li>
-          <li
-            onmouseup="return false;"><var:string label:value="Subscribe..." /></li>
-          <li class="separator"></li>
-          <li
-            onmouseup="return false;"><var:string label:value="Mark Folder Read..." /></li>
-          <li
-            onmouseup="return false;"><var:string label:value="New Subfolder..." /></li>
-          <li
-            onmouseup="return false;"><var:string label:value="Compact This Folder" /></li>
-          <li
-            onmouseup="return false;"><var:string label:value="Empty Trash" /></li>
-          <li class="separator"></li>
-          <li
-            onmouseup="return false;"><var:string label:value="Search Messages..." /></li>
-          <li
-            onmouseup="return false;"><var:string label:value="Properties..." /></li>
-        </ul>
-      </div>
+    <div class="menu" id="trashIconMenu">
+      <ul id="sourceList">
+        <li><var:string label:value="Open in New Mail Window" /></li>
+        <li><var:string label:value="Copy Folder Location" /></li>
+        <li><var:string label:value="Subscribe..." /></li>
+        <li class="separator"></li>
+        <li><var:string label:value="Mark Folder Read..." /></li>
+        <li><var:string label:value="New Subfolder..." /></li>
+        <li><var:string label:value="Compact This Folder" /></li>
+        <li><var:string label:value="Empty Trash" /></li>
+        <li class="separator"></li>
+        <li><var:string label:value="Search Messages..." /></li>
+        <li><var:string label:value="Properties..." /></li>
+      </ul>
+    </div>
 
-      <div class="menu" id="mailboxIconMenu">
-        <ul id="sourceList">
-          <li
-            onmouseup="return false;"><var:string label:value="Open in New Mail Window" /></li>
-          <li
-            onmouseup="return false;"><var:string label:value="Copy Folder Location" /></li>
-          <li
-            onmouseup="return false;"><var:string label:value="Subscribe..." /></li>
-          <li class="separator"></li>
-          <li
-            onmouseup="return false;"><var:string label:value="Mark Folder Read..." /></li>
-          <li
-            onmouseup="return false;"><var:string label:value="New Subfolder..." /></li>
-          <li
-            onmouseup="return false;"><var:string label:value="Rename Folder..." /></li>
-          <li
-            onmouseup="return false;"><var:string label:value="Compact This Folder" /></li>
-          <li
-            onmouseup="return false;"><var:string label:value="Delete Folder" /></li>
-          <li class="separator"></li>
-          <li
-            onmouseup="return false;"><var:string label:value="Search Messages..." /></li>
-          <li
-            onmouseup="return false;"><var:string label:value="Properties..." /></li>
-        </ul>
-      </div>
+    <div class="menu" id="mailboxIconMenu">
+      <ul id="sourceList">
+        <li><var:string label:value="Open in New Mail Window" /></li>
+        <li><var:string label:value="Copy Folder Location" /></li>
+        <li><var:string label:value="Subscribe..." /></li>
+        <li class="separator"></li>
+        <li><var:string label:value="Mark Folder Read..." /></li>
+        <li><var:string label:value="New Subfolder..." /></li>
+        <li><var:string label:value="Rename Folder..." /></li>
+        <li><var:string label:value="Compact This Folder" /></li>
+        <li><var:string label:value="Delete Folder" /></li>
+        <li class="separator"></li>
+        <li><var:string label:value="Search Messages..." /></li>
+        <li><var:string label:value="Properties..." /></li>
+      </ul>
+    </div>
+    
+    <div class="menu" id="addressMenu">
+      <ul id="sourceList">
+        <li id="add_to_addressbook"
+          onmouseup="newContactFromEmail(this);"><var:string label:value="Add to Address Book..."/></li>
+        <li id="compose_mailto"
+          onmouseup="newEmailTo(this);"><var:string label:value="Compose Mail To"/></li>
+        <li id="create_filter"
+          onmouseup="onMenuEntryClick(this, event);"><var:string label:value="Create Filter From Message..."/></li>
+      </ul>
+    </div>
 
-      <div class="menu" id="addressMenu">
-        <ul id="sourceList">
-          <li id="add_to_addressbook"
-            onmouseup="newContactFromEmail(this);"><var:string label:value="Add to Address Book..."/></li>
-          <li id="compose_mailto"
-            onmouseup="newEmailTo(this);"><var:string label:value="Compose Mail To"/></li>
-          <li id="create_filter"
-            onmouseup="onMenuEntryClick(this, event);"><var:string label:value="Create Filter From Message..."/></li>
-        </ul>
-      </div>
+    <div class="menu" id="messageListMenu">
+      <ul id="sourceList">
+        <li
+          onmouseup="onMenuOpenMessage(event);"><var:string label:value="Open Message In New Window"/></li>
+        <li class="separator"></li>
+        <li
+          onmouseup="onMenuReplyToSender(event);"><var:string label:value="Reply to Sender Only"/></li>
+        <li
+          onmouseup="onMenuReplyToAll(event);"><var:string label:value="Reply to All"/></li>
+        <li
+          onmouseup="onMenuForwardMessage(event);"><var:string label:value="Forward"/></li>
+        <li
+          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);"><var:string label:value="Move To"/></li>
+        <li
+          class="submenu"
+          mailboxaction="copy"
+          submenu="mailboxes-menu"
+          onmouseover="dropDownSubmenu(event);"><var:string label:value="Copy To"/></li>
+        <li
+          class="submenu"
+          submenu="label-menu"
+          onmouseover="dropDownSubmenu(event);"><var:string label:value="Label"/></li>
+        <li
+          class="submenu"
+          submenu="mark-menu"
+          onmouseover="dropDownSubmenu(event);"><var:string label:value="Mark"/></li>
+        <li class="separator"></li>
+        <li
+          onmouseup="onMenuSaveMessageAs(event);"><var:string label:value="Save As..."/></li>
+        <li
+          onmouseup="onMenuPreviewPrintMessage(event);"><var:string label:value="Print Preview"/></li>
+        <li
+          onmouseup="onMenuPrintMessage(event);"><var:string label:value="Print..."/></li>
+        <li
+          onmouseup="onMenuDeleteMessage(event);"><var:string label:value="Delete Message"/></li>
+      </ul>
+    </div>
 
-      <div class="menu" id="messageListMenu">
-        <ul id="sourceList">
-          <li
-            onmouseup="onMenuOpenMessage(event);"><var:string label:value="Open Message In New Window"/></li>
-          <li class="separator"></li>
-          <li
-            onmouseup="onMenuReplyToSender(event);"><var:string label:value="Reply to Sender Only"/></li>
-          <li
-            onmouseup="onMenuReplyToAll(event);"><var:string label:value="Reply to All"/></li>
-          <li
-            onmouseup="onMenuForwardMessage(event);"><var:string label:value="Forward"/></li>
-          <li
-            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
-            onmouseup="onMenuSaveMessageAs(event);"><var:string label:value="Save As..."/></li>
-          <li
-            onmouseup="onMenuPreviewPrintMessage(event);"><var:string label:value="Print Preview"/></li>
-          <li
-            onmouseup="onMenuPrintMessage(event);"><var:string label:value="Print..."/></li>
-          <li
-            onmouseup="onMenuDeleteMessage(event);"><var:string label:value="Delete Message"/></li>
-        </ul>
-      </div>
+    <div class="menu" id="messageContentMenu">
+      <ul>
+        <li
+          onmouseup="onMenuReplyToSender(event);"><var:string label:value="Reply to Sender Only"/></li>
+        <li
+          onmouseup="onMenuReplyToAll(event);"><var:string label:value="Reply to All"/></li>
+        <li
+          onmouseup="onMenuForwardMessage(event);"><var:string label:value="Forward"/></li>
+        <li
+          onmouseup="onMenuEditMessageAsNew(event);"><var:string label:value="Edit As New..."/></li>
+        <li
+          class="submenu"
+          mailboxaction="move"
+          submenu="mailboxes-menu"
+          onmouseover="dropDownSubmenu(event);"><var:string label:value="Move To"/></li>
+        <li
+          class="submenu"
+          mailboxaction="copy"
+          submenu="mailboxes-menu"
+          onmouseover="dropDownSubmenu(event);"><var:string label:value="Copy To"/></li>
+        <li class="separator"></li>
+        <li
+          class="submenu"
+          submenu="label-menu"
+          onmouseover="dropDownSubmenu(event);"><var:string label:value="Label"/></li>
+        <li
+          class="submenu"
+          submenu="mark-menu"
+          onmouseover="dropDownSubmenu(event);"><var:string label:value="Mark"/></li>
+        <li class="separator"></li>
+        <li
+          onmouseup="onMenuSaveMessageAs(event);"><var:string label:value="Save As..."/></li>
+        <li
+          onmouseup="onMenuPreviewPrintMessage(event);"><var:string label:value="Print Preview"/></li>
+        <li
+          onmouseup="onMenuPrintMessage(event);"><var:string label:value="Print..."/></li>
+        <li
+          onmouseup="onMenuDeleteMessage(event);"><var:string label:value="Delete Message"/></li>
+      </ul>
+    </div>
 
-      <div class="menu" id="messageContentMenu">
-        <ul>
-          <li
-            onmouseup="onMenuReplyToSender(event);"><var:string label:value="Reply to Sender Only"/></li>
-          <li
-            onmouseup="onMenuReplyToAll(event);"><var:string label:value="Reply to All"/></li>
-          <li
-            onmouseup="onMenuForwardMessage(event);"><var:string label:value="Forward"/></li>
-          <li
-            onmouseup="onMenuEditMessageAsNew(event);"><var:string label:value="Edit As New..."/></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="separator"></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
-            onmouseup="onMenuSaveMessageAs(event);"><var:string label:value="Save As..."/></li>
-          <li
-            onmouseup="onMenuPreviewPrintMessage(event);"><var:string label:value="Print Preview"/></li>
-          <li
-            onmouseup="onMenuPrintMessage(event);"><var:string label:value="Print..."/></li>
-          <li
-            onmouseup="onMenuDeleteMessage(event);"><var:string label:value="Delete Message"/></li>
-        </ul>
-      </div>
+    <div class="menu" id="label-menu">
+      <ul id="">
+        <li onmouseup="onMenuLabelMessage(event, 'none');"><var:string label:value="None" /></li>
+        <li class="separator"></li>
+        <li onmouseup="onMenuLabelMessage(event, 'important);"><var:string label:value="Important" /></li>
+        <li onmouseup="onMenuLabelMessage(event, 'work');"><var:string label:value="Work" /></li>
+        <li onmouseup="onMenuLabelMessage(event, 'personal');"><var:string label:value="Personal" /></li>
+        <li onmouseup="onMenuLabelMessage(event, 'todo');"><var:string label:value="To Do" /></li>
+        <li onmouseup="onMenuLab-elMessage(event, 'later');"><var:string label:value="Later" /></li>
+      </ul>
+    </div>
 
-      <div class="menu" id="label-menu">
-        <ul id="">
-          <li onmouseup="onMenuLabelMessage(event, 'none');"><var:string label:value="None" /></li>
-          <li class="separator"></li>
-          <li onmouseup="onMenuLabelMessage(event, 'important);"><var:string label:value="Important" /></li>
-          <li onmouseup="onMenuLabelMessage(event, 'work');"><var:string label:value="Work" /></li>
-          <li onmouseup="onMenuLabelMessage(event, 'personal');"><var:string label:value="Personal" /></li>
-          <li onmouseup="onMenuLabelMessage(event, 'todo');"><var:string label:value="To Do" /></li>
-          <li onmouseup="onMenuLab-elMessage(event, 'later');"><var:string label:value="Later" /></li>
-        </ul>
-      </div>
+    <var:component
+      className="UIxMailFolderMenu"
+      const:menuId="mailboxes-menu"
+      const:parentMenu="0"
+      rootClassName="treeRootClassName" 
+      const:treeFolderAction="view" />
 
-      <var:component
-        className="UIxMailFolderMenu"
-        const:menuId="mailboxes-menu"
-        const:parentMenu="0"
+    <div class="menu" id="mark-menu">
+      <ul id="">
+        <li onmouseup="onMenuMarkMessage(event, 'read');"><var:string label:value="As Read" /></li>
+        <li onmouseup="onMenuMarkMessage(event, 'threadread');"><var:string label:value="Thread As Read" /></li>
+        <li onmouseup="onMenuMarkMessage(event, 'readbydate);"><var:string label:value="As Read By Date..." /></li>
+        <li onmouseup="onMenuMarkMessage(event, 'allread);"><var:string label:value="All Read" /></li>
+        <li class="separator"></li>
+        <li onmouseup="onMenuMarkMessage(event, 'flag);"><var:string label:value="Flag" /></li>
+        <li class="separator"></li>
+        <li onmouseup="onMenuMarkMessage(event, 'junk);"><var:string label:value="As Junk" /></li>
+        <li onmouseup="onMenuMarkMessage(event, 'notjunk);"><var:string label:value="As Not Junk" /></li>
+        <li onmouseup="onMenuMarkMessage(event, 'runjunkmailcontrols);"><var:string label:value="Run Junk Mail Controls" /></li>
+      </ul>
+    </div>
+
+    <div id="leftPanel">
+      <div class="titlediv"><var:string label:value="Folders" /></div>
+      <var:component className="UIxMailTree" 
         rootClassName="treeRootClassName" 
         const:treeFolderAction="view" 
         />
+    </div>
       
-      <div class="menu" id="mark-menu">
-        <ul id="">
-          <li onmouseup="onMenuMarkMessage(event, 'read');"><var:string label:value="As Read" /></li>
-          <li onmouseup="onMenuMarkMessage(event, 'threadread');"><var:string label:value="Thread As Read" /></li>
-          <li onmouseup="onMenuMarkMessage(event, 'readbydate);"><var:string label:value="As Read By Date..." /></li>
-          <li onmouseup="onMenuMarkMessage(event, 'allread);"><var:string label:value="All Read" /></li>
-          <li class="separator"></li>
-          <li onmouseup="onMenuMarkMessage(event, 'flag);"><var:string label:value="Flag" /></li>
-          <li class="separator"></li>
-          <li onmouseup="onMenuMarkMessage(event, 'junk);"><var:string label:value="As Junk" /></li>
-          <li onmouseup="onMenuMarkMessage(event, 'notjunk);"><var:string label:value="As Not Junk" /></li>
-          <li onmouseup="onMenuMarkMessage(event, 'runjunkmailcontrols);"><var:string label:value="Run Junk Mail Controls" /></li>
-        </ul>
-      </div>
-      
-      <form name="pageform" var:href="pageFormURL" _wosid="0" onsubmit="checkSearchValue(event);">
-        <var:if condition="isPopup" const:negate="YES">
-          <var:if condition="hideFolderTree" const:negate="YES">
-            <div class="folderTree" id="mailerFolderTree">
-              <div class="titlediv"><var:string label:value="Folders" /></div>
-              <var:component className="UIxMailTree" 
-                rootClassName="treeRootClassName" 
-                const:treeFolderAction="view" 
-                />
-            </div>
-            
-            <div class="dragHandle" id="dragHandle"><!-- space --></div>
-          </var:if>
-        
-          <div id="mailerPageContent">
-            <var:component-content/>
-          </div>
-        </var:if>
-        
-        <var:if condition="isPopup">
-          <var:component-content/>
-        </var:if>
-      </form>
+    <div class="dragHandle" id="verticalDragHandle"><!-- space --></div>
 
-      <var:string value="errorAlertJavaScript" const:escapeHTML="NO" />
-    </var:if>
-    
-    <var:if condition="hideFrame">
-      <var:component-content/>
-    </var:if>
+    <div id="rightPanel">
+      <var:component className="UIxMailFilterPanel" qualifier="qualifier" />
+      
+        <div id="mailboxContent"><!-- space --></div>
+        <div class="dragHandle" id="rightDragHandle"><!-- space --></div>
+        <div id="messageContent"><!-- space --></div>
+        <script type="text/javascript">
+          initMailboxSelection('<var:string value="mailFolderName" />');
+        </script>
+      </div>
+    </form>
+
+    <var:string value="errorAlertJavaScript" const:escapeHTML="NO" />
   </var:component>
diff --git a/UI/Templates/MailerUI/UIxMailPopupView.wox b/UI/Templates/MailerUI/UIxMailPopupView.wox
new file mode 100644
index 000000000..6b892b56a
--- /dev/null
+++ b/UI/Templates/MailerUI/UIxMailPopupView.wox
@@ -0,0 +1,11 @@
+<?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"
+    const:popup="YES">
+    <var:component className="UIxMailView" />
+  </var:component>
diff --git a/UI/Templates/MailerUI/UIxMailSplashView.wox b/UI/Templates/MailerUI/UIxMailSplashView.wox
new file mode 100644
index 000000000..26cef689e
--- /dev/null
+++ b/UI/Templates/MailerUI/UIxMailSplashView.wox
@@ -0,0 +1,43 @@
+<?xml version='1.0' standalone='yes'?>
+  <div style="padding: 1em;"
+    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:rsrc="OGo:url"
+    xmlns:label="OGo:label">
+    <h2>
+      SOGo Mail - <var:string value="objectTitle" />
+      
+      <var:if condition="clientObject.isSharedAccount">
+        <var:string label:value="Shared Account: " />
+      </var:if>
+      
+    </h2>
+    <var:if condition="clientObject.isSharedAccount">
+      <div>
+        <var:string label:value="Share: " />
+        <var:string value="clientObject.sharedAccountName" />
+      </div>
+    </var:if>
+    
+    <h3>Email</h3>
+    <p>
+      <a href="INBOX/" onclick="initMailboxSelection(currentMailbox + '/INBOX'); openMailbox(currentMailbox + '/INBOX'); return false;"><img rsrc:src="read-messages.png" /><var:string label:value="Read messages" /></a><br />
+      <a href="#" onclick="clickedCompose(this);"><img rsrc:src="write-message.png" /><var:string label:value="Write a new message" /></a><br />
+    </p>
+
+    <h3>Accounts</h3>
+    <p>
+      <a href=""><img rsrc:src="account-settings.png" />View settings for this account</a><br />
+      <a href=""><img rsrc:src="create-account.png" />Create a new account</a> [TBD: not in Agenor]<br />
+    </p>
+    
+    <h3>Advanced Features</h3>
+    <p>
+      <a href=""><img rsrc:src="search-messages.png" />Search messages</a><br />
+      <a href=""><img rsrc:src="manage-filters.png" />Manage message filters</a><br />
+      <a href=""><img rsrc:src="manage-imap.png" />Manage folder subscriptions</a><br />
+      <a href=""><img rsrc:src="offline-settings.png" />Offline settings</a> [TBD: not in Agenor]<br />
+    </p>
+  </div>
diff --git a/UI/Templates/MailerUI/UIxMailTree.wox b/UI/Templates/MailerUI/UIxMailTree.wox
index 250e87f8b..1bcfe7d1b 100644
--- a/UI/Templates/MailerUI/UIxMailTree.wox
+++ b/UI/Templates/MailerUI/UIxMailTree.wox
@@ -7,7 +7,7 @@
     xmlns:label="OGo:label">
     <!-- TODO: extend treeview to use CSS -->
 
-    <script type="text/javascript" rsrc:src="dtree.js"> <!-- space --></script>
+    <script type="text/javascript" rsrc:src="dtree.js"><!-- space --></script>
     <script type="text/javascript">
       d = new dTree('d');
       d.config.folderLlinks = true;
@@ -37,36 +37,4 @@
       document.write(d);
     </script>
 <!--    <noscript>
-      <var:treeview
-	list="rootNodes" item="item" sublist="item.children"
-	zoom="item.isPathNode"
-	const:iconWidth       = "17"
-	const:plusIcon        = "tbtv_plus_17x17.gif"
-	const:minusIcon       = "tbtv_minus_17x17.gif"
-	const:lineIcon        = "tbtv_line_17x17.gif"
-	const:cornerIcon      = "tbtv_corner_17x17.gif"
-	const:junctionIcon    = "tbtv_junction_17x17.gif"
-	const:leafIcon        = "tbtv_leaf_corner_17x17.gif"
-	const:leafCornerIcon  = "tbtv_leaf_corner_17x17.gif"
-	const:cornerPlusIcon  = "tbtv_corner_plus_17x17.gif"
-	const:cornerMinusIcon = "tbtv_corner_minus_17x17.gif"
-	const:spaceIcon       = "empty.gif"
-	>
-	<var:tree-data const:isTreeElement="YES"
-	  var:icon="item.iconName"
-	  var:cornerIcon="item.iconName"
-	  var:treeLink="item.link"
-	  ><a var:href="item.link"
-	    ><span class="treecell"
-	      ><var:if condition="item.isActiveNode"
-		><b><var:string value="item.title" /></b
-                  ></var:if
-                ><var:if condition="item.isActiveNode" const:negate="YES"
-		><var:string value="item.title"
-                  /></var:if
-                ></span
-              ></a
-            ></var:tree-data>
-      </var:treeview>
-    </noscript> -->
   </div>
diff --git a/UI/Templates/MailerUI/UIxMailTreeBlockJS.wox b/UI/Templates/MailerUI/UIxMailTreeBlockJS.wox
index 0ffd12900..d63a075a5 100644
--- a/UI/Templates/MailerUI/UIxMailTreeBlockJS.wox
+++ b/UI/Templates/MailerUI/UIxMailTreeBlockJS.wox
@@ -3,5 +3,5 @@
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:var="http://www.skyrix.com/od/binding"
     xmlns:const="http://www.skyrix.com/od/constant"
-    ><var:string value="treeObjectName" />.add(<var:string value="item.serial" />, <var:string value="item.parent" />, '<var:string value="item.title" />', <var:string value="item.hasChildren" />, '#', 'onMailboxTreeItemClick(this);', '<var:string value="item.name" />', '<var:string value="item.folderType" />', '', '', '<var:string value="iconName" />', '<var:string value="iconName" />');
+    ><var:string value="treeObjectName" />.add(<var:string value="item.serial" />, <var:string value="item.parent" />, '<var:string value="item.title" />', <var:string value="item.hasChildren" />, '#', '<var:string value="item.name" />', '<var:string value="item.folderType" />', '', '', '<var:string value="iconName" />', '<var:string value="iconName" />');
   </container>
diff --git a/UI/Templates/MailerUI/UIxMailView.wox b/UI/Templates/MailerUI/UIxMailView.wox
index dd4f45e20..07966734c 100644
--- a/UI/Templates/MailerUI/UIxMailView.wox
+++ b/UI/Templates/MailerUI/UIxMailView.wox
@@ -1,84 +1,75 @@
 <?xml version='1.0' standalone='yes'?>
-  <container
-    xmlns="http://www.w3.org/1999/xhtml"
+  <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:uix="OGo:uix"
     xmlns:rsrc="OGo:url"
-    xmlns:label="OGo:label"
-    >
-    <var:if condition="clientObject.isKolabObject" const:negate="YES">
-      <!-- 
-      Note: We cannot make this section static (like the toolbar) because the CC
-      list has a dynamic height (would require some tricky JavaScript).
-      -->
-      <table class="mailer_fieldtable">
+    xmlns:label="OGo:label">
+    <table class="mailer_fieldtable">
+      <tr class="mailer_fieldrow">
+        <td class="mailer_fieldname" ><var:string label:value="Subject"/>:</td>
+        <td class="mailer_subjectfieldvalue">
+          <var:string value="clientObject.subject"
+            formatter="context.mailSubjectFormatter"/>
+        </td>
+      </tr>
+      <tr class="mailer_fieldrow">
+        <td class="mailer_fieldname" ><var:string label:value="From"/>:</td>
+        <td class="mailer_fieldvalue">
+          <var:foreach list="clientObject.fromEnvelopeAddresses"
+            item="currentAddress">
+            <a var:href="currentAddressLink" onclick="return onMenuClick(event, 'addressMenu');" oncontextmenu="onMenuClick(event, 'addressMenu');">
+              <var:string value="currentAddress"
+                formatter="context.mailEnvelopeFullAddressFormatter" /></a>
+          </var:foreach>
+        </td>
+      </tr>
+      <tr class="mailer_fieldrow">
+        <td class="mailer_fieldname" ><var:string label:value="Date"/>:</td>
+        <td class="mailer_fieldvalue">
+          <var:string value="clientObject.date" 
+            formatter="context.mailDateFormatter"/>
+
+          <!-- TODO:
+          (<a rsrc:href="tbird_073_viewer.png">screenshot</a>)
+          -->
+        </td>
+      </tr>
+
+      <tr class="mailer_fieldrow">
+        <td class="mailer_fieldname"><var:string label:value="To"/>:</td>
+        <td class="mailer_fieldvalue">
+          <var:foreach list="clientObject.toEnvelopeAddresses"
+            item="currentAddress"
+            ><a var:href="currentAddressLink"
+              onmousedown="return false;"
+              onclick="return onMenuClick(event, 'addressMenu');"
+              oncontextmenu="onMenuClick(event, 'addressMenu');">
+              <var:string value="currentAddress"
+                formatter="context.mailEnvelopeFullAddressFormatter"
+                /></a>
+          </var:foreach>
+        </td>
+      </tr>
+      <var:if condition="hasCC">
         <tr class="mailer_fieldrow">
-          <td class="mailer_fieldname" ><var:string label:value="Subject"/>:</td>
-          <td class="mailer_subjectfieldvalue">
-            <var:string value="clientObject.subject"
-              formatter="context.mailSubjectFormatter"/>
-          </td>
-        </tr>
-        <tr class="mailer_fieldrow">
-          <td class="mailer_fieldname" ><var:string label:value="From"/>:</td>
+          <td class="mailer_fieldname"><var:string label:value="CC"/>:</td>
           <td class="mailer_fieldvalue">
-            <var:foreach list="clientObject.fromEnvelopeAddresses"
+            <var:foreach list="clientObject.ccEnvelopeAddresses" 
               item="currentAddress">
-              <a var:href="currentAddressLink" onclick="return onMenuClick(event, 'addressMenu');" oncontextmenu="onMenuClick(event, 'addressMenu');">
-                <var:string value="currentAddress"
-                  formatter="context.mailEnvelopeFullAddressFormatter" /></a>
-            </var:foreach>
-          </td>
-        </tr>
-        <tr class="mailer_fieldrow">
-          <td class="mailer_fieldname" ><var:string label:value="Date"/>:</td>
-          <td class="mailer_fieldvalue">
-            <var:string value="clientObject.date" 
-              formatter="context.mailDateFormatter"/>
-
-            <!-- TODO:
-            (<a rsrc:href="tbird_073_viewer.png">screenshot</a>)
-            -->
-          </td>
-        </tr>
-
-        <tr class="mailer_fieldrow">
-          <td class="mailer_fieldname"><var:string label:value="To"/>:</td>
-          <td class="mailer_fieldvalue">
-            <var:foreach list="clientObject.toEnvelopeAddresses"
-              item="currentAddress"
-              ><a var:href="currentAddressLink"
-                onmousedown="return false;"
+              <a var:href="currentAddressLink"
                 onclick="return onMenuClick(event, 'addressMenu');"
-                oncontextmenu="onMenuClick(event, 'addressMenu');">
-                <var:string value="currentAddress"
+                oncontextmenu="onMenuClick(event, 'addressMenu');"
+                onmousedown="return false;"
+                ><var:string value="currentAddress"
                   formatter="context.mailEnvelopeFullAddressFormatter"
                   /></a>
+              <!-- TODO: better to use li+CSS -->
             </var:foreach>
           </td>
         </tr>
-        <var:if condition="hasCC">
-          <tr class="mailer_fieldrow">
-            <td class="mailer_fieldname"><var:string label:value="CC"/>:</td>
-            <td class="mailer_fieldvalue">
-              <var:foreach list="clientObject.ccEnvelopeAddresses" 
-                item="currentAddress">
-                <a var:href="currentAddressLink"
-                  onclick="return onMenuClick(event, 'addressMenu');"
-                  oncontextmenu="onMenuClick(event, 'addressMenu');"
-                  onmousedown="return false;"
-                  ><var:string value="currentAddress"
-                    formatter="context.mailEnvelopeFullAddressFormatter"
-                    /></a>
-                <!-- TODO: better to use li+CSS -->
-              </var:foreach>
-            </td>
-          </tr>
-        </var:if>
-
-      </table>
-    </var:if><!-- !Kolab -->
+      </var:if>
+    </table>
 
     <div class="mailer_mailcontent"
       oncontextmenu="onMenuClick(event, 'messageContentMenu');">
diff --git a/UI/Templates/MailerUI/UIxMailViewContainer.wox b/UI/Templates/MailerUI/UIxMailViewContainer.wox
deleted file mode 100644
index 9d7f1cfb0..000000000
--- a/UI/Templates/MailerUI/UIxMailViewContainer.wox
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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:rsrc="OGo:url"
-    xmlns:label="OGo:label"
-    className="UIxMailMainFrame"
-    title="panelTitle"
-    const:popup="YES"
-    >
-    <var:if condition="hideFrame" const:negate="YES">
-  <!-- TODO: refactor address rendering into an own component(/element) -->
-
-  <!-- TODO: can we create own clientObject's for Kolab entities? Probably
-             not (since we would always need to fetch the header during 
-             lookup). It would work for 'annotated' folders though.
-       TODO: for Kolab we need a completely different viewer with a different
-             toolbar etc. And for Kolab we would need a different list viewer
-             as well ...
-    -->
-      <div class="messageContent">
-        <var:component className="UIxMailView" />
-      </div>
-      <script language="JavaScript">
-        if (window.opener) {
-        markMailReadInWindow(window.opener, 
-        '<var:string value="clientObject.nameInContainer"/>');
-        }
-      </script>
-    </var:if>
-
-    <var:if condition="hideFrame">
-      <var:component className="UIxMailView" />
-    </var:if>
-  </var:component>
diff --git a/UI/Templates/MailerUI/UIxSieveEditor.wox b/UI/Templates/MailerUI/UIxSieveEditor.wox
index 56f4f5028..138ddad1a 100644
--- a/UI/Templates/MailerUI/UIxSieveEditor.wox
+++ b/UI/Templates/MailerUI/UIxSieveEditor.wox
@@ -6,7 +6,7 @@
   xmlns:uix="OGo:uix"
   xmlns:rsrc="OGo:url"
   xmlns:label="OGo:label"
-  className="UIxMailMainFrame"
+  className="UIxPageFrame"
   title="panelTitle"
   const:hideFolderTree="1"
 >