diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index 2106c7ba9..10ef59a97 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -21,7 +21,7 @@
     </ul>
   </div>
 
-  <form name="pageform" enctype="multipart/form-data" accept-charset="UTF-8">
+  <form const:href="send" name="pageform" enctype="multipart/form-data">
     <div id="headerArea">
       <div id="attachmentsArea">
 	<var:string label:value="Attachments:" />
diff --git a/UI/Templates/MailerUI/UIxMailToSelection.wox b/UI/Templates/MailerUI/UIxMailToSelection.wox
index 40d503e22..ebde46970 100644
--- a/UI/Templates/MailerUI/UIxMailToSelection.wox
+++ b/UI/Templates/MailerUI/UIxMailToSelection.wox
@@ -18,7 +18,7 @@
             <var:popup name="currentPopUpId"
               list="headers"
               item="item"
-              label:string="$item"
+              label:displayString="$item"
               selection="currentHeader"
               />
             </span>
@@ -41,7 +41,7 @@
               const:disabled="1"
               list="headers"
               item="item"
-              label:string="$item"
+              label:displayString="$item"
               />
         </span>
         <span class="headerInput">