diff --git a/assets/translations/en-Shaw.json b/assets/translations/en-Shaw.json
new file mode 100644
index 000000000..29f173b60
--- /dev/null
+++ b/assets/translations/en-Shaw.json
@@ -0,0 +1,65 @@
+{
+    "title-intro": "𐑢𐑧𐑤𐑒𐑩𐑥 𐑑 {}",
+    "header-intro": "𐑐𐑮𐑦𐑝𐑩𐑕𐑦 𐑯 𐑓𐑮𐑰𐑛𐑩𐑥\n𐑢𐑦𐑞𐑬𐑑 𐑞 𐑣𐑨𐑕𐑩𐑤.",
+    "title-proxy-use-basic-authentication": "𐑿𐑟 𐑐𐑮𐑪𐑒𐑕𐑦 𐑷𐑔𐑧𐑯𐑑𐑦𐑒𐑱𐑖𐑩𐑯",
+    "title-dialog-captcha": "𐑒𐑩𐑥𐑐𐑤𐑰𐑑 ·𐑒𐑨𐑐𐑗𐑩",
+    "header-login": "𐑑𐑱𐑒 𐑚𐑨𐑒 𐑞 𐑗𐑨𐑑",
+    "header-signup-username": "𐑒𐑮𐑦𐑱𐑑 𐑩 𐑿𐑟𐑼𐑯𐑱𐑥",
+    "title-view-delete-devices": "𐑒𐑩𐑯𐑓𐑻𐑥 𐑛𐑦𐑝𐑲𐑕 𐑮𐑦𐑥𐑵𐑝𐑩𐑤",
+    "title-view-search-groups": "𐑦𐑒𐑕𐑐𐑤𐑹 𐑜𐑮𐑵𐑐𐑕",
+    "title-view-search-users": "𐑕𐑻𐑗 𐑿𐑟𐑼𐑟",
+    "title-view-invite-users": "𐑦𐑯𐑝𐑲𐑑 𐑿𐑟𐑼𐑟",
+    "title-view-chat-users": "𐑷𐑤 𐑗𐑨𐑑 𐑿𐑟𐑼𐑟",
+    "title-view-create-group-public": "𐑒𐑮𐑦𐑱𐑑 𐑩 𐑐𐑳𐑚𐑤𐑦𐑒 𐑜𐑮𐑵𐑐",
+    "title-view-devices": "𐑛𐑦𐑝𐑲𐑕𐑩𐑟",
+    "title-view-settings": "𐑕𐑧𐑑𐑦𐑙𐑟",
+    "title-view-theming": "𐑩𐑐𐑽𐑩𐑯𐑕",
+    "title-view-invite": "𐑦𐑯𐑝𐑲𐑑",
+    "title-view-settings-chat": "𐑗𐑨𐑑𐑕",
+    "title-view-homeserver-search": "𐑓𐑲𐑯𐑛 𐑘𐑹 𐑣𐑴𐑥𐑕𐑻𐑝𐑼",
+    "title-proxy-host": "𐑥𐑪𐑛𐑦𐑓𐑲 𐑐𐑮𐑪𐑒𐑕𐑦 𐑣𐑴𐑕𐑑",
+    "title-proxy-port": "𐑥𐑪𐑛𐑦𐑓𐑲 𐑐𐑮𐑪𐑒𐑕𐑦 𐑐𐑹𐑑",
+    "title-proxy-username": "𐑥𐑪𐑛𐑦𐑓𐑲 𐑐𐑮𐑪𐑒𐑕𐑦 𐑿𐑟𐑼𐑯𐑱𐑥",
+    "title-proxy-password": "𐑥𐑪𐑛𐑦𐑓𐑲 𐑐𐑮𐑪𐑒𐑕𐑦 𐑐𐑭𐑕𐑢𐑻𐑛",
+    "title-search-unencrypted": "𐑕𐑻𐑗 𐑳𐑯𐑦𐑯𐑒𐑮𐑦𐑐𐑑𐑩𐑛",
+    "title-message-details": "𐑥𐑧𐑕𐑦𐑡 𐑛𐑰𐑑𐑱𐑤𐑟",
+    "title-send-media-message": "𐑕𐑧𐑯𐑛 𐑥𐑰𐑛𐑾 𐑥𐑧𐑕𐑦𐑡",
+    "title-send-media-message-unencrypted": "𐑕𐑧𐑯𐑛 𐑥𐑰𐑛𐑾 𐑥𐑧𐑕𐑦𐑡 (𐑳𐑯𐑦𐑯𐑒𐑮𐑦𐑐𐑑𐑩𐑛)",
+    "title-toggle-autocorrect": "𐑑𐑪𐑜𐑩𐑤 𐑒𐑰𐑚𐑹𐑛 𐑷𐑑𐑴𐑒𐑼𐑧𐑒𐑑",
+    "title-dialog-confirm-linkout": "𐑒𐑩𐑯𐑓𐑻𐑥 𐑴𐑐𐑩𐑯𐑦𐑙 𐑤𐑦𐑙𐑒",
+    "title-dialog-encryption": "𐑦𐑯𐑒𐑮𐑦𐑐𐑑 𐑗𐑨𐑑?",
+    "title-dialog-email-requirement": "𐑰𐑥𐑱𐑤 𐑮𐑦𐑒𐑢𐑲𐑼𐑥𐑩𐑯𐑑",
+    "title-dialog-email-requirement-verified": "𐑰𐑥𐑱𐑤 𐑝𐑧𐑮𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯",
+    "title-device-rename": "𐑮𐑰𐑯𐑱𐑥 𐑩 𐑛𐑦𐑝𐑲𐑕",
+    "label-on": "𐑪𐑯",
+    "label-off": "𐑪𐑓",
+    "label-email": "𐑰𐑥𐑱𐑤",
+    "label-users": "𐑿𐑟𐑼𐑟",
+    "label-back": "𐑜𐑴 𐑚𐑨𐑒",
+    "label-close": "𐑒𐑤𐑴𐑕",
+    "label-send": "𐑕𐑧𐑯𐑛",
+    "label-download-image": "𐑤𐑴𐑛 𐑦𐑥𐑦𐑡",
+    "label-users-results": "𐑥𐑨𐑗𐑑 𐑿𐑟𐑼𐑟",
+    "title-verification": "𐑝𐑧𐑮𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯",
+    "title-view-create-group": "𐑒𐑮𐑦𐑱𐑑 𐑩 𐑜𐑮𐑵𐑐 𐑗𐑨𐑑",
+    "title-view-advanced": "𐑩𐑛𐑝𐑭𐑯𐑕𐑑",
+    "title-view-profile": "𐑕𐑧𐑑 𐑳𐑐 𐑘𐑹 𐑐𐑮𐑴𐑓𐑲𐑤",
+    "title-view-privacy": "𐑐𐑮𐑦𐑝𐑩𐑕𐑦 𐑯 𐑕𐑦𐑒𐑘𐑫𐑼𐑦𐑑𐑦",
+    "title-proxy-use-proxy": "𐑿𐑟 𐑩 𐑐𐑮𐑪𐑒𐑕𐑦",
+    "title-toggle-suggestions": "𐑑𐑪𐑜𐑩𐑤 𐑒𐑰𐑚𐑹𐑛 𐑢𐑻𐑛 𐑕𐑩𐑡𐑧𐑕𐑗𐑩𐑯𐑟",
+    "title-dialog-draft-preview": "𐑛𐑮𐑭𐑓𐑑 𐑐𐑮𐑰𐑝𐑿",
+    "subtitle-proxy-use-proxy": "𐑞𐑦𐑕 𐑢𐑦𐑤 𐑓𐑹𐑕 𐑷𐑤 𐑑𐑮𐑨𐑓𐑦𐑒 𐑤𐑰𐑝𐑦𐑙 ·𐑕𐑲𐑓𐑩𐑯 𐑑 𐑛𐑵 𐑕𐑴 𐑝𐑲𐑩 𐑩 𐑐𐑮𐑪𐑒𐑕𐑦",
+    "title-confirm-lock-overlay": "𐑐𐑤𐑰𐑟 𐑒𐑩𐑯𐑓𐑻𐑥 𐑐𐑭𐑕𐑒𐑴𐑛.",
+    "title-lock-overlay": "𐑐𐑤𐑰𐑟 𐑧𐑯𐑑𐑼 𐑐𐑭𐑕𐑒𐑴𐑛.",
+    "title-dialog-delete-keys": "𐑒𐑩𐑯𐑓𐑻𐑥 𐑛𐑦𐑤𐑰𐑑𐑦𐑙 𐑒𐑰𐑟",
+    "title-dialog-terms": "𐑒𐑩𐑯𐑓𐑻𐑥 𐑑𐑻𐑥𐑟 𐑝 𐑕𐑻𐑝𐑦𐑕",
+    "title-dialog-terms-alpha": "𐑒𐑩𐑯𐑓𐑻𐑥 𐑴𐑐𐑩𐑯 𐑨𐑤𐑓𐑩 𐑑𐑻𐑥𐑟 𐑝 𐑕𐑻𐑝𐑦𐑕",
+    "title-dialog-accept-invite": "𐑩𐑒𐑕𐑧𐑐𐑑 𐑦𐑯𐑝𐑲𐑑?",
+    "title-user-verification": "𐑿𐑟𐑼 𐑝𐑧𐑮𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯",
+    "title-confirm-password": "𐑒𐑩𐑯𐑓𐑻𐑥 𐑐𐑭𐑕𐑢𐑻𐑛",
+    "title-confirm-email": "𐑒𐑩𐑯𐑓𐑻𐑥 𐑰𐑥𐑱𐑤",
+    "title-dialog-chat-color": "𐑕𐑦𐑤𐑧𐑒𐑑 𐑗𐑨𐑑 𐑒𐑳𐑤𐑼",
+    "subtitle-proxy-use-basic-authentication": "𐑐𐑮𐑩𐑝𐑲𐑛 𐑿𐑟𐑼𐑯𐑱𐑥 𐑯 𐑐𐑭𐑕𐑢𐑻𐑛 𐑑 𐑷𐑔𐑧𐑯𐑑𐑦𐑒𐑱𐑑 𐑢𐑦𐑞 𐑩 𐑐𐑮𐑪𐑒𐑕𐑦",
+    "label-users-recent": "𐑮𐑰𐑕𐑩𐑯𐑑 𐑿𐑟𐑼𐑟",
+    "label-users-known": "𐑯𐑴𐑯 𐑿𐑟𐑼𐑟"
+}
diff --git a/assets/translations/en.json b/assets/translations/en.json
index 1b5e4eacc..28ac96ac8 100644
--- a/assets/translations/en.json
+++ b/assets/translations/en.json
@@ -32,8 +32,8 @@
     "title-message-details": "Message Details",
     "title-send-media-message": "Send Media Message",
     "title-send-media-message-unencrypted": "Send Media Message (Unencrypted)",
-    "title-toggle-autocorrect": "Toggle keyboard autocorrect",
-    "title-toggle-suggestions": "Toggle keyboard word suggestions",
+    "title-toggle-autocorrect": "Keyboard autocorrect",
+    "title-toggle-suggestions": "Keyboard word suggestions",
     "title-dialog-delete-keys": "Confirm Deleting Keys",
     "title-dialog-confirm-linkout": "Confirm Opening Link",
     "title-dialog-encryption": "Encrypt Chat?",
diff --git a/assets/translations/fr.json b/assets/translations/fr.json
index 1626833a9..14ef2703a 100644
--- a/assets/translations/fr.json
+++ b/assets/translations/fr.json
@@ -237,10 +237,10 @@
     "list-item-advanced-settings-start-background": "Démarrer le service en arrière-plan",
     "list-item-advanced-settings-force-function": "Forcer la fonction",
     "list-item-advanced-settings-test-notifications": "Tester les notifications",
-    "list-item-via": "Via",
+    "list-item-via": "Plateforme",
     "list-item-sent": "Envoyé",
     "content-dialog-confirm-password": "Veuillez confirmer votre mot de passe (Par défaut)",
-    "message-edited-append": " (Modifié)",
+    "message-edited-append": " (modifié)",
     "label-default": "Par défaut",
     "semantics-image-intro": "Utilisateur détendu, allongé",
     "title-send-media-message-unencrypted": "Envoyer un média (non chiffré)",
@@ -267,5 +267,6 @@
     "list-item-chat-detail-vibrate": "Vibration",
     "content-notification-style-type-inbox": "Regrouper les nouveaux messages dans une même notification",
     "content-notification-style-type-latest": "Afficher une notification avec le message le plus récent",
-    "content-notification-style-type-itemized": "Une nouvelle notification apparaîtra pour chaque nouveau message"
+    "content-notification-style-type-itemized": "Une nouvelle notification apparaîtra pour chaque nouveau message",
+    "label-show-attachment-options": "Ouvrir les options de pièce jointe"
 }
diff --git a/assets/translations/id.json b/assets/translations/id.json
index 631a55b0c..786c88c1a 100644
--- a/assets/translations/id.json
+++ b/assets/translations/id.json
@@ -9,7 +9,7 @@
     "title-view-create-group": "Buat Sebuah Grup Obrolan",
     "title-view-invite": "Undang",
     "title-view-settings-chat": "Obrolan",
-    "title-view-privacy": "Privasi",
+    "title-view-privacy": "Privasi & Keamanan",
     "title-view-homeserver-search": "Temukan Homeserver Anda",
     "title-view-profile": "Siapkan Profil Anda",
     "title-proxy-host": "Modifikasi Host Proksi",
@@ -226,12 +226,12 @@
     "list-item-advanced-settings-force-function": "Paksakan Fungsi",
     "list-item-sent": "Terkirim",
     "list-item-received": "Diterima",
-    "list-item-via": "Via",
+    "list-item-via": "Platform",
     "alert-offline": "Sepertinya Anda mungkin offline. Periksa koneksi Anda dan coba lagi.",
     "alert-unknown": "Terjadi Kesalahan Yang Tidak Diketahui",
     "alert-could-not-launch-url": "Tidak dapat membuka {}",
     "alert-no-images-found": "Tidak Ada Gambar Yang Ditemukan.",
-    "message-edited-append": " (Diedit)",
+    "message-edited-append": " (diedit)",
     "label-default": "Default",
     "semantics-image-intro": "Pengguna menyantai",
     "semantics-image-private-message": "Seseorang membawa sebuah gelembung pesan privat",
@@ -267,5 +267,6 @@
     "content-notification-style-type-inbox": "Kelompokkan pesan baru dalam satu notifikasi",
     "content-notification-style-type-itemized": "Sebuah notifikasi baru akan muncul untuk setiap pesan baru",
     "list-item-chat-detail-vibrate": "Getaran",
-    "content-notification-style-type-latest": "Tampilkan satu notifikasi dengan pesan terbaru"
+    "content-notification-style-type-latest": "Tampilkan satu notifikasi dengan pesan terbaru",
+    "label-show-attachment-options": "Buka opsi lampiran"
 }
diff --git a/assets/translations/uk.json b/assets/translations/uk.json
index 8f80854a1..470dff533 100644
--- a/assets/translations/uk.json
+++ b/assets/translations/uk.json
@@ -267,5 +267,6 @@
     "semantics-image-empty-chat-list": "Кілька крихітних, милих монстрів, що виглядають з-за листя.",
     "semantics-image-terms-of-service": "Рука тримає телефон з прапорцем умов про надання послуг",
     "semantics-image-signup-username": "Людина, що спирається ліктем на ID-картку",
-    "semantics-image-password-reset": "Людина, що поклала розслаблену руку на лист із прапорцем всередині"
+    "semantics-image-password-reset": "Людина, що поклала розслаблену руку на лист із прапорцем всередині",
+    "label-show-attachment-options": "Відкрити параметри вкладення"
 }
diff --git a/fastlane/metadata/android/en-US/changelogs/2100.txt b/fastlane/metadata/android/en-US/changelogs/2100.txt
new file mode 100644
index 000000000..5aa659edd
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/2100.txt
@@ -0,0 +1,25 @@
+0.2.10
+
+🔥 Hot Fixes
+- Crypto Storage performance issues
+- Fixed Wordle
+
+🔮 New Features
+- Session Key Imports / Exports
+- Email and other 3pid auth support
+- Fullscreen Image View
+- Incoming Read Receipt Support
+- Toggle autocorrect setting
+ 
+🐛 Bug Fixes
+- fixed missing several translations
+- fixed various notification issues
+- fixed issues with deleting devices
+- fixed issues deactivating accounts
+- fixed showing TOS more than once
+
+💡 Improvements
+- Hide Send Button 
+
+📐 Refactoring
+- Lots!
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 6c9e06b9f..2b4d73849 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -355,7 +355,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 2007;
+				CURRENT_PROJECT_VERSION = 2090;
 				DEVELOPMENT_TEAM = W98LUTKH5G;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -371,7 +371,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 0.2.6;
+				MARKETING_VERSION = 0.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = org.tether.tether;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -496,7 +496,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 2007;
+				CURRENT_PROJECT_VERSION = 2090;
 				DEVELOPMENT_TEAM = W98LUTKH5G;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -512,7 +512,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 0.2.6;
+				MARKETING_VERSION = 0.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = org.tether.tether;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -529,7 +529,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 2007;
+				CURRENT_PROJECT_VERSION = 2090;
 				DEVELOPMENT_TEAM = W98LUTKH5G;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -545,7 +545,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 0.2.6;
+				MARKETING_VERSION = 0.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = org.tether.tether;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
diff --git a/lib/cache/middleware.dart b/lib/cache/middleware.dart
index cc9923e11..4451b86c2 100644
--- a/lib/cache/middleware.dart
+++ b/lib/cache/middleware.dart
@@ -22,11 +22,9 @@ bool cacheMiddleware(Store<AppState> store, dynamic action) {
     case UpdateRoom:
     case SetRoom:
     case RemoveRoom:
-    case SetOlmAccount:
     case SetOlmAccountBackup:
     case SetDeviceKeysOwned:
     case AddKeySession:
-    case AddMessageSessionInbound:
     case AddMessageSessionOutbound:
     case SetUser:
     case ResetCrypto:
diff --git a/lib/cache/serializer.dart b/lib/cache/serializer.dart
index 1d278a294..d3a92f897 100644
--- a/lib/cache/serializer.dart
+++ b/lib/cache/serializer.dart
@@ -9,6 +9,7 @@ import 'package:syphon/cache/threadables.dart';
 import 'package:syphon/global/print.dart';
 import 'package:syphon/storage/constants.dart';
 import 'package:syphon/store/auth/state.dart';
+import 'package:syphon/store/crypto/sessions/model.dart';
 import 'package:syphon/store/crypto/state.dart';
 import 'package:syphon/store/events/messages/model.dart';
 import 'package:syphon/store/events/reactions/model.dart';
@@ -141,10 +142,17 @@ class CacheSerializer implements StateSerializer<AppState> {
     final cryptoState =
         cryptoStore ?? preloaded[StorageKeys.CRYPTO] as CryptoStore? ?? CryptoStore();
 
+    final messageSessionsLoaded =
+        preloaded[StorageKeys.MESSAGE_SESSIONS] as Map<String, Map<String, List<MessageSession>>>;
+
     return AppState(
       loading: false,
       authStore: authStore ?? preloaded[StorageKeys.AUTH] ?? AuthStore(),
-      cryptoStore: cryptoState.upgradeSessions_temp(),
+      cryptoStore: messageSessionsLoaded.isEmpty
+          ? cryptoState.upgradeSessions_temp()
+          : cryptoState.upgradeSessions_temp().copyWith(
+                messageSessionsInbound: preloaded[StorageKeys.MESSAGE_SESSIONS],
+              ),
       settingsStore: preloaded[StorageKeys.SETTINGS] ?? settingsStore ?? SettingsStore(),
       syncStore: syncStore ?? SyncStore(),
       mediaStore: mediaStore ?? MediaStore().copyWith(mediaCache: preloaded[StorageKeys.MEDIA]),
diff --git a/lib/global/libs/matrix/devices.dart b/lib/global/libs/matrix/devices.dart
index ea0a2ef92..8c3092298 100644
--- a/lib/global/libs/matrix/devices.dart
+++ b/lib/global/libs/matrix/devices.dart
@@ -55,12 +55,12 @@ abstract class Devices {
     return await json.decode(response.body);
   }
 
-  /**
- * https://matrix.org/docs/spec/client_server/latest#id414
- *  
- * HTTP:DELETE
- * Gets all currently active pushers for the authenticated user.
- */
+  ///
+  /// https://matrix.org/docs/spec/client_server/latest#id414
+  ///
+  /// HTTP:DELETE
+  /// Gets all currently active pushers for the authenticated user.
+  ///
   static Future<dynamic> deleteDevices({
     String? protocol = 'https://',
     String? homeserver = Values.homeserverDefault,
@@ -100,12 +100,10 @@ abstract class Devices {
     return await json.decode(response.body);
   }
 
-  /**
-   * https://spec.matrix.org/unstable/client-server-api/#put_matrixclientv3devicesdeviceid
-   *
-   * HTTP:PUT
-   * Change a given Device's public display name.
-   */
+  /// https://spec.matrix.org/unstable/client-server-api/#put_matrixclientv3devicesdeviceid
+  ///
+  /// HTTP:PUT
+  /// Change a given Device's public display name.
   static Future<dynamic> renameDevice({
     String? protocol = 'https://',
     String? homeserver = Values.homeserverDefault,
@@ -132,5 +130,4 @@ abstract class Devices {
 
     return await json.decode(response.body);
   }
-
 }
diff --git a/lib/global/print.dart b/lib/global/print.dart
index d4dd06fd7..73d0db8e0 100644
--- a/lib/global/print.dart
+++ b/lib/global/print.dart
@@ -1,6 +1,7 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
+import 'package:syphon/global/values.dart';
 
 typedef PrintJson = void Function(Map? jsonMap);
 typedef PrintDebug = void Function(String message, {String title});
@@ -8,28 +9,43 @@ typedef PrintError = void Function(String message, {String? title});
 
 void _printInfo(String content, {String? title}) {
   final output = title != null ? '[$title] $content' : content;
-  print(output);
+  if (DEBUG_MODE) {
+    print(output);
+  }
 }
 
 void _printWarning(String content, {String? title}) {
   final output = title != null ? '[$title] $content' : content;
-  print(output);
+  if (DEBUG_MODE) {
+    print(output);
+  }
 }
 
 void _printError(String content, {String? title}) {
+  final output = title != null ? '[$title] $content' : content;
+  if (DEBUG_MODE) {
+    print(output);
+  }
+}
+
+void _printRelease(String content, {String? title}) {
   final output = title != null ? '[$title] $content' : content;
   print(output);
 }
 
 void _printDebug(String content, {String? title}) {
   final output = title != null ? '[$title] $content' : content;
-  debugPrint(output);
+  if (DEBUG_MODE) {
+    debugPrint(output);
+  }
 }
 
 void _printJson(Map? jsonMap) {
   final JsonEncoder encoder = JsonEncoder.withIndent('  ');
   final String prettyEvent = encoder.convert(jsonMap);
-  debugPrint(prettyEvent, wrapWidth: 2048);
+  if (DEBUG_MODE) {
+    debugPrint(prettyEvent, wrapWidth: 2048);
+  }
 }
 
 PrintJson printJson = _printJson;
@@ -45,5 +61,6 @@ class log {
   static warn(String content, {String? title}) => _printWarning(content, title: title);
   static error(String content, {String? title}) => _printError(content, title: title);
   static debug(String content, {String? title}) => _printDebug(content, title: title);
+  static release(String content, {String? title}) => _printRelease(content, title: title);
   static json(Map? json) => _printJson(json);
 }
diff --git a/lib/storage/constants.dart b/lib/storage/constants.dart
index 9e209cfcc..330e3916b 100644
--- a/lib/storage/constants.dart
+++ b/lib/storage/constants.dart
@@ -18,6 +18,9 @@ class StorageKeys {
   static const String RECEIPTS = 'receipts';
   static const String REACTIONS = 'reactions';
   static const String REDACTIONS = 'redactions';
+
+  // crypto
+  static const String MESSAGE_SESSIONS = 'message_sessions';
 }
 
 enum StorageKey {
@@ -33,7 +36,8 @@ enum StorageKey {
   decrypted,
   receipts,
   reactions,
-  redactions
+  redactions,
+  messageSessions,
 }
 
 const int DEFAULT_LOAD_LIMIT = 25;
diff --git a/lib/storage/database.dart b/lib/storage/database.dart
index 232020e19..4c028a7b9 100644
--- a/lib/storage/database.dart
+++ b/lib/storage/database.dart
@@ -21,6 +21,7 @@ import 'package:syphon/storage/migrations/5.update.messages.dart';
 import 'package:syphon/storage/models.dart';
 import 'package:syphon/store/auth/schema.dart';
 import 'package:syphon/store/crypto/schema.dart';
+import 'package:syphon/store/crypto/sessions/schema.dart';
 import 'package:syphon/store/events/messages/model.dart';
 import 'package:syphon/store/events/messages/schema.dart';
 import 'package:syphon/store/events/reactions/model.dart';
@@ -210,19 +211,18 @@ LazyDatabase openDatabase(AppContext context, {String pin = Values.empty}) {
   Auths,
   Syncs,
   Cryptos,
+  MessageSessions,
+  KeySessions,
   Settings,
 ])
 class StorageDatabase extends _$StorageDatabase {
-  // we tell the database where to store the data with this constructor
   StorageDatabase(AppContext context, {String pin = ''}) : super(openDatabase(context, pin: pin));
 
-  // this is the new constructor
   StorageDatabase.connect(DatabaseConnection connection) : super.connect(connection);
 
-  // you should bump this number whenever you change or add a table definition. Migrations
-  // are covered later in this readme.
+  // you should bump this number whenever you change or add a table definition.
   @override
-  int get schemaVersion => 7;
+  int get schemaVersion => 8;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -231,6 +231,10 @@ class StorageDatabase extends _$StorageDatabase {
         },
         onUpgrade: (Migrator m, int from, int to) async {
           printInfo('[MIGRATION] VERSION $from to $to');
+          if (from == 7) {
+            await m.createTable(keySessions);
+            await m.createTable(messageSessions);
+          }
           if (from == 6) {
             await m.createTable(syncs);
           }
diff --git a/lib/storage/index.dart b/lib/storage/index.dart
index a26b38f69..99dff4d6d 100644
--- a/lib/storage/index.dart
+++ b/lib/storage/index.dart
@@ -11,6 +11,7 @@ import 'package:syphon/global/values.dart';
 import 'package:syphon/storage/constants.dart';
 import 'package:syphon/storage/database.dart';
 import 'package:syphon/store/auth/storage.dart';
+import 'package:syphon/store/crypto/sessions/storage.dart';
 import 'package:syphon/store/crypto/storage.dart';
 import 'package:syphon/store/events/messages/actions.dart';
 import 'package:syphon/store/events/messages/model.dart';
@@ -117,6 +118,11 @@ Future<Map<String, dynamic>> loadStorage(StorageDatabase storage) async {
       rooms: rooms.values.toList(),
     );
 
+    final messageSessions = await loadMessageSessionsInbound(
+      roomIds: rooms.keys.toList(),
+      storage: storage,
+    );
+
     return {
       StorageKeys.AUTH: auth,
       StorageKeys.CRYPTO: crypto,
@@ -127,6 +133,7 @@ Future<Map<String, dynamic>> loadStorage(StorageDatabase storage) async {
       StorageKeys.MESSAGES: messages,
       StorageKeys.REACTIONS: reactions,
       StorageKeys.DECRYPTED: decrypted,
+      StorageKeys.MESSAGE_SESSIONS: messageSessions,
     };
   } catch (error) {
     printError('[loadStorage]  ${error.toString()}');
diff --git a/lib/storage/middleware/save-storage-middleware.dart b/lib/storage/middleware/save-storage-middleware.dart
index 4015d5f53..391daffba 100644
--- a/lib/storage/middleware/save-storage-middleware.dart
+++ b/lib/storage/middleware/save-storage-middleware.dart
@@ -7,6 +7,7 @@ import 'package:syphon/store/auth/storage.dart';
 import 'package:syphon/store/crypto/actions.dart';
 import 'package:syphon/store/crypto/keys/actions.dart';
 import 'package:syphon/store/crypto/sessions/actions.dart';
+import 'package:syphon/store/crypto/sessions/storage.dart';
 import 'package:syphon/store/crypto/storage.dart';
 import 'package:syphon/store/events/actions.dart';
 import 'package:syphon/store/events/messages/storage.dart';
@@ -25,9 +26,7 @@ import 'package:syphon/store/settings/actions.dart';
 import 'package:syphon/store/settings/notification-settings/actions.dart';
 import 'package:syphon/store/settings/proxy-settings/actions.dart';
 import 'package:syphon/store/settings/storage.dart';
-import 'package:syphon/store/sync/actions.dart';
 import 'package:syphon/store/sync/background/storage.dart';
-import 'package:syphon/store/sync/storage.dart';
 import 'package:syphon/store/user/actions.dart';
 import 'package:syphon/store/user/storage.dart';
 
@@ -166,13 +165,28 @@ saveStorageMiddleware(StorageDatabase? storage) {
       case SetDeviceKeys:
       case SetOneTimeKeysCounts:
       case SetOneTimeKeysClaimed:
-      case AddMessageSessionInbound:
       case AddMessageSessionOutbound:
       case UpdateMessageSessionOutbound:
       case AddKeySession:
       case ResetCrypto:
         saveCrypto(store.state.cryptoStore, storage: storage);
         break;
+      case AddMessageSessionInbound:
+        final _action = action as AddMessageSessionInbound;
+        saveMessageSessionInbound(
+          roomId: _action.roomId,
+          identityKey: _action.senderKey,
+          session: _action.session,
+          messageIndex: _action.messageIndex,
+          storage: storage,
+        );
+        break;
+      case SaveMessageSessionsInbound:
+        saveMessageSessionsInbound(
+          store.state.cryptoStore.messageSessionsInbound,
+          storage: storage,
+        );
+        break;
       case SetNotificationSettings:
         // handles updating the background sync thread with new chat settings
         saveNotificationSettings(
diff --git a/lib/store/auth/actions.dart b/lib/store/auth/actions.dart
index 8d29c7597..9de847fa6 100644
--- a/lib/store/auth/actions.dart
+++ b/lib/store/auth/actions.dart
@@ -1320,6 +1320,9 @@ ThunkAction<AppState> resolveUsername({String? username}) {
     } else if (int.tryParse(localpart) != null) {
       //msisdn 3pid
       store.dispatch(setMsisdn(msisdn: int.parse(localpart)));
+    } else {
+      // raw username
+      store.dispatch(setUsername(username: localpart));
     }
 
     // If user enters full username, make sure to set homeserver
diff --git a/lib/store/auth/selectors.dart b/lib/store/auth/selectors.dart
index a9ae04f77..99f1561b7 100644
--- a/lib/store/auth/selectors.dart
+++ b/lib/store/auth/selectors.dart
@@ -1,5 +1,6 @@
 import 'package:syphon/global/libs/matrix/auth.dart';
 import 'package:syphon/global/libs/matrix/errors.dart';
+import 'package:syphon/global/print.dart';
 import 'package:syphon/store/index.dart';
 
 // Preauth
diff --git a/lib/store/crypto/events/actions.dart b/lib/store/crypto/events/actions.dart
index 6894f1319..4142c007f 100644
--- a/lib/store/crypto/events/actions.dart
+++ b/lib/store/crypto/events/actions.dart
@@ -50,7 +50,7 @@ ThunkAction<AppState> encryptMessageContent({
     final encryptedPayload = outboundMessageSession.encrypt(serializedPayload);
 
     // save the outbound session after processing content
-    await store.dispatch(saveMessageSessionOutbound(
+    await store.dispatch(AddMessageSessionOutbound(
       roomId: roomId,
       session: outboundMessageSession.pickle(roomId),
     ));
@@ -258,7 +258,7 @@ ThunkAction<AppState> decryptMessage({
       );
     }
 
-    await store.dispatch(saveMessageSessionInbound(
+    await store.dispatch(addMessageSessionInbound(
       roomId: roomId,
       identityKey: identityKey,
       session: session,
diff --git a/lib/store/crypto/sessions/actions.dart b/lib/store/crypto/sessions/actions.dart
index 5869b0815..0676dc94c 100644
--- a/lib/store/crypto/sessions/actions.dart
+++ b/lib/store/crypto/sessions/actions.dart
@@ -20,6 +20,7 @@ import 'package:syphon/store/crypto/sessions/converters.dart';
 import 'package:syphon/store/crypto/sessions/model.dart';
 import 'package:syphon/store/index.dart';
 import 'package:syphon/store/settings/actions.dart';
+import 'package:syphon/store/sync/actions.dart';
 
 ///
 ///
@@ -95,7 +96,13 @@ class SetMessageSessionsInbound {
   SetMessageSessionsInbound({required this.sessions});
 }
 
-ThunkAction<AppState> saveMessageSessionOutbound({
+class SaveMessageSessionsInbound {
+  Map<String, Map<String, List<MessageSession>>> sessions;
+
+  SaveMessageSessionsInbound({required this.sessions});
+}
+
+ThunkAction<AppState> addMessageSessionOutbound({
   required String roomId,
   required String session,
 }) {
@@ -332,7 +339,7 @@ ThunkAction<AppState> loadMessageSessionInbound({
 /// Save Message Session Inbound
 ///
 /// Saves the message session and index after encrypting and sending an event
-ThunkAction<AppState> saveMessageSessionInbound({
+ThunkAction<AppState> addMessageSessionInbound({
   required String roomId,
   required String identityKey,
   required olm.InboundGroupSession session,
@@ -552,9 +559,11 @@ ThunkAction<AppState> importSessionKeys(FilePickerResult file, {String? password
   return (Store<AppState> store) async {
     try {
       store.dispatch(SetLoadingSettings(loading: true));
+      await store.dispatch(stopSyncObserver());
 
       final keyFile = File(file.paths[0]!);
       final fileData = await keyFile.readAsString();
+      final roomsEncrypted = store.state.roomStore.roomList.where((room) => room.encryptionEnabled);
 
       var sessionJson;
 
@@ -567,7 +576,6 @@ ThunkAction<AppState> importSessionKeys(FilePickerResult file, {String? password
         );
       }
 
-      final roomIdsEncrypted = [];
       final messageSessions = Map<String, Map<String, List<MessageSession>>>.from(
         store.state.cryptoStore.messageSessionsInbound,
       );
@@ -608,31 +616,50 @@ ThunkAction<AppState> importSessionKeys(FilePickerResult file, {String? password
             senderKey: [messageSession],
           },
         );
-
-        roomIdsEncrypted.add(roomId);
       }
 
+      // save _all_ keys to cold storage
+      await store.dispatch(SaveMessageSessionsInbound(
+        sessions: messageSessions,
+      ));
+
+      // Only set local message sessions where rooms are actively being synced
+      final roomIdsEncrypted = roomsEncrypted.map((room) => room.id);
+      final messageSessionsActive = Map<String, Map<String, List<MessageSession>>>.from(
+        messageSessions,
+      );
+      messageSessionsActive.removeWhere(
+        (key, value) => !roomIdsEncrypted.contains(key),
+      );
+
+      // set active keys to state
       await store.dispatch(SetMessageSessionsInbound(
-        sessions: combineMessageSesssions(
-          messageSessions,
-          store.state.cryptoStore.messageSessionsInbound,
-        ),
+        sessions: messageSessionsActive,
       ));
 
-      for (final roomId in roomIdsEncrypted) {
-        store.dispatch(backfillDecryptMessages(roomId));
-      }
+      // TODO: needs work for on combining them efficiently
+      // await store.dispatch(SetMessageSessionsInbound(
+      //   sessions: combineMessageSesssions(
+      //     messageSessions,
+      //     store.state.cryptoStore.messageSessionsInbound,
+      //   ),
+      // ));
+
+      await Future.forEach(roomIdsEncrypted, (String roomId) {
+        return store.dispatch(backfillDecryptMessages(roomId));
+      });
 
       store.dispatch(addConfirmation(
         origin: 'importSessionKeys',
         message: 'Successfully imported keys, your previous messages should be decrypting.',
       ));
+
+      await store.dispatch(startSyncObserver());
     } catch (error) {
       store.dispatch(addAlert(
         error: error,
         origin: 'importSessionKeys',
-        message:
-            'Failed to import your session key backup, contact us at https://syphon.org/support',
+        message: 'Failed to import your session key backup, check your password and try again.',
       ));
     } finally {
       store.dispatch(SetLoadingSettings(loading: false));
diff --git a/lib/store/crypto/sessions/model.dart b/lib/store/crypto/sessions/model.dart
index 09c66fd16..64aa66000 100644
--- a/lib/store/crypto/sessions/model.dart
+++ b/lib/store/crypto/sessions/model.dart
@@ -29,24 +29,3 @@ class MessageSession extends Equatable {
   Map<String, dynamic> toJson() => _$MessageSessionToJson(this);
   factory MessageSession.fromJson(Map<String, dynamic> json) => _$MessageSessionFromJson(json);
 }
-
-///
-/// Message Session model
-///
-/// allows for multiple identitykey sessions and sorting
-/// based on last used or created
-///
-@JsonSerializable()
-class MessageSessionMapper extends Equatable {
-  //    Map<session_id, session>
-  final Map<String, MessageSession> sessions;
-
-  const MessageSessionMapper({this.sessions = const {}});
-
-  @override
-  List<Object?> get props => [sessions];
-
-  Map<String, dynamic> toJson() => _$MessageSessionMapperToJson(this);
-  factory MessageSessionMapper.fromJson(Map<String, dynamic> json) =>
-      _$MessageSessionMapperFromJson(json);
-}
diff --git a/lib/store/crypto/sessions/schema.dart b/lib/store/crypto/sessions/schema.dart
new file mode 100644
index 000000000..2d73ccc7a
--- /dev/null
+++ b/lib/store/crypto/sessions/schema.dart
@@ -0,0 +1,38 @@
+import 'package:drift/drift.dart';
+
+///
+///
+///
+/// Message Sessions Model (Table)
+///
+/// Meant to store all of crypto state in _cold storage_
+///
+class MessageSessions extends Table {
+  TextColumn get id => text().customConstraint('UNIQUE')();
+
+  TextColumn get roomId => text()();
+  IntColumn get index => integer()();
+  TextColumn get identityKey => text().nullable()(); // outbound keys have no identity
+  TextColumn get session => text()();
+  BoolColumn get inbound => boolean()();
+  IntColumn get createdAt => integer()();
+
+  @override
+  Set<Column> get primaryKey => {id};
+}
+
+///
+/// Key Sessions Model (Table)
+///
+/// Meant to store all of crypto state in _cold storage_
+///
+class KeySessions extends Table {
+  TextColumn get id => text().customConstraint('UNIQUE')();
+
+  TextColumn get sessionId => text()();
+  TextColumn get identityKey => text()();
+  TextColumn get session => text().nullable()();
+
+  @override
+  Set<Column> get primaryKey => {id};
+}
diff --git a/lib/store/crypto/sessions/storage.dart b/lib/store/crypto/sessions/storage.dart
new file mode 100644
index 000000000..6bf30a42e
--- /dev/null
+++ b/lib/store/crypto/sessions/storage.dart
@@ -0,0 +1,139 @@
+import 'package:drift/drift.dart';
+import 'package:syphon/global/print.dart';
+import 'package:syphon/storage/database.dart';
+import 'package:syphon/store/crypto/sessions/model.dart' as model;
+
+///
+/// Auth Quesies - unencrypted (Cold Storage)
+///
+/// In storage, messages are indexed by eventId
+/// In redux, they're indexed by RoomID and placed in a list
+///
+extension SessionQueries on StorageDatabase {
+  Future<void> insertMessageSessions(List<MessageSession> sessions) async {
+    return batch(
+      (batch) => batch.insertAllOnConflictUpdate(
+        messageSessions,
+        sessions,
+      ),
+    );
+  }
+
+  Future<List<MessageSession>> selectMessageSessionsInbound(List<String> roomIds) {
+    return (select(messageSessions)
+          ..where((tbl) => tbl.roomId.isIn(roomIds) & tbl.inbound.equals(true))
+          ..orderBy([(tbl) => OrderingTerm(expression: tbl.createdAt, mode: OrderingMode.desc)]))
+        .get();
+  }
+
+  Future<List<MessageSession>> selectMessageSessionsInboundAll() {
+    return (select(messageSessions)
+          ..where((tbl) => tbl.inbound.equals(true))
+          ..orderBy([(tbl) => OrderingTerm(expression: tbl.createdAt, mode: OrderingMode.desc)]))
+        .get();
+  }
+}
+
+Future<void> saveMessageSessionInbound({
+  required String roomId,
+  required String identityKey,
+  required String session,
+  required int messageIndex,
+  required StorageDatabase storage,
+}) async {
+  return storage.insertMessageSessions([
+    MessageSession(
+      id: session,
+      roomId: roomId,
+      session: session,
+      index: messageIndex,
+      identityKey: identityKey,
+      createdAt: DateTime.now().millisecondsSinceEpoch,
+      inbound: true,
+    )
+  ]);
+}
+
+Future<void> saveMessageSessionsInbound(
+  Map<String, Map<String, List<model.MessageSession>>> messageSessions, {
+  required StorageDatabase storage,
+}) async {
+  final List<MessageSession> messageSessionsDb = [];
+
+  // prepend session keys to an array per spec
+  for (final roomSessions in messageSessions.entries) {
+    final roomId = roomSessions.key;
+    final sessions = roomSessions.value;
+
+    for (final messsageSessions in sessions.entries) {
+      final identityKey = messsageSessions.key;
+      final sessionsSerialized = messsageSessions.value;
+
+      for (final session in sessionsSerialized) {
+        messageSessionsDb.add(
+          MessageSession(
+            id: session.serialized,
+            index: session.index,
+            roomId: roomId,
+            session: session.serialized,
+            identityKey: identityKey,
+            createdAt: session.createdAt,
+            inbound: true,
+          ),
+        );
+      }
+    }
+  }
+
+  return storage.insertMessageSessions(messageSessionsDb);
+}
+
+///
+/// Load Crypto Store (Cold Storage)
+///
+///
+Future<Map<String, Map<String, List<model.MessageSession>>>> loadMessageSessionsInbound({
+  List<String>? roomIds,
+  required StorageDatabase storage,
+}) async {
+  try {
+    final messageSessions = <String, Map<String, List<model.MessageSession>>>{};
+    var messageSessionsDb = <MessageSession>[];
+
+    if (roomIds == null || roomIds.isEmpty) {
+      messageSessionsDb = await storage.selectMessageSessionsInboundAll();
+    } else {
+      messageSessionsDb = await storage.selectMessageSessionsInbound(roomIds);
+    }
+
+    for (final session in messageSessionsDb) {
+      final roomId = session.roomId;
+      final senderKey = session.identityKey!;
+
+      final messageSessionNew = model.MessageSession(
+        index: session.index,
+        serialized: session.session, // already pickled
+        createdAt: session.createdAt,
+      );
+
+      // new message session updates
+      messageSessions.update(
+        roomId,
+        (identitySessions) => identitySessions
+          ..update(
+            senderKey,
+            (sessions) => sessions..insert(0, messageSessionNew),
+            ifAbsent: () => [messageSessionNew],
+          ),
+        ifAbsent: () => {
+          senderKey: [messageSessionNew],
+        },
+      );
+    }
+
+    return messageSessions;
+  } catch (error) {
+    printError(error.toString(), title: 'loadCrypto');
+    return {};
+  }
+}
diff --git a/lib/store/crypto/state.dart b/lib/store/crypto/state.dart
index 4cb9b817b..79e4d9dd5 100644
--- a/lib/store/crypto/state.dart
+++ b/lib/store/crypto/state.dart
@@ -21,9 +21,16 @@ class CryptoStore extends Equatable {
   final bool deviceKeyVerified;
   final bool oneTimeKeysStable;
 
-  // TODO: Map<identityKey, Map<SessionId, serializedSession>
+  // Map<identityKey, Map<SessionId, serializedSession> 
   final Map<String, Map<String, String>> keySessions; // both olm inbound and outbound key sessions
 
+  // Map<roomId, serializedSession> // megolm - messages
+  final Map<String, String> outboundMessageSessions;
+
+  // Map<roomId, Map<identityKey, serializedSession>  // megolm - messages per chat
+  @JsonKey(ignore: true)
+  final Map<String, Map<String, List<MessageSession>>> messageSessionsInbound;
+
   // Map<roomId, Map<identityKey, serializedSession>  // megolm - index per chat
   @Deprecated('switch to using "index" inside MessageSession within inboundMessageSessionsAll')
   final Map<String, Map<String, int>> messageSessionIndex;
@@ -32,12 +39,6 @@ class CryptoStore extends Equatable {
   @Deprecated('switch to inboundMessageSessionsAll to include old session for a device')
   final Map<String, Map<String, String>> inboundMessageSessions;
 
-  // Map<roomId, serializedSession> // megolm - messages
-  final Map<String, String> outboundMessageSessions;
-
-  // Map<roomId, Map<identityKey, serializedSession>  // megolm - messages per chat
-  final Map<String, Map<String, List<MessageSession>>> messageSessionsInbound;
-
   /// Map<UserId, Map<DeviceId, DeviceKey> deviceKeys
   final Map<String, Map<String, DeviceKey>> deviceKeys;
 
diff --git a/lib/store/crypto/storage.dart b/lib/store/crypto/storage.dart
index 40cf99087..4ba0d925c 100644
--- a/lib/store/crypto/storage.dart
+++ b/lib/store/crypto/storage.dart
@@ -41,13 +41,13 @@ Future<int> saveCrypto(
 }
 
 ///
-/// Load Auth Store (Cold Storage)
+/// Load Crypto Store (Cold Storage)
 ///
 Future<CryptoStore?> loadCrypto({required StorageDatabase storage}) async {
   try {
     return storage.selectCryptoStore();
   } catch (error) {
-    printError(error.toString(), title: 'loadAuth');
+    printError(error.toString(), title: 'loadCrypto');
     return null;
   }
 }
diff --git a/lib/store/sync/actions.dart b/lib/store/sync/actions.dart
index a9d8845d1..a1e890b13 100644
--- a/lib/store/sync/actions.dart
+++ b/lib/store/sync/actions.dart
@@ -388,7 +388,7 @@ ThunkAction<AppState> syncRooms(Map roomData) {
 
         // fetch previous messages since last /sync (a messages gap)
         // room will be marked limited to indicate this
-        if (roomSynced.limited) {
+        if (roomSynced.limited && synced) {
           printWarning(
             '[syncRooms] ${roomSynced.name} LIMITED TRUE - Fetching more messages',
           );
diff --git a/lib/store/sync/parsers.dart b/lib/store/sync/parsers.dart
index 4cfdb9363..b95bb41df 100644
--- a/lib/store/sync/parsers.dart
+++ b/lib/store/sync/parsers.dart
@@ -1,5 +1,6 @@
 import 'package:syphon/global/libs/matrix/constants.dart';
 import 'package:syphon/global/print.dart';
+import 'package:syphon/global/values.dart';
 import 'package:syphon/store/events/messages/model.dart';
 import 'package:syphon/store/events/model.dart';
 import 'package:syphon/store/events/reactions/model.dart';
@@ -104,7 +105,7 @@ Sync parseSync(Map params) {
     prevBatch: details.prevBatch,
   );
 
-  if (details.limited != null) {
+  if (details.limited != null  && DEBUG_MODE) {
     printInfo(
       '[parseSync] ${roomExisting.id} limited ${details.limited} lastBatch ${details.lastBatch != null} prevBatch ${details.prevBatch != null}',
     );
@@ -133,7 +134,7 @@ Sync parseSync(Map params) {
 
   ephemerals.readReceipts.forEach((key, value) {
     if (value.userReadsMapped!.containsKey(currentUser.userId)) {
-      int rr = value.userReadsMapped![currentUser.userId];
+      final int rr = value.userReadsMapped![currentUser.userId];
 
       if (rr > lastRead) {
         lastRead = rr;
diff --git a/lib/views/home/settings/settings-devices-screen.dart b/lib/views/home/settings/settings-devices-screen.dart
index 3e245ef4e..55d03d0bb 100644
--- a/lib/views/home/settings/settings-devices-screen.dart
+++ b/lib/views/home/settings/settings-devices-screen.dart
@@ -5,9 +5,7 @@ import 'package:flutter_redux/flutter_redux.dart';
 import 'package:redux/redux.dart';
 import 'package:syphon/global/colours.dart';
 import 'package:syphon/global/dimensions.dart';
-import 'package:syphon/global/print.dart';
 import 'package:syphon/global/strings.dart';
-import 'package:syphon/store/alerts/actions.dart';
 import 'package:syphon/store/auth/actions.dart';
 import 'package:syphon/store/index.dart';
 import 'package:syphon/store/settings/actions.dart';
diff --git a/lib/views/widgets/messages/message.dart b/lib/views/widgets/messages/message.dart
index e4f3ace4c..711d18c4f 100644
--- a/lib/views/widgets/messages/message.dart
+++ b/lib/views/widgets/messages/message.dart
@@ -564,6 +564,7 @@ class MessageWidget extends StatelessWidget {
                                           : CrossFadeState.showFirst,
                                       firstChild: MarkdownBody(
                                         data: body.trim(),
+                                        softLineBreak: true,
                                         onTapLink: (text, href, title) =>
                                             onConfirmLink(context, href),
                                         styleSheet: MarkdownStyleSheet(
diff --git a/pubspec.yaml b/pubspec.yaml
index 46322939f..b10ab211b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: syphon
 description: a privacy focused matrix client
-version: 0.2.9+2090
+version: 0.2.10+2100
 
 environment:
   sdk: ">=2.12.0 <3.0.0"