diff --git a/zephyr/static/js/message_list.js b/zephyr/static/js/message_list.js
index 81ed87b357..95250b0ad1 100644
--- a/zephyr/static/js/message_list.js
+++ b/zephyr/static/js/message_list.js
@@ -288,6 +288,8 @@ MessageList.prototype = {
             var top_messages = [];
             $.each(top_group, function (index, id) {
                 rows.get(id, table_name).remove();
+                // Remove any date row headers for these messages
+                $('.date_row[data-zid=' + id + ']').remove();
                 top_messages.push(self.get(id));
             });
             messages = messages.concat(top_messages);
diff --git a/zephyr/static/templates/message.handlebars b/zephyr/static/templates/message.handlebars
index ddac510b8a..a3956823e6 100644
--- a/zephyr/static/templates/message.handlebars
+++ b/zephyr/static/templates/message.handlebars
@@ -26,7 +26,7 @@
 {{/include_bookend}}
 
 {{#if show_date}}
-<tr class="date_row"><td colspan="4">{{{show_date}}}</td></tr>
+<tr class="date_row" data-zid="{{id}}"><td colspan="4">{{{show_date}}}</td></tr>
 {{/if}}
 
 {{#include_recipient}}