diff --git a/js/models/messages.js b/js/models/messages.js
index 184d3904..6b0e8216 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -432,6 +432,7 @@
                         var conversation_timestamp = conversation.get('timestamp');
                         if (!conversation_timestamp || message.get('sent_at') > conversation_timestamp) {
                             conversation.set({
+                                lastMessage : message.getNotificationText(),
                                 timestamp: message.get('sent_at')
                             });
                         }