From c2d4f4b58dfaaa93d8e19dba435dd3b3cb2d710c Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Tue, 15 Oct 2019 16:07:34 +1100
Subject: [PATCH] Fix mentions bug

---
 .../securesms/conversation/ConversationActivity.java           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index c392596663..b5e55c6020 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -2775,7 +2775,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
         } catch (Exception exception) {
           mentions.clear(); // TODO: Dirty workaround for ConcurrentModificationException
         }
-      } else if (text.length() > 0) {
+      }
+      if (text.length() > 0) {
         if (currentMentionStartIndex > text.length()) {
             resetMentions(); // Should never occur
         }