From 9ac85a31a7023d380dee7470d937684e9725e5c6 Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Mon, 27 Sep 2021 16:57:14 +0200
Subject: [PATCH 1/2] fix(ui): thread reply scrolling main list

---
 packages/stream_chat_flutter/lib/src/message_list_view.dart | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/stream_chat_flutter/lib/src/message_list_view.dart b/packages/stream_chat_flutter/lib/src/message_list_view.dart
index 4f76a3bf..e67f00dd 100644
--- a/packages/stream_chat_flutter/lib/src/message_list_view.dart
+++ b/packages/stream_chat_flutter/lib/src/message_list_view.dart
@@ -1227,8 +1227,9 @@ class _MessageListViewState extends State<MessageListView> {
           _bottomPaginationActive = false;
           _topPaginationActive = false;
         }
-        if (event.message!.user!.id ==
-            streamChannel!.channel.client.state.currentUser!.id) {
+        if (event.message?.parentId == widget.parentMessage?.id &&
+            event.message!.user!.id ==
+                streamChannel!.channel.client.state.currentUser!.id) {
           WidgetsBinding.instance!.addPostFrameCallback((_) {
             _scrollController?.jumpTo(
               index: 0,

From 5a9af36d8acc7264397f0c0154647130e5b4a8f8 Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Mon, 27 Sep 2021 16:58:57 +0200
Subject: [PATCH 2/2] chore(ui): update changelog

---
 packages/stream_chat_flutter/CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index 0117a7ce..ec368723 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -1,3 +1,9 @@
+## Upcoming
+
+🐞 Fixed
+
+-[[#687]](https://github.com/GetStream/stream-chat-flutter/issues/687): Fix Users losing their place in the conversation after replying in threads.
+
 ## 3.0.0
 
 - Updated `stream_chat_flutter_core` dependency to [`3.0.0`](https://pub.dev/packages/stream_chat_flutter_core/changelog).