From f3e66ad75eef60d0a882ae201b9bbe5e82d92248 Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Tue, 29 Jun 2021 17:23:30 +0300
Subject: [PATCH] Message List: Fix losing scroll position in unread chats

---
 src/components/middle/MessageList.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/middle/MessageList.tsx b/src/components/middle/MessageList.tsx
index 3554ed152..617d4c44f 100644
--- a/src/components/middle/MessageList.tsx
+++ b/src/components/middle/MessageList.tsx
@@ -471,7 +471,7 @@ const MessageList: FC<OwnProps & StateProps & DispatchProps> = ({
     } else if (anchor) {
       const newAnchorTop = anchor.getBoundingClientRect().top;
       newScrollTop = scrollTop + (newAnchorTop - (anchorTopRef.current || 0));
-    } else if (unreadDivider) {
+    } else if (unreadDivider && !scrollOffset) {
       newScrollTop = unreadDivider.offsetTop - (hasTools ? UNREAD_DIVIDER_TOP_WITH_TOOLS : UNREAD_DIVIDER_TOP);
     } else {
       newScrollTop = scrollHeight - scrollOffset;