diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index b77237b6c..d82afa3db 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -10,12 +10,9 @@
     title="panelTitle"
     const:popup="YES"
     >
-    <div id="compose_panel">
+    <div id="headerArea">
       <div id="attachmentsArea">
-        <var:string label:value="Attachments" />
-                <!--<a href="#"
-                onclick="hideInlineAttachmentList(this);"
-                ><var:string label:value="close" /></a>-->
+        <var:string label:value="Attachments:" />
         <div id="compose_attachments_list"
           onclick="clickedEditorAttach(this);"
           ><var:foreach list="attachmentNames" item="attachmentName">
@@ -23,37 +20,28 @@
           </var:foreach>
         </div>
       </div>
-      <div id="headerArea">
-        <var:if condition="showInternetMarker">
-          <div id="compose_internetmarker">
-            <var:string
-              label:value="This mail is being sent from an unsecure network!" />
-          </div>
-        </var:if>
-        <span class="headerField"
-          ><var:string label:value="From"
-            />:</span
-          ><var:popup const:name="from"
-          list="fromEMails"
-          item="item"
-          selection="from"
-          /><br />
-        <var:component className="UIxMailToSelection"
-          to="to"
-          cc="cc"
-          bcc="bcc"
-          />
-        <span class="headerField"
-          ><var:string label:value="Subject"
-            />:</span><input name="subject"
-            id="compose_subject_input"
+      <span class="headerField"><var:string label:value="From" />:</span>
+      <var:popup const:name="from"
+        list="fromEMails"
+        item="item"
+        selection="from"
+        /><br />
+      <var:component className="UIxMailToSelection"
+        to="to"
+        cc="cc"
+        bcc="bcc"
+        />
+      <div class="addressListElement" id="subjectRow"
+        ><span class="headerField"><var:string label:value="Subject" />:</span
+          ><span class="headerInput"
+          ><input name="subject"
             type="text"
             class="textField"
             var:value="subject"
-            /><br />
-      </div>
-      <!-- separator line -->
-      <textarea name="content" var:value="text" />
-      <!-- img rsrc:src="tbird_073_compose.png" alt="screenshot" / -->
+            /></span></div>
     </div>
+    <!-- separator line -->
+    <textarea name="content" var:value="text" />
+    <!-- img rsrc:src="tbird_073_compose.png" alt="screenshot" / -->
+  </div>
   </var:component>
diff --git a/UI/Templates/MailerUI/UIxMailToSelection.wox b/UI/Templates/MailerUI/UIxMailToSelection.wox
index aeafc1f3f..ac9c9d937 100644
--- a/UI/Templates/MailerUI/UIxMailToSelection.wox
+++ b/UI/Templates/MailerUI/UIxMailToSelection.wox
@@ -4,51 +4,56 @@
     xmlns:const="http://www.skyrix.com/od/constant"
     xmlns:rsrc="OGo:url"
     xmlns:label="OGo:label"
-    border="0"
-    width="100%"
     >
     <script type="text/javascript">
       var currentIndex = <var:string value="currentIndex" />;
     </script>
     <script type="text/javascript" rsrc:src="UIxMailToSelection.js"> <!-- Space! --></script>
     <script type="text/javascript" rsrc:src="layout2or3_xlib.js"> <!-- Space! --></script>
-
+    
     <div id="addressList"
       ><var:foreach list="addressLists" item="addressList"
-        ><var:foreach list="addressList" item="address"
-          ><span class="addressListElement" var:id="currentRowId"
-            ><span class="headerField"
-              ><var:popup name="currentPopUpId"
-                list="headers"
-                item="item"
-                label:string="$item"
-                selection="currentHeader"
-                /></span><input var:id="currentAddressId"
+        ><var:foreach list="addressList" item="address">
+          <div class="addressListElement" var:id="currentRowId">
+            <span class="headerField">
+            <var:popup name="currentPopUpId"
+              list="headers"
+              item="item"
+              label:string="$item"
+              selection="currentHeader"
+              />
+            </span>
+            <span class="headerInput">
+            <input var:id="currentAddressId"
               var:name="currentAddressId"
               class="textField"
               type="text"
               var:value="address"
               onfocus="addressFieldGotFocus(this);"
               onblur="addressFieldLostFocus(this);"
-            
-              /><var:string value="nextId"
-              /></span><br />
-        </var:foreach
-          ></var:foreach
-        ></div>
-    <!-- todo: use stylesheet? -->
-    <span class="addressListElement" id="lastRow"><span class="headerField"
-        ><select disabled="1"><option value="to"
-            ><var:string label:value="to"
-              />:</option></select></span>
-      <!-- todo: use stylesheet? -->
-      <input onfocus="fancyAddRow(true,'');"
-        type="text"
-        class="textField"
-        /></span><br />
+              />
+            </span>
+          </div>
+        </var:foreach>
+      </var:foreach>
+      <div class="addressListElement" id="lastRow">
+        <span class="headerField">
+          <select disabled="1">
+            <option value="to"><var:string label:value="to" />:</option>
+          </select>
+        </span>
+        <span class="headerInput">
+          <input onfocus="fancyAddRow(true,'');"
+            readonly="1"
+            type="text"
+            class="textField" />
+        </span>
+      </div>
     <!--<var:if condition="isUIxDebugEnabled">
     <a href="#" onclick="checkAddresses();">check addresses</a>
   </var:if>-->
+    </div>
     <span id="addr_addresses" style="visibility: hidden;"><var:foreach list="addressLists" item="addressList"><var:foreach list="addressList" item="address"><span var:id="address" /></var:foreach></var:foreach>
     </span>
   </span>
+