From dabc56d0cfd3e143d9876385b69ca68c897e7c95 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@nonnenberg.com>
Date: Wed, 18 Oct 2017 11:59:12 -0700
Subject: [PATCH] Load profiles for a conversation without blocking convo load
 (#1570)

---
 js/views/conversation_view.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 55af530c5..d0ebcc359 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -470,11 +470,9 @@
             //   messages from the database, then ensure that the loading screen is only
             //   dismissed when that is complete.
             var messagesLoaded = this.inProgressFetch || Promise.resolve();
-            messagesLoaded = messagesLoaded.then(function() {
-                return this.model.decryptOldIncomingKeyErrors();
-            }.bind(this));
 
-            Promise.all([this.statusFetch, messagesLoaded])
+            messagesLoaded
+                .then(this.model.decryptOldIncomingKeyErrors.bind(this))
                 .then(this.onLoaded.bind(this), this.onLoaded.bind(this));
 
             this.view.resetScrollPosition();