diff --git a/UI/Templates/MailerUI/UIxMailView.wox b/UI/Templates/MailerUI/UIxMailView.wox
index fcec52799..620032c5f 100644
--- a/UI/Templates/MailerUI/UIxMailView.wox
+++ b/UI/Templates/MailerUI/UIxMailView.wox
@@ -19,11 +19,13 @@
     </var:if>
     <span id="messageContent">
     <input type="hidden" const:id="shouldAskReceipt" var:value="shouldAskReceipt"/>
-    <var:if var:condition="mailIsDraft"
+    <span id="actionButtons">
+      <var:if var:condition="mailIsDraft"
       ><a href="#" const:id="editDraftButton" class="button"><span><var:string label:value="Edit Draft..."/></span></a
-	></var:if>
-    <a href="#" const:name="loadImagesButton" const:id="loadImagesButton"
-	class="button"><span><var:string label:value="Load Images"/></span></a>
+      ></var:if>
+      <a href="#" const:name="loadImagesButton" const:id="loadImagesButton"
+         class="button"><span><var:string label:value="Load Images"/></span></a>
+    </span>
     <table class="mailer_fieldtable">
       <tr class="mailer_fieldrow">
         <td class="mailer_fieldname" ><var:string label:value="Subject"/>:</td>
diff --git a/UI/WebServerResources/MailerUI.css b/UI/WebServerResources/MailerUI.css
index fd0c7132b..bbb6127c7 100644
--- a/UI/WebServerResources/MailerUI.css
+++ b/UI/WebServerResources/MailerUI.css
@@ -374,25 +374,24 @@ TR.mailer_listcell_regular TD A
 }
 
 /* mail viewer */
-#editDraftButton
+#actionButtons
 {
-  position: absolute;
-  top: 2.5em;
-  right: 1em;
+    position: absolute;
+    top: 2.5em;
+    right: 1em;
 }
 
+.popup #actionButtons
+{
+  top: 7.0em;
+}
+
+#editDraftButton,
 #loadImagesButton
 {
-  position: absolute;
-  top: 2.5em;
-  right: 1em;
+    float: right;
 }
 
-.popup #loadImagesButton
-{
-  top: 9.0em;
-  right: 1em;
-}
 
 #signedImage
 {