diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb
index 077f787c..63d50cea 100644
--- a/assets/l10n/intl_en.arb
+++ b/assets/l10n/intl_en.arb
@@ -2564,5 +2564,6 @@
   "createGroupAndInviteUsers": "Create a group and invite users",
   "groupCanBeFoundViaSearch": "Group can be found via search",
   "wrongRecoveryKey": "Sorry... this does not seem to be the correct recovery key.",
-  "startConversation": "Start conversation"
+  "startConversation": "Start conversation",
+  "commandHint_sendraw": "Send raw json"
 }
diff --git a/lib/pages/chat/command_hints.dart b/lib/pages/chat/command_hints.dart
index 5ab49360..750f8134 100644
--- a/lib/pages/chat/command_hints.dart
+++ b/lib/pages/chat/command_hints.dart
@@ -50,6 +50,8 @@ String commandHint(L10n l10n, String command) {
       return l10n.commandHint_hug;
     case 'cuddle':
       return l10n.commandHint_cuddle;
+    case 'sendraw':
+      return l10n.commandHint_sendraw;
     default:
       return "";
   }
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index a7420ec9..f5ab4a3f 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -28,6 +28,7 @@ import record_macos
 import share_plus
 import shared_preferences_foundation
 import sqflite
+import sqflite_sqlcipher
 import url_launcher_macos
 import video_compress
 import video_player_avfoundation
@@ -58,6 +59,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
+  SqfliteSqlCipherPlugin.register(with: registry.registrar(forPlugin: "SqfliteSqlCipherPlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
   VideoCompressPlugin.register(with: registry.registrar(forPlugin: "VideoCompressPlugin"))
   FVPVideoPlayerPlugin.register(with: registry.registrar(forPlugin: "FVPVideoPlayerPlugin"))
diff --git a/pubspec.lock b/pubspec.lock
index 2dc9194f..e6fcb3c6 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -903,6 +903,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
+  idb_shim:
+    dependency: "direct main"
+    description:
+      name: idb_shim
+      sha256: cf1b3870ad63a6f5393edb351a9c9364e739731f2176c27f44d9645327c2cdd5
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.2"
   image:
     dependency: transitive
     description:
@@ -1152,10 +1160,11 @@ packages:
   matrix:
     dependency: "direct main"
     description:
-      name: matrix
-      sha256: "155673171920dceb224bd209f51a3e41fc5c015f55ec780c9d95e54eb84ba582"
-      url: "https://pub.dev"
-    source: hosted
+      path: "."
+      ref: "krille/add-matrix-sdk-database"
+      resolved-ref: "2b08db35972b47040da6d7aa84f564cbf68ed4f2"
+      url: "https://github.com/famedly/matrix-dart-sdk.git"
+    source: git
     version: "0.24.0"
   matrix_api_lite:
     dependency: transitive
@@ -1613,6 +1622,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.3.2"
+  sembast:
+    dependency: transitive
+    description:
+      name: sembast
+      sha256: "85ff944434f7b566fdc388be4f85b23e954736b7d6e51f965f4f419d966c15b1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.5.0+1"
   sentiment_dart:
     dependency: transitive
     description:
@@ -1715,7 +1732,7 @@ packages:
     source: hosted
     version: "1.10.0"
   sqflite:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: sqflite
       sha256: "591f1602816e9c31377d5f008c2d9ef7b8aca8941c3f89cc5fd9d84da0c38a9a"
@@ -1730,6 +1747,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.5.0+2"
+  sqflite_common_ffi:
+    dependency: "direct main"
+    description:
+      name: sqflite_common_ffi
+      sha256: "35d2fce1e971707c227cc4775cc017d5eafe06c2654c3435ebd5c3ad6c170f5f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.0+4"
+  sqflite_sqlcipher:
+    dependency: "direct main"
+    description:
+      name: sqflite_sqlcipher
+      sha256: e1dfb55bf21ee5a18c43f28faa4291272a801da4ab34a6ba9973b6c0e1ed77da
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.1"
+  sqlite3:
+    dependency: transitive
+    description:
+      name: sqlite3
+      sha256: db65233e6b99e99b2548932f55a987961bc06d82a31a0665451fa0b4fff4c3fb
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
   stack_trace:
     dependency: transitive
     description: