diff --git a/lib/config/setting_keys.dart b/lib/config/setting_keys.dart
index 1b19ac795..7011e8645 100644
--- a/lib/config/setting_keys.dart
+++ b/lib/config/setting_keys.dart
@@ -32,7 +32,6 @@ enum AppSettings<T> {
   fontSizeFactor<double>('chat.fluffy.font_size_factor', 1.0),
   hideRedactedEvents<bool>('chat.fluffy.hideRedactedEvents', false),
   hideUnknownEvents<bool>('chat.fluffy.hideUnknownEvents', true),
-  separateChatTypes<bool>('chat.fluffy.separateChatTypes', false),
   autoplayImages<bool>('chat.fluffy.autoplay_images', true),
   sendTypingNotifications<bool>('chat.fluffy.send_typing_notifications', true),
   sendPublicReadReceipts<bool>('chat.fluffy.send_public_read_receipts', true),
diff --git a/lib/pages/bootstrap/bootstrap_dialog.dart b/lib/pages/bootstrap/bootstrap_dialog.dart
index e7fa87032..9d2b5fabf 100644
--- a/lib/pages/bootstrap/bootstrap_dialog.dart
+++ b/lib/pages/bootstrap/bootstrap_dialog.dart
@@ -115,7 +115,7 @@ class BootstrapDialogState extends State<BootstrapDialog> {
     await client.accountDataLoading;
     await client.userDeviceKeysLoading;
     while (client.prevBatch == null) {
-      await client.onSync.stream.first;
+      await client.onSyncStatus.stream.first;
     }
     await client.updateUserDeviceKeys();
     _wipe = wipe;
diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart
index 3b54e1a8c..01e3e009a 100644
--- a/lib/pages/chat_list/chat_list.dart
+++ b/lib/pages/chat_list/chat_list.dart
@@ -374,9 +374,7 @@ class ChatListController extends State<ChatList>
 
   @override
   void initState() {
-    activeFilter = AppSettings.separateChatTypes.value
-        ? ActiveFilter.messages
-        : ActiveFilter.allChats;
+    activeFilter = ActiveFilter.allChats;
     _initReceiveSharingIntent();
     _activeSpaceId = widget.activeSpace;
 
diff --git a/lib/pages/chat_list/chat_list_body.dart b/lib/pages/chat_list/chat_list_body.dart
index 1aa398f3f..63e8dee20 100644
--- a/lib/pages/chat_list/chat_list_body.dart
+++ b/lib/pages/chat_list/chat_list_body.dart
@@ -140,18 +140,17 @@ class ChatListViewBody extends StatelessWidget {
                         scrollDirection: Axis.horizontal,
                         children:
                             [
-                                  if (AppSettings.separateChatTypes.value)
-                                    ActiveFilter.messages
-                                  else
-                                    ActiveFilter.allChats,
-                                  ActiveFilter.groups,
-                                  ActiveFilter.unread,
+                                  ActiveFilter.allChats,
+
                                   if (spaceDelegateCandidates.isNotEmpty &&
                                       !AppSettings
                                           .displayNavigationRail
                                           .value &&
                                       !FluffyThemes.isColumnMode(context))
                                     ActiveFilter.spaces,
+                                  ActiveFilter.unread,
+                                  ActiveFilter.groups,
+                                  ActiveFilter.messages,
                                 ]
                                 .map(
                                   (filter) => Padding(
diff --git a/lib/pages/settings_style/settings_style_view.dart b/lib/pages/settings_style/settings_style_view.dart
index fcace2b59..213cf5d5f 100644
--- a/lib/pages/settings_style/settings_style_view.dart
+++ b/lib/pages/settings_style/settings_style_view.dart
@@ -349,10 +349,6 @@ class SettingsStyleView extends StatelessWidget {
               title: L10n.of(context).presencesToggle,
               setting: AppSettings.showPresences,
             ),
-            SettingsSwitchListTile.adaptive(
-              title: L10n.of(context).separateChatTypes,
-              setting: AppSettings.separateChatTypes,
-            ),
             SettingsSwitchListTile.adaptive(
               title: L10n.of(context).displayNavigationRail,
               setting: AppSettings.displayNavigationRail,
diff --git a/macos/Podfile.lock b/macos/Podfile.lock
index 3e928cef2..f9cfc10c1 100644
--- a/macos/Podfile.lock
+++ b/macos/Podfile.lock
@@ -21,7 +21,8 @@ PODS:
     - FlutterMacOS
   - flutter_new_badger (0.0.1):
     - FlutterMacOS
-  - flutter_secure_storage_macos (6.1.3):
+  - flutter_secure_storage_darwin (10.0.0):
+    - Flutter
     - FlutterMacOS
   - flutter_vodozemac (0.0.1):
     - FlutterMacOS
@@ -89,7 +90,7 @@ DEPENDENCIES:
   - file_selector_macos (from `Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos`)
   - flutter_local_notifications (from `Flutter/ephemeral/.symlinks/plugins/flutter_local_notifications/macos`)
   - flutter_new_badger (from `Flutter/ephemeral/.symlinks/plugins/flutter_new_badger/macos`)
-  - flutter_secure_storage_macos (from `Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos`)
+  - flutter_secure_storage_darwin (from `Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_darwin/darwin`)
   - flutter_vodozemac (from `Flutter/ephemeral/.symlinks/plugins/flutter_vodozemac/macos`)
   - flutter_web_auth_2 (from `Flutter/ephemeral/.symlinks/plugins/flutter_web_auth_2/macos`)
   - flutter_webrtc (from `Flutter/ephemeral/.symlinks/plugins/flutter_webrtc/macos`)
@@ -139,8 +140,8 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/flutter_local_notifications/macos
   flutter_new_badger:
     :path: Flutter/ephemeral/.symlinks/plugins/flutter_new_badger/macos
-  flutter_secure_storage_macos:
-    :path: Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos
+  flutter_secure_storage_darwin:
+    :path: Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_darwin/darwin
   flutter_vodozemac:
     :path: Flutter/ephemeral/.symlinks/plugins/flutter_vodozemac/macos
   flutter_web_auth_2:
@@ -194,7 +195,7 @@ SPEC CHECKSUMS:
   file_selector_macos: 9e9e068e90ebee155097d00e89ae91edb2374db7
   flutter_local_notifications: 4bf37a31afde695b56091b4ae3e4d9c7a7e6cda0
   flutter_new_badger: 6fe9bf7e42793a164032c21f164c0ad9985cd0f2
-  flutter_secure_storage_macos: 7f45e30f838cf2659862a4e4e3ee1c347c2b3b54
+  flutter_secure_storage_darwin: acdb3f316ed05a3e68f856e0353b133eec373a23
   flutter_vodozemac: fd2ea9cb3e2a37beaac883a369811fbfe042fc53
   flutter_web_auth_2: 62b08da29f15a20fa63f144234622a1488d45b65
   flutter_webrtc: 718eae22a371cd94e5d56aa4f301443ebc5bb737