diff --git a/Cargo.lock b/Cargo.lock
index 8d4a5da9..29531096 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -719,14 +719,38 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "darling"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f2c43f534ea4b0b049015d00269734195e6d3f0f6635cb692251aca6f9f8b3c"
+dependencies = [
+ "darling_core 0.12.4",
+ "darling_macro 0.12.4",
+]
+
 [[package]]
 name = "darling"
 version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4529658bdda7fd6769b8614be250cdcfc3aeb0ee72fe66f9e41e5e5eb73eac02"
 dependencies = [
- "darling_core",
- "darling_macro",
+ "darling_core 0.14.1",
+ "darling_macro 0.14.1",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e91455b86830a1c21799d94524df0845183fa55bafd9aa137b01c7d1065fa36"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2 1.0.43",
+ "quote 1.0.21",
+ "strsim 0.10.0",
+ "syn 1.0.99",
 ]
 
 [[package]]
@@ -743,13 +767,24 @@ dependencies = [
  "syn 1.0.99",
 ]
 
+[[package]]
+name = "darling_macro"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29b5acf0dea37a7f66f7b25d2c5e93fd46f8f6968b1a5d7a3e02e97768afc95a"
+dependencies = [
+ "darling_core 0.12.4",
+ "quote 1.0.21",
+ "syn 1.0.99",
+]
+
 [[package]]
 name = "darling_macro"
 version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ddfc69c5bfcbd2fc09a0f38451d2daf0e372e367986a83906d1b0dbc88134fb5"
 dependencies = [
- "darling_core",
+ "darling_core 0.14.1",
  "quote 1.0.21",
  "syn 1.0.99",
 ]
@@ -797,13 +832,34 @@ dependencies = [
  "syn 1.0.99",
 ]
 
+[[package]]
+name = "derive_builder"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d13202debe11181040ae9063d739fa32cfcaaebe2275fe387703460ae2365b30"
+dependencies = [
+ "derive_builder_macro 0.10.2",
+]
+
 [[package]]
 name = "derive_builder"
 version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3"
 dependencies = [
- "derive_builder_macro",
+ "derive_builder_macro 0.11.2",
+]
+
+[[package]]
+name = "derive_builder_core"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66e616858f6187ed828df7c64a6d71720d83767a7f19740b2d1b6fe6327b36e5"
+dependencies = [
+ "darling 0.12.4",
+ "proc-macro2 1.0.43",
+ "quote 1.0.21",
+ "syn 1.0.99",
 ]
 
 [[package]]
@@ -812,19 +868,29 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4"
 dependencies = [
- "darling",
+ "darling 0.14.1",
  "proc-macro2 1.0.43",
  "quote 1.0.21",
  "syn 1.0.99",
 ]
 
+[[package]]
+name = "derive_builder_macro"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58a94ace95092c5acb1e97a7e846b310cfbd499652f72297da7493f618a98d73"
+dependencies = [
+ "derive_builder_core 0.10.2",
+ "syn 1.0.99",
+]
+
 [[package]]
 name = "derive_builder_macro"
 version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68"
 dependencies = [
- "derive_builder_core",
+ "derive_builder_core 0.11.2",
  "syn 1.0.99",
 ]
 
@@ -2375,9 +2441,9 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.7.8"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a"
+checksum = "936d98d2ddd79c18641c6709e7bb09981449694e402d1a0f0f657ea8d61f4a51"
 dependencies = [
  "hashbrown 0.12.3",
 ]
