diff --git a/message/templates/message_drawer_conversations_list.mustache b/message/templates/message_drawer_conversations_list.mustache
index 55ec82db5e9..5cdee0e7d7b 100644
--- a/message/templates/message_drawer_conversations_list.mustache
+++ b/message/templates/message_drawer_conversations_list.mustache
@@ -87,6 +87,9 @@
                             }
                         {{/str}}
                     {{/lastsendername}}
+                    {{^lastsendername}}
+                        <span class='text-muted'>{{lastmessage}}</span>
+                    {{/lastsendername}}
                 {{/sentfromcurrentuser}}
             </p>
         </div>