diff --git a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java
index e20bbf5dc..14ae83aa5 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java
@@ -2270,8 +2270,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
 
         if( doScroll!=0 ) {
             scrollToMessageId(doScroll, doHilite);
-            updateVisibleRows();
         }
+        else {
+            highlightMessageId = 0;
+        }
+        updateVisibleRows();
 
         if( m_lastSearchQuery.isEmpty() ) {
             searchItem.setExtraSearchInfo("", true, true, true);