diff --git a/UI/Templates/ContactsUI/UIxContactEditor.wox b/UI/Templates/ContactsUI/UIxContactEditor.wox
index c84985ed2..5a1a6f89d 100644
--- a/UI/Templates/ContactsUI/UIxContactEditor.wox
+++ b/UI/Templates/ContactsUI/UIxContactEditor.wox
@@ -1,320 +1,322 @@
 <?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="name"
->
+  <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="name"
+    const:popup="YES"
 
-  <var:js-stringtable const:framework="ContactsUI.SOGo"
-                      const:identifier="labels" />
-  
-  <style>
-    table.editsec {
+    >
+
+    <var:js-stringtable const:framework="ContactsUI.SOGo"
+      const:identifier="labels" />
+    
+    <style>
+      table.editsec {
       background-color: #e8e8e0;
       width:            100%;
-    }
-  </style>
+      }
+    </style>
 
-  <form var:href="clientObject.baseURL" name="editform"
-        onsubmit="return validateContactEditor()">
-    <table cellspacing="0" cellpadding="5" width="100%">
-      <tr>
-        <td>
-          <table cellpadding="0" cellspacing="0" width="100%">
-            <tr>
-              <td width="5"/>
-              <td class="window_label">
-                <var:string label:value="Contact editor" /></td>
-              <td width="36" align="right" valign="center">
-                <var:component className="UIxWinClose" />
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <var:if condition="hasErrorText">
-            <div style="background-color: #AA0000;">
-	      <var:string value="errorText" />
-            </div>
-            <hr />
-          </var:if>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <var:if condition="clientObject.isVCardRecord">
-            <h4>Editing of vCards is not yet supported!</h4>
-          </var:if>
-
-  <var:if condition="clientObject.isVCardRecord" const:negate="1">
-          <table border="0" cellpadding="2" cellspacing="0" class="editsec">
-            <tr>
-              <td align="right" colspan="2">
-<!-- superflous without Anais
-                <var:component className="AnaisSelector"
-                               const:windowId="UIxContactTemplates"
-                               label:title="Copy from Anais"
-                               const:callback="copyContact"
-                               const:extraAttributes="cn, givenName,telephoneNumber,facsimileTelephoneNumber,mobile,postalAddress,homePostalAddress,departmentNumber,l"
-                />
--->
-              </td>
-            </tr>
-            <tr>
-              <td align="left" colspan="2">
-                <span class="aptview_title">
-                  <var:string label:value="Common" />
-                </span>
-              </td>
-            </tr>
-            <tr valign="top">
-              <td align="right" width="15%">
-                <span class="aptview_text">
-                  <var:string label:value="Lastname" />:
-                </span>
-              </td>
-              <td align="left" bgcolor="#FFFFF0">
-                <span class="aptview_text">
-                  <input type="text" name="sn" id="sn"
-                         var:value="snapshot.sn" size="60" />
-                </span>
-              </td>
-            </tr>
-            <tr valign="top">
-              <td align="right" width="15%">
-                <span class="aptview_text">
-                  <var:string label:value="Firstname" />:
-                </span>
-              </td>
-              <td align="left" bgcolor="#FFFFF0">
-                <span class="aptview_text">
-                  <input type="hidden" name="cn" id="cn" var:value="anaisCN"/>
-                  <input type="text" name="givenName" id="givenName"
-                         var:value="snapshot.givenName" size="60" />
-                </span>
-              </td>
-            </tr>
-          </table>
-          <br />
-
-          <table border="0" cellpadding="2" cellspacing="0" class="editsec">
-            <tr>
-              <td align="left" colspan="2">
-                <span class="aptview_title">
-                  <var:string label:value="Phones" />
-                </span>
-              </td>
-            </tr>
-            <tr valign="top">
-              <td align="right" width="15%">
-                <span class="aptview_text">
-                  <var:string label:value="OfficePhone" />:
-                </span>
-              </td>
-              <td align="left" bgcolor="#FFFFF0">
-                <span class="aptview_text">
-                  <input type="text"
-                         name="telephoneNumber"
-                         id="telephoneNumber"
-                         var:value="snapshot.telephoneNumber"
-                         size="60"
-                  />
-                </span>
-              </td>
-            </tr>
-            <tr valign="top">
-              <td align="right" width="15%">
-                <span class="aptview_text">
-                  <var:string label:value="HomePhone" />:
-                </span>
-              </td>
-              <td align="left" bgcolor="#FFFFF0">
-                <span class="aptview_text">
-                  <input type="text"
-                         name="homeTelephoneNumber"
-                         id="homeTelephoneNumber"
-                         var:value="snapshot.homeTelephoneNumber"
-                         size="60"
-                  />
-                </span>
-              </td>
-            </tr>
-            <tr valign="top">
-              <td align="right" width="15%">
-                <span class="aptview_text">
-                  <var:string label:value="MobilePhone" />:
-                </span>
-              </td>
-              <td align="left" bgcolor="#FFFFF0">
-                <span class="aptview_text">
-                  <!-- pamela.schema defines this as 'mobile',
-                       NOT 'mobileTelephoneNumber'
-                  -->
-                  <input type="text" name="mobile" id="mobile"
-                         var:value="snapshot.mobile" size="60" />
-                </span>
-              </td>
-            </tr>
-            <tr valign="top">
-              <td align="right" width="15%">
-                <span class="aptview_text">
-                  <var:string label:value="Fax" />:
-                </span>
-              </td>
-              <td align="left" bgcolor="#FFFFF0">
-                <span class="aptview_text">
-                  <input type="text"
-                         name="facsimileTelephoneNumber"
-                         id="facsimileTelephoneNumber"
-                         var:value="snapshot.facsimileTelephoneNumber"
-                         size="60"
-                  />
-                </span>
-              </td>
-            </tr>
-          </table>
-          <br />
-
-          <table border="0" cellpadding="2" cellspacing="0" class="editsec">
-            <tr>
-              <td align="left" colspan="2">
-                <span class="aptview_title">
-                  <var:string label:value="Addresses" />
-                </span>
-              </td>
-            </tr>
-            <tr valign="top">
-              <td align="right" width="15%">
-                <span class="aptview_text">
-                  <var:string label:value="Postal" />:
-                </span>
-              </td>
-              <td align="left" bgcolor="#FFFFF0">
-                <span class="aptview_text">
-                  <textarea name="postalAddress"
-                            id="postalAddress"
-                            rows="3"
-                            cols="60"
-                            wrap="physical"
-                            var:value="snapshot.postalAddress"
-                  />
-                </span>
-              </td>
-            </tr>
-            <tr valign="top">
-              <td align="right" width="15%">
-                <span class="aptview_text">
-                  <var:string label:value="Home" />:
-                </span>
-              </td>
-              <td align="left" bgcolor="#FFFFF0">
-                <span class="aptview_text">
-                  <textarea name="homePostalAddress"
-                            rows="3"
-                            cols="60"
-                            wrap="physical"
-                            var:value="snapshot.homePostalAddress"
-                  />
-                </span>
-              </td>
-            </tr>
-          </table>
-          <br />
-          <table border="0" cellpadding="2" cellspacing="0" class="editsec">
-            <tr>
-              <td align="left" colspan="2">
-                <span class="aptview_title">
-                  <var:string label:value="Extended" />
-                </span>
-              </td>
-            </tr>
-            <tr valign="top">
-              <td align="right" width="15%">
-                <span class="aptview_text">
-                  <var:string label:value="EMail" />:
-                </span>
-              </td>
-              <td align="left" bgcolor="#FFFFF0">
-                <span class="aptview_text">
-                  <input type="text" name="mail" id="email"
-                         var:value="snapshot.mail" size="60" />
-                </span>
-              </td>
-            </tr>
-            <tr valign="top">
-              <td align="right" width="15%">
-                <span class="aptview_text">
-                  <var:string label:value="Unit" />:
-                </span>
-              </td>
-              <td align="left" bgcolor="#FFFFF0">
-                <span class="aptview_text">
-                  <input type="text" name="departmentNumber"
-                         id="departmentNumber"
-                         var:value="snapshot.departmentNumber" size="60" />
-                </span>
-              </td>
-            </tr>
-            <tr valign="top">
-              <td align="right" width="15%">
-                <span class="aptview_text">
-                  <var:string label:value="Location" />:
-                </span>
-              </td>
-              <td align="left" bgcolor="#FFFFF0">
-                <span class="aptview_text">
-                  <input type="text" name="l" id="l" var:value="snapshot.l"
-                         size="60" />
-                </span>
-              </td>
-            </tr>
-            <tr valign="top">
-              <td align="right" width="15%">
-                <span class="aptview_text">
-                  <var:string label:value="URL" />:
-                </span>
-              </td>
-              <td align="left" bgcolor="#FFFFF0">
-                <span class="aptview_text">
-                  <input type="text" name="labeledURI" 
-			 var:value="snapshot.labeledURI" size="60" />
-                </span>
-              </td>
-            </tr>
-          </table>
-  </var:if>
-        </td>
-      </tr>
-  <var:if condition="clientObject.isVCardRecord" const:negate="1">
-      <tr>
-        <td>
-            <input type="submit" label:value="Save" name="save:method" />
-            <span class="button_auto_env"
-            ><a href="../view"
-                var:queryDictionary="queryParameters"
-                class="button_auto"
-             ><var:string label:value="Cancel" /></a></span>
-            <var:if condition="isUIxDebugEnabled">
-              <input type="submit" value="Test" name="test:method" />
+    <form var:href="clientObject.baseURL" name="editform"
+      onsubmit="return validateContactEditor()">
+      <table cellspacing="0" cellpadding="5" width="100%">
+        <tr>
+          <td>
+            <table cellpadding="0" cellspacing="0" width="100%">
+              <tr>
+                <td width="5"/>
+                <td class="window_label">
+                  <var:string label:value="Contact editor" /></td>
+                <td width="36" align="right" valign="center">
+                  <var:component className="UIxWinClose" />
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <var:if condition="hasErrorText">
+              <div style="background-color: #AA0000;">
+                <var:string value="errorText" />
+              </div>
+              <hr />
+            </var:if>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <var:if condition="clientObject.isVCardRecord">
+              <h4>Editing of vCards is not yet supported!</h4>
             </var:if>
-        </td>
-      </tr>
-  </var:if>
-    </table>
-    
-    <input type="hidden" name="content" var:value="contentString" />
-  </form>
 
-  <var:if condition="isUIxDebugEnabled">
-    <small>
-      <hr />
-      clientObject: <var:string value="clientObject" />
-    </small>
-  </var:if>
-</var:component>
+            <var:if condition="clientObject.isVCardRecord" const:negate="1">
+              <table border="0" cellpadding="2" cellspacing="0" class="editsec">
+                <tr>
+                  <td align="right" colspan="2">
+                    <!-- superflous without Anais
+                    <var:component className="AnaisSelector"
+                    const:windowId="UIxContactTemplates"
+                    label:title="Copy from Anais"
+                    const:callback="copyContact"
+                    const:extraAttributes="cn, givenName,telephoneNumber,facsimileTelephoneNumber,mobile,postalAddress,homePostalAddress,departmentNumber,l"
+                    />
+                    -->
+                  </td>
+                </tr>
+                <tr>
+                  <td align="left" colspan="2">
+                    <span class="aptview_title">
+                      <var:string label:value="Common" />
+                    </span>
+                  </td>
+                </tr>
+                <tr valign="top">
+                  <td align="right" width="15%">
+                    <span class="aptview_text">
+                      <var:string label:value="Lastname" />:
+                    </span>
+                  </td>
+                  <td align="left" bgcolor="#FFFFF0">
+                    <span class="aptview_text">
+                      <input type="text" name="sn" id="sn"
+                        var:value="snapshot.sn" size="60" />
+                    </span>
+                  </td>
+                </tr>
+                <tr valign="top">
+                  <td align="right" width="15%">
+                    <span class="aptview_text">
+                      <var:string label:value="Firstname" />:
+                    </span>
+                  </td>
+                  <td align="left" bgcolor="#FFFFF0">
+                    <span class="aptview_text">
+                      <input type="hidden" name="cn" id="cn" var:value="anaisCN"/>
+                      <input type="text" name="givenName" id="givenName"
+                        var:value="snapshot.givenName" size="60" />
+                    </span>
+                  </td>
+                </tr>
+              </table>
+              <br />
+
+              <table border="0" cellpadding="2" cellspacing="0" class="editsec">
+                <tr>
+                  <td align="left" colspan="2">
+                    <span class="aptview_title">
+                      <var:string label:value="Phones" />
+                    </span>
+                  </td>
+                </tr>
+                <tr valign="top">
+                  <td align="right" width="15%">
+                    <span class="aptview_text">
+                      <var:string label:value="OfficePhone" />:
+                    </span>
+                  </td>
+                  <td align="left" bgcolor="#FFFFF0">
+                    <span class="aptview_text">
+                      <input type="text"
+                        name="telephoneNumber"
+                        id="telephoneNumber"
+                        var:value="snapshot.telephoneNumber"
+                        size="60"
+                        />
+                    </span>
+                  </td>
+                </tr>
+                <tr valign="top">
+                  <td align="right" width="15%">
+                    <span class="aptview_text">
+                      <var:string label:value="HomePhone" />:
+                    </span>
+                  </td>
+                  <td align="left" bgcolor="#FFFFF0">
+                    <span class="aptview_text">
+                      <input type="text"
+                        name="homeTelephoneNumber"
+                        id="homeTelephoneNumber"
+                        var:value="snapshot.homeTelephoneNumber"
+                        size="60"
+                        />
+                    </span>
+                  </td>
+                </tr>
+                <tr valign="top">
+                  <td align="right" width="15%">
+                    <span class="aptview_text">
+                      <var:string label:value="MobilePhone" />:
+                    </span>
+                  </td>
+                  <td align="left" bgcolor="#FFFFF0">
+                    <span class="aptview_text">
+                      <!-- pamela.schema defines this as 'mobile',
+                      NOT 'mobileTelephoneNumber'
+                      -->
+                      <input type="text" name="mobile" id="mobile"
+                        var:value="snapshot.mobile" size="60" />
+                    </span>
+                  </td>
+                </tr>
+                <tr valign="top">
+                  <td align="right" width="15%">
+                    <span class="aptview_text">
+                      <var:string label:value="Fax" />:
+                    </span>
+                  </td>
+                  <td align="left" bgcolor="#FFFFF0">
+                    <span class="aptview_text">
+                      <input type="text"
+                        name="facsimileTelephoneNumber"
+                        id="facsimileTelephoneNumber"
+                        var:value="snapshot.facsimileTelephoneNumber"
+                        size="60"
+                        />
+                    </span>
+                  </td>
+                </tr>
+              </table>
+              <br />
+
+              <table border="0" cellpadding="2" cellspacing="0" class="editsec">
+                <tr>
+                  <td align="left" colspan="2">
+                    <span class="aptview_title">
+                      <var:string label:value="Addresses" />
+                    </span>
+                  </td>
+                </tr>
+                <tr valign="top">
+                  <td align="right" width="15%">
+                    <span class="aptview_text">
+                      <var:string label:value="Postal" />:
+                    </span>
+                  </td>
+                  <td align="left" bgcolor="#FFFFF0">
+                    <span class="aptview_text">
+                      <textarea name="postalAddress"
+                        id="postalAddress"
+                        rows="3"
+                        cols="60"
+                        wrap="physical"
+                        var:value="snapshot.postalAddress"
+                        />
+                    </span>
+                  </td>
+                </tr>
+                <tr valign="top">
+                  <td align="right" width="15%">
+                    <span class="aptview_text">
+                      <var:string label:value="Home" />:
+                    </span>
+                  </td>
+                  <td align="left" bgcolor="#FFFFF0">
+                    <span class="aptview_text">
+                      <textarea name="homePostalAddress"
+                        rows="3"
+                        cols="60"
+                        wrap="physical"
+                        var:value="snapshot.homePostalAddress"
+                        />
+                    </span>
+                  </td>
+                </tr>
+              </table>
+              <br />
+              <table border="0" cellpadding="2" cellspacing="0" class="editsec">
+                <tr>
+                  <td align="left" colspan="2">
+                    <span class="aptview_title">
+                      <var:string label:value="Extended" />
+                    </span>
+                  </td>
+                </tr>
+                <tr valign="top">
+                  <td align="right" width="15%">
+                    <span class="aptview_text">
+                      <var:string label:value="EMail" />:
+                    </span>
+                  </td>
+                  <td align="left" bgcolor="#FFFFF0">
+                    <span class="aptview_text">
+                      <input type="text" name="mail" id="email"
+                        var:value="snapshot.mail" size="60" />
+                    </span>
+                  </td>
+                </tr>
+                <tr valign="top">
+                  <td align="right" width="15%">
+                    <span class="aptview_text">
+                      <var:string label:value="Unit" />:
+                    </span>
+                  </td>
+                  <td align="left" bgcolor="#FFFFF0">
+                    <span class="aptview_text">
+                      <input type="text" name="departmentNumber"
+                        id="departmentNumber"
+                        var:value="snapshot.departmentNumber" size="60" />
+                    </span>
+                  </td>
+                </tr>
+                <tr valign="top">
+                  <td align="right" width="15%">
+                    <span class="aptview_text">
+                      <var:string label:value="Location" />:
+                    </span>
+                  </td>
+                  <td align="left" bgcolor="#FFFFF0">
+                    <span class="aptview_text">
+                      <input type="text" name="l" id="l" var:value="snapshot.l"
+                        size="60" />
+                    </span>
+                  </td>
+                </tr>
+                <tr valign="top">
+                  <td align="right" width="15%">
+                    <span class="aptview_text">
+                      <var:string label:value="URL" />:
+                    </span>
+                  </td>
+                  <td align="left" bgcolor="#FFFFF0">
+                    <span class="aptview_text">
+                      <input type="text" name="labeledURI" 
+                        var:value="snapshot.labeledURI" size="60" />
+                    </span>
+                  </td>
+                </tr>
+              </table>
+            </var:if>
+          </td>
+        </tr>
+        <var:if condition="clientObject.isVCardRecord" const:negate="1">
+          <tr>
+            <td>
+              <input type="submit" label:value="Save" name="save:method" />
+              <span class="button_auto_env"
+                ><a href="../view"
+                  var:queryDictionary="queryParameters"
+                  class="button_auto"
+                  ><var:string label:value="Cancel" /></a></span>
+              <var:if condition="isUIxDebugEnabled">
+                <input type="submit" value="Test" name="test:method" />
+              </var:if>
+            </td>
+          </tr>
+        </var:if>
+      </table>
+      
+      <input type="hidden" name="content" var:value="contentString" />
+    </form>
+
+    <var:if condition="isUIxDebugEnabled">
+      <small>
+        <hr />
+        clientObject: <var:string value="clientObject" />
+      </small>
+    </var:if>
+  </var:component>
diff --git a/UI/Templates/ContactsUI/UIxContactView.wox b/UI/Templates/ContactsUI/UIxContactView.wox
index 846f4f832..af67fca12 100644
--- a/UI/Templates/ContactsUI/UIxContactView.wox
+++ b/UI/Templates/ContactsUI/UIxContactView.wox
@@ -1,340 +1,341 @@
 <?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="name"
