diff --git a/zephyr/jstemplates/zephyr.html b/zephyr/jstemplates/zephyr.html
index 56290b5b74..43d29a2c24 100644
--- a/zephyr/jstemplates/zephyr.html
+++ b/zephyr/jstemplates/zephyr.html
@@ -1,7 +1,6 @@
 {{! Client-side Mustache template for rendering zephyrs.}}
 <td class="pointer"><p></p></td>
 <td class="zephyr_recipient"><p onclick="select_zephyr({{id}})">
-    {{#include_recipient}}
     {{#is_huddle}}
         <span class="hidden zephyr_huddle_recipients_list
                      ">{{#display_recipient}}{{name}},{{/display_recipient}}</span>
@@ -23,7 +22,6 @@
         <span class="zephyr_label_clickable zephyr_instance"
               onclick="select_zephyr({{id}}); narrow_instance();">{{instance}}</span>
     {{/is_class}}
-    {{/include_recipient}}
     <br />
 </td>
 <td class="messagebox" onclick="select_zephyr({{id}})">
diff --git a/zephyr/static/js/zephyr.js b/zephyr/static/js/zephyr.js
index 10434c2278..a5b8d0a461 100644
--- a/zephyr/static/js/zephyr.js
+++ b/zephyr/static/js/zephyr.js
@@ -465,23 +465,6 @@ function add_message(index, zephyr) {
     }
     zephyr.html_content = newline2br(zephyr.content);
 
-    parent = $('#table tr:last-child');
-    zephyr_class = parent.find("span.zephyr_class").text();
-    zephyr_huddle = parent.find("span.zephyr_huddle_recipient").text();
-    zephyr_personal = parent.find("span.zephyr_personal_recipient").text();
-    zephyr_instance = parent.find("span.zephyr_instance").text();
-
-    if ((zephyr.is_huddle && zephyr_huddle === zephyr.name) ||
-        (zephyr.is_personal && zephyr_personal === zephyr.display_recipient) ||
-        (zephyr.is_class && zephyr_class === zephyr.display_recipient &&
-            zephyr_instance === zephyr.instance)) {
-        zephyr.include_recipient = false;
-    } else {
-        zephyr.include_recipient = true;
-        // add a space to the table
-        $('#table').append($('<tr />').append($('<td />').html('<br/>')));
-    }
-
     var new_tr = $('<tr />').attr('id', zephyr.id);
     $('#table').append(new_tr);
     new_tr.append(ich.zephyr(zephyr));