From 1a7df91dbc30c24cb35210f5e41847bbbad23bf5 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Thu, 7 Feb 2019 17:25:48 -0800
Subject: [PATCH] Fix: Navigation to message via quote click didn't always work

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

diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index e841cb914a6..3d2aafb560f 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -708,9 +708,9 @@
 
       // Look for message in memory first, which would tell us if we could scroll to it
       const targetMessage = this.model.messageCollection.find(item => {
-        const messageAuthor = item.getContact().id;
+        const messageAuthor = item.getContact();
 
-        if (author !== messageAuthor) {
+        if (!messageAuthor || author !== messageAuthor.id) {
           return false;
         }
         if (id !== item.get('sent_at')) {