diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index dff3bde46e..9667b3f375 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -1455,3 +1455,16 @@ li.expanded_subject {
 .message_edit {
     display: none;
 }
+
+/* Reduce some of the heavy padding from Bootstrap. */
+#message_edit_form .edit-control-label {
+    width: auto;
+    float: left;
+}
+#message_edit_form .edit-controls {
+    margin-left: 50px;
+}
+#message_edit_form textarea {
+    width: 90%;
+    min-width: 206px;
+}
diff --git a/zephyr/static/templates/message.handlebars b/zephyr/static/templates/message.handlebars
index 70bbbb3296..ffb1e104ed 100644
--- a/zephyr/static/templates/message.handlebars
+++ b/zephyr/static/templates/message.handlebars
@@ -81,7 +81,6 @@
         <div class="message_content">{{#if ../../use_match_properties}}{{{match_content}}}{{else}}{{{content}}}{{/if}}</div>
         <div class="message_edit">
             <div class="message_edit_form" id="{{id}}"></div>
-            <a class="message_edit_save btn btn-primary btn-small">Save</a> <a class="message_edit_cancel btn btn-small">Cancel</a>
         </div>
         <div class="message_expander message_length_controller" title="See the rest of this message">[More...]</div>
         <div class="message_condenser message_length_controller" title="Make this message take up less space on the screen">[Condense this message]</div>
diff --git a/zephyr/static/templates/message_edit_form.handlebars b/zephyr/static/templates/message_edit_form.handlebars
index 8def23d990..1032231761 100644
--- a/zephyr/static/templates/message_edit_form.handlebars
+++ b/zephyr/static/templates/message_edit_form.handlebars
@@ -1,8 +1,24 @@
 {{! Client-side Mustache template for rendering the trailing bookend.}}
 
-<form>
+<form id="message_edit_form" class="form-horizontal">
 {{#if is_stream}}
-    <span>Subject: <input type="text" value="{{subject}}" class="message_edit_subject"></input></span><br />
+    <div class="control-group">
+        <label class="control-label edit-control-label" for="message_edit_subject">Subject</label>
+        <div class="controls edit-controls">
+          <input type="text" value="{{subject}}" class="message_edit_subject" id="message_edit_subject">
+        </div>
+    </div>
 {{/if}}
-    <span>Content: <textarea class="message_edit_content">{{content}}</textarea></span>
+    <div class="control-group">
+        <label class="control-label edit-control-label" for="message_edit_content">Content</label>
+        <div class="controls edit-controls">
+            <textarea class="message_edit_content" id="message_edit_content">{{content}}</textarea>
+        </div>
+    </div>
+    <div class="control-group">
+        <div class="controls edit-controls">
+            <a class="message_edit_save btn btn-primary btn-small">Save</a>
+            <a class="message_edit_cancel btn btn-small">Cancel</a>
+        </div>
+    </div>
 </form>