diff --git a/UI/MailerUI/UIxMailEditor.m b/UI/MailerUI/UIxMailEditor.m
index 0c2063d72..b41001bd4 100644
--- a/UI/MailerUI/UIxMailEditor.m
+++ b/UI/MailerUI/UIxMailEditor.m
@@ -276,7 +276,7 @@ static NSArray      *infoKeys            = nil;
 - (void)_presetFromBasedOnAccountsQueryParameter {
   /* preset the from field to the primary identity of the given account */
   /* Note: The compose action sets the 'accounts' query parameter */
-  NSString         *accountID;
+  NSString         *accountID, *mailto;
   SOGoMailAccounts *accounts;
   SOGoMailAccount  *account;
   SOGoMailIdentity *identity;
diff --git a/UI/Templates/ContactsUI/UIxContactsListView.wox b/UI/Templates/ContactsUI/UIxContactsListView.wox
index 62555d1ef..2c21bd28e 100644
--- a/UI/Templates/ContactsUI/UIxContactsListView.wox
+++ b/UI/Templates/ContactsUI/UIxContactsListView.wox
@@ -1,172 +1,66 @@
 <?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="UIxPageFrame"
-  title="name"
->
-  <style>
-    table.contacttableview {
-      text-decoration:  none;
-      font-family:      Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
-      font-size:        9pt;
-      color:            #000000;
-    }
-    table.contacttableview th {
-      text-align: left;
-    }
-    input.searchfield {
-      font-size:        8pt;
-    }
-  </style>
-
-  <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5"
-         width="100%">
-    <tr>
-      <td class="wintitle">
-        <table cellpadding="0" cellspacing="0" width="100%">
-          <tr>
-            <td width="5"/>
-            <td class="wintitle">
-              <!-- localize me -->
-              <span class="window_label"
-              ><var:string label:value="Addressbook"/></span>
-            </td>
-            <td width="36" align="right" valign="center">
-              <var:component className="UIxWinClose"/>
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-    <tr>
-      <td id="skywinbodycell" class="wincontent">
-       <form name="searchform" var:href="view" var:_sort="sortKey"
-             method="GET">
-        <table border="0" width="100%" cellpadding="0" cellspacing="0">
-          <tr>
-            <td colspan="2">
-                <table border="0" cellpadding="4" width="100%" cellspacing="0">
-                  <tr bgcolor="#e8e8e0">
-                    <td align="left">
-                      <input type="text" name="search" class="searchfield" 
-                             var:value="searchText" />
-                    </td>
-                    <td align="right">
-                      <table border="0" cellpadding="0" cellspacing="1">
-                        <tr>
-                          <td class="button_auto_env"
-                              nowrap="true" valign="middle" align="center">
-                            <a class="button_auto"
-                               href="new"
-                               var:queryDictionary="queryParameters"
-                            ><var:string label:value="new"/></a>
-                          </td>
-                        </tr>
-                      </table>
-                    </td>
-                  </tr>
-                </table>
-
-                <!-- the content -->
-                <table border="0" width="100%" class="contacttableview">
-                  <tr>
-                    <!-- localize -->
-                    <th>
-                      <var:if condition="sortKey" const:value="sn"
-                              const:negate="YES">
-                        <a href="view"
-                           _sort="sn"
-                           var:_search="searchText"
-                        ><var:string label:value="Lastname" /></a>
-                      </var:if>
-                      <var:if condition="sortKey" const:value="sn">
-                        <i><var:string label:value="Lastname" /></i>
-                      </var:if>
-                    </th>
-                    <th>
-                      <var:if condition="sortKey" const:value="givenname"
-                              const:negate="YES">
-                        <a href="view"
-                           _sort="givenname"
-                           var:_search="searchText"
-                        ><var:string label:value="Firstname" /></a>
-                      </var:if>
-                      <var:if condition="sortKey" const:value="givenname">
-                        <i><var:string label:value="Firstname" /></i>
-                      </var:if>
-                    </th>
-                    <th>
-                      <var:if condition="sortKey" const:value="mail"
-                              const:negate="YES">
-                        <a href="view"
-                           _sort="mail"
-                           var:_search="searchText"
-                        ><var:string label:value="EMail" /></a>
-                      </var:if>
-                      <var:if condition="sortKey" const:value="mail">
-                        <i><var:string label:value="EMail" /></i>
-                      </var:if>
-                    </th>
-                    <th>
-		            <var:string label:value="Phone" />
-                    </th>
-                    <th>
-		            <var:string label:value="Location" />
-                    </th>
-                  </tr>
-                  <var:foreach list="contactInfos" item="contact">
-                    <tr>
-                      <td>
-                        <a var:href="contact.c_name"
-                           ><var:string value="contact.sn" /></a>
-                      </td>
-                      <td><var:string value="contact.givenname"       /></td>
-                      <td><var:string value="contact.mail"            /></td>
-                      <td><var:string value="contact.telephonenumber" /></td>
-                      <td><var:string value="contact.l"               /></td>
-                    </tr>
-                  </var:foreach>
-                </table>
-            </td>
-          </tr>
-
-          <tr bgcolor="#F5F5E9">
-            <td align="left" width="10">
-              <var:entity const:name="nbsp"/>
-            </td>
-            <td align="right">
-              <img border="0" alt=""
-                   rsrc:src="CommonUI.SOGo/corner_right.gif"
+  <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="UIxContactsListViewContainer"
+    title="name"
+    >
+    <var:component className="UIxContactsFilterPanel" qualifier="qualifier" />
+    
+    <!-- the content -->
+    <table border="0" width="100%" id="contactsList" multiselect="yes">
+      <tbody>
+        <tr class="tableview">
+          <!-- localize -->
+          <td class="tbtv_headercell">
+            <var:component className="UIxSortableTableHeader"
+              label:label="Lastname"
+              const:sortKey="sn"
+              const:href="view"
+              var:queryDictionary="context.request.formValues"
               />
-            </td>
-          </tr>
-          <tr>
-            <td colspan="2" bgcolor="#F5F5E9">
-              <table border="0" width="100%" cellpadding="10" cellspacing="0">
-                <tr/>
-              </table>
-            </td>
-          </tr>
-        </table>
-       </form>
-      </td>
-    </tr>
-  </table>
-  
-<!-- todo: need onload for this to work ...
-  <script language="JavaScript">
-    document.searchform.search.select();
-    document.searchform.search.focus();
-  </script>
--->
+          </td>
+          <td class="tbtv_headercell">
+            <var:component className="UIxSortableTableHeader"
+              label:label="Firstname"
+              const:sortKey="givenname"
+              const:href="view"
+              var:queryDictionary="context.request.formValues"
+              />
+          </td>
+          <td class="tbtv_headercell">
+            <var:component className="UIxSortableTableHeader"
+              label:label="EMail"
+              const:sortKey="mail"
+              const:href="view"
+              var:queryDictionary="context.request.formValues"
+              />
+          </td>
+          <td class="tbtv_headercell">
+            <var:string label:value="Phone" />
+          </td>
+          <td class="tbtv_headercell">
+            <var:string label:value="Location" />
+          </td>
+        </tr>
 
-  <var:if condition="isUIxDebugEnabled">
-    <hr />
-    <small>clientObject: <var:string value="clientObject" /></small>
-  </var:if>
-</var:component>
+        <var:foreach list="contactInfos" item="contact">
+          <tr class="tableview"
+            var:id="contact.c_name"
+            onclick="return onRowClick(event);"
+            ondblclick="return onContactRowDblClick(event, this);"
+            oncontextmenu="return onContactContextMenu(event, this);">
+            <td onmousedown="return false;"><var:string value="contact.sn" /></td>
+            <td onmousedown="return false;"><var:string value="contact.givenname"       /></td>
+            <td onmousedown="return false;"><var:string value="contact.mail"            /></td>
+            <td onmousedown="return false;"><var:string value="contact.telephonenumber" /></td>
+            <td onmousedown="return false;"><var:string value="contact.l"               /></td>
+          </tr>
+        </var:foreach>
+      </tbody>
+    </table>
+  </var:component>
diff --git a/UI/Templates/MailerUI/UIxMailListView.wox b/UI/Templates/MailerUI/UIxMailListView.wox
index d184a0006..1ccccdfe3 100644
--- a/UI/Templates/MailerUI/UIxMailListView.wox
+++ b/UI/Templates/MailerUI/UIxMailListView.wox
@@ -23,7 +23,7 @@
               height="14"
               /></td
             ><td class="tbtv_headercell tbtv_subject_headercell"
-            ><var:component className="UIxMailSortableTableHeader"
+            ><var:component className="UIxSortableTableHeader"
               label:label="Subject"
               const:sortKey="subject"
               const:href="view"
@@ -31,14 +31,14 @@
               /></td
             ><td class="tbtv_headercell"
             ><var:if condition="showToAddress" const:negate="YES"
-              ><var:component className="UIxMailSortableTableHeader"
+              ><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="UIxMailSortableTableHeader"
+              ><var:component className="UIxSortableTableHeader"
                 label:label="To"
                 const:sortKey="to"
                 const:href="view"
@@ -49,7 +49,7 @@
             ><img rsrc:src="title_read_14x14.png" width="14" height="14"
               /></td
             ><td class="tbtv_headercell"
-            ><var:component className="UIxMailSortableTableHeader"
+            ><var:component className="UIxSortableTableHeader"
               label:label="Date"
               const:sortKey="date"
               const:href="view"