diff --git a/static/templates/message.handlebars b/static/templates/message.handlebars
index d2d01079b6..de4fe71bf9 100644
--- a/static/templates/message.handlebars
+++ b/static/templates/message.handlebars
@@ -147,7 +147,6 @@
           <span class="topic_edit_form" id="{{id}}"></span>
       </span>
     </td>
-</tr>
 {{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">
@@ -158,8 +157,8 @@
                title="Narrow to your private messages with {{display_reply_to}}">
         You and {{display_reply_to}}</span>
     </td>
-</tr>
 {{/if}}
+</tr>
 {{/include_recipient}}
 <tr zid="{{id}}" id="{{dom_id}}"
     class="message_row{{^is_stream}} private-message{{/is_stream}}{{#include_sender}} include-sender{{/include_sender}}{{#contains_mention}} mention{{/contains_mention}}{{#include_footer}} last_message{{/include_footer}}{{#unread}} unread{{/unread}} selectable_row">
@@ -179,7 +178,7 @@
         <div class="message_controls">
           <div class="star">
             <span class="message_star {{#if starred}}icon-vector-star{{else}}icon-vector-star empty-star{{/if}}"
-               title="{{#if starred}}Unstar{{else}}Star{{/if}} this message"></i>
+               title="{{#if starred}}Unstar{{else}}Star{{/if}} this message"></span>
           </div>
           <div class="info actions_hover">
             <i class="icon-vector-chevron-down"></i>