From 67c08dfaf20a3abe81ecf8c2f1e5757843408207 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@humbughq.com>
Date: Tue, 9 Oct 2012 09:39:30 -0400
Subject: [PATCH] Set huddle_recipient even when replying to class messages.

(imported from commit dc91d66d87fb1b4c70d7b1842b733282c80b3e4a)
---
 zephyr/static/js/zephyr.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/zephyr/static/js/zephyr.js b/zephyr/static/js/zephyr.js
index 2c792a56ef..9edcd1f111 100644
--- a/zephyr/static/js/zephyr.js
+++ b/zephyr/static/js/zephyr.js
@@ -117,11 +117,13 @@ function respond_to_zephyr() {
         $("#class").val(zephyr.display_recipient);
         $("#instance").val(zephyr.instance);
         show_compose('class', $("#new_zephyr"));
+        $("#huddle_recipient").val(zephyr.sender);
         break;
 
     case 'huddle':
         $('#zephyr-type-tabs a[href="#personal-message"]').tab('show');
-        prepare_huddle(zephyr.reply_to);
+        show_compose('personal', $("#new_zephyr"));
+        $("#huddle_recipient").val(zephyr.reply_to);
         break;
 
     case 'personal':
@@ -132,7 +134,8 @@ function respond_to_zephyr() {
         if (recipient === email) { // that is, we sent the original message
             recipient = zephyr.sender_email;
         }
-        prepare_huddle(recipient);
+        show_compose('personal', $("#new_zephyr"));
+        $("#huddle_recipient").val(recipient);
         break;
     }
 }