diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index 87f55d46a..f925d61f8 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -9735,7 +9735,7 @@
 			repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift";
 			requirement = {
 				kind = exactVersion;
-				version = 25.12.19;
+				version = 26.1.6;
 			};
 		};
 		701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = {
diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 0fbf782f2..884d7ecb3 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" : "bc1acbc8ee7e8271465a724e3b3f2339cd12d20b",
-        "version" : "25.12.19"
+        "revision" : "7e3bb4a7ca2d24c36a40e21124fbdac7409d9c9c",
+        "version" : "26.1.6"
       }
     },
     {
diff --git a/ElementX/Sources/Mocks/SDK/EventTimelineItem.swift b/ElementX/Sources/Mocks/SDK/EventTimelineItem.swift
index eb905e9b9..8f8bdf5b0 100644
--- a/ElementX/Sources/Mocks/SDK/EventTimelineItem.swift
+++ b/ElementX/Sources/Mocks/SDK/EventTimelineItem.swift
@@ -15,6 +15,8 @@ struct EventTimelineItemSDKMockConfiguration {
     var eventID: String = UUID().uuidString
     var sender = ""
     var senderProfile: ProfileDetails?
+    var forwarder: String?
+    var forwarderProfile: ProfileDetails?
     var isOwn = false
     var content: TimelineItemContent = .msgLike(content: .init(kind: .redacted,
                                                                reactions: [],
@@ -29,6 +31,8 @@ extension EventTimelineItem {
                   eventOrTransactionId: .eventId(eventId: configuration.eventID),
                   sender: configuration.sender,
                   senderProfile: configuration.senderProfile ?? .pending,
+                  forwarder: configuration.forwarder,
+                  forwarderProfile: configuration.forwarderProfile,
                   isOwn: configuration.isOwn,
                   isEditable: false,
                   content: configuration.content,
diff --git a/ElementX/Sources/Services/Timeline/TimelineItemContent/EncryptionAuthenticity.swift b/ElementX/Sources/Services/Timeline/TimelineItemContent/EncryptionAuthenticity.swift
index 48518e21a..0e025c361 100644
--- a/ElementX/Sources/Services/Timeline/TimelineItemContent/EncryptionAuthenticity.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineItemContent/EncryptionAuthenticity.swift
@@ -68,16 +68,16 @@ enum EncryptionAuthenticity: Hashable {
 extension EncryptionAuthenticity {
     init?(shieldState: ShieldState) {
         switch shieldState {
-        case .red(let code, _):
+        case .red(let code):
             self.init(shieldStateCode: code, color: .red)
-        case .grey(let code, _):
+        case .grey(let code):
             self.init(shieldStateCode: code, color: .gray)
         case .none:
             return nil
         }
     }
     
-    init(shieldStateCode: ShieldStateCode, color: EncryptionAuthenticity.Color) {
+    init(shieldStateCode: TimelineEventShieldStateCode, color: EncryptionAuthenticity.Color) {
         switch shieldStateCode {
         case .authenticityNotGuaranteed:
             self = .notGuaranteed(color: color)
diff --git a/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift b/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift
index 6e23a4300..55ce23831 100644
--- a/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift
+++ b/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift
@@ -10573,13 +10573,13 @@ open class LazyTimelineItemProviderSDKMock: MatrixRustSDK.LazyTimelineItemProvid
     open var getShieldsStrictReceivedStrict: Bool?
     open var getShieldsStrictReceivedInvocations: [Bool] = []
 
-    open var getShieldsStrictUnderlyingReturnValue: ShieldState?
-    open var getShieldsStrictReturnValue: ShieldState? {
+    open var getShieldsStrictUnderlyingReturnValue: ShieldState!
+    open var getShieldsStrictReturnValue: ShieldState! {
         get {
             if Thread.isMainThread {
                 return getShieldsStrictUnderlyingReturnValue
             } else {
-                var returnValue: ShieldState?? = nil
+                var returnValue: ShieldState? = nil
                 DispatchQueue.main.sync {
                     returnValue = getShieldsStrictUnderlyingReturnValue
                 }
@@ -10597,9 +10597,9 @@ open class LazyTimelineItemProviderSDKMock: MatrixRustSDK.LazyTimelineItemProvid
             }
         }
     }
-    open var getShieldsStrictClosure: ((Bool) -> ShieldState?)?
+    open var getShieldsStrictClosure: ((Bool) -> ShieldState)?
 
-    open override func getShields(strict: Bool) -> ShieldState? {
+    open override func getShields(strict: Bool) -> ShieldState {
         getShieldsStrictCallsCount += 1
         getShieldsStrictReceivedStrict = strict
         DispatchQueue.main.async {
diff --git a/project.yml b/project.yml
index ceb30cda8..9aa152c78 100644
--- a/project.yml
+++ b/project.yml
@@ -73,7 +73,7 @@ packages:
   # Element/Matrix dependencies
   MatrixRustSDK:
     url: https://github.com/element-hq/matrix-rust-components-swift
-    exactVersion: 25.12.19
+    exactVersion: 26.1.6
     # path: ../matrix-rust-sdk
   Compound:
     path: compound-ios