Merge branch 'develop' into fix/857

packages/stream_chat/lib/src/client/channel.dart

@@ -1803,7 +1803,13 @@ class ChannelClientState {
       if (replyCount == null || replyCount == 0) return;
 
       addMessage(parentMessage.copyWith(replyCount: replyCount - 1));
-      updateThreadInfo(parentId, threads[parentId]!..remove(message));
+      updateThreadInfo(
+        parentId,
+        threads[parentId]!
+          ..removeWhere(
+            (e) => e.id == message.id,
+          ),
+      );
     } else {
       // Remove regular message
       final allMessages = [...messages];

packages/stream_chat/lib/src/db/chat_persistence_client.dart

@@ -253,6 +253,7 @@ abstract class ChatPersistenceClient {
 
         users.addAll([
           channel.createdBy,
+          ...messages.map((it) => it.user),
           ...reads.map((it) => it.user),
           ...members.map((it) => it.user),
           ...reactions.map((it) => it.user),