diff --git a/templates/zephyr/index.html b/templates/zephyr/index.html
index d8e56ba9dc..4326c97c4a 100644
--- a/templates/zephyr/index.html
+++ b/templates/zephyr/index.html
@@ -11,6 +11,7 @@
 <script type="text/javascript" src="/static/js/zephyr.js"></script>
 <script type="text/javascript">
 var initial_zephyr_json = {{ zephyr_json }};
+var username = "{{ user_profile.user.username }}";
 </script>
 
 <div class="row-fluid">
diff --git a/zephyr/static/js/zephyr.js b/zephyr/static/js/zephyr.js
index a4a022c300..2467699d0c 100644
--- a/zephyr/static/js/zephyr.js
+++ b/zephyr/static/js/zephyr.js
@@ -146,7 +146,12 @@ $(document).keydown(function(event) {
                 $("#new_zephyr").focus();
                 $("#new_zephyr").select();
             } else { // No instance, must be a personal
-                prepare_personal(parent.find("span.zephyr_sender").text());
+
+                var recipient = parent.find("span.zephyr_sender").text();
+                if (recipient == username) { // that is, we sent the original message
+                    recipient = parent.find("span.zephyr_personal_recipient").text();
+                }
+                prepare_personal(recipient);
                 $("#new_personal_zephyr").focus();
                 $("#new_personal_zephyr").select();
             }