diff --git a/templates/zephyr/compose.html b/templates/zephyr/compose.html
index 36877a99ce..7f5f643e91 100644
--- a/templates/zephyr/compose.html
+++ b/templates/zephyr/compose.html
@@ -49,6 +49,7 @@
                   </div>
                 </div>
                 <div id="tab-enter-message">
+                  <span id="sending-indicator">Sending...</span>
                   <label class="pull-right">Press Enter to send&nbsp;
                     <input type="checkbox" id="enter_sends" name="enter_sends" value="ender_sends" />
                   </label>
diff --git a/zephyr/static/js/compose.js b/zephyr/static/js/compose.js
index fae58a1d01..4a52ba63fe 100644
--- a/zephyr/static/js/compose.js
+++ b/zephyr/static/js/compose.js
@@ -198,6 +198,7 @@ function compose_error(error_text, bad_input) {
                .stop(true).fadeTo(0, 1);
     $('#error-msg').html(error_text);
     $("#compose-send-button").removeAttr('disabled');
+    $("#sending-indicator").hide();
     bad_input.focus().select();
 }
 
@@ -240,6 +241,7 @@ function send_message() {
             is_composing_message = false;
             compose.hide();
             $("#compose-send-button").removeAttr('disabled');
+            $("#sending-indicator").hide();
         },
         error: function (xhr, error_type) {
             if (error_type !== 'timeout' && reload.is_pending()) {
@@ -367,6 +369,7 @@ function check_stream_for_send(stream_name) {
         ui.report_error("Error checking subscription", xhr, $("#home-error"));
         $("#stream").focus();
         $("#compose-send-button").removeAttr('disabled');
+        $("#sending-indicator").hide();
     }
 
     return result;
@@ -423,6 +426,7 @@ function validate_private_message() {
 
 exports.validate = function () {
     $("#compose-send-button").attr('disabled', 'disabled').blur();
+    $("#sending-indicator").show();
 
     if (exports.message_content() === "") {
         compose_error("You have nothing to send!", $("#new_message_content"));
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index b38e566813..bec3f6ba33 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -1026,3 +1026,9 @@ table.floating_recipient {
 .emoji {
     height: 1.4em;
 }
+
+#sending-indicator {
+    float: left;
+    font-weight: bold;
+    display: none;
+}