diff --git a/tools/jslint/check-all.js b/tools/jslint/check-all.js
index 3b3fe96712..668743bffc 100644
--- a/tools/jslint/check-all.js
+++ b/tools/jslint/check-all.js
@@ -9,7 +9,7 @@ var globals =
     + ' initial_pointer email stream_list people_list have_initial_messages'
 
     // compose.js
-    + ' show_compose hide_compose toggle_compose compose_button'
+    + ' show_compose hide_compose toggle_compose clear_compose_box compose_button'
     + ' composing_message compose_stream_name validate_message'
     + ' status_classes'
 
diff --git a/zephyr/static/js/zephyr.js b/zephyr/static/js/zephyr.js
index 77f43201d4..ff825e5fa4 100644
--- a/zephyr/static/js/zephyr.js
+++ b/zephyr/static/js/zephyr.js
@@ -127,6 +127,7 @@ function get_huddle_recipient_names(message) {
 function respond_to_message(reply_type) {
     var message, tabname;
     message = message_dict[selected_message_id];
+    clear_compose_box();
     if (message.type === "stream") {
         $("#stream").val(message.display_recipient);
         $("#subject").val(message.subject);