->
+  <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="name"
+    const:popup="YES"
+    >
+    
+    <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="Contact viewer" /></span>
+              </td>
+              <td width="36" align="right" valign="center">
+                <var:component className="UIxWinClose"/>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
 
-  <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="Contact viewer" /></span>
-            </td>
-            <td width="36" align="right" valign="center">
-              <var:component className="UIxWinClose"/>
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-
-  <tr>
-    <td>
-        <table border="0" cellpadding="2" width="100%" cellspacing="0">
-          <tr bgcolor="#e8e8e0">
-            <td align="left">
-              <span class="aptview_title">
-               <var:if condition="clientObject.isVCardRecord" const:negate="1">
-                 <var:string value="clientObject.cn"/>
-               </var:if>
-               <var:if condition="clientObject.isVCardRecord">
-                 <var:string label:value="vCard" />:
-                 <var:string value="clientObject.vCard.fn"/>
-               </var:if>
-              </span>
-            </td>
-            <td align="right" >
-              <table border='0' cellpadding='0' cellspacing='1'>
-                <tr>
-                  <td class="button_auto_env" nowrap="true"
+      <tr>
+        <td>
+          <table border="0" cellpadding="2" width="100%" cellspacing="0">
+            <tr bgcolor="#e8e8e0">
+              <td align="left">
+                <span class="aptview_title">
+                  <var:if condition="clientObject.isVCardRecord" const:negate="1">
+                    <var:string value="clientObject.cn"/>
+                  </var:if>
+                  <var:if condition="clientObject.isVCardRecord">
+                    <var:string label:value="vCard" />:
+                    <var:string value="clientObject.vCard.fn"/>
+                  </var:if>
+                </span>
+              </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="edit"
-                       var:queryDictionary="queryParameters"
-                    ><var:string label:value="edit" /></a>
-                  </td>
-                  <td class="button_auto_env" nowrap="true"
+                      <a class="button_auto"
+                        href="edit"
+                        var:queryDictionary="queryParameters"
+                        ><var:string label:value="edit" /></a>
+                    </td>
+                    <td class="button_auto_env" nowrap="true"
                       valign='middle' align='center'>