@@ -2446,7 +2512,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk"
 version = "0.5.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#97995b7bf6ac5d5810016458510ae02eb87de86b"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#34ed04958f4c7c1a4a6957cc33f27a5c637d8790"
 dependencies = [
  "anymap2",
  "async-once-cell",
@@ -2455,6 +2521,7 @@ dependencies = [
  "backoff",
  "bytes",
  "dashmap",
+ "derive_builder 0.10.2",
  "event-listener",
  "futures-channel",
  "futures-core",
@@ -2484,7 +2551,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-base"
 version = "0.5.1"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#97995b7bf6ac5d5810016458510ae02eb87de86b"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#34ed04958f4c7c1a4a6957cc33f27a5c637d8790"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -2493,7 +2560,7 @@ dependencies = [
  "futures-core",
  "futures-signals",
  "futures-util",
- "lru 0.7.8",
+ "lru 0.8.0",
  "matrix-sdk-common",
  "matrix-sdk-crypto",
  "once_cell",
@@ -2508,7 +2575,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-common"
 version = "0.5.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#97995b7bf6ac5d5810016458510ae02eb87de86b"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#34ed04958f4c7c1a4a6957cc33f27a5c637d8790"
 dependencies = [
  "async-lock",
  "futures-core",
@@ -2524,7 +2591,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-crypto"
 version = "0.5.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#97995b7bf6ac5d5810016458510ae02eb87de86b"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#34ed04958f4c7c1a4a6957cc33f27a5c637d8790"
 dependencies = [
  "aes",
  "async-trait",
@@ -2554,13 +2621,13 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-indexeddb"
 version = "0.1.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#97995b7bf6ac5d5810016458510ae02eb87de86b"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#34ed04958f4c7c1a4a6957cc33f27a5c637d8790"
 dependencies = [
  "anyhow",
  "async-trait",
  "base64",
  "dashmap",
- "derive_builder",
+ "derive_builder 0.11.2",
  "futures-util",
  "getrandom 0.2.7",
  "indexed_db_futures",
@@ -2580,7 +2647,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-qrcode"
 version = "0.3.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#97995b7bf6ac5d5810016458510ae02eb87de86b"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#34ed04958f4c7c1a4a6957cc33f27a5c637d8790"
 dependencies = [
  "base64",
  "byteorder",
@@ -2593,12 +2660,12 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-sled"
 version = "0.1.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#97995b7bf6ac5d5810016458510ae02eb87de86b"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#34ed04958f4c7c1a4a6957cc33f27a5c637d8790"
 dependencies = [
  "async-stream",
  "async-trait",
  "dashmap",
- "derive_builder",
+ "derive_builder 0.11.2",
  "fs_extra",
  "futures-core",
  "futures-util",
@@ -2618,7 +2685,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-store-encryption"
 version = "0.1.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#97995b7bf6ac5d5810016458510ae02eb87de86b"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#34ed04958f4c7c1a4a6957cc33f27a5c637d8790"
 dependencies = [
  "blake3",
  "chacha20poly1305",
@@ -3370,9 +3437,9 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.10.4"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e"
+checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -3380,9 +3447,9 @@ dependencies = [
 
 [[package]]
 name = "prost-derive"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc"
+checksum = "7345d5f0e08c0536d7ac7229952590239e77abf0a0100a1b1d890add6ea96364"
 dependencies = [
  "anyhow",
  "itertools",
@@ -3642,8 +3709,9 @@ dependencies = [
 
 [[package]]
 name = "ruma"
-version = "0.6.3"
-source = "git+https://github.com/ruma/ruma?rev=c745d3baf720b38a254e640a526717864e87a065#c745d3baf720b38a254e640a526717864e87a065"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3daa593bddbe225bc78760329afaba54d0c653e015f18ce6405fa723ec0f34d5"
 dependencies = [
  "assign",
  "js_int",
@@ -3656,8 +3724,9 @@ dependencies = [
 
 [[package]]
 name = "ruma-client-api"
-version = "0.14.1"
-source = "git+https://github.com/ruma/ruma?rev=c745d3baf720b38a254e640a526717864e87a065#c745d3baf720b38a254e640a526717864e87a065"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2709c891d277ef94d56657c3ec92ed464779dbfff055e518425eedf11d9ecb7"
 dependencies = [
  "assign",
  "bytes",
@@ -3672,8 +3741,9 @@ dependencies = [
 
 [[package]]
 name = "ruma-common"
-version = "0.9.2"
-source = "git+https://github.com/ruma/ruma?rev=c745d3baf720b38a254e640a526717864e87a065#c745d3baf720b38a254e640a526717864e87a065"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67dab5e934f2e280875cf3a863c14d876265bda169e4fd18334058e7307142d6"
 dependencies = [
  "base64",
  "bytes",
@@ -3704,8 +3774,9 @@ dependencies = [
 
 [[package]]
 name = "ruma-federation-api"
-version = "0.5.0"
-source = "git+https://github.com/ruma/ruma?rev=c745d3baf720b38a254e640a526717864e87a065#c745d3baf720b38a254e640a526717864e87a065"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f905d12f6144c7a754bd0339fa6893698c03d03a908abb20cc6eeb4ec7f9466"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -3715,8 +3786,9 @@ dependencies = [
 
 [[package]]
 name = "ruma-identifiers-validation"
-version = "0.8.1"
-source = "git+https://github.com/ruma/ruma?rev=c745d3baf720b38a254e640a526717864e87a065#c745d3baf720b38a254e640a526717864e87a065"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eabac62d16465a87435579c779d74dceabb93b09e44c766af6085050f3cc4275"
 dependencies = [
  "js_int",
  "thiserror",
@@ -3724,8 +3796,9 @@ dependencies = [
 
 [[package]]
 name = "ruma-macros"
-version = "0.9.2"
-source = "git+https://github.com/ruma/ruma?rev=c745d3baf720b38a254e640a526717864e87a065#c745d3baf720b38a254e640a526717864e87a065"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b3e5a61180840ebfdeb4bcc4dc4a0d0c21aa22f587360b16b785c79058d99f3"
 dependencies = [
  "once_cell",
  "proc-macro-crate",
@@ -3739,8 +3812,9 @@ dependencies = [
 
 [[package]]
 name = "ruma-push-gateway-api"
-version = "0.5.0"
-source = "git+https://github.com/ruma/ruma?rev=c745d3baf720b38a254e640a526717864e87a065#c745d3baf720b38a254e640a526717864e87a065"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dfd2f65e3377126282d444275a43aa05eecf5950344ebc5a6173abf55ba3636"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -4590,8 +4664,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "vodozemac"
-version = "0.2.0"
-source = "git+https://github.com/matrix-org/vodozemac/?rev=ad1f098aff2a0b69aa5822c4e0679089a9fa4a86#ad1f098aff2a0b69aa5822c4e0679089a9fa4a86"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f20153a1c82ac5f1243b62e80f067ae608facc415c6ef82f88426a61c79886"
 dependencies = [
  "aes",
  "arrayvec",
diff --git a/Cargo.toml b/Cargo.toml
index 91b495ec..a9274eec 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -76,8 +76,7 @@ git = "https://github.com/matrix-org/matrix-rust-sdk.git"
 features = ["socks", "sso-login", "markdown", "qrcode", "experimental-timeline"]
 
 [dependencies.ruma]
-git = "https://github.com/ruma/ruma"
-rev = "c745d3baf720b38a254e640a526717864e87a065"
+version = "0.7.1"
 features = [
     "unstable-pre-spec",
     "client-api-c",
diff --git a/src/session/room/mod.rs b/src/session/room/mod.rs
index 278a0574..8af3c94c 100644
--- a/src/session/room/mod.rs
+++ b/src/session/room/mod.rs
@@ -33,15 +33,15 @@ use matrix_sdk::{
             room_key::ToDeviceRoomKeyEventContent,
             tag::{TagInfo, TagName},
             AnyRoomAccountDataEvent, AnyStrippedStateEvent, AnySyncStateEvent,
-            AnySyncTimelineEvent, EventContent, MessageLikeEventType, MessageLikeUnsigned,
-            OriginalSyncMessageLikeEvent, StateEventType, SyncStateEvent, ToDeviceEvent,
+            AnySyncTimelineEvent, MessageLikeUnsigned, OriginalSyncMessageLikeEvent,
+            StateEventType, SyncStateEvent, ToDeviceEvent,
         },
         serde::Raw,
         EventId, MilliSecondsSinceUnixEpoch, OwnedEventId, OwnedRoomId, OwnedUserId, RoomId,
     },
     DisplayName, Result as MatrixResult,
 };
-use ruma::events::SyncEphemeralRoomEvent;
+use ruma::events::{MessageLikeEventContent, SyncEphemeralRoomEvent};
 
 pub use self::{
     event::*,
@@ -1286,10 +1286,7 @@ impl Room {
     }
 
     /// Send a message with the given `content` in this room.
-    pub fn send_room_message_event(
-        &self,
-        content: impl EventContent<EventType = MessageLikeEventType> + Send + 'static,
-    ) {
+    pub fn send_room_message_event(&self, content: impl MessageLikeEventContent + Send + 'static) {
         if let MatrixRoom::Joined(matrix_room) = self.matrix_room() {
             let (txn_id, event_id) = pending_event_ids();
             let matrix_event = OriginalSyncMessageLikeEvent {