diff --git a/templates/zephyr/compose.html b/templates/zephyr/compose.html
index 19db5c9313..9b85b26ed2 100644
--- a/templates/zephyr/compose.html
+++ b/templates/zephyr/compose.html
@@ -49,15 +49,13 @@
                   </div>
                 </div>
                 <div id="below-compose-content">
-                  <input type="file" id="file_input" class="notvisible" multiple />
+                  <input type="file" id="file_input" class="notvisible pull-left" multiple />
                   <a class="message-control-button icon-vector-paper-clip notdisplayed" id="attach_files" href="#" title="Attach files"></a>
-                  <span id="restore-draft" onclick="compose.restore_message();">Restore last draft?</span>
-                  <span id="tab-enter-message">
-                    <span id="sending-indicator">Sending...</span>
-                    <label class="pull-right inline">Press Enter to send&nbsp;
-                      <input type="checkbox" id="enter_sends" name="enter_sends" value="ender_sends" />
-                    </label>
-                  </span>
+                  <a id="restore-draft" onclick="compose.restore_message();">Restore last draft?</a>
+                  <span id="sending-indicator">Sending...</span>
+                  <label class="pull-right inline">Press Enter to send&nbsp;
+                    <input type="checkbox" id="enter_sends" name="enter_sends" value="ender_sends" />
+                  </label>
                 </div>
               </td>
             </tr>
diff --git a/zephyr/static/js/compose.js b/zephyr/static/js/compose.js
index 28201c7d8e..ae699c4a61 100644
--- a/zephyr/static/js/compose.js
+++ b/zephyr/static/js/compose.js
@@ -204,7 +204,7 @@ exports.start = function (msg_type, opts) {
     }
 
     if (message_snapshot !== undefined) {
-        $('#restore-draft').css('visibility', 'visible');
+        $('#restore-draft').show();
     }
 
     if (opts.replying_to_message !== undefined) {
@@ -266,7 +266,7 @@ exports.snapshot_message = function(message) {
 };
 
 function clear_message_snapshot() {
-    $("#restore-draft").css("visibility", "hidden");
+    $("#restore-draft").hide();
     message_snapshot = undefined;
 }
 
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index e380adb803..e900d4e4ec 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -1158,7 +1158,9 @@ li.expanded_subject {
 }
 
 #restore-draft {
-    visibility: hidden;
+    float: left;
+    display: none;
+    margin-right: 1em;
 }
 
 #restore-draft:hover {
@@ -1175,6 +1177,7 @@ li.expanded_subject {
     margin-right: 5px;
     border-radius: 2px;
     text-align: center;
+    float: left;
 }
 
 #compose a.message-control-button:hover {