-                    <a class="button_auto"
-                       href="delete"
-                       var:queryDictionary="queryParameters"
-                    ><var:string label:value="delete" /></a>
-                  </td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-        </table>
-    </td>
-  </tr>
-  <tr>
-    <td valign="top" width="100%">
-      <table width="100%" border="0" cellpadding="4" cellspacing="0">
-       <var:if condition="clientObject.isVCardRecord" const:negate="1">
-        <!-- general contact info -->
-        <tr valign="top">
-          <td align="right" width="15%" bgcolor="#E8E8E0">
-              <span class="aptview_text"
-              ><var:string label:value="Name" />:</span>
-          </td>
-          <td align="left" bgcolor="#FFFFF0">
-              <span class="aptview_text">
-                <var:string value="clientObject.cn" />
-              </span>
-          </td>
-        </tr>
-        <tr valign="top">
-          <td align="right" width="15%" bgcolor="#E8E8E0">
-            <span class="aptview_text"
-            ><var:string label:value="Unit" />:</span>
-          </td>
-          <td align="left" bgcolor="#FFFFF0">
-            <span class="aptview_text">
-              <var:string value="clientObject.departmentNumber"/></span>
-          </td>
-        </tr>
-        <tr valign="top">
-          <td align="right" width="15%" bgcolor="#E8E8E0">
-            <span class="aptview_text"
-            ><var:string label:value="Location" />:</span>
-          </td>
-          <td align="left" bgcolor="#FFFFF0">
-            <span class="aptview_text">
-              <var:string value="clientObject.l" />
-            </span>
-          </td>
-        </tr>
-       </var:if>
-      </table>
-      </td>
-    </tr>
-    <tr>
-      <td valign="top" width="100%">
-        <uix:tabview var:selection="tabSelection"
-                     const:tabStyle="tab"
-                     const:selectedTabStyle="tab_selected"
-                     const:bodyStyle="tabview_body"
-        >
-          <!-- ******************** Tab for PLists ******************* -->
-	
-          <var:if condition="clientObject.isVCardRecord" const:negate="1">
-           <uix:tab const:key="attributes"
-                   const:label="attributes"
-                   var:href="attributesTabLink"
-           >
-            <table width="100%" border="0" cellpadding="4" cellspacing="0">
+                      <a class="button_auto"
+                        href="delete"
+                        var:queryDictionary="queryParameters"
+                        ><var:string label:value="delete" /></a>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td valign="top" width="100%">
+          <table width="100%" border="0" cellpadding="4" cellspacing="0">
+            <var:if condition="clientObject.isVCardRecord" const:negate="1">
+              <!-- general contact info -->
               <tr valign="top">
                 <td align="right" width="15%" bgcolor="#E8E8E0">
                   <span class="aptview_text"
