diff --git a/zephyr/static/js/compose.js b/zephyr/static/js/compose.js
index 16a7be1eaf..44845b44d9 100644
--- a/zephyr/static/js/compose.js
+++ b/zephyr/static/js/compose.js
@@ -143,7 +143,7 @@ function do_fade(reply_message, fade_type) {
         type: fade_type
     };
     if (fade_type === "stream") {
-        faded_to.recipient_id = reply_message.recipient_id;
+        faded_to.display_recipient = reply_message.display_recipient;
         faded_to.subject = reply_message.subject;
     } else {
         faded_to.reply_to = reply_message.reply_to;
diff --git a/zephyr/static/js/util.js b/zephyr/static/js/util.js
index 1f957462fd..7808841919 100644
--- a/zephyr/static/js/util.js
+++ b/zephyr/static/js/util.js
@@ -166,9 +166,8 @@ exports.lower_bound = function (array, arg1, arg2, arg3, arg4) {
 };
 
 exports.same_stream_and_subject = function util_same_stream_and_subject(a, b) {
-    // Streams and subjects are case-insensitive. Streams have
-    // already been forced to the canonical case.
-    return ((a.recipient_id === b.recipient_id) &&
+    // Streams and subjects are case-insensitive.
+    return ((a.display_recipient.toLowerCase() === b.display_recipient.toLowerCase()) &&
             (a.subject.toLowerCase() === b.subject.toLowerCase()));
 };