diff --git a/static/styles/zulip.css b/static/styles/zulip.css
index 2dbd7a7527..8c3c167fbb 100644
--- a/static/styles/zulip.css
+++ b/static/styles/zulip.css
@@ -728,6 +728,10 @@ td.pointer {
     width: auto;
 }
 
+.sender-status .message_edit_notice {
+    line-height: 18px;
+}
+
 .message_edit_notice {
     font-size: 10px;
     color: #a1a1a1;
diff --git a/static/templates/single_message.handlebars b/static/templates/single_message.handlebars
index 81426f10be..e358baa6b1 100644
--- a/static/templates/single_message.handlebars
+++ b/static/templates/single_message.handlebars
@@ -10,12 +10,28 @@
           <span class="message_sender{{^status_message}} sender_info_hover{{/status_message}}">
             {{! See ../js/notifications.js for another user of avatar_url. }}
             <div class="inline_profile_picture{{#status_message}} sender_info_hover{{/status_message}}"
-                 style="background-image: url('{{small_avatar_url}}');"/><span class="{{^status_message}}sender_name{{/status_message}}{{#status_message}}sender-status{{/status_message}}">{{#unless status_message}}{{msg/sender_full_name}}{{else}}<span class="sender_name{{#status_message}}-in-status{{/status_message}} sender_info_hover">{{msg/sender_full_name}}</span>{{{ status_message }}}{{/unless}}</span>
+                 style="background-image: url('{{small_avatar_url}}');"/>
+          <span class="{{^status_message}}sender_name{{/status_message}}{{#status_message}}sender-status{{/status_message}}">
+
+            {{#unless status_message}}
+              {{msg/sender_full_name}}
+            {{else}}
+              <span class="sender_name{{#status_message}}-in-status{{/status_message}} sender_info_hover">{{msg/sender_full_name}}</span>
+                  {{{ status_message }}}
+            {{/unless}}
+            {{#if_and last_edit_timestr include_sender}}
+              {{#if status_message}}
+                <div class="message_edit_notice" title="Edited ({{last_edit_timestr}})">{{t "EDITED" }}</div>
+              {{/if}}
+            {{/if_and}}
+          </span>
           </span>
           {{/include_sender}}
           <span class="message_time{{#if msg.local_id}} notvisible{{/if}}{{#if status_message}} status-time{{/if}}">{{timestr}}</span>
           {{#if_and last_edit_timestr include_sender}}
-          <div class="message_edit_notice" title="Edited ({{last_edit_timestr}})">{{t "EDITED" }}</div>
+            {{#unless status_message}}
+                <div class="message_edit_notice" title="Edited ({{last_edit_timestr}})">{{t "EDITED" }}</div>
+            {{/unless}}
           {{/if_and}}
           <div class="message_controls{{#status_message}} sender-status-controls{{/status_message}}">
             <div class="star">
@@ -33,7 +49,7 @@
         <div class="message_content">{{#unless status_message}}{{#if use_match_properties}}{{{msg/match_content}}}{{else}}{{{msg/content}}}{{/if}}{{/unless}}</div>
         {{#if last_edit_timestr}}
           {{#unless include_sender}}
-          <div class="message_edit_notice" title="Edited ({{last_edit_timestr}})">{{t "EDITED" }}</div>
+            <div class="message_edit_notice" title="Edited ({{last_edit_timestr}})">{{t "EDITED" }}</div>
           {{/unless}}
         {{/if}}
         <div class="message_edit">