From 89f5f216edb036562a182fc7676dcdcb65272ff2 Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Thu, 27 Aug 2015 18:02:39 -0700
Subject: [PATCH] Fix new conversation with no lastMessage

---
 js/models/messages.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/js/models/messages.js b/js/models/messages.js
index 9c16a55b80..dded20f962 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -217,6 +217,11 @@
                         lastMessage: message.get('body')
                     });
                 }
+                else if (!conversation.get('lastMessage')) {
+                    conversation.set({
+                        lastMessage: message.get('body')
+                    });
+                }
 
                 conversation.save().then(function() {
                     message.save().then(function() {