diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index aa276a9ba..e4fc7fd7b 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -313,19 +313,19 @@ static NSString    *userAgent      = nil;
     {
       // newHeaders come from Web form; convert priority to MIME header representation
       priority = [newHeaders objectForKey: @"priority"];
-      if (!priority || [priority isEqualToString: @"NORMAL"])
+      if (!priority || [priority intValue] == 3)
         {
           [headers removeObjectForKey: @"X-Priority"];
         }
-      else if ([priority isEqualToString: @"HIGHEST"])
+      else if ([priority intValue] == 1)
         {
           [headers setObject: @"1 (Highest)"  forKey: @"X-Priority"];
         }
-      else if ([priority isEqualToString: @"HIGH"])
+      else if ([priority intValue] == 2)
         {
           [headers setObject: @"2 (High)"  forKey: @"X-Priority"];
         }
-      else if ([priority isEqualToString: @"LOW"])
+      else if ([priority intValue] == 4)
         {
           [headers setObject: @"4 (Low)"  forKey: @"X-Priority"];
         }
@@ -355,7 +355,7 @@ static NSString    *userAgent      = nil;
   else
     {
       receipt = [newHeaders objectForKey: @"receipt"];
-      if ([receipt isEqualToString: @"true"])
+      if ([receipt boolValue])
         {
           [headers setObject: receipt  forKey: @"receipt"];
           pureSender = [[newHeaders objectForKey: @"from"] pureEMailAddress];
diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index fa47fc78e..eb68fdefb 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -73,22 +73,6 @@
           <input type="text" name="subject" ng-model="message.editable.subject"/>
         </md-input-container>
 
-        <!--
-        <div layout="row" layout-align="center center" ng-hide="hidePriority">
-          <span class="md-body-1">
-            <var:string label:value="Priority"/>
-          </span>
-          <md-slider flex="flex"
-                     md-discrete="md-discrete"
-                     ng-model="message.editable.priority"
-                     step="1"
-                     min="1"
-                     max="5"
-                     aria-label="rating">
-          </md-slider>
-          </div>
-          -->
-
         <md-list>
           <!-- FILES ALREADY UPLOADED, FOR EXAMPLE WHEN WE FORWARD A
                MAIL WITH ATTACHMENTS -->
@@ -130,11 +114,7 @@
         <md-button  class="iconButton" ng-show="hideCc" ng-click="hideCc = false">Cc</md-button>
         <md-button  class="iconButton" ng-show="hideBcc"
                     ng-click="hideBcc = false">Bcc</md-button>
-        <!--
-            <md-button class="sg-icon-button" ng-show="hidePriority" ng-click="hidePriority = false">
-            <md-icon>info_outline</md-icon>
-            </md-button>
-        -->
+
         <md-button class="iconButton">
           <label for="file-input">
             Add files
@@ -145,12 +125,35 @@
                multiple="multiple"
                uploader="uploader"
                ng-show="false"/>
+
+        <md-menu>
+          <md-button aria-label="More mail options" class="iconBtton" ng-click="$mdOpenMenu($event)">
+            <md-icon>more_vert</md-icon>
+          </md-button>
+          <md-menu-content width="4">
+            <md-menu-item>
+              <md-checkbox ng-model="message.editable.receipt">
+                <var:string label:value="Receipt"/>
+              </md-checkbox>
+            </md-menu-item>
+            <md-menu-item>
+              <div layout="row" layout-align="center center">
+                <span>
+                  <var:string label:value="Priority"/>
+                </span>
+                <md-slider flex="flex"
+                           md-discrete="md-discrete"
+                           ng-model="message.editable.priority"
+                           step="1"
+                           min="1"
+                           max="5"
+                           aria-label="rating">
+                </md-slider>
+              </div>
+            </md-menu-item>
+          </md-menu-content>
+        </md-menu>
         
-        <!--
-            <md-button class="sg-icon-button" ng-click="returnReceipt = !returnReceipt">
-            <md-icon>receipt</md-icon>
-            </md-button>
-        -->
       </div>
       
     </header>