diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index 4da7eea3f..845a62aa8 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -3223,7 +3223,7 @@
 			repositoryURL = "https://github.com/matrix-org/matrix-rust-components-swift";
 			requirement = {
 				kind = exactVersion;
-				version = "1.0.14-alpha";
+				version = "1.0.15-alpha";
 			};
 		};
 		96495DD8554E2F39D3954354 /* XCRemoteSwiftPackageReference "posthog-ios" */ = {
diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 9483f8008..9a6a7f8b0 100644
--- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -77,8 +77,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/matrix-org/matrix-rust-components-swift",
       "state" : {
-        "revision" : "787b00fbdd34cf296a760c27136749e60223ed01",
-        "version" : "1.0.14-alpha"
+        "revision" : "e3ae8941c864ba18e7e5c51d25a6ce2c5c7a65a0",
+        "version" : "1.0.15-alpha"
       }
     },
     {
diff --git a/ElementX/Sources/Services/Client/ClientProxy.swift b/ElementX/Sources/Services/Client/ClientProxy.swift
index d0da6906d..5aaed4577 100644
--- a/ElementX/Sources/Services/Client/ClientProxy.swift
+++ b/ElementX/Sources/Services/Client/ClientProxy.swift
@@ -84,14 +84,15 @@ class ClientProxy: ClientProxyProtocol {
             
             let slidingSyncView = try SlidingSyncViewBuilder()
                 .timelineLimit(limit: 10)
-                .requiredState(requiredState: [RequiredState(key: "m.room.avatar", value: "")])
+                .requiredState(requiredState: [RequiredState(key: "m.room.avatar", value: ""),
+                                               RequiredState(key: "m.room.encryption", value: "")])
                 .name(name: "HomeScreenView")
                 .syncMode(mode: .fullSync)
                 .build()
             
             slidingSync = try slidingSyncBuilder
                 .addView(view: slidingSyncView)
-//                .withCommonExtensions()
+                .withCommonExtensions()
                 .build()
             
             roomSummaryProvider = RoomSummaryProvider(slidingSyncController: slidingSync,
@@ -254,6 +255,6 @@ class ClientProxy: ClientProxyProtocol {
     fileprivate func didReceiveSlidingSyncUpdate(summary: UpdateSummary) {
         roomSummaryProvider.updateRoomsWithIdentifiers(summary.rooms)
         
-//        callbacks.send(.receivedSyncUpdate)
+        callbacks.send(.receivedSyncUpdate)
     }
 }
diff --git a/ElementX/Sources/UserSession/UserSessionFlowCoordinator.swift b/ElementX/Sources/UserSession/UserSessionFlowCoordinator.swift
index 42d4cafca..e0d36c42f 100644
--- a/ElementX/Sources/UserSession/UserSessionFlowCoordinator.swift
+++ b/ElementX/Sources/UserSession/UserSessionFlowCoordinator.swift
@@ -112,7 +112,7 @@ class UserSessionFlowCoordinator: Coordinator {
             case .presentRoom(let roomIdentifier):
                 self.stateMachine.processEvent(.showRoomScreen(roomId: roomIdentifier))
             case .presentSettings:
-                self.presentSettingsScreen()
+                self.stateMachine.processEvent(.showSettingsScreen)
             case .presentBugReport:
                 self.presentBugReportScreen()
             case .verifySession:
@@ -209,6 +209,8 @@ class UserSessionFlowCoordinator: Coordinator {
 
         navigationRouter.dismissModule()
         remove(childCoordinator: coordinator)
+        
+        stateMachine.processEvent(.dismissedSettingsScreen)
     }
     
     // MARK: Session verification
diff --git a/ElementX/Sources/UserSession/UserSessionFlowCoordinatorStateMachine.swift b/ElementX/Sources/UserSession/UserSessionFlowCoordinatorStateMachine.swift
index fb5daa0a7..6d01baf96 100644
--- a/ElementX/Sources/UserSession/UserSessionFlowCoordinatorStateMachine.swift
+++ b/ElementX/Sources/UserSession/UserSessionFlowCoordinatorStateMachine.swift
@@ -89,6 +89,14 @@ class UserSessionFlowCoordinatorStateMachine {
                 return .suspended
             case (.becomeActive, .suspended):
                 return self.stateBeforeSuspension
+            case (.showSettingsScreen, .homeScreen):
+                return .settingsScreen
+            case (.dismissedSettingsScreen, .settingsScreen):
+                return .homeScreen
+            case (.showSessionVerificationScreen, .homeScreen):
+                return .sessionVerificationScreen
+            case (.dismissedSessionVerificationScreen, .sessionVerificationScreen):
+                return .homeScreen
             default:
                 return nil
             }
diff --git a/UITests/Sources/Application.swift b/UITests/Sources/Application.swift
index e7beafe99..633f5686a 100644
--- a/UITests/Sources/Application.swift
+++ b/UITests/Sources/Application.swift
@@ -63,11 +63,11 @@ extension XCUIApplication {
     }
 
     private var languageCode: String {
-        Locale.current.languageCode ?? ""
+        Locale.current.language.languageCode?.identifier ?? ""
     }
 
     private var regionCode: String {
-        Locale.current.regionCode ?? ""
+        Locale.current.language.region?.identifier ?? ""
     }
 
     private var osVersion: String {
diff --git a/changelog.d/pr-274.feature b/changelog.d/pr-274.feature
new file mode 100644
index 000000000..a05c8db0a
--- /dev/null
+++ b/changelog.d/pr-274.feature
@@ -0,0 +1 @@
+Enable e2e encryption support
\ No newline at end of file
diff --git a/project.yml b/project.yml
index 967439d14..df7b40ab3 100644
--- a/project.yml
+++ b/project.yml
@@ -35,7 +35,7 @@ include:
 packages:
   MatrixRustSDK:
     url: https://github.com/matrix-org/matrix-rust-components-swift
-    exactVersion: 1.0.14-alpha
+    exactVersion: 1.0.15-alpha
     # path: ../matrix-rust-components-swift
   DesignKit:
     path: ./