-                  ><var:string label:value="EMail" />:</span>
+                    ><var:string label:value="Name" />:</span>
                 </td>
                 <td align="left" bgcolor="#FFFFF0">
                   <span class="aptview_text">
-                    <var:string value="clientObject.mail"/></span>
+                    <var:string value="clientObject.cn" />
+                  </span>
                 </td>
               </tr>
               <tr valign="top">
                 <td align="right" width="15%" bgcolor="#E8E8E0">
                   <span class="aptview_text"
-                  ><var:string label:value="OfficePhone" />:</span>
+                    ><var:string label:value="Unit" />:</span>
                 </td>
                 <td align="left" bgcolor="#FFFFF0">
                   <span class="aptview_text">
-                    <var:string value="clientObject.telephoneNumber"/></span>
+                    <var:string value="clientObject.departmentNumber"/></span>
                 </td>
               </tr>
               <tr valign="top">
                 <td align="right" width="15%" bgcolor="#E8E8E0">
                   <span class="aptview_text"
-                  ><var:string label:value="HomePhone" />:</span>
+                    ><var:string label:value="Location" />:</span>
                 </td>
                 <td align="left" bgcolor="#FFFFF0">
                   <span class="aptview_text">
-                    <var:string value="clientObject.homeTelephoneNumber"/></span>
+                    <var:string value="clientObject.l" />
+                  </span>
                 </td>
               </tr>
-              <tr valign="top">
-                <td align="right" width="15%" bgcolor="#E8E8E0">
-                  <span class="aptview_text"
-                  ><var:string label:value="MobilePhone" />:</span>
-                </td>
-                <td align="left" bgcolor="#FFFFF0">
-                  <span class="aptview_text">
-                    <var:string value="clientObject.mobile"/></span>
-                </td>
-              </tr>
-              <tr valign="top">
-                <td align="right" width="15%" bgcolor="#E8E8E0">
-                  <span class="aptview_text"
-                  ><var:string label:value="Fax" />:</span>
-                </td>
-                <td align="left" bgcolor="#FFFFF0">
-                  <span class="aptview_text">
-                    <var:string value="clientObject.facsimileTelephoneNumber"
-                    /></span>
-                </td>
-              </tr>
-              <!--
-              <tr valign="top">
-                <td align="right" width="15%" bgcolor="#E8E8E0">
+            </var:if>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td valign="top" width="100%">
+          <uix:tabview var:selection="tabSelection"
+            const:tabStyle="tab"
+            const:selectedTabStyle="tab_selected"
+            const:bodyStyle="tabview_body"
+            >
+            <!-- ******************** Tab for PLists ******************* -->
+            
+            <var:if condition="clientObject.isVCardRecord" const:negate="1">
+              <uix:tab const:key="attributes"
+                const:label="attributes"
+                var:href="attributesTabLink"
+                >
+                <table width="100%" border="0" cellpadding="4" cellspacing="0">
+                  <tr valign="top">
+                    <td align="right" width="15%" bgcolor="#E8E8E0">
+                      <span class="aptview_text"
+                        ><var:string label:value="EMail" />:</span>
+                    </td>
+                    <td align="left" bgcolor="#FFFFF0">
+                      <span class="aptview_text">
+                        <var:string value="clientObject.mail"/></span>
+                    </td>
+                  </tr>
+                  <tr valign="top">
+                    <td align="right" width="15%" bgcolor="#E8E8E0">
+                      <span class="aptview_text"
+                        ><var:string label:value="OfficePhone" />:</span>
+                    </td>
+                    <td align="left" bgcolor="#FFFFF0">
+                      <span class="aptview_text">
+                        <var:string value="clientObject.telephoneNumber"/></span>
+                    </td>
+                  </tr>
+                  <tr valign="top">
+                    <td align="right" width="15%" bgcolor="#E8E8E0">
+                      <span class="aptview_text"
+                        ><var:string label:value="HomePhone" />:</span>
+                    </td>
+                    <td align="left" bgcolor="#FFFFF0">
+                      <span class="aptview_text">
+                        <var:string value="clientObject.homeTelephoneNumber"/></span>
+                    </td>
+                  </tr>
+                  <tr valign="top">
+                    <td align="right" width="15%" bgcolor="#E8E8E0">
+                      <span class="aptview_text"
+                        ><var:string label:value="MobilePhone" />:</span>
+                    </td>
+                    <td align="left" bgcolor="#FFFFF0">
+                      <span class="aptview_text">
+                        <var:string value="clientObject.mobile"/></span>
+                    </td>
+                  </tr>
+                  <tr valign="top">
+                    <td align="right" width="15%" bgcolor="#E8E8E0">
+                      <span class="aptview_text"
+                        ><var:string label:value="Fax" />:</span>
+                    </td>
+                    <td align="left" bgcolor="#FFFFF0">
+                      <span class="aptview_text">
+                        <var:string value="clientObject.facsimileTelephoneNumber"
+                          /></span>
+                    </td>
+                  </tr>
+                  <!--
+                  <tr valign="top">
+                  <td align="right" width="15%" bgcolor="#E8E8E0">
                   <span class="aptview_text"
                   ><var:string label:value="Organisation" />:</span>
                 </td>
