diff --git a/Cargo.lock b/Cargo.lock
index 400ae3db..f27dd1ab 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -139,6 +139,17 @@ dependencies = [
  "futures-core",
 ]
 
+[[package]]
+name = "async-channel"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
+dependencies = [
+ "concurrent-queue",
+ "event-listener",
+ "futures-core",
+]
+
 [[package]]
 name = "async-executor"
 version = "1.5.0"
@@ -153,6 +164,21 @@ dependencies = [
  "slab",
 ]
 
+[[package]]
+name = "async-global-executor"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776"
+dependencies = [
+ "async-channel",
+ "async-executor",
+ "async-io",
+ "async-lock",
+ "blocking",
+ "futures-lite",
+ "once_cell",
+]
+
 [[package]]
 name = "async-io"
 version = "1.12.0"
@@ -188,6 +214,24 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b49bd4c5b769125ea6323601c39815848972880efd33ffb2d01f9f909adc699"
 
+[[package]]
+name = "async-process"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6381ead98388605d0d9ff86371043b5aa922a3905824244de40dc263a14fcba4"
+dependencies = [
+ "async-io",
+ "async-lock",
+ "autocfg",
+ "blocking",
+ "cfg-if",
+ "event-listener",
+ "futures-lite",
+ "libc",
+ "signal-hook",
+ "windows-sys 0.42.0",
+]
+
 [[package]]
 name = "async-recursion"
 version = "1.0.2"
@@ -199,6 +243,33 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "async-std"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
+dependencies = [
+ "async-channel",
+ "async-global-executor",
+ "async-io",
+ "async-lock",
+ "async-process",
+ "crossbeam-utils",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-lite",
+ "gloo-timers",
+ "kv-log-macro",
+ "log",
+ "memchr",
+ "once_cell",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+ "wasm-bindgen-futures",
+]
+
 [[package]]
 name = "async-stream"
 version = "0.3.4"
@@ -247,6 +318,12 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "atomic-waker"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599"
+
 [[package]]
 name = "atomic_refcell"
 version = "0.1.9"
@@ -379,6 +456,20 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "blocking"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8"
+dependencies = [
+ "async-channel",
+ "async-lock",
+ "async-task",
+ "atomic-waker",
+ "fastrand",
+ "futures-lite",
+]
+
 [[package]]
 name = "bumpalo"
 version = "3.12.0"
@@ -686,6 +777,16 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "ctor"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
+dependencies = [
+ "quote 1.0.23",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "ctr"
 version = "0.9.2"
@@ -2412,6 +2513,15 @@ version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "984e109462d46ad18314f10e392c286c3d47bce203088a09012de1015b45b737"
 
+[[package]]
+name = "kv-log-macro"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
+dependencies = [
+ "log",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -2593,6 +2703,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
 dependencies = [
  "cfg-if",
+ "value-bag",
 ]
 
 [[package]]
@@ -2677,7 +2788,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk"
 version = "0.6.2"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a8204987be9a2696be183c3954a8569fa2141661#a8204987be9a2696be183c3954a8569fa2141661"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=7794b230e1a5a1c8cb6b050b8c947595cb74c8e7#7794b230e1a5a1c8cb6b050b8c947595cb74c8e7"
 dependencies = [
  "anymap2",
  "async-once-cell",
@@ -2704,6 +2815,7 @@ dependencies = [
  "matrix-sdk-indexeddb",
  "matrix-sdk-sled",
  "mime",
+ "mime_guess",
  "pin-project-lite",
  "rand 0.8.5",
  "reqwest",
@@ -2711,6 +2823,7 @@ dependencies = [
  "serde",
  "serde_html_form",
  "serde_json",
+ "tempfile",
  "thiserror",
  "tokio",
  "tower",
@@ -2722,7 +2835,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-base"
 version = "0.6.1"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a8204987be9a2696be183c3954a8569fa2141661#a8204987be9a2696be183c3954a8569fa2141661"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=7794b230e1a5a1c8cb6b050b8c947595cb74c8e7#7794b230e1a5a1c8cb6b050b8c947595cb74c8e7"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -2745,7 +2858,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-common"
 version = "0.6.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a8204987be9a2696be183c3954a8569fa2141661#a8204987be9a2696be183c3954a8569fa2141661"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=7794b230e1a5a1c8cb6b050b8c947595cb74c8e7#7794b230e1a5a1c8cb6b050b8c947595cb74c8e7"
 dependencies = [
  "async-lock",
  "futures-core",
@@ -2762,9 +2875,10 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-crypto"
 version = "0.6.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a8204987be9a2696be183c3954a8569fa2141661#a8204987be9a2696be183c3954a8569fa2141661"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=7794b230e1a5a1c8cb6b050b8c947595cb74c8e7#7794b230e1a5a1c8cb6b050b8c947595cb74c8e7"
 dependencies = [
  "aes",
+ "async-std",
  "async-trait",
  "atomic",
  "base64 0.21.0",
@@ -2797,7 +2911,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-indexeddb"
 version = "0.2.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a8204987be9a2696be183c3954a8569fa2141661#a8204987be9a2696be183c3954a8569fa2141661"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=7794b230e1a5a1c8cb6b050b8c947595cb74c8e7#7794b230e1a5a1c8cb6b050b8c947595cb74c8e7"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2822,7 +2936,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-qrcode"
 version = "0.4.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a8204987be9a2696be183c3954a8569fa2141661#a8204987be9a2696be183c3954a8569fa2141661"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=7794b230e1a5a1c8cb6b050b8c947595cb74c8e7#7794b230e1a5a1c8cb6b050b8c947595cb74c8e7"
 dependencies = [
  "base64 0.21.0",
  "byteorder",
@@ -2835,7 +2949,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-sled"
 version = "0.2.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a8204987be9a2696be183c3954a8569fa2141661#a8204987be9a2696be183c3954a8569fa2141661"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=7794b230e1a5a1c8cb6b050b8c947595cb74c8e7#7794b230e1a5a1c8cb6b050b8c947595cb74c8e7"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -2859,7 +2973,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-store-encryption"
 version = "0.2.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a8204987be9a2696be183c3954a8569fa2141661#a8204987be9a2696be183c3954a8569fa2141661"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=7794b230e1a5a1c8cb6b050b8c947595cb74c8e7#7794b230e1a5a1c8cb6b050b8c947595cb74c8e7"
 dependencies = [
  "blake3",
  "chacha20poly1305",
@@ -4323,6 +4437,25 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
 
+[[package]]
+name = "signal-hook"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9"
+dependencies = [
+ "libc",
+ "signal-hook-registry",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "signature"
 version = "1.6.4"
@@ -4972,6 +5105,16 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
+[[package]]
+name = "value-bag"
+version = "1.0.0-alpha.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55"
+dependencies = [
+ "ctor",
+ "version_check",
+]
+
 [[package]]
 name = "vcpkg"
 version = "0.2.15"
diff --git a/Cargo.toml b/Cargo.toml
index f41789a9..cdd40515 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -77,7 +77,7 @@ features = ["v4_6"]
 
 [dependencies.matrix-sdk]
 git = "https://github.com/matrix-org/matrix-rust-sdk.git"
-rev = "a8204987be9a2696be183c3954a8569fa2141661"
+rev = "7794b230e1a5a1c8cb6b050b8c947595cb74c8e7"
 features = [
     "socks",
     "sso-login",
@@ -89,7 +89,7 @@ features = [
 
 [dependencies.matrix-sdk-sled]
 git = "https://github.com/matrix-org/matrix-rust-sdk.git"
-rev = "a8204987be9a2696be183c3954a8569fa2141661"
+rev = "7794b230e1a5a1c8cb6b050b8c947595cb74c8e7"
 features = ["crypto-store"]
 
 [dependencies.ruma]