diff --git a/static/templates/message.handlebars b/static/templates/message.handlebars
index fd794a5e4b..54cf8556af 100644
--- a/static/templates/message.handlebars
+++ b/static/templates/message.handlebars
@@ -34,12 +34,12 @@
   {{#if is_stream}}
     <td class="message_header_colorblock" style="background-color: {{background_color}};"></td>
     <td class="message_header message_header_stream right_part">
-        <span class="message_label_clickable"><i class="icon-vector-expand-alt"></i> Expand {{count}} read {{plural count 'message' 'messages'}} on {{display_recipient}} &nbsp;<i class="icon-vector-narrow icon-vector-small"></i><span class="copy-paste-text">&gt;</span> &nbsp;{{subject}}</span>
+        <span class="message_label_clickable"><i class="icon-vector-expand-alt"></i> {{display_recipient}} &nbsp;<i class="icon-vector-narrow icon-vector-small"></i><span class="copy-paste-text">&gt;</span> &nbsp;{{subject}} ({{count}} read)</span>
     </td>
   {{else}}
     <td class="message_header_colorblock message_header_private_message" style="background-color: {{background_color}};"></td>
     <td class="message_header message_header_private_message right_part dark_background">
-        <span class="message_label_clickable"><i class="icon-vector-expand-alt"></i> Expand {{count}} read {{plural count 'message' 'messages'}} with {{display_reply_to}}</span>
+        <span class="message_label_clickable"><i class="icon-vector-expand-alt"></i> You and {{display_reply_to}} ({{count}} read)</span>
     </td>
   {{/if}}
   </tr>