diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index 10ef59a97..bacdcb53a 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -22,7 +22,6 @@
   </div>
 
   <form const:href="send" name="pageform" enctype="multipart/form-data">
-    <div id="headerArea">
       <div id="attachmentsArea">
 	<var:string label:value="Attachments:" />
 	<ul id="attachments">
@@ -32,6 +31,7 @@
 		/></li></var:foreach>
 	</ul>
       </div>
+    <div id="headerArea">
       <span class="headerField"><var:string label:value="From" />:</span>
       <var:popup const:name="from"
 	list="fromEMails"
diff --git a/UI/WebServerResources/UIxMailEditor.css b/UI/WebServerResources/UIxMailEditor.css
index e3c227b8d..d9cc74eba 100644
--- a/UI/WebServerResources/UIxMailEditor.css
+++ b/UI/WebServerResources/UIxMailEditor.css
@@ -27,20 +27,22 @@ DIV.addressListElement
 
 SPAN.headerField
 { line-height: 1.8em;
-  width: 5em;
+  width: 7em;
   text-align: right; }
 
 SPAN.headerInput INPUT
-{ width: 100%;
+{ width: 50%;
   padding-left: 24px;
   background-image: url('/SOGo.woa/WebServerResources/abcard.gif');
   background-repeat: no-repeat;
-  background-position: 2px center;
-  margin-right: -12em; }
+  background-position: 2px center; }
+
+DIV#subjectRow
+{ margin-left: 9em; }
 
 DIV#subjectRow INPUT
 { background-image: none;
-  width: 100%;
+  width: 50%;
   padding-left: .5em; }
 
 div#compose_internetmarker