-                <td align="left" bgcolor="#FFFFF0">
+                  <td align="left" bgcolor="#FFFFF0">
                   <span class="aptview_text">
-                    <var:string value="clientObject.o"/></span>
+                  <var:string value="clientObject.o"/></span>
                 </td>
-              </tr>
-              -->
-              <tr valign="top">
-                <td align="right" width="15%" bgcolor="#E8E8E0">
-                  <span class="aptview_text"
-                  ><var:string label:value="Postal" />:</span>
-                </td>
-                <td align="left" bgcolor="#FFFFF0">
-                  <span class="aptview_text">
-                    <var:string value="clientObject.postalAddress"
-                                const:insertBR="YES"
-                    />
-                  </span>
-                </td>
-              </tr>
-              <tr valign="top">
-                <td align="right" width="15%" bgcolor="#E8E8E0">
-                  <span class="aptview_text"
-                  ><var:string label:value="Home" />:</span>
-                </td>
-                <td align="left" bgcolor="#FFFFF0">
-                  <span class="aptview_text">
-                    <var:string value="clientObject.homePostalAddress"
-                                const:insertBR="YES"
-                    />
-                  </span>
-                </td>
-              </tr>
-              <tr valign="top">
-                <td align="right" width="15%" bgcolor="#E8E8E0">
-                  <span class="aptview_text"
-                  ><var:string label:value="URL" />:</span>
-                </td>
-                <td align="left" bgcolor="#FFFFF0">
-                  <span class="aptview_text">
-                    <var:string value="clientObject.labeledURI"/>
-                  </span>
-                </td>
-              </tr>
-            </table>
-           </uix:tab>
-          </var:if>
+                </tr>
+                  -->
+                  <tr valign="top">
+                    <td align="right" width="15%" bgcolor="#E8E8E0">
+                      <span class="aptview_text"
+                        ><var:string label:value="Postal" />:</span>
+                    </td>
+                    <td align="left" bgcolor="#FFFFF0">
+                      <span class="aptview_text">
+                        <var:string value="clientObject.postalAddress"
+                          const:insertBR="YES"
+                          />
+                      </span>
+                    </td>
+                  </tr>
+                  <tr valign="top">
+                    <td align="right" width="15%" bgcolor="#E8E8E0">
+                      <span class="aptview_text"
+                        ><var:string label:value="Home" />:</span>
+                    </td>
+                    <td align="left" bgcolor="#FFFFF0">
+                      <span class="aptview_text">
+                        <var:string value="clientObject.homePostalAddress"
+                          const:insertBR="YES"
+                          />
+                      </span>
+                    </td>
+                  </tr>
+                  <tr valign="top">
+                    <td align="right" width="15%" bgcolor="#E8E8E0">
+                      <span class="aptview_text"
+                        ><var:string label:value="URL" />:</span>
+                    </td>
+                    <td align="left" bgcolor="#FFFFF0">
+                      <span class="aptview_text">
+                        <var:string value="clientObject.labeledURI"/>
+                      </span>
+                    </td>
+                  </tr>
+                </table>
+              </uix:tab>
+            </var:if>
 
-          <!-- ******************** Tab for vCards ******************* -->
+            <!-- ******************** Tab for vCards ******************* -->
 
-          <var:if condition="clientObject.isVCardRecord">
-           <uix:tab const:key="attributes"
-                   const:label="attributes"
-                   var:href="attributesTabLink"
-           >
-            <table width="100%" border="0" cellpadding="4" cellspacing="0">
-              <tr valign="top">
-                <td align="right" width="15%" bgcolor="#E8E8E0">
-                  <span class="aptview_text"
-                  ><var:string label:value="EMail" />:</span>
-                </td>
-                <td align="left" bgcolor="#FFFFF0">
-                  <span class="aptview_text">
-                    <var:string
-                       value="clientObject.vCard.preferredEMail.stringValue"/>
-                  </span>
-                </td>
-              </tr>
-              <tr valign="top">
-                <td align="right" width="15%" bgcolor="#E8E8E0">
-                  <span class="aptview_text"
-                  ><var:string label:value="Phone" />:</span>
-                </td>
-                <td align="left" bgcolor="#FFFFF0">
-                  <span class="aptview_text">
-                    <var:string
-                      value="clientObject.vCard.preferredTel.stringValue"/>
-                  </span>
-                </td>
-              </tr>
-              <tr valign="top">
-                <td align="right" width="15%" bgcolor="#E8E8E0">
-                  <span class="aptview_text"
-                  ><var:string label:value="Address" />:</span>
-                </td>
-                <td align="left" bgcolor="#FFFFF0">
-                  <span class="aptview_text">
-                    <var:string
-                      value="clientObject.vCard.preferredAdr.street"/><br />
-                    <var:string
-                      value="clientObject.vCard.preferredAdr.locality"/><br />
-                    <var:string
-                      value="clientObject.vCard.preferredAdr.country"/><br />
-                  </span>
-                </td>
-              </tr>
-              <tr valign="top">
-                <td align="right" width="15%" bgcolor="#E8E8E0">
-                  <span class="aptview_text"
-                  ><var:string label:value="Role" />:</span>
-                </td>
-                <td align="left" bgcolor="#FFFFF0">
-                  <span class="aptview_text">
-                    <var:string value="clientObject.vCard.role"/></span>
-                </td>
-              </tr>
-              <tr valign="top">
-                <td align="right" width="15%" bgcolor="#E8E8E0">
-                  <span class="aptview_text"
-                  ><var:string label:value="Title" />:</span>
-                </td>
-                <td align="left" bgcolor="#FFFFF0">
-                  <span class="aptview_text">
-                    <var:string value="clientObject.vCard.title"/></span>
-                </td>
-              </tr>
+            <var:if condition="clientObject.isVCardRecord">
+              <uix:tab const:key="attributes"
+                const:label="attributes"
+                var:href="attributesTabLink"
+                >
+                <table width="100%" border="0" cellpadding="4" cellspacing="0">
+                  <tr valign="top">
+                    <td align="right" width="15%" bgcolor="#E8E8E0">
+                      <span class="aptview_text"
+                        ><var:string label:value="EMail" />:</span>
+                    </td>
+                    <td align="left" bgcolor="#FFFFF0">
+                      <span class="aptview_text">
+                        <var:string
+                          value="clientObject.vCard.preferredEMail.stringValue"/>
+                      </span>
+                    </td>
+                  </tr>
+                  <tr valign="top">
+                    <td align="right" width="15%" bgcolor="#E8E8E0">
+                      <span class="aptview_text"
+                        ><var:string label:value="Phone" />:</span>
+                    </td>
+                    <td align="left" bgcolor="#FFFFF0">
+                      <span class="aptview_text">
+                        <var:string
+                          value="clientObject.vCard.preferredTel.stringValue"/>
+                      </span>
+                    </td>
+                  </tr>
+                  <tr valign="top">
+                    <td align="right" width="15%" bgcolor="#E8E8E0">
+                      <span class="aptview_text"
+                        ><var:string label:value="Address" />:</span>
+                    </td>
+                    <td align="left" bgcolor="#FFFFF0">
+                      <span class="aptview_text">
+                        <var:string
+                          value="clientObject.vCard.preferredAdr.street"/><br />
+                        <var:string
+                          value="clientObject.vCard.preferredAdr.locality"/><br />
+                        <var:string
+                          value="clientObject.vCard.preferredAdr.country"/><br />
+                      </span>
+                    </td>
+                  </tr>
+                  <tr valign="top">
+                    <td align="right" width="15%" bgcolor="#E8E8E0">
+                      <span class="aptview_text"
+                        ><var:string label:value="Role" />:</span>
+                    </td>
+                    <td align="left" bgcolor="#FFFFF0">
+                      <span class="aptview_text">
+                        <var:string value="clientObject.vCard.role"/></span>
+                    </td>
+                  </tr>
+                  <tr valign="top">
+                    <td align="right" width="15%" bgcolor="#E8E8E0">
+                      <span class="aptview_text"
+                        ><var:string label:value="Title" />:</span>
+                    </td>
+                    <td align="left" bgcolor="#FFFFF0">
+                      <span class="aptview_text">
+                        <var:string value="clientObject.vCard.title"/></span>
+                    </td>
+                  </tr>
 
-              <tr valign="top">
-                <td align="right" width="15%" bgcolor="#E8E8E0">
-                  <span class="aptview_text"
-                  ><var:string label:value="Note" />:</span>
-                </td>
-                <td align="left" bgcolor="#FFFFF0">
-                  <span class="aptview_text">
-                    <var:string value="clientObject.vCard.note"/></span>
-                </td>
-              </tr>
-            </table>
-           </uix:tab>
-          </var:if>
+                  <tr valign="top">
+                    <td align="right" width="15%" bgcolor="#E8E8E0">
+                      <span class="aptview_text"
+                        ><var:string label:value="Note" />:</span>
+                    </td>
+                    <td align="left" bgcolor="#FFFFF0">
+                      <span class="aptview_text">
+                        <var:string value="clientObject.vCard.note"/></span>
+                    </td>
+                  </tr>
+                </table>
+              </uix:tab>
+            </var:if>
 
-          <!-- ******************** Debugging Tab ******************** -->
+            <!-- ******************** Debugging Tab ******************** -->
 
-          <var:if condition="isUIxDebugEnabled">
-            <uix:tab const:key="debug"
-                     const:label="DEBUG"
-                     var:href="debugTabLink">
-             <small>
-              SOGo Server - <var:string value="name"/>
-              <br />
-              Client: <var:string value="clientObject"/>
-              <hr />
-              Raw :<br />
-              <pre><var:string value="clientObject.contentAsString"/></pre>
-             </small>
-            </uix:tab>
-          </var:if>
-        </uix:tabview>
-      </td>
-    </tr>
-  </table>
-  <var:if condition="isUIxDebugEnabled">
-    <small>
-      <hr />
-      clientObject: <var:string value="clientObject" />
-    </small>
-  </var:if>
-</var:component>
+            <var:if condition="isUIxDebugEnabled">
+              <uix:tab const:key="debug"
+                const:label="DEBUG"
+                var:href="debugTabLink">
+                <small>
+                  SOGo Server - <var:string value="name"/>
+                  <br />
+                  Client: <var:string value="clientObject"/>
+                  <hr />
+                  Raw :<br />
+                  <pre><var:string value="clientObject.contentAsString"/></pre>
+                </small>
+              </uix:tab>
+            </var:if>
+          </uix:tabview>
+        </td>
+      </tr>
+    </table>
+    <var:if condition="isUIxDebugEnabled">
+      <small>
+        <hr />
+        clientObject: <var:string value="clientObject" />
+      </small>
+    </var:if>
+  </var:component>
diff --git a/UI/Templates/MailerUI/UIxMailListView.wox b/UI/Templates/MailerUI/UIxMailListView.wox
index eb8a971e3..1f85c528c 100644
--- a/UI/Templates/MailerUI/UIxMailListView.wox
+++ b/UI/Templates/MailerUI/UIxMailListView.wox
@@ -14,7 +14,7 @@
 
     <table multiselect="yes" id="messageList"
       onselectionchange="onMessageSelectionChange();">
-      <thead>
+      <tbody>
         <tr class="tableview"
           ><td class="tbtv_headercell"
             ><var:entity const:name="nbsp"
@@ -69,30 +69,26 @@
                   onclick="openMailboxAtIndex(this);"
                   var:idx="prevFirstMessageNumber"
                   ><var:string label:value="previous"/></a> |
-              </var:if>
+              </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: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">
+                /><var:if condition="hasNext">
                 | <a href="#"
                   onclick="openMailboxAtIndex(this);"
                   var:idx="nextFirstMessageNumber"
                   ><var:string label:value="next" /></a>
-              </var:if>
-            </td
+              </var:if
+            ></td
               ></tr
             ></var:if>
-      </thead>
-
-      <tbody>
         <var:foreach list="messages" item="message"
           ><tr class="tableview" var:id="msgRowID"
             onclick="return onRowClick(event);"
-            oncontextmenu="onMenuClick(event, 'messageListMenu'); onRowClick(event); return false;"
+            oncontextmenu="return onMenuClick(event, 'messageListMenu');"
             ><td onmousedown="return false;"
               ></td
               ><td onmousedown="return false;"
diff --git a/UI/Templates/MailerUI/UIxMailSortableTableHeader.wox b/UI/Templates/MailerUI/UIxMailSortableTableHeader.wox
index 420da4bf9..24bb9313e 100644
--- a/UI/Templates/MailerUI/UIxMailSortableTableHeader.wox
+++ b/UI/Templates/MailerUI/UIxMailSortableTableHeader.wox
@@ -1,38 +1,39 @@
 <?xml version='1.0' standalone='yes'?>
-
-<span 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"
->
-  <var:if condition="isSelected">
-    <var:if condition="isSortedDescending" >
-      <a var:href="href"
-         var:_sort="sortKey"
-         _desc="0"
-         var:queryDictionary="queryDictionary"
-      ><img rsrc:src="title_sortup_12x12.png"
-                class="tbtv_sortcell"
-           /><var:entity const:name="nbsp"
-         /></a>
-    </var:if>
-    <var:if condition="isSortedDescending" const:negate="YES" >
-      <a var:href="href"
-         var:_sort="sortKey"
-         _desc="1"
-         var:queryDictionary="queryDictionary"
-      ><img rsrc:src="title_sortdown_12x12.png"
-                class="tbtv_sortcell"
-           /><var:string var:value="label"
-       /></a>
-    </var:if>
-  </var:if>
-  <var:if condition="isSelected" const:negate="YES">
-    <a var:href="href"
-       var:_sort="sortKey"
-       _desc="0"
-       var:queryDictionary="queryDictionary"
-    ><var:string var:value="label"
-     /></a>
-  </var:if>
-</span>
\ No newline at end of file
+  <span 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"
+    ><var:if condition="isSelected"
+      ><var:if condition="isSortedDescending"
+        ><a var:href="href"
+          var:_sort="sortKey"
+          _desc="0"
+          onclick="return onHeaderClick(this);"
+          var:queryDictionary="queryDictionary"
+          ><img rsrc:src="title_sortup_12x12.png"
+            class="tbtv_sortcell"
+            /><var:entity const:name="nbsp"
+            /></a
+      ></var:if
+        ><var:if condition="isSortedDescending" const:negate="YES"
+        ><a var:href="href"
+          var:_sort="sortKey"
+          _desc="1"
+          onclick="return onHeaderClick(this);"
+          var:queryDictionary="queryDictionary"
+          ><img rsrc:src="title_sortdown_12x12.png"
+            class="tbtv_sortcell"
+            /><var:string var:value="label"
+            /></a
+          ></var:if
+        ></var:if
+      ><var:if condition="isSelected" const:negate="YES"
+      ><a var:href="href"
+        var:_sort="sortKey"
+        _desc="0"
+        onclick="return onHeaderClick(this);"
+        var:queryDictionary="queryDictionary"
+        ><var:string var:value="label"
+          /></a
+        ></var:if
+      ></span>