diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index 5ca0d3af5..d248091e4 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -9598,7 +9598,7 @@
 			repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift";
 			requirement = {
 				kind = exactVersion;
-				version = 25.12.17;
+				version = 25.12.19;
 			};
 		};
 		701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = {
diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index a74c52204..8733264b2 100644
--- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -158,8 +158,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/element-hq/matrix-rust-components-swift",
       "state" : {
-        "revision" : "22e7419cc1dd4fe9cdcc9e596e86b805ca1be809",
-        "version" : "25.12.17"
+        "revision" : "bc1acbc8ee7e8271465a724e3b3f2339cd12d20b",
+        "version" : "25.12.19"
       }
     },
     {
diff --git a/ElementX/Sources/Mocks/NotificationItemProxyMock.swift b/ElementX/Sources/Mocks/NotificationItemProxyMock.swift
index 30df12c4c..74ca37837 100644
--- a/ElementX/Sources/Mocks/NotificationItemProxyMock.swift
+++ b/ElementX/Sources/Mocks/NotificationItemProxyMock.swift
@@ -16,7 +16,7 @@ struct NotificationItemProxyMockConfiguration {
         let messageLikeContent = MessageLikeEventContent.roomMessage(messageType: messageType, inReplyToEventId: nil)
         let event = TimelineEventSDKMock()
         event.eventIdUnderlyingReturnValue = UUID().uuidString
-        event.eventTypeReturnValue = TimelineEventType.messageLike(content: messageLikeContent)
+        event.contentReturnValue = .messageLike(content: messageLikeContent)
         return .timeline(event: event)
     }()
     
diff --git a/ElementX/Sources/Services/Client/ClientProxy.swift b/ElementX/Sources/Services/Client/ClientProxy.swift
index 6069294d1..5ed6ed6f6 100644
--- a/ElementX/Sources/Services/Client/ClientProxy.swift
+++ b/ElementX/Sources/Services/Client/ClientProxy.swift
@@ -172,7 +172,7 @@ class ClientProxy: ClientProxyProtocol {
         
         secureBackupController = SecureBackupController(encryption: client.encryption())
         
-        spaceService = SpaceServiceProxy(spaceService: client.spaceService())
+        spaceService = await SpaceServiceProxy(spaceService: client.spaceService())
         
         let configuredAppService = try await ClientProxyServices(client: client,
                                                                  actionsSubject: actionsSubject,
diff --git a/ElementX/Sources/Services/Spaces/SpaceServiceProxy.swift b/ElementX/Sources/Services/Spaces/SpaceServiceProxy.swift
index 2722fda9c..4d4969855 100644
--- a/ElementX/Sources/Services/Spaces/SpaceServiceProxy.swift
+++ b/ElementX/Sources/Services/Spaces/SpaceServiceProxy.swift
@@ -26,7 +26,7 @@ class SpaceServiceProxy: SpaceServiceProxyProtocol {
     }
     
     private func setupSubscriptions() async {
-        joinedSpacesHandle = await spaceService.subscribeToJoinedSpaces(listener: SDKListener { [weak self] updates in
+        joinedSpacesHandle = await spaceService.subscribeToTopLevelJoinedSpaces(listener: SDKListener { [weak self] updates in
             self?.handleUpdates(updates)
         })
     }
diff --git a/NSE/Sources/NotificationContentBuilder.swift b/NSE/Sources/NotificationContentBuilder.swift
index 21c814af5..4d7818fea 100644
--- a/NSE/Sources/NotificationContentBuilder.swift
+++ b/NSE/Sources/NotificationContentBuilder.swift
@@ -59,8 +59,7 @@ struct NotificationContentBuilder {
                                  notificationItem: notificationItem,
                                  mediaProvider: mediaProvider)
         case .timeline(let event):
-            guard let eventType = try? event.eventType(),
-                  case let .messageLike(content) = eventType else {
+            guard case let .messageLike(messageContent) = try? event.content() else {
                 processEmpty(&notificationContent)
                 return
             }
@@ -69,7 +68,7 @@ struct NotificationContentBuilder {
                                      notificationItem: notificationItem,
                                      mediaProvider: mediaProvider)
             
-            switch content {
+            switch messageContent {
             case .roomMessage(let messageType, _):
                 await processRoomMessage(notificationContent: &notificationContent,
                                          notificationItem: notificationItem,
diff --git a/NSE/Sources/NotificationHandler.swift b/NSE/Sources/NotificationHandler.swift
index ace393d1a..a8a97785f 100644
--- a/NSE/Sources/NotificationHandler.swift
+++ b/NSE/Sources/NotificationHandler.swift
@@ -98,9 +98,9 @@ class NotificationHandler {
             return .shouldDisplay
         }
         
-        switch try? event.eventType() {
-        case .messageLike(let content):
-            switch content {
+        switch try? event.content() {
+        case .messageLike(let messageContent):
+            switch messageContent {
             case .poll,
                  .roomEncrypted,
                  .sticker:
diff --git a/Package.resolved b/Package.resolved
index 4ad266478..958ad6262 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -1,13 +1,13 @@
 {
-  "originHash" : "43d8d4409954f06d1f1b8ea37d305f2db6b1e8bd1b8a0e108e9bae075d7a601c",
+  "originHash" : "ef4c8dd879ab71e7b86c9acb2ca8553c28ad37193014cec9199f0c0f5fd14b41",
   "pins" : [
     {
       "identity" : "swift-argument-parser",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-argument-parser",
       "state" : {
-        "revision" : "cdd0ef3755280949551dc26dee5de9ddeda89f54",
-        "version" : "1.6.2"
+        "revision" : "c5d11a805e765f52ba34ec7284bd4fcd6ba68615",
+        "version" : "1.7.0"
       }
     },
     {
diff --git a/project.yml b/project.yml
index e4b4a85b2..f742b3dad 100644
--- a/project.yml
+++ b/project.yml
@@ -71,7 +71,7 @@ packages:
   # Element/Matrix dependencies
   MatrixRustSDK:
     url: https://github.com/element-hq/matrix-rust-components-swift
-    exactVersion: 25.12.17
+    exactVersion: 25.12.19
     # path: ../matrix-rust-sdk
   Compound:
     path: compound-ios