diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index d82afa3db..9ff34a5bc 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -26,19 +26,18 @@
         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"
-            /></span></div>
+      <div>
+        <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"
+              /></span></div></div></div><
+      </div>
     </div>
     <!-- separator line -->
     <textarea name="content" var:value="text" />
diff --git a/UI/Templates/MailerUI/UIxMailToSelection.wox b/UI/Templates/MailerUI/UIxMailToSelection.wox
index ac9c9d937..6d323a208 100644
--- a/UI/Templates/MailerUI/UIxMailToSelection.wox
+++ b/UI/Templates/MailerUI/UIxMailToSelection.wox
@@ -1,5 +1,5 @@
 <?xml version='1.0' standalone='yes'?>
-  <span 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:rsrc="OGo:url"
@@ -55,5 +55,5 @@
     </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>
+  </container>