diff --git a/lib/matrix.dart b/lib/matrix.dart
index bbd34d5a..ad5d5c20 100644
--- a/lib/matrix.dart
+++ b/lib/matrix.dart
@@ -24,6 +24,7 @@ export 'package:matrix_api_lite/matrix_api_lite.dart';
export 'src/client.dart';
export 'src/database/database_api.dart';
export 'src/database/hive_database.dart';
+export 'src/database/fluffybox_database.dart';
export 'src/event.dart';
export 'src/event_status.dart';
export 'src/room.dart';
diff --git a/lib/src/database/fluffybox_database.dart b/lib/src/database/fluffybox_database.dart
new file mode 100644
index 00000000..acfa3489
--- /dev/null
+++ b/lib/src/database/fluffybox_database.dart
@@ -0,0 +1,1475 @@
+/*
+ * Famedly Matrix SDK
+ * Copyright (C) 2019, 2020, 2021 Famedly GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+import 'dart:async';
+import 'dart:convert';
+import 'dart:math';
+import 'dart:typed_data';
+
+import 'package:fluffybox/fluffybox.dart';
+import 'package:hive/hive.dart' show HiveCipher;
+import 'package:matrix/encryption/utils/olm_session.dart';
+import 'package:matrix/encryption/utils/outbound_group_session.dart';
+import 'package:matrix/encryption/utils/ssss_cache.dart';
+import 'package:matrix/encryption/utils/stored_inbound_group_session.dart';
+import 'package:matrix/matrix.dart';
+import 'package:matrix/src/event_status.dart';
+import 'package:matrix/src/utils/queued_to_device_event.dart';
+import 'package:matrix/src/utils/run_benchmarked.dart';
+
+/// This database does not support file caching!
+class FluffyBoxDatabase extends DatabaseApi {
+ static const int version = 6;
+ final String name;
+ final String path;
+ final HiveCipher? key;
+ late final BoxCollection _collection;
+ late Box _clientBox;
+ late Box