diff --git a/zephyr/static/js/compose.js b/zephyr/static/js/compose.js
index 5368306e06..24a70d0b3d 100644
--- a/zephyr/static/js/compose.js
+++ b/zephyr/static/js/compose.js
@@ -126,8 +126,6 @@ exports.start = function (msg_type, opts) {
         return;
     }
 
-    compose.clear();
-
     var default_opts = {
         message_type:     msg_type,
         stream:           '',
@@ -140,6 +138,16 @@ exports.start = function (msg_type, opts) {
 
     opts = $.extend(default_opts, opts);
 
+    if (!(compose.composing() === msg_type &&
+          ((msg_type === "stream" &&
+            opts.stream === compose.stream() &&
+            opts.subject === compose.subject()) ||
+           (msg_type === "private" &&
+            opts.private_message_recipient === compose.recipient())))) {
+        // Clear the compose box if the existing message is to a different recipient
+        compose.clear();
+    }
+
     compose.stream_name(opts.stream);
     compose.subject(opts.subject);
     compose.recipient(opts.private_message_recipient);