diff --git a/Cargo.lock b/Cargo.lock
index ae63e4d9..9ca23aad 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1564,7 +1564,7 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 [[package]]
 name = "matrix-sdk"
 version = "0.2.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#5df9ae350c30e89d7b2116c7750ec051395e21ac"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#da57061db0c470e06dd366c5f3f61fb3a8bf235e"
 dependencies = [
  "backoff",
  "bytes",
@@ -1588,7 +1588,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-base"
 version = "0.2.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#5df9ae350c30e89d7b2116c7750ec051395e21ac"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#da57061db0c470e06dd366c5f3f61fb3a8bf235e"
 dependencies = [
  "chacha20poly1305",
  "dashmap",
@@ -1611,7 +1611,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-common"
 version = "0.2.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#5df9ae350c30e89d7b2116c7750ec051395e21ac"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#da57061db0c470e06dd366c5f3f61fb3a8bf235e"
 dependencies = [
  "async-trait",
  "futures",
@@ -1627,7 +1627,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-crypto"
 version = "0.2.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#5df9ae350c30e89d7b2116c7750ec051395e21ac"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#da57061db0c470e06dd366c5f3f61fb3a8bf235e"
 dependencies = [
  "aes-ctr",
  "aes-gcm",
@@ -2424,7 +2424,7 @@ dependencies = [
 [[package]]
 name = "ruma"
 version = "0.0.3"
-source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
+source = "git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88"
 dependencies = [
  "assign",
  "js_int",
@@ -2440,7 +2440,7 @@ dependencies = [
 [[package]]
 name = "ruma-api"
 version = "0.17.0-alpha.4"
-source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
+source = "git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88"
 dependencies = [
  "bytes",
  "http",
@@ -2456,7 +2456,7 @@ dependencies = [
 [[package]]
 name = "ruma-api-macros"
 version = "0.17.0-alpha.4"
-source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
+source = "git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -2467,7 +2467,7 @@ dependencies = [
 [[package]]
 name = "ruma-client-api"
 version = "0.10.0-alpha.3"
-source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
+source = "git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88"
 dependencies = [
  "assign",
  "bytes",
@@ -2487,11 +2487,10 @@ dependencies = [
 [[package]]
 name = "ruma-common"
 version = "0.5.0"
-source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
+source = "git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88"
 dependencies = [
  "indexmap",
  "js_int",
- "maplit",
  "ruma-identifiers",
  "ruma-serde",
  "serde",
@@ -2503,7 +2502,7 @@ dependencies = [
 [[package]]
 name = "ruma-events"
 version = "0.22.0-alpha.3"
-source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
+source = "git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -2517,7 +2516,7 @@ dependencies = [
 [[package]]
 name = "ruma-events-macros"
 version = "0.22.0-alpha.3"
-source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
+source = "git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -2528,7 +2527,7 @@ dependencies = [
 [[package]]
 name = "ruma-federation-api"
 version = "0.1.0-alpha.2"
-source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
+source = "git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88"
 dependencies = [
  "js_int",
  "ruma-api",
@@ -2543,7 +2542,7 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers"
 version = "0.19.0"
-source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
+source = "git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88"
 dependencies = [
  "paste",
  "ruma-identifiers-macros",
@@ -2556,9 +2555,8 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers-macros"
 version = "0.19.0"
-source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
+source = "git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88"
 dependencies = [
- "proc-macro2",
  "quote",
  "ruma-identifiers-validation",
  "syn",
@@ -2567,12 +2565,12 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers-validation"
 version = "0.3.0"
-source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
+source = "git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88"
 
 [[package]]
 name = "ruma-serde"
 version = "0.3.1"
-source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
+source = "git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88"
 dependencies = [
  "bytes",
  "form_urlencoded",
@@ -2586,7 +2584,7 @@ dependencies = [
 [[package]]
 name = "ruma-serde-macros"
 version = "0.3.1"
-source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
+source = "git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",