diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart
index c85c85e68..6d08f4bd8 100644
--- a/lib/pages/chat/events/message.dart
+++ b/lib/pages/chat/events/message.dart
@@ -342,8 +342,12 @@ class Message extends StatelessWidget {
                                             crossAxisAlignment:
                                                 CrossAxisAlignment.start,
                                             children: <Widget>[
-                                              if (event.relationshipType ==
-                                                  RelationshipTypes.reply)
+                                              if ({
+                                                RelationshipTypes.reply,
+                                                RelationshipTypes.thread,
+                                              }.contains(
+                                                event.relationshipType,
+                                              ))
                                                 FutureBuilder<Event?>(
                                                   future: event
                                                       .getReplyEvent(timeline),
diff --git a/lib/pages/chat_members/chat_members_view.dart b/lib/pages/chat_members/chat_members_view.dart
index ef55411d9..ed2a41ff5 100644
--- a/lib/pages/chat_members/chat_members_view.dart
+++ b/lib/pages/chat_members/chat_members_view.dart
@@ -144,15 +144,18 @@ class ChatMembersView extends StatelessWidget {
                                             L10n.of(context).banned,
                                           Membership.invite =>
                                             L10n.of(context).invited,
-                                          Membership.join => L10n.of(context)
-                                              .countParticipants(room.summary
-                                                      .mJoinedMemberCount ??
+                                          Membership.join =>
+                                            L10n.of(context).countParticipants(
+                                              room.summary.mJoinedMemberCount ??
                                                   controller.members
-                                                      ?.where((member) =>
-                                                          member.membership ==
-                                                          Membership.join)
+                                                      ?.where(
+                                                        (member) =>
+                                                            member.membership ==
+                                                            Membership.join,
+                                                      )
                                                       .length ??
-                                                  0),
+                                                  0,
+                                            ),
                                           Membership.knock =>
                                             L10n.of(context).knocking,
                                           Membership.leave =>
diff --git a/lib/utils/push_helper.dart b/lib/utils/push_helper.dart
index c59178e00..6e242eedb 100644
--- a/lib/utils/push_helper.dart
+++ b/lib/utils/push_helper.dart
@@ -1,19 +1,21 @@
 import 'dart:ui';
 
-import 'package:collection/collection.dart';
-import 'package:fluffychat/config/app_config.dart';
-import 'package:fluffychat/utils/client_download_content_extension.dart';
-import 'package:fluffychat/utils/client_manager.dart';
-import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
-import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+
+import 'package:collection/collection.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:flutter_shortcuts_new/flutter_shortcuts_new.dart';
 import 'package:matrix/matrix.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
+import 'package:fluffychat/config/app_config.dart';
+import 'package:fluffychat/utils/client_download_content_extension.dart';
+import 'package:fluffychat/utils/client_manager.dart';
+import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
+import 'package:fluffychat/utils/platform_infos.dart';
+
 Future<void> pushHelper(
   PushNotification notification, {
   Client? client,