diff --git a/zephyr/jstemplates/message.html b/zephyr/jstemplates/message.html
index df07e18d46..895f2e2ca5 100644
--- a/zephyr/jstemplates/message.html
+++ b/zephyr/jstemplates/message.html
@@ -25,6 +25,7 @@
         class="message_header message_header_stream left_part" style="background-color: {{background_color}};">
     </td>
     <td class="message_header message_header_stream right_part" style="background-color: {{background_color}};">
+      {{#if invite_only}}<i class="icon-lock" title="This is an invite-only stream"></i>{{/if}}
       <span class="message_label_clickable narrows_by_recipient stream_label"
             title="Narrow to stream &quot;{{display_recipient}}&quot;">{{display_recipient}}</span>
       &nbsp; | &nbsp;
diff --git a/zephyr/static/js/subs.js b/zephyr/static/js/subs.js
index b984669e90..36066c797b 100644
--- a/zephyr/static/js/subs.js
+++ b/zephyr/static/js/subs.js
@@ -203,6 +203,14 @@ exports.get_color = function (stream_name) {
     return stream_info[lstream_name].color;
 };
 
+exports.get_invite_only = function (stream_name) {
+    var lstream_name = stream_name.toLowerCase();
+    if (stream_info[lstream_name] === undefined) {
+        return false;
+    }
+    return stream_info[lstream_name].invite_only;
+};
+
 function get_disjoint_list(list1, list2) {
     return $.grep(list1, function (elt) {
         return $.inArray(elt, list2) === -1;
diff --git a/zephyr/static/js/zephyr.js b/zephyr/static/js/zephyr.js
index 7fde31a9d8..688e476668 100644
--- a/zephyr/static/js/zephyr.js
+++ b/zephyr/static/js/zephyr.js
@@ -343,6 +343,7 @@ function add_to_table(messages, table_name, filter_function, where, allow_collap
 
         if (message.is_stream) {
             message.background_color = subs.get_color(message.display_recipient);
+            message.invite_only = subs.get_invite_only(message.display_recipient);
         }
 
         messages_to_render.push(message);