From b5f5c4604c580235811a729c3b817f2faa9516b2 Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Wed, 12 Oct 2016 10:32:11 +0900
Subject: [PATCH] Fix missing hourglass on some expiring messages

Resolves a race condition between marking messages read and
loading/rendering those messages in the frontend.

Fixes #942
---
 js/views/conversation_view.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 1066cd90b..65825b0e2 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -209,6 +209,9 @@
             return this.model.fetchContacts().then(function() {
                 return this.model.fetchMessages().then(function() {
                     this.$('.bar-container').hide();
+                    this.model.messageCollection.where({unread: 1}).forEach(function(m) {
+                        m.fetch();
+                    });
                 }.bind(this));
             }.bind(this));
             // TODO catch?