From fe8ef21659c14b9b34fa8fdf0dd999f3bab99b44 Mon Sep 17 00:00:00 2001
From: Johannes Marbach <n0-0ne+github@mailbox.org>
Date: Thu, 8 Apr 2021 20:51:39 +0200
Subject: [PATCH 01/59] Fix memory leak in [RecentsDataSource
 dataSource:didStateChange:]

The block passed into `[MXSession listenToEventsOfTypes:onEvent:]` is stored with a strong
reference in the `listenerBlock` property of `MXSessionEventListener`. The method also
returns the listener and it is then stored into the `roomTagsListenerByUserId` dictionary
on `self`. Since a strong reference to `self` is captured in the block that means the block
retains `self` (via the capture) and `self` retains the block (via `roomTagsListenerByUserId`)
so there is a memory leak.

The bug is most easily reproduced during testing #4168 which involves closing the current
and creating a new session.

Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>
---
 CHANGES.rst                                                 | 1 +
 Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 76bb579d0..363aaaa66 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -23,6 +23,7 @@ Changes to be released in next version
  * Black theme uses dark background for composer (#4192)
  * Vertical layout of typing notifs can go wonky (#4159)
  * Crash in [RoomViewController refreshTypingNotification] (#4161)
+ * Memory leak in [RecentsDataSource dataSource:didStateChange:]
 
 ⚠️ API Changes
  * 
diff --git a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
index 497f80fce..09989ec36 100644
--- a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
+++ b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
@@ -337,9 +337,12 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
         if ((aState == MXKDataSourceStateReady) && dataSource.mxSession.myUser.userId)
         {
             // Register the room tags updates to refresh the favorites order
+            MXWeakify(self);
             id roomTagsListener = [dataSource.mxSession listenToEventsOfTypes:@[kMXEventTypeStringRoomTag]
                                                                 onEvent:^(MXEvent *event, MXTimelineDirection direction, id customObject) {
 
+                                                                    MXStrongifyAndReturnIfNil(self);
+
                                                                     // Consider only live event
                                                                     if (direction == MXTimelineDirectionForwards)
                                                                     {

From 7ad705d92de9fa82d845ee6cafc66990edb57c46 Mon Sep 17 00:00:00 2001
From: Paulo Pinto <paulo.pinto@automattic.com>
Date: Wed, 14 Jul 2021 12:42:27 +0100
Subject: [PATCH 02/59] Standardise casing of identity server

Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
---
 Riot/Generated/Strings.swift                                  | 4 ++--
 Riot/Modules/Application/LegacyAppDelegate.m                  | 2 +-
 Riot/Modules/Authentication/AuthenticationViewController.xib  | 2 +-
 .../SettingsIdentityServerViewController.storyboard           | 2 +-
 Riot/Modules/Settings/SettingsViewController.m                | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift
index e568cf7a8..2c7b1c79b 100644
--- a/Riot/Generated/Strings.swift
+++ b/Riot/Generated/Strings.swift
@@ -1590,7 +1590,7 @@ internal enum VectorL10n {
   internal static var identityServerSettingsPlaceHolder: String { 
     return VectorL10n.tr("Vector", "identity_server_settings_place_holder") 
   }
-  /// Identity Server
+  /// Identity server
   internal static var identityServerSettingsTitle: String { 
     return VectorL10n.tr("Vector", "identity_server_settings_title") 
   }
@@ -4150,7 +4150,7 @@ internal enum VectorL10n {
   internal static var settingsDiscoverySettings: String { 
     return VectorL10n.tr("Vector", "settings_discovery_settings") 
   }
-  /// Agree to the Identity Server (%@) Terms of Service to allow yourself to be discoverable by email address or phone number.
+  /// Agree to the identity server (%@) Terms of Service to allow yourself to be discoverable by email address or phone number.
   internal static func settingsDiscoveryTermsNotSigned(_ p1: String) -> String {
     return VectorL10n.tr("Vector", "settings_discovery_terms_not_signed", p1)
   }
diff --git a/Riot/Modules/Application/LegacyAppDelegate.m b/Riot/Modules/Application/LegacyAppDelegate.m
index a6df6cb48..73cad0071 100644
--- a/Riot/Modules/Application/LegacyAppDelegate.m
+++ b/Riot/Modules/Application/LegacyAppDelegate.m
@@ -1164,7 +1164,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
         return YES;
     }
     
-    // Manage email validation link from Identity Server v1 or v2
+    // Manage email validation link from identity server v1 or v2
     else if ([webURL.path isEqualToString:validateEmailSubmitTokenAPIPathV1]
              || [webURL.path isEqualToString:validateEmailSubmitTokenAPIPathV2])
     {
diff --git a/Riot/Modules/Authentication/AuthenticationViewController.xib b/Riot/Modules/Authentication/AuthenticationViewController.xib
index c654446fc..4080c755d 100644
--- a/Riot/Modules/Authentication/AuthenticationViewController.xib
+++ b/Riot/Modules/Authentication/AuthenticationViewController.xib
@@ -294,7 +294,7 @@
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kjJ-Tb-SIW">
                                                             <rect key="frame" x="0.0" y="70" width="375" height="70"/>
                                                             <subviews>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Identity Server:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5CT-Ht-Z3v">
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Identity server:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5CT-Ht-Z3v">
                                                                     <rect key="frame" x="18" y="8" width="339" height="20"/>
                                                                     <accessibility key="accessibilityConfiguration" identifier="AuthenticationVCISLabel"/>
                                                                     <constraints>
diff --git a/Riot/Modules/Settings/IdentityServer/SettingsIdentityServerViewController.storyboard b/Riot/Modules/Settings/IdentityServer/SettingsIdentityServerViewController.storyboard
index b33325642..69b2e017f 100644
--- a/Riot/Modules/Settings/IdentityServer/SettingsIdentityServerViewController.storyboard
+++ b/Riot/Modules/Settings/IdentityServer/SettingsIdentityServerViewController.storyboard
@@ -28,7 +28,7 @@
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0W7-LW-UNr">
                                                         <rect key="frame" x="0.0" y="40" width="375" height="51"/>
                                                         <subviews>
-                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Identity Server" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g0a-45-iRa">
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Identity server" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g0a-45-iRa">
                                                                 <rect key="frame" x="20" y="16" width="100" height="19"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                                 <nil key="textColor"/>
diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m
index 29765dd4a..7ecef6765 100644
--- a/Riot/Modules/Settings/SettingsViewController.m
+++ b/Riot/Modules/Settings/SettingsViewController.m
@@ -4195,7 +4195,7 @@ TableViewSectionsDelegate>
 }
 
 
-#pragma mark - Identity Server updates
+#pragma mark - Identity server updates
 
 - (void)registerAccountDataDidChangeIdentityServerNotification
 {
@@ -4289,7 +4289,7 @@ TableViewSectionsDelegate>
 }
 
 
-#pragma mark - Identity Server
+#pragma mark - Identity server
 
 - (void)showIdentityServerSettingsScreen
 {

From 36f51e38ed409862bf6e52bc1ac045edcc3c9e01 Mon Sep 17 00:00:00 2001
From: Paulo Pinto <paulo.pinto@automattic.com>
Date: Wed, 14 Jul 2021 12:59:58 +0100
Subject: [PATCH 03/59] Standardise spelling and casing of integration manager

Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
---
 Riot/Managers/Widgets/WidgetManager.m | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Riot/Managers/Widgets/WidgetManager.m b/Riot/Managers/Widgets/WidgetManager.m
index f336cbade..8f0d0e6d6 100644
--- a/Riot/Managers/Widgets/WidgetManager.m
+++ b/Riot/Managers/Widgets/WidgetManager.m
@@ -262,7 +262,7 @@ NSString *const WidgetManagerErrorDomain = @"WidgetManagerErrorDomain";
     WidgetManagerConfig *config = [self configForUser:userId];
     if (!config.hasUrls)
     {
-        MXLogDebug(@"[WidgetManager] createJitsiWidgetInRoom: Error: no Integrations Manager API URL for user %@", userId);
+        MXLogDebug(@"[WidgetManager] createJitsiWidgetInRoom: Error: no integration manager API URL for user %@", userId);
         failure(self.errorForNonConfiguredIntegrationManager);
         return nil;
     }
@@ -574,7 +574,7 @@ NSString *const WidgetManagerErrorDomain = @"WidgetManagerErrorDomain";
     WidgetManagerConfig *config = [self configForUser:userId];
     if (!config.hasUrls)
     {
-        MXLogDebug(@"[WidgetManager] registerForScalarToken: Error: no Integrations Manager API URL for user %@", mxSession.myUser.userId);
+        MXLogDebug(@"[WidgetManager] registerForScalarToken: Error: no integration manager API URL for user %@", mxSession.myUser.userId);
         failure(self.errorForNonConfiguredIntegrationManager);
         return nil;
     }
@@ -654,7 +654,7 @@ NSString *const WidgetManagerErrorDomain = @"WidgetManagerErrorDomain";
     WidgetManagerConfig *config = [self configForUser:userId];
     if (!config.hasUrls)
     {
-        MXLogDebug(@"[WidgetManager] validateScalarToken: Error: no Integrations Manager API URL for user %@", mxSession.myUser.userId);
+        MXLogDebug(@"[WidgetManager] validateScalarToken: Error: no integration manager API URL for user %@", mxSession.myUser.userId);
         failure(self.errorForNonConfiguredIntegrationManager);
         return nil;
     }

From 1d6c4fdf6fcb31db025b49b85a84e4a4df9d5302 Mon Sep 17 00:00:00 2001
From: Paulo Pinto <paulo.pinto@automattic.com>
Date: Thu, 15 Jul 2021 16:24:35 +0100
Subject: [PATCH 04/59] Add entry to changelog

Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 1433d58ab..a4820be32 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -100,6 +100,7 @@ Improvements:
 
  * Room Notification Settings: Ability to change between "All Messages", "Mentions and Keywords" and "None". Not yet exposed in Element UI. (#4458).
  * Add support for sending slow motion videos (#4483).
+ * Standardise casing of identity server and integration manager (#4559).
 
 🐛 Bugfix
 

From 3c5c77373680051ceed401bb03190736bd5fd05e Mon Sep 17 00:00:00 2001
From: Paulo Pinto <paulo.pinto@automattic.com>
Date: Mon, 19 Jul 2021 14:35:05 +0100
Subject: [PATCH 05/59] Standardise casing of terms in source strings

Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
---
 Riot/Assets/en.lproj/Vector.strings | 8 ++++----
 Riot/Generated/Strings.swift        | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings
index 9731fee82..e2d163d7e 100644
--- a/Riot/Assets/en.lproj/Vector.strings
+++ b/Riot/Assets/en.lproj/Vector.strings
@@ -513,7 +513,7 @@ Tap the + to start adding people.";
 "settings_calls_stun_server_fallback_description" = "Allow fallback call assist server %@ when your homeserver does not offer one (your IP address would be shared during a call).";
 
 "settings_integrations_allow_button" = "Manage integrations";
-"settings_integrations_allow_description" = "Use an Integration Manager (%@) to manage bots, bridges, widgets and sticker packs.\n\nIntegration Managers receive configuration data, and can modify widgets, send room invites and set power levels on your behalf.";
+"settings_integrations_allow_description" = "Use an integration manager (%@) to manage bots, bridges, widgets and sticker packs.\n\nIntegration managers receive configuration data, and can modify widgets, send room invites and set power levels on your behalf.";
 
 "settings_ui_language" = "Language";
 "settings_ui_theme" = "Theme";
@@ -595,7 +595,7 @@ Tap the + to start adding people.";
 "settings_devices_description" = "A session's public name is visible to people you communicate with";
 
 "settings_discovery_no_identity_server" = "You are not currently using an identity server. To be discoverable by existing contacts you known, add one.";
-"settings_discovery_terms_not_signed" = "Agree to the Identity Server (%@) Terms of Service to allow yourself to be discoverable by email address or phone number.";
+"settings_discovery_terms_not_signed" = "Agree to the identity server (%@) Terms of Service to allow yourself to be discoverable by email address or phone number.";
 "settings_discovery_three_pids_management_information_part1" = "Manage which email addresses or phone numbers other users can use to discover you and use to invite you to rooms. Add or remove email addresses or phone numbers from this list in ";
 "settings_discovery_three_pids_management_information_part2" = "User Settings";
 "settings_discovery_three_pids_management_information_part3" = ".";
@@ -668,7 +668,7 @@ Tap the + to start adding people.";
 "authenticated_session_flow_not_supported" = "This app does not support the authentication mechanism on your homeserver.";
 
 // Identity server settings
-"identity_server_settings_title" = "Identity Server";
+"identity_server_settings_title" = "Identity server";
 
 "identity_server_settings_description" = "You are currently using %@ to discover and be discoverable by existing contacts you know.";
 "identity_server_settings_no_is_description" = "You are not currently using an identity server. To discover and be discoverable by existing contacts, add one above.";
@@ -959,7 +959,7 @@ Tap the + to start adding people.";
 "widget_integration_missing_room_id" = "Missing room_id in request.";
 "widget_integration_missing_user_id" = "Missing user_id in request.";
 "widget_integration_room_not_visible" = "Room %@ is not visible.";
-"widget_integration_manager_disabled" = "You need to enable Integration Manager in settings";
+"widget_integration_manager_disabled" = "You need to enable integration manager in settings";
 
 // Widget Picker
 "widget_picker_title" = "Integrations";
diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift
index 2c7b1c79b..2828a1614 100644
--- a/Riot/Generated/Strings.swift
+++ b/Riot/Generated/Strings.swift
@@ -4270,7 +4270,7 @@ internal enum VectorL10n {
   internal static var settingsIntegrationsAllowButton: String { 
     return VectorL10n.tr("Vector", "settings_integrations_allow_button") 
   }
-  /// Use an Integration Manager (%@) to manage bots, bridges, widgets and sticker packs.\n\nIntegration Managers receive configuration data, and can modify widgets, send room invites and set power levels on your behalf.
+  /// Use an integration manager (%@) to manage bots, bridges, widgets and sticker packs.\n\nIntegration managers receive configuration data, and can modify widgets, send room invites and set power levels on your behalf.
   internal static func settingsIntegrationsAllowDescription(_ p1: String) -> String {
     return VectorL10n.tr("Vector", "settings_integrations_allow_description", p1)
   }
@@ -4930,7 +4930,7 @@ internal enum VectorL10n {
   internal static var widgetIntegrationFailedToSendRequest: String { 
     return VectorL10n.tr("Vector", "widget_integration_failed_to_send_request") 
   }
-  /// You need to enable Integration Manager in settings
+  /// You need to enable integration manager in settings
   internal static var widgetIntegrationManagerDisabled: String { 
     return VectorL10n.tr("Vector", "widget_integration_manager_disabled") 
   }

From 5ba896ac8964505c470fdcdd3c807ff73edf00f4 Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Sun, 12 Sep 2021 14:57:45 +0100
Subject: [PATCH 06/59] Add chat example

---
 Riot/Modules/Room/RoomViewController.xib      |  12 +-
 .../Modules/Common/Mock/MockScreenState.swift |  11 +-
 .../TemplateRoomChatCoordinator.swift         |  64 ++++++++++
 ...emplateRoomChatCoordinatorParamaters.swift |  21 ++++
 .../Model/TemplateRoomChatRoom.swift          |  43 +++++++
 .../Model/TemplateRoomChatStateAction.swift   |  21 ++++
 .../Model/TemplateRoomChatViewAction.swift    |  22 ++++
 .../TemplateRoomChatViewModelInput.swift      |  21 ++++
 .../TemplateRoomChatViewModelResult.swift     |  22 ++++
 .../Model/TemplateRoomChatViewState.swift     |  21 ++++
 .../MatrixSDK/TemplateRoomChatService.swift   |  78 +++++++++++++
 .../MockTemplateRoomChatScreenState.swift     |  52 +++++++++
 .../Mock/MockTemplateRoomChatService.swift    |  38 ++++++
 .../TemplateRoomChatServiceProtocol.swift     |  23 ++++
 .../Test/UI/TemplateRoomChatUITests.swift     |  53 +++++++++
 .../Unit/TemplateRoomChatViewModelTests.swift |  54 +++++++++
 .../View/TemplateRoomChat.swift               |  73 ++++++++++++
 .../View/TemplateRoomChatBubbleImage.swift    |  44 +++++++
 .../View/TemplateRoomChatBubbleView.swift     |  58 +++++++++
 .../ViewModel/TemplateRoomChatViewModel.swift | 110 ++++++++++++++++++
 .../TemplateRoomChatViewModelProtocol.swift   |  21 ++++
 .../TemplateRoomListCoordinator.swift         |  64 ++++++++++
 ...emplateRoomListCoordinatorParamaters.swift |  21 ++++
 .../Model/TemplateRoomListRoom.swift          |  25 ++++
 .../Model/TemplateRoomListStateAction.swift   |  21 ++++
 .../Model/TemplateRoomListViewAction.swift    |  22 ++++
 .../TemplateRoomListViewModelResult.swift     |  22 ++++
 .../Model/TemplateRoomListViewState.swift     |  21 ++++
 .../MatrixSDK/TemplateRoomListService.swift   |  52 +++++++++
 .../MockTemplateRoomListScreenState.swift     |  52 +++++++++
 .../Mock/MockTemplateRoomListService.swift    |  37 ++++++
 .../TemplateRoomListServiceProtocol.swift     |  23 ++++
 .../Test/UI/TemplateRoomListUITests.swift     |  53 +++++++++
 .../Unit/TemplateRoomListViewModelTests.swift |  54 +++++++++
 .../View/TemplateRoomList.swift               |  71 +++++++++++
 .../View/TemplateRoomListRow.swift            |  54 +++++++++
 .../ViewModel/TemplateRoomListViewModel.swift |  88 ++++++++++++++
 .../TemplateRoomListViewModelProtocol.swift   |  21 ++++
 Tools/Templates/createSwiftUITwoScreen.sh     |  34 ++++++
 39 files changed, 1589 insertions(+), 8 deletions(-)
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinator.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinatorParamaters.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatRoom.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatStateAction.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewAction.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelInput.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelResult.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewState.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatScreenState.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatService.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/TemplateRoomChatServiceProtocol.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Test/UI/TemplateRoomChatUITests.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Test/Unit/TemplateRoomChatViewModelTests.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleImage.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleView.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModelProtocol.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinator.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinatorParamaters.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListRoom.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListStateAction.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewAction.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewModelResult.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewState.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/MatrixSDK/TemplateRoomListService.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/Mock/MockTemplateRoomListScreenState.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/Mock/MockTemplateRoomListService.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/TemplateRoomListServiceProtocol.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Test/UI/TemplateRoomListUITests.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Test/Unit/TemplateRoomListViewModelTests.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomListRow.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModelProtocol.swift
 create mode 100755 Tools/Templates/createSwiftUITwoScreen.sh

diff --git a/Riot/Modules/Room/RoomViewController.xib b/Riot/Modules/Room/RoomViewController.xib
index 5b1a0a909..8483c4fd6 100644
--- a/Riot/Modules/Room/RoomViewController.xib
+++ b/Riot/Modules/Room/RoomViewController.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -136,14 +136,14 @@
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                 </stackView>
                 <button opaque="NO" alpha="0.0" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ih9-EU-BOU" userLabel="scroll Button">
-                    <rect key="frame" x="327" y="570" width="32" height="32"/>
+                    <rect key="frame" x="321" y="564" width="38" height="38"/>
                     <state key="normal" image="scrolldown"/>
                     <connections>
                         <action selector="scrollToBottomAction:" destination="-1" eventType="touchUpInside" id="TOf-aY-J6a"/>
                     </connections>
                 </button>
                 <label opaque="NO" userInteractionEnabled="NO" alpha="0.0" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QHs-rM-UU8" userLabel="scroll badge" customClass="BadgeLabel" customModule="Riot" customModuleProvider="target">
-                    <rect key="frame" x="334.5" y="562" width="17.5" height="16.5"/>
+                    <rect key="frame" x="336.5" y="557.5" width="7.5" height="13.5"/>
                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="11"/>
                     <nil key="textColor"/>
                     <nil key="highlightedColor"/>
@@ -212,13 +212,13 @@
     </objects>
     <designables>
         <designable name="QHs-rM-UU8">
-            <size key="intrinsicContentSize" width="17.5" height="16.5"/>
+            <size key="intrinsicContentSize" width="7.5" height="13.5"/>
         </designable>
     </designables>
     <resources>
         <image name="new_close" width="16" height="16"/>
         <image name="room_scroll_up" width="24" height="24"/>
-        <image name="scrolldown" width="32" height="32"/>
+        <image name="scrolldown" width="38" height="38"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
diff --git a/RiotSwiftUI/Modules/Common/Mock/MockScreenState.swift b/RiotSwiftUI/Modules/Common/Mock/MockScreenState.swift
index 22dc09383..651dbf83a 100644
--- a/RiotSwiftUI/Modules/Common/Mock/MockScreenState.swift
+++ b/RiotSwiftUI/Modules/Common/Mock/MockScreenState.swift
@@ -48,11 +48,18 @@ extension MockScreenState {
     static func screenGroup(
         themeId: ThemeIdentifier = .light,
         locale: Locale = Locale.current,
-        sizeCategory: ContentSizeCategory = ContentSizeCategory.medium
+        sizeCategory: ContentSizeCategory = ContentSizeCategory.medium,
+        addNavigation: Bool = false
     ) -> some View {
         Group {
             ForEach(0..<screensViews.count) { index in
-                screensViews[index]
+                if addNavigation {
+                    NavigationView{
+                        screensViews[index]
+                    }
+                } else {
+                    screensViews[index]
+                }
             }
         }
         .theme(themeId)
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinator.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinator.swift
new file mode 100644
index 000000000..080790d9d
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinator.swift
@@ -0,0 +1,64 @@
+/*
+ Copyright 2021 New Vector Ltd
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+import Foundation
+import UIKit
+import SwiftUI
+
+final class TemplateRoomChatCoordinator: Coordinator {
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    private let parameters: TemplateRoomChatCoordinatorParameters
+    private let templateRoomChatHostingController: UIViewController
+    private var templateRoomChatViewModel: TemplateRoomChatViewModelProtocol
+    
+    // MARK: Public
+
+    // Must be used only internally
+    var childCoordinators: [Coordinator] = []
+    var completion: (() -> Void)?
+    
+    // MARK: - Setup
+    
+    @available(iOS 14.0, *)
+    init(parameters: TemplateRoomChatCoordinatorParameters) {
+        self.parameters = parameters
+        let viewModel = TemplateRoomChatViewModel(templateRoomChatService: TemplateRoomChatService(session: parameters.session))
+        let view = TemplateRoomChat(viewModel: viewModel)
+            .addDependency(AvatarService.instantiate(mediaManager: parameters.session.mediaManager))
+        templateRoomChatViewModel = viewModel
+        templateRoomChatHostingController = VectorHostingController(rootView: view)
+    }
+    
+    // MARK: - Public
+    func start() {
+        templateRoomChatViewModel.completion = { [weak self] result in
+            guard let self = self else { return }
+            switch result {
+            case .cancel, .done:
+                self.completion?()
+            break
+            }
+        }
+    }
+    
+    func toPresentable() -> UIViewController {
+        return self.templateRoomChatHostingController
+    }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinatorParamaters.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinatorParamaters.swift
new file mode 100644
index 000000000..5fd0ebaea
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinatorParamaters.swift
@@ -0,0 +1,21 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+struct TemplateRoomChatCoordinatorParameters {
+ let session: MXSession
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatRoom.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatRoom.swift
new file mode 100644
index 000000000..409526af7
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatRoom.swift
@@ -0,0 +1,43 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+struct TemplateRoomChatMessage {
+    let id: String
+    let body: String
+    let sender: TemplateRoomChatMember
+}
+
+extension TemplateRoomChatMessage: Identifiable {}
+
+struct TemplateRoomChatMember {
+    let id: String
+    let avatarUrl: String?
+    let displayName: String?
+}
+
+extension TemplateRoomChatMember: Avatarable {
+    var mxContentUri: String? {
+        avatarUrl
+    }
+    
+    var matrixItemId: String {
+        id
+    }
+}
+
+extension TemplateRoomChatMember: Identifiable {}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatStateAction.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatStateAction.swift
new file mode 100644
index 000000000..ebf5052b5
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatStateAction.swift
@@ -0,0 +1,21 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+enum TemplateRoomChatStateAction {
+    case updateBubbles([TemplateRoomChatBubble])
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewAction.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewAction.swift
new file mode 100644
index 000000000..a65e0b623
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewAction.swift
@@ -0,0 +1,22 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+enum TemplateRoomChatViewAction {
+    case cancel
+    case done
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelInput.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelInput.swift
new file mode 100644
index 000000000..79b37684f
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelInput.swift
@@ -0,0 +1,21 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+struct TemplateRoomChatViewModelInput {
+    let messageInput: String
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelResult.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelResult.swift
new file mode 100644
index 000000000..1d62dab22
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelResult.swift
@@ -0,0 +1,22 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+enum TemplateRoomChatViewModelResult {
+    case cancel
+    case done
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewState.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewState.swift
new file mode 100644
index 000000000..e9c677a65
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewState.swift
@@ -0,0 +1,21 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+struct TemplateRoomChatViewState {
+    var bubbles: [TemplateRoomChatBubble]
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift
new file mode 100644
index 000000000..80f4a255f
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift
@@ -0,0 +1,78 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+import Combine
+
+@available(iOS 14.0, *)
+class TemplateRoomChatService: TemplateRoomChatServiceProtocol {
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    private let room: MXRoom
+    private let eventFormatter: EventFormatter
+    private var listenerReference: Any?
+    
+    // MARK: Public
+    private(set) var chatMessagesSubject: CurrentValueSubject<[TemplateRoomChatMessage], Never>
+    
+    // MARK: - Setup
+    
+    init(room: MXRoom) {
+        self.room = room
+        self.eventFormatter = EventFormatter(matrixSession: room.mxSession)
+        let batch = room.enumeratorForStoredMessages.nextEventsBatch(50)
+        let messageBatch = chatMessages(from: batch ?? [])
+        chatMessagesSubject = CurrentValueSubject(messageBatch)
+    }
+    
+    
+    func senderForMessage(event: MXEvent) -> TemplateRoomChatMember? {
+        guard let sender = event.sender else {
+            return nil
+        }
+        let displayName = eventFormatter.senderDisplayName(for: event, with: room.dangerousSyncState)
+        let avatarUrl = eventFormatter.senderAvatarUrl(for: event, with: room.dangerousSyncState)
+        return TemplateRoomChatMember(id: sender, avatarUrl: avatarUrl, displayName: displayName)
+    }
+    
+    private func chatMessages(from events: [MXEvent]) -> [TemplateRoomChatMessage] {
+        
+        eve
+        return events
+            .filter({ event in
+            event.type == kMXEventTypeStringRoomMessage
+                && event.content["msgtype"] as? String == kMXMessageTypeText
+            })
+            .compactMap({ event -> TemplateRoomChatMessage?  in
+                guard let eventId = event.eventId,
+                      let eventBody = event.content["body"] as? String,
+                      let sender = senderForMessage(event: event)
+                      else { return nil }
+                return TemplateRoomChatMessage(id: eventId,
+                                        body: eventBody,
+                                        sender: sender)
+            })
+    }
+
+
+    deinit {
+//        guard let reference = listenerReference else { return }
+    }
+
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatScreenState.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatScreenState.swift
new file mode 100644
index 000000000..77d61ca75
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatScreenState.swift
@@ -0,0 +1,52 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+import SwiftUI
+
+
+/// Using an enum for the screen allows you define the different state cases with
+/// the relevant associated data for each case.
+@available(iOS 14.0, *)
+enum MockTemplateRoomChatScreenState: MockScreenState, CaseIterable {
+    // A case for each state you want to represent
+    // with specific, minimal associated data that will allow you
+    // mock that screen.
+    case noRooms
+    case rooms
+    
+    /// The associated screen
+    var screenType: Any.Type {
+        TemplateRoomChat.self
+    }
+    
+    /// Generate the view struct for the screen state.
+    var screenView: AnyView {
+        let service: MockTemplateRoomChatService
+        switch self {
+        case .noRooms:
+            service = MockTemplateRoomChatService(messages: [])
+        case .rooms:
+            service = MockTemplateRoomChatService()
+        }
+        let viewModel = TemplateRoomChatViewModel(templateRoomChatService: service)
+        
+        // can simulate service and viewModel actions here if needs be.
+        
+        return AnyView(TemplateRoomChat(viewModel: viewModel)
+                .addDependency(MockAvatarService.example))
+    }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatService.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatService.swift
new file mode 100644
index 000000000..f02ed7873
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatService.swift
@@ -0,0 +1,38 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+import Combine
+
+@available(iOS 14.0, *)
+class MockTemplateRoomChatService: TemplateRoomChatServiceProtocol {
+    
+    static let mockMessages = [
+        TemplateRoomChatMessage(id: "!aaabaa:matrix.org", body: "Shall I put it live?", sender: "@alice:matrix.org"),
+        TemplateRoomChatMessage(id: "!bbbabb:matrix.org", body: "Yea go for it! ...and then let's head to the pub", sender: "@patrice:matrix.org"),
+        TemplateRoomChatMessage(id: "!aaabaa:matrix.org", body: "Deal.", sender: "@alice:matrix.org"),
+        TemplateRoomChatMessage(id: "!aaabaa:matrix.org", body: "Ok, Done. 🍻", sender: "@alice:matrix.org"),
+    ]
+    var chatMessagesSubject: CurrentValueSubject<[TemplateRoomChatMessage], Never>
+
+    init(messages: [TemplateRoomChatMessage] = mockMessages) {
+        chatMessagesSubject = CurrentValueSubject(messages)
+    }
+    
+    func simulateUpdate(messages: [TemplateRoomChatMessage]) {
+        self.chatMessagesSubject.send(messages)
+    }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/TemplateRoomChatServiceProtocol.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/TemplateRoomChatServiceProtocol.swift
new file mode 100644
index 000000000..e0a00b71e
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/TemplateRoomChatServiceProtocol.swift
@@ -0,0 +1,23 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+import Combine
+
+@available(iOS 14.0, *)
+protocol TemplateRoomChatServiceProtocol {
+    var chatMessagesSubject: CurrentValueSubject<[TemplateRoomChatMessage], Never> { get }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Test/UI/TemplateRoomChatUITests.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Test/UI/TemplateRoomChatUITests.swift
new file mode 100644
index 000000000..1a015132b
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Test/UI/TemplateRoomChatUITests.swift
@@ -0,0 +1,53 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import XCTest
+import RiotSwiftUI
+
+@available(iOS 14.0, *)
+class TemplateRoomChatUITests: MockScreenTest {
+    
+    override class var screenType: MockScreenState.Type {
+        return MockTemplateRoomChatScreenState.self
+    }
+
+    override class func createTest() -> MockScreenTest {
+        return TemplateRoomChatUITests(selector: #selector(verifyTemplateRoomChatScreen))
+    }
+    
+    func verifyTemplateRoomChatScreen() throws {
+        guard let screenState = screenState as? MockTemplateRoomChatScreenState else { fatalError("no screen") }
+        switch screenState {
+        case .presence(let presence):
+            verifyTemplateRoomChatPresence(presence: presence)
+        case .longDisplayName(let name):
+            verifyTemplateRoomChatLongName(name: name)
+        }
+    }
+    
+    func verifyTemplateRoomChatPresence(presence: TemplateRoomChatPresence) {
+        let presenceText = app.staticTexts["presenceText"]
+        XCTAssert(presenceText.exists)
+        XCTAssert(presenceText.label == presence.title)
+    }
+    
+    func verifyTemplateRoomChatLongName(name: String) {
+        let displayNameText = app.staticTexts["displayNameText"]
+        XCTAssert(displayNameText.exists)
+        XCTAssert(displayNameText.label == name)
+    }
+
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Test/Unit/TemplateRoomChatViewModelTests.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Test/Unit/TemplateRoomChatViewModelTests.swift
new file mode 100644
index 000000000..14cf4280b
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Test/Unit/TemplateRoomChatViewModelTests.swift
@@ -0,0 +1,54 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import XCTest
+import Combine
+
+@testable import RiotSwiftUI
+
+@available(iOS 14.0, *)
+class TemplateRoomChatViewModelTests: XCTestCase {
+    private enum Constants {
+        static let presenceInitialValue: TemplateRoomChatPresence = .offline
+        static let displayName = "Alice"
+    }
+    var service: MockTemplateRoomChatService!
+    var viewModel: TemplateRoomChatViewModel!
+    var cancellables = Set<AnyCancellable>()
+    override func setUpWithError() throws {
+        service = MockTemplateRoomChatService(displayName: Constants.displayName, presence: Constants.presenceInitialValue)
+        viewModel = TemplateRoomChatViewModel(templateRoomChatService: service)
+    }
+    
+    func testInitialState() {
+        XCTAssertEqual(viewModel.viewState.displayName, Constants.displayName)
+        XCTAssertEqual(viewModel.viewState.presence, Constants.presenceInitialValue)
+    }
+
+    func testFirstPresenceReceived() throws {
+        let presencePublisher = viewModel.$viewState.map(\.presence).removeDuplicates().collect(1).first()
+        XCTAssertEqual(try xcAwait(presencePublisher), [Constants.presenceInitialValue])
+    }
+    
+    func testPresenceUpdatesReceived() throws {
+        let presencePublisher = viewModel.$viewState.map(\.presence).removeDuplicates().collect(3).first()
+        let newPresenceValue1: TemplateRoomChatPresence = .online
+        let newPresenceValue2: TemplateRoomChatPresence = .idle
+        service.simulateUpdate(presence: newPresenceValue1)
+        service.simulateUpdate(presence: newPresenceValue2)
+        XCTAssertEqual(try xcAwait(presencePublisher), [Constants.presenceInitialValue, newPresenceValue1, newPresenceValue2])
+    }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
new file mode 100644
index 000000000..d2d0936e7
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
@@ -0,0 +1,73 @@
+//
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import SwiftUI
+
+@available(iOS 14.0, *)
+struct TemplateRoomChat: View {
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    @Environment(\.theme) private var theme: ThemeSwiftUI
+    
+    // MARK: Public
+    
+    @ObservedObject var viewModel: TemplateRoomChatViewModel
+    
+    var body: some View {
+        VStack {
+            LazyVStack {
+                
+            }.frame(maxHeight: .infinity)
+            
+            HStack {
+                TextField(VectorL10n.roomMessageShortPlaceholder, text: $viewModel.input.messageInput)
+                    .textFieldStyle(BorderedInputFieldStyle())
+                Button(action: {
+                    
+                }, label: {
+                    Image(uiImage: Asset.Images.sendIcon.image)
+                })
+            }
+            .padding(.horizontal)
+            
+        }
+        .navigationTitle("Chat")
+        .toolbar {
+            ToolbarItem(placement: .primaryAction) {
+                Button(VectorL10n.done) {
+                    viewModel.process(viewAction: .cancel)
+                }
+            }
+            ToolbarItem(placement: .cancellationAction) {
+                Button(VectorL10n.cancel) {
+                    viewModel.process(viewAction: .cancel)
+                }
+            }
+        }
+    }
+}
+
+// MARK: - Previews
+
+@available(iOS 14.0, *)
+struct TemplateRoomChat_Previews: PreviewProvider {
+    static var previews: some View {
+        MockTemplateRoomChatScreenState.screenGroup(addNavigation: true)
+    }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleImage.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleImage.swift
new file mode 100644
index 000000000..3b1bb7661
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleImage.swift
@@ -0,0 +1,44 @@
+//
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import SwiftUI
+
+@available(iOS 14.0, *)
+struct TemplateRoomChatBubbleImage: View {
+
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    @Environment(\.theme) private var theme: ThemeSwiftUI
+    
+    // MARK: Public
+    
+    let imageItem: TemplateRoomChatBubbleImageItem
+    
+    var body: some View {
+        EmptyView()
+    }
+}
+
+// MARK: - Previews
+
+@available(iOS 14.0, *)
+struct TemplateRoomChatBubbleImage_Previews: PreviewProvider {
+    static var previews: some View {
+        EmptyView()
+    }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleView.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleView.swift
new file mode 100644
index 000000000..0a44c72ba
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleView.swift
@@ -0,0 +1,58 @@
+//
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import SwiftUI
+
+@available(iOS 14.0, *)
+struct TemplateRoomChatBubbleView: View {
+
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    @Environment(\.theme) private var theme: ThemeSwiftUI
+    
+    // MARK: Public
+    
+    let bubble: TemplateRoomChatBubble
+    
+    var body: some View {
+        HStack{
+            AvatarImage(avatarData: bubble.avatar, size: .xSmall)
+            VStack{
+                Text(bubble.displayName ?? "")
+                ForEach(bubble.items) { item in
+                    TemplateRoomChatBubbleItemView(bubbleItem: item)
+                }
+            }
+            
+            Spacer()
+        }
+        //add to a style
+        .padding(.horizontal)
+        .padding(.vertical, 8)
+        .frame(maxWidth: .infinity)
+    }
+}
+
+// MARK: - Previews
+
+@available(iOS 14.0, *)
+struct TemplateRoomChatBubbleView_Previews: PreviewProvider {
+    static var previews: some View {
+        EmptyView()
+    }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
new file mode 100644
index 000000000..c4437a7e1
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
@@ -0,0 +1,110 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import SwiftUI
+import Combine
+    
+@available(iOS 14.0, *)
+class TemplateRoomChatViewModel: ObservableObject, TemplateRoomChatViewModelProtocol {
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    private let templateRoomChatService: TemplateRoomChatServiceProtocol
+    private var cancellables = Set<AnyCancellable>()
+    
+    // MARK: Public
+    @Published var input: TemplateRoomChatViewModelInput
+    @Published private(set) var viewState: TemplateRoomChatViewState
+    
+    var completion: ((TemplateRoomChatViewModelResult) -> Void)?
+    
+    // MARK: - Setup
+    init(templateRoomChatService: TemplateRoomChatServiceProtocol, initialState: TemplateRoomChatViewState? = nil) {
+        self.input = TemplateRoomChatViewModelInput(messageInput: "")
+        self.templateRoomChatService = templateRoomChatService
+        self.viewState = initialState ?? Self.defaultState(templateRoomChatService: templateRoomChatService)
+        
+        templateRoomChatService.chatMessagesSubject
+            .map(Self.makeBubbles(messages:))
+            .map(TemplateRoomChatStateAction.updateBubbles)
+            .receive(on: DispatchQueue.main)
+            .sink(receiveValue: { [weak self] action in
+                self?.dispatch(action:action)
+            })
+            .store(in: &cancellables)
+    }
+    
+    private static func defaultState(templateRoomChatService: TemplateRoomChatServiceProtocol) -> TemplateRoomChatViewState {
+        let bubbles = makeBubbles(messages: templateRoomChatService.chatMessagesSubject.value)
+        return TemplateRoomChatViewState(bubbles: bubbles)
+    }
+    
+    private static func makeBubbles(messages: [TemplateRoomChatMessage]) -> [TemplateRoomChatBubble] {
+        
+        
+        messages.enumerated().forEach { i, message in
+            let currentMessage = messages[i]
+            if i > 0 {
+                let lastMessage = messages[i-1]
+            } else {
+                TemplateRoomChatBubble(
+                    id: message.,
+                    avatar: <#T##AvatarInputProtocol#>,
+                    displayName: <#T##String?#>,
+                    items: <#T##[TemplateRoomChatBubbleItem]#>
+                )
+            }
+        }
+    }
+    
+    // MARK: - Public
+    func process(viewAction: TemplateRoomChatViewAction) {
+        switch viewAction {
+        case .cancel:
+            cancel()
+        case .done:
+            done()
+        }
+    }
+    
+    // MARK: - Private
+    /**
+     Send state actions to mutate the state.
+     */
+    private func dispatch(action: TemplateRoomChatStateAction) {
+        Self.reducer(state: &self.viewState, action: action)
+    }
+    
+    /**
+     A redux style reducer, all modifications to state happen here. Receives a state and a state action and produces a new state.
+     */
+    private static func reducer(state: inout TemplateRoomChatViewState, action: TemplateRoomChatStateAction) {
+        switch action {
+        case .updateBubbles(let bubbles):
+            state.bubbles = bubbles
+        }
+        UILog.debug("[TemplateRoomChatViewModel] reducer with action \(action) produced state: \(state)")
+    }
+    
+    private func done() {
+        completion?(.done)
+    }
+    
+    private func cancel() {
+        completion?(.cancel)
+    }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModelProtocol.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModelProtocol.swift
new file mode 100644
index 000000000..ad7553d81
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModelProtocol.swift
@@ -0,0 +1,21 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+protocol TemplateRoomChatViewModelProtocol {
+    var completion: ((TemplateRoomChatViewModelResult) -> Void)? { get set }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinator.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinator.swift
new file mode 100644
index 000000000..315b9946b
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinator.swift
@@ -0,0 +1,64 @@
+/*
+ Copyright 2021 New Vector Ltd
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+import Foundation
+import UIKit
+import SwiftUI
+
+final class TemplateRoomListCoordinator: Coordinator {
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    private let parameters: TemplateRoomListCoordinatorParameters
+    private let templateRoomListHostingController: UIViewController
+    private var templateRoomListViewModel: TemplateRoomListViewModelProtocol
+    
+    // MARK: Public
+
+    // Must be used only internally
+    var childCoordinators: [Coordinator] = []
+    var completion: (() -> Void)?
+    
+    // MARK: - Setup
+    
+    @available(iOS 14.0, *)
+    init(parameters: TemplateRoomListCoordinatorParameters) {
+        self.parameters = parameters
+        let viewModel = TemplateRoomListViewModel(templateRoomListService: TemplateRoomListService(session: parameters.session))
+        let view = TemplateRoomList(viewModel: viewModel)
+            .addDependency(AvatarService.instantiate(mediaManager: parameters.session.mediaManager))
+        templateRoomListViewModel = viewModel
+        templateRoomListHostingController = VectorHostingController(rootView: view)
+    }
+    
+    // MARK: - Public
+    func start() {
+        templateRoomListViewModel.completion = { [weak self] result in
+            guard let self = self else { return }
+            switch result {
+            case .cancel, .done:
+                self.completion?()
+            break
+            }
+        }
+    }
+    
+    func toPresentable() -> UIViewController {
+        return self.templateRoomListHostingController
+    }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinatorParamaters.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinatorParamaters.swift
new file mode 100644
index 000000000..986bca4f6
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinatorParamaters.swift
@@ -0,0 +1,21 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+struct TemplateRoomListCoordinatorParameters {
+ let session: MXSession
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListRoom.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListRoom.swift
new file mode 100644
index 000000000..94608e150
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListRoom.swift
@@ -0,0 +1,25 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+struct TemplateRoomListRoom {
+    let id: String
+    let avatar: AvatarInputProtocol
+    let displayName: String?
+}
+
+extension TemplateRoomListRoom: Identifiable {}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListStateAction.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListStateAction.swift
new file mode 100644
index 000000000..97f4557bc
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListStateAction.swift
@@ -0,0 +1,21 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+enum TemplateRoomListStateAction {
+    case updateRooms([TemplateRoomListRoom])
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewAction.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewAction.swift
new file mode 100644
index 000000000..d83f14bd4
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewAction.swift
@@ -0,0 +1,22 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+enum TemplateRoomListViewAction {
+    case cancel
+    case done
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewModelResult.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewModelResult.swift
new file mode 100644
index 000000000..5b4ac0ead
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewModelResult.swift
@@ -0,0 +1,22 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+enum TemplateRoomListViewModelResult {
+    case cancel
+    case done
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewState.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewState.swift
new file mode 100644
index 000000000..31975d18f
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewState.swift
@@ -0,0 +1,21 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+struct TemplateRoomListViewState {
+    var rooms: [TemplateRoomListRoom]
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/MatrixSDK/TemplateRoomListService.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/MatrixSDK/TemplateRoomListService.swift
new file mode 100644
index 000000000..6b74d321c
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/MatrixSDK/TemplateRoomListService.swift
@@ -0,0 +1,52 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+import Combine
+
+@available(iOS 14.0, *)
+class TemplateRoomListService: TemplateRoomListServiceProtocol {
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    private let session: MXSession
+    private var listenerReference: Any?
+    
+    // MARK: Public
+    private(set) var roomsSubject: CurrentValueSubject<[TemplateRoomListRoom], Never>
+    
+    // MARK: - Setup
+    
+    init(session: MXSession) {
+        self.session = session
+        self.roomsSubject = CurrentValueSubject(session.rooms.map(TemplateRoomListRoom.init(mxRoom:)))
+//        self.listenerReference = setupPresenceListener()
+    }
+
+    deinit {
+//        guard let reference = listenerReference else { return }
+    }
+
+}
+
+fileprivate extension TemplateRoomListRoom {
+    
+    init(mxRoom: MXRoom) {
+        TemplateRoomListRoom(id: mxRoom.roomId, avatar: mxRoom.summary.avatar, displayName: mxRoom.summary.displayname)
+    }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/Mock/MockTemplateRoomListScreenState.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/Mock/MockTemplateRoomListScreenState.swift
new file mode 100644
index 000000000..c4461b9d8
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/Mock/MockTemplateRoomListScreenState.swift
@@ -0,0 +1,52 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+import SwiftUI
+
+
+/// Using an enum for the screen allows you define the different state cases with
+/// the relevant associated data for each case.
+@available(iOS 14.0, *)
+enum MockTemplateRoomListScreenState: MockScreenState, CaseIterable {
+    // A case for each state you want to represent
+    // with specific, minimal associated data that will allow you
+    // mock that screen.
+    case noRooms
+    case rooms
+    
+    /// The associated screen
+    var screenType: Any.Type {
+        TemplateRoomList.self
+    }
+    
+    /// Generate the view struct for the screen state.
+    var screenView: AnyView {
+        let service: MockTemplateRoomListService
+        switch self {
+        case .noRooms:
+            service = MockTemplateRoomListService(rooms: [])
+        case .rooms:
+            service = MockTemplateRoomListService()
+        }
+        let viewModel = TemplateRoomListViewModel(templateRoomListService: service)
+        
+        // can simulate service and viewModel actions here if needs be.
+        
+        return AnyView(TemplateRoomList(viewModel: viewModel)
+                .addDependency(MockAvatarService.example))
+    }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/Mock/MockTemplateRoomListService.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/Mock/MockTemplateRoomListService.swift
new file mode 100644
index 000000000..f89d49d90
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/Mock/MockTemplateRoomListService.swift
@@ -0,0 +1,37 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+import Combine
+
+@available(iOS 14.0, *)
+class MockTemplateRoomListService: TemplateRoomListServiceProtocol {
+    
+    static let mockRooms = [
+        TemplateRoomListRoom(id: "!aaabaa:matrix.org", avatar: MockAvatarInput.example, displayName: "Matrix Discussion"),
+        TemplateRoomListRoom(id: "!zzasds:matrix.org", avatar: MockAvatarInput.example, displayName: "Element Mobile"),
+        TemplateRoomListRoom(id: "!scthve:matrix.org", avatar: MockAvatarInput.example, displayName: "Alice Personal")
+    ]
+    var roomsSubject: CurrentValueSubject<[TemplateRoomListRoom], Never>
+
+    init(rooms: [TemplateRoomListRoom] = mockRooms) {
+        roomsSubject = CurrentValueSubject(rooms)
+    }
+    
+    func simulateUpdate(rooms: [TemplateRoomListRoom]) {
+        self.roomsSubject.send(rooms)
+    }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/TemplateRoomListServiceProtocol.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/TemplateRoomListServiceProtocol.swift
new file mode 100644
index 000000000..fe9243d1a
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/TemplateRoomListServiceProtocol.swift
@@ -0,0 +1,23 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+import Combine
+
+@available(iOS 14.0, *)
+protocol TemplateRoomListServiceProtocol {
+    var roomsSubject: CurrentValueSubject<[TemplateRoomListRoom], Never> { get }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Test/UI/TemplateRoomListUITests.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Test/UI/TemplateRoomListUITests.swift
new file mode 100644
index 000000000..fdcfc8fa2
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Test/UI/TemplateRoomListUITests.swift
@@ -0,0 +1,53 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import XCTest
+import RiotSwiftUI
+
+@available(iOS 14.0, *)
+class TemplateRoomListUITests: MockScreenTest {
+    
+    override class var screenType: MockScreenState.Type {
+        return MockTemplateRoomListScreenState.self
+    }
+
+    override class func createTest() -> MockScreenTest {
+        return TemplateRoomListUITests(selector: #selector(verifyTemplateRoomListScreen))
+    }
+    
+    func verifyTemplateRoomListScreen() throws {
+        guard let screenState = screenState as? MockTemplateRoomListScreenState else { fatalError("no screen") }
+        switch screenState {
+        case .presence(let presence):
+            verifyTemplateRoomListPresence(presence: presence)
+        case .longDisplayName(let name):
+            verifyTemplateRoomListLongName(name: name)
+        }
+    }
+    
+    func verifyTemplateRoomListPresence(presence: TemplateRoomListPresence) {
+        let presenceText = app.staticTexts["presenceText"]
+        XCTAssert(presenceText.exists)
+        XCTAssert(presenceText.label == presence.title)
+    }
+    
+    func verifyTemplateRoomListLongName(name: String) {
+        let displayNameText = app.staticTexts["displayNameText"]
+        XCTAssert(displayNameText.exists)
+        XCTAssert(displayNameText.label == name)
+    }
+
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Test/Unit/TemplateRoomListViewModelTests.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Test/Unit/TemplateRoomListViewModelTests.swift
new file mode 100644
index 000000000..d059460cb
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Test/Unit/TemplateRoomListViewModelTests.swift
@@ -0,0 +1,54 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import XCTest
+import Combine
+
+@testable import RiotSwiftUI
+
+@available(iOS 14.0, *)
+class TemplateRoomListViewModelTests: XCTestCase {
+    private enum Constants {
+        static let presenceInitialValue: TemplateRoomListPresence = .offline
+        static let displayName = "Alice"
+    }
+    var service: MockTemplateRoomListService!
+    var viewModel: TemplateRoomListViewModel!
+    var cancellables = Set<AnyCancellable>()
+    override func setUpWithError() throws {
+        service = MockTemplateRoomListService(displayName: Constants.displayName, presence: Constants.presenceInitialValue)
+        viewModel = TemplateRoomListViewModel(templateRoomListService: service)
+    }
+    
+    func testInitialState() {
+        XCTAssertEqual(viewModel.viewState.displayName, Constants.displayName)
+        XCTAssertEqual(viewModel.viewState.presence, Constants.presenceInitialValue)
+    }
+
+    func testFirstPresenceReceived() throws {
+        let presencePublisher = viewModel.$viewState.map(\.presence).removeDuplicates().collect(1).first()
+        XCTAssertEqual(try xcAwait(presencePublisher), [Constants.presenceInitialValue])
+    }
+    
+    func testPresenceUpdatesReceived() throws {
+        let presencePublisher = viewModel.$viewState.map(\.presence).removeDuplicates().collect(3).first()
+        let newPresenceValue1: TemplateRoomListPresence = .online
+        let newPresenceValue2: TemplateRoomListPresence = .idle
+        service.simulateUpdate(presence: newPresenceValue1)
+        service.simulateUpdate(presence: newPresenceValue2)
+        XCTAssertEqual(try xcAwait(presencePublisher), [Constants.presenceInitialValue, newPresenceValue1, newPresenceValue2])
+    }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift
new file mode 100644
index 000000000..636171a06
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift
@@ -0,0 +1,71 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import SwiftUI
+
+@available(iOS 14.0, *)
+struct TemplateRoomList: View {
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    @Environment(\.theme) private var theme: ThemeSwiftUI
+    
+    // MARK: Public
+    
+    @ObservedObject var viewModel: TemplateRoomListViewModel
+    
+    var body: some View {
+        listContent
+            .navigationTitle("Rooms")
+            .toolbar {
+                ToolbarItem(placement: .primaryAction) {
+                    Button(VectorL10n.done) {
+                        viewModel.process(viewAction: .cancel)
+                    }
+                }
+                ToolbarItem(placement: .cancellationAction) {
+                    Button(VectorL10n.cancel) {
+                        viewModel.process(viewAction: .cancel)
+                    }
+                }
+            }
+    }
+    
+    @ViewBuilder
+    var listContent: some View {
+        if viewModel.viewState.rooms.isEmpty {
+            Text("No Rooms")
+        } else {
+            LazyVStack(spacing: 0) {
+                ForEach(viewModel.viewState.rooms) { room in
+                    TemplateRoomListRow(avatar: room.avatar, displayName: room.displayName)
+                }
+            }
+            .frame(maxHeight: .infinity, alignment: .top)
+        }
+    }
+}
+
+// MARK: - Previews
+
+@available(iOS 14.0, *)
+struct TemplateRoomList_Previews: PreviewProvider {
+    static var previews: some View {
+        MockTemplateRoomListScreenState.screenGroup(addNavigation: true)
+    }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomListRow.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomListRow.swift
new file mode 100644
index 000000000..c173ab122
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomListRow.swift
@@ -0,0 +1,54 @@
+//
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import SwiftUI
+
+@available(iOS 14.0, *)
+struct TemplateRoomListRow: View {
+
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    @Environment(\.theme) private var theme: ThemeSwiftUI
+    
+    // MARK: Public
+    
+    let avatar: AvatarInputProtocol
+    let displayName: String?
+    
+    var body: some View {
+        HStack{
+            AvatarImage(avatarData: avatar, size: .medium)
+            Text(displayName ?? "")
+            Spacer()
+        }
+        //add to a style
+        .padding(.horizontal)
+        .padding(.vertical, 8)
+        .frame(maxWidth: .infinity)
+    }
+}
+
+// MARK: - Previews
+
+@available(iOS 14.0, *)
+struct TemplateRoomListRow_Previews: PreviewProvider {
+    static var previews: some View {
+        TemplateRoomListRow(avatar: MockAvatarInput.example, displayName: "Alice")
+            .addDependency(MockAvatarService.example)
+    }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift
new file mode 100644
index 000000000..dc7430b6e
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift
@@ -0,0 +1,88 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import SwiftUI
+import Combine
+    
+@available(iOS 14.0, *)
+class TemplateRoomListViewModel: ObservableObject, TemplateRoomListViewModelProtocol {
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    private let templateRoomListService: TemplateRoomListServiceProtocol
+    private var cancellables = Set<AnyCancellable>()
+    
+    // MARK: Public
+    @Published private(set) var viewState: TemplateRoomListViewState
+    
+    var completion: ((TemplateRoomListViewModelResult) -> Void)?
+    
+    // MARK: - Setup
+    init(templateRoomListService: TemplateRoomListServiceProtocol, initialState: TemplateRoomListViewState? = nil) {
+        self.templateRoomListService = templateRoomListService
+        self.viewState = initialState ?? Self.defaultState(templateRoomListService: templateRoomListService)
+        
+        templateRoomListService.roomsSubject
+            .map(TemplateRoomListStateAction.updateRooms)
+            .receive(on: DispatchQueue.main)
+            .sink(receiveValue: { [weak self] action in
+                self?.dispatch(action:action)
+            })
+            .store(in: &cancellables)
+    }
+    
+    private static func defaultState(templateRoomListService: TemplateRoomListServiceProtocol) -> TemplateRoomListViewState {
+        return TemplateRoomListViewState(rooms: templateRoomListService.roomsSubject.value)
+    }
+    
+    // MARK: - Public
+    func process(viewAction: TemplateRoomListViewAction) {
+        switch viewAction {
+        case .cancel:
+            cancel()
+        case .done:
+            done()
+        }
+    }
+    
+    // MARK: - Private
+    /**
+     Send state actions to mutate the state.
+     */
+    private func dispatch(action: TemplateRoomListStateAction) {
+        Self.reducer(state: &self.viewState, action: action)
+    }
+    
+    /**
+     A redux style reducer, all modifications to state happen here. Receives a state and a state action and produces a new state.
+     */
+    private static func reducer(state: inout TemplateRoomListViewState, action: TemplateRoomListStateAction) {
+        switch action {
+        case .updateRooms(let rooms):
+            state.rooms = rooms
+        }
+        UILog.debug("[TemplateRoomListViewModel] reducer with action \(action) produced state: \(state)")
+    }
+    
+    private func done() {
+        completion?(.done)
+    }
+    
+    private func cancel() {
+        completion?(.cancel)
+    }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModelProtocol.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModelProtocol.swift
new file mode 100644
index 000000000..a64e790e8
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModelProtocol.swift
@@ -0,0 +1,21 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+protocol TemplateRoomListViewModelProtocol {
+    var completion: ((TemplateRoomListViewModelResult) -> Void)? { get set }
+}
diff --git a/Tools/Templates/createSwiftUITwoScreen.sh b/Tools/Templates/createSwiftUITwoScreen.sh
new file mode 100755
index 000000000..931afc9ab
--- /dev/null
+++ b/Tools/Templates/createSwiftUITwoScreen.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+if [ ! $# -eq 2 ]; then
+    echo "Usage: ./createSwiftUITwoScreen.sh Folder MyScreenName"
+    exit 1
+fi
+
+MODULE_DIR="../../RiotSwiftUI/Modules"
+OUTPUT_DIR=$MODULE_DIR/$1
+SCREEN_NAME=$2
+SCREEN_VAR_NAME=`echo $SCREEN_NAME | awk '{ print tolower(substr($0, 1, 1)) substr($0, 2) }'`
+TEMPLATE_DIR=$MODULE_DIR/Template/TemplateAdvancedRoomsExample/TemplateRoomList/
+if [ -e $OUTPUT_DIR ]; then
+    echo "Error: Folder ${OUTPUT_DIR} already exists"
+    exit 1
+fi
+
+echo "Create folder ${OUTPUT_DIR}"
+
+mkdir -p $OUTPUT_DIR
+cp -R $TEMPLATE_DIR $OUTPUT_DIR/
+
+cd $OUTPUT_DIR
+for file in $(find * -type f -print)
+do
+  echo "Building ${file/TemplateRoomList/$SCREEN_NAME}..."
+  perl -p -i -e "s/TemplateRoomList/"$SCREEN_NAME"/g" $file
+  perl -p -i -e "s/templateRoomList/"$SCREEN_VAR_NAME"/g" $file
+
+  # echo "// $ createScreen.sh $@" | cat - ${file} > /tmp/$$ && mv /tmp/$$ ${file}
+  # echo '// File created from TemplateAdvancedRoomsExample' | cat - ${file} > /tmp/$$ && mv /tmp/$$ ${file}
+
+  mv ${file} ${file/TemplateRoomList/$SCREEN_NAME}
+done

From e5043acff26b20c4901fa72b218c500c605e32fb Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Mon, 13 Sep 2021 09:26:21 +0100
Subject: [PATCH 07/59] Add subviews for message and image

---
 .../Model/TemplateRoomChatBubbleItem.swift    | 49 +++++++++++++++++++
 .../TemplateRoomChatViewModelInput.swift      |  2 +-
 .../Mock/MockTemplateRoomChatService.swift    | 11 +++--
 .../View/TemplateRoomChat.swift               | 18 +++++--
 .../View/TemplateRoomChatBubbleItemView.swift | 49 +++++++++++++++++++
 .../View/TemplateRoomChatBubbleMessage.swift  | 44 +++++++++++++++++
 .../View/TemplateRoomChatBubbleView.swift     | 15 ++++--
 .../ViewModel/TemplateRoomChatViewModel.swift | 34 +++++++++----
 8 files changed, 198 insertions(+), 24 deletions(-)
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItem.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleItemView.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleMessage.swift

diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItem.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItem.swift
new file mode 100644
index 000000000..b9a6e50c7
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItem.swift
@@ -0,0 +1,49 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import UIKit
+
+
+struct TemplateRoomChatBubble {
+    var id: String
+    var senderAvatar: AvatarInputProtocol
+    var senderDisplayName: String?
+    var items: [TemplateRoomChatBubbleItem]
+}
+
+extension TemplateRoomChatBubble: Identifiable { }
+
+enum TemplateRoomChatBubbleItem {
+    var id: Self { self }
+    case message(TemplateRoomChatBubbleMessageItem)
+    case image(TemplateRoomChatBubbleImageItem)
+}
+
+extension TemplateRoomChatBubbleItem: Hashable, Identifiable {}
+
+struct TemplateRoomChatBubbleMessageItem {
+    var id: String
+    var body: String
+}
+
+extension TemplateRoomChatBubbleMessageItem: Hashable {}
+
+struct TemplateRoomChatBubbleImageItem {
+    var id: String
+    var image: UIImage
+}
+
+extension TemplateRoomChatBubbleImageItem: Hashable {}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelInput.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelInput.swift
index 79b37684f..7ac56116c 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelInput.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelInput.swift
@@ -17,5 +17,5 @@
 import Foundation
 
 struct TemplateRoomChatViewModelInput {
-    let messageInput: String
+    var messageInput: String
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatService.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatService.swift
index f02ed7873..bbd85efbe 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatService.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatService.swift
@@ -19,12 +19,13 @@ import Combine
 
 @available(iOS 14.0, *)
 class MockTemplateRoomChatService: TemplateRoomChatServiceProtocol {
-    
+    static let alice = TemplateRoomChatMember(id: "@alice:matrix.org", avatarUrl: "!aaabaa:matrix.org", displayName: "Alice")
+    static let mathew = TemplateRoomChatMember(id: "@mathew:matrix.org", avatarUrl: "!bbabb:matrix.org", displayName: "Mathew")
     static let mockMessages = [
-        TemplateRoomChatMessage(id: "!aaabaa:matrix.org", body: "Shall I put it live?", sender: "@alice:matrix.org"),
-        TemplateRoomChatMessage(id: "!bbbabb:matrix.org", body: "Yea go for it! ...and then let's head to the pub", sender: "@patrice:matrix.org"),
-        TemplateRoomChatMessage(id: "!aaabaa:matrix.org", body: "Deal.", sender: "@alice:matrix.org"),
-        TemplateRoomChatMessage(id: "!aaabaa:matrix.org", body: "Ok, Done. 🍻", sender: "@alice:matrix.org"),
+        TemplateRoomChatMessage(id: "!11111:matrix.org", body: "Shall I put it live?", sender: alice),
+        TemplateRoomChatMessage(id: "!22222:matrix.org", body: "Yea go for it! ...and then let's head to the pub", sender: mathew),
+        TemplateRoomChatMessage(id: "!33333:matrix.org", body: "Deal.", sender: alice),
+        TemplateRoomChatMessage(id: "!44444:matrix.org", body: "Ok, Done. 🍻", sender: alice),
     ]
     var chatMessagesSubject: CurrentValueSubject<[TemplateRoomChatMessage], Never>
 
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
index d2d0936e7..c9fbb4bff 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
@@ -31,15 +31,25 @@ struct TemplateRoomChat: View {
     
     var body: some View {
         VStack {
-            LazyVStack {
-                
-            }.frame(maxHeight: .infinity)
+            if viewModel.viewState.bubbles.isEmpty {
+                VStack{
+                    Text("No messages")
+                }
+                .frame(maxHeight: .infinity)
+            } else {
+                LazyVStack {
+                    ForEach(viewModel.viewState.bubbles) { bubble in
+                        TemplateRoomChatBubbleView(bubble: bubble)
+                    }
+                }
+                .frame(maxHeight: .infinity, alignment: .top)
+            }
             
             HStack {
                 TextField(VectorL10n.roomMessageShortPlaceholder, text: $viewModel.input.messageInput)
                     .textFieldStyle(BorderedInputFieldStyle())
                 Button(action: {
-                    
+
                 }, label: {
                     Image(uiImage: Asset.Images.sendIcon.image)
                 })
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleItemView.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleItemView.swift
new file mode 100644
index 000000000..c40fa812f
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleItemView.swift
@@ -0,0 +1,49 @@
+//
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import SwiftUI
+
+@available(iOS 14.0, *)
+struct TemplateRoomChatBubbleItemView: View {
+
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    @Environment(\.theme) private var theme: ThemeSwiftUI
+    
+    // MARK: Public
+    
+    let bubbleItem: TemplateRoomChatBubbleItem
+    
+    var body: some View {
+        switch bubbleItem {
+        case .message(let messageItem):
+            TemplateRoomChatBubbleMessage(messageItem: messageItem)
+        case .image(let imageItem):
+            TemplateRoomChatBubbleImage(imageItem: imageItem)
+        }
+    }
+}
+
+// MARK: - Previews
+
+@available(iOS 14.0, *)
+struct TemplateRoomChatBubbleItemView_Previews: PreviewProvider {
+    static var previews: some View {
+        EmptyView()
+    }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleMessage.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleMessage.swift
new file mode 100644
index 000000000..f1f08248f
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleMessage.swift
@@ -0,0 +1,44 @@
+//
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import SwiftUI
+
+@available(iOS 14.0, *)
+struct TemplateRoomChatBubbleMessage: View {
+
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    @Environment(\.theme) private var theme: ThemeSwiftUI
+    
+    // MARK: Public
+    
+    let messageItem: TemplateRoomChatBubbleMessageItem
+    
+    var body: some View {
+        Text(messageItem.body)
+    }
+}
+
+// MARK: - Previews
+
+@available(iOS 14.0, *)
+struct TemplateRoomChatBubbleMessage_Previews: PreviewProvider {
+    static var previews: some View {
+        EmptyView()
+    }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleView.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleView.swift
index 0a44c72ba..45b0719e3 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleView.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleView.swift
@@ -31,9 +31,9 @@ struct TemplateRoomChatBubbleView: View {
     
     var body: some View {
         HStack{
-            AvatarImage(avatarData: bubble.avatar, size: .xSmall)
-            VStack{
-                Text(bubble.displayName ?? "")
+            AvatarImage(avatarData: bubble.senderAvatar, size: .xSmall)
+            VStack(alignment: .leading){
+                Text(bubble.senderDisplayName ?? "")
                 ForEach(bubble.items) { item in
                     TemplateRoomChatBubbleItemView(bubbleItem: item)
                 }
@@ -52,7 +52,14 @@ struct TemplateRoomChatBubbleView: View {
 
 @available(iOS 14.0, *)
 struct TemplateRoomChatBubbleView_Previews: PreviewProvider {
+    static let bubble = TemplateRoomChatBubble(
+        id: "111",
+        senderAvatar: MockAvatarInput.example,
+        senderDisplayName: "Alice",
+        items: [.message(TemplateRoomChatBubbleMessageItem(id: "222", body: "Hello world! 🌎"))]
+    )
     static var previews: some View {
-        EmptyView()
+        TemplateRoomChatBubbleView(bubble: bubble)
+            .addDependency(MockAvatarService.example)
     }
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
index c4437a7e1..81252c16e 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
@@ -55,20 +55,34 @@ class TemplateRoomChatViewModel: ObservableObject, TemplateRoomChatViewModelProt
     
     private static func makeBubbles(messages: [TemplateRoomChatMessage]) -> [TemplateRoomChatBubble] {
         
-        
+        var bubbleOrder = [String]()
+        var bubbleMap = [String:TemplateRoomChatBubble]()
         messages.enumerated().forEach { i, message in
-            let currentMessage = messages[i]
-            if i > 0 {
-                let lastMessage = messages[i-1]
-            } else {
-                TemplateRoomChatBubble(
-                    id: message.,
-                    avatar: <#T##AvatarInputProtocol#>,
-                    displayName: <#T##String?#>,
-                    items: <#T##[TemplateRoomChatBubbleItem]#>
+            if i > 0,
+                messages[i-1].sender.id == message.sender.id,
+                var existingBubble = bubbleMap[messages[i-1].id] {
+                let messageItem = TemplateRoomChatBubbleMessageItem(
+                    id: message.id,
+                    body: message.body
                 )
+                existingBubble.items.append(.message(messageItem))
+                bubbleMap[existingBubble.id] = existingBubble
+            } else {
+                let messageItem = TemplateRoomChatBubbleMessageItem(
+                    id: message.id,
+                    body: message.body
+                )
+                let bubble = TemplateRoomChatBubble(
+                    id: message.id,
+                    senderAvatar: message.sender.avatarData,
+                    senderDisplayName:  message.sender.displayName,
+                    items: [.message(messageItem)]
+                )
+                bubbleOrder.append(bubble.id)
+                bubbleMap[bubble.id] = bubble
             }
         }
+        return bubbleOrder.compactMap({ bubbleMap[$0] })
     }
     
     // MARK: - Public

From ec9fef9e61e7d65d788b7224d53d5cb9bfe3dc7a Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Sat, 11 Sep 2021 14:13:43 +0100
Subject: [PATCH 08/59] Fix Naming

Change userService name to templateUserProfileService for templating.
Remove test subclass from MockScreenTest
---
 .../Modules/Common/Mock/MockAppScreens.swift  |  2 +-
 .../Modules/Common/Mock/ScreenList.swift      |  2 +-
 .../Common/Test/UI/MockScreenTest.swift       | 16 ++++++++-------
 .../TemplateUserProfileCoordinator.swift      |  2 +-
 ... MockTemplateUserProfileScreenState.swift} |  8 ++++----
 ...swift => TemplateUserProfileUITests.swift} | 20 +++++++++++--------
 .../TemplateUserProfileViewModelTests.swift   |  2 +-
 .../View/TemplateUserProfile.swift            |  2 +-
 .../TemplateUserProfileViewModel.swift        | 18 ++++++++++-------
 9 files changed, 41 insertions(+), 31 deletions(-)
 rename RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Service/Mock/{MockTemplateProfileUserScreenState.swift => MockTemplateUserProfileScreenState.swift} (86%)
 rename RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Test/UI/{TestUserProfileUITests.swift => TemplateUserProfileUITests.swift} (62%)

diff --git a/RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift b/RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
index a222edf3f..e028c5fb1 100644
--- a/RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
+++ b/RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
@@ -19,6 +19,6 @@ import Foundation
 /// The static list of mocked screens in RiotSwiftUI
 @available(iOS 14.0, *)
 enum MockAppScreens {
-    static let appScreens = [MockTemplateProfileUserScreenState.self]
+    static let appScreens = [MockTemplateUserProfileScreenState.self]
 }
 
diff --git a/RiotSwiftUI/Modules/Common/Mock/ScreenList.swift b/RiotSwiftUI/Modules/Common/Mock/ScreenList.swift
index 62b857769..973ab530b 100644
--- a/RiotSwiftUI/Modules/Common/Mock/ScreenList.swift
+++ b/RiotSwiftUI/Modules/Common/Mock/ScreenList.swift
@@ -44,6 +44,6 @@ struct ScreenList: View {
 @available(iOS 14.0, *)
 struct ScreenList_Previews: PreviewProvider {
     static var previews: some View {
-        ScreenList(screens: [MockTemplateProfileUserScreenState.self])
+        ScreenList(screens: [MockTemplateUserProfileScreenState.self])
     }
 }
diff --git a/RiotSwiftUI/Modules/Common/Test/UI/MockScreenTest.swift b/RiotSwiftUI/Modules/Common/Test/UI/MockScreenTest.swift
index 9d3a65e6d..1146d4715 100644
--- a/RiotSwiftUI/Modules/Common/Test/UI/MockScreenTest.swift
+++ b/RiotSwiftUI/Modules/Common/Test/UI/MockScreenTest.swift
@@ -31,6 +31,10 @@ class MockScreenTest: XCTestCase {
         return nil
     }
     
+    class func createTest() -> MockScreenTest {
+        return MockScreenTest()
+    }
+    
     var screenState: MockScreenState?
     var screenStateKey: String?
     let app = XCUIApplication()
@@ -48,13 +52,11 @@ class MockScreenTest: XCTestCase {
         return testSuite
     }
     
-    private class func addTestFor(screenState: MockScreenState, screenStateKey: String, toTestSuite testSuite: XCTestSuite) {
-        testInvocations.forEach { invocation in
-            let testCase = TestUserProfileUITests(invocation: invocation)
-            testCase.screenState = screenState
-            testCase.screenStateKey = screenStateKey
-            testSuite.addTest(testCase)
-        }
+    class func addTestFor(screenState: MockScreenState, screenStateKey: String, toTestSuite testSuite: XCTestSuite) {
+        let test = createTest()
+        test.screenState = screenState
+        test.screenStateKey = screenStateKey
+        testSuite.addTest(test)
     }
     
     open override func setUpWithError() throws {
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Coordinator/TemplateUserProfileCoordinator.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Coordinator/TemplateUserProfileCoordinator.swift
index c42a297a7..5818b543b 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Coordinator/TemplateUserProfileCoordinator.swift
+++ b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Coordinator/TemplateUserProfileCoordinator.swift
@@ -39,7 +39,7 @@ final class TemplateUserProfileCoordinator: Coordinator {
     @available(iOS 14.0, *)
     init(parameters: TemplateUserProfileCoordinatorParameters) {
         self.parameters = parameters
-        let viewModel = TemplateUserProfileViewModel(userService: TemplateUserProfileService(session: parameters.session))
+        let viewModel = TemplateUserProfileViewModel(templateUserProfileService: TemplateUserProfileService(session: parameters.session))
         let view = TemplateUserProfile(viewModel: viewModel)
             .addDependency(AvatarService.instantiate(mediaManager: parameters.session.mediaManager))
         templateUserProfileViewModel = viewModel
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Service/Mock/MockTemplateProfileUserScreenState.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Service/Mock/MockTemplateUserProfileScreenState.swift
similarity index 86%
rename from RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Service/Mock/MockTemplateProfileUserScreenState.swift
rename to RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Service/Mock/MockTemplateUserProfileScreenState.swift
index 29092cd8d..4388c4d1d 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Service/Mock/MockTemplateProfileUserScreenState.swift
+++ b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Service/Mock/MockTemplateUserProfileScreenState.swift
@@ -21,7 +21,7 @@ import SwiftUI
 /// Using an enum for the screen allows you define the different state cases with
 /// the relevant associated data for each case.
 @available(iOS 14.0, *)
-enum MockTemplateProfileUserScreenState: MockScreenState, CaseIterable {
+enum MockTemplateUserProfileScreenState: MockScreenState, CaseIterable {
     // A case for each state you want to represent
     // with specific, minimal associated data that will allow you
     // mock that screen.
@@ -34,9 +34,9 @@ enum MockTemplateProfileUserScreenState: MockScreenState, CaseIterable {
     }
     
     /// A list of screen state definitions
-    static var allCases: [MockTemplateProfileUserScreenState] {
+    static var allCases: [MockTemplateUserProfileScreenState] {
         // Each of the presence statuses
-        TemplateUserProfilePresence.allCases.map(MockTemplateProfileUserScreenState.presence)
+        TemplateUserProfilePresence.allCases.map(MockTemplateUserProfileScreenState.presence)
         // A long display name
         + [.longDisplayName("Somebody with a super long name we would like to test")]
     }
@@ -50,7 +50,7 @@ enum MockTemplateProfileUserScreenState: MockScreenState, CaseIterable {
         case .longDisplayName(let displayName):
             service = MockTemplateUserProfileService(displayName: displayName)
         }
-        let viewModel = TemplateUserProfileViewModel(userService: service)
+        let viewModel = TemplateUserProfileViewModel(templateUserProfileService: service)
         
         // can simulate service and viewModel actions here if needs be.
         
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Test/UI/TestUserProfileUITests.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Test/UI/TemplateUserProfileUITests.swift
similarity index 62%
rename from RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Test/UI/TestUserProfileUITests.swift
rename to RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Test/UI/TemplateUserProfileUITests.swift
index 2bfd4d319..3507fcdf9 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Test/UI/TestUserProfileUITests.swift
+++ b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Test/UI/TemplateUserProfileUITests.swift
@@ -18,29 +18,33 @@ import XCTest
 import RiotSwiftUI
 
 @available(iOS 14.0, *)
-class TestUserProfileUITests: MockScreenTest {
+class TemplateUserProfileUITests: MockScreenTest {
     
     override class var screenType: MockScreenState.Type {
-        return MockTemplateProfileUserScreenState.self
+        return MockTemplateUserProfileScreenState.self
+    }
+
+    override class func createTest() -> MockScreenTest {
+        return TemplateUserProfileUITests(selector: #selector(verifyTemplateUserProfileScreen))
     }
     
-    func testTemplateUserProfileScreen() throws {
-        guard let screenState = screenState as? MockTemplateProfileUserScreenState else { fatalError("no screen") }
+    func verifyTemplateUserProfileScreen() throws {
+        guard let screenState = screenState as? MockTemplateUserProfileScreenState else { fatalError("no screen") }
         switch screenState {
         case .presence(let presence):
-            testTemplateUserProfilePresence(presence: presence)
+            verifyTemplateUserProfilePresence(presence: presence)
         case .longDisplayName(let name):
-            testTemplateUserProfileLongName(name: name)
+            verifyTemplateUserProfileLongName(name: name)
         }
     }
     
-    func testTemplateUserProfilePresence(presence: TemplateUserProfilePresence) {
+    func verifyTemplateUserProfilePresence(presence: TemplateUserProfilePresence) {
         let presenceText = app.staticTexts["presenceText"]
         XCTAssert(presenceText.exists)
         XCTAssert(presenceText.label == presence.title)
     }
     
-    func testTemplateUserProfileLongName(name: String) {
+    func verifyTemplateUserProfileLongName(name: String) {
         let displayNameText = app.staticTexts["displayNameText"]
         XCTAssert(displayNameText.exists)
         XCTAssert(displayNameText.label == name)
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Test/Unit/TemplateUserProfileViewModelTests.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Test/Unit/TemplateUserProfileViewModelTests.swift
index 74925f5d7..f14b1a2e6 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Test/Unit/TemplateUserProfileViewModelTests.swift
+++ b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Test/Unit/TemplateUserProfileViewModelTests.swift
@@ -30,7 +30,7 @@ class TemplateUserProfileViewModelTests: XCTestCase {
     var cancellables = Set<AnyCancellable>()
     override func setUpWithError() throws {
         service = MockTemplateUserProfileService(displayName: Constants.displayName, presence: Constants.presenceInitialValue)
-        viewModel = TemplateUserProfileViewModel(userService: service)
+        viewModel = TemplateUserProfileViewModel(templateUserProfileService: service)
     }
     
     func testInitialState() {
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/View/TemplateUserProfile.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/View/TemplateUserProfile.swift
index 6025fceba..64cbf3ca4 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/View/TemplateUserProfile.swift
+++ b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/View/TemplateUserProfile.swift
@@ -67,6 +67,6 @@ struct TemplateUserProfile: View {
 @available(iOS 14.0, *)
 struct TemplateUserProfile_Previews: PreviewProvider {
     static var previews: some View {
-        MockTemplateProfileUserScreenState.screenGroup()
+        MockTemplateUserProfileScreenState.screenGroup()
     }
 }
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModel.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModel.swift
index cf625e152..f6b60cc3d 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModel.swift
+++ b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModel.swift
@@ -23,7 +23,7 @@ class TemplateUserProfileViewModel: ObservableObject, TemplateUserProfileViewMod
     // MARK: - Properties
     
     // MARK: Private
-    private let userService: TemplateUserProfileServiceProtocol
+    private let templateUserProfileService: TemplateUserProfileServiceProtocol
     private var cancellables = Set<AnyCancellable>()
     
     // MARK: Public
@@ -32,11 +32,11 @@ class TemplateUserProfileViewModel: ObservableObject, TemplateUserProfileViewMod
     var completion: ((TemplateUserProfileViewModelResult) -> Void)?
     
     // MARK: - Setup
-    init(userService: TemplateUserProfileServiceProtocol, initialState: TemplateUserProfileViewState? = nil) {
-        self.userService = userService
-        self.viewState = initialState ?? Self.defaultState(userService: userService)
+    init(templateUserProfileService: TemplateUserProfileServiceProtocol, initialState: TemplateUserProfileViewState? = nil) {
+        self.templateUserProfileService = templateUserProfileService
+        self.viewState = initialState ?? Self.defaultState(templateUserProfileService: templateUserProfileService)
         
-        userService.presenceSubject
+        templateUserProfileService.presenceSubject
             .map(TemplateUserProfileStateAction.updatePresence)
             .receive(on: DispatchQueue.main)
             .sink(receiveValue: { [weak self] action in
@@ -45,8 +45,12 @@ class TemplateUserProfileViewModel: ObservableObject, TemplateUserProfileViewMod
             .store(in: &cancellables)
     }
     
-    private static func defaultState(userService: TemplateUserProfileServiceProtocol) -> TemplateUserProfileViewState {
-        return TemplateUserProfileViewState(avatar: userService.avatarData, displayName: userService.displayName, presence: userService.presenceSubject.value)
+    private static func defaultState(templateUserProfileService: TemplateUserProfileServiceProtocol) -> TemplateUserProfileViewState {
+        return TemplateUserProfileViewState(
+            avatar: templateUserProfileService.avatarData,
+            displayName: templateUserProfileService.displayName,
+            presence: templateUserProfileService.presenceSubject.value
+        )
     }
     
     // MARK: - Public

From c596a9f5cabc5b060a2b3466cc25bd3108855549 Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Mon, 13 Sep 2021 11:36:33 +0100
Subject: [PATCH 09/59] Update RiotSwiftUI symbols to triple slash
 documentation style with function annotations.

---
 .../ActivityIndicator/ActivityIndicator.swift |  4 +-
 .../ActivityIndicatorModifier.swift           |  4 +-
 .../Common/Avatar/Model/Avatarable.swift      | 11 ++---
 .../Service/MatrixSDK/AvatarService.swift     | 15 +++---
 .../ViewModel/AvatarServiceProtocol.swift     |  5 +-
 .../Avatar/ViewModel/AvatarViewModel.swift    | 29 ++++++-----
 .../Common/Bridging/VectorContentView.swift   |  7 ++-
 .../DependencyContainer.swift                 | 23 +++++----
 .../DependencyContainerKey.swift              | 21 ++++----
 .../Common/DependencyInjection/Inject.swift   | 10 ++--
 .../DependencyInjection/Injectable.swift      | 10 ++--
 .../InjectableObject.swift                    |  5 +-
 .../Modules/Common/Extensions/Publisher.swift |  8 ++--
 .../Common/Logging/LoggerProtocol.swift       |  5 +-
 .../Modules/Common/Logging/PrintLogger.swift  |  7 ++-
 .../Modules/Common/Logging/UILog.swift        |  8 ++--
 .../Test/XCTestPublisherExtensions.swift      | 19 ++++----
 .../Theme/ThemeIdentifierExtensions.swift     |  4 +-
 .../Modules/Common/Theme/ThemeKey.swift       | 16 +++----
 .../Modules/Common/Theme/ThemePublisher.swift |  9 ++--
 .../ViewFrameReader/ViewFrameReader.swift     | 21 ++++----
 .../MatrixSDK/MXNotificationPushRule.swift    | 10 ++--
 .../Model/NotificationActions.swift           |  4 +-
 .../Model/NotificationIndex.swift             | 19 ++++----
 .../NotificationPushRuleDefinitions.swift     |  9 ++--
 .../Model/NotificationPushRuleIds.swift       |  4 +-
 .../Model/NotificationSettingsScreen.swift    |  8 +---
 .../Model/NotificationStandardActions.swift   |  7 ++-
 .../NotificationSettingsServiceType.swift     | 48 +++++++------------
 .../View/BorderedInputFieldStyle.swift        |  8 ++--
 .../Settings/Notifications/View/Chip.swift    |  5 +-
 .../Settings/Notifications/View/Chips.swift   |  4 +-
 .../Notifications/View/ChipsInput.swift       |  7 +--
 .../View/FormInputFieldStyle.swift            |  4 +-
 .../View/NotificationSettings.swift           |  9 ++--
 .../View/NotificationSettingsKeywords.swift   |  4 +-
 .../NotificationSettingsViewModel.swift       | 13 ++---
 .../TemplateUserProfileViewModel.swift        | 16 ++++---
 RiotSwiftUI/RiotSwiftUIApp.swift              |  4 +-
 39 files changed, 184 insertions(+), 240 deletions(-)

diff --git a/RiotSwiftUI/Modules/Common/ActivityIndicator/ActivityIndicator.swift b/RiotSwiftUI/Modules/Common/ActivityIndicator/ActivityIndicator.swift
index f1e8f3694..541bfbd60 100644
--- a/RiotSwiftUI/Modules/Common/ActivityIndicator/ActivityIndicator.swift
+++ b/RiotSwiftUI/Modules/Common/ActivityIndicator/ActivityIndicator.swift
@@ -16,10 +16,8 @@
 
 import SwiftUI
 
-/**
- A visual cue to user that something is in progress.
- */
 @available(iOS 14.0, *)
+/// A visual cue to user that something is in progress.
 struct ActivityIndicator: View {
     
     private enum Constants {
diff --git a/RiotSwiftUI/Modules/Common/ActivityIndicator/ActivityIndicatorModifier.swift b/RiotSwiftUI/Modules/Common/ActivityIndicator/ActivityIndicatorModifier.swift
index 405c26649..821c71ef0 100644
--- a/RiotSwiftUI/Modules/Common/ActivityIndicator/ActivityIndicatorModifier.swift
+++ b/RiotSwiftUI/Modules/Common/ActivityIndicator/ActivityIndicatorModifier.swift
@@ -17,10 +17,8 @@
 import Foundation
 import SwiftUI
 
-/**
- A modifier for showing the activity indcator centered over a view.
- */
 @available(iOS 14.0, *)
+/// A modifier for showing the activity indicator centered over a view.
 struct ActivityIndicatorModifier: ViewModifier {
     var show: Bool
 
diff --git a/RiotSwiftUI/Modules/Common/Avatar/Model/Avatarable.swift b/RiotSwiftUI/Modules/Common/Avatar/Model/Avatarable.swift
index 17a0ea1ee..4e5062b5f 100644
--- a/RiotSwiftUI/Modules/Common/Avatar/Model/Avatarable.swift
+++ b/RiotSwiftUI/Modules/Common/Avatar/Model/Avatarable.swift
@@ -16,12 +16,11 @@
 
 import Foundation
 
-/**
- A protocol that any class or struct can conform to
- so that it can easily produce avatar data.
-  E.g. MXRoom, MxUser can conform to this making it
- easy to grab the avatar data for display.
- */
+/// A protocol that any class or struct can conform to
+/// so that it can easily produce avatar data.
+/// 
+/// E.g. MXRoom, MxUser can conform to this making it
+/// easy to grab the avatar data for display.
 protocol Avatarable: AvatarInputProtocol { }
 extension Avatarable {
     var avatarData: AvatarInput {
diff --git a/RiotSwiftUI/Modules/Common/Avatar/Service/MatrixSDK/AvatarService.swift b/RiotSwiftUI/Modules/Common/Avatar/Service/MatrixSDK/AvatarService.swift
index 4aa3fdb32..34b6db55a 100644
--- a/RiotSwiftUI/Modules/Common/Avatar/Service/MatrixSDK/AvatarService.swift
+++ b/RiotSwiftUI/Modules/Common/Avatar/Service/MatrixSDK/AvatarService.swift
@@ -41,14 +41,13 @@ class AvatarService: AvatarServiceProtocol {
         self.mediaManager = mediaManager
     }
     
-    /**
-     Given an mxContentUri, this function returns a Future of UIImage.
-     If possible it will retrieve the image from network or cache, otherwise it will error.
-     
-    - Parameter mxContentUri: matrix uri of the avatar to fetch
-    - Parameter avatarSize: The size of avatar to retrieve as defined in the DesignKit spec.
-    - Returns: A Future of UIImage that returns an error if it fails to fetch the image
-     */
+    /// Given an mxContentUri, this function returns a Future of UIImage.
+    ///
+    /// If possible it will retrieve the image from network or cache, otherwise it will error.
+    /// - Parameters:
+    ///   - mxContentUri: matrix uri of the avatar to fetch
+    ///   - avatarSize: The size of avatar to retrieve as defined in the DesignKit spec.
+    /// - Returns: A Future of UIImage that returns an error if it fails to fetch the image.
     @available(iOS 14.0, *)
     func avatarImage(mxContentUri: String, avatarSize: AvatarSize) -> Future<UIImage, Error> {
         
diff --git a/RiotSwiftUI/Modules/Common/Avatar/ViewModel/AvatarServiceProtocol.swift b/RiotSwiftUI/Modules/Common/Avatar/ViewModel/AvatarServiceProtocol.swift
index 2d51df330..bc8283ee6 100644
--- a/RiotSwiftUI/Modules/Common/Avatar/ViewModel/AvatarServiceProtocol.swift
+++ b/RiotSwiftUI/Modules/Common/Avatar/ViewModel/AvatarServiceProtocol.swift
@@ -19,9 +19,8 @@ import DesignKit
 import Combine
 import UIKit
 
-/**
- Provides a simple api to retrieve and cache avatar images
- */
+
+/// Provides a simple api to retrieve and cache avatar images
 protocol AvatarServiceProtocol {
     @available(iOS 14.0, *)
     func avatarImage(mxContentUri: String, avatarSize: AvatarSize) -> Future<UIImage, Error>
diff --git a/RiotSwiftUI/Modules/Common/Avatar/ViewModel/AvatarViewModel.swift b/RiotSwiftUI/Modules/Common/Avatar/ViewModel/AvatarViewModel.swift
index 1612da1c2..6808f0dd6 100644
--- a/RiotSwiftUI/Modules/Common/Avatar/ViewModel/AvatarViewModel.swift
+++ b/RiotSwiftUI/Modules/Common/Avatar/ViewModel/AvatarViewModel.swift
@@ -18,11 +18,8 @@ import Foundation
 import Combine
 import DesignKit
 
-/**
- Simple ViewModel that supports loading an avatar image of a particular size
- as specified in DesignKit and delivering the UIImage to the UI if possible.
- */
 @available(iOS 14.0, *)
+/// Simple ViewModel that supports loading an avatar image
 class AvatarViewModel: InjectableObject, ObservableObject {
     
     @Inject var avatarService: AvatarServiceProtocol
@@ -31,6 +28,13 @@ class AvatarViewModel: InjectableObject, ObservableObject {
     
     private var cancellables = Set<AnyCancellable>()
     
+    /// Load an avatar
+    /// - Parameters:
+    ///   - mxContentUri: The matrix content URI of the avatar.
+    ///   - matrixItemId: The id of the matrix item represented by the avatar.
+    ///   - displayName: Display name of the avatar.
+    ///   - colorCount: The count of total avatar colors used to generate the stable color index.
+    ///   - avatarSize: The size of the avatar to fetch (as defined within DesignKit).
     func loadAvatar(
         mxContentUri: String?,
         matrixItemId: String,
@@ -54,9 +58,9 @@ class AvatarViewModel: InjectableObject, ObservableObject {
             .store(in: &cancellables)
     }
     
-    /**
-     Get the first character of a string capialized or else an empty string.
-     */
+    /// Get the first character of a string capialized or else an empty string.
+    /// - Parameter string: The input string to get the capitalized letter from.
+    /// - Returns: The capitalized first letter.
     private func firstCharacterCapitalized(_ string: String?) -> String {
         guard let character = string?.first else {
             return ""
@@ -64,10 +68,13 @@ class AvatarViewModel: InjectableObject, ObservableObject {
         return String(character).capitalized
     }
     
-    /**
-     Provides the same color each time for a specified matrixId.
-     Same algorithm as in AvatarGenerator.
-     */
+    /// Provides the same color each time for a specified matrixId
+    ///
+    /// Same algorithm as in AvatarGenerator.
+    /// - Parameters:
+    ///   - matrixItemId: the matrix id used as input to create the stable index.
+    ///   - colorCount: The number of total colors we want to index in to.
+    /// - Returns: The stable index.
     private func stableColorIndex(matrixItemId: String, colorCount: Int) -> Int {
         // Sum all characters
         let sum = matrixItemId.utf8
diff --git a/RiotSwiftUI/Modules/Common/Bridging/VectorContentView.swift b/RiotSwiftUI/Modules/Common/Bridging/VectorContentView.swift
index 9dac8ec08..449042d78 100644
--- a/RiotSwiftUI/Modules/Common/Bridging/VectorContentView.swift
+++ b/RiotSwiftUI/Modules/Common/Bridging/VectorContentView.swift
@@ -16,10 +16,9 @@
 
 import SwiftUI
 
-/**
- A Modifier to be called from the top-most SwiftUI view before being added to a HostViewController
- Provides any app level configuration the SwiftUI hierarchy might need (E.g. to monitor theme changes).
- */
+/// A Modifier to be called from the top-most SwiftUI view before being added to a HostViewController.
+///
+/// Provides any app level configuration the SwiftUI hierarchy might need (E.g. to monitor theme changes).
 @available(iOS 14.0, *)
 struct VectorContentModifier: ViewModifier {
     
diff --git a/RiotSwiftUI/Modules/Common/DependencyInjection/DependencyContainer.swift b/RiotSwiftUI/Modules/Common/DependencyInjection/DependencyContainer.swift
index 36e8678f3..c3c0169fd 100644
--- a/RiotSwiftUI/Modules/Common/DependencyInjection/DependencyContainer.swift
+++ b/RiotSwiftUI/Modules/Common/DependencyInjection/DependencyContainer.swift
@@ -16,19 +16,18 @@
 
 import Foundation
 
-/**
- Used for storing and resolving dependencies at runtime.
- */
+/// Used for storing and resolving dependencies at runtime.
 struct DependencyContainer {
     
     // Stores the dependencies with type information removed.
     private var dependencyStore: [String: Any] = [:]
     
-    /**
-     Resolve a dependency by type.
-     Given a particlar `Type` (Inferred from return type),
-     generate a key and retrieve from storage.
-     */
+    /// Resolve a dependency by type.
+    ///
+    /// Given a particular `Type` (Inferred from return type),
+    /// generate a key and retrieve from storage.
+    /// 
+    /// - Returns: The resolved dependency.
     func resolve<T>() -> T {
         let key = String(describing: T.self)
         guard let t = dependencyStore[key] as? T else {
@@ -37,10 +36,10 @@ struct DependencyContainer {
         return t
     }
     
-    /**
-     Register a dependency.
-     Given a dependency, generate a key from it's `Type` and save in storage.
-     */
+    /// Register a dependency.
+    ///
+    /// Given a dependency, generate a key from it's `Type` and save in storage.
+    /// - Parameter dependency: The dependency to register.
     mutating func register<T>(dependency: T) {
         let key = String(describing: T.self)
         dependencyStore[key] = dependency
diff --git a/RiotSwiftUI/Modules/Common/DependencyInjection/DependencyContainerKey.swift b/RiotSwiftUI/Modules/Common/DependencyInjection/DependencyContainerKey.swift
index 79557e541..1bfbd48b5 100644
--- a/RiotSwiftUI/Modules/Common/DependencyInjection/DependencyContainerKey.swift
+++ b/RiotSwiftUI/Modules/Common/DependencyInjection/DependencyContainerKey.swift
@@ -17,10 +17,10 @@
 import Foundation
 import SwiftUI
 
-/**
- An Environment Key for retrieving runtime dependencies to be injected into `ObservableObjects`
- that are owned by a View (i.e. `@StateObject`'s, such as ViewModels owned by the View).
- */
+/// An Environment Key for retrieving runtime dependencies.
+///
+/// Dependencies are to be injected into `ObservableObjects`
+/// that are owned by a View (i.e. `@StateObject`'s, such as ViewModels owned by the View).
 private struct DependencyContainerKey: EnvironmentKey {
     static let defaultValue = DependencyContainer()
 }
@@ -36,12 +36,13 @@ extension EnvironmentValues {
 @available(iOS 14.0, *)
 extension View {
     
-    /**
-     A modifier for adding a dependency to the SwiftUI view hierarchy's dependency container.
-     Important: When adding a dependency to cast it to the type in which it will be injected.
-     So if adding `MockDependency` but type at injection is `Dependency` remember to cast
-     to `Dependency` first.
-     */
+    /// A modifier for adding a dependency to the SwiftUI view hierarchy's dependency container.
+    ///
+    /// Important: When adding a dependency to cast it to the type in which it will be injected.
+    /// So if adding `MockDependency` but type at injection is `Dependency` remember to cast
+    /// to `Dependency` first.
+    /// - Parameter dependency: The dependency to add.
+    /// - Returns: The wrapped view that now includes the dependency.
     func addDependency<T>(_ dependency: T) -> some View {
         transformEnvironment(\.dependencies) { container in
             container.register(dependency: dependency)
diff --git a/RiotSwiftUI/Modules/Common/DependencyInjection/Inject.swift b/RiotSwiftUI/Modules/Common/DependencyInjection/Inject.swift
index ff9d69eab..e81457678 100644
--- a/RiotSwiftUI/Modules/Common/DependencyInjection/Inject.swift
+++ b/RiotSwiftUI/Modules/Common/DependencyInjection/Inject.swift
@@ -16,11 +16,11 @@
 
 import Foundation
 
-/**
- A property wrapped used to inject from the dependency
- container on the instance to instance properties.
- E.g. ```@Inject var someClass: SomeClass```
- */
+/// A property wrapped used to inject from the dependency container on the instance, to instance properties.
+///
+/// ```
+/// @Inject var someClass: SomeClass
+/// ```
 @propertyWrapper struct Inject<Value> {
     
     static subscript<T: Injectable>(
diff --git a/RiotSwiftUI/Modules/Common/DependencyInjection/Injectable.swift b/RiotSwiftUI/Modules/Common/DependencyInjection/Injectable.swift
index 27a861ba2..96e5eef64 100644
--- a/RiotSwiftUI/Modules/Common/DependencyInjection/Injectable.swift
+++ b/RiotSwiftUI/Modules/Common/DependencyInjection/Injectable.swift
@@ -16,18 +16,16 @@
 
 import Foundation
 
-/**
- A protocol for classes that can be injected with a dependency container
- */
+/// A protocol for classes that can be injected with a dependency container
 protocol Injectable: AnyObject {
     var dependencies: DependencyContainer! { get set }
 }
 
 
 extension Injectable {
-    /**
-     Used to inject the dependency container into an Injectable.
-     */
+    
+    /// Used to inject the dependency container into an Injectable.
+    /// - Parameter dependencies: The `DependencyContainer` to inject.
     func inject(dependencies: DependencyContainer) {
         self.dependencies = dependencies
     }
diff --git a/RiotSwiftUI/Modules/Common/DependencyInjection/InjectableObject.swift b/RiotSwiftUI/Modules/Common/DependencyInjection/InjectableObject.swift
index de5d1ccd8..bf38a0707 100644
--- a/RiotSwiftUI/Modules/Common/DependencyInjection/InjectableObject.swift
+++ b/RiotSwiftUI/Modules/Common/DependencyInjection/InjectableObject.swift
@@ -16,10 +16,7 @@
 
 import Foundation
 
-/**
- Class that can be extended and supports
- injection and the `@Inject` property wrapper.
- */
+/// Class that can be extended that supports injection and the `@Inject` property wrapper.
 open class InjectableObject: Injectable {
     var dependencies: DependencyContainer!
 }
diff --git a/RiotSwiftUI/Modules/Common/Extensions/Publisher.swift b/RiotSwiftUI/Modules/Common/Extensions/Publisher.swift
index 6bc37c9b2..40703befa 100644
--- a/RiotSwiftUI/Modules/Common/Extensions/Publisher.swift
+++ b/RiotSwiftUI/Modules/Common/Extensions/Publisher.swift
@@ -17,13 +17,11 @@
 import Foundation
 import Combine
 
-/**
- Sams as `assign(to:on:)` but maintains a weak reference to object(Useful in cases where you want to pass self and not cause a retain cycle.)
- - SeeAlso:
- [assign(to:on:)](https://developer.apple.com/documentation/combine/just/assign(to:on:))
- */
 @available(iOS 14.0, *)
 extension Publisher where Failure == Never {
+    /// Sams as `assign(to:on:)` but maintains a weak reference to object
+    ///
+    /// Useful in cases where you want to pass self and not cause a retain cycle.
     func weakAssign<T: AnyObject>(
         to keyPath: ReferenceWritableKeyPath<T, Output>,
         on object: T
diff --git a/RiotSwiftUI/Modules/Common/Logging/LoggerProtocol.swift b/RiotSwiftUI/Modules/Common/Logging/LoggerProtocol.swift
index 8930f07c7..806f4b1c7 100644
--- a/RiotSwiftUI/Modules/Common/Logging/LoggerProtocol.swift
+++ b/RiotSwiftUI/Modules/Common/Logging/LoggerProtocol.swift
@@ -16,10 +16,7 @@
 
 import Foundation
 
-/**
- A logger protocol that enables confirming types
- to be used with UILog.
- */
+/// A logger protocol that enables conforming types to be used with UILog.
 protocol LoggerProtocol {
     static func verbose(_ message: @autoclosure () -> Any, _ file: String, _ function: String, line: Int, context: Any?)
     static func debug(_ message: @autoclosure () -> Any, _ file: String, _ function: String, line: Int, context: Any?)
diff --git a/RiotSwiftUI/Modules/Common/Logging/PrintLogger.swift b/RiotSwiftUI/Modules/Common/Logging/PrintLogger.swift
index faf90b540..29bfc8421 100644
--- a/RiotSwiftUI/Modules/Common/Logging/PrintLogger.swift
+++ b/RiotSwiftUI/Modules/Common/Logging/PrintLogger.swift
@@ -16,10 +16,9 @@
 
 import Foundation
 
-/**
- A logger for logging to `print`.
- For use with UILog.
- */
+/// A logger for logging to `print`.
+///
+/// For use with UILog.
 class PrintLogger: LoggerProtocol {
     static func verbose(_ message: @autoclosure () -> Any, _ file: String = #file, _ function: String = #function, line: Int = #line, context: Any? = nil) {
         print(message())
diff --git a/RiotSwiftUI/Modules/Common/Logging/UILog.swift b/RiotSwiftUI/Modules/Common/Logging/UILog.swift
index 9874be30c..75c3325af 100644
--- a/RiotSwiftUI/Modules/Common/Logging/UILog.swift
+++ b/RiotSwiftUI/Modules/Common/Logging/UILog.swift
@@ -15,10 +15,10 @@
 //
 
 import Foundation
-/*
- A logger for use in different application targets that can be configured
- at runtime with a suitable logger.
- */
+
+/// A logger for use in different application targets.
+///
+/// It can be configured at runtime with a suitable logger.
 class UILog: LoggerProtocol {
     
     static var _logger: LoggerProtocol.Type?
diff --git a/RiotSwiftUI/Modules/Common/Test/XCTestPublisherExtensions.swift b/RiotSwiftUI/Modules/Common/Test/XCTestPublisherExtensions.swift
index 06fcd96f7..4861d08ab 100644
--- a/RiotSwiftUI/Modules/Common/Test/XCTestPublisherExtensions.swift
+++ b/RiotSwiftUI/Modules/Common/Test/XCTestPublisherExtensions.swift
@@ -17,16 +17,19 @@
 import XCTest
 import Combine
 
-/**
- XCTest utility to wait for results from publishers, so that the output can be used for assertions.
- 
- ```
- let collectedEvents = somePublisher.collect(3).first()
- XCTAssertEqual(try xcAwait(collectedEvents), [expected, values, here])
- ```
- */
 @available(iOS 14.0, *)
 extension XCTestCase {
+    /// XCTest utility to wait for results from publishers, so that the output can be used for assertions.
+    ///
+    ///  ```
+    /// let collectedEvents = somePublisher.collect(3).first()
+    /// XCTAssertEqual(try xcAwait(collectedEvents), [expected, values, here])
+    ///  ```
+    /// - Parameters:
+    ///   - publisher: The publisher to wait on.
+    ///   - timeout: A timeout after which we give up.
+    /// - Throws: If it can't get the unwrapped result.
+    /// - Returns: The unwrapped result.
     func xcAwait<T: Publisher>(
         _ publisher: T,
         timeout: TimeInterval = 10
diff --git a/RiotSwiftUI/Modules/Common/Theme/ThemeIdentifierExtensions.swift b/RiotSwiftUI/Modules/Common/Theme/ThemeIdentifierExtensions.swift
index f9e6530ed..d3e3c6c4b 100644
--- a/RiotSwiftUI/Modules/Common/Theme/ThemeIdentifierExtensions.swift
+++ b/RiotSwiftUI/Modules/Common/Theme/ThemeIdentifierExtensions.swift
@@ -17,13 +17,11 @@
 import Foundation
 import DesignKit
 
-/**
- Extension to `ThemeIdentifier` for getting the SwiftUI theme.
- */
 @available(iOS 14.0, *)
 extension ThemeIdentifier {
     fileprivate static let defaultTheme = DefaultThemeSwiftUI()
     fileprivate static let darkTheme = DarkThemeSwiftUI()
+    /// Extension to `ThemeIdentifier` for getting the SwiftUI theme.
     public var themeSwiftUI: ThemeSwiftUI {
         switch self {
         case .light:
diff --git a/RiotSwiftUI/Modules/Common/Theme/ThemeKey.swift b/RiotSwiftUI/Modules/Common/Theme/ThemeKey.swift
index f1ea41cea..eb4de70c1 100644
--- a/RiotSwiftUI/Modules/Common/Theme/ThemeKey.swift
+++ b/RiotSwiftUI/Modules/Common/Theme/ThemeKey.swift
@@ -31,25 +31,21 @@ extension EnvironmentValues {
   }
 }
 
-/**
- A theme modifier for setting the theme for this view and all its descendants in the hierarchy.
- - Parameters:
-  - theme: a Theme to be set as the environment value.
- */
 @available(iOS 14.0, *)
 extension View {
+    /// A theme modifier for setting the theme for this view and all its descendants in the hierarchy.
+    /// - Parameter theme: A theme to be set as the environment value.
+    /// - Returns: The target view with the theme applied.
   func theme(_ theme: ThemeSwiftUI) -> some View {
     environment(\.theme, theme)
   }
 }
 
-/**
- A theme modifier for setting the theme by id for this view and all its descendants in the hierarchy.
- - Parameters:
-  - themeId: ThemeIdentifier of a theme to be set as the environment value.
- */
 @available(iOS 14.0, *)
 extension View {
+    /// A theme modifier for setting the theme by id for this view and all its descendants in the hierarchy.
+    /// - Parameter themeId: ThemeIdentifier of a theme to be set as the environment value.
+    /// - Returns: The target view with the theme applied.
   func theme(_ themeId: ThemeIdentifier) -> some View {
     return environment(\.theme, themeId.themeSwiftUI)
   }
diff --git a/RiotSwiftUI/Modules/Common/Theme/ThemePublisher.swift b/RiotSwiftUI/Modules/Common/Theme/ThemePublisher.swift
index c721d7bf1..be6ba9b38 100644
--- a/RiotSwiftUI/Modules/Common/Theme/ThemePublisher.swift
+++ b/RiotSwiftUI/Modules/Common/Theme/ThemePublisher.swift
@@ -17,11 +17,10 @@
 import Foundation
 import Combine
 
-/**
- Provides the theme and theme updates to SwiftUI.
- Replaces the old ThemeObserver. Riot app can push updates to this class
- removing the dependency of this class on the `ThemeService`.
- */
+/// Provides the theme and theme updates to SwiftUI.
+///
+/// Replaces the old ThemeObserver. Riot app can push updates to this class
+/// removing the dependency of this class on the `ThemeService`.
 @available(iOS 14.0, *)
 class ThemePublisher: ObservableObject {
     
diff --git a/RiotSwiftUI/Modules/Common/ViewFrameReader/ViewFrameReader.swift b/RiotSwiftUI/Modules/Common/ViewFrameReader/ViewFrameReader.swift
index 4beb8f731..74318a0e1 100644
--- a/RiotSwiftUI/Modules/Common/ViewFrameReader/ViewFrameReader.swift
+++ b/RiotSwiftUI/Modules/Common/ViewFrameReader/ViewFrameReader.swift
@@ -17,18 +17,15 @@
 import Foundation
 import SwiftUI
 
-/**
- Used to calculate the frame of a view. Useful in situations as with `ZStack` where
- you might want to layout views using alignment guides.
- Example usage:
- ```
- @State private var frame: CGRect = CGRect.zero
- ...
- SomeView()
-    .background(ViewFrameReader(frame: $frame))
- 
- ```
- */
+/// Used to calculate the frame of a view.
+///
+/// Useful in situations as with `ZStack` where you might want to layout views using alignment guides.
+/// ```
+/// @State private var frame: CGRect = CGRect.zero
+/// ...
+/// SomeView()
+///    .background(ViewFrameReader(frame: $frame))
+/// ```
 @available(iOS 14.0, *)
 struct ViewFrameReader: View {
     @Binding var frame: CGRect
diff --git a/RiotSwiftUI/Modules/Settings/Notifications/Model/MatrixSDK/MXNotificationPushRule.swift b/RiotSwiftUI/Modules/Settings/Notifications/Model/MatrixSDK/MXNotificationPushRule.swift
index 7da294aa0..6c67350af 100644
--- a/RiotSwiftUI/Modules/Settings/Notifications/Model/MatrixSDK/MXNotificationPushRule.swift
+++ b/RiotSwiftUI/Modules/Settings/Notifications/Model/MatrixSDK/MXNotificationPushRule.swift
@@ -17,14 +17,12 @@
 import Foundation
 import DesignKit
 
-/**
- Conformance of MXPushRule to the abstraction `NotificationPushRule` for use in `NotificationSettingsViewModel`.
- */
+// Conformance of MXPushRule to the abstraction `NotificationPushRule` for use in `NotificationSettingsViewModel`.
 extension MXPushRule: NotificationPushRuleType {
     
-    /*
-     Given a rule, check it match the actions in the static definition.
-     */
+    /// Given a rule, check it match the actions in the static definition.
+    /// - Parameter standardActions: The standard actions to match against.
+    /// - Returns: Wether `this` rule matches the standard actions.
     func matches(standardActions: NotificationStandardActions?) -> Bool {
         guard let standardActions = standardActions else {
             return false
diff --git a/RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationActions.swift b/RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationActions.swift
index 519c71116..2facda9cd 100644
--- a/RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationActions.swift
+++ b/RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationActions.swift
@@ -16,9 +16,7 @@
 
 import Foundation
 
-/**
- The actions defined on a push rule, used in the static push rule definitions.
- */
+/// The actions defined on a push rule, used in the static push rule definitions.
 struct NotificationActions {
     let notify: Bool
     let highlight: Bool
diff --git a/RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationIndex.swift b/RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationIndex.swift
index 6b562f5e7..89088159a 100644
--- a/RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationIndex.swift
+++ b/RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationIndex.swift
@@ -16,11 +16,10 @@
 
 import Foundation
 
-/**
- Index that determines the state of the push setting.
- Silent case is un-unsed on iOS but keeping in for consistency of
- definition across the platforms.
- */
+/// Index that determines the state of the push setting.
+///
+/// Silent case is un-used on iOS but keeping in for consistency of
+/// definition across the platforms.
 enum NotificationIndex {
     case off
     case silent
@@ -30,16 +29,14 @@ enum NotificationIndex {
 extension NotificationIndex: CaseIterable { }
 
 extension NotificationIndex {
-    /**
-     Used to map the on/off checkmarks to an index used in the static push rule definitions.
-     */
+    /// Used to map the on/off checkmarks to an index used in the static push rule definitions.
+    /// - Parameter enabled: Enabled/Disabled state.
+    /// - Returns: The associated NotificationIndex
     static func index(when enabled: Bool) -> NotificationIndex {
         return enabled ? .noisy : .off
     }
     
-    /**
-     Used to map from the checked state back to the index.
-     */
+    /// Used to map from the checked state back to the index.
     var enabled: Bool {
         return self != .off
     }
diff --git a/RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationPushRuleDefinitions.swift b/RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationPushRuleDefinitions.swift
index 35907875c..10fa5ec90 100644
--- a/RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationPushRuleDefinitions.swift
+++ b/RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationPushRuleDefinitions.swift
@@ -18,10 +18,11 @@ import Foundation
 
 
 extension NotificationPushRuleId {
-    /**
-     A static definition of the push rule actions.
-     It is defined similarly across Web and Android.
-     */
+    /// A static definition of the push rule actions.
+    ///
+    /// It is defined similarly across Web and Android.
+    /// - Parameter index: The notification index for which to get the actions for.
+    /// - Returns: The associated `NotificationStandardActions`.
     func standardActions(for index: NotificationIndex) -> NotificationStandardActions? {
         switch self {
         case .containDisplayName:
diff --git a/RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationPushRuleIds.swift b/RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationPushRuleIds.swift
index b3af72eca..38ed2b521 100644
--- a/RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationPushRuleIds.swift
+++ b/RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationPushRuleIds.swift
@@ -16,9 +16,7 @@
 
 import Foundation
 
-/**
- The push rule ids used in notification settings and the static rule definitions.
- */
+/// The push rule ids used in notification settings and the static rule definitions.
 enum NotificationPushRuleId: String {
     case suppressBots = ".m.rule.suppress_notices"
     case inviteMe = ".m.rule.invite_for_me"
diff --git a/RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationSettingsScreen.swift b/RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationSettingsScreen.swift
index 63cfa7a91..7049e67bd 100644
--- a/RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationSettingsScreen.swift
+++ b/RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationSettingsScreen.swift
@@ -16,9 +16,7 @@
 
 import Foundation
 
-/**
-The notification settings screen definitions, used when calling the coordinator.
- */
+/// The notification settings screen definitions, used when calling the coordinator.
 @objc enum NotificationSettingsScreen: Int {
     case defaultNotifications
     case mentionsAndKeywords
@@ -32,9 +30,7 @@ extension NotificationSettingsScreen: Identifiable {
 }
 
 extension NotificationSettingsScreen {
-    /**
-     Defines which rules are handled by each of the screens.
-     */
+    /// Defines which rules are handled by each of the screens.
     var pushRules: [NotificationPushRuleId] {
         switch self {
         case .defaultNotifications:
diff --git a/RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationStandardActions.swift b/RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationStandardActions.swift
index 7bc3ec471..466b11595 100644
--- a/RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationStandardActions.swift
+++ b/RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationStandardActions.swift
@@ -16,10 +16,9 @@
 
 import Foundation
 
-/**
- A static definition of the different actions that can be defined on push rules.
- It is defined similarly across Web and Android.
- */
+/// A static definition of the different actions that can be defined on push rules.
+///
+/// It is defined similarly across Web and Android.
 enum NotificationStandardActions {
     case notify
     case notifyDefaultSound
diff --git a/RiotSwiftUI/Modules/Settings/Notifications/Service/NotificationSettingsServiceType.swift b/RiotSwiftUI/Modules/Settings/Notifications/Service/NotificationSettingsServiceType.swift
index 905b2eda2..317cc8253 100644
--- a/RiotSwiftUI/Modules/Settings/Notifications/Service/NotificationSettingsServiceType.swift
+++ b/RiotSwiftUI/Modules/Settings/Notifications/Service/NotificationSettingsServiceType.swift
@@ -17,41 +17,29 @@
 import Foundation
 import Combine
 
-/**
- A service for changing notification settings and keywords
- */
+/// A service for changing notification settings and keywords
 @available(iOS 14.0, *)
 protocol NotificationSettingsServiceType {
-    /**
-     Publisher of all push rules.
-     */
+    /// Publisher of all push rules.
     var rulesPublisher: AnyPublisher<[NotificationPushRuleType], Never> { get }
-    /**
-     Publisher of content rules.
-     */
+    
+    /// Publisher of content rules.
     var contentRulesPublisher: AnyPublisher<[NotificationPushRuleType], Never> { get }
-    /**
-     Adds a keyword.
-     
-     - Parameters:
-      - keyword: The keyword to add.
-      - enabled: Whether the keyword should be added in the enabled or disabled state.
-     */
+    
+    /// Adds a keyword.
+    /// - Parameters:
+    ///   - keyword: The keyword to add.
+    ///   - enabled: Whether the keyword should be added in the enabled or disabled state.
     func add(keyword: String, enabled: Bool)
-    /**
-     Removes a keyword.
-     
-     - Parameters:
-      - keyword: The keyword to remove.
-     */
+    
+    /// Removes a keyword.
+    /// - Parameter keyword: The keyword to remove.
     func remove(keyword: String)
-    /**
-     Updates the push rule actions.
-     
-     - Parameters:
-      - ruleId: The id of the rule.
-      - enabled: Whether the rule should be enabled or disabled.
-      - actions: The actions to update with.
-     */
+    
+    /// Updates the push rule actions.
+    /// - Parameters:
+    ///   - ruleId: The id of the rule.
+    ///   - enabled: Whether the rule should be enabled or disabled.
+    ///   - actions: The actions to update with.
     func updatePushRuleActions(for ruleId: String, enabled: Bool, actions: NotificationActions?)
 }
diff --git a/RiotSwiftUI/Modules/Settings/Notifications/View/BorderedInputFieldStyle.swift b/RiotSwiftUI/Modules/Settings/Notifications/View/BorderedInputFieldStyle.swift
index 24fcc06f1..89e4349fd 100644
--- a/RiotSwiftUI/Modules/Settings/Notifications/View/BorderedInputFieldStyle.swift
+++ b/RiotSwiftUI/Modules/Settings/Notifications/View/BorderedInputFieldStyle.swift
@@ -17,11 +17,11 @@
 import Foundation
 import SwiftUI
 
-/**
- A bordered style of text input as defined in:
- https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=2039%3A26415
- */
 @available(iOS 14.0, *)
+/// A bordered style of text input
+///
+/// As defined in:
+/// https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=2039%3A26415
 struct BorderedInputFieldStyle: TextFieldStyle {
     
     @Environment(\.theme) var theme: ThemeSwiftUI
diff --git a/RiotSwiftUI/Modules/Settings/Notifications/View/Chip.swift b/RiotSwiftUI/Modules/Settings/Notifications/View/Chip.swift
index 5ec26ef70..458293f6c 100644
--- a/RiotSwiftUI/Modules/Settings/Notifications/View/Chip.swift
+++ b/RiotSwiftUI/Modules/Settings/Notifications/View/Chip.swift
@@ -16,9 +16,8 @@
 
 import SwiftUI
 
-/**
- A single rounded rect chip to be rendered within `Chips` collection
- */
+
+/// A single rounded rect chip to be rendered within `Chips` collection
 @available(iOS 14.0, *)
 struct Chip: View {
     
diff --git a/RiotSwiftUI/Modules/Settings/Notifications/View/Chips.swift b/RiotSwiftUI/Modules/Settings/Notifications/View/Chips.swift
index 8b729ae8b..0c3c8bfe7 100644
--- a/RiotSwiftUI/Modules/Settings/Notifications/View/Chips.swift
+++ b/RiotSwiftUI/Modules/Settings/Notifications/View/Chips.swift
@@ -16,9 +16,7 @@
 
 import SwiftUI
 
-/**
- Renders multiple chips in a flow layout.
- */
+/// Renders multiple chips in a flow layout.
 @available(iOS 14.0, *)
 struct Chips: View {
     
diff --git a/RiotSwiftUI/Modules/Settings/Notifications/View/ChipsInput.swift b/RiotSwiftUI/Modules/Settings/Notifications/View/ChipsInput.swift
index 7d969403c..10a82add6 100644
--- a/RiotSwiftUI/Modules/Settings/Notifications/View/ChipsInput.swift
+++ b/RiotSwiftUI/Modules/Settings/Notifications/View/ChipsInput.swift
@@ -16,11 +16,7 @@
 
 import SwiftUI
 
-
-/**
- Renders an input field and a collection of chips
- with callbacks for addition and deletion.
- */
+/// Renders an input field and a collection of chips.
 @available(iOS 14.0, *)
 struct ChipsInput: View {
     
@@ -29,7 +25,6 @@ struct ChipsInput: View {
     
     @State private var chipText: String = ""
     
-    
     let titles: [String]
     let didAddChip: (String) -> Void
     let didDeleteChip: (String) -> Void
diff --git a/RiotSwiftUI/Modules/Settings/Notifications/View/FormInputFieldStyle.swift b/RiotSwiftUI/Modules/Settings/Notifications/View/FormInputFieldStyle.swift
index cc10f9591..9f7ccf7ff 100644
--- a/RiotSwiftUI/Modules/Settings/Notifications/View/FormInputFieldStyle.swift
+++ b/RiotSwiftUI/Modules/Settings/Notifications/View/FormInputFieldStyle.swift
@@ -17,9 +17,7 @@
 import Foundation
 import SwiftUI
 
-/**
- An input field for forms.
- */
+/// An input field style for forms.
 @available(iOS 14.0, *)
 struct FormInputFieldStyle: TextFieldStyle {
     
diff --git a/RiotSwiftUI/Modules/Settings/Notifications/View/NotificationSettings.swift b/RiotSwiftUI/Modules/Settings/Notifications/View/NotificationSettings.swift
index b72f477e4..8a461d07d 100644
--- a/RiotSwiftUI/Modules/Settings/Notifications/View/NotificationSettings.swift
+++ b/RiotSwiftUI/Modules/Settings/Notifications/View/NotificationSettings.swift
@@ -16,11 +16,10 @@
 
 import SwiftUI
 
-/**
- Renders the push rule settings that can be enabled/disable.
- Also renders an optional bottom section
- (used in the case of keywords, for the keyword chips and input).
- */
+/// Renders the push rule settings that can be enabled/disable.
+///
+/// Also renders an optional bottom section.
+/// Used in the case of keywords, for the keyword chips and input.
 @available(iOS 14.0, *)
 struct NotificationSettings<BottomSection: View>: View {
     
diff --git a/RiotSwiftUI/Modules/Settings/Notifications/View/NotificationSettingsKeywords.swift b/RiotSwiftUI/Modules/Settings/Notifications/View/NotificationSettingsKeywords.swift
index 7e6b4aa72..460eed436 100644
--- a/RiotSwiftUI/Modules/Settings/Notifications/View/NotificationSettingsKeywords.swift
+++ b/RiotSwiftUI/Modules/Settings/Notifications/View/NotificationSettingsKeywords.swift
@@ -16,9 +16,7 @@
 
 import SwiftUI
 
-/**
- Renders the keywords input, driven by 'NotificationSettingsViewModel'.
- */
+/// Renders the keywords input, driven by 'NotificationSettingsViewModel'.
 @available(iOS 14.0, *)
 struct NotificationSettingsKeywords: View {
     @ObservedObject var viewModel: NotificationSettingsViewModel
diff --git a/RiotSwiftUI/Modules/Settings/Notifications/ViewModel/NotificationSettingsViewModel.swift b/RiotSwiftUI/Modules/Settings/Notifications/ViewModel/NotificationSettingsViewModel.swift
index 20194e237..90b8ac38f 100644
--- a/RiotSwiftUI/Modules/Settings/Notifications/ViewModel/NotificationSettingsViewModel.swift
+++ b/RiotSwiftUI/Modules/Settings/Notifications/ViewModel/NotificationSettingsViewModel.swift
@@ -168,12 +168,13 @@ final class NotificationSettingsViewModel: NotificationSettingsViewModelType, Ob
             self.viewState.selectionState[.keywords] = anyEnabled
         }
     }
-    
-    /**
-     Given a push rule check which index/checked state  it matches.
-     Matcing is done by comparing the rule against the static definitions for that rule.
-     The same logic is used on android.
-     */
+      
+    /// Given a push rule check which index/checked state it matches.
+    ///
+    /// Matching is done by comparing the rule against the static definitions for that rule.
+    /// The same logic is used on android.
+    /// - Parameter rule: The push rule type to check.
+    /// - Returns: Wether it should be displayed as checked or not checked.
     private func isChecked(rule: NotificationPushRuleType) -> Bool {
         guard let ruleId = NotificationPushRuleId(rawValue: rule.ruleId) else { return false }
         
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModel.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModel.swift
index f6b60cc3d..ca1644b79 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModel.swift
+++ b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModel.swift
@@ -64,16 +64,18 @@ class TemplateUserProfileViewModel: ObservableObject, TemplateUserProfileViewMod
     }
     
     // MARK: - Private
-    /**
-     Send state actions to mutate the state.
-     */
+    /// Send state actions to mutate the state.
+    /// - Parameter action: The `TemplateUserProfileStateAction` to trigger the state change.
     private func dispatch(action: TemplateUserProfileStateAction) {
         Self.reducer(state: &self.viewState, action: action)
     }
-    
-    /**
-     A redux style reducer, all modifications to state happen here. Receives a state and a state action and produces a new state.
-     */
+      
+    /// A redux style reducer
+    ///
+    /// All modifications to state happen here.
+    /// - Parameters:
+    ///   - state: The `inout` state to be modified,
+    ///   - action: The action that defines which state modification should take place.
     private static func reducer(state: inout TemplateUserProfileViewState, action: TemplateUserProfileStateAction) {
         switch action {
         case .updatePresence(let presence):
diff --git a/RiotSwiftUI/RiotSwiftUIApp.swift b/RiotSwiftUI/RiotSwiftUIApp.swift
index f62d72b44..63dbece0d 100644
--- a/RiotSwiftUI/RiotSwiftUIApp.swift
+++ b/RiotSwiftUI/RiotSwiftUIApp.swift
@@ -15,11 +15,9 @@
 //
 import SwiftUI
 
-/**
- RiotSwiftUI screens rendered for UI Tests.
- */
 @available(iOS 14.0, *)
 @main
+/// RiotSwiftUI screens rendered for UI Tests.
 struct RiotSwiftUIApp: App {
     init() {
         UILog.configure(logger: PrintLogger.self)

From eea57a455d0aa37da050491844581d15afff3a50 Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Tue, 14 Sep 2021 22:28:25 +0100
Subject: [PATCH 10/59] Add StateStoreViewModel and publisher extensions for
 convenienec.

---
 .../StateStorePublisherExtensions.swift       | 26 ++++++
 .../ViewModel/StateStoreViewModel.swift       | 93 +++++++++++++++++++
 .../TemplateUserProfileCoordinator.swift      |  4 +-
 .../Model/TemplateUserProfileViewState.swift  |  2 +-
 .../MockTemplateUserProfileScreenState.swift  |  4 +-
 .../View/TemplateUserProfile.swift            |  7 +-
 .../TemplateUserProfileViewModel.swift        | 49 +++++-----
 ...TemplateUserProfileViewModelProtocol.swift |  5 +
 8 files changed, 159 insertions(+), 31 deletions(-)
 create mode 100644 RiotSwiftUI/Modules/Common/StateStore/StateStorePublisherExtensions.swift
 create mode 100644 RiotSwiftUI/Modules/Common/ViewModel/StateStoreViewModel.swift

diff --git a/RiotSwiftUI/Modules/Common/StateStore/StateStorePublisherExtensions.swift b/RiotSwiftUI/Modules/Common/StateStore/StateStorePublisherExtensions.swift
new file mode 100644
index 000000000..a5332c1fc
--- /dev/null
+++ b/RiotSwiftUI/Modules/Common/StateStore/StateStorePublisherExtensions.swift
@@ -0,0 +1,26 @@
+import Foundation
+import Combine
+
+@available(iOS 14.0, *)
+extension Publisher {
+    
+    func sinkDispatchTo<S, SA, IA>(_ store: StateStoreViewModel<S, SA, IA>) where SA == Output, Failure == Never {
+        return self
+            .subscribe(on: DispatchQueue.main)
+            .sink { [weak store] (output) in
+                guard let store = store else { return }
+                store.dispatch(action: output)
+            }
+            .store(in: &store.cancellables)
+    }
+    
+    
+    func dispatchTo<S, SA, IA>(_ store: StateStoreViewModel<S, SA, IA>)  -> Publishers.HandleEvents<Publishers.SubscribeOn<Self, DispatchQueue>> where SA == Output, Failure == Never {
+        return self
+            .subscribe(on: DispatchQueue.main)
+            .handleEvents(receiveOutput: { [weak store] action in
+                guard let store = store else { return }
+                store.dispatch(action: action)
+            })
+    }
+}
diff --git a/RiotSwiftUI/Modules/Common/ViewModel/StateStoreViewModel.swift b/RiotSwiftUI/Modules/Common/ViewModel/StateStoreViewModel.swift
new file mode 100644
index 000000000..78ffe52d0
--- /dev/null
+++ b/RiotSwiftUI/Modules/Common/ViewModel/StateStoreViewModel.swift
@@ -0,0 +1,93 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+import Combine
+
+import Foundation
+import Combine
+
+protocol BindableState {
+    associatedtype BindStateType = Void
+    var bindings: BindStateType { get set }
+}
+
+extension BindableState where BindStateType == Void {
+    var bindings: Void {
+        get {
+            ()
+        }
+        set {
+            fatalError("Can't bind to the default Void binding.")
+        }
+    }
+}
+
+@available(iOS 14, *)
+class ViewModelContext<ViewState:BindableState, ViewAction>: ObservableObject {
+   
+    private var cancellables = Set<AnyCancellable>()
+    
+    let inputActions: PassthroughSubject<ViewAction, Never>
+    @Published var inputState: ViewState.BindStateType
+    @Published fileprivate(set) var viewState: ViewState
+
+    init(initialViewState: ViewState) {
+        self.inputState = initialViewState.bindings
+        self.inputActions = PassthroughSubject()
+        self.viewState = initialViewState
+        if !(initialViewState.bindings is Void) {
+            self.$inputState
+                .weakAssign(to: \.viewState.bindings, on: self)
+                .store(in: &cancellables)
+        }
+    }
+}
+
+@available(iOS 14, *)
+class StateStoreViewModel<State:BindableState, StateAction, ViewAction> {
+    
+    typealias Context = ViewModelContext<State, ViewAction>
+    
+    let state: CurrentValueSubject<State, Never>
+
+    var cancellables = Set<AnyCancellable>()
+    var context: Context
+    
+    init(initialViewState: State) {
+        
+        self.context = Context(initialViewState: initialViewState)
+        self.state = CurrentValueSubject(initialViewState)
+        self.state.weakAssign(to: \.context.viewState, on: self)
+            .store(in: &cancellables)
+        self.context.inputActions.sink { [weak self] action in
+            guard let self = self else { return }
+            self.process(viewAction: action)
+        }
+        .store(in: &cancellables)
+    }
+    func dispatch(action: StateAction) {
+        reducer(state: &state.value, action: action)
+    }
+
+    func reducer(state: inout State, action: StateAction) {
+
+    }
+
+    func process(viewAction: ViewAction) {
+
+    }
+}
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Coordinator/TemplateUserProfileCoordinator.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Coordinator/TemplateUserProfileCoordinator.swift
index 5818b543b..6d4a8780c 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Coordinator/TemplateUserProfileCoordinator.swift
+++ b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Coordinator/TemplateUserProfileCoordinator.swift
@@ -39,8 +39,8 @@ final class TemplateUserProfileCoordinator: Coordinator {
     @available(iOS 14.0, *)
     init(parameters: TemplateUserProfileCoordinatorParameters) {
         self.parameters = parameters
-        let viewModel = TemplateUserProfileViewModel(templateUserProfileService: TemplateUserProfileService(session: parameters.session))
-        let view = TemplateUserProfile(viewModel: viewModel)
+        let viewModel = TemplateUserProfileViewModel.makeTemplateUserProfileViewModel(templateUserProfileService: TemplateUserProfileService(session: parameters.session))
+        let view = TemplateUserProfile(viewModel: viewModel.context)
             .addDependency(AvatarService.instantiate(mediaManager: parameters.session.mediaManager))
         templateUserProfileViewModel = viewModel
         templateUserProfileHostingController = VectorHostingController(rootView: view)
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileViewState.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileViewState.swift
index 1634b8c1d..e7e7b9317 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileViewState.swift
+++ b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileViewState.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 
-struct TemplateUserProfileViewState {
+struct TemplateUserProfileViewState: BindableState {
     let avatar: AvatarInputProtocol?
     let displayName: String?
     var presence: TemplateUserProfilePresence
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Service/Mock/MockTemplateUserProfileScreenState.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Service/Mock/MockTemplateUserProfileScreenState.swift
index 4388c4d1d..549716975 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Service/Mock/MockTemplateUserProfileScreenState.swift
+++ b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Service/Mock/MockTemplateUserProfileScreenState.swift
@@ -50,11 +50,11 @@ enum MockTemplateUserProfileScreenState: MockScreenState, CaseIterable {
         case .longDisplayName(let displayName):
             service = MockTemplateUserProfileService(displayName: displayName)
         }
-        let viewModel = TemplateUserProfileViewModel(templateUserProfileService: service)
+        let viewModel = TemplateUserProfileViewModel.makeTemplateUserProfileViewModel(templateUserProfileService: service)
         
         // can simulate service and viewModel actions here if needs be.
         
-        return AnyView(TemplateUserProfile(viewModel: viewModel)
+        return AnyView(TemplateUserProfile(viewModel: viewModel.context)
                 .addDependency(MockAvatarService.example))
     }
 }
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/View/TemplateUserProfile.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/View/TemplateUserProfile.swift
index 64cbf3ca4..ebde27b1c 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/View/TemplateUserProfile.swift
+++ b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/View/TemplateUserProfile.swift
@@ -27,9 +27,10 @@ struct TemplateUserProfile: View {
     
     // MARK: Public
     
-    @ObservedObject var viewModel: TemplateUserProfileViewModel
+    @ObservedObject var viewModel: TemplateUserProfileViewModel.Context
     
     var body: some View {
+        EmptyView()
         VStack {
             TemplateUserProfileHeader(
                 avatar: viewModel.viewState.avatar,
@@ -50,12 +51,12 @@ struct TemplateUserProfile: View {
         .toolbar {
             ToolbarItem(placement: .primaryAction) {
                 Button(VectorL10n.done) {
-                    viewModel.process(viewAction: .cancel)
+                    viewModel.inputActions.send(.done)
                 }
             }
             ToolbarItem(placement: .cancellationAction) {
                 Button(VectorL10n.cancel) {
-                    viewModel.process(viewAction: .cancel)
+                    viewModel.inputActions.send(.cancel)
                 }
             }
         }
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModel.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModel.swift
index ca1644b79..5b781c494 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModel.swift
+++ b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModel.swift
@@ -16,33 +16,36 @@
 
 import SwiftUI
 import Combine
-    
-@available(iOS 14.0, *)
-class TemplateUserProfileViewModel: ObservableObject, TemplateUserProfileViewModelProtocol {
+
+
+
+@available(iOS 14, *)
+typealias TemplateUserProfileViewModelType = StateStoreViewModel<TemplateUserProfileViewState,
+                                                                 TemplateUserProfileStateAction,
+                                                                 TemplateUserProfileViewAction>
+@available(iOS 14, *)
+class TemplateUserProfileViewModel: TemplateUserProfileViewModelType, TemplateUserProfileViewModelProtocol {
     
     // MARK: - Properties
     
     // MARK: Private
+    
     private let templateUserProfileService: TemplateUserProfileServiceProtocol
-    private var cancellables = Set<AnyCancellable>()
     
     // MARK: Public
-    @Published private(set) var viewState: TemplateUserProfileViewState
     
     var completion: ((TemplateUserProfileViewModelResult) -> Void)?
     
     // MARK: - Setup
-    init(templateUserProfileService: TemplateUserProfileServiceProtocol, initialState: TemplateUserProfileViewState? = nil) {
+    
+    static func makeTemplateUserProfileViewModel(templateUserProfileService: TemplateUserProfileServiceProtocol) -> TemplateUserProfileViewModelProtocol {
+        return TemplateUserProfileViewModel(templateUserProfileService: templateUserProfileService)
+    }
+    
+    fileprivate init(templateUserProfileService: TemplateUserProfileServiceProtocol) {
         self.templateUserProfileService = templateUserProfileService
-        self.viewState = initialState ?? Self.defaultState(templateUserProfileService: templateUserProfileService)
-        
-        templateUserProfileService.presenceSubject
-            .map(TemplateUserProfileStateAction.updatePresence)
-            .receive(on: DispatchQueue.main)
-            .sink(receiveValue: { [weak self] action in
-                self?.dispatch(action:action)
-            })
-            .store(in: &cancellables)
+        super.init(initialViewState: Self.defaultState(templateUserProfileService: templateUserProfileService))
+        setupPresenceObserving()
     }
     
     private static func defaultState(templateUserProfileService: TemplateUserProfileServiceProtocol) -> TemplateUserProfileViewState {
@@ -53,8 +56,15 @@ class TemplateUserProfileViewModel: ObservableObject, TemplateUserProfileViewMod
         )
     }
     
+    private func setupPresenceObserving() {
+        templateUserProfileService.presenceSubject
+            .map(TemplateUserProfileStateAction.updatePresence)
+            .sinkDispatchTo(self)
+    }
+    
     // MARK: - Public
-    func process(viewAction: TemplateUserProfileViewAction) {
+    
+    override func process(viewAction: TemplateUserProfileViewAction) {
         switch viewAction {
         case .cancel:
             cancel()
@@ -62,13 +72,6 @@ class TemplateUserProfileViewModel: ObservableObject, TemplateUserProfileViewMod
             done()
         }
     }
-    
-    // MARK: - Private
-    /// Send state actions to mutate the state.
-    /// - Parameter action: The `TemplateUserProfileStateAction` to trigger the state change.
-    private func dispatch(action: TemplateUserProfileStateAction) {
-        Self.reducer(state: &self.viewState, action: action)
-    }
       
     /// A redux style reducer
     ///
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModelProtocol.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModelProtocol.swift
index 4f038ae32..271ec3c38 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModelProtocol.swift
+++ b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModelProtocol.swift
@@ -17,5 +17,10 @@
 import Foundation
 
 protocol TemplateUserProfileViewModelProtocol {
+    
     var completion: ((TemplateUserProfileViewModelResult) -> Void)? { get set }
+    @available(iOS 14, *)
+    static func makeTemplateUserProfileViewModel(templateUserProfileService: TemplateUserProfileServiceProtocol) -> TemplateUserProfileViewModelProtocol
+    @available(iOS 14, *)
+    var context: TemplateUserProfileViewModelType.Context { get }
 }

From 23366974b3d111e346c0380756bb9f0b0b208f5c Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Wed, 15 Sep 2021 11:47:59 +0100
Subject: [PATCH 11/59] Introduce StateStore with bindings example for Chat
 example.

---
 .../ViewModel/StateStoreViewModel.swift       | 21 +++++++-----
 .../View/TemplateUserProfile.swift            |  4 +--
 .../TemplateUserProfileViewModel.swift        |  2 +-
 .../TemplateRoomChatViewModelInput.swift      |  2 +-
 .../Model/TemplateRoomChatViewState.swift     |  3 +-
 .../MockTemplateRoomChatScreenState.swift     |  2 +-
 .../View/TemplateRoomChat.swift               |  8 ++---
 .../ViewModel/TemplateRoomChatViewModel.swift | 34 +++++++------------
 8 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/RiotSwiftUI/Modules/Common/ViewModel/StateStoreViewModel.swift b/RiotSwiftUI/Modules/Common/ViewModel/StateStoreViewModel.swift
index 78ffe52d0..e66e787b7 100644
--- a/RiotSwiftUI/Modules/Common/ViewModel/StateStoreViewModel.swift
+++ b/RiotSwiftUI/Modules/Common/ViewModel/StateStoreViewModel.swift
@@ -40,21 +40,25 @@ extension BindableState where BindStateType == Void {
 class ViewModelContext<ViewState:BindableState, ViewAction>: ObservableObject {
    
     private var cancellables = Set<AnyCancellable>()
+    fileprivate let viewActions: PassthroughSubject<ViewAction, Never>
     
-    let inputActions: PassthroughSubject<ViewAction, Never>
-    @Published var inputState: ViewState.BindStateType
+    @Published var bindings: ViewState.BindStateType
     @Published fileprivate(set) var viewState: ViewState
 
     init(initialViewState: ViewState) {
-        self.inputState = initialViewState.bindings
-        self.inputActions = PassthroughSubject()
+        self.bindings = initialViewState.bindings
+        self.viewActions = PassthroughSubject()
         self.viewState = initialViewState
         if !(initialViewState.bindings is Void) {
-            self.$inputState
+            self.$bindings
                 .weakAssign(to: \.viewState.bindings, on: self)
                 .store(in: &cancellables)
         }
     }
+    
+    func send(viewAction: ViewAction) {
+        viewActions.send(viewAction)
+    }
 }
 
 @available(iOS 14, *)
@@ -73,17 +77,18 @@ class StateStoreViewModel<State:BindableState, StateAction, ViewAction> {
         self.state = CurrentValueSubject(initialViewState)
         self.state.weakAssign(to: \.context.viewState, on: self)
             .store(in: &cancellables)
-        self.context.inputActions.sink { [weak self] action in
+        self.context.viewActions.sink { [weak self] action in
             guard let self = self else { return }
             self.process(viewAction: action)
         }
         .store(in: &cancellables)
     }
+    
     func dispatch(action: StateAction) {
-        reducer(state: &state.value, action: action)
+        Self.reducer(state: &state.value, action: action)
     }
 
-    func reducer(state: inout State, action: StateAction) {
+    class func reducer(state: inout State, action: StateAction) {
 
     }
 
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/View/TemplateUserProfile.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/View/TemplateUserProfile.swift
index ebde27b1c..30902c482 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/View/TemplateUserProfile.swift
+++ b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/View/TemplateUserProfile.swift
@@ -51,12 +51,12 @@ struct TemplateUserProfile: View {
         .toolbar {
             ToolbarItem(placement: .primaryAction) {
                 Button(VectorL10n.done) {
-                    viewModel.inputActions.send(.done)
+                    viewModel.send(viewAction: .done)
                 }
             }
             ToolbarItem(placement: .cancellationAction) {
                 Button(VectorL10n.cancel) {
-                    viewModel.inputActions.send(.cancel)
+                    viewModel.send(viewAction: .cancel)
                 }
             }
         }
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModel.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModel.swift
index 5b781c494..2eaccfdb5 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModel.swift
+++ b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModel.swift
@@ -79,7 +79,7 @@ class TemplateUserProfileViewModel: TemplateUserProfileViewModelType, TemplateUs
     /// - Parameters:
     ///   - state: The `inout` state to be modified,
     ///   - action: The action that defines which state modification should take place.
-    private static func reducer(state: inout TemplateUserProfileViewState, action: TemplateUserProfileStateAction) {
+    override class func reducer(state: inout TemplateUserProfileViewState, action: TemplateUserProfileStateAction) {
         switch action {
         case .updatePresence(let presence):
             state.presence = presence
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelInput.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelInput.swift
index 7ac56116c..2eadcfd56 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelInput.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelInput.swift
@@ -16,6 +16,6 @@
 
 import Foundation
 
-struct TemplateRoomChatViewModelInput {
+struct TemplateRoomChatViewModelBindings {
     var messageInput: String
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewState.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewState.swift
index e9c677a65..ebf924770 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewState.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewState.swift
@@ -16,6 +16,7 @@
 
 import Foundation
 
-struct TemplateRoomChatViewState {
+struct TemplateRoomChatViewState: BindableState {
     var bubbles: [TemplateRoomChatBubble]
+    var bindings: TemplateRoomChatViewModelBindings
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatScreenState.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatScreenState.swift
index 77d61ca75..3106381c2 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatScreenState.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatScreenState.swift
@@ -46,7 +46,7 @@ enum MockTemplateRoomChatScreenState: MockScreenState, CaseIterable {
         
         // can simulate service and viewModel actions here if needs be.
         
-        return AnyView(TemplateRoomChat(viewModel: viewModel)
+        return AnyView(TemplateRoomChat(viewModel: viewModel.context)
                 .addDependency(MockAvatarService.example))
     }
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
index c9fbb4bff..088ecbf5c 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
@@ -27,7 +27,7 @@ struct TemplateRoomChat: View {
     
     // MARK: Public
     
-    @ObservedObject var viewModel: TemplateRoomChatViewModel
+    @ObservedObject var viewModel: TemplateRoomChatViewModel.Context
     
     var body: some View {
         VStack {
@@ -46,7 +46,7 @@ struct TemplateRoomChat: View {
             }
             
             HStack {
-                TextField(VectorL10n.roomMessageShortPlaceholder, text: $viewModel.input.messageInput)
+                TextField(VectorL10n.roomMessageShortPlaceholder, text: $viewModel.bindings.messageInput)
                     .textFieldStyle(BorderedInputFieldStyle())
                 Button(action: {
 
@@ -61,12 +61,12 @@ struct TemplateRoomChat: View {
         .toolbar {
             ToolbarItem(placement: .primaryAction) {
                 Button(VectorL10n.done) {
-                    viewModel.process(viewAction: .cancel)
+                    viewModel.send(viewAction: .cancel)
                 }
             }
             ToolbarItem(placement: .cancellationAction) {
                 Button(VectorL10n.cancel) {
-                    viewModel.process(viewAction: .cancel)
+                    viewModel.send(viewAction: .cancel)
                 }
             }
         }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
index 81252c16e..86cc7d21a 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
@@ -17,27 +17,26 @@
 import SwiftUI
 import Combine
     
-@available(iOS 14.0, *)
-class TemplateRoomChatViewModel: ObservableObject, TemplateRoomChatViewModelProtocol {
+@available(iOS 14, *)
+typealias TemplateRoomChatViewModelType = StateStoreViewModel<TemplateRoomChatViewState,
+                                                                 TemplateRoomChatStateAction,
+                                                                 TemplateRoomChatViewAction>
+
+@available(iOS 14, *)
+class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChatViewModelProtocol {
     
     // MARK: - Properties
     
     // MARK: Private
     private let templateRoomChatService: TemplateRoomChatServiceProtocol
-    private var cancellables = Set<AnyCancellable>()
     
     // MARK: Public
-    @Published var input: TemplateRoomChatViewModelInput
-    @Published private(set) var viewState: TemplateRoomChatViewState
-    
     var completion: ((TemplateRoomChatViewModelResult) -> Void)?
     
     // MARK: - Setup
-    init(templateRoomChatService: TemplateRoomChatServiceProtocol, initialState: TemplateRoomChatViewState? = nil) {
-        self.input = TemplateRoomChatViewModelInput(messageInput: "")
+    init(templateRoomChatService: TemplateRoomChatServiceProtocol) {
         self.templateRoomChatService = templateRoomChatService
-        self.viewState = initialState ?? Self.defaultState(templateRoomChatService: templateRoomChatService)
-        
+        super.init(initialViewState: Self.defaultState(templateRoomChatService: templateRoomChatService))
         templateRoomChatService.chatMessagesSubject
             .map(Self.makeBubbles(messages:))
             .map(TemplateRoomChatStateAction.updateBubbles)
@@ -50,7 +49,8 @@ class TemplateRoomChatViewModel: ObservableObject, TemplateRoomChatViewModelProt
     
     private static func defaultState(templateRoomChatService: TemplateRoomChatServiceProtocol) -> TemplateRoomChatViewState {
         let bubbles = makeBubbles(messages: templateRoomChatService.chatMessagesSubject.value)
-        return TemplateRoomChatViewState(bubbles: bubbles)
+        let bindings = TemplateRoomChatViewModelBindings(messageInput: "")
+        return TemplateRoomChatViewState(bubbles: bubbles, bindings: bindings)
     }
     
     private static func makeBubbles(messages: [TemplateRoomChatMessage]) -> [TemplateRoomChatBubble] {
@@ -86,7 +86,7 @@ class TemplateRoomChatViewModel: ObservableObject, TemplateRoomChatViewModelProt
     }
     
     // MARK: - Public
-    func process(viewAction: TemplateRoomChatViewAction) {
+    override func process(viewAction: TemplateRoomChatViewAction) {
         switch viewAction {
         case .cancel:
             cancel()
@@ -95,18 +95,10 @@ class TemplateRoomChatViewModel: ObservableObject, TemplateRoomChatViewModelProt
         }
     }
     
-    // MARK: - Private
-    /**
-     Send state actions to mutate the state.
-     */
-    private func dispatch(action: TemplateRoomChatStateAction) {
-        Self.reducer(state: &self.viewState, action: action)
-    }
-    
     /**
      A redux style reducer, all modifications to state happen here. Receives a state and a state action and produces a new state.
      */
-    private static func reducer(state: inout TemplateRoomChatViewState, action: TemplateRoomChatStateAction) {
+    override class func reducer(state: inout TemplateRoomChatViewState, action: TemplateRoomChatStateAction) {
         switch action {
         case .updateBubbles(let bubbles):
             state.bubbles = bubbles

From a8708b648621733d0fa02fb82f6c87c0e53e37e9 Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Thu, 16 Sep 2021 22:09:32 +0100
Subject: [PATCH 12/59] Use dynamicMembers for StoreState for single source of
 truth. Fix bubble grouping and add send message function.

---
 .../MatrixSDK/MXRoomAvatarable.swift          |  31 +++++
 .../Modules/Common/Theme/ThemePublisher.swift |   2 +-
 .../ViewModel/StateStoreViewModel.swift       |  39 +++---
 .../TemplateRoomChatCoordinator.swift         |   6 +-
 ...emplateRoomChatCoordinatorParamaters.swift |   2 +-
 .../Model/TemplateRoomChatBubbleItem.swift    |  30 ++---
 .../Model/TemplateRoomChatRoom.swift          |   1 +
 .../Model/TemplateRoomChatStateAction.swift   |   1 +
 .../Model/TemplateRoomChatViewAction.swift    |   1 +
 .../Model/TemplateRoomChatViewState.swift     |   8 ++
 .../MatrixSDK/TemplateRoomChatService.swift   | 120 +++++++++++++-----
 .../Mock/MockTemplateRoomChatService.swift    |  18 ++-
 .../TemplateRoomChatServiceProtocol.swift     |   2 +
 .../Test/UI/TemplateRoomChatUITests.swift     |  28 ----
 .../View/TemplateRoomChat.swift               |  29 +++--
 ...> TemplateRoomChatBubbleContentView.swift} |  12 +-
 .../View/TemplateRoomChatBubbleImage.swift    |   2 +-
 .../View/TemplateRoomChatBubbleMessage.swift  |   5 +-
 .../View/TemplateRoomChatBubbleView.swift     |  14 +-
 .../ViewModel/TemplateRoomChatViewModel.swift |  59 ++++++---
 .../TemplateRoomListCoordinator.swift         |   3 +-
 .../Model/TemplateRoomListViewState.swift     |   2 +-
 .../MatrixSDK/TemplateRoomListService.swift   |   2 +-
 .../MockTemplateRoomListScreenState.swift     |   2 +-
 .../View/TemplateRoomList.swift               |  10 +-
 .../View/TemplateRoomListRow.swift            |   1 +
 .../ViewModel/TemplateRoomListViewModel.swift |  33 +++--
 .../TemplateRoomListViewModelProtocol.swift   |   2 +
 28 files changed, 285 insertions(+), 180 deletions(-)
 create mode 100644 RiotSwiftUI/Modules/Common/Extensions/MatrixSDK/MXRoomAvatarable.swift
 rename RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/{TemplateRoomChatBubbleItemView.swift => TemplateRoomChatBubbleContentView.swift} (77%)

diff --git a/RiotSwiftUI/Modules/Common/Extensions/MatrixSDK/MXRoomAvatarable.swift b/RiotSwiftUI/Modules/Common/Extensions/MatrixSDK/MXRoomAvatarable.swift
new file mode 100644
index 000000000..e18feed41
--- /dev/null
+++ b/RiotSwiftUI/Modules/Common/Extensions/MatrixSDK/MXRoomAvatarable.swift
@@ -0,0 +1,31 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+extension MXRoom: Avatarable {
+    var mxContentUri: String? {
+        summary.avatar
+    }
+    
+    var matrixItemId: String {
+        roomId
+    }
+    
+    var displayName: String? {
+        summary.displayname
+    }
+    
+}
diff --git a/RiotSwiftUI/Modules/Common/Theme/ThemePublisher.swift b/RiotSwiftUI/Modules/Common/Theme/ThemePublisher.swift
index be6ba9b38..c57034fd7 100644
--- a/RiotSwiftUI/Modules/Common/Theme/ThemePublisher.swift
+++ b/RiotSwiftUI/Modules/Common/Theme/ThemePublisher.swift
@@ -35,7 +35,7 @@ class ThemePublisher: ObservableObject {
     @Published private(set) var theme: ThemeSwiftUI
     
     static func configure(themeId: ThemeIdentifier) {
-        _shared = ThemePublisher(themeId: .light)
+        _shared = ThemePublisher(themeId: themeId)
     }
     
     init(themeId: ThemeIdentifier) {
diff --git a/RiotSwiftUI/Modules/Common/ViewModel/StateStoreViewModel.swift b/RiotSwiftUI/Modules/Common/ViewModel/StateStoreViewModel.swift
index 5a0bd7e98..e82731cd9 100644
--- a/RiotSwiftUI/Modules/Common/ViewModel/StateStoreViewModel.swift
+++ b/RiotSwiftUI/Modules/Common/ViewModel/StateStoreViewModel.swift
@@ -34,6 +34,7 @@ import Combine
 /// It provides a nice layer of consistency and also safety. As we are not passing the `ViewModel` to the view directly, shortcuts/hacks
 /// can't be made into the `ViewModel`.
 @available(iOS 14, *)
+@dynamicMemberLookup
 class ViewModelContext<ViewState:BindableState, ViewAction>: ObservableObject {
     // MARK: - Properties
 
@@ -44,23 +45,20 @@ class ViewModelContext<ViewState:BindableState, ViewAction>: ObservableObject {
 
     // MARK: Public
 
-    /// Set-able/Bindable `Published` property for the bindable portion of the `ViewState`
-    @Published var bindings: ViewState.BindStateType
     /// Get-able/Observable `Published` property for the `ViewState`
     @Published fileprivate(set) var viewState: ViewState
 
+    /// Set-able/Bindable access to the bindable state.
+    subscript<T>(dynamicMember keyPath: WritableKeyPath<ViewState.BindStateType, T>) -> T {
+        get { viewState.bindings[keyPath: keyPath] }
+        set { viewState.bindings[keyPath: keyPath] = newValue }
+    }
+    
     // MARK: Setup
 
     init(initialViewState: ViewState) {
-        self.bindings = initialViewState.bindings
         self.viewActions = PassthroughSubject()
         self.viewState = initialViewState
-        if !(initialViewState.bindings is Void) {
-            // If we have bindable state defined, forward its updates on to the `ViewState`
-            self.$bindings
-                .weakAssign(to: \.viewState.bindings, on: self)
-                .store(in: &cancellables)
-        }
     }
 
     // MARK: Public
@@ -85,12 +83,8 @@ class StateStoreViewModel<State: BindableState, StateAction, ViewAction> {
 
     // MARK: - Properties
 
-    // MARK: Private
-
-    private let state: CurrentValueSubject<State, Never>
-
     // MARK: Public
-
+    
     /// For storing subscription references.
     ///
     /// Left as public for `ViewModel` implementations convenience.
@@ -98,17 +92,16 @@ class StateStoreViewModel<State: BindableState, StateAction, ViewAction> {
 
     /// Constrained interface for passing to Views.
     var context: Context
-
+    
+    /// State can be read  within the 'ViewModel' but not modified outside of the reducer.
+    var state: State {
+        context.viewState
+    }
+    
     // MARK: Setup
 
     init(initialViewState: State) {
         self.context = Context(initialViewState: initialViewState)
-        self.state = CurrentValueSubject(initialViewState)
-        // Connect the state to context viewState, that view uses for observing (but not modifying directly) the state.
-        self.state
-            .weakAssign(to: \.context.viewState, on: self)
-            .store(in: &cancellables)
-        // Receive events from the view and pass on to the `ViewModel` for processing.
         self.context.viewActions.sink { [weak self] action in
             guard let self = self else { return }
             self.process(viewAction: action)
@@ -119,7 +112,7 @@ class StateStoreViewModel<State: BindableState, StateAction, ViewAction> {
     /// Send state actions to modify the state within the reducer.
     /// - Parameter action: The state action to send to the reducer.
     func dispatch(action: StateAction) {
-        Self.reducer(state: &state.value, action: action)
+        Self.reducer(state: &context.viewState, action: action)
     }
 
     /// Send state actions from a publisher to modify the state within the reducer.
@@ -127,7 +120,7 @@ class StateStoreViewModel<State: BindableState, StateAction, ViewAction> {
     func dispatch(actionPublisher: AnyPublisher<StateAction, Never>) {
         actionPublisher.sink { [weak self] action in
             guard let self = self else { return }
-            Self.reducer(state: &self.state.value, action: action)
+            Self.reducer(state: &self.context.viewState, action: action)
         }
         .store(in: &cancellables)
     }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinator.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinator.swift
index 080790d9d..6faf18f15 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinator.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinator.swift
@@ -39,9 +39,9 @@ final class TemplateRoomChatCoordinator: Coordinator {
     @available(iOS 14.0, *)
     init(parameters: TemplateRoomChatCoordinatorParameters) {
         self.parameters = parameters
-        let viewModel = TemplateRoomChatViewModel(templateRoomChatService: TemplateRoomChatService(session: parameters.session))
-        let view = TemplateRoomChat(viewModel: viewModel)
-            .addDependency(AvatarService.instantiate(mediaManager: parameters.session.mediaManager))
+        let viewModel = TemplateRoomChatViewModel(templateRoomChatService: TemplateRoomChatService(room: parameters.room))
+        let view = TemplateRoomChat(viewModel: viewModel.context)
+            .addDependency(AvatarService.instantiate(mediaManager: parameters.room.mxSession.mediaManager))
         templateRoomChatViewModel = viewModel
         templateRoomChatHostingController = VectorHostingController(rootView: view)
     }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinatorParamaters.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinatorParamaters.swift
index 5fd0ebaea..ed6db9cb0 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinatorParamaters.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinatorParamaters.swift
@@ -17,5 +17,5 @@
 import Foundation
 
 struct TemplateRoomChatCoordinatorParameters {
- let session: MXSession
+ let room: MXRoom
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItem.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItem.swift
index b9a6e50c7..97406a2e3 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItem.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItem.swift
@@ -18,32 +18,30 @@ import UIKit
 
 
 struct TemplateRoomChatBubble {
-    var id: String
-    var senderAvatar: AvatarInputProtocol
-    var senderDisplayName: String?
+    let id: String
+    let sender: TemplateRoomChatMember
     var items: [TemplateRoomChatBubbleItem]
 }
 
 extension TemplateRoomChatBubble: Identifiable { }
 
-enum TemplateRoomChatBubbleItem {
-    var id: Self { self }
-    case message(TemplateRoomChatBubbleMessageItem)
-    case image(TemplateRoomChatBubbleImageItem)
+struct TemplateRoomChatBubbleItem {
+    let id: String
+    var timestamp: Date
+    var content: TemplateRoomChatBubbleItemContent
 }
 
-extension TemplateRoomChatBubbleItem: Hashable, Identifiable {}
+extension TemplateRoomChatBubbleItem: Identifiable { }
 
-struct TemplateRoomChatBubbleMessageItem {
-    var id: String
+enum TemplateRoomChatBubbleItemContent {
+    case message(TemplateRoomChatBubbleMessageContent)
+    case image(TemplateRoomChatBubbleImageContent)
+}
+
+struct TemplateRoomChatBubbleMessageContent {
     var body: String
 }
 
-extension TemplateRoomChatBubbleMessageItem: Hashable {}
-
-struct TemplateRoomChatBubbleImageItem {
-    var id: String
+struct TemplateRoomChatBubbleImageContent {
     var image: UIImage
 }
-
-extension TemplateRoomChatBubbleImageItem: Hashable {}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatRoom.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatRoom.swift
index 409526af7..20bfac77e 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatRoom.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatRoom.swift
@@ -20,6 +20,7 @@ struct TemplateRoomChatMessage {
     let id: String
     let body: String
     let sender: TemplateRoomChatMember
+    let timestamp: Date
 }
 
 extension TemplateRoomChatMessage: Identifiable {}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatStateAction.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatStateAction.swift
index ebf5052b5..8e5f81336 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatStateAction.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatStateAction.swift
@@ -17,5 +17,6 @@
 import Foundation
 
 enum TemplateRoomChatStateAction {
+    case clearMessageInput
     case updateBubbles([TemplateRoomChatBubble])
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewAction.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewAction.swift
index a65e0b623..7e9020e1c 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewAction.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewAction.swift
@@ -17,6 +17,7 @@
 import Foundation
 
 enum TemplateRoomChatViewAction {
+    case sendMessage
     case cancel
     case done
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewState.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewState.swift
index ebf924770..b4badbdb4 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewState.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewState.swift
@@ -17,6 +17,14 @@
 import Foundation
 
 struct TemplateRoomChatViewState: BindableState {
+    let roomName: String?
     var bubbles: [TemplateRoomChatBubble]
     var bindings: TemplateRoomChatViewModelBindings
 }
+
+extension TemplateRoomChatViewState {
+    var sendButtonEnabled: Bool {
+        !bindings.messageInput.isEmpty
+    }
+}
+
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift
index 80f4a255f..68498f853 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift
@@ -17,6 +17,13 @@
 import Foundation
 import Combine
 
+
+enum TemplateRoomChatRoomIntializationStatus{
+    case notInitialized
+    case initialized
+    case failedToInitialize
+}
+
 @available(iOS 14.0, *)
 class TemplateRoomChatService: TemplateRoomChatServiceProtocol {
     
@@ -26,53 +33,108 @@ class TemplateRoomChatService: TemplateRoomChatServiceProtocol {
     
     private let room: MXRoom
     private let eventFormatter: EventFormatter
-    private var listenerReference: Any?
+    private var roomState: MXRoomState?
+    private var roomListenerReference: Any?
+    private var usernameColorGenerator: UserNameColorGenerator()
     
     // MARK: Public
     private(set) var chatMessagesSubject: CurrentValueSubject<[TemplateRoomChatMessage], Never>
+    private(set) var roomInitialized: CurrentValueSubject<TemplateRoomChatRoomIntializationStatus, Never>
     
+    var roomName: String? {
+        self.room.summary.displayname
+    }
     // MARK: - Setup
     
     init(room: MXRoom) {
+        )
         self.room = room
         self.eventFormatter = EventFormatter(matrixSession: room.mxSession)
-        let batch = room.enumeratorForStoredMessages.nextEventsBatch(50)
-        let messageBatch = chatMessages(from: batch ?? [])
-        chatMessagesSubject = CurrentValueSubject(messageBatch)
-    }
-    
-    
-    func senderForMessage(event: MXEvent) -> TemplateRoomChatMember? {
-        guard let sender = event.sender else {
-            return nil
-        }
-        let displayName = eventFormatter.senderDisplayName(for: event, with: room.dangerousSyncState)
-        let avatarUrl = eventFormatter.senderAvatarUrl(for: event, with: room.dangerousSyncState)
-        return TemplateRoomChatMember(id: sender, avatarUrl: avatarUrl, displayName: displayName)
-    }
-    
-    private func chatMessages(from events: [MXEvent]) -> [TemplateRoomChatMessage] {
+        self.chatMessagesSubject = CurrentValueSubject([])
+        self.roomInitialized = CurrentValueSubject(.notInitialized)
         
-        eve
+        initalizeRoom()
+    }
+    
+    deinit {
+        guard let reference = roomListenerReference else { return }
+        room.removeListener(reference)
+    }
+    
+    // MARK: Public
+    func send(message: String) {
+        var localEcho: MXEvent? = nil
+        room.sendTextMessage(message, localEcho: &localEcho, completion: { _ in }) 
+    }
+    
+    // MARK: Private
+    
+    private func initalizeRoom(){
+        room.state { [weak self] roomState in
+            guard let self = self else { return }
+            if let roomState = roomState {
+                self.roomState = roomState
+                self.roomInitialized.value = .initialized
+                self.loadInitialMessages()
+                self.startListeningToRoomEvents()
+            } else {
+                self.roomInitialized.value = .failedToInitialize
+            }
+        }
+    }
+    
+    private func loadInitialMessages() {
+        let batch = room.enumeratorForStoredMessages.nextEventsBatch(200)
+        let messageBatch = self.mapChatMessages(from: batch ?? [])
+        self.chatMessagesSubject.value = messageBatch
+    }
+    
+    private func startListeningToRoomEvents(){
+        roomListenerReference = room.listen { [weak self] event, directionId, roomState in
+            let direction = MXTimelineDirection(identifer: directionId)
+            guard let self = self,
+                  let event = event else { return }
+            if let roomState = roomState {
+                self.roomState = roomState
+            }
+            if direction == .forwards &&  event.type == kMXEventTypeStringRoomMessage {
+                self.appendNewMessage(event: event)
+            }
+        }
+    }
+    
+    private func mapChatMessages(from events: [MXEvent]) -> [TemplateRoomChatMessage] {
         return events
             .filter({ event in
-            event.type == kMXEventTypeStringRoomMessage
-                && event.content["msgtype"] as? String == kMXMessageTypeText
+                event.type == kMXEventTypeStringRoomMessage
+                    && event.content["msgtype"] as? String == kMXMessageTypeText
             })
             .compactMap({ event -> TemplateRoomChatMessage?  in
                 guard let eventId = event.eventId,
                       let eventBody = event.content["body"] as? String,
                       let sender = senderForMessage(event: event)
-                      else { return nil }
-                return TemplateRoomChatMessage(id: eventId,
-                                        body: eventBody,
-                                        sender: sender)
+                else { return nil }
+                
+                return TemplateRoomChatMessage(
+                    id: eventId,
+                    body: eventBody,
+                    sender: sender,
+                    timestamp: Date(timeIntervalSince1970: TimeInterval(event.originServerTs / 1000))
+                )
             })
     }
-
-
-    deinit {
-//        guard let reference = listenerReference else { return }
+    
+    private func senderForMessage(event: MXEvent) -> TemplateRoomChatMember? {
+        guard let sender = event.sender, let roomState = roomState else {
+            return nil
+        }
+        let displayName = eventFormatter.senderDisplayName(for: event, with: roomState)
+        let avatarUrl = eventFormatter.senderAvatarUrl(for: event, with: roomState)
+        return TemplateRoomChatMember(id: sender, avatarUrl: avatarUrl, displayName: displayName)
     }
-
+    
+    private func appendNewMessage(event: MXEvent) {
+        chatMessagesSubject.value += mapChatMessages(from: [event])
+    }
+    
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatService.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatService.swift
index bbd85efbe..eb053a8d8 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatService.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatService.swift
@@ -19,13 +19,16 @@ import Combine
 
 @available(iOS 14.0, *)
 class MockTemplateRoomChatService: TemplateRoomChatServiceProtocol {
-    static let alice = TemplateRoomChatMember(id: "@alice:matrix.org", avatarUrl: "!aaabaa:matrix.org", displayName: "Alice")
+    
+    let roomName: String? = "New Vector"
+    
+    static let amadine = TemplateRoomChatMember(id: "@amadine:matrix.org", avatarUrl: "!aaabaa:matrix.org", displayName: "Amadine")
     static let mathew = TemplateRoomChatMember(id: "@mathew:matrix.org", avatarUrl: "!bbabb:matrix.org", displayName: "Mathew")
     static let mockMessages = [
-        TemplateRoomChatMessage(id: "!11111:matrix.org", body: "Shall I put it live?", sender: alice),
-        TemplateRoomChatMessage(id: "!22222:matrix.org", body: "Yea go for it! ...and then let's head to the pub", sender: mathew),
-        TemplateRoomChatMessage(id: "!33333:matrix.org", body: "Deal.", sender: alice),
-        TemplateRoomChatMessage(id: "!44444:matrix.org", body: "Ok, Done. 🍻", sender: alice),
+        TemplateRoomChatMessage(id: "!0:matrix.org", body: "Shall I put it live?", sender: amadine, timestamp: Date(timeIntervalSinceNow: 60 * -3)),
+        TemplateRoomChatMessage(id: "!1:matrix.org", body: "Yea go for it! ...and then let's head to the pub", sender: mathew, timestamp: Date(timeIntervalSinceNow: 60)),
+        TemplateRoomChatMessage(id: "!2:matrix.org", body: "Deal.", sender: amadine, timestamp: Date(timeIntervalSinceNow: 60 * -2)),
+        TemplateRoomChatMessage(id: "!3:matrix.org", body: "Ok, Done. 🍻", sender: amadine, timestamp: Date(timeIntervalSinceNow: 60 * -1)),
     ]
     var chatMessagesSubject: CurrentValueSubject<[TemplateRoomChatMessage], Never>
 
@@ -33,6 +36,11 @@ class MockTemplateRoomChatService: TemplateRoomChatServiceProtocol {
         chatMessagesSubject = CurrentValueSubject(messages)
     }
     
+    func send(message: String) {
+        let newMessage = TemplateRoomChatMessage(id: "!\(chatMessagesSubject.value.count):matrix.org", body: message, sender: Self.amadine, timestamp: Date())
+        self.chatMessagesSubject.value += [newMessage]
+    }
+    
     func simulateUpdate(messages: [TemplateRoomChatMessage]) {
         self.chatMessagesSubject.send(messages)
     }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/TemplateRoomChatServiceProtocol.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/TemplateRoomChatServiceProtocol.swift
index e0a00b71e..e3eb61031 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/TemplateRoomChatServiceProtocol.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/TemplateRoomChatServiceProtocol.swift
@@ -20,4 +20,6 @@ import Combine
 @available(iOS 14.0, *)
 protocol TemplateRoomChatServiceProtocol {
     var chatMessagesSubject: CurrentValueSubject<[TemplateRoomChatMessage], Never> { get }
+    var roomName: String? { get }
+    func send(message: String)
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Test/UI/TemplateRoomChatUITests.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Test/UI/TemplateRoomChatUITests.swift
index 733e3fcc1..1a015132b 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Test/UI/TemplateRoomChatUITests.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Test/UI/TemplateRoomChatUITests.swift
@@ -18,7 +18,6 @@ import XCTest
 import RiotSwiftUI
 
 @available(iOS 14.0, *)
-<<<<<<< HEAD:RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Test/UI/TemplateRoomChatUITests.swift
 class TemplateRoomChatUITests: MockScreenTest {
     
     override class var screenType: MockScreenState.Type {
@@ -40,39 +39,12 @@ class TemplateRoomChatUITests: MockScreenTest {
     }
     
     func verifyTemplateRoomChatPresence(presence: TemplateRoomChatPresence) {
-=======
-class TemplateUserProfileUITests: MockScreenTest {
-    
-    override class var screenType: MockScreenState.Type {
-        return MockTemplateUserProfileScreenState.self
-    }
-
-    override class func createTest() -> MockScreenTest {
-        return TemplateUserProfileUITests(selector: #selector(verifyTemplateUserProfileScreen))
-    }
-    
-    func verifyTemplateUserProfileScreen() throws {
-        guard let screenState = screenState as? MockTemplateUserProfileScreenState else { fatalError("no screen") }
-        switch screenState {
-        case .presence(let presence):
-            verifyTemplateUserProfilePresence(presence: presence)
-        case .longDisplayName(let name):
-            verifyTemplateUserProfileLongName(name: name)
-        }
-    }
-    
-    func verifyTemplateUserProfilePresence(presence: TemplateUserProfilePresence) {
->>>>>>> ed82cec9f8dd0bb215c2c0d58c3f67649dc64dfb:RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Test/UI/TemplateUserProfileUITests.swift
         let presenceText = app.staticTexts["presenceText"]
         XCTAssert(presenceText.exists)
         XCTAssert(presenceText.label == presence.title)
     }
     
-<<<<<<< HEAD:RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Test/UI/TemplateRoomChatUITests.swift
     func verifyTemplateRoomChatLongName(name: String) {
-=======
-    func verifyTemplateUserProfileLongName(name: String) {
->>>>>>> ed82cec9f8dd0bb215c2c0d58c3f67649dc64dfb:RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Test/UI/TemplateUserProfileUITests.swift
         let displayNameText = app.staticTexts["displayNameText"]
         XCTAssert(displayNameText.exists)
         XCTAssert(displayNameText.label == name)
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
index 088ecbf5c..30b013f79 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
@@ -37,27 +37,34 @@ struct TemplateRoomChat: View {
                 }
                 .frame(maxHeight: .infinity)
             } else {
-                LazyVStack {
-                    ForEach(viewModel.viewState.bubbles) { bubble in
-                        TemplateRoomChatBubbleView(bubble: bubble)
+                ScrollView{
+                    LazyVStack {
+                        ForEach(viewModel.viewState.bubbles) { bubble in
+                            TemplateRoomChatBubbleView(bubble: bubble)
+                        }
                     }
+                    .frame(maxHeight: .infinity, alignment: .top)
                 }
-                .frame(maxHeight: .infinity, alignment: .top)
+                .frame(maxHeight: .infinity)
             }
             
             HStack {
-                TextField(VectorL10n.roomMessageShortPlaceholder, text: $viewModel.bindings.messageInput)
+                TextField(VectorL10n.roomMessageShortPlaceholder, text: $viewModel.messageInput)
                     .textFieldStyle(BorderedInputFieldStyle())
-                Button(action: {
-
-                }, label: {
-                    Image(uiImage: Asset.Images.sendIcon.image)
-                })
+                if viewModel.viewState.sendButtonEnabled {
+                    Button(action: {
+                        viewModel.send(viewAction: .sendMessage)
+                    }, label: {
+                        Image(uiImage: Asset.Images.sendIcon.image)
+                    })
+                }
             }
+            .animation(.easeOut(duration: 0.25))
+            .transition(.move(edge: .trailing))
             .padding(.horizontal)
             
         }
-        .navigationTitle("Chat")
+        .navigationTitle(viewModel.viewState.roomName ?? "Chat")
         .toolbar {
             ToolbarItem(placement: .primaryAction) {
                 Button(VectorL10n.done) {
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleItemView.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleContentView.swift
similarity index 77%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleItemView.swift
rename to RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleContentView.swift
index c40fa812f..42b488537 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleItemView.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleContentView.swift
@@ -17,7 +17,7 @@
 import SwiftUI
 
 @available(iOS 14.0, *)
-struct TemplateRoomChatBubbleItemView: View {
+struct TemplateRoomChatBubbleContentView: View {
 
     // MARK: - Properties
     
@@ -30,11 +30,11 @@ struct TemplateRoomChatBubbleItemView: View {
     let bubbleItem: TemplateRoomChatBubbleItem
     
     var body: some View {
-        switch bubbleItem {
-        case .message(let messageItem):
-            TemplateRoomChatBubbleMessage(messageItem: messageItem)
-        case .image(let imageItem):
-            TemplateRoomChatBubbleImage(imageItem: imageItem)
+        switch bubbleItem.content {
+        case .message(let messageContent):
+            TemplateRoomChatBubbleMessage(messageContent: messageContent)
+        case .image(let imageContent):
+            TemplateRoomChatBubbleImage(imageContent: imageContent)
         }
     }
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleImage.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleImage.swift
index 3b1bb7661..f05b7391c 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleImage.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleImage.swift
@@ -27,7 +27,7 @@ struct TemplateRoomChatBubbleImage: View {
     
     // MARK: Public
     
-    let imageItem: TemplateRoomChatBubbleImageItem
+    let imageContent: TemplateRoomChatBubbleImageContent
     
     var body: some View {
         EmptyView()
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleMessage.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleMessage.swift
index f1f08248f..2082688e2 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleMessage.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleMessage.swift
@@ -27,10 +27,11 @@ struct TemplateRoomChatBubbleMessage: View {
     
     // MARK: Public
     
-    let messageItem: TemplateRoomChatBubbleMessageItem
+    let messageContent: TemplateRoomChatBubbleMessageContent
     
     var body: some View {
-        Text(messageItem.body)
+        Text(messageContent.body)
+            .foregroundColor(theme.colors.primaryContent)
     }
 }
 
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleView.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleView.swift
index 45b0719e3..121e8227e 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleView.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleView.swift
@@ -30,12 +30,13 @@ struct TemplateRoomChatBubbleView: View {
     let bubble: TemplateRoomChatBubble
     
     var body: some View {
-        HStack{
-            AvatarImage(avatarData: bubble.senderAvatar, size: .xSmall)
+        HStack(alignment: .top){
+            AvatarImage(avatarData: bubble.sender.avatarData, size: .xSmall)
             VStack(alignment: .leading){
-                Text(bubble.senderDisplayName ?? "")
+                Text(bubble.sender.displayName ?? "")
+                    .foregroundColor(theme.colors.primaryContent)
                 ForEach(bubble.items) { item in
-                    TemplateRoomChatBubbleItemView(bubbleItem: item)
+                    TemplateRoomChatBubbleContentView(bubbleItem: item)
                 }
             }
             
@@ -54,9 +55,8 @@ struct TemplateRoomChatBubbleView: View {
 struct TemplateRoomChatBubbleView_Previews: PreviewProvider {
     static let bubble = TemplateRoomChatBubble(
         id: "111",
-        senderAvatar: MockAvatarInput.example,
-        senderDisplayName: "Alice",
-        items: [.message(TemplateRoomChatBubbleMessageItem(id: "222", body: "Hello world! 🌎"))]
+        sender: MockTemplateRoomChatService.mockMessages[0].sender,
+        items: []
     )
     static var previews: some View {
         TemplateRoomChatBubbleView(bubble: bubble)
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
index 86cc7d21a..04aa5f0ba 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
@@ -1,4 +1,4 @@
-// 
+//
 // Copyright 2021 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,24 +16,30 @@
 
 import SwiftUI
 import Combine
-    
+
 @available(iOS 14, *)
 typealias TemplateRoomChatViewModelType = StateStoreViewModel<TemplateRoomChatViewState,
-                                                                 TemplateRoomChatStateAction,
-                                                                 TemplateRoomChatViewAction>
+                                                              TemplateRoomChatStateAction,
+                                                              TemplateRoomChatViewAction>
 
 @available(iOS 14, *)
 class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChatViewModelProtocol {
     
+    enum Constants {
+        static let maxTimeBeforeNewBubble: TimeInterval = 5*60
+    }
     // MARK: - Properties
     
     // MARK: Private
+    
     private let templateRoomChatService: TemplateRoomChatServiceProtocol
     
     // MARK: Public
+    
     var completion: ((TemplateRoomChatViewModelResult) -> Void)?
     
     // MARK: - Setup
+    
     init(templateRoomChatService: TemplateRoomChatServiceProtocol) {
         self.templateRoomChatService = templateRoomChatService
         super.init(initialViewState: Self.defaultState(templateRoomChatService: templateRoomChatService))
@@ -50,33 +56,39 @@ class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChat
     private static func defaultState(templateRoomChatService: TemplateRoomChatServiceProtocol) -> TemplateRoomChatViewState {
         let bubbles = makeBubbles(messages: templateRoomChatService.chatMessagesSubject.value)
         let bindings = TemplateRoomChatViewModelBindings(messageInput: "")
-        return TemplateRoomChatViewState(bubbles: bubbles, bindings: bindings)
+        return TemplateRoomChatViewState(roomName: templateRoomChatService.roomName, bubbles: bubbles, bindings: bindings)
     }
     
     private static func makeBubbles(messages: [TemplateRoomChatMessage]) -> [TemplateRoomChatBubble] {
         
         var bubbleOrder = [String]()
         var bubbleMap = [String:TemplateRoomChatBubble]()
+        
         messages.enumerated().forEach { i, message in
+            let messageItem = TemplateRoomChatBubbleItem(
+                id: message.id,
+                timestamp: message.timestamp,
+                content: .message(TemplateRoomChatBubbleMessageContent(body: message.body))
+            )
             if i > 0,
-                messages[i-1].sender.id == message.sender.id,
-                var existingBubble = bubbleMap[messages[i-1].id] {
-                let messageItem = TemplateRoomChatBubbleMessageItem(
+               let lastBubbleId = bubbleOrder.last,
+               var lastBubble = bubbleMap[lastBubbleId],
+               lastBubble.sender.id == message.sender.id,
+               let interveningTime =  lastBubble.items.last?.timestamp.timeIntervalSince(message.timestamp),
+               abs(interveningTime) < Constants.maxTimeBeforeNewBubble
+            {
+                let item = TemplateRoomChatBubbleItem(
                     id: message.id,
-                    body: message.body
+                    timestamp: message.timestamp,
+                    content: .message(TemplateRoomChatBubbleMessageContent(body: message.body))
                 )
-                existingBubble.items.append(.message(messageItem))
-                bubbleMap[existingBubble.id] = existingBubble
+                lastBubble.items.append(item)
+                bubbleMap[lastBubble.id] = lastBubble
             } else {
-                let messageItem = TemplateRoomChatBubbleMessageItem(
-                    id: message.id,
-                    body: message.body
-                )
                 let bubble = TemplateRoomChatBubble(
                     id: message.id,
-                    senderAvatar: message.sender.avatarData,
-                    senderDisplayName:  message.sender.displayName,
-                    items: [.message(messageItem)]
+                    sender: message.sender,
+                    items: [messageItem]
                 )
                 bubbleOrder.append(bubble.id)
                 bubbleMap[bubble.id] = bubble
@@ -86,26 +98,31 @@ class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChat
     }
     
     // MARK: - Public
+    
     override func process(viewAction: TemplateRoomChatViewAction) {
         switch viewAction {
         case .cancel:
             cancel()
         case .done:
             done()
+        case .sendMessage:
+            templateRoomChatService.send(message: state.bindings.messageInput)
+            dispatch(action: .clearMessageInput)
         }
     }
     
-    /**
-     A redux style reducer, all modifications to state happen here. Receives a state and a state action and produces a new state.
-     */
     override class func reducer(state: inout TemplateRoomChatViewState, action: TemplateRoomChatStateAction) {
         switch action {
+        case .clearMessageInput:
+            state.bindings.messageInput = ""
         case .updateBubbles(let bubbles):
             state.bubbles = bubbles
         }
         UILog.debug("[TemplateRoomChatViewModel] reducer with action \(action) produced state: \(state)")
     }
     
+    // MARK: - Private
+    
     private func done() {
         completion?(.done)
     }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinator.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinator.swift
index 315b9946b..cace1612f 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinator.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinator.swift
@@ -40,13 +40,14 @@ final class TemplateRoomListCoordinator: Coordinator {
     init(parameters: TemplateRoomListCoordinatorParameters) {
         self.parameters = parameters
         let viewModel = TemplateRoomListViewModel(templateRoomListService: TemplateRoomListService(session: parameters.session))
-        let view = TemplateRoomList(viewModel: viewModel)
+        let view = TemplateRoomList(viewModel: viewModel.context)
             .addDependency(AvatarService.instantiate(mediaManager: parameters.session.mediaManager))
         templateRoomListViewModel = viewModel
         templateRoomListHostingController = VectorHostingController(rootView: view)
     }
     
     // MARK: - Public
+    
     func start() {
         templateRoomListViewModel.completion = { [weak self] result in
             guard let self = self else { return }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewState.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewState.swift
index 31975d18f..38e9c5b38 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewState.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewState.swift
@@ -16,6 +16,6 @@
 
 import Foundation
 
-struct TemplateRoomListViewState {
+struct TemplateRoomListViewState: BindableState {
     var rooms: [TemplateRoomListRoom]
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/MatrixSDK/TemplateRoomListService.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/MatrixSDK/TemplateRoomListService.swift
index 6b74d321c..25c8bf567 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/MatrixSDK/TemplateRoomListService.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/MatrixSDK/TemplateRoomListService.swift
@@ -47,6 +47,6 @@ class TemplateRoomListService: TemplateRoomListServiceProtocol {
 fileprivate extension TemplateRoomListRoom {
     
     init(mxRoom: MXRoom) {
-        TemplateRoomListRoom(id: mxRoom.roomId, avatar: mxRoom.summary.avatar, displayName: mxRoom.summary.displayname)
+        self.init(id: mxRoom.roomId, avatar: mxRoom.avatarData, displayName: mxRoom.summary.displayname)
     }
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/Mock/MockTemplateRoomListScreenState.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/Mock/MockTemplateRoomListScreenState.swift
index c4461b9d8..207fa9408 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/Mock/MockTemplateRoomListScreenState.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/Mock/MockTemplateRoomListScreenState.swift
@@ -46,7 +46,7 @@ enum MockTemplateRoomListScreenState: MockScreenState, CaseIterable {
         
         // can simulate service and viewModel actions here if needs be.
         
-        return AnyView(TemplateRoomList(viewModel: viewModel)
+        return AnyView(TemplateRoomList(viewModel: viewModel.context)
                 .addDependency(MockAvatarService.example))
     }
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift
index 636171a06..b83ae40f3 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift
@@ -27,7 +27,7 @@ struct TemplateRoomList: View {
     
     // MARK: Public
     
-    @ObservedObject var viewModel: TemplateRoomListViewModel
+    @ObservedObject var viewModel: TemplateRoomListViewModelType.Context
     
     var body: some View {
         listContent
@@ -35,12 +35,12 @@ struct TemplateRoomList: View {
             .toolbar {
                 ToolbarItem(placement: .primaryAction) {
                     Button(VectorL10n.done) {
-                        viewModel.process(viewAction: .cancel)
+                        viewModel.send(viewAction: .cancel)
                     }
                 }
                 ToolbarItem(placement: .cancellationAction) {
                     Button(VectorL10n.cancel) {
-                        viewModel.process(viewAction: .cancel)
+                        viewModel.send(viewAction: .cancel)
                     }
                 }
             }
@@ -66,6 +66,8 @@ struct TemplateRoomList: View {
 @available(iOS 14.0, *)
 struct TemplateRoomList_Previews: PreviewProvider {
     static var previews: some View {
-        MockTemplateRoomListScreenState.screenGroup(addNavigation: true)
+        MockTemplateRoomListScreenState
+            .screenGroup(themeId: .dark, addNavigation: true)
+        
     }
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomListRow.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomListRow.swift
index c173ab122..c0a89e5f5 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomListRow.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomListRow.swift
@@ -34,6 +34,7 @@ struct TemplateRoomListRow: View {
         HStack{
             AvatarImage(avatarData: avatar, size: .medium)
             Text(displayName ?? "")
+                .foregroundColor(theme.colors.primaryContent)
             Spacer()
         }
         //add to a style
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift
index dc7430b6e..9735c4f84 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift
@@ -17,24 +17,29 @@
 import SwiftUI
 import Combine
     
+@available(iOS 14, *)
+typealias TemplateRoomListViewModelType = StateStoreViewModel<TemplateRoomListViewState,
+                                                              TemplateRoomListStateAction,
+                                                              TemplateRoomListViewAction>
 @available(iOS 14.0, *)
-class TemplateRoomListViewModel: ObservableObject, TemplateRoomListViewModelProtocol {
+class TemplateRoomListViewModel: TemplateRoomListViewModelType, TemplateRoomListViewModelProtocol {
     
     // MARK: - Properties
     
     // MARK: Private
+    
     private let templateRoomListService: TemplateRoomListServiceProtocol
-    private var cancellables = Set<AnyCancellable>()
     
     // MARK: Public
-    @Published private(set) var viewState: TemplateRoomListViewState
     
     var completion: ((TemplateRoomListViewModelResult) -> Void)?
     
     // MARK: - Setup
-    init(templateRoomListService: TemplateRoomListServiceProtocol, initialState: TemplateRoomListViewState? = nil) {
+    
+    init(templateRoomListService: TemplateRoomListServiceProtocol) {
         self.templateRoomListService = templateRoomListService
-        self.viewState = initialState ?? Self.defaultState(templateRoomListService: templateRoomListService)
+        
+        super.init(initialViewState: Self.defaultState(templateRoomListService: templateRoomListService))
         
         templateRoomListService.roomsSubject
             .map(TemplateRoomListStateAction.updateRooms)
@@ -50,7 +55,8 @@ class TemplateRoomListViewModel: ObservableObject, TemplateRoomListViewModelProt
     }
     
     // MARK: - Public
-    func process(viewAction: TemplateRoomListViewAction) {
+    
+    override func process(viewAction: TemplateRoomListViewAction) {
         switch viewAction {
         case .cancel:
             cancel()
@@ -59,18 +65,7 @@ class TemplateRoomListViewModel: ObservableObject, TemplateRoomListViewModelProt
         }
     }
     
-    // MARK: - Private
-    /**
-     Send state actions to mutate the state.
-     */
-    private func dispatch(action: TemplateRoomListStateAction) {
-        Self.reducer(state: &self.viewState, action: action)
-    }
-    
-    /**
-     A redux style reducer, all modifications to state happen here. Receives a state and a state action and produces a new state.
-     */
-    private static func reducer(state: inout TemplateRoomListViewState, action: TemplateRoomListStateAction) {
+    override class func reducer(state: inout TemplateRoomListViewState, action: TemplateRoomListStateAction) {
         switch action {
         case .updateRooms(let rooms):
             state.rooms = rooms
@@ -78,6 +73,8 @@ class TemplateRoomListViewModel: ObservableObject, TemplateRoomListViewModelProt
         UILog.debug("[TemplateRoomListViewModel] reducer with action \(action) produced state: \(state)")
     }
     
+    // MARK: - Private
+    
     private func done() {
         completion?(.done)
     }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModelProtocol.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModelProtocol.swift
index a64e790e8..f051849bf 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModelProtocol.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModelProtocol.swift
@@ -18,4 +18,6 @@ import Foundation
 
 protocol TemplateRoomListViewModelProtocol {
     var completion: ((TemplateRoomListViewModelResult) -> Void)? { get set }
+    @available(iOS 14, *)
+    var context: TemplateRoomListViewModelType.Context { get }
 }

From 39adf6027d677c20a439fa1bc77133559716eaab Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Thu, 16 Sep 2021 23:48:59 +0100
Subject: [PATCH 13/59] Improve scrolling behaviour and add name colors

---
 .../Theme/ThemeNamesColorsExtension.swift     | 27 +++++++++++++++
 .../MatrixSDK/TemplateRoomChatService.swift   |  2 --
 .../View/TemplateRoomChat.swift               | 33 ++++++++++++++++---
 .../View/TemplateRoomChatBubbleMessage.swift  |  1 +
 .../View/TemplateRoomChatBubbleView.swift     |  4 +--
 .../ViewModel/TemplateRoomChatViewModel.swift | 18 ++++++----
 RiotSwiftUI/target.yml                        |  2 ++
 7 files changed, 72 insertions(+), 15 deletions(-)
 create mode 100644 RiotSwiftUI/Modules/Common/Theme/ThemeNamesColorsExtension.swift

diff --git a/RiotSwiftUI/Modules/Common/Theme/ThemeNamesColorsExtension.swift b/RiotSwiftUI/Modules/Common/Theme/ThemeNamesColorsExtension.swift
new file mode 100644
index 000000000..3cdae85a1
--- /dev/null
+++ b/RiotSwiftUI/Modules/Common/Theme/ThemeNamesColorsExtension.swift
@@ -0,0 +1,27 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+import SwiftUI
+
+@available(iOS 14.0, *)
+extension ThemeSwiftUI {
+    
+    func displayNameColor(for userId: String) -> Color {
+        let senderNameColorIndex = Int(userId.vc_hashCode % Int32(colors.namesAndAvatars.count))
+        return colors.namesAndAvatars[senderNameColorIndex]
+    }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift
index 68498f853..fcc4ce70b 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift
@@ -35,7 +35,6 @@ class TemplateRoomChatService: TemplateRoomChatServiceProtocol {
     private let eventFormatter: EventFormatter
     private var roomState: MXRoomState?
     private var roomListenerReference: Any?
-    private var usernameColorGenerator: UserNameColorGenerator()
     
     // MARK: Public
     private(set) var chatMessagesSubject: CurrentValueSubject<[TemplateRoomChatMessage], Never>
@@ -47,7 +46,6 @@ class TemplateRoomChatService: TemplateRoomChatServiceProtocol {
     // MARK: - Setup
     
     init(room: MXRoom) {
-        )
         self.room = room
         self.eventFormatter = EventFormatter(matrixSession: room.mxSession)
         self.chatMessagesSubject = CurrentValueSubject([])
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
index 30b013f79..695b47f7f 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
@@ -37,13 +37,27 @@ struct TemplateRoomChat: View {
                 }
                 .frame(maxHeight: .infinity)
             } else {
-                ScrollView{
-                    LazyVStack {
-                        ForEach(viewModel.viewState.bubbles) { bubble in
-                            TemplateRoomChatBubbleView(bubble: bubble)
+                ScrollViewReader { reader in
+                    ScrollView{
+                        LazyVStack {
+                            ForEach(viewModel.viewState.bubbles) { bubble in
+                                TemplateRoomChatBubbleView(bubble: bubble)
+                                    .id(bubble.id)
+                            }
                         }
+                        .onAppear {
+                            // Start at the bottom
+                            reader.scrollTo(viewModel.viewState.bubbles.last?.id, anchor: .bottom)
+                        }
+                        .onChange(of: itemCount) { _ in
+                            // When new items are added animate to the new items
+                            withAnimation {
+                                reader.scrollTo(viewModel.viewState.bubbles.last?.id, anchor: .bottom)
+                            }
+                        }
+                        // When the scroll content takes less than the screen space align at the top
+                        .frame(maxHeight: .infinity, alignment: .top)
                     }
-                    .frame(maxHeight: .infinity, alignment: .top)
                 }
                 .frame(maxHeight: .infinity)
             }
@@ -59,6 +73,7 @@ struct TemplateRoomChat: View {
                     })
                 }
             }
+            // When displaying/hiding the send button slide it on/off from the right side
             .animation(.easeOut(duration: 0.25))
             .transition(.move(edge: .trailing))
             .padding(.horizontal)
@@ -78,6 +93,14 @@ struct TemplateRoomChat: View {
             }
         }
     }
+    
+    private var itemCount: Int {
+        return viewModel.viewState
+            .bubbles
+            .map(\.items)
+            .map(\.count)
+            .reduce(0, +)
+    }
 }
 
 // MARK: - Previews
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleMessage.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleMessage.swift
index 2082688e2..7c8f59393 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleMessage.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleMessage.swift
@@ -32,6 +32,7 @@ struct TemplateRoomChatBubbleMessage: View {
     var body: some View {
         Text(messageContent.body)
             .foregroundColor(theme.colors.primaryContent)
+            .font(theme.fonts.body)
     }
 }
 
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleView.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleView.swift
index 121e8227e..08a8ed47a 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleView.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleView.swift
@@ -34,12 +34,12 @@ struct TemplateRoomChatBubbleView: View {
             AvatarImage(avatarData: bubble.sender.avatarData, size: .xSmall)
             VStack(alignment: .leading){
                 Text(bubble.sender.displayName ?? "")
-                    .foregroundColor(theme.colors.primaryContent)
+                    .foregroundColor(theme.displayNameColor(for: bubble.sender.id))
+                    .font(theme.fonts.bodySB)
                 ForEach(bubble.items) { item in
                     TemplateRoomChatBubbleContentView(bubbleItem: item)
                 }
             }
-            
             Spacer()
         }
         //add to a style
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
index 04aa5f0ba..9f77cf594 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
@@ -43,14 +43,16 @@ class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChat
     init(templateRoomChatService: TemplateRoomChatServiceProtocol) {
         self.templateRoomChatService = templateRoomChatService
         super.init(initialViewState: Self.defaultState(templateRoomChatService: templateRoomChatService))
-        templateRoomChatService.chatMessagesSubject
+        setupMessageObserving()
+    }
+    
+    private func setupMessageObserving() {
+        let messageActionPublisher = templateRoomChatService
+            .chatMessagesSubject
             .map(Self.makeBubbles(messages:))
             .map(TemplateRoomChatStateAction.updateBubbles)
-            .receive(on: DispatchQueue.main)
-            .sink(receiveValue: { [weak self] action in
-                self?.dispatch(action:action)
-            })
-            .store(in: &cancellables)
+            .eraseToAnyPublisher()
+        dispatch(actionPublisher: messageActionPublisher)
     }
     
     private static func defaultState(templateRoomChatService: TemplateRoomChatServiceProtocol) -> TemplateRoomChatViewState {
@@ -65,6 +67,7 @@ class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChat
         var bubbleMap = [String:TemplateRoomChatBubble]()
         
         messages.enumerated().forEach { i, message in
+            // New message content
             let messageItem = TemplateRoomChatBubbleItem(
                 id: message.id,
                 timestamp: message.timestamp,
@@ -77,6 +80,8 @@ class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChat
                let interveningTime =  lastBubble.items.last?.timestamp.timeIntervalSince(message.timestamp),
                abs(interveningTime) < Constants.maxTimeBeforeNewBubble
             {
+                // if the last bubble's last message was within
+                // the last 5 minutes append
                 let item = TemplateRoomChatBubbleItem(
                     id: message.id,
                     timestamp: message.timestamp,
@@ -85,6 +90,7 @@ class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChat
                 lastBubble.items.append(item)
                 bubbleMap[lastBubble.id] = lastBubble
             } else {
+                // else create a new bubble and add the message as the first item
                 let bubble = TemplateRoomChatBubble(
                     id: message.id,
                     sender: message.sender,
diff --git a/RiotSwiftUI/target.yml b/RiotSwiftUI/target.yml
index a685db564..5200f73ca 100644
--- a/RiotSwiftUI/target.yml
+++ b/RiotSwiftUI/target.yml
@@ -36,6 +36,8 @@ targets:
     - path: ../Riot/Generated/Images.swift
     - path: ../Riot/Managers/Theme/ThemeIdentifier.swift
     - path: ../Riot/Managers/Locale/LocaleProviderType.swift
+    - path: ../Riot/Categories/String.swift
+    - path: ../Riot/Categories/Character.swift
     - path: ../Riot/Assets/en.lproj/Vector.strings
       buildPhase: resources
     - path: ../Riot/Assets/Images.xcassets

From 40dc5533ce627af54b546dc422a723a27d0d1643 Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Fri, 17 Sep 2021 10:46:40 +0100
Subject: [PATCH 14/59] Add Flow coordinator and hook up screens.

---
 .../TemplateRoomsCoordinator.swift            | 113 ++++++++++++++++++
 .../TemplateRoomsCoordinatorParameters.swift  |  35 ++++++
 .../TemplateRoomChatCoordinator.swift         |   4 +-
 .../Model/TemplateRoomChatViewAction.swift    |   1 -
 .../TemplateRoomChatViewModelResult.swift     |   1 -
 .../View/TemplateRoomChat.swift               |  22 ++--
 .../ViewModel/TemplateRoomChatViewModel.swift |   6 -
 .../TemplateRoomListCoordinator.swift         |  10 +-
 .../TemplateRoomListCoordinatorResult.swift   |  22 ++++
 .../Model/TemplateRoomListViewAction.swift    |   2 +-
 .../TemplateRoomListViewModelResult.swift     |   2 +-
 .../MatrixSDK/TemplateRoomListService.swift   |   5 -
 .../View/TemplateRoomList.swift               |  23 ++--
 .../ViewModel/TemplateRoomListViewModel.swift |   8 +-
 14 files changed, 209 insertions(+), 45 deletions(-)
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/Coordinator/TemplateRoomsCoordinator.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/Coordinator/TemplateRoomsCoordinatorParameters.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinatorResult.swift

diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/Coordinator/TemplateRoomsCoordinator.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/Coordinator/TemplateRoomsCoordinator.swift
new file mode 100644
index 000000000..048e4bc6e
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/Coordinator/TemplateRoomsCoordinator.swift
@@ -0,0 +1,113 @@
+// File created from FlowTemplate
+// $ createRootCoordinator.sh TemplateRoomsCoordinator TemplateRooms
+/*
+ Copyright 2021 New Vector Ltd
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+import UIKit
+
+@objcMembers
+final class TemplateRoomsCoordinator: Coordinator {
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    private let parameters: TemplateRoomsCoordinatorParameters
+    
+    private var navigationRouter: NavigationRouterType {
+        return self.parameters.navigationRouter
+    }
+    
+    // MARK: Public
+    
+    // Must be used only internally
+    var childCoordinators: [Coordinator] = []
+    
+    var completion: (() -> Void)?
+    
+    // MARK: - Setup
+    
+    init(parameters: TemplateRoomsCoordinatorParameters) {
+        self.parameters = parameters
+    }    
+    
+    // MARK: - Public
+    
+    
+    func start() {
+        if #available(iOS 14.0, *) {
+            let rootCoordinator = self.createTemplateRoomListCoordinator()
+            rootCoordinator.start()
+            
+            self.add(childCoordinator: rootCoordinator)
+            
+            if self.navigationRouter.modules.isEmpty == false {
+                self.navigationRouter.push(rootCoordinator, animated: true, popCompletion: { [weak self] in
+                    self?.remove(childCoordinator: rootCoordinator)
+                })
+            } else {
+                self.navigationRouter.setRootModule(rootCoordinator) { [weak self] in
+                    self?.remove(childCoordinator: rootCoordinator)
+                }
+            }
+        }
+    }
+    
+    func toPresentable() -> UIViewController {
+        return self.navigationRouter.toPresentable()
+    }
+    
+    // MARK: - Private
+    
+    @available(iOS 14.0, *)
+    private func createTemplateRoomListCoordinator() -> TemplateRoomListCoordinator {
+        let coordinator: TemplateRoomListCoordinator = TemplateRoomListCoordinator(parameters: TemplateRoomListCoordinatorParameters(session: parameters.session))
+        
+        coordinator.completion = { [weak self] result in
+            guard let self = self else { return }
+            switch result {
+            case .didSelectRoom(let roomId):
+                self.showTemplateRoomChat(roomId: roomId)
+            case .done:
+                self.completion?()
+            }
+        }
+        return coordinator
+    }
+    
+    @available(iOS 14.0, *)
+    private func createTemplateRoomChatCoordinator(room: MXRoom) -> TemplateRoomChatCoordinator {
+        let coordinator: TemplateRoomChatCoordinator = TemplateRoomChatCoordinator(parameters: TemplateRoomChatCoordinatorParameters(room: room))
+        return coordinator
+    }
+    
+    @available(iOS 14.0, *)
+    func showTemplateRoomChat(roomId: String) {
+        guard let room = parameters.session.room(withRoomId: roomId) else {
+            MXLog.error("[TemplateRoomsCoordinator] Failed to find room by selected Id.")
+            return
+        }
+        let templateRoomChatCoordinator = createTemplateRoomChatCoordinator(room: room)
+        
+        add(childCoordinator: templateRoomChatCoordinator)
+        
+        self.navigationRouter.push(templateRoomChatCoordinator, animated: true, popCompletion: { [weak self] in
+            self?.remove(childCoordinator: templateRoomChatCoordinator)
+        })
+        
+        templateRoomChatCoordinator.start()
+    }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/Coordinator/TemplateRoomsCoordinatorParameters.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/Coordinator/TemplateRoomsCoordinatorParameters.swift
new file mode 100644
index 000000000..8454b3ee2
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/Coordinator/TemplateRoomsCoordinatorParameters.swift
@@ -0,0 +1,35 @@
+// File created from FlowTemplate
+// $ createRootCoordinator.sh TemplateRoomsCoordinator TemplateRooms
+/*
+ Copyright 2021 New Vector Ltd
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+import Foundation
+
+/// TemplateRoomsCoordinator input parameters
+struct TemplateRoomsCoordinatorParameters {
+    
+    /// The Matrix session
+    let session: MXSession
+                
+    /// The navigation router that manage physical navigation
+    let navigationRouter: NavigationRouterType
+    
+    init(session: MXSession,
+         navigationRouter: NavigationRouterType? = nil) {
+        self.session = session
+        self.navigationRouter = navigationRouter ?? NavigationRouter(navigationController: RiotNavigationController())
+    }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinator.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinator.swift
index 6faf18f15..d7be94f7c 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinator.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinator.swift
@@ -18,7 +18,7 @@ import Foundation
 import UIKit
 import SwiftUI
 
-final class TemplateRoomChatCoordinator: Coordinator {
+final class TemplateRoomChatCoordinator: Coordinator, Presentable {
     
     // MARK: - Properties
     
@@ -51,7 +51,7 @@ final class TemplateRoomChatCoordinator: Coordinator {
         templateRoomChatViewModel.completion = { [weak self] result in
             guard let self = self else { return }
             switch result {
-            case .cancel, .done:
+            case .done:
                 self.completion?()
             break
             }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewAction.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewAction.swift
index 7e9020e1c..013d52bd1 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewAction.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewAction.swift
@@ -18,6 +18,5 @@ import Foundation
 
 enum TemplateRoomChatViewAction {
     case sendMessage
-    case cancel
     case done
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelResult.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelResult.swift
index 1d62dab22..eaf549c5b 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelResult.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelResult.swift
@@ -17,6 +17,5 @@
 import Foundation
 
 enum TemplateRoomChatViewModelResult {
-    case cancel
     case done
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
index 695b47f7f..d1f7e6122 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
@@ -28,6 +28,7 @@ struct TemplateRoomChat: View {
     // MARK: Public
     
     @ObservedObject var viewModel: TemplateRoomChatViewModel.Context
+    var presentedModally = false
     
     var body: some View {
         VStack {
@@ -76,24 +77,27 @@ struct TemplateRoomChat: View {
             // When displaying/hiding the send button slide it on/off from the right side
             .animation(.easeOut(duration: 0.25))
             .transition(.move(edge: .trailing))
-            .padding(.horizontal)
+            .padding()
             
         }
         .navigationTitle(viewModel.viewState.roomName ?? "Chat")
         .toolbar {
             ToolbarItem(placement: .primaryAction) {
-                Button(VectorL10n.done) {
-                    viewModel.send(viewAction: .cancel)
-                }
-            }
-            ToolbarItem(placement: .cancellationAction) {
-                Button(VectorL10n.cancel) {
-                    viewModel.send(viewAction: .cancel)
-                }
+                trailingToolBarButton
             }
         }
     }
     
+    @ViewBuilder
+    private var trailingToolBarButton: some View {
+        if presentedModally {
+            Button(VectorL10n.done) {
+                viewModel.send(viewAction: .done)
+            }
+        }
+    }
+    
+    
     private var itemCount: Int {
         return viewModel.viewState
             .bubbles
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
index 9f77cf594..7feeae5ed 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
@@ -107,8 +107,6 @@ class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChat
     
     override func process(viewAction: TemplateRoomChatViewAction) {
         switch viewAction {
-        case .cancel:
-            cancel()
         case .done:
             done()
         case .sendMessage:
@@ -132,8 +130,4 @@ class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChat
     private func done() {
         completion?(.done)
     }
-    
-    private func cancel() {
-        completion?(.cancel)
-    }
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinator.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinator.swift
index cace1612f..09dbd9539 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinator.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinator.swift
@@ -18,7 +18,7 @@ import Foundation
 import UIKit
 import SwiftUI
 
-final class TemplateRoomListCoordinator: Coordinator {
+final class TemplateRoomListCoordinator: Coordinator, Presentable {
     
     // MARK: - Properties
     
@@ -32,7 +32,7 @@ final class TemplateRoomListCoordinator: Coordinator {
 
     // Must be used only internally
     var childCoordinators: [Coordinator] = []
-    var completion: (() -> Void)?
+    var completion: ((TemplateRoomListCoordinatorResult) -> Void)?
     
     // MARK: - Setup
     
@@ -52,8 +52,10 @@ final class TemplateRoomListCoordinator: Coordinator {
         templateRoomListViewModel.completion = { [weak self] result in
             guard let self = self else { return }
             switch result {
-            case .cancel, .done:
-                self.completion?()
+            case .didSelectRoom(let roomId):
+                self.completion?(.didSelectRoom(roomId))
+            case .done:
+                self.completion?(.done)
             break
             }
         }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinatorResult.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinatorResult.swift
new file mode 100644
index 000000000..5f6f9e3cd
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinatorResult.swift
@@ -0,0 +1,22 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+enum TemplateRoomListCoordinatorResult {
+    case didSelectRoom(String)
+    case done
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewAction.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewAction.swift
index d83f14bd4..594383d23 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewAction.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewAction.swift
@@ -17,6 +17,6 @@
 import Foundation
 
 enum TemplateRoomListViewAction {
-    case cancel
     case done
+    case didSelectRoom(String)
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewModelResult.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewModelResult.swift
index 5b4ac0ead..1a7ea8347 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewModelResult.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewModelResult.swift
@@ -17,6 +17,6 @@
 import Foundation
 
 enum TemplateRoomListViewModelResult {
-    case cancel
+    case didSelectRoom(String)
     case done
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/MatrixSDK/TemplateRoomListService.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/MatrixSDK/TemplateRoomListService.swift
index 25c8bf567..ce9b33b32 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/MatrixSDK/TemplateRoomListService.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/MatrixSDK/TemplateRoomListService.swift
@@ -35,11 +35,6 @@ class TemplateRoomListService: TemplateRoomListServiceProtocol {
     init(session: MXSession) {
         self.session = session
         self.roomsSubject = CurrentValueSubject(session.rooms.map(TemplateRoomListRoom.init(mxRoom:)))
-//        self.listenerReference = setupPresenceListener()
-    }
-
-    deinit {
-//        guard let reference = listenerReference else { return }
     }
 
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift
index b83ae40f3..ef71923fd 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift
@@ -35,12 +35,7 @@ struct TemplateRoomList: View {
             .toolbar {
                 ToolbarItem(placement: .primaryAction) {
                     Button(VectorL10n.done) {
-                        viewModel.send(viewAction: .cancel)
-                    }
-                }
-                ToolbarItem(placement: .cancellationAction) {
-                    Button(VectorL10n.cancel) {
-                        viewModel.send(viewAction: .cancel)
+                        viewModel.send(viewAction: .done)
                     }
                 }
             }
@@ -51,12 +46,18 @@ struct TemplateRoomList: View {
         if viewModel.viewState.rooms.isEmpty {
             Text("No Rooms")
         } else {
-            LazyVStack(spacing: 0) {
-                ForEach(viewModel.viewState.rooms) { room in
-                    TemplateRoomListRow(avatar: room.avatar, displayName: room.displayName)
+            ScrollView{
+                LazyVStack(spacing: 0) {
+                    ForEach(viewModel.viewState.rooms) { room in
+                        Button {
+                            viewModel.send(viewAction: .didSelectRoom(room.id))
+                        } label: {
+                            TemplateRoomListRow(avatar: room.avatar, displayName: room.displayName)
+                        }
+                    }
                 }
+                .frame(maxHeight: .infinity, alignment: .top)
             }
-            .frame(maxHeight: .infinity, alignment: .top)
         }
     }
 }
@@ -67,7 +68,7 @@ struct TemplateRoomList: View {
 struct TemplateRoomList_Previews: PreviewProvider {
     static var previews: some View {
         MockTemplateRoomListScreenState
-            .screenGroup(themeId: .dark, addNavigation: true)
+            .screenGroup(addNavigation: true)
         
     }
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift
index 9735c4f84..8c709d834 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift
@@ -58,8 +58,8 @@ class TemplateRoomListViewModel: TemplateRoomListViewModelType, TemplateRoomList
     
     override func process(viewAction: TemplateRoomListViewAction) {
         switch viewAction {
-        case .cancel:
-            cancel()
+        case .didSelectRoom(let roomId):
+            didSelect(by: roomId)
         case .done:
             done()
         }
@@ -79,7 +79,7 @@ class TemplateRoomListViewModel: TemplateRoomListViewModelType, TemplateRoomList
         completion?(.done)
     }
     
-    private func cancel() {
-        completion?(.cancel)
+    private func didSelect(by roomId: String) {
+        completion?(.didSelectRoom(roomId))
     }
 }

From a21d3bfb518a97e65d67ac11b09ae94f62d6641a Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Mon, 20 Sep 2021 08:47:28 +0100
Subject: [PATCH 15/59] Cleanup, documentation and ui tests.

---
 Riot/Modules/Room/RoomViewController.xib      | 12 +--
 .../Modules/Common/Mock/MockAppScreens.swift  |  6 +-
 .../Modules/Common/Mock/MockScreenState.swift | 44 +++++++----
 .../Modules/Common/Mock/ScreenList.swift      |  6 +-
 .../StateStorePublisherExtensions.swift       | 26 -------
 .../Theme/ThemeNamesColorsExtension.swift     |  3 +
 .../TemplateRoomsCoordinator.swift            |  8 +-
 .../TemplateRoomChatCoordinator.swift         |  8 +-
 .../Model/TemplateRoomChatBubble.swift        | 26 +++++++
 .../TemplateRoomChatBubbleImageContent.swift  | 22 ++++++
 .../Model/TemplateRoomChatBubbleItem.swift    | 21 +-----
 ...> TemplateRoomChatBubbleItemContent.swift} |  4 +-
 ...oom.swift => TemplateRoomChatMember.swift} | 10 +--
 .../Model/TemplateRoomChatMessage.swift       | 27 +++++++
 .../TemplateRoomChatMessageContent.swift      | 23 ++++++
 .../TemplateRoomChatMessageTextContent.swift  | 22 ++++++
 ...lateRoomChatRoomInitializationStatus.swift | 23 ++++++
 .../Model/TemplateRoomChatStateAction.swift   |  4 +-
 .../Model/TemplateRoomChatViewAction.swift    |  1 +
 .../TemplateRoomChatViewModelAction.swift     | 22 ++++++
 .../TemplateRoomChatViewModelInput.swift      |  1 +
 .../Model/TemplateRoomChatViewState.swift     |  2 +
 .../MatrixSDK/TemplateRoomChatService.swift   | 30 ++++----
 .../MockTemplateRoomChatScreenState.swift     | 19 +++--
 .../Mock/MockTemplateRoomChatService.swift    | 19 +++--
 .../TemplateRoomChatServiceProtocol.swift     |  3 +-
 .../Test/UI/TemplateRoomChatUITests.swift     | 44 ++++++++---
 .../View/TemplateRoomChat.swift               | 74 +++++++++++--------
 .../TemplateRoomChatBubbleContentView.swift   | 11 ++-
 .../View/TemplateRoomChatBubbleImage.swift    |  3 +-
 .../View/TemplateRoomChatBubbleMessage.swift  |  3 +-
 .../View/TemplateRoomChatBubbleView.swift     |  1 +
 .../ViewModel/TemplateRoomChatViewModel.swift | 24 ++++--
 .../TemplateRoomChatViewModelProtocol.swift   |  2 +-
 .../TemplateRoomListCoordinator.swift         | 10 ++-
 ...> TemplateRoomListCoordinatorAction.swift} |  3 +-
 .../Model/TemplateRoomListStateAction.swift   |  1 +
 .../Model/TemplateRoomListViewAction.swift    |  1 +
 .../TemplateRoomListViewModelAction.swift}    |  3 +-
 .../Model/TemplateRoomListViewState.swift     |  1 +
 .../Test/UI/TemplateRoomListUITests.swift     | 23 +++---
 .../View/TemplateRoomList.swift               |  1 +
 .../View/TemplateRoomListRow.swift            |  1 +
 .../ViewModel/TemplateRoomListViewModel.swift |  6 +-
 .../TemplateRoomListViewModelProtocol.swift   |  2 +-
 RiotSwiftUI/targetUITests.yml                 |  2 +
 46 files changed, 414 insertions(+), 194 deletions(-)
 delete mode 100644 RiotSwiftUI/Modules/Common/StateStore/StateStorePublisherExtensions.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubble.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleImageContent.swift
 rename RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/{TemplateRoomChatViewModelResult.swift => TemplateRoomChatBubbleItemContent.swift} (87%)
 rename RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/{TemplateRoomChatRoom.swift => TemplateRoomChatMember.swift} (83%)
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessage.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageContent.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageTextContent.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatRoomInitializationStatus.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelAction.swift
 rename RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/{TemplateRoomListViewModelResult.swift => TemplateRoomListCoordinatorAction.swift} (88%)
 rename RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/{Coordinator/TemplateRoomListCoordinatorResult.swift => Model/TemplateRoomListViewModelAction.swift} (87%)

diff --git a/Riot/Modules/Room/RoomViewController.xib b/Riot/Modules/Room/RoomViewController.xib
index 8483c4fd6..5b1a0a909 100644
--- a/Riot/Modules/Room/RoomViewController.xib
+++ b/Riot/Modules/Room/RoomViewController.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -136,14 +136,14 @@
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                 </stackView>
                 <button opaque="NO" alpha="0.0" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ih9-EU-BOU" userLabel="scroll Button">
-                    <rect key="frame" x="321" y="564" width="38" height="38"/>
+                    <rect key="frame" x="327" y="570" width="32" height="32"/>
                     <state key="normal" image="scrolldown"/>
                     <connections>
                         <action selector="scrollToBottomAction:" destination="-1" eventType="touchUpInside" id="TOf-aY-J6a"/>
                     </connections>
                 </button>
                 <label opaque="NO" userInteractionEnabled="NO" alpha="0.0" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QHs-rM-UU8" userLabel="scroll badge" customClass="BadgeLabel" customModule="Riot" customModuleProvider="target">
-                    <rect key="frame" x="336.5" y="557.5" width="7.5" height="13.5"/>
+                    <rect key="frame" x="334.5" y="562" width="17.5" height="16.5"/>
                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="11"/>
                     <nil key="textColor"/>
                     <nil key="highlightedColor"/>
@@ -212,13 +212,13 @@
     </objects>
     <designables>
         <designable name="QHs-rM-UU8">
-            <size key="intrinsicContentSize" width="7.5" height="13.5"/>
+            <size key="intrinsicContentSize" width="17.5" height="16.5"/>
         </designable>
     </designables>
     <resources>
         <image name="new_close" width="16" height="16"/>
         <image name="room_scroll_up" width="24" height="24"/>
-        <image name="scrolldown" width="38" height="38"/>
+        <image name="scrolldown" width="32" height="32"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
diff --git a/RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift b/RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
index e028c5fb1..38022e7b8 100644
--- a/RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
+++ b/RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
@@ -19,6 +19,10 @@ import Foundation
 /// The static list of mocked screens in RiotSwiftUI
 @available(iOS 14.0, *)
 enum MockAppScreens {
-    static let appScreens = [MockTemplateUserProfileScreenState.self]
+    static let appScreens: [MockScreenState.Type] = [
+        MockTemplateUserProfileScreenState.self,
+        MockTemplateRoomListScreenState.self,
+        MockTemplateRoomChatScreenState.self
+    ]
 }
 
diff --git a/RiotSwiftUI/Modules/Common/Mock/MockScreenState.swift b/RiotSwiftUI/Modules/Common/Mock/MockScreenState.swift
index 651dbf83a..9a8a36ba2 100644
--- a/RiotSwiftUI/Modules/Common/Mock/MockScreenState.swift
+++ b/RiotSwiftUI/Modules/Common/Mock/MockScreenState.swift
@@ -35,15 +35,18 @@ extension MockScreenState {
     
     /// A unique key to identify each screen state.
     static var screenStateKeys: [String] {
-        return Array(0..<screenStates.count).map(String.init)
+        return screenStates.enumerated().map { (index, state) in
+            state.screenName + String(index)
+        }
     }
     
     /// Render each of the screen states in a group applying
     /// any optional environment variables.
     /// - Parameters:
-    ///   - themeId: id of theme to render the screens with
-    ///   - locale: Locale to render the screens with
-    ///   - sizeCategory: type sizeCategory to render the screens with
+    ///   - themeId: id of theme to render the screens with.
+    ///   - locale: Locale to render the screens with.
+    ///   - sizeCategory: type sizeCategory to render the screens with.
+    ///   - addNavigation: Wether to wrap the screens in a navigation view.
     /// - Returns: The group of screens
     static func screenGroup(
         themeId: ThemeIdentifier = .light,
@@ -52,14 +55,9 @@ extension MockScreenState {
         addNavigation: Bool = false
     ) -> some View {
         Group {
-            ForEach(0..<screensViews.count) { index in
-                if addNavigation {
-                    NavigationView{
-                        screensViews[index]
-                    }
-                } else {
-                    screensViews[index]
-                }
+            ForEach(0..<screensViews.count) { i in
+                wrapWithNavigation(addNavigation, view: screensViews[i])
+                    .previewDisplayName(screenStates[i].stateTitle)
             }
         }
         .theme(themeId)
@@ -67,15 +65,33 @@ extension MockScreenState {
         .environment(\.sizeCategory, sizeCategory)
     }
     
+    @ViewBuilder
+    static func wrapWithNavigation<V: View>(_ wrap: Bool, view: V) -> some View {
+        if wrap {
+            NavigationView{
+                view
+            }
+        } else {
+            view
+        }
+    }
+
     /// A title to represent the screen and it's screen state
-    var screenTitle: String {
-        "\(String(describing: screenType.self)): \(stateTitle)"
+    var screenName: String {
+        "\(String(describing: screenType.self))"
     }
     
     /// A title to represent this screen state
     var stateTitle: String {
         String(describing: self)
     }
+    
+    /// A title to represent the screen and it's screen state
+    var fullScreenTitle: String {
+        "\(screenName): \(stateTitle)"
+    }
+    
+
 }
 
 @available(iOS 14.0, *)
diff --git a/RiotSwiftUI/Modules/Common/Mock/ScreenList.swift b/RiotSwiftUI/Modules/Common/Mock/ScreenList.swift
index 973ab530b..88847c790 100644
--- a/RiotSwiftUI/Modules/Common/Mock/ScreenList.swift
+++ b/RiotSwiftUI/Modules/Common/Mock/ScreenList.swift
@@ -20,9 +20,11 @@ import SwiftUI
 struct ScreenList: View {
     
     private var allStates: [MockScreenState]
+    private var allKeys: [String]
     
     init(screens: [MockScreenState.Type]) {
         self.allStates = screens.flatMap{ $0.screenStates }
+        self.allKeys = screens.flatMap{ $0.screenStateKeys }
     }
     
     var body: some View {
@@ -31,8 +33,8 @@ struct ScreenList: View {
                 ForEach(0..<allStates.count) { i in
                     let state = allStates[i]
                     NavigationLink(destination: state.screenView) {
-                        Text(state.screenTitle)
-                            .accessibilityIdentifier(String(i))
+                        Text(state.fullScreenTitle)
+                            .accessibilityIdentifier(allKeys[i])
                     }
                 }
             }
diff --git a/RiotSwiftUI/Modules/Common/StateStore/StateStorePublisherExtensions.swift b/RiotSwiftUI/Modules/Common/StateStore/StateStorePublisherExtensions.swift
deleted file mode 100644
index a5332c1fc..000000000
--- a/RiotSwiftUI/Modules/Common/StateStore/StateStorePublisherExtensions.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-import Foundation
-import Combine
-
-@available(iOS 14.0, *)
-extension Publisher {
-    
-    func sinkDispatchTo<S, SA, IA>(_ store: StateStoreViewModel<S, SA, IA>) where SA == Output, Failure == Never {
-        return self
-            .subscribe(on: DispatchQueue.main)
-            .sink { [weak store] (output) in
-                guard let store = store else { return }
-                store.dispatch(action: output)
-            }
-            .store(in: &store.cancellables)
-    }
-    
-    
-    func dispatchTo<S, SA, IA>(_ store: StateStoreViewModel<S, SA, IA>)  -> Publishers.HandleEvents<Publishers.SubscribeOn<Self, DispatchQueue>> where SA == Output, Failure == Never {
-        return self
-            .subscribe(on: DispatchQueue.main)
-            .handleEvents(receiveOutput: { [weak store] action in
-                guard let store = store else { return }
-                store.dispatch(action: action)
-            })
-    }
-}
diff --git a/RiotSwiftUI/Modules/Common/Theme/ThemeNamesColorsExtension.swift b/RiotSwiftUI/Modules/Common/Theme/ThemeNamesColorsExtension.swift
index 3cdae85a1..ae52e2ec7 100644
--- a/RiotSwiftUI/Modules/Common/Theme/ThemeNamesColorsExtension.swift
+++ b/RiotSwiftUI/Modules/Common/Theme/ThemeNamesColorsExtension.swift
@@ -20,6 +20,9 @@ import SwiftUI
 @available(iOS 14.0, *)
 extension ThemeSwiftUI {
     
+    /// Get the stable display name color based on userId.
+    /// - Parameter userId: The user id used to hash.
+    /// - Returns: The SwiftUI color for the associated userId.
     func displayNameColor(for userId: String) -> Color {
         let senderNameColorIndex = Int(userId.vc_hashCode % Int32(colors.namesAndAvatars.count))
         return colors.namesAndAvatars[senderNameColorIndex]
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/Coordinator/TemplateRoomsCoordinator.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/Coordinator/TemplateRoomsCoordinator.swift
index 048e4bc6e..c7a79d69f 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/Coordinator/TemplateRoomsCoordinator.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/Coordinator/TemplateRoomsCoordinator.swift
@@ -36,7 +36,7 @@ final class TemplateRoomsCoordinator: Coordinator {
     // Must be used only internally
     var childCoordinators: [Coordinator] = []
     
-    var completion: (() -> Void)?
+    var callback: (() -> Void)?
     
     // MARK: - Setup
     
@@ -49,6 +49,7 @@ final class TemplateRoomsCoordinator: Coordinator {
     
     func start() {
         if #available(iOS 14.0, *) {
+            MXLog.debug("[TemplateRoomsCoordinator] did start.")
             let rootCoordinator = self.createTemplateRoomListCoordinator()
             rootCoordinator.start()
             
@@ -76,13 +77,14 @@ final class TemplateRoomsCoordinator: Coordinator {
     private func createTemplateRoomListCoordinator() -> TemplateRoomListCoordinator {
         let coordinator: TemplateRoomListCoordinator = TemplateRoomListCoordinator(parameters: TemplateRoomListCoordinatorParameters(session: parameters.session))
         
-        coordinator.completion = { [weak self] result in
+        coordinator.callback = { [weak self] result in
+            MXLog.debug("[TemplateRoomsCoordinator] TemplateRoomListCoordinator did complete with result \(result).")
             guard let self = self else { return }
             switch result {
             case .didSelectRoom(let roomId):
                 self.showTemplateRoomChat(roomId: roomId)
             case .done:
-                self.completion?()
+                self.callback?()
             }
         }
         return coordinator
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinator.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinator.swift
index d7be94f7c..33f27e14a 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinator.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinator.swift
@@ -32,7 +32,7 @@ final class TemplateRoomChatCoordinator: Coordinator, Presentable {
 
     // Must be used only internally
     var childCoordinators: [Coordinator] = []
-    var completion: (() -> Void)?
+    var callback: (() -> Void)?
     
     // MARK: - Setup
     
@@ -48,11 +48,13 @@ final class TemplateRoomChatCoordinator: Coordinator, Presentable {
     
     // MARK: - Public
     func start() {
-        templateRoomChatViewModel.completion = { [weak self] result in
+        MXLog.debug("[TemplateRoomChatCoordinator] did start.")
+        templateRoomChatViewModel.callback = { [weak self] result in
+            MXLog.debug("[TemplateRoomChatCoordinator] TemplateRoomChatViewModel did complete with result: \(result).")
             guard let self = self else { return }
             switch result {
             case .done:
-                self.completion?()
+                self.callback?()
             break
             }
         }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubble.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubble.swift
new file mode 100644
index 000000000..2c170242e
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubble.swift
@@ -0,0 +1,26 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+/// Represents a grouped bubble in the View(For example multiple message of different time sent close together).
+struct TemplateRoomChatBubble {
+    let id: String
+    let sender: TemplateRoomChatMember
+    var items: [TemplateRoomChatBubbleItem]
+}
+
+extension TemplateRoomChatBubble: Identifiable { }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleImageContent.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleImageContent.swift
new file mode 100644
index 000000000..1dc76548f
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleImageContent.swift
@@ -0,0 +1,22 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import UIKit
+
+/// An image sent as a message.
+struct TemplateRoomChatMessageImageContent {
+    var image: UIImage
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItem.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItem.swift
index 97406a2e3..a5687055d 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItem.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItem.swift
@@ -16,15 +16,7 @@
 
 import UIKit
 
-
-struct TemplateRoomChatBubble {
-    let id: String
-    let sender: TemplateRoomChatMember
-    var items: [TemplateRoomChatBubbleItem]
-}
-
-extension TemplateRoomChatBubble: Identifiable { }
-
+/// One of the items grouped within a bubble(could be message types like text, image or video, or could be other items like url previews).
 struct TemplateRoomChatBubbleItem {
     let id: String
     var timestamp: Date
@@ -33,15 +25,4 @@ struct TemplateRoomChatBubbleItem {
 
 extension TemplateRoomChatBubbleItem: Identifiable { }
 
-enum TemplateRoomChatBubbleItemContent {
-    case message(TemplateRoomChatBubbleMessageContent)
-    case image(TemplateRoomChatBubbleImageContent)
-}
 
-struct TemplateRoomChatBubbleMessageContent {
-    var body: String
-}
-
-struct TemplateRoomChatBubbleImageContent {
-    var image: UIImage
-}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelResult.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItemContent.swift
similarity index 87%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelResult.swift
rename to RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItemContent.swift
index eaf549c5b..55355780e 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelResult.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItemContent.swift
@@ -16,6 +16,6 @@
 
 import Foundation
 
-enum TemplateRoomChatViewModelResult {
-    case done
+enum TemplateRoomChatBubbleItemContent {
+    case message(TemplateRoomChatMessageContent)
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatRoom.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMember.swift
similarity index 83%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatRoom.swift
rename to RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMember.swift
index 20bfac77e..3b26a13d0 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatRoom.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMember.swift
@@ -16,15 +16,7 @@
 
 import Foundation
 
-struct TemplateRoomChatMessage {
-    let id: String
-    let body: String
-    let sender: TemplateRoomChatMember
-    let timestamp: Date
-}
-
-extension TemplateRoomChatMessage: Identifiable {}
-
+/// A user who is a member of the room.
 struct TemplateRoomChatMember {
     let id: String
     let avatarUrl: String?
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessage.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessage.swift
new file mode 100644
index 000000000..46ad7daf8
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessage.swift
@@ -0,0 +1,27 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+/// A chat message send to the timeline within a room.
+struct TemplateRoomChatMessage {
+    let id: String
+    let content: TemplateRoomChatMessageContent
+    let sender: TemplateRoomChatMember
+    let timestamp: Date
+}
+
+extension TemplateRoomChatMessage: Identifiable {}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageContent.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageContent.swift
new file mode 100644
index 000000000..89e3c7116
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageContent.swift
@@ -0,0 +1,23 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+/// The type of message a long with it's content.
+enum TemplateRoomChatMessageContent {
+    case text(TemplateRoomChatMessageTextContent)
+    case image(TemplateRoomChatMessageImageContent)
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageTextContent.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageTextContent.swift
new file mode 100644
index 000000000..2b7b2164e
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageTextContent.swift
@@ -0,0 +1,22 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+/// The text content of a message sent by a user.
+struct TemplateRoomChatMessageTextContent {
+    var body: String
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatRoomInitializationStatus.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatRoomInitializationStatus.swift
new file mode 100644
index 000000000..6469eefe1
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatRoomInitializationStatus.swift
@@ -0,0 +1,23 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+enum TemplateRoomChatRoomInitializationStatus {
+    case notInitialized
+    case initialized
+    case failedToInitialize
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatStateAction.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatStateAction.swift
index 8e5f81336..7c0b510c5 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatStateAction.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatStateAction.swift
@@ -16,7 +16,9 @@
 
 import Foundation
 
+/// Actions to be performed on the `ViewModel` State
 enum TemplateRoomChatStateAction {
-    case clearMessageInput
+    case updateRoomInitializationStatus(TemplateRoomChatRoomInitializationStatus)
     case updateBubbles([TemplateRoomChatBubble])
+    case clearMessageInput
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewAction.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewAction.swift
index 013d52bd1..76f0abfea 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewAction.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewAction.swift
@@ -16,6 +16,7 @@
 
 import Foundation
 
+/// Actions send from the `View` to the `ViewModel`.
 enum TemplateRoomChatViewAction {
     case sendMessage
     case done
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelAction.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelAction.swift
new file mode 100644
index 000000000..603480035
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelAction.swift
@@ -0,0 +1,22 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+/// Actions sent by the `ViewModel` to the `Coordinator`
+enum TemplateRoomChatViewModelAction {
+    case done
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelInput.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelInput.swift
index 2eadcfd56..9137b6ca0 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelInput.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelInput.swift
@@ -16,6 +16,7 @@
 
 import Foundation
 
+/// State bound directly to SwiftUI elements.
 struct TemplateRoomChatViewModelBindings {
     var messageInput: String
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewState.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewState.swift
index b4badbdb4..c296d6d38 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewState.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewState.swift
@@ -16,7 +16,9 @@
 
 import Foundation
 
+/// State managed by the `ViewModel` delivered to the `View`.
 struct TemplateRoomChatViewState: BindableState {
+    var roomInitializationStatus: TemplateRoomChatRoomInitializationStatus
     let roomName: String?
     var bubbles: [TemplateRoomChatBubble]
     var bindings: TemplateRoomChatViewModelBindings
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift
index fcc4ce70b..ae14ab8fa 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift
@@ -17,13 +17,6 @@
 import Foundation
 import Combine
 
-
-enum TemplateRoomChatRoomIntializationStatus{
-    case notInitialized
-    case initialized
-    case failedToInitialize
-}
-
 @available(iOS 14.0, *)
 class TemplateRoomChatService: TemplateRoomChatServiceProtocol {
     
@@ -38,7 +31,7 @@ class TemplateRoomChatService: TemplateRoomChatServiceProtocol {
     
     // MARK: Public
     private(set) var chatMessagesSubject: CurrentValueSubject<[TemplateRoomChatMessage], Never>
-    private(set) var roomInitialized: CurrentValueSubject<TemplateRoomChatRoomIntializationStatus, Never>
+    private(set) var roomInitializationStatus: CurrentValueSubject<TemplateRoomChatRoomInitializationStatus, Never>
     
     var roomName: String? {
         self.room.summary.displayname
@@ -49,9 +42,9 @@ class TemplateRoomChatService: TemplateRoomChatServiceProtocol {
         self.room = room
         self.eventFormatter = EventFormatter(matrixSession: room.mxSession)
         self.chatMessagesSubject = CurrentValueSubject([])
-        self.roomInitialized = CurrentValueSubject(.notInitialized)
+        self.roomInitializationStatus = CurrentValueSubject(.notInitialized)
         
-        initalizeRoom()
+        initializeRoom()
     }
     
     deinit {
@@ -60,23 +53,23 @@ class TemplateRoomChatService: TemplateRoomChatServiceProtocol {
     }
     
     // MARK: Public
-    func send(message: String) {
+    func send(textMessage: String) {
         var localEcho: MXEvent? = nil
-        room.sendTextMessage(message, localEcho: &localEcho, completion: { _ in }) 
+        room.sendTextMessage(textMessage, localEcho: &localEcho, completion: { _ in })
     }
     
     // MARK: Private
     
-    private func initalizeRoom(){
+    private func initializeRoom(){
         room.state { [weak self] roomState in
             guard let self = self else { return }
             if let roomState = roomState {
                 self.roomState = roomState
-                self.roomInitialized.value = .initialized
+                self.roomInitializationStatus.value = .initialized
                 self.loadInitialMessages()
                 self.startListeningToRoomEvents()
             } else {
-                self.roomInitialized.value = .failedToInitialize
+                self.roomInitializationStatus.value = .failedToInitialize
             }
         }
     }
@@ -106,16 +99,19 @@ class TemplateRoomChatService: TemplateRoomChatServiceProtocol {
             .filter({ event in
                 event.type == kMXEventTypeStringRoomMessage
                     && event.content["msgtype"] as? String == kMXMessageTypeText
+                
+                // TODO: New to our SwiftUI Template? Why not implement another message type like image?
+                
             })
             .compactMap({ event -> TemplateRoomChatMessage?  in
                 guard let eventId = event.eventId,
-                      let eventBody = event.content["body"] as? String,
+                      let body = event.content["body"] as? String,
                       let sender = senderForMessage(event: event)
                 else { return nil }
                 
                 return TemplateRoomChatMessage(
                     id: eventId,
-                    body: eventBody,
+                    content: .text(TemplateRoomChatMessageTextContent(body: body)),
                     sender: sender,
                     timestamp: Date(timeIntervalSince1970: TimeInterval(event.originServerTs / 1000))
                 )
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatScreenState.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatScreenState.swift
index 3106381c2..ce2b8db3d 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatScreenState.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatScreenState.swift
@@ -25,8 +25,10 @@ enum MockTemplateRoomChatScreenState: MockScreenState, CaseIterable {
     // A case for each state you want to represent
     // with specific, minimal associated data that will allow you
     // mock that screen.
-    case noRooms
-    case rooms
+    case initializingRoom
+    case failedToInitializeRoom
+    case noMessages
+    case messages
     
     /// The associated screen
     var screenType: Any.Type {
@@ -37,15 +39,22 @@ enum MockTemplateRoomChatScreenState: MockScreenState, CaseIterable {
     var screenView: AnyView {
         let service: MockTemplateRoomChatService
         switch self {
-        case .noRooms:
+        case .noMessages:
             service = MockTemplateRoomChatService(messages: [])
-        case .rooms:
+            service.simulateUpdate(initializationStatus: .initialized)
+        case .messages:
+             service = MockTemplateRoomChatService()
+             service.simulateUpdate(initializationStatus: .initialized)
+        case .initializingRoom:
+             service = MockTemplateRoomChatService()
+        case .failedToInitializeRoom:
             service = MockTemplateRoomChatService()
+            service.simulateUpdate(initializationStatus: .failedToInitialize)
         }
         let viewModel = TemplateRoomChatViewModel(templateRoomChatService: service)
         
         // can simulate service and viewModel actions here if needs be.
-        
+    
         return AnyView(TemplateRoomChat(viewModel: viewModel.context)
                 .addDependency(MockAvatarService.example))
     }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatService.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatService.swift
index eb053a8d8..a967450eb 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatService.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatService.swift
@@ -25,22 +25,27 @@ class MockTemplateRoomChatService: TemplateRoomChatServiceProtocol {
     static let amadine = TemplateRoomChatMember(id: "@amadine:matrix.org", avatarUrl: "!aaabaa:matrix.org", displayName: "Amadine")
     static let mathew = TemplateRoomChatMember(id: "@mathew:matrix.org", avatarUrl: "!bbabb:matrix.org", displayName: "Mathew")
     static let mockMessages = [
-        TemplateRoomChatMessage(id: "!0:matrix.org", body: "Shall I put it live?", sender: amadine, timestamp: Date(timeIntervalSinceNow: 60 * -3)),
-        TemplateRoomChatMessage(id: "!1:matrix.org", body: "Yea go for it! ...and then let's head to the pub", sender: mathew, timestamp: Date(timeIntervalSinceNow: 60)),
-        TemplateRoomChatMessage(id: "!2:matrix.org", body: "Deal.", sender: amadine, timestamp: Date(timeIntervalSinceNow: 60 * -2)),
-        TemplateRoomChatMessage(id: "!3:matrix.org", body: "Ok, Done. 🍻", sender: amadine, timestamp: Date(timeIntervalSinceNow: 60 * -1)),
+        TemplateRoomChatMessage(id: "!0:matrix.org", content: .text(TemplateRoomChatMessageTextContent(body: "Shall I put it live?")) , sender: amadine, timestamp: Date(timeIntervalSinceNow: 60 * -3)),
+        TemplateRoomChatMessage(id: "!1:matrix.org", content: .text(TemplateRoomChatMessageTextContent(body: "Yea go for it! ...and then let's head to the pub")), sender: mathew, timestamp: Date(timeIntervalSinceNow: 60)),
+        TemplateRoomChatMessage(id: "!2:matrix.org", content: .text(TemplateRoomChatMessageTextContent(body: "Deal.")), sender: amadine, timestamp: Date(timeIntervalSinceNow: 60 * -2)),
+        TemplateRoomChatMessage(id: "!3:matrix.org", content: .text(TemplateRoomChatMessageTextContent(body: "Ok, Done. 🍻")), sender: amadine, timestamp: Date(timeIntervalSinceNow: 60 * -1)),
     ]
+    var roomInitializationStatus: CurrentValueSubject<TemplateRoomChatRoomInitializationStatus, Never>
     var chatMessagesSubject: CurrentValueSubject<[TemplateRoomChatMessage], Never>
 
     init(messages: [TemplateRoomChatMessage] = mockMessages) {
-        chatMessagesSubject = CurrentValueSubject(messages)
+        self.roomInitializationStatus = CurrentValueSubject(.notInitialized)
+        self.chatMessagesSubject = CurrentValueSubject(messages)
     }
     
-    func send(message: String) {
-        let newMessage = TemplateRoomChatMessage(id: "!\(chatMessagesSubject.value.count):matrix.org", body: message, sender: Self.amadine, timestamp: Date())
+    func send(textMessage: String) {
+        let newMessage = TemplateRoomChatMessage(id: "!\(chatMessagesSubject.value.count):matrix.org", content: .text(TemplateRoomChatMessageTextContent(body: textMessage)), sender: Self.amadine, timestamp: Date())
         self.chatMessagesSubject.value += [newMessage]
     }
     
+    func simulateUpdate(initializationStatus: TemplateRoomChatRoomInitializationStatus) {
+        self.roomInitializationStatus.value = initializationStatus
+    }
     func simulateUpdate(messages: [TemplateRoomChatMessage]) {
         self.chatMessagesSubject.send(messages)
     }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/TemplateRoomChatServiceProtocol.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/TemplateRoomChatServiceProtocol.swift
index e3eb61031..99fd920f0 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/TemplateRoomChatServiceProtocol.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/TemplateRoomChatServiceProtocol.swift
@@ -19,7 +19,8 @@ import Combine
 
 @available(iOS 14.0, *)
 protocol TemplateRoomChatServiceProtocol {
+    var roomInitializationStatus: CurrentValueSubject<TemplateRoomChatRoomInitializationStatus, Never> { get }
     var chatMessagesSubject: CurrentValueSubject<[TemplateRoomChatMessage], Never> { get }
     var roomName: String? { get }
-    func send(message: String)
+    func send(textMessage: String)
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Test/UI/TemplateRoomChatUITests.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Test/UI/TemplateRoomChatUITests.swift
index 1a015132b..04a6e3dab 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Test/UI/TemplateRoomChatUITests.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Test/UI/TemplateRoomChatUITests.swift
@@ -31,23 +31,43 @@ class TemplateRoomChatUITests: MockScreenTest {
     func verifyTemplateRoomChatScreen() throws {
         guard let screenState = screenState as? MockTemplateRoomChatScreenState else { fatalError("no screen") }
         switch screenState {
-        case .presence(let presence):
-            verifyTemplateRoomChatPresence(presence: presence)
-        case .longDisplayName(let name):
-            verifyTemplateRoomChatLongName(name: name)
+        case .initializingRoom:
+            verifyInitializingRoom()
+        case .failedToInitializeRoom:
+            verifyFailedToInitializeRoom()
+        case .noMessages:
+            verifyNoMessages()
+        case .messages:
+            verifyMessages()
         }
     }
     
-    func verifyTemplateRoomChatPresence(presence: TemplateRoomChatPresence) {
-        let presenceText = app.staticTexts["presenceText"]
-        XCTAssert(presenceText.exists)
-        XCTAssert(presenceText.label == presence.title)
+    func verifyInitializingRoom() {
+        let loadingProgress = app.activityIndicators["loadingProgress"]
+        XCTAssert(loadingProgress.exists)
     }
     
-    func verifyTemplateRoomChatLongName(name: String) {
-        let displayNameText = app.staticTexts["displayNameText"]
-        XCTAssert(displayNameText.exists)
-        XCTAssert(displayNameText.label == name)
+    func verifyFailedToInitializeRoom() {
+        let errorMessage = app.staticTexts["errorMessage"]
+        XCTAssert(errorMessage.exists)
+    }
+    
+    func verifyNoMessages() {
+        let errorMessage = app.staticTexts["errorMessage"]
+        XCTAssert(errorMessage.exists)
+    }
+    
+    func verifyMessages() {
+        // Verify bubble grouping with:
+        // 3 bubbles
+        let bubbleCount = app.images.matching(identifier:"bubbleImage").count
+        XCTAssertEqual(bubbleCount, 3)
+        
+        // and 4 text items
+        let bubbleTextItemCount = app.staticTexts.matching(identifier:"bubbleTextContent").count
+        XCTAssertEqual(bubbleTextItemCount, 4)
+        
+        
     }
 
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
index d1f7e6122..e8372f7f4 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
@@ -32,36 +32,9 @@ struct TemplateRoomChat: View {
     
     var body: some View {
         VStack {
-            if viewModel.viewState.bubbles.isEmpty {
-                VStack{
-                    Text("No messages")
-                }
-                .frame(maxHeight: .infinity)
-            } else {
-                ScrollViewReader { reader in
-                    ScrollView{
-                        LazyVStack {
-                            ForEach(viewModel.viewState.bubbles) { bubble in
-                                TemplateRoomChatBubbleView(bubble: bubble)
-                                    .id(bubble.id)
-                            }
-                        }
-                        .onAppear {
-                            // Start at the bottom
-                            reader.scrollTo(viewModel.viewState.bubbles.last?.id, anchor: .bottom)
-                        }
-                        .onChange(of: itemCount) { _ in
-                            // When new items are added animate to the new items
-                            withAnimation {
-                                reader.scrollTo(viewModel.viewState.bubbles.last?.id, anchor: .bottom)
-                            }
-                        }
-                        // When the scroll content takes less than the screen space align at the top
-                        .frame(maxHeight: .infinity, alignment: .top)
-                    }
-                }
-                .frame(maxHeight: .infinity)
-            }
+            VStack{
+                roomContent
+            }.frame(maxHeight: .infinity)
             
             HStack {
                 TextField(VectorL10n.roomMessageShortPlaceholder, text: $viewModel.messageInput)
@@ -88,6 +61,47 @@ struct TemplateRoomChat: View {
         }
     }
     
+    @ViewBuilder
+    private var roomContent: some View {
+        if case .notInitialized = viewModel.viewState.roomInitializationStatus {
+            ProgressView()
+                .accessibility(identifier: "loadingProgress")
+        } else if case .failedToInitialize = viewModel.viewState.roomInitializationStatus {
+            Text("Sorry, We failed to load the room.")
+                .accessibility(identifier: "errorMessage")
+        } else if viewModel.viewState.bubbles.isEmpty {
+            Text("There are no messages in this room yet.")
+                .accessibility(identifier: "errorMessage")
+        } else {
+            bubbleList
+        }
+    }
+    
+    private var bubbleList: some View {
+        ScrollViewReader { reader in
+            ScrollView{
+                LazyVStack {
+                    ForEach(viewModel.viewState.bubbles) { bubble in
+                        TemplateRoomChatBubbleView(bubble: bubble)
+                            .id(bubble.id)
+                    }
+                }
+                .onAppear {
+                    // Start at the bottom
+                    reader.scrollTo(viewModel.viewState.bubbles.last?.id, anchor: .bottom)
+                }
+                .onChange(of: itemCount) { _ in
+                    // When new items are added animate to the new items
+                    withAnimation {
+                        reader.scrollTo(viewModel.viewState.bubbles.last?.id, anchor: .bottom)
+                    }
+                }
+                // When the scroll content takes less than the screen space align at the top
+                .frame(maxHeight: .infinity, alignment: .top)
+            }
+        }
+    }
+    
     @ViewBuilder
     private var trailingToolBarButton: some View {
         if presentedModally {
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleContentView.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleContentView.swift
index 42b488537..6efb16b4f 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleContentView.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleContentView.swift
@@ -18,7 +18,7 @@ import SwiftUI
 
 @available(iOS 14.0, *)
 struct TemplateRoomChatBubbleContentView: View {
-
+    
     // MARK: - Properties
     
     // MARK: Private
@@ -32,9 +32,12 @@ struct TemplateRoomChatBubbleContentView: View {
     var body: some View {
         switch bubbleItem.content {
         case .message(let messageContent):
-            TemplateRoomChatBubbleMessage(messageContent: messageContent)
-        case .image(let imageContent):
-            TemplateRoomChatBubbleImage(imageContent: imageContent)
+            switch messageContent {
+            case .text(let messageContent):
+                TemplateRoomChatBubbleMessage(messageContent: messageContent)
+            case .image(let imageContent):
+                TemplateRoomChatBubbleImage(imageContent: imageContent)
+            }
         }
     }
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleImage.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleImage.swift
index f05b7391c..16fa077d4 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleImage.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleImage.swift
@@ -27,7 +27,7 @@ struct TemplateRoomChatBubbleImage: View {
     
     // MARK: Public
     
-    let imageContent: TemplateRoomChatBubbleImageContent
+    let imageContent: TemplateRoomChatMessageImageContent
     
     var body: some View {
         EmptyView()
@@ -40,5 +40,6 @@ struct TemplateRoomChatBubbleImage: View {
 struct TemplateRoomChatBubbleImage_Previews: PreviewProvider {
     static var previews: some View {
         EmptyView()
+        // TODO: New to our SwiftUI Template? Why not implement the image item in the bubble here?
     }
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleMessage.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleMessage.swift
index 7c8f59393..f6569a970 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleMessage.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleMessage.swift
@@ -27,10 +27,11 @@ struct TemplateRoomChatBubbleMessage: View {
     
     // MARK: Public
     
-    let messageContent: TemplateRoomChatBubbleMessageContent
+    let messageContent: TemplateRoomChatMessageTextContent
     
     var body: some View {
         Text(messageContent.body)
+            .accessibility(identifier: "bubbleTextContent")
             .foregroundColor(theme.colors.primaryContent)
             .font(theme.fonts.body)
     }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleView.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleView.swift
index 08a8ed47a..a996bca52 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleView.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleView.swift
@@ -32,6 +32,7 @@ struct TemplateRoomChatBubbleView: View {
     var body: some View {
         HStack(alignment: .top){
             AvatarImage(avatarData: bubble.sender.avatarData, size: .xSmall)
+                .accessibility(identifier: "bubbleImage")
             VStack(alignment: .leading){
                 Text(bubble.sender.displayName ?? "")
                     .foregroundColor(theme.displayNameColor(for: bubble.sender.id))
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
index 7feeae5ed..fd95ea3bf 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
@@ -36,16 +36,26 @@ class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChat
     
     // MARK: Public
     
-    var completion: ((TemplateRoomChatViewModelResult) -> Void)?
+    var callback: ((TemplateRoomChatViewModelAction) -> Void)?
     
     // MARK: - Setup
     
     init(templateRoomChatService: TemplateRoomChatServiceProtocol) {
         self.templateRoomChatService = templateRoomChatService
         super.init(initialViewState: Self.defaultState(templateRoomChatService: templateRoomChatService))
+        setupRoomInitializationObserving()
         setupMessageObserving()
     }
     
+    private func setupRoomInitializationObserving() {
+        let initializationPublisher = templateRoomChatService
+            .roomInitializationStatus
+            .map(TemplateRoomChatStateAction.updateRoomInitializationStatus)
+            .eraseToAnyPublisher()
+        
+        dispatch(actionPublisher: initializationPublisher)
+    }
+        
     private func setupMessageObserving() {
         let messageActionPublisher = templateRoomChatService
             .chatMessagesSubject
@@ -58,7 +68,7 @@ class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChat
     private static func defaultState(templateRoomChatService: TemplateRoomChatServiceProtocol) -> TemplateRoomChatViewState {
         let bubbles = makeBubbles(messages: templateRoomChatService.chatMessagesSubject.value)
         let bindings = TemplateRoomChatViewModelBindings(messageInput: "")
-        return TemplateRoomChatViewState(roomName: templateRoomChatService.roomName, bubbles: bubbles, bindings: bindings)
+        return TemplateRoomChatViewState(roomInitializationStatus: templateRoomChatService.roomInitializationStatus.value, roomName: templateRoomChatService.roomName, bubbles: bubbles, bindings: bindings)
     }
     
     private static func makeBubbles(messages: [TemplateRoomChatMessage]) -> [TemplateRoomChatBubble] {
@@ -71,7 +81,7 @@ class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChat
             let messageItem = TemplateRoomChatBubbleItem(
                 id: message.id,
                 timestamp: message.timestamp,
-                content: .message(TemplateRoomChatBubbleMessageContent(body: message.body))
+                content: .message(message.content)
             )
             if i > 0,
                let lastBubbleId = bubbleOrder.last,
@@ -85,7 +95,7 @@ class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChat
                 let item = TemplateRoomChatBubbleItem(
                     id: message.id,
                     timestamp: message.timestamp,
-                    content: .message(TemplateRoomChatBubbleMessageContent(body: message.body))
+                    content: .message(message.content)
                 )
                 lastBubble.items.append(item)
                 bubbleMap[lastBubble.id] = lastBubble
@@ -110,13 +120,15 @@ class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChat
         case .done:
             done()
         case .sendMessage:
-            templateRoomChatService.send(message: state.bindings.messageInput)
+            templateRoomChatService.send(textMessage: state.bindings.messageInput)
             dispatch(action: .clearMessageInput)
         }
     }
     
     override class func reducer(state: inout TemplateRoomChatViewState, action: TemplateRoomChatStateAction) {
         switch action {
+        case .updateRoomInitializationStatus(let status):
+            state.roomInitializationStatus = status
         case .clearMessageInput:
             state.bindings.messageInput = ""
         case .updateBubbles(let bubbles):
@@ -128,6 +140,6 @@ class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChat
     // MARK: - Private
     
     private func done() {
-        completion?(.done)
+        callback?(.done)
     }
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModelProtocol.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModelProtocol.swift
index ad7553d81..3dd0ad937 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModelProtocol.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModelProtocol.swift
@@ -17,5 +17,5 @@
 import Foundation
 
 protocol TemplateRoomChatViewModelProtocol {
-    var completion: ((TemplateRoomChatViewModelResult) -> Void)? { get set }
+    var callback: ((TemplateRoomChatViewModelAction) -> Void)? { get set }
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinator.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinator.swift
index 09dbd9539..99636eb73 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinator.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinator.swift
@@ -32,7 +32,7 @@ final class TemplateRoomListCoordinator: Coordinator, Presentable {
 
     // Must be used only internally
     var childCoordinators: [Coordinator] = []
-    var completion: ((TemplateRoomListCoordinatorResult) -> Void)?
+    var callback: ((TemplateRoomListCoordinatorAction) -> Void)?
     
     // MARK: - Setup
     
@@ -49,13 +49,15 @@ final class TemplateRoomListCoordinator: Coordinator, Presentable {
     // MARK: - Public
     
     func start() {
-        templateRoomListViewModel.completion = { [weak self] result in
+        MXLog.debug("[TemplateRoomListCoordinator] did start.")
+        templateRoomListViewModel.callback = { [weak self] result in
+            MXLog.debug("[TemplateRoomListCoordinator] TemplateRoomListViewModel did complete with result \(result).")
             guard let self = self else { return }
             switch result {
             case .didSelectRoom(let roomId):
-                self.completion?(.didSelectRoom(roomId))
+                self.callback?(.didSelectRoom(roomId))
             case .done:
-                self.completion?(.done)
+                self.callback?(.done)
             break
             }
         }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewModelResult.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListCoordinatorAction.swift
similarity index 88%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewModelResult.swift
rename to RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListCoordinatorAction.swift
index 1a7ea8347..9228e33a9 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewModelResult.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListCoordinatorAction.swift
@@ -16,7 +16,8 @@
 
 import Foundation
 
-enum TemplateRoomListViewModelResult {
+/// Actions returned by the coordinator callback
+enum TemplateRoomListCoordinatorAction {
     case didSelectRoom(String)
     case done
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListStateAction.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListStateAction.swift
index 97f4557bc..95a3e19f0 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListStateAction.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListStateAction.swift
@@ -16,6 +16,7 @@
 
 import Foundation
 
+/// Actions to be performed on the `ViewModel` State
 enum TemplateRoomListStateAction {
     case updateRooms([TemplateRoomListRoom])
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewAction.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewAction.swift
index 594383d23..baae86649 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewAction.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewAction.swift
@@ -16,6 +16,7 @@
 
 import Foundation
 
+/// Actions send from the `View` to the `ViewModel`.
 enum TemplateRoomListViewAction {
     case done
     case didSelectRoom(String)
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinatorResult.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewModelAction.swift
similarity index 87%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinatorResult.swift
rename to RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewModelAction.swift
index 5f6f9e3cd..f21fdfa32 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinatorResult.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewModelAction.swift
@@ -16,7 +16,8 @@
 
 import Foundation
 
-enum TemplateRoomListCoordinatorResult {
+/// Actions sent by the`ViewModel` to the `Coordinator`.
+enum TemplateRoomListViewModelAction {
     case didSelectRoom(String)
     case done
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewState.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewState.swift
index 38e9c5b38..9c5728786 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewState.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewState.swift
@@ -16,6 +16,7 @@
 
 import Foundation
 
+/// State managed by the `ViewModel` delivered to the `View`.
 struct TemplateRoomListViewState: BindableState {
     var rooms: [TemplateRoomListRoom]
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Test/UI/TemplateRoomListUITests.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Test/UI/TemplateRoomListUITests.swift
index fdcfc8fa2..6121e727c 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Test/UI/TemplateRoomListUITests.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Test/UI/TemplateRoomListUITests.swift
@@ -31,23 +31,22 @@ class TemplateRoomListUITests: MockScreenTest {
     func verifyTemplateRoomListScreen() throws {
         guard let screenState = screenState as? MockTemplateRoomListScreenState else { fatalError("no screen") }
         switch screenState {
-        case .presence(let presence):
-            verifyTemplateRoomListPresence(presence: presence)
-        case .longDisplayName(let name):
-            verifyTemplateRoomListLongName(name: name)
+        case .noRooms:
+            verifyTemplateRoomListNoRooms()
+        case .rooms:
+            verifyTemplateRoomListRooms()
         }
     }
     
-    func verifyTemplateRoomListPresence(presence: TemplateRoomListPresence) {
-        let presenceText = app.staticTexts["presenceText"]
-        XCTAssert(presenceText.exists)
-        XCTAssert(presenceText.label == presence.title)
+    func verifyTemplateRoomListNoRooms() {
+        let errorMessage = app.staticTexts["errorMessage"]
+        XCTAssert(errorMessage.exists)
+        XCTAssert(errorMessage.label == "No Rooms")
     }
     
-    func verifyTemplateRoomListLongName(name: String) {
-        let displayNameText = app.staticTexts["displayNameText"]
-        XCTAssert(displayNameText.exists)
-        XCTAssert(displayNameText.label == name)
+    func verifyTemplateRoomListRooms() {
+        let displayNameCount = app.buttons.matching(identifier:"roomNameText").count
+        XCTAssertEqual(displayNameCount, 3)
     }
 
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift
index ef71923fd..0b19063c7 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift
@@ -45,6 +45,7 @@ struct TemplateRoomList: View {
     var listContent: some View {
         if viewModel.viewState.rooms.isEmpty {
             Text("No Rooms")
+                .accessibility(identifier: "errorMessage")
         } else {
             ScrollView{
                 LazyVStack(spacing: 0) {
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomListRow.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomListRow.swift
index c0a89e5f5..d417c315b 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomListRow.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomListRow.swift
@@ -35,6 +35,7 @@ struct TemplateRoomListRow: View {
             AvatarImage(avatarData: avatar, size: .medium)
             Text(displayName ?? "")
                 .foregroundColor(theme.colors.primaryContent)
+                .accessibility(identifier: "roomNameText")
             Spacer()
         }
         //add to a style
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift
index 8c709d834..b9eed4d0d 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift
@@ -32,7 +32,7 @@ class TemplateRoomListViewModel: TemplateRoomListViewModelType, TemplateRoomList
     
     // MARK: Public
     
-    var completion: ((TemplateRoomListViewModelResult) -> Void)?
+    var callback: ((TemplateRoomListViewModelAction) -> Void)?
     
     // MARK: - Setup
     
@@ -76,10 +76,10 @@ class TemplateRoomListViewModel: TemplateRoomListViewModelType, TemplateRoomList
     // MARK: - Private
     
     private func done() {
-        completion?(.done)
+        callback?(.done)
     }
     
     private func didSelect(by roomId: String) {
-        completion?(.didSelectRoom(roomId))
+        callback?(.didSelectRoom(roomId))
     }
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModelProtocol.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModelProtocol.swift
index f051849bf..a47e6c9b7 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModelProtocol.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModelProtocol.swift
@@ -17,7 +17,7 @@
 import Foundation
 
 protocol TemplateRoomListViewModelProtocol {
-    var completion: ((TemplateRoomListViewModelResult) -> Void)? { get set }
+    var callback: ((TemplateRoomListViewModelAction) -> Void)? { get set }
     @available(iOS 14, *)
     var context: TemplateRoomListViewModelType.Context { get }
 }
diff --git a/RiotSwiftUI/targetUITests.yml b/RiotSwiftUI/targetUITests.yml
index 4466226ad..0e2a100df 100644
--- a/RiotSwiftUI/targetUITests.yml
+++ b/RiotSwiftUI/targetUITests.yml
@@ -49,6 +49,8 @@ targets:
     - path: ../Riot/Generated/Images.swift
     - path: ../Riot/Managers/Theme/ThemeIdentifier.swift
     - path: ../Riot/Managers/Locale/LocaleProviderType.swift
+    - path: ../Riot/Categories/String.swift
+    - path: ../Riot/Categories/Character.swift
     - path: ../Riot/Assets/en.lproj/Vector.strings
       buildPhase: resources
     - path: ../Riot/Assets/Images.xcassets

From 920a1fab58c0ced9933089ced8a81c09dddcecf9 Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Mon, 20 Sep 2021 15:56:53 +0100
Subject: [PATCH 16/59] Fix Unit tests

---
 .../Avatar/Model/AvatarInputProtocol.swift    |  2 +
 .../Model/TemplateRoomChatBubble.swift        |  2 +-
 .../TemplateRoomChatBubbleImageContent.swift  |  2 +
 .../Model/TemplateRoomChatBubbleItem.swift    |  2 +-
 .../TemplateRoomChatBubbleItemContent.swift   |  2 +
 .../Model/TemplateRoomChatMember.swift        |  2 +-
 .../TemplateRoomChatMessageContent.swift      |  2 +
 .../TemplateRoomChatMessageTextContent.swift  |  3 ++
 .../Unit/TemplateRoomChatViewModelTests.swift | 46 +++++++++++--------
 .../Model/TemplateRoomListRoom.swift          |  4 +-
 .../Unit/TemplateRoomListViewModelTests.swift | 29 ++++++------
 11 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/RiotSwiftUI/Modules/Common/Avatar/Model/AvatarInputProtocol.swift b/RiotSwiftUI/Modules/Common/Avatar/Model/AvatarInputProtocol.swift
index edfd86099..2b36660a0 100644
--- a/RiotSwiftUI/Modules/Common/Avatar/Model/AvatarInputProtocol.swift
+++ b/RiotSwiftUI/Modules/Common/Avatar/Model/AvatarInputProtocol.swift
@@ -27,3 +27,5 @@ struct AvatarInput: AvatarInputProtocol {
     var matrixItemId: String
     let displayName: String?
 }
+
+extension AvatarInput: Equatable { }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubble.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubble.swift
index 2c170242e..ed9b4b5f1 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubble.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubble.swift
@@ -23,4 +23,4 @@ struct TemplateRoomChatBubble {
     var items: [TemplateRoomChatBubbleItem]
 }
 
-extension TemplateRoomChatBubble: Identifiable { }
+extension TemplateRoomChatBubble: Identifiable, Equatable { }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleImageContent.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleImageContent.swift
index 1dc76548f..2a9eda6f8 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleImageContent.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleImageContent.swift
@@ -20,3 +20,5 @@ import UIKit
 struct TemplateRoomChatMessageImageContent {
     var image: UIImage
 }
+
+extension TemplateRoomChatMessageImageContent: Equatable { }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItem.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItem.swift
index a5687055d..9d8809917 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItem.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItem.swift
@@ -23,6 +23,6 @@ struct TemplateRoomChatBubbleItem {
     var content: TemplateRoomChatBubbleItemContent
 }
 
-extension TemplateRoomChatBubbleItem: Identifiable { }
+extension TemplateRoomChatBubbleItem: Identifiable, Equatable { }
 
 
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItemContent.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItemContent.swift
index 55355780e..17c05ab54 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItemContent.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItemContent.swift
@@ -19,3 +19,5 @@ import Foundation
 enum TemplateRoomChatBubbleItemContent {
     case message(TemplateRoomChatMessageContent)
 }
+
+extension TemplateRoomChatBubbleItemContent: Equatable { }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMember.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMember.swift
index 3b26a13d0..54f6121c1 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMember.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMember.swift
@@ -33,4 +33,4 @@ extension TemplateRoomChatMember: Avatarable {
     }
 }
 
-extension TemplateRoomChatMember: Identifiable {}
+extension TemplateRoomChatMember: Identifiable, Equatable {}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageContent.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageContent.swift
index 89e3c7116..c7e54a7d0 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageContent.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageContent.swift
@@ -21,3 +21,5 @@ enum TemplateRoomChatMessageContent {
     case text(TemplateRoomChatMessageTextContent)
     case image(TemplateRoomChatMessageImageContent)
 }
+
+extension TemplateRoomChatMessageContent: Equatable { }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageTextContent.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageTextContent.swift
index 2b7b2164e..4aeda448c 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageTextContent.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageTextContent.swift
@@ -20,3 +20,6 @@ import Foundation
 struct TemplateRoomChatMessageTextContent {
     var body: String
 }
+
+
+extension TemplateRoomChatMessageTextContent: Equatable { }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Test/Unit/TemplateRoomChatViewModelTests.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Test/Unit/TemplateRoomChatViewModelTests.swift
index 14cf4280b..498390a19 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Test/Unit/TemplateRoomChatViewModelTests.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Test/Unit/TemplateRoomChatViewModelTests.swift
@@ -21,34 +21,42 @@ import Combine
 
 @available(iOS 14.0, *)
 class TemplateRoomChatViewModelTests: XCTestCase {
-    private enum Constants {
-        static let presenceInitialValue: TemplateRoomChatPresence = .offline
-        static let displayName = "Alice"
-    }
+
     var service: MockTemplateRoomChatService!
     var viewModel: TemplateRoomChatViewModel!
+    var context: TemplateRoomChatViewModel.Context!
     var cancellables = Set<AnyCancellable>()
+    
     override func setUpWithError() throws {
-        service = MockTemplateRoomChatService(displayName: Constants.displayName, presence: Constants.presenceInitialValue)
+        service = MockTemplateRoomChatService()
+        service.simulateUpdate(initializationStatus: .initialized)
         viewModel = TemplateRoomChatViewModel(templateRoomChatService: service)
+        context = viewModel.context
     }
     
     func testInitialState() {
-        XCTAssertEqual(viewModel.viewState.displayName, Constants.displayName)
-        XCTAssertEqual(viewModel.viewState.presence, Constants.presenceInitialValue)
+        XCTAssertEqual(context.viewState.bubbles.count, 3)
+        XCTAssertEqual(context.viewState.sendButtonEnabled, false)
+        XCTAssertEqual(context.viewState.roomInitializationStatus, .initialized)
     }
 
-    func testFirstPresenceReceived() throws {
-        let presencePublisher = viewModel.$viewState.map(\.presence).removeDuplicates().collect(1).first()
-        XCTAssertEqual(try xcAwait(presencePublisher), [Constants.presenceInitialValue])
-    }
-    
-    func testPresenceUpdatesReceived() throws {
-        let presencePublisher = viewModel.$viewState.map(\.presence).removeDuplicates().collect(3).first()
-        let newPresenceValue1: TemplateRoomChatPresence = .online
-        let newPresenceValue2: TemplateRoomChatPresence = .idle
-        service.simulateUpdate(presence: newPresenceValue1)
-        service.simulateUpdate(presence: newPresenceValue2)
-        XCTAssertEqual(try xcAwait(presencePublisher), [Constants.presenceInitialValue, newPresenceValue1, newPresenceValue2])
+
+    func testSendMessageUpdatesReceived() throws {
+        let bubblesPublisher: AnyPublisher<[[TemplateRoomChatBubble]], Never> = context.$viewState.map(\.bubbles).removeDuplicates().collect(2).first().eraseToAnyPublisher()
+        let awaitDeferred = xcAwaitDeferred(bubblesPublisher)
+        let newMessage: String = "Let's Go"
+        service.send(textMessage: newMessage)
+        
+        let result: [[TemplateRoomChatBubble]]? = try awaitDeferred()
+        
+        // Test that the update to the messages in turn updates the view's
+        // the last bubble by appending another text item, asserting the body.
+        guard let item:TemplateRoomChatBubbleItem = result?.last?.last?.items.last,
+              case TemplateRoomChatBubbleItemContent.message(let message) = item.content,
+              case let TemplateRoomChatMessageContent.text(text) = message else {
+            XCTFail()
+            return
+        }
+        XCTAssertEqual(text.body, newMessage)
     }
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListRoom.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListRoom.swift
index 94608e150..9db425230 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListRoom.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListRoom.swift
@@ -18,8 +18,8 @@ import Foundation
 
 struct TemplateRoomListRoom {
     let id: String
-    let avatar: AvatarInputProtocol
+    let avatar: AvatarInput
     let displayName: String?
 }
 
-extension TemplateRoomListRoom: Identifiable {}
+extension TemplateRoomListRoom: Identifiable, Equatable {}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Test/Unit/TemplateRoomListViewModelTests.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Test/Unit/TemplateRoomListViewModelTests.swift
index d059460cb..450541faa 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Test/Unit/TemplateRoomListViewModelTests.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Test/Unit/TemplateRoomListViewModelTests.swift
@@ -22,33 +22,32 @@ import Combine
 @available(iOS 14.0, *)
 class TemplateRoomListViewModelTests: XCTestCase {
     private enum Constants {
-        static let presenceInitialValue: TemplateRoomListPresence = .offline
-        static let displayName = "Alice"
     }
     var service: MockTemplateRoomListService!
     var viewModel: TemplateRoomListViewModel!
+    var context: TemplateRoomListViewModel.Context!
     var cancellables = Set<AnyCancellable>()
+    
     override func setUpWithError() throws {
-        service = MockTemplateRoomListService(displayName: Constants.displayName, presence: Constants.presenceInitialValue)
+        service = MockTemplateRoomListService()
         viewModel = TemplateRoomListViewModel(templateRoomListService: service)
+        context = viewModel.context
     }
     
     func testInitialState() {
-        XCTAssertEqual(viewModel.viewState.displayName, Constants.displayName)
-        XCTAssertEqual(viewModel.viewState.presence, Constants.presenceInitialValue)
+        XCTAssertEqual(context.viewState.rooms, MockTemplateRoomListService.mockRooms)
     }
 
-    func testFirstPresenceReceived() throws {
-        let presencePublisher = viewModel.$viewState.map(\.presence).removeDuplicates().collect(1).first()
-        XCTAssertEqual(try xcAwait(presencePublisher), [Constants.presenceInitialValue])
+    func testFirstValueReceived() throws {
+        let roomsPublisher = context.$viewState.map(\.rooms).removeDuplicates().collect(1).first()
+        XCTAssertEqual(try xcAwait(roomsPublisher), [MockTemplateRoomListService.mockRooms])
     }
     
-    func testPresenceUpdatesReceived() throws {
-        let presencePublisher = viewModel.$viewState.map(\.presence).removeDuplicates().collect(3).first()
-        let newPresenceValue1: TemplateRoomListPresence = .online
-        let newPresenceValue2: TemplateRoomListPresence = .idle
-        service.simulateUpdate(presence: newPresenceValue1)
-        service.simulateUpdate(presence: newPresenceValue2)
-        XCTAssertEqual(try xcAwait(presencePublisher), [Constants.presenceInitialValue, newPresenceValue1, newPresenceValue2])
+    func testUpdatesReceived() throws {
+        let updatedRooms = Array(MockTemplateRoomListService.mockRooms.dropLast())
+        let roomsPublisher = context.$viewState.map(\.rooms).removeDuplicates().collect(2).first()
+        let awaitDeferred = xcAwaitDeferred(roomsPublisher)
+        service.simulateUpdate(rooms:  updatedRooms)
+        XCTAssertEqual(try awaitDeferred(), [MockTemplateRoomListService.mockRooms, updatedRooms])
     }
 }

From 1e9876d798e39eefeceeaf9b608529357a0ca901 Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Tue, 21 Sep 2021 08:06:27 +0100
Subject: [PATCH 17/59] Only display unencrypted rooms which we can use with
 the chat view.

---
 .../View/TemplateRoomChat.swift                 |  2 ++
 .../MatrixSDK/TemplateRoomListService.swift     |  6 +++++-
 .../View/TemplateRoomList.swift                 |  3 ++-
 .../ViewModel/TemplateRoomListViewModel.swift   | 17 ++++++++---------
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
index e8372f7f4..eae5f5cc8 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
@@ -68,9 +68,11 @@ struct TemplateRoomChat: View {
                 .accessibility(identifier: "loadingProgress")
         } else if case .failedToInitialize = viewModel.viewState.roomInitializationStatus {
             Text("Sorry, We failed to load the room.")
+                .foregroundColor(theme.colors.primaryContent)
                 .accessibility(identifier: "errorMessage")
         } else if viewModel.viewState.bubbles.isEmpty {
             Text("There are no messages in this room yet.")
+                .foregroundColor(theme.colors.primaryContent)
                 .accessibility(identifier: "errorMessage")
         } else {
             bubbleList
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/MatrixSDK/TemplateRoomListService.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/MatrixSDK/TemplateRoomListService.swift
index ce9b33b32..0d32be924 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/MatrixSDK/TemplateRoomListService.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/MatrixSDK/TemplateRoomListService.swift
@@ -34,7 +34,11 @@ class TemplateRoomListService: TemplateRoomListServiceProtocol {
     
     init(session: MXSession) {
         self.session = session
-        self.roomsSubject = CurrentValueSubject(session.rooms.map(TemplateRoomListRoom.init(mxRoom:)))
+        
+        let unencryptedRooms = session.rooms
+            .filter(\.summary.isEncrypted)
+            .map(TemplateRoomListRoom.init(mxRoom:))
+        self.roomsSubject = CurrentValueSubject(unencryptedRooms)
     }
 
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift
index 0b19063c7..346c0b805 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift
@@ -31,7 +31,7 @@ struct TemplateRoomList: View {
     
     var body: some View {
         listContent
-            .navigationTitle("Rooms")
+            .navigationTitle("Unencrypted Rooms")
             .toolbar {
                 ToolbarItem(placement: .primaryAction) {
                     Button(VectorL10n.done) {
@@ -45,6 +45,7 @@ struct TemplateRoomList: View {
     var listContent: some View {
         if viewModel.viewState.rooms.isEmpty {
             Text("No Rooms")
+                .foregroundColor(theme.colors.primaryContent)
                 .accessibility(identifier: "errorMessage")
         } else {
             ScrollView{
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift
index b9eed4d0d..7b0adcb10 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift
@@ -38,22 +38,21 @@ class TemplateRoomListViewModel: TemplateRoomListViewModelType, TemplateRoomList
     
     init(templateRoomListService: TemplateRoomListServiceProtocol) {
         self.templateRoomListService = templateRoomListService
-        
         super.init(initialViewState: Self.defaultState(templateRoomListService: templateRoomListService))
-        
-        templateRoomListService.roomsSubject
-            .map(TemplateRoomListStateAction.updateRooms)
-            .receive(on: DispatchQueue.main)
-            .sink(receiveValue: { [weak self] action in
-                self?.dispatch(action:action)
-            })
-            .store(in: &cancellables)
+        startObservingRooms()
     }
     
     private static func defaultState(templateRoomListService: TemplateRoomListServiceProtocol) -> TemplateRoomListViewState {
         return TemplateRoomListViewState(rooms: templateRoomListService.roomsSubject.value)
     }
     
+    private func startObservingRooms() {
+        let roomsUpdatePublisher = templateRoomListService.roomsSubject
+            .map(TemplateRoomListStateAction.updateRooms)
+            .eraseToAnyPublisher()
+            dispatch(actionPublisher: roomsUpdatePublisher)
+    }
+    
     // MARK: - Public
     
     override func process(viewAction: TemplateRoomListViewAction) {

From 21677d8336354df87b756e2e78cf01cca414542d Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Tue, 21 Sep 2021 09:55:44 +0100
Subject: [PATCH 18/59] Fix template script for example 2

---
 Tools/Templates/createSwiftUITwoScreen.sh | 51 +++++++++++++++++------
 1 file changed, 39 insertions(+), 12 deletions(-)

diff --git a/Tools/Templates/createSwiftUITwoScreen.sh b/Tools/Templates/createSwiftUITwoScreen.sh
index 931afc9ab..e82027fc1 100755
--- a/Tools/Templates/createSwiftUITwoScreen.sh
+++ b/Tools/Templates/createSwiftUITwoScreen.sh
@@ -1,15 +1,23 @@
 #!/bin/bash
 
-if [ ! $# -eq 2 ]; then
-    echo "Usage: ./createSwiftUITwoScreen.sh Folder MyScreenName"
+if [ ! $# -eq 4 ]; then
+    echo "Usage: ./createSwiftUITwoScreen.sh Folder MyRootCoordinatorName MyFirstScreenName MyDetailScreenName"
     exit 1
 fi
 
 MODULE_DIR="../../RiotSwiftUI/Modules"
 OUTPUT_DIR=$MODULE_DIR/$1
-SCREEN_NAME=$2
-SCREEN_VAR_NAME=`echo $SCREEN_NAME | awk '{ print tolower(substr($0, 1, 1)) substr($0, 2) }'`
-TEMPLATE_DIR=$MODULE_DIR/Template/TemplateAdvancedRoomsExample/TemplateRoomList/
+
+COORDINATOR_NAME=$2
+COORDINATOR_VAR_NAME=`echo $COORDINATOR_NAME | awk '{ print tolower(substr($0, 1, 1)) substr($0, 2) }'`
+FIRST_SCREEN_NAME=$3
+FIRST_SCREEN_VAR_NAME=`echo $FIRST_SCREEN_NAME | awk '{ print tolower(substr($0, 1, 1)) substr($0, 2) }'`
+DETAIL_SCREEN_NAME=$4
+DETAIL_SCREEN_VAR_NAME=`echo $DETAIL_SCREEN_NAME | awk '{ print tolower(substr($0, 1, 1)) substr($0, 2) }'`
+
+
+
+TEMPLATE_DIR=$MODULE_DIR/Template/TemplateAdvancedRoomsExample/
 if [ -e $OUTPUT_DIR ]; then
     echo "Error: Folder ${OUTPUT_DIR} already exists"
     exit 1
@@ -21,14 +29,33 @@ mkdir -p $OUTPUT_DIR
 cp -R $TEMPLATE_DIR $OUTPUT_DIR/
 
 cd $OUTPUT_DIR
+
+mv "TemplateRoomList" $FIRST_SCREEN_NAME
+mv "TemplateRoomChat" $DETAIL_SCREEN_NAME
+
 for file in $(find * -type f -print)
 do
-  echo "Building ${file/TemplateRoomList/$SCREEN_NAME}..."
-  perl -p -i -e "s/TemplateRoomList/"$SCREEN_NAME"/g" $file
-  perl -p -i -e "s/templateRoomList/"$SCREEN_VAR_NAME"/g" $file
+  if [[ $file == "Coordinator"* ]]; then
+    echo "Building ${file/TemplateRooms/$COORDINATOR_NAME}..."
+    perl -p -i -e "s/TemplateRooms/"$COORDINATOR_NAME"/g" $file
+    perl -p -i -e "s/templateRooms/"$COORDINATOR_VAR_NAME"/g" $file
 
-  # echo "// $ createScreen.sh $@" | cat - ${file} > /tmp/$$ && mv /tmp/$$ ${file}
-  # echo '// File created from TemplateAdvancedRoomsExample' | cat - ${file} > /tmp/$$ && mv /tmp/$$ ${file}
-
-  mv ${file} ${file/TemplateRoomList/$SCREEN_NAME}
+    mv ${file} ${file/TemplateRooms/$COORDINATOR_NAME}
+  elif [[ $file == $FIRST_SCREEN_NAME* ]]; then
+    echo "Building ${file/TemplateRoomList/$FIRST_SCREEN_NAME}..."
+    perl -p -i -e "s/TemplateRoomList/"$FIRST_SCREEN_NAME"/g" $file
+    perl -p -i -e "s/templateRoomList/"$FIRST_SCREEN_VAR_NAME"/g" $file
+    mv ${file} ${file/TemplateRoomList/$FIRST_SCREEN_NAME}
+  elif [[ $file == $DETAIL_SCREEN_NAME* ]]; then
+    echo "Building ${file/TemplateRoomChat/$DETAIL_SCREEN_NAME}..."
+    perl -p -i -e "s/TemplateRoomChat/"$DETAIL_SCREEN_NAME"/g" $file
+    perl -p -i -e "s/templateRoomChat/"$DETAIL_SCREEN_VAR_NAME"/g" $file
+    mv ${file} ${file/TemplateRoomChat/$DETAIL_SCREEN_NAME}
+  fi
+done
+
+for file in $(find * -type f -print)
+do
+  echo "// $ createSwiftUITwoScreen.sh $@" | cat - ${file} > /tmp/$$ && mv /tmp/$$ ${file}
+  echo '// File created from TemplateAdvancedRoomsExample' | cat - ${file} > /tmp/$$ && mv /tmp/$$ ${file}
 done

From 6bae045bad2c0c379d8554c862b7b91843943278 Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Thu, 23 Sep 2021 17:30:24 +0100
Subject: [PATCH 19/59] Include URL previews in
 addVerticalWhitespaceToString:forEvent: and remove
 heightForCellData:withMaximumWidth: from the various TextMsgBubbleCell
 subclasses.

Use the bubble cell data's available width when sizing URL previews and update the defaultAvailableWidth and reducedWidthThreshold accordingly.
---
 .../Room/CellData/RoomBubbleCellData.m        | 30 ++++++++++++++++++-
 .../Modules/Room/DataSources/RoomDataSource.m |  5 ++--
 .../RoomIncomingTextMsgBubbleCell.m           | 15 ----------
 ...mingTextMsgWithPaginationTitleBubbleCell.m | 15 ----------
 ...comingTextMsgWithoutSenderInfoBubbleCell.m | 15 ----------
 .../RoomOutgoingTextMsgBubbleCell.m           | 15 ----------
 ...tgoingTextMsgWithoutSenderInfoBubbleCell.m | 15 ----------
 .../Views/URLPreviews/URLPreviewView.swift    |  4 +--
 8 files changed, 33 insertions(+), 81 deletions(-)

diff --git a/Riot/Modules/Room/CellData/RoomBubbleCellData.m b/Riot/Modules/Room/CellData/RoomBubbleCellData.m
index e8c8dcdc3..b420ec258 100644
--- a/Riot/Modules/Room/CellData/RoomBubbleCellData.m
+++ b/Riot/Modules/Room/CellData/RoomBubbleCellData.m
@@ -535,6 +535,8 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
 {
     CGFloat additionalVerticalHeight = 0;
     
+    // Add vertical whitespace in case of a url preview.
+    additionalVerticalHeight+= [self urlPreviewHeightForEventId:eventId];
     // Add vertical whitespace in case of reactions.
     additionalVerticalHeight+= [self reactionHeightForEventId:eventId];
     // Add vertical whitespace in case of read receipts.
@@ -554,6 +556,7 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
     {
         NSString *eventId = bubbleComponent.event.eventId;
         
+        height+= [self urlPreviewHeightForEventId:eventId];
         height+= [self reactionHeightForEventId:eventId];
         height+= [self readReceiptHeightForEventId:eventId];
     }
@@ -593,6 +596,29 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
     self.shouldUpdateAdditionalContentHeight = YES;
 }
 
+- (CGFloat)urlPreviewHeightForEventId:(NSString*)eventId
+{
+    if (!RiotSettings.shared.roomScreenShowsURLPreviews || !self.showURLPreview)
+    {
+        return 0;
+    }
+    
+    NSInteger index = [self bubbleComponentIndexForEventId:eventId];
+    if (index >= bubbleComponents.count)
+    {
+        return 0;
+    }
+    
+    MXKRoomBubbleComponent *component = self.bubbleComponents[index];
+    if (!component.link)
+    {
+        return 0;
+    }
+    
+    return RoomBubbleCellLayout.urlPreviewViewTopMargin + [URLPreviewView contentViewHeightFor:self.urlPreviewData
+                                                                                       fitting:self.maxTextViewWidth];
+}
+
 - (CGFloat)reactionHeightForEventId:(NSString*)eventId
 {
     CGFloat height = 0;
@@ -1117,8 +1143,10 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
                                  success:^(URLPreviewData * _Nonnull urlPreviewData) {
         MXStrongifyAndReturnIfNil(self);
         
-        // Update the preview data and send a notification for refresh
+        // Update the preview data, indicate that the data layout needs refreshing and send a notification for refresh
         self.urlPreviewData = urlPreviewData;
+        [self setNeedsUpdateContent];
+        [self setNeedsUpdateAdditionalContentHeight];
         
         dispatch_async(dispatch_get_main_queue(), ^{
             [NSNotificationCenter.defaultCenter postNotificationName:URLPreviewDidUpdateNotification object:nil userInfo:userInfo];
diff --git a/Riot/Modules/Room/DataSources/RoomDataSource.m b/Riot/Modules/Room/DataSources/RoomDataSource.m
index d2a3ab48b..036153771 100644
--- a/Riot/Modules/Room/DataSources/RoomDataSource.m
+++ b/Riot/Modules/Room/DataSources/RoomDataSource.m
@@ -343,7 +343,7 @@ const CGFloat kTypingCellHeight = 24;
         // Handle read receipts and read marker display.
         // Ignore the read receipts on the bubble without actual display.
         // Ignore the read receipts on collapsed bubbles
-        if ((((self.showBubbleReceipts && cellData.readReceipts.count) || cellData.reactions.count || cellData.hasLink) && !isCollapsableCellCollapsed) || self.showReadMarker)
+        if ((((self.showBubbleReceipts && cellData.readReceipts.count) || cellData.reactions.count || cellData.showURLPreview) && !isCollapsableCellCollapsed) || self.showReadMarker)
         {
             // Read receipts container are inserted here on the right side into the content view.
             // Some vertical whitespaces are added in message text view (see RoomBubbleCellData class) to insert correctly multiple receipts.
@@ -388,8 +388,7 @@ const CGFloat kTypingCellHeight = 24;
                         [bubbleCell.tmpSubviews addObject:urlPreviewView];
                         
                         urlPreviewView.translatesAutoresizingMaskIntoConstraints = NO;
-                        // TODO: Use cellData.maxTextViewWidth when the view height is part of RoomBubbleCellData's additional height.
-                        urlPreviewView.availableWidth = tableView.contentSize.width;
+                        urlPreviewView.availableWidth = cellData.maxTextViewWidth;
                         [bubbleCell.contentView addSubview:urlPreviewView];
                         
                         CGFloat leftMargin = RoomBubbleCellLayout.reactionsViewLeftMargin;
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgBubbleCell.m
index 9ab51781e..d308fcfea 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgBubbleCell.m
@@ -39,19 +39,4 @@
     [self updateUserNameColor];
 }
 
-+ (CGFloat)heightForCellData:(MXKCellData *)cellData withMaximumWidth:(CGFloat)maxWidth
-{
-    RoomBubbleCellData *bubbleData = (RoomBubbleCellData*)cellData;
-    
-    // Include the URL preview in the height if necessary.
-    if (RiotSettings.shared.roomScreenShowsURLPreviews && bubbleData && bubbleData.showURLPreview)
-    {
-        CGFloat height = [super heightForCellData:cellData withMaximumWidth:maxWidth];
-        return height + RoomBubbleCellLayout.urlPreviewViewTopMargin + [URLPreviewView contentViewHeightFor:bubbleData.urlPreviewData
-                                                                                                    fitting:maxWidth];
-    }
-    
-    return [super heightForCellData:cellData withMaximumWidth:maxWidth];
-}
-
 @end
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithPaginationTitleBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithPaginationTitleBubbleCell.m
index 9a6185998..2e8bdeb34 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithPaginationTitleBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithPaginationTitleBubbleCell.m
@@ -45,19 +45,4 @@
     }
 }
 
-+ (CGFloat)heightForCellData:(MXKCellData *)cellData withMaximumWidth:(CGFloat)maxWidth
-{
-    RoomBubbleCellData *bubbleData = (RoomBubbleCellData*)cellData;
-    
-    // Include the URL preview in the height if necessary.
-    if (RiotSettings.shared.roomScreenShowsURLPreviews && bubbleData && bubbleData.showURLPreview)
-    {
-        CGFloat height = [super heightForCellData:cellData withMaximumWidth:maxWidth];
-        return height + RoomBubbleCellLayout.urlPreviewViewTopMargin + [URLPreviewView contentViewHeightFor:bubbleData.urlPreviewData
-                                                                                                    fitting:maxWidth];
-    }
-    
-    return [super heightForCellData:cellData withMaximumWidth:maxWidth];
-}
-
 @end
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithoutSenderInfoBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithoutSenderInfoBubbleCell.m
index 599940a69..56b0db94c 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithoutSenderInfoBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithoutSenderInfoBubbleCell.m
@@ -29,19 +29,4 @@
     self.messageTextView.tintColor = ThemeService.shared.theme.tintColor;
 }
 
-+ (CGFloat)heightForCellData:(MXKCellData *)cellData withMaximumWidth:(CGFloat)maxWidth
-{
-    RoomBubbleCellData *bubbleData = (RoomBubbleCellData*)cellData;
-    
-    // Include the URL preview in the height if necessary.
-    if (RiotSettings.shared.roomScreenShowsURLPreviews && bubbleData && bubbleData.showURLPreview)
-    {
-        CGFloat height = [super heightForCellData:cellData withMaximumWidth:maxWidth];
-        return height + RoomBubbleCellLayout.urlPreviewViewTopMargin + [URLPreviewView contentViewHeightFor:bubbleData.urlPreviewData
-                                                                                                    fitting:maxWidth];
-    }
-    
-    return [super heightForCellData:cellData withMaximumWidth:maxWidth];
-}
-
 @end
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgBubbleCell.m
index e2e39e2ef..374ed6da0 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgBubbleCell.m
@@ -40,19 +40,4 @@
     [self updateUserNameColor];
 }
 
-+ (CGFloat)heightForCellData:(MXKCellData *)cellData withMaximumWidth:(CGFloat)maxWidth
-{
-    RoomBubbleCellData *bubbleData = (RoomBubbleCellData*)cellData;
-    
-    // Include the URL preview in the height if necessary.
-    if (RiotSettings.shared.roomScreenShowsURLPreviews && bubbleData && bubbleData.showURLPreview)
-    {
-        CGFloat height = [super heightForCellData:cellData withMaximumWidth:maxWidth];
-        return height + RoomBubbleCellLayout.urlPreviewViewTopMargin + [URLPreviewView contentViewHeightFor:bubbleData.urlPreviewData
-                                                                                                    fitting:maxWidth];
-    }
-    
-    return [super heightForCellData:cellData withMaximumWidth:maxWidth];
-}
-
 @end
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.m
index d90f4eea4..1e0ffeb61 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.m
@@ -29,19 +29,4 @@
     self.messageTextView.tintColor = ThemeService.shared.theme.tintColor;
 }
 
-+ (CGFloat)heightForCellData:(MXKCellData *)cellData withMaximumWidth:(CGFloat)maxWidth
-{
-    RoomBubbleCellData *bubbleData = (RoomBubbleCellData*)cellData;
-    
-    // Include the URL preview in the height if necessary.
-    if (RiotSettings.shared.roomScreenShowsURLPreviews && bubbleData && bubbleData.showURLPreview)
-    {
-        CGFloat height = [super heightForCellData:cellData withMaximumWidth:maxWidth];
-        return height + RoomBubbleCellLayout.urlPreviewViewTopMargin + [URLPreviewView contentViewHeightFor:bubbleData.urlPreviewData
-                                                                                                    fitting:maxWidth];
-    }
-    
-    return [super heightForCellData:cellData withMaximumWidth:maxWidth];
-}
-
 @end
diff --git a/Riot/Modules/Room/Views/URLPreviews/URLPreviewView.swift b/Riot/Modules/Room/Views/URLPreviews/URLPreviewView.swift
index 923c57763..c730325f6 100644
--- a/Riot/Modules/Room/Views/URLPreviews/URLPreviewView.swift
+++ b/Riot/Modules/Room/Views/URLPreviews/URLPreviewView.swift
@@ -37,9 +37,9 @@ class URLPreviewView: UIView, NibLoadable, Themable {
         static let reducedWidth: CGFloat = 230
         
         /// The availableWidth value that the XIB file is designed against.
-        static let defaultAvailableWidth: CGFloat = 375
+        static let defaultAvailableWidth: CGFloat = 340
         /// The threshold value for available width that triggers the view to use a reducedWidth
-        static let reducedWidthThreshold: CGFloat = 320
+        static let reducedWidthThreshold: CGFloat = 285
     }
     
     // MARK: - Properties

From 9bf11fac0ca89d5763bc2b2a5da9b48c92de61bf Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Thu, 23 Sep 2021 23:57:54 +0100
Subject: [PATCH 20/59] Address comments, show unencrypted rooms,

retain viewModel and services in ScreenSates so you can interact with Previews after the first state.
---
 .../Modules/Common/Mock/MockScreenState.swift | 59 ++++++-----------
 .../Modules/Common/Mock/ScreenList.swift      | 12 ++--
 .../Modules/Common/Mock/ScreenStateInfo.swift | 27 ++++++++
 .../Modules/Common/Mock/StateRenderer.swift   | 63 +++++++++++++++++++
 .../MockTemplateUserProfileScreenState.swift  |  7 ++-
 .../View/TemplateUserProfile.swift            |  3 +-
 ...> TemplateRoomChatViewModelBindings.swift} |  0
 .../MatrixSDK/TemplateRoomChatService.swift   | 63 +++++++++----------
 .../MockTemplateRoomChatScreenState.swift     | 17 ++---
 .../Mock/MockTemplateRoomChatService.swift    |  3 +-
 .../View/TemplateRoomChat.swift               | 19 +++---
 .../ViewModel/TemplateRoomChatViewModel.swift |  8 +--
 .../MatrixSDK/TemplateRoomListService.swift   |  2 +-
 .../MockTemplateRoomListScreenState.swift     |  7 ++-
 .../View/TemplateRoomList.swift               |  6 +-
 .../ViewModel/TemplateRoomListViewModel.swift |  3 +-
 16 files changed, 185 insertions(+), 114 deletions(-)
 create mode 100644 RiotSwiftUI/Modules/Common/Mock/ScreenStateInfo.swift
 create mode 100644 RiotSwiftUI/Modules/Common/Mock/StateRenderer.swift
 rename RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/{TemplateRoomChatViewModelInput.swift => TemplateRoomChatViewModelBindings.swift} (100%)

diff --git a/RiotSwiftUI/Modules/Common/Mock/MockScreenState.swift b/RiotSwiftUI/Modules/Common/Mock/MockScreenState.swift
index 9a8a36ba2..4bf0df19d 100644
--- a/RiotSwiftUI/Modules/Common/Mock/MockScreenState.swift
+++ b/RiotSwiftUI/Modules/Common/Mock/MockScreenState.swift
@@ -21,7 +21,7 @@ import SwiftUI
 protocol MockScreenState {
     static var screenStates: [MockScreenState] { get }
     var screenType: Any.Type { get }
-    var screenView: AnyView { get }
+    var screenView: ([Any], AnyView) { get }
     var stateTitle: String { get }
 }
 
@@ -29,8 +29,24 @@ protocol MockScreenState {
 extension MockScreenState {
     
     /// Get a list of the screens for every screen state.
-    static var screensViews: [AnyView] {
-        screenStates.map(\.screenView)
+    static var stateRenderer: StateRenderer {
+        let depsAndViews  = screenStates.map(\.screenView)
+        let deps = depsAndViews.map({ $0.0 })
+        let views = depsAndViews.map({ $0.1 })
+        let stateTitles = screenStates.map(\.stateTitle)
+        let fullScreenTitles = screenStates.map(\.fullScreenTitle)
+        
+        var states = [ScreenStateInfo]()
+        for i in 0..<deps.count {
+            let dep = deps[i]
+            let view = views[i]
+            let stateTitle = stateTitles[i]
+            let stateKey = screenStateKeys[i]
+            let fullScreenTitle = fullScreenTitles[i]
+            states.append(ScreenStateInfo(dependencies: dep, view: view, stateTitle: stateTitle, fullScreenTitle:fullScreenTitle, stateKey: stateKey))
+        }
+        
+        return StateRenderer(states: states)
     }
     
     /// A unique key to identify each screen state.
@@ -40,42 +56,6 @@ extension MockScreenState {
         }
     }
     
-    /// Render each of the screen states in a group applying
-    /// any optional environment variables.
-    /// - Parameters:
-    ///   - themeId: id of theme to render the screens with.
-    ///   - locale: Locale to render the screens with.
-    ///   - sizeCategory: type sizeCategory to render the screens with.
-    ///   - addNavigation: Wether to wrap the screens in a navigation view.
-    /// - Returns: The group of screens
-    static func screenGroup(
-        themeId: ThemeIdentifier = .light,
-        locale: Locale = Locale.current,
-        sizeCategory: ContentSizeCategory = ContentSizeCategory.medium,
-        addNavigation: Bool = false
-    ) -> some View {
-        Group {
-            ForEach(0..<screensViews.count) { i in
-                wrapWithNavigation(addNavigation, view: screensViews[i])
-                    .previewDisplayName(screenStates[i].stateTitle)
-            }
-        }
-        .theme(themeId)
-        .environment(\.locale, locale)
-        .environment(\.sizeCategory, sizeCategory)
-    }
-    
-    @ViewBuilder
-    static func wrapWithNavigation<V: View>(_ wrap: Bool, view: V) -> some View {
-        if wrap {
-            NavigationView{
-                view
-            }
-        } else {
-            view
-        }
-    }
-
     /// A title to represent the screen and it's screen state
     var screenName: String {
         "\(String(describing: screenType.self))"
@@ -90,7 +70,6 @@ extension MockScreenState {
     var fullScreenTitle: String {
         "\(screenName): \(stateTitle)"
     }
-    
 
 }
 
diff --git a/RiotSwiftUI/Modules/Common/Mock/ScreenList.swift b/RiotSwiftUI/Modules/Common/Mock/ScreenList.swift
index 88847c790..ce9f09f35 100644
--- a/RiotSwiftUI/Modules/Common/Mock/ScreenList.swift
+++ b/RiotSwiftUI/Modules/Common/Mock/ScreenList.swift
@@ -19,12 +19,12 @@ import SwiftUI
 @available(iOS 14.0, *)
 struct ScreenList: View {
     
-    private var allStates: [MockScreenState]
-    private var allKeys: [String]
+    private var allStates: [ScreenStateInfo]
     
     init(screens: [MockScreenState.Type]) {
-        self.allStates = screens.flatMap{ $0.screenStates }
-        self.allKeys = screens.flatMap{ $0.screenStateKeys }
+        allStates = screens
+            .map({ $0.stateRenderer })
+            .flatMap{( $0.states )}
     }
     
     var body: some View {
@@ -32,9 +32,9 @@ struct ScreenList: View {
             List {
                 ForEach(0..<allStates.count) { i in
                     let state = allStates[i]
-                    NavigationLink(destination: state.screenView) {
+                    NavigationLink(destination: state.view) {
                         Text(state.fullScreenTitle)
-                            .accessibilityIdentifier(allKeys[i])
+                            .accessibilityIdentifier(state.stateKey)
                     }
                 }
             }
diff --git a/RiotSwiftUI/Modules/Common/Mock/ScreenStateInfo.swift b/RiotSwiftUI/Modules/Common/Mock/ScreenStateInfo.swift
new file mode 100644
index 000000000..5aa3d5909
--- /dev/null
+++ b/RiotSwiftUI/Modules/Common/Mock/ScreenStateInfo.swift
@@ -0,0 +1,27 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+import SwiftUI
+
+@available(iOS 14.0, *)
+struct ScreenStateInfo {
+    var dependencies: [Any]
+    var view: AnyView
+    var stateTitle: String
+    var fullScreenTitle: String
+    var stateKey: String
+}
diff --git a/RiotSwiftUI/Modules/Common/Mock/StateRenderer.swift b/RiotSwiftUI/Modules/Common/Mock/StateRenderer.swift
new file mode 100644
index 000000000..893573772
--- /dev/null
+++ b/RiotSwiftUI/Modules/Common/Mock/StateRenderer.swift
@@ -0,0 +1,63 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+import SwiftUI
+
+@available(iOS 14.0, *)
+class StateRenderer {
+    var states: [ScreenStateInfo]
+    init(states: [ScreenStateInfo]) {
+        self.states = states
+    }
+    
+    /// Render each of the screen states in a group applying
+    /// any optional environment variables.
+    /// - Parameters:
+    ///   - themeId: id of theme to render the screens with.
+    ///   - locale: Locale to render the screens with.
+    ///   - sizeCategory: type sizeCategory to render the screens with.
+    ///   - addNavigation: Wether to wrap the screens in a navigation view.
+    /// - Returns: The group of screens
+    func screenGroup(
+        themeId: ThemeIdentifier = .light,
+        locale: Locale = Locale.current,
+        sizeCategory: ContentSizeCategory = ContentSizeCategory.medium,
+        addNavigation: Bool = false
+    ) -> some View {
+        Group {
+            ForEach(0..<states.count) { i in
+                let state = self.states[i]
+                Self.wrapWithNavigation(addNavigation, view: state.view)
+                    .previewDisplayName(state.stateTitle)
+            }
+        }
+        .theme(themeId)
+        .environment(\.locale, locale)
+        .environment(\.sizeCategory, sizeCategory)
+    }
+    
+    @ViewBuilder
+    static func wrapWithNavigation<V: View>(_ wrap: Bool, view: V) -> some View {
+        if wrap {
+            NavigationView{
+                view
+            }
+        } else {
+            view
+        }
+    }
+}
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Service/Mock/MockTemplateUserProfileScreenState.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Service/Mock/MockTemplateUserProfileScreenState.swift
index 549716975..ae0dbd208 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Service/Mock/MockTemplateUserProfileScreenState.swift
+++ b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Service/Mock/MockTemplateUserProfileScreenState.swift
@@ -42,7 +42,7 @@ enum MockTemplateUserProfileScreenState: MockScreenState, CaseIterable {
     }
     
     /// Generate the view struct for the screen state.
-    var screenView: AnyView {
+    var screenView: ([Any], AnyView)  {
         let service: MockTemplateUserProfileService
         switch self {
         case .presence(let presence):
@@ -54,7 +54,10 @@ enum MockTemplateUserProfileScreenState: MockScreenState, CaseIterable {
         
         // can simulate service and viewModel actions here if needs be.
         
-        return AnyView(TemplateUserProfile(viewModel: viewModel.context)
+        return (
+            [service, viewModel],
+            AnyView(TemplateUserProfile(viewModel: viewModel.context)
                 .addDependency(MockAvatarService.example))
+        )
     }
 }
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/View/TemplateUserProfile.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/View/TemplateUserProfile.swift
index aa1d19dd2..2e861c3cd 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/View/TemplateUserProfile.swift
+++ b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/View/TemplateUserProfile.swift
@@ -73,7 +73,8 @@ struct TemplateUserProfile: View {
 
 @available(iOS 14.0, *)
 struct TemplateUserProfile_Previews: PreviewProvider {
+    static let stateRenderer = MockTemplateUserProfileScreenState.stateRenderer
     static var previews: some View {
-        MockTemplateUserProfileScreenState.screenGroup()
+        stateRenderer.screenGroup()
     }
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelInput.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelBindings.swift
similarity index 100%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelInput.swift
rename to RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelBindings.swift
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift
index ae14ab8fa..a749cde50 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift
@@ -26,9 +26,11 @@ class TemplateRoomChatService: TemplateRoomChatServiceProtocol {
     
     private let room: MXRoom
     private let eventFormatter: EventFormatter
-    private var roomState: MXRoomState?
+    private var timeline: MXEventTimeline?
+    private var eventBatch: [MXEvent]
     private var roomListenerReference: Any?
     
+    
     // MARK: Public
     private(set) var chatMessagesSubject: CurrentValueSubject<[TemplateRoomChatMessage], Never>
     private(set) var roomInitializationStatus: CurrentValueSubject<TemplateRoomChatRoomInitializationStatus, Never>
@@ -43,7 +45,7 @@ class TemplateRoomChatService: TemplateRoomChatServiceProtocol {
         self.eventFormatter = EventFormatter(matrixSession: room.mxSession)
         self.chatMessagesSubject = CurrentValueSubject([])
         self.roomInitializationStatus = CurrentValueSubject(.notInitialized)
-        
+        self.eventBatch = [MXEvent]()
         initializeRoom()
     }
     
@@ -61,35 +63,31 @@ class TemplateRoomChatService: TemplateRoomChatServiceProtocol {
     // MARK: Private
     
     private func initializeRoom(){
-        room.state { [weak self] roomState in
-            guard let self = self else { return }
-            if let roomState = roomState {
-                self.roomState = roomState
-                self.roomInitializationStatus.value = .initialized
-                self.loadInitialMessages()
-                self.startListeningToRoomEvents()
-            } else {
-                self.roomInitializationStatus.value = .failedToInitialize
-            }
-        }
-    }
-    
-    private func loadInitialMessages() {
-        let batch = room.enumeratorForStoredMessages.nextEventsBatch(200)
-        let messageBatch = self.mapChatMessages(from: batch ?? [])
-        self.chatMessagesSubject.value = messageBatch
-    }
-    
-    private func startListeningToRoomEvents(){
-        roomListenerReference = room.listen { [weak self] event, directionId, roomState in
-            let direction = MXTimelineDirection(identifer: directionId)
+        room.liveTimeline { [weak self] timeline in
             guard let self = self,
-                  let event = event else { return }
-            if let roomState = roomState {
-                self.roomState = roomState
+                  let timeline = timeline
+            else {
+                return
             }
-            if direction == .forwards &&  event.type == kMXEventTypeStringRoomMessage {
-                self.appendNewMessage(event: event)
+            self.timeline = timeline
+            timeline.resetPagination()
+            self.roomListenerReference = timeline.listenToEvents([.roomMessage], { [weak self] event, direction, roomState in
+                guard let self = self else { return }
+                if direction == .backwards {
+                    self.eventBatch.append(event)
+                } else {
+                    self.chatMessagesSubject.value += self.mapChatMessages(from: [event])
+                }
+                
+            })
+            timeline.paginate(200, direction: .backwards, onlyFromStore: false) { result in
+                guard result.isSuccess else {
+                    self.roomInitializationStatus.value = .failedToInitialize
+                    return
+                }
+                let sortedBatch = self.eventBatch.sorted(by: { $0.originServerTs < $1.originServerTs})
+                self.chatMessagesSubject.value = self.mapChatMessages(from: sortedBatch)
+                self.roomInitializationStatus.value = .initialized
             }
         }
     }
@@ -119,16 +117,11 @@ class TemplateRoomChatService: TemplateRoomChatServiceProtocol {
     }
     
     private func senderForMessage(event: MXEvent) -> TemplateRoomChatMember? {
-        guard let sender = event.sender, let roomState = roomState else {
+        guard let sender = event.sender, let roomState = timeline?.state else {
             return nil
         }
         let displayName = eventFormatter.senderDisplayName(for: event, with: roomState)
         let avatarUrl = eventFormatter.senderAvatarUrl(for: event, with: roomState)
         return TemplateRoomChatMember(id: sender, avatarUrl: avatarUrl, displayName: displayName)
     }
-    
-    private func appendNewMessage(event: MXEvent) {
-        chatMessagesSubject.value += mapChatMessages(from: [event])
-    }
-    
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatScreenState.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatScreenState.swift
index ce2b8db3d..3a3fad18d 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatScreenState.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatScreenState.swift
@@ -36,17 +36,17 @@ enum MockTemplateRoomChatScreenState: MockScreenState, CaseIterable {
     }
     
     /// Generate the view struct for the screen state.
-    var screenView: AnyView {
+    var screenView: ([Any], AnyView) {
         let service: MockTemplateRoomChatService
         switch self {
         case .noMessages:
             service = MockTemplateRoomChatService(messages: [])
             service.simulateUpdate(initializationStatus: .initialized)
         case .messages:
-             service = MockTemplateRoomChatService()
-             service.simulateUpdate(initializationStatus: .initialized)
+            service = MockTemplateRoomChatService()
+            service.simulateUpdate(initializationStatus: .initialized)
         case .initializingRoom:
-             service = MockTemplateRoomChatService()
+            service = MockTemplateRoomChatService()
         case .failedToInitializeRoom:
             service = MockTemplateRoomChatService()
             service.simulateUpdate(initializationStatus: .failedToInitialize)
@@ -54,8 +54,11 @@ enum MockTemplateRoomChatScreenState: MockScreenState, CaseIterable {
         let viewModel = TemplateRoomChatViewModel(templateRoomChatService: service)
         
         // can simulate service and viewModel actions here if needs be.
-    
-        return AnyView(TemplateRoomChat(viewModel: viewModel.context)
-                .addDependency(MockAvatarService.example))
+        
+        return (
+            [service, viewModel],
+            AnyView(TemplateRoomChat(viewModel: viewModel.context)
+                        .addDependency(MockAvatarService.example))
+        )
     }
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatService.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatService.swift
index a967450eb..8fa354911 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatService.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatService.swift
@@ -46,7 +46,8 @@ class MockTemplateRoomChatService: TemplateRoomChatServiceProtocol {
     func simulateUpdate(initializationStatus: TemplateRoomChatRoomInitializationStatus) {
         self.roomInitializationStatus.value = initializationStatus
     }
+    
     func simulateUpdate(messages: [TemplateRoomChatMessage]) {
-        self.chatMessagesSubject.send(messages)
+        self.chatMessagesSubject.value = messages
     }
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
index eae5f5cc8..736ac603c 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
@@ -15,6 +15,7 @@
 //
 
 import SwiftUI
+import Combine
 
 @available(iOS 14.0, *)
 struct TemplateRoomChat: View {
@@ -88,15 +89,15 @@ struct TemplateRoomChat: View {
                             .id(bubble.id)
                     }
                 }
-                .onAppear {
-                    // Start at the bottom
-                    reader.scrollTo(viewModel.viewState.bubbles.last?.id, anchor: .bottom)
+                .onAppear{
+                    guard let lastBubbleId = viewModel.viewState.bubbles.last?.id
+                    else { return }
+                    reader.scrollTo(lastBubbleId, anchor: .bottom)
                 }
                 .onChange(of: itemCount) { _ in
-                    // When new items are added animate to the new items
-                    withAnimation {
-                        reader.scrollTo(viewModel.viewState.bubbles.last?.id, anchor: .bottom)
-                    }
+                    guard let lastBubbleId = viewModel.viewState.bubbles.last?.id
+                    else { return }
+                    reader.scrollTo(lastBubbleId, anchor: .bottom)
                 }
                 // When the scroll content takes less than the screen space align at the top
                 .frame(maxHeight: .infinity, alignment: .top)
@@ -113,7 +114,6 @@ struct TemplateRoomChat: View {
         }
     }
     
-    
     private var itemCount: Int {
         return viewModel.viewState
             .bubbles
@@ -127,7 +127,8 @@ struct TemplateRoomChat: View {
 
 @available(iOS 14.0, *)
 struct TemplateRoomChat_Previews: PreviewProvider {
+    static let stateRenderer = MockTemplateRoomChatScreenState.stateRenderer
     static var previews: some View {
-        MockTemplateRoomChatScreenState.screenGroup(addNavigation: true)
+        stateRenderer.screenGroup(addNavigation: true)
     }
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
index fd95ea3bf..2be3c5818 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
@@ -43,8 +43,8 @@ class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChat
     init(templateRoomChatService: TemplateRoomChatServiceProtocol) {
         self.templateRoomChatService = templateRoomChatService
         super.init(initialViewState: Self.defaultState(templateRoomChatService: templateRoomChatService))
-        setupRoomInitializationObserving()
         setupMessageObserving()
+        setupRoomInitializationObserving()
     }
     
     private func setupRoomInitializationObserving() {
@@ -52,7 +52,7 @@ class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChat
             .roomInitializationStatus
             .map(TemplateRoomChatStateAction.updateRoomInitializationStatus)
             .eraseToAnyPublisher()
-        
+
         dispatch(actionPublisher: initializationPublisher)
     }
         
@@ -66,9 +66,8 @@ class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChat
     }
     
     private static func defaultState(templateRoomChatService: TemplateRoomChatServiceProtocol) -> TemplateRoomChatViewState {
-        let bubbles = makeBubbles(messages: templateRoomChatService.chatMessagesSubject.value)
         let bindings = TemplateRoomChatViewModelBindings(messageInput: "")
-        return TemplateRoomChatViewState(roomInitializationStatus: templateRoomChatService.roomInitializationStatus.value, roomName: templateRoomChatService.roomName, bubbles: bubbles, bindings: bindings)
+        return TemplateRoomChatViewState(roomInitializationStatus: .notInitialized, roomName: templateRoomChatService.roomName, bubbles: [], bindings: bindings)
     }
     
     private static func makeBubbles(messages: [TemplateRoomChatMessage]) -> [TemplateRoomChatBubble] {
@@ -134,7 +133,6 @@ class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChat
         case .updateBubbles(let bubbles):
             state.bubbles = bubbles
         }
-        UILog.debug("[TemplateRoomChatViewModel] reducer with action \(action) produced state: \(state)")
     }
     
     // MARK: - Private
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/MatrixSDK/TemplateRoomListService.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/MatrixSDK/TemplateRoomListService.swift
index 0d32be924..1fb747974 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/MatrixSDK/TemplateRoomListService.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/MatrixSDK/TemplateRoomListService.swift
@@ -36,7 +36,7 @@ class TemplateRoomListService: TemplateRoomListServiceProtocol {
         self.session = session
         
         let unencryptedRooms = session.rooms
-            .filter(\.summary.isEncrypted)
+            .filter({ !$0.summary.isEncrypted })
             .map(TemplateRoomListRoom.init(mxRoom:))
         self.roomsSubject = CurrentValueSubject(unencryptedRooms)
     }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/Mock/MockTemplateRoomListScreenState.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/Mock/MockTemplateRoomListScreenState.swift
index 207fa9408..168b31297 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/Mock/MockTemplateRoomListScreenState.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/Mock/MockTemplateRoomListScreenState.swift
@@ -34,7 +34,7 @@ enum MockTemplateRoomListScreenState: MockScreenState, CaseIterable {
     }
     
     /// Generate the view struct for the screen state.
-    var screenView: AnyView {
+    var screenView: ([Any], AnyView) {
         let service: MockTemplateRoomListService
         switch self {
         case .noRooms:
@@ -46,7 +46,10 @@ enum MockTemplateRoomListScreenState: MockScreenState, CaseIterable {
         
         // can simulate service and viewModel actions here if needs be.
         
-        return AnyView(TemplateRoomList(viewModel: viewModel.context)
+        return (
+            [service, viewModel],
+            AnyView(TemplateRoomList(viewModel: viewModel.context)
                 .addDependency(MockAvatarService.example))
+        )
     }
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift
index 346c0b805..2ecd36427 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift
@@ -68,9 +68,9 @@ struct TemplateRoomList: View {
 
 @available(iOS 14.0, *)
 struct TemplateRoomList_Previews: PreviewProvider {
+    
+    static let stateRenderer = MockTemplateRoomListScreenState.stateRenderer
     static var previews: some View {
-        MockTemplateRoomListScreenState
-            .screenGroup(addNavigation: true)
-        
+        stateRenderer.screenGroup(addNavigation: true)
     }
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift
index 7b0adcb10..338146605 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift
@@ -50,7 +50,7 @@ class TemplateRoomListViewModel: TemplateRoomListViewModelType, TemplateRoomList
         let roomsUpdatePublisher = templateRoomListService.roomsSubject
             .map(TemplateRoomListStateAction.updateRooms)
             .eraseToAnyPublisher()
-            dispatch(actionPublisher: roomsUpdatePublisher)
+        dispatch(actionPublisher: roomsUpdatePublisher)
     }
     
     // MARK: - Public
@@ -69,7 +69,6 @@ class TemplateRoomListViewModel: TemplateRoomListViewModelType, TemplateRoomList
         case .updateRooms(let rooms):
             state.rooms = rooms
         }
-        UILog.debug("[TemplateRoomListViewModel] reducer with action \(action) produced state: \(state)")
     }
     
     // MARK: - Private

From 6142ce51a9b1574d5c1df2b79afceabdb956b4c5 Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Fri, 24 Sep 2021 15:19:24 +0100
Subject: [PATCH 21/59] Use setNeedsUpdateContent instead of setting the
 attributed string to nil.

---
 Riot/Modules/Room/CellData/RoomBubbleCellData.m | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Riot/Modules/Room/CellData/RoomBubbleCellData.m b/Riot/Modules/Room/CellData/RoomBubbleCellData.m
index b420ec258..2e8c742ae 100644
--- a/Riot/Modules/Room/CellData/RoomBubbleCellData.m
+++ b/Riot/Modules/Room/CellData/RoomBubbleCellData.m
@@ -177,8 +177,8 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
         // Increase maximum number of components
         self.maxComponentCount = 20;
 
-        // Reset attributedTextMessage to force reset MXKRoomCellData parameters
-        self.attributedTextMessage = nil;
+        // Indicate that the text message layout should be recomputed.
+        [self setNeedsUpdateContent];
         
         // Load a url preview if a link was detected
         if (self.hasLink)
@@ -331,7 +331,7 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
         // Refresh only cells series header
         if (self.collapsedAttributedTextMessage && self.nextCollapsableCellData)
         {
-            attributedTextMessage = nil;
+            [self setNeedsUpdateContent];
         }
     }
 }
@@ -666,8 +666,8 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
         // Update flag
         _containsLastMessage = containsLastMessage;
         
-        // Recompute the text message layout
-        self.attributedTextMessage = nil;
+        // Indicate that the text message layout should be recomputed.
+        [self setNeedsUpdateContent];
     }
 }
 
@@ -679,8 +679,8 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
         // Update flag
         _selectedEventId = selectedEventId;
         
-        // Recompute the text message layout
-        self.attributedTextMessage = nil;
+        // Indicate that the text message layout should be recomputed.
+        [self setNeedsUpdateContent];
     }
 }
 
@@ -1143,7 +1143,7 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
                                  success:^(URLPreviewData * _Nonnull urlPreviewData) {
         MXStrongifyAndReturnIfNil(self);
         
-        // Update the preview data, indicate that the data layout needs refreshing and send a notification for refresh
+        // Update the preview data, indicate that the text message layout needs refreshing and send a notification for refresh
         self.urlPreviewData = urlPreviewData;
         [self setNeedsUpdateContent];
         [self setNeedsUpdateAdditionalContentHeight];

From 67f4b5bb43fe518fdc210593a32b473cb014b6da Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Fri, 24 Sep 2021 15:33:04 +0100
Subject: [PATCH 22/59] Rename setNeedsUpdateContent to invalidateTextLayout.

---
 Riot/Modules/Room/CellData/RoomBubbleCellData.m | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Riot/Modules/Room/CellData/RoomBubbleCellData.m b/Riot/Modules/Room/CellData/RoomBubbleCellData.m
index 2e8c742ae..f0ee1f4b2 100644
--- a/Riot/Modules/Room/CellData/RoomBubbleCellData.m
+++ b/Riot/Modules/Room/CellData/RoomBubbleCellData.m
@@ -178,7 +178,7 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
         self.maxComponentCount = 20;
 
         // Indicate that the text message layout should be recomputed.
-        [self setNeedsUpdateContent];
+        [self invalidateTextLayout];
         
         // Load a url preview if a link was detected
         if (self.hasLink)
@@ -331,7 +331,7 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
         // Refresh only cells series header
         if (self.collapsedAttributedTextMessage && self.nextCollapsableCellData)
         {
-            [self setNeedsUpdateContent];
+            [self invalidateTextLayout];
         }
     }
 }
@@ -667,7 +667,7 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
         _containsLastMessage = containsLastMessage;
         
         // Indicate that the text message layout should be recomputed.
-        [self setNeedsUpdateContent];
+        [self invalidateTextLayout];
     }
 }
 
@@ -680,7 +680,7 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
         _selectedEventId = selectedEventId;
         
         // Indicate that the text message layout should be recomputed.
-        [self setNeedsUpdateContent];
+        [self invalidateTextLayout];
     }
 }
 
@@ -1145,7 +1145,7 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
         
         // Update the preview data, indicate that the text message layout needs refreshing and send a notification for refresh
         self.urlPreviewData = urlPreviewData;
-        [self setNeedsUpdateContent];
+        [self invalidateTextLayout];
         [self setNeedsUpdateAdditionalContentHeight];
         
         dispatch_async(dispatch_get_main_queue(), ^{

From d230a76c400a8665abc3041e27a9b0627f202550 Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Fri, 24 Sep 2021 17:06:50 +0100
Subject: [PATCH 23/59] Rename refreshAttributedTextMessage to
 makeAttributedString to indicate that it doesn't affect the
 attributedTextMessage.

---
 Riot/Modules/Room/CellData/RoomBubbleCellData.m | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Riot/Modules/Room/CellData/RoomBubbleCellData.m b/Riot/Modules/Room/CellData/RoomBubbleCellData.m
index f0ee1f4b2..6755e96fe 100644
--- a/Riot/Modules/Room/CellData/RoomBubbleCellData.m
+++ b/Riot/Modules/Room/CellData/RoomBubbleCellData.m
@@ -241,12 +241,12 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
             {
                 MXLogDebug(@"[RoomBubbleCellData] attributedTextMessage called on wrong thread");
                 dispatch_sync(dispatch_get_main_queue(), ^{
-                    self.attributedTextMessage = [self refreshAttributedTextMessage];
+                    self.attributedTextMessage = [self makeAttributedString];
                 });
             }
             else
             {
-                self.attributedTextMessage = [self refreshAttributedTextMessage];
+                self.attributedTextMessage = [self makeAttributedString];
             }
         }
     }
@@ -338,7 +338,7 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
 
 #pragma mark - 
 
-- (NSAttributedString*)refreshAttributedTextMessage
+- (NSAttributedString*)makeAttributedString
 {
     // CAUTION: This method must be called on the main thread.
 

From e0bddb58e35496b0aa5bf9e33e96149a8ce20760 Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Fri, 24 Sep 2021 17:21:33 +0100
Subject: [PATCH 24/59] Don't need to take modifiers as parameter to
 screenGroup. Fix example theming.

---
 RiotSwiftUI/Modules/Common/Mock/StateRenderer.swift       | 7 +------
 .../TemplateRoomChat/View/TemplateRoomChat.swift          | 2 ++
 .../View/TemplateRoomChatBubbleMessage.swift              | 3 ++-
 .../View/TemplateRoomChatBubbleView.swift                 | 8 +++++++-
 .../TemplateRoomList/View/TemplateRoomList.swift          | 3 ++-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/RiotSwiftUI/Modules/Common/Mock/StateRenderer.swift b/RiotSwiftUI/Modules/Common/Mock/StateRenderer.swift
index 893573772..f5beed2ed 100644
--- a/RiotSwiftUI/Modules/Common/Mock/StateRenderer.swift
+++ b/RiotSwiftUI/Modules/Common/Mock/StateRenderer.swift
@@ -33,9 +33,6 @@ class StateRenderer {
     ///   - addNavigation: Wether to wrap the screens in a navigation view.
     /// - Returns: The group of screens
     func screenGroup(
-        themeId: ThemeIdentifier = .light,
-        locale: Locale = Locale.current,
-        sizeCategory: ContentSizeCategory = ContentSizeCategory.medium,
         addNavigation: Bool = false
     ) -> some View {
         Group {
@@ -45,9 +42,6 @@ class StateRenderer {
                     .previewDisplayName(state.stateTitle)
             }
         }
-        .theme(themeId)
-        .environment(\.locale, locale)
-        .environment(\.sizeCategory, sizeCategory)
     }
     
     @ViewBuilder
@@ -55,6 +49,7 @@ class StateRenderer {
         if wrap {
             NavigationView{
                 view
+                    .navigationBarTitleDisplayMode(.inline)
             }
         } else {
             view
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
index 736ac603c..c714ff34b 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
@@ -54,6 +54,7 @@ struct TemplateRoomChat: View {
             .padding()
             
         }
+        .background(theme.colors.background)
         .navigationTitle(viewModel.viewState.roomName ?? "Chat")
         .toolbar {
             ToolbarItem(placement: .primaryAction) {
@@ -66,6 +67,7 @@ struct TemplateRoomChat: View {
     private var roomContent: some View {
         if case .notInitialized = viewModel.viewState.roomInitializationStatus {
             ProgressView()
+                .progressViewStyle(CircularProgressViewStyle(tint: theme.colors.primaryContent))
                 .accessibility(identifier: "loadingProgress")
         } else if case .failedToInitialize = viewModel.viewState.roomInitializationStatus {
             Text("Sorry, We failed to load the room.")
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleMessage.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleMessage.swift
index f6569a970..4ff790148 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleMessage.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleMessage.swift
@@ -41,7 +41,8 @@ struct TemplateRoomChatBubbleMessage: View {
 
 @available(iOS 14.0, *)
 struct TemplateRoomChatBubbleMessage_Previews: PreviewProvider {
+    static let message = TemplateRoomChatMessageTextContent(body: "Hello")
     static var previews: some View {
-        EmptyView()
+        TemplateRoomChatBubbleMessage(messageContent: message)
     }
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleView.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleView.swift
index a996bca52..b324a9565 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleView.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChatBubbleView.swift
@@ -57,7 +57,13 @@ struct TemplateRoomChatBubbleView_Previews: PreviewProvider {
     static let bubble = TemplateRoomChatBubble(
         id: "111",
         sender: MockTemplateRoomChatService.mockMessages[0].sender,
-        items: []
+        items: [
+            TemplateRoomChatBubbleItem(
+                id: "222",
+                timestamp: Date(),
+                content: .message(.text(TemplateRoomChatMessageTextContent(body: "Hello")))
+            )
+        ]
     )
     static var previews: some View {
         TemplateRoomChatBubbleView(bubble: bubble)
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift
index 2ecd36427..1e78b40ec 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift
@@ -59,7 +59,7 @@ struct TemplateRoomList: View {
                     }
                 }
                 .frame(maxHeight: .infinity, alignment: .top)
-            }
+            }.background(theme.colors.background)
         }
     }
 }
@@ -72,5 +72,6 @@ struct TemplateRoomList_Previews: PreviewProvider {
     static let stateRenderer = MockTemplateRoomListScreenState.stateRenderer
     static var previews: some View {
         stateRenderer.screenGroup(addNavigation: true)
+            .theme(.dark)
     }
 }

From 755846a384ec4211b54475989164b623ec46bfe6 Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Mon, 27 Sep 2021 17:06:36 +0200
Subject: [PATCH 25/59] Update PR template with a checkbox for accessibility
 and self review.

---
 .github/PULL_REQUEST_TEMPLATE.md | 12 +++++++-----
 changelog.d/4920.doc             |  1 +
 2 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 changelog.d/4920.doc

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index c45428232..d9c3901ec 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,8 +1,10 @@
 ### Pull Request Checklist
 
-* [ ] I read the [contributing guide](https://github.com/vector-im/element-ios/blob/develop/CONTRIBUTING.md)
-* [ ] UI change has been tested on both light and dark themes, in portrait and landscape orientations and on iPhone and iPad simulators
+- [ ] I read the [contributing guide](https://github.com/vector-im/element-ios/blob/develop/CONTRIBUTING.md)
+- [ ] UI change has been tested on both light and dark themes, in portrait and landscape orientations and on iPhone and iPad simulators
+- [ ] Accessibility has been taken into account.
 * [ ] Pull request is based on the develop branch
-* [ ] Pull request contains a [changelog file](https://github.com/matrix-org/matrix-ios-sdk/blob/develop/CONTRIBUTING.md#changelog) in ./changelog.d
-* [ ] Pull request includes screenshots or videos of UI changes
-* [ ] Pull request includes a [sign off](https://github.com/matrix-org/matrix-ios-sdk/blob/develop/CONTRIBUTING.md#sign-off)
+- [ ] Pull request contains a [changelog file](https://github.com/matrix-org/matrix-ios-sdk/blob/develop/CONTRIBUTING.md#changelog) in ./changelog.d
+- [ ] You've made a self review of your PR
+- [ ] Pull request includes screenshots or videos of UI changes
+- [ ] Pull request includes a [sign off](https://github.com/matrix-org/matrix-ios-sdk/blob/develop/CONTRIBUTING.md#sign-off)
diff --git a/changelog.d/4920.doc b/changelog.d/4920.doc
new file mode 100644
index 000000000..746bc48aa
--- /dev/null
+++ b/changelog.d/4920.doc
@@ -0,0 +1 @@
+Update PR template with a checkbox for accessibility and self review.
\ No newline at end of file

From 6745fe48f4a172cde6caf2b280868cca91f4886c Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Mon, 27 Sep 2021 18:15:48 +0100
Subject: [PATCH 26/59] Move URL preview properties from RoomBubbleCellData in
 MXKRoomBubbleComponent.

Stop breaking up the bubble data for links now that vertical whitespace is added.
---
 .../Room/CellData/RoomBubbleCellData.h        |  11 --
 .../Room/CellData/RoomBubbleCellData.m        | 134 +++++++-----------
 .../Modules/Room/DataSources/RoomDataSource.m |  34 +++--
 3 files changed, 72 insertions(+), 107 deletions(-)

diff --git a/Riot/Modules/Room/CellData/RoomBubbleCellData.h b/Riot/Modules/Room/CellData/RoomBubbleCellData.h
index 1e55e8446..6b2bffd27 100644
--- a/Riot/Modules/Room/CellData/RoomBubbleCellData.h
+++ b/Riot/Modules/Room/CellData/RoomBubbleCellData.h
@@ -15,7 +15,6 @@
  */
 
 #import <MatrixKit/MatrixKit.h>
-@class URLPreviewData;
 
 extern NSString *const URLPreviewDidUpdateNotification;
 
@@ -81,16 +80,6 @@ typedef NS_ENUM(NSInteger, RoomBubbleCellDataTag)
  */
 @property(nonatomic, readonly) CGFloat additionalContentHeight;
 
-/**
- The data necessary to show a URL preview.
- */
-@property (nonatomic) URLPreviewData *urlPreviewData;
-
-/**
- Whether a URL preview should be displayed for this cell.
- */
-@property (nonatomic) BOOL showURLPreview;
-
 /**
  MXKeyVerification object associated to key verification event when using key verification by direct message.
  */
diff --git a/Riot/Modules/Room/CellData/RoomBubbleCellData.m b/Riot/Modules/Room/CellData/RoomBubbleCellData.m
index 6755e96fe..994b9b386 100644
--- a/Riot/Modules/Room/CellData/RoomBubbleCellData.m
+++ b/Riot/Modules/Room/CellData/RoomBubbleCellData.m
@@ -180,11 +180,8 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
         // Indicate that the text message layout should be recomputed.
         [self invalidateTextLayout];
         
-        // Load a url preview if a link was detected
-        if (self.hasLink)
-        {
-            [self loadURLPreview];
-        }
+        // Load a url preview if necessary.
+        [self refreshURLPreviewForEventId:event.eventId];
     }
     
     return self;
@@ -194,11 +191,8 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
 {
     NSUInteger retVal = [super updateEvent:eventId withEvent:event];
 
-    // Update any URL preview data too.
-    if (self.hasLink)
-    {
-        [self loadURLPreview];
-    }
+    // Update any URL preview data as necessary.
+    [self refreshURLPreviewForEventId:event.eventId];
 
     return retVal;
 }
@@ -254,14 +248,6 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
     return attributedTextMessage;
 }
 
-- (BOOL)hasLink
-{
-    // Only check the last bubble component as -addEvent:andRoomState: will break up
-    // the data that way, to always show a URL preview at the bottom of the cell.
-    MXKRoomBubbleComponent *lastComponent = bubbleComponents.lastObject;
-    return (lastComponent && lastComponent.link);
-}
-
 - (BOOL)hasNoDisplay
 {
     if (self.tag == RoomBubbleCellDataTagKeyVerificationNoDisplay)
@@ -598,24 +584,13 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
 
 - (CGFloat)urlPreviewHeightForEventId:(NSString*)eventId
 {
-    if (!RiotSettings.shared.roomScreenShowsURLPreviews || !self.showURLPreview)
+    MXKRoomBubbleComponent *component = [self bubbleComponentWithLinkForEventId:eventId];
+    if (!component.showURLPreview)
     {
         return 0;
     }
     
-    NSInteger index = [self bubbleComponentIndexForEventId:eventId];
-    if (index >= bubbleComponents.count)
-    {
-        return 0;
-    }
-    
-    MXKRoomBubbleComponent *component = self.bubbleComponents[index];
-    if (!component.link)
-    {
-        return 0;
-    }
-    
-    return RoomBubbleCellLayout.urlPreviewViewTopMargin + [URLPreviewView contentViewHeightFor:self.urlPreviewData
+    return RoomBubbleCellLayout.urlPreviewViewTopMargin + [URLPreviewView contentViewHeightFor:component.urlPreviewData
                                                                                        fitting:self.maxTextViewWidth];
 }
 
@@ -748,6 +723,28 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
     return selectedComponentIndex;
 }
 
+- (MXKRoomBubbleComponent *)bubbleComponentWithLinkForEventId:(NSString *)eventId
+{
+    if (!RiotSettings.shared.roomScreenShowsURLPreviews)
+    {
+        return nil;
+    }
+    
+    NSInteger index = [self bubbleComponentIndexForEventId:eventId];
+    if (index == NSNotFound)
+    {
+        return nil;
+    }
+    
+    MXKRoomBubbleComponent *component = self.bubbleComponents[index];
+    if (!component.link)
+    {
+        return nil;
+    }
+    
+    return component;
+}
+
 #pragma mark -
 
 + (NSAttributedString *)timestampVerticalWhitespace
@@ -801,19 +798,6 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
 {
     BOOL shouldAddEvent = YES;
     
-    // For unencrypted rooms, don't allow any events to be added
-    // after a bubble component that contains a link so than any URL
-    // preview is for the last bubble component in the cell.
-    if (!self.isEncryptedRoom && self.hasLink && self.bubbleComponents.lastObject)
-    {
-        MXKRoomBubbleComponent *lastComponent = self.bubbleComponents.lastObject;
-        
-        if (event.originServerTs > lastComponent.event.originServerTs)
-        {
-            shouldAddEvent = NO;
-        }
-    }
-    
     switch (self.tag)
     {
         case RoomBubbleCellDataTagKeyVerificationNoDisplay:
@@ -857,27 +841,9 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
                 if ([messageType isEqualToString:kMXMessageTypeKeyVerificationRequest])
                 {
                     shouldAddEvent = NO;
-                    break;
                 }
-                
-                // If the message contains a link and comes before this cell data, don't add it to
-                // ensure that a URL preview is only shown for the last component on some new cell data.
-                if (!self.isEncryptedRoom && self.bubbleComponents.firstObject)
-                {
-                    MXKRoomBubbleComponent *firstComponent = self.bubbleComponents.firstObject;
-                    
-                    if (event.originServerTs < firstComponent.event.originServerTs)
-                    {
-                        NSString *messageBody = event.content[@"body"];
-                        if (messageBody && [messageBody mxk_firstURLDetected])
-                        {
-                            shouldAddEvent = NO;
-                        }
-                        break;
-                    }
-                }
-            }
                 break;
+            }
             case MXEventTypeKeyVerificationStart:
             case MXEventTypeKeyVerificationAccept:
             case MXEventTypeKeyVerificationKey:
@@ -928,14 +894,12 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
     
     if (shouldAddEvent)
     {
-        BOOL hadLink = self.hasLink;
-        
         shouldAddEvent = [super addEvent:event andRoomState:roomState];
         
-        // If the cell data now contains a link, set the preview data.
-        if (shouldAddEvent && self.hasLink && !hadLink)
+        // If the event was added, load any url preview data if necessary.
+        if (shouldAddEvent)
         {
-            [self loadURLPreview];
+            [self refreshURLPreviewForEventId:event.eventId];
         }
     }
     
@@ -1106,45 +1070,45 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
 
 #pragma mark - URL Previews
 
-- (void)loadURLPreview
+- (void)refreshURLPreviewForEventId:(NSString *)eventId
 {
-    // Get the last bubble component as that contains the link.
-    MXKRoomBubbleComponent *lastComponent = bubbleComponents.lastObject;
-    if (!lastComponent || !lastComponent.link)
+    // Get the event's component, but only if it has a link.
+    MXKRoomBubbleComponent *component = [self bubbleComponentWithLinkForEventId:eventId];
+    if (!component)
     {
         return;
     }
     
     // Don't show the preview if it has been dismissed already.
-    self.showURLPreview = ![URLPreviewService.shared hasClosedPreviewFrom:lastComponent.event];
-    if (!self.showURLPreview)
+    component.showURLPreview = ![URLPreviewService.shared hasClosedPreviewFrom:component.event];
+    if (!component.showURLPreview)
     {
         return;
     }
     
-    // If there is existing preview data, the message has been edited
-    // Clear the data to show the loading state when the preview isn't cached
-    if (self.urlPreviewData)
+    // If there is existing preview data, the message has been edited.
+    // Clear the data to show the loading state when the preview isn't cached.
+    if (component.urlPreviewData)
     {
-        self.urlPreviewData = nil;
+        component.urlPreviewData = nil;
     }
     
     // Set the preview data.
     MXWeakify(self);
     
     NSDictionary<NSString *, NSString*> *userInfo = @{
-        @"eventId": lastComponent.event.eventId,
+        @"eventId": eventId,
         @"roomId": self.roomId
     };
     
-    [URLPreviewService.shared previewFor:lastComponent.link
-                                     and:lastComponent.event
+    [URLPreviewService.shared previewFor:component.link
+                                     and:component.event
                                     with:self.mxSession
                                  success:^(URLPreviewData * _Nonnull urlPreviewData) {
         MXStrongifyAndReturnIfNil(self);
         
         // Update the preview data, indicate that the text message layout needs refreshing and send a notification for refresh
-        self.urlPreviewData = urlPreviewData;
+        component.urlPreviewData = urlPreviewData;
         [self invalidateTextLayout];
         [self setNeedsUpdateAdditionalContentHeight];
         
@@ -1156,7 +1120,9 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
         MXLogDebug(@"[RoomBubbleCellData] Failed to get url preview")
         
         // Don't show a preview and send a notification for refresh
-        self.showURLPreview = NO;
+        component.showURLPreview = NO;
+        [self invalidateTextLayout];
+        [self setNeedsUpdateAdditionalContentHeight];
         
         dispatch_async(dispatch_get_main_queue(), ^{
             [NSNotificationCenter.defaultCenter postNotificationName:URLPreviewDidUpdateNotification object:nil userInfo:userInfo];
diff --git a/Riot/Modules/Room/DataSources/RoomDataSource.m b/Riot/Modules/Room/DataSources/RoomDataSource.m
index 036153771..748eb1cf8 100644
--- a/Riot/Modules/Room/DataSources/RoomDataSource.m
+++ b/Riot/Modules/Room/DataSources/RoomDataSource.m
@@ -343,7 +343,7 @@ const CGFloat kTypingCellHeight = 24;
         // Handle read receipts and read marker display.
         // Ignore the read receipts on the bubble without actual display.
         // Ignore the read receipts on collapsed bubbles
-        if ((((self.showBubbleReceipts && cellData.readReceipts.count) || cellData.reactions.count || cellData.showURLPreview) && !isCollapsableCellCollapsed) || self.showReadMarker)
+        if ((((self.showBubbleReceipts && cellData.readReceipts.count) || cellData.reactions.count || cellData.hasLink) && !isCollapsableCellCollapsed) || self.showReadMarker)
         {
             // Read receipts container are inserted here on the right side into the content view.
             // Some vertical whitespaces are added in message text view (see RoomBubbleCellData class) to insert correctly multiple receipts.
@@ -369,14 +369,13 @@ const CGFloat kTypingCellHeight = 24;
                         continue;
                     }
                     
-                    NSURL *link = component.link;
                     URLPreviewView *urlPreviewView;
                     
                     // Show a URL preview if the component has a link that should be previewed.
-                    if (link && RiotSettings.shared.roomScreenShowsURLPreviews && cellData.showURLPreview)
+                    if (RiotSettings.shared.roomScreenShowsURLPreviews && component.showURLPreview)
                     {
                         urlPreviewView = [URLPreviewView instantiate];
-                        urlPreviewView.preview = cellData.urlPreviewData;
+                        urlPreviewView.preview = component.urlPreviewData;
                         urlPreviewView.delegate = self;
                         
                         [temporaryViews addObject:urlPreviewView];
@@ -1220,37 +1219,48 @@ const CGFloat kTypingCellHeight = 24;
     // Use the link stored in the bubble component when opening the URL as we only
     // store the sanitized URL in the preview data which may differ to the message content.
     RoomBubbleCellData *cellData = [self cellDataOfEventWithEventId:eventID];
-    
     if (!cellData)
     {
         return;
     }
     
-    MXKRoomBubbleComponent *lastComponent = cellData.bubbleComponents.lastObject;
-    
-    if (!lastComponent)
+    NSInteger index = [cellData bubbleComponentIndexForEventId:eventID];
+    if (index == NSNotFound)
     {
         return;
     }
     
-    [UIApplication.sharedApplication vc_open:lastComponent.link completionHandler:nil];
+    MXKRoomBubbleComponent *component = cellData.bubbleComponents[index];
+    
+    [UIApplication.sharedApplication vc_open:component.link completionHandler:nil];
 }
 
 - (void)didCloseURLPreviewView:(URLPreviewView *)previewView for:(NSString *)eventID in:(NSString *)roomID
 {
     RoomBubbleCellData *cellData = [self cellDataOfEventWithEventId:eventID];
-    
     if (!cellData)
     {
         return;
     }
     
+    NSInteger index = [cellData bubbleComponentIndexForEventId:eventID];
+    if (index == NSNotFound)
+    {
+        return;
+    }
+    
+    MXKRoomBubbleComponent *component = cellData.bubbleComponents[index];
+    
     // Remember that the user closed the preview so it isn't shown again.
     [URLPreviewService.shared closePreviewFor:eventID in:roomID];
     
     // Hide the preview, remove its data and refresh the cells.
-    cellData.showURLPreview = NO;
-    cellData.urlPreviewData = nil;
+    component.showURLPreview = NO;
+    component.urlPreviewData = nil;
+    
+    [cellData invalidateTextLayout];
+    [cellData setNeedsUpdateAdditionalContentHeight];
+    
     [self refreshCells];
 }
 

From 2887fd27ef6b63d86db53030c43bba34f2bd77b2 Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Mon, 27 Sep 2021 18:43:53 +0100
Subject: [PATCH 27/59] Use bubbleComponentWithLinkForEventId: in
 RoomDataSource.

---
 .../Room/CellData/RoomBubbleCellData.h        |  8 +++++
 .../Modules/Room/DataSources/RoomDataSource.m | 35 +++++++------------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/Riot/Modules/Room/CellData/RoomBubbleCellData.h b/Riot/Modules/Room/CellData/RoomBubbleCellData.h
index 6b2bffd27..52fbf40f4 100644
--- a/Riot/Modules/Room/CellData/RoomBubbleCellData.h
+++ b/Riot/Modules/Room/CellData/RoomBubbleCellData.h
@@ -110,6 +110,14 @@ typedef NS_ENUM(NSInteger, RoomBubbleCellDataTag)
  */
 - (NSInteger)firstVisibleComponentIndex;
 
+/**
+ Returns the bubble component for the specified event ID, but only if that component
+ has detected a link in the event's body. Otherwise returns `nil`.
+ 
+ This will also return `nil` If URL previews have been disabled by the user.
+ */
+- (MXKRoomBubbleComponent *)bubbleComponentWithLinkForEventId:(NSString *)eventId;
+
 #pragma mark - Show all reactions
 
 - (BOOL)showAllReactionsForEvent:(NSString*)eventId;
diff --git a/Riot/Modules/Room/DataSources/RoomDataSource.m b/Riot/Modules/Room/DataSources/RoomDataSource.m
index 748eb1cf8..fdaef5cf7 100644
--- a/Riot/Modules/Room/DataSources/RoomDataSource.m
+++ b/Riot/Modules/Room/DataSources/RoomDataSource.m
@@ -1219,41 +1219,30 @@ const CGFloat kTypingCellHeight = 24;
     // Use the link stored in the bubble component when opening the URL as we only
     // store the sanitized URL in the preview data which may differ to the message content.
     RoomBubbleCellData *cellData = [self cellDataOfEventWithEventId:eventID];
-    if (!cellData)
+    MXKRoomBubbleComponent *component = [cellData bubbleComponentWithLinkForEventId:eventID];
+    if (!component)
     {
+        MXLogError(@"[RoomDataSource] Failed to open link: Unable to find bubble component.")
         return;
     }
     
-    NSInteger index = [cellData bubbleComponentIndexForEventId:eventID];
-    if (index == NSNotFound)
-    {
-        return;
-    }
-    
-    MXKRoomBubbleComponent *component = cellData.bubbleComponents[index];
-    
     [UIApplication.sharedApplication vc_open:component.link completionHandler:nil];
 }
 
 - (void)didCloseURLPreviewView:(URLPreviewView *)previewView for:(NSString *)eventID in:(NSString *)roomID
 {
-    RoomBubbleCellData *cellData = [self cellDataOfEventWithEventId:eventID];
-    if (!cellData)
-    {
-        return;
-    }
-    
-    NSInteger index = [cellData bubbleComponentIndexForEventId:eventID];
-    if (index == NSNotFound)
-    {
-        return;
-    }
-    
-    MXKRoomBubbleComponent *component = cellData.bubbleComponents[index];
-    
     // Remember that the user closed the preview so it isn't shown again.
     [URLPreviewService.shared closePreviewFor:eventID in:roomID];
     
+    // Get the component to remove the URL preview from.
+    RoomBubbleCellData *cellData = [self cellDataOfEventWithEventId:eventID];
+    MXKRoomBubbleComponent *component = [cellData bubbleComponentWithLinkForEventId:eventID];
+    if (!component)
+    {
+        MXLogError(@"[RoomDataSource] Failed to close URL preview: Unable to find bubble component.")
+        return;
+    }
+    
     // Hide the preview, remove its data and refresh the cells.
     component.showURLPreview = NO;
     component.urlPreviewData = nil;

From 5fb6008c8031484da50cb7e54e8cbc652d5ceacd Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Tue, 28 Sep 2021 10:03:41 +0100
Subject: [PATCH 28/59] Add changelog entry.

---
 changelog.d/4896.change | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/4896.change

diff --git a/changelog.d/4896.change b/changelog.d/4896.change
new file mode 100644
index 000000000..00f6d5b4e
--- /dev/null
+++ b/changelog.d/4896.change
@@ -0,0 +1 @@
+URL Previews: Use attributed string whitespace for cell heights and stop breaking up the bubble data.
\ No newline at end of file

From 251c257fb4e79f98d582641a911d4aa027d7cdb8 Mon Sep 17 00:00:00 2001
From: artevaeckt <timucin.boldt@udo.edu>
Date: Tue, 28 Sep 2021 16:41:42 +0000
Subject: [PATCH 29/59] Translated using Weblate (German)

Currently translated at 99.7% (1313 of 1316 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/de/
---
 Riot/Assets/de.lproj/Vector.strings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Riot/Assets/de.lproj/Vector.strings b/Riot/Assets/de.lproj/Vector.strings
index 916cb445f..0bea67a81 100644
--- a/Riot/Assets/de.lproj/Vector.strings
+++ b/Riot/Assets/de.lproj/Vector.strings
@@ -1480,3 +1480,4 @@
 "spaces_left_panel_title" = "Spaces";
 "room_recents_suggested_rooms_section" = "VORGESCHLAGENE RÄUME";
 "spaces_home_space_title" = "Start";
+"space_tag" = "space";

From 3a05f62612cdb711ac2411b15345d58ebe1a565c Mon Sep 17 00:00:00 2001
From: libexus <libexus@gmail.com>
Date: Tue, 28 Sep 2021 16:41:23 +0000
Subject: [PATCH 30/59] Translated using Weblate (German)

Currently translated at 99.7% (1313 of 1316 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/de/
---
 Riot/Assets/de.lproj/Vector.strings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Riot/Assets/de.lproj/Vector.strings b/Riot/Assets/de.lproj/Vector.strings
index 0bea67a81..30c80ce35 100644
--- a/Riot/Assets/de.lproj/Vector.strings
+++ b/Riot/Assets/de.lproj/Vector.strings
@@ -1481,3 +1481,4 @@
 "room_recents_suggested_rooms_section" = "VORGESCHLAGENE RÄUME";
 "spaces_home_space_title" = "Start";
 "space_tag" = "space";
+"open" = "Öffnen";

From f790d3dcae05581554bfe5fae538da003613c747 Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Wed, 29 Sep 2021 10:36:35 +0100
Subject: [PATCH 31/59] Add invalidateLayout to RoomBubbleCellData.

---
 .../Modules/Room/CellData/RoomBubbleCellData.h | 10 ++++++++++
 .../Modules/Room/CellData/RoomBubbleCellData.m | 18 +++++++++++-------
 Riot/Modules/Room/DataSources/RoomDataSource.m |  3 +--
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/Riot/Modules/Room/CellData/RoomBubbleCellData.h b/Riot/Modules/Room/CellData/RoomBubbleCellData.h
index 52fbf40f4..ebbf94aaa 100644
--- a/Riot/Modules/Room/CellData/RoomBubbleCellData.h
+++ b/Riot/Modules/Room/CellData/RoomBubbleCellData.h
@@ -95,6 +95,16 @@ typedef NS_ENUM(NSInteger, RoomBubbleCellDataTag)
  */
 @property(nonatomic) NSInteger componentIndexOfSentMessageTick;
 
+/**
+ Indicate that both the text message layout and any additional content height are no longer
+ valid and should be recomputed before presentation in a bubble cell. This could be due
+ to a content change, or the available space for the cell has been updated.
+ 
+ This is a convenience method that calls `invalidateTextLayout` and
+ `setNeedsUpdateAdditionalContentHeight` together.
+ */
+- (void)invalidateLayout;
+
 /**
  Indicate to update additional content height.
  */
diff --git a/Riot/Modules/Room/CellData/RoomBubbleCellData.m b/Riot/Modules/Room/CellData/RoomBubbleCellData.m
index 994b9b386..e5351d7cf 100644
--- a/Riot/Modules/Room/CellData/RoomBubbleCellData.m
+++ b/Riot/Modules/Room/CellData/RoomBubbleCellData.m
@@ -322,7 +322,13 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
     }
 }
 
-#pragma mark - 
+#pragma mark -
+
+- (void)invalidateLayout
+{
+    [self invalidateTextLayout];
+    [self setNeedsUpdateAdditionalContentHeight];
+}
 
 - (NSAttributedString*)makeAttributedString
 {
@@ -1107,10 +1113,9 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
                                  success:^(URLPreviewData * _Nonnull urlPreviewData) {
         MXStrongifyAndReturnIfNil(self);
         
-        // Update the preview data, indicate that the text message layout needs refreshing and send a notification for refresh
+        // Update the preview data, indicate that the message layout needs refreshing and send a notification for refresh
         component.urlPreviewData = urlPreviewData;
-        [self invalidateTextLayout];
-        [self setNeedsUpdateAdditionalContentHeight];
+        [self invalidateLayout];
         
         dispatch_async(dispatch_get_main_queue(), ^{
             [NSNotificationCenter.defaultCenter postNotificationName:URLPreviewDidUpdateNotification object:nil userInfo:userInfo];
@@ -1119,10 +1124,9 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
     } failure:^(NSError * _Nullable error) {
         MXLogDebug(@"[RoomBubbleCellData] Failed to get url preview")
         
-        // Don't show a preview and send a notification for refresh
+        // Remove the loading URLPreviewView, indicate that the layout needs refreshing and send a notification for refresh
         component.showURLPreview = NO;
-        [self invalidateTextLayout];
-        [self setNeedsUpdateAdditionalContentHeight];
+        [self invalidateLayout];
         
         dispatch_async(dispatch_get_main_queue(), ^{
             [NSNotificationCenter.defaultCenter postNotificationName:URLPreviewDidUpdateNotification object:nil userInfo:userInfo];
diff --git a/Riot/Modules/Room/DataSources/RoomDataSource.m b/Riot/Modules/Room/DataSources/RoomDataSource.m
index fdaef5cf7..22e0550d6 100644
--- a/Riot/Modules/Room/DataSources/RoomDataSource.m
+++ b/Riot/Modules/Room/DataSources/RoomDataSource.m
@@ -1247,8 +1247,7 @@ const CGFloat kTypingCellHeight = 24;
     component.showURLPreview = NO;
     component.urlPreviewData = nil;
     
-    [cellData invalidateTextLayout];
-    [cellData setNeedsUpdateAdditionalContentHeight];
+    [cellData invalidateLayout];
     
     [self refreshCells];
 }

From 0764252138e1107226acc3e1ceb8a36f60fe746c Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Wed, 29 Sep 2021 11:39:11 +0100
Subject: [PATCH 32/59] Check whether URL previews should be shown in a single
 location.

Reset all cell data when this setting is changed to force a refresh.
Rename `hasClosedPreview(from:)` to `shouldShowPreview(for:)` for clarity and potentially adding more rules at a later date.
---
 Riot/Managers/URLPreviews/URLPreviewService.swift | 6 +++---
 Riot/Modules/Room/CellData/RoomBubbleCellData.m   | 9 ++-------
 Riot/Modules/Room/DataSources/RoomDataSource.m    | 2 +-
 Riot/Modules/Settings/SettingsViewController.m    | 3 +++
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Riot/Managers/URLPreviews/URLPreviewService.swift b/Riot/Managers/URLPreviews/URLPreviewService.swift
index d89728621..e731c27db 100644
--- a/Riot/Managers/URLPreviews/URLPreviewService.swift
+++ b/Riot/Managers/URLPreviews/URLPreviewService.swift
@@ -92,9 +92,9 @@ class URLPreviewService: NSObject {
         store.closePreview(for: eventId, in: roomId)
     }
     
-    /// Whether a preview for the given event has been closed or not.
-    func hasClosedPreview(from event: MXEvent) -> Bool {
-        store.hasClosedPreview(for: event.eventId, in: event.roomId)
+    /// Whether a preview for the given event should be shown or not.
+    func shouldShowPreview(for event: MXEvent) -> Bool {
+        !store.hasClosedPreview(for: event.eventId, in: event.roomId)
     }
     
     // MARK: - Private
diff --git a/Riot/Modules/Room/CellData/RoomBubbleCellData.m b/Riot/Modules/Room/CellData/RoomBubbleCellData.m
index e5351d7cf..15cdee58d 100644
--- a/Riot/Modules/Room/CellData/RoomBubbleCellData.m
+++ b/Riot/Modules/Room/CellData/RoomBubbleCellData.m
@@ -731,11 +731,6 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
 
 - (MXKRoomBubbleComponent *)bubbleComponentWithLinkForEventId:(NSString *)eventId
 {
-    if (!RiotSettings.shared.roomScreenShowsURLPreviews)
-    {
-        return nil;
-    }
-    
     NSInteger index = [self bubbleComponentIndexForEventId:eventId];
     if (index == NSNotFound)
     {
@@ -1085,8 +1080,8 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
         return;
     }
     
-    // Don't show the preview if it has been dismissed already.
-    component.showURLPreview = ![URLPreviewService.shared hasClosedPreviewFrom:component.event];
+    // Don't show the preview if they're disabled globally or this one has been dismissed previously.
+    component.showURLPreview = RiotSettings.shared.roomScreenShowsURLPreviews && [URLPreviewService.shared shouldShowPreviewFor:component.event];
     if (!component.showURLPreview)
     {
         return;
diff --git a/Riot/Modules/Room/DataSources/RoomDataSource.m b/Riot/Modules/Room/DataSources/RoomDataSource.m
index 22e0550d6..7f94a8c2f 100644
--- a/Riot/Modules/Room/DataSources/RoomDataSource.m
+++ b/Riot/Modules/Room/DataSources/RoomDataSource.m
@@ -372,7 +372,7 @@ const CGFloat kTypingCellHeight = 24;
                     URLPreviewView *urlPreviewView;
                     
                     // Show a URL preview if the component has a link that should be previewed.
-                    if (RiotSettings.shared.roomScreenShowsURLPreviews && component.showURLPreview)
+                    if (component.showURLPreview)
                     {
                         urlPreviewView = [URLPreviewView instantiate];
                         urlPreviewView.preview = component.urlPreviewData;
diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m
index caaa593f9..2c70a2b4a 100644
--- a/Riot/Modules/Settings/SettingsViewController.m
+++ b/Riot/Modules/Settings/SettingsViewController.m
@@ -3124,6 +3124,9 @@ TableViewSectionsDelegate>
 - (void)toggleEnableURLPreviews:(UISwitch *)sender
 {
     RiotSettings.shared.roomScreenShowsURLPreviews = sender.on;
+    
+    // Any loaded cell data is now invalid and should be refreshed for the new value.
+    [[MXKRoomDataSourceManager sharedManagerForMatrixSession:self.mainSession] reset];
 }
 
 - (void)toggleSendCrashReport:(id)sender

From a0af63131f180d2b58714863b3a23f7c2b76e820 Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Wed, 29 Sep 2021 12:12:25 +0100
Subject: [PATCH 33/59] Conform URLPreviewData to MXKURLPreviewDataProtocol.

---
 Riot/Managers/URLPreviews/URLPreviewData.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Riot/Managers/URLPreviews/URLPreviewData.swift b/Riot/Managers/URLPreviews/URLPreviewData.swift
index 849b40d9f..856eb43f9 100644
--- a/Riot/Managers/URLPreviews/URLPreviewData.swift
+++ b/Riot/Managers/URLPreviews/URLPreviewData.swift
@@ -17,7 +17,7 @@
 import Foundation
 
 @objcMembers
-class URLPreviewData: NSObject {
+class URLPreviewData: NSObject, MXKURLPreviewDataProtocol {
     /// The URL that's represented by the preview data. This may have been sanitized.
     /// Note: The original URL, can be found in the bubble components with `eventID` and `roomID`.
     let url: URL

From 04bc95a85cea1bdde68096c20a0ed43030daefdb Mon Sep 17 00:00:00 2001
From: Stefan Ceriu <stefanc@matrix.org>
Date: Tue, 28 Sep 2021 08:40:01 +0300
Subject: [PATCH 34/59] vector-im/element-ios/issues/4899 - Replaced (*almost*)
 all NSLocalizedString calls with newly generated ObjC methods.

---
 Riot/Managers/AppInfo/BuildInfo.m             |   4 +-
 Riot/Managers/BugReport/RageShakeManager.m    |  14 +-
 .../PushNotificationService.m                 |   4 +-
 Riot/Managers/Widgets/WidgetManager.m         |  10 +-
 Riot/Modules/Application/LegacyAppDelegate.m  | 191 ++++++-----
 .../AuthenticationViewController.m            |  95 +++---
 .../Authentication/Views/AuthInputsView.m     | 109 ++++---
 .../Views/ForgotPasswordInputsView.m          |  42 +--
 .../Authentication/Views/TermsView.swift      |   4 +-
 .../BugReport/BugReportViewController.m       |  32 +-
 Riot/Modules/Call/CallViewController.m        |  18 +-
 Riot/Modules/Call/Views/IncomingCallView.m    |   4 +-
 .../SelectContact/MatrixContactsDataSource.m  |   6 +-
 .../Common/Recents/CellData/RecentCellData.m  |  10 +-
 .../Recents/DataSources/RecentsDataSource.m   |  28 +-
 .../Common/Recents/RecentsViewController.m    |  36 +--
 .../DataSources/GroupsDataSource.m            |   4 +-
 .../Communities/GroupsViewController.m        |   8 +-
 .../Home/GroupHomeViewController.m            |  20 +-
 .../Members/GroupParticipantsViewController.m |  36 +--
 .../Rooms/GroupRoomsViewController.m          |   2 +-
 .../TabDetail/GroupDetailsViewController.m    |   8 +-
 .../Views/GroupInviteTableViewCell.m          |   8 +-
 .../Contacts/DataSources/ContactsDataSource.m |  18 +-
 .../Details/ContactDetailsViewController.m    |  28 +-
 .../Contacts/Views/ContactTableViewCell.m     |   2 +-
 .../Favorites/FavouritesViewController.m      |   6 +-
 .../GDPR/GDPRConsentViewController.swift      |   2 +-
 .../Files/CellData/FilesSearchCellData.m      |   2 +-
 ...MessagesSearchResultAttachmentBubbleCell.m |   2 +-
 .../Rooms/DirectoryViewController.m           |   2 +-
 .../UnifiedSearchViewController.m             |  14 +-
 .../Views/DirectoryRecentTableViewCell.m      |  26 +-
 .../Fallback/AuthFallBackViewController.m     |   6 +-
 Riot/Modules/Home/HomeViewController.m        |  14 +-
 .../IntegrationManagerViewController.m        |   6 +-
 .../WidgetPicker/WidgetPickerViewController.m |   6 +-
 .../StickerPickerViewController.m             |   4 +-
 .../Widgets/WidgetViewController.m            |  30 +-
 .../Library/MediaAlbumContentViewController.m |   6 +-
 .../MediaPicker/MediaPickerViewController.m   |  20 +-
 Riot/Modules/People/PeopleViewController.m    |   6 +-
 .../People/Views/InviteRecentTableViewCell.m  |   8 +-
 .../PublicRoomsDirectoryDataSource.m          |   8 +-
 .../Room/CellData/RoomBubbleCellData.m        |  14 +-
 .../Detail/RoomMemberDetailsViewController.m  |  96 +++---
 .../Members/RoomParticipantsViewController.m  |  60 ++--
 .../ReadReceiptsViewController.m              |   8 +-
 Riot/Modules/Room/RoomViewController.m        | 165 +++++-----
 .../Room/Search/RoomSearchViewController.m    |   4 +-
 .../Settings/RoomSettingsViewController.m     | 180 ++++++-----
 .../Views/Activities/RoomActivitiesView.m     |  51 ++-
 .../RoomMembershipExpandedBubbleCell.m        |   2 +-
 .../Views/InputToolbar/RoomInputToolbarView.m |  18 +-
 .../Title/Expanded/ExpandedRoomTitleView.m    |   8 +-
 .../Title/Preview/PreviewRoomTitleView.m      |  28 +-
 Riot/Modules/Room/Views/Title/RoomTitleView.m |   2 +-
 .../RoomKeyRequestViewController.m            |  12 +-
 .../DirectoryServerPickerViewController.m     |  10 +-
 .../DirectoryServerDetailTableViewCell.m      |   4 +-
 Riot/Modules/Rooms/RoomsViewController.m      |   6 +-
 .../DeactivateAccountViewController.m         |  30 +-
 .../ManageSessionViewController.m             |  25 +-
 .../Security/SecurityViewController.m         |  95 +++---
 .../Modules/Settings/SettingsViewController.m | 306 +++++++++---------
 .../StartChat/StartChatViewController.m       |  16 +-
 Riot/Modules/TabBar/MasterTabBarController.m  |  30 +-
 .../UserDevices/UsersDevicesViewController.m  |   2 +-
 .../UserDevices/Views/DeviceTableViewCell.m   |  24 +-
 Riot/Utils/EventFormatter.m                   |  38 +--
 Riot/Utils/Tools.m                            |  19 +-
 .../Managers/ShareExtensionManager.m          |  14 +-
 .../Modules/Fallback/FallbackViewController.m |   2 +-
 .../Share/Listing/RoomsListViewController.m   |  20 +-
 .../Listing/Views/RecentRoomTableViewCell.m   |   2 +-
 .../Modules/Share/ShareViewController.m       |   4 +-
 RiotShareExtension/target.yml                 |   3 +
 77 files changed, 1099 insertions(+), 1108 deletions(-)

diff --git a/Riot/Managers/AppInfo/BuildInfo.m b/Riot/Managers/AppInfo/BuildInfo.m
index b97e9fd2f..0853efe94 100644
--- a/Riot/Managers/AppInfo/BuildInfo.m
+++ b/Riot/Managers/AppInfo/BuildInfo.m
@@ -16,6 +16,8 @@
 
 #import "BuildInfo.h"
 
+#import "Riot-Swift.h"
+
 #define MAKE_STRING(x) #x
 #define MAKE_NS_STRING(x) @MAKE_STRING(x)
 
@@ -80,7 +82,7 @@
         }
         else
         {
-            _readableBuildVersion = NSLocalizedStringFromTable(@"settings_config_no_build_info", @"Vector", nil);
+            _readableBuildVersion = [VectorL10n settingsConfigNoBuildInfo];
         }
     }
     return _readableBuildVersion;
diff --git a/Riot/Managers/BugReport/RageShakeManager.m b/Riot/Managers/BugReport/RageShakeManager.m
index 10edcfb75..13bd5c985 100644
--- a/Riot/Managers/BugReport/RageShakeManager.m
+++ b/Riot/Managers/BugReport/RageShakeManager.m
@@ -67,10 +67,10 @@ static RageShakeManager* sharedInstance = nil;
 {
     if ([MXLogger crashLog])
     {
-        confirmationAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"bug_report_prompt", @"Vector", nil)  message:nil preferredStyle:UIAlertControllerStyleAlert];
+        confirmationAlert = [UIAlertController alertControllerWithTitle:[VectorL10n bugReportPrompt]  message:nil preferredStyle:UIAlertControllerStyleAlert];
         
         __weak typeof(self) weakSelf = self;
-        [confirmationAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+        [confirmationAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                               style:UIAlertActionStyleDefault
                                                             handler:^(UIAlertAction * action) {
                                                                 
@@ -85,7 +85,7 @@ static RageShakeManager* sharedInstance = nil;
                                                                 
                                                             }]];
         
-        [confirmationAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+        [confirmationAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                                               style:UIAlertActionStyleDefault
                                                             handler:^(UIAlertAction * action) {
                                                                 
@@ -131,10 +131,10 @@ static RageShakeManager* sharedInstance = nil;
     {
         if ([responder isKindOfClass:[UIViewController class]])
         {
-            confirmationAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"rage_shake_prompt", @"Vector", nil)  message:nil preferredStyle:UIAlertControllerStyleAlert];
+            confirmationAlert = [UIAlertController alertControllerWithTitle:[VectorL10n rageShakePrompt] message:nil preferredStyle:UIAlertControllerStyleAlert];
             
             __weak typeof(self) weakSelf = self;
-            [confirmationAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+            [confirmationAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                                                   style:UIAlertActionStyleDefault
                                                                 handler:^(UIAlertAction * action) {
                                                                     
@@ -154,7 +154,7 @@ static RageShakeManager* sharedInstance = nil;
                                                                     
                                                                 }]];
 
-            [confirmationAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"do_not_ask_again"]
+            [confirmationAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n doNotAskAgain]
                                                                   style:UIAlertActionStyleDefault
                                                                 handler:^(UIAlertAction * action) {
 
@@ -169,7 +169,7 @@ static RageShakeManager* sharedInstance = nil;
 
                                                                 }]];
 
-            [confirmationAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+            [confirmationAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                                   style:UIAlertActionStyleDefault
                                                                 handler:^(UIAlertAction * action) {
 
diff --git a/Riot/Managers/PushNotification/PushNotificationService.m b/Riot/Managers/PushNotification/PushNotificationService.m
index 5edec7a00..24ab4246d 100644
--- a/Riot/Managers/PushNotification/PushNotificationService.m
+++ b/Riot/Managers/PushNotification/PushNotificationService.m
@@ -60,7 +60,7 @@ Matrix session observer used to detect new opened sessions.
     {
         UNTextInputNotificationAction *quickReply = [UNTextInputNotificationAction
                                                      actionWithIdentifier:@"inline-reply"
-                                                     title:NSLocalizedStringFromTable(@"room_message_short_placeholder", @"Vector", nil)
+                                                     title:[VectorL10n roomMessageShortPlaceholder]
                                                      options:UNNotificationActionOptionAuthenticationRequired
                                                      ];
 
@@ -370,7 +370,7 @@ Matrix session observer used to detect new opened sessions.
 
                 UNMutableNotificationContent *failureNotificationContent = [[UNMutableNotificationContent alloc] init];
                 failureNotificationContent.userInfo = content.userInfo;
-                failureNotificationContent.body = NSLocalizedStringFromTable(@"room_event_failed_to_send", @"Vector", nil);
+                failureNotificationContent.body = [VectorL10n roomEventFailedToSend];
                 failureNotificationContent.threadIdentifier = roomId;
 
                 NSString *uuid = [[NSUUID UUID] UUIDString];
diff --git a/Riot/Managers/Widgets/WidgetManager.m b/Riot/Managers/Widgets/WidgetManager.m
index f336cbade..1a181046f 100644
--- a/Riot/Managers/Widgets/WidgetManager.m
+++ b/Riot/Managers/Widgets/WidgetManager.m
@@ -358,7 +358,7 @@ NSString *const WidgetManagerErrorDomain = @"WidgetManagerErrorDomain";
             error = [NSError errorWithDomain:WidgetManagerErrorDomain
                                         code:WidgetManagerErrorCodeNotEnoughPower
                                     userInfo:@{
-                                               NSLocalizedDescriptionKey: NSLocalizedStringFromTable(@"widget_no_power_to_manage", @"Vector", nil)
+                                               NSLocalizedDescriptionKey: [VectorL10n widgetNoPowerToManage]
                                                }];
         }
 
@@ -419,7 +419,7 @@ NSString *const WidgetManagerErrorDomain = @"WidgetManagerErrorDomain";
                     NSError *error = [NSError errorWithDomain:WidgetManagerErrorDomain
                                                          code:WidgetManagerErrorCodeCreationFailed
                                                      userInfo:@{
-                                                                NSLocalizedDescriptionKey: NSLocalizedStringFromTable(@"widget_creation_failure", @"Vector", nil)
+                                                                NSLocalizedDescriptionKey: [VectorL10n widgetCreationFailure]
                                                                 }];
 
                     self->failureBlockForWidgetCreation[hash][widgetId](error);
@@ -624,7 +624,7 @@ NSString *const WidgetManagerErrorDomain = @"WidgetManagerErrorDomain";
                  NSError *error = [NSError errorWithDomain:WidgetManagerErrorDomain
                                                       code:WidgetManagerErrorCodeFailedToConnectToIntegrationsServer
                                                   userInfo:@{
-                                                             NSLocalizedDescriptionKey: NSLocalizedStringFromTable(@"widget_integrations_server_failed_to_connect", @"Vector", nil)
+                                                             NSLocalizedDescriptionKey: [VectorL10n widgetIntegrationsServerFailedToConnect]
                                                              }];
 
                  failure(error);
@@ -797,14 +797,14 @@ NSString *const WidgetManagerErrorDomain = @"WidgetManagerErrorDomain";
 {
     return [NSError errorWithDomain:WidgetManagerErrorDomain
                                code:WidgetManagerErrorCodeNoIntegrationsServerConfigured
-                           userInfo:@{NSLocalizedDescriptionKey: NSLocalizedStringFromTable(@"widget_no_integrations_server_configured", @"Vector", nil)}];
+                           userInfo:@{NSLocalizedDescriptionKey: [VectorL10n widgetNoIntegrationsServerConfigured]}];
 }
 
 - (NSError*)errorForDisabledIntegrationManager
 {
     return [NSError errorWithDomain:WidgetManagerErrorDomain
                                code:WidgetManagerErrorCodeDisabledIntegrationsServer
-                           userInfo:@{NSLocalizedDescriptionKey: NSLocalizedStringFromTable(@"widget_integration_manager_disabled", @"Vector", nil)}];
+                           userInfo:@{NSLocalizedDescriptionKey: [VectorL10n widgetIntegrationManagerDisabled]}];
 }
 
 @end
diff --git a/Riot/Modules/Application/LegacyAppDelegate.m b/Riot/Modules/Application/LegacyAppDelegate.m
index 1ad7847f8..dc019e9ce 100644
--- a/Riot/Modules/Application/LegacyAppDelegate.m
+++ b/Riot/Modules/Application/LegacyAppDelegate.m
@@ -666,7 +666,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
         // Inform the end user why the app appears blank
         NSError *error = [NSError errorWithDomain:NSURLErrorDomain
                                              code:NSURLErrorCannotConnectToHost
-                                         userInfo:@{NSLocalizedDescriptionKey : NSLocalizedStringFromTable(@"homeserver_connection_lost", @"Vector", nil)}];
+                                         userInfo:@{NSLocalizedDescriptionKey : [VectorL10n homeserverConnectionLost]}];
 
         [self showErrorAsAlert:error];
     }
@@ -686,7 +686,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
             if (status == AFNetworkReachabilityStatusNotReachable)
             {
                 // Prompt user
-                [[AppDelegate theDelegate] showErrorAsAlert:[NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorNotConnectedToInternet userInfo:@{NSLocalizedDescriptionKey : NSLocalizedStringFromTable(@"network_offline_prompt", @"Vector", nil)}]];
+                [[AppDelegate theDelegate] showErrorAsAlert:[NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorNotConnectedToInternet userInfo:@{NSLocalizedDescriptionKey : [VectorL10n networkOfflinePrompt]}]];
             }
             else
             {
@@ -928,7 +928,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
         }
         else
         {
-            title = [NSBundle mxk_localizedStringForKey:@"error"];
+            title = [MatrixKitL10n error];
         }
     }
     
@@ -946,7 +946,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
     [_errorNotification dismissViewControllerAnimated:NO completion:nil];
 
     _errorNotification = [UIAlertController alertControllerWithTitle:title message:message preferredStyle:UIAlertControllerStyleAlert];
-    [_errorNotification addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+    [_errorNotification addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                                            style:UIAlertActionStyleDefault
                                                          handler:^(UIAlertAction * action) {
 
@@ -983,12 +983,12 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
         }
         
         cryptoDataCorruptedAlert = [UIAlertController alertControllerWithTitle:nil
-                                                                       message:NSLocalizedStringFromTable(@"e2e_need_log_in_again", @"Vector", nil)
+                                                                       message:[VectorL10n e2eNeedLogInAgain]
                                                                 preferredStyle:UIAlertControllerStyleAlert];
         
         __weak typeof(self) weakSelf = self;
         
-        [cryptoDataCorruptedAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"later"]
+        [cryptoDataCorruptedAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n later]
                                                                      style:UIAlertActionStyleDefault
                                                                    handler:^(UIAlertAction * action) {
                                                                        
@@ -1000,7 +1000,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
                                                                        
                                                                    }]];
         
-        [cryptoDataCorruptedAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"settings_sign_out"]
+        [cryptoDataCorruptedAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n settingsSignOut]
                                                                      style:UIAlertActionStyleDefault
                                                                    handler:^(UIAlertAction * action) {
                                                                        
@@ -1029,15 +1029,12 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
             [wrongBackupVersionAlert dismissViewControllerAnimated:NO completion:nil];
         }
 
-        wrongBackupVersionAlert = [UIAlertController
-                                   alertControllerWithTitle:NSLocalizedStringFromTable(@"e2e_key_backup_wrong_version_title", @"Vector", nil)
-
-                                   message:NSLocalizedStringFromTable(@"e2e_key_backup_wrong_version", @"Vector", nil)
-
-                                   preferredStyle:UIAlertControllerStyleAlert];
+        wrongBackupVersionAlert = [UIAlertController alertControllerWithTitle:[VectorL10n e2eKeyBackupWrongVersionTitle]
+                                                                      message:[VectorL10n e2eKeyBackupWrongVersion]
+                                                               preferredStyle:UIAlertControllerStyleAlert];
 
         MXWeakify(self);
-        [wrongBackupVersionAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"e2e_key_backup_wrong_version_button_settings"]
+        [wrongBackupVersionAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n e2eKeyBackupWrongVersionButtonSettings]
                                                                      style:UIAlertActionStyleDefault
                                                                    handler:^(UIAlertAction * action)
                                              {
@@ -1047,7 +1044,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
                                                  // TODO: Open settings
                                              }]];
 
-        [wrongBackupVersionAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"e2e_key_backup_wrong_version_button_wasme"]
+        [wrongBackupVersionAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n e2eKeyBackupWrongVersionButtonWasme]
                                                                      style:UIAlertActionStyleDefault
                                                                    handler:^(UIAlertAction * action)
                                              {
@@ -1419,7 +1416,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
 
                                 [homeViewController stopActivityIndicator];
 
-                                NSString *errorMessage = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_does_not_exist", @"Vector", nil), roomIdOrAlias];
+                                NSString *errorMessage = [VectorL10n roomDoesNotExist:roomIdOrAlias];
 
                                 [self showAlertWithTitle:nil message:errorMessage];
                             }];
@@ -1774,9 +1771,9 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
 - (void)displayServerProvionningLinkBuyAlreadyLoggedInAlertWithCompletion:(void (^)(BOOL logout))completion
 {
     // Ask confirmation
-    self.logoutConfirmation = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"error_user_already_logged_in", @"Vector", nil) message:nil preferredStyle:UIAlertControllerStyleAlert];
+    self.logoutConfirmation = [UIAlertController alertControllerWithTitle:[VectorL10n errorUserAlreadyLoggedIn] message:nil preferredStyle:UIAlertControllerStyleAlert];
 
-    [self.logoutConfirmation addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"settings_sign_out", @"Vector", nil)
+    [self.logoutConfirmation addAction:[UIAlertAction actionWithTitle:[VectorL10n settingsSignOut]
                                                                 style:UIAlertActionStyleDefault
                                                               handler:^(UIAlertAction * action)
                                         {
@@ -1784,7 +1781,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
                                             completion(YES);
                                         }]];
 
-    [self.logoutConfirmation addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+    [self.logoutConfirmation addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                                 style:UIAlertActionStyleCancel
                                                               handler:^(UIAlertAction * action)
                                         {
@@ -2097,7 +2094,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
         
         __weak typeof(self) weakSelf = self;
         
-        NSString *message = NSLocalizedStringFromTable(@"settings_sign_out_confirmation", @"Vector", nil);
+        NSString *message = [VectorL10n settingsSignOutConfirmation];
         
         // If the user has encrypted rooms, warn he will lose his e2e keys
         MXSession *session = self.mxSessions.firstObject;
@@ -2105,15 +2102,15 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
         {
             if (room.summary.isEncrypted)
             {
-                message = [message stringByAppendingString:[NSString stringWithFormat:@"\n\n%@", NSLocalizedStringFromTable(@"settings_sign_out_e2e_warn", @"Vector", nil)]];
+                message = [message stringByAppendingString:[NSString stringWithFormat:@"\n\n%@", [VectorL10n settingsSignOutE2eWarn]]];
                 break;
             }
         }
         
         // Ask confirmation
-        self.logoutConfirmation = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"settings_sign_out", @"Vector", nil) message:message preferredStyle:UIAlertControllerStyleAlert];
+        self.logoutConfirmation = [UIAlertController alertControllerWithTitle:[VectorL10n settingsSignOut] message:message preferredStyle:UIAlertControllerStyleAlert];
         
-        [self.logoutConfirmation addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"settings_sign_out", @"Vector", nil)
+        [self.logoutConfirmation addAction:[UIAlertAction actionWithTitle:[VectorL10n settingsSignOut]
                                                          style:UIAlertActionStyleDefault
                                                        handler:^(UIAlertAction * action) {
                                                            
@@ -2131,7 +2128,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
                                                            
                                                        }]];
         
-        [self.logoutConfirmation addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+        [self.logoutConfirmation addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                          style:UIAlertActionStyleCancel
                                                        handler:^(UIAlertAction * action) {
                                                            
@@ -2570,7 +2567,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
             [_errorNotification dismissViewControllerAnimated:NO completion:nil];
             _errorNotification = [UIAlertController alertControllerWithTitle:nil message:msg preferredStyle:UIAlertControllerStyleAlert];
             
-            [_errorNotification addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"later"]
+            [_errorNotification addAction:[UIAlertAction actionWithTitle:[VectorL10n later]
                                                                    style:UIAlertActionStyleDefault
                                                                  handler:^(UIAlertAction * action) {
                                                                      
@@ -2582,7 +2579,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
                                                                      
                                                                  }]];
             
-            [_errorNotification addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+            [_errorNotification addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                                                    style:UIAlertActionStyleDefault
                                                                  handler:^(UIAlertAction * action) {
                                                                      
@@ -2663,7 +2660,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
                                                                                        message:messageText
                                                                                 preferredStyle:UIAlertControllerStyleAlert];
                         
-                        [self.mxInAppNotification addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+                        [self.mxInAppNotification addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                                                      style:UIAlertActionStyleCancel
                                                                                    handler:^(UIAlertAction * action) {
                                                                                        
@@ -2676,7 +2673,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
                                                                                        
                                                                                    }]];
                         
-                        [self.mxInAppNotification addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"view", @"Vector", nil)
+                        [self.mxInAppNotification addAction:[UIAlertAction actionWithTitle:[VectorL10n view]
                                                                                      style:UIAlertActionStyleDefault
                                                                                    handler:^(UIAlertAction * action) {
                                                                                        
@@ -2723,7 +2720,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
     {
         [accountPicker dismissViewControllerAnimated:NO completion:nil];
         
-        accountPicker = [UIAlertController alertControllerWithTitle:[NSBundle mxk_localizedStringForKey:@"select_account"] message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+        accountPicker = [UIAlertController alertControllerWithTitle:[MatrixKitL10n selectAccount] message:nil preferredStyle:UIAlertControllerStyleActionSheet];
         
         __weak typeof(self) weakSelf = self;
         for(MXKAccount *account in mxAccounts)
@@ -2746,7 +2743,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
                                                             }]];
         }
         
-        [accountPicker addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+        [accountPicker addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                           style:UIAlertActionStyleCancel
                                                         handler:^(UIAlertAction * action) {
                                                             
@@ -2908,7 +2905,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
             void (^onFailure)(NSError *) = ^(NSError *error){
                 MXLogDebug(@"[AppDelegate] Create direct chat failed");
                 //Alert user
-                [self showAlertWithTitle:nil message:NSLocalizedStringFromTable(@"room_creation_dm_error", @"Vector", nil)];
+                [self showAlertWithTitle:nil message:[VectorL10n roomCreationDmError]];
 
                 if (completion)
                 {
@@ -3023,24 +3020,24 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
     NSString *homeServerName = mainSession.matrixRestClient.credentials.homeServerName;
 
     NSString *message = [NSString stringWithFormat:@"%@\n\n%@",
-                         [NSString stringWithFormat:NSLocalizedStringFromTable(@"call_no_stun_server_error_message_1", @"Vector", nil), homeServerName],
-                         [NSString stringWithFormat: NSLocalizedStringFromTable(@"call_no_stun_server_error_message_2", @"Vector", nil), stunFallbackHost]];
-
-    _errorNotification = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"call_no_stun_server_error_title", @"Vector", nil)
+                         [VectorL10n callNoStunServerErrorMessage1:homeServerName],
+                         [VectorL10n callNoStunServerErrorMessage2:stunFallbackHost]];
+    
+    _errorNotification = [UIAlertController alertControllerWithTitle:[VectorL10n callNoStunServerErrorTitle]
                                                              message:message
                                                       preferredStyle:UIAlertControllerStyleAlert];
-
-    [_errorNotification addAction:[UIAlertAction actionWithTitle:[NSString stringWithFormat: NSLocalizedStringFromTable(@"call_no_stun_server_error_use_fallback_button", @"Vector", nil), stunFallbackHost]
+    
+    [_errorNotification addAction:[UIAlertAction actionWithTitle:[VectorL10n callNoStunServerErrorUseFallbackButton:stunFallbackHost]
                                                            style:UIAlertActionStyleDefault
                                                          handler:^(UIAlertAction * action) {
-
-                                                             RiotSettings.shared.allowStunServerFallback = YES;
+        
+        RiotSettings.shared.allowStunServerFallback = YES;
                                                              mainSession.callManager.fallbackSTUNServer = BuildSettings.stunServerFallbackUrlString;
 
                                                              [AppDelegate theDelegate].errorNotification = nil;
                                                          }]];
 
-    [_errorNotification addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+    [_errorNotification addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                            style:UIAlertActionStyleCancel
                                                          handler:^(UIAlertAction * action) {
 
@@ -3109,7 +3106,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
     
     [self.slidingModalPresenter dismissWithAnimated:NO completion:nil];
     
-    NSString *widgetCreatorUserId = widget.widgetEvent.sender ?: NSLocalizedStringFromTable(@"room_participants_unknown", @"Vector", nil);
+    NSString *widgetCreatorUserId = widget.widgetEvent.sender ?: [VectorL10n roomParticipantsUnknown];
     
     MXSession *session = widget.mxSession;
     MXRoom *room = [session roomWithRoomId:widget.widgetEvent.roomId];
@@ -3132,8 +3129,8 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
     NSString *widgetCreatorAvatarURL = widgetCreatorRoomMember.avatarUrl;
     
     NSArray<NSString*> *permissionStrings = @[
-                                              NSLocalizedStringFromTable(@"room_widget_permission_display_name_permission", @"Vector", nil),
-                                              NSLocalizedStringFromTable(@"room_widget_permission_avatar_url_permission", @"Vector", nil)
+                                              [VectorL10n roomWidgetPermissionDisplayNamePermission],
+                                              [VectorL10n roomWidgetPermissionAvatarUrlPermission]
                                               ];
     
     WidgetPermissionViewModel *widgetPermissionViewModel = [[WidgetPermissionViewModel alloc] initWithCreatorUserId:widgetCreatorUserId
@@ -3237,15 +3234,15 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
                                              
                                              NSString *appDisplayName = [[NSBundle mainBundle] infoDictionary][@"CFBundleDisplayName"];
                                              
-                                             NSString *message = [NSString stringWithFormat:NSLocalizedStringFromTable(@"no_voip", @"Vector", nil), callerDisplayname, appDisplayName];
+                                             NSString *message = [VectorL10n noVoip:callerDisplayname :appDisplayName];
                                              
-                                             noCallSupportAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"no_voip_title", @"Vector", nil)
+                                             noCallSupportAlert = [UIAlertController alertControllerWithTitle:[VectorL10n noVoipTitle]
                                                                                                       message:message
                                                                                                preferredStyle:UIAlertControllerStyleAlert];
                                              
                                              __weak typeof(self) weakSelf = self;
                                              
-                                             [noCallSupportAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ignore"]
+                                             [noCallSupportAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ignore]
                                                                                                     style:UIAlertActionStyleDefault
                                                                                                   handler:^(UIAlertAction * action) {
                                                                                                       
@@ -3257,7 +3254,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
                                                                                                       
                                                                                                   }]];
                                              
-                                             [noCallSupportAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"reject_call"]
+                                             [noCallSupportAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n rejectCall]
                                                                                                     style:UIAlertActionStyleDefault
                                                                                                   handler:^(UIAlertAction * action) {
                                                                                                       
@@ -3798,7 +3795,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
     {
         senderInfo = senderId;
     }
-
+    
     
     __block id observer;
     void (^removeObserver)(void) = ^() {
@@ -3808,37 +3805,34 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
             observer = nil;
         }
     };
-
-    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"key_verification_tile_request_incoming_title", @"Vector", nil)
-                                                                                             message:senderInfo
-                                                                                      preferredStyle:UIAlertControllerStyleAlert];
     
-    [alertController addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"key_verification_tile_request_incoming_approval_accept", @"Vector", nil)
-                                                                                           style:UIAlertActionStyleDefault
-                                                                                         handler:^(UIAlertAction * action)
-                                                                   {
-                                                                       removeObserver();
-                                                                       [self presentIncomingKeyVerificationRequest:keyVerificationRequest inSession:session];
-                                                                   }]];
+    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:[VectorL10n keyVerificationTileRequestIncomingTitle]
+                                                                             message:senderInfo
+                                                                      preferredStyle:UIAlertControllerStyleAlert];
     
-    [alertController addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"key_verification_tile_request_incoming_approval_decline", @"Vector", nil)
-                                                                                           style:UIAlertActionStyleDestructive
-                                                                                         handler:^(UIAlertAction * action)
-                                                                   {
-                                                                       removeObserver();
-                                                                       [keyVerificationRequest cancelWithCancelCode:MXTransactionCancelCode.user success:^{
-                                                                           
-                                                                       } failure:^(NSError * _Nonnull error) {
-                                                                           MXLogDebug(@"[AppDelegate][KeyVerification] Fail to cancel incoming key verification request with error: %@", error);
-                                                                       }];
-                                                                   }]];
+    [alertController addAction:[UIAlertAction actionWithTitle:[VectorL10n keyVerificationTileRequestIncomingApprovalAccept]
+                                                        style:UIAlertActionStyleDefault
+                                                      handler:^(UIAlertAction * action) {
+        removeObserver();
+        [self presentIncomingKeyVerificationRequest:keyVerificationRequest inSession:session];
+    }]];
     
-    [alertController addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"later", @"Vector", nil)
-                                                                                           style:UIAlertActionStyleCancel
-                                                                                         handler:^(UIAlertAction * action)
-                                                                   {
-                                                                       removeObserver();
-                                                                   }]];
+    [alertController addAction:[UIAlertAction actionWithTitle:[VectorL10n keyVerificationTileRequestIncomingApprovalDecline]
+                                                        style:UIAlertActionStyleDestructive
+                                                      handler:^(UIAlertAction * action) {
+        removeObserver();
+        [keyVerificationRequest cancelWithCancelCode:MXTransactionCancelCode.user success:^{
+            
+        } failure:^(NSError * _Nonnull error) {
+            MXLogDebug(@"[AppDelegate][KeyVerification] Fail to cancel incoming key verification request with error: %@", error);
+        }];
+    }]];
+    
+    [alertController addAction:[UIAlertAction actionWithTitle:[VectorL10n later]
+                                                        style:UIAlertActionStyleCancel
+                                                      handler:^(UIAlertAction * action) {
+        removeObserver();
+    }]];
     
     [self presentViewController:alertController animated:YES completion:nil];
     self.incomingKeyVerificationRequestAlertController = alertController;
@@ -3846,17 +3840,16 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
     observer = [[NSNotificationCenter defaultCenter] addObserverForName:MXKeyVerificationRequestDidChangeNotification
                                                                  object:keyVerificationRequest
                                                                   queue:[NSOperationQueue mainQueue]
-                                                             usingBlock:^(NSNotification * _Nonnull note)
-                {
-                    if (keyVerificationRequest.state != MXKeyVerificationRequestStatePending)
-                    {
-                        if (self.incomingKeyVerificationRequestAlertController == alertController)
-                        {
-                            [self.incomingKeyVerificationRequestAlertController dismissViewControllerAnimated:NO completion:nil];
-                            removeObserver();
-                        }
-                    }
-                }];
+                                                             usingBlock:^(NSNotification *note) {
+        if (keyVerificationRequest.state != MXKeyVerificationRequestStatePending)
+        {
+            if (self.incomingKeyVerificationRequestAlertController == alertController)
+            {
+                [self.incomingKeyVerificationRequestAlertController dismissViewControllerAnimated:NO completion:nil];
+                removeObserver();
+            }
+        }
+    }];
 }
 
 #pragma mark - New Sign In
@@ -3925,25 +3918,25 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
         deviceInfo = device.deviceId;
     }
     
-    NSString *alertMessage = [NSString stringWithFormat:NSLocalizedStringFromTable(@"device_verification_self_verify_alert_message", @"Vector", nil), deviceInfo];
+    NSString *alertMessage = [VectorL10n deviceVerificationSelfVerifyAlertMessage:deviceInfo];
     
-    UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"device_verification_self_verify_alert_title", @"Vector", nil)
+    UIAlertController *alert = [UIAlertController alertControllerWithTitle:[VectorL10n deviceVerificationSelfVerifyAlertTitle]
                                                                    message:alertMessage
                                                             preferredStyle:UIAlertControllerStyleAlert];
     
-    [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"device_verification_self_verify_alert_validate_action", @"Vector", nil)
+    [alert addAction:[UIAlertAction actionWithTitle:[VectorL10n deviceVerificationSelfVerifyAlertValidateAction]
                                               style:UIAlertActionStyleDefault
                                             handler:^(UIAlertAction * action) {
         self.userNewSignInAlertController = nil;
         [self presentSelfVerificationForOtherDeviceId:device.deviceId inSession:session];
     }]];
     
-    [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"later", @"Vector", nil)
+    [alert addAction:[UIAlertAction actionWithTitle:[VectorL10n later]
                                               style:UIAlertActionStyleCancel
                                             handler:^(UIAlertAction * action) {
         self.userNewSignInAlertController = nil;
     }]];
-     
+    
     [self presentViewController:alert animated:YES completion:nil];
     
     self.userNewSignInAlertController = alert;
@@ -4036,13 +4029,13 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
             MXSession *mainSession = self.mxSessions.firstObject;
             NSString *homeServerName = mainSession.matrixRestClient.credentials.homeServerName;
             
-            NSString *alertMessage = [NSString stringWithFormat:NSLocalizedStringFromTable(@"gdpr_consent_not_given_alert_message", @"Vector", nil), homeServerName];
+            NSString *alertMessage = [VectorL10n gdprConsentNotGivenAlertMessage:homeServerName];
             
-            UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"settings_term_conditions", @"Vector", nil)                                        
+            UIAlertController *alert = [UIAlertController alertControllerWithTitle:[VectorL10n settingsTermConditions]
                                                                            message:alertMessage
                                                                     preferredStyle:UIAlertControllerStyleAlert];
             
-            [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"gdpr_consent_not_given_alert_review_now_action", @"Vector", nil)
+            [alert addAction:[UIAlertAction actionWithTitle:[VectorL10n gdprConsentNotGivenAlertReviewNowAction]
                                                       style:UIAlertActionStyleDefault
                                                     handler:^(UIAlertAction * action) {
                                                         
@@ -4054,7 +4047,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
                                                         }
                                                     }]];
             
-            [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"later", @"Vector", nil)
+            [alert addAction:[UIAlertAction actionWithTitle:[VectorL10n later]
                                                       style:UIAlertActionStyleCancel
                                                     handler:nil]];
             
@@ -4069,7 +4062,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
 {
     GDPRConsentViewController *gdprConsentViewController = [[GDPRConsentViewController alloc] initWithURL:consentURI];    
     
-    UIBarButtonItem *closeBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:[NSBundle mxk_localizedStringForKey:@"close"]
+    UIBarButtonItem *closeBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:[MatrixKitL10n close]
                                                                            style:UIBarButtonItemStylePlain
                                                                           target:self
                                                                           action:@selector(dismissGDPRConsent)];
@@ -4269,7 +4262,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
         [[UIApplication sharedApplication] vc_open:self.majorUpdateManager.learnMoreURL completionHandler:^(BOOL success) {
             if (!success)
             {
-                [self showAlertWithTitle:[NSBundle mxk_localizedStringForKey:@"error"] message:NSLocalizedStringFromTable(@"room_message_unable_open_link_error_message", @"Vector", nil)];
+                [self showAlertWithTitle:[MatrixKitL10n error] message:[VectorL10n roomMessageUnableOpenLinkErrorMessage]];
             }
         }];
         
@@ -4304,7 +4297,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
 {
     if (dueToTooManyErrors)
     {
-        [self showAlertWithTitle:nil message:NSLocalizedStringFromTable(@"pin_protection_kick_user_alert_message", @"Vector", nil)];
+        [self showAlertWithTitle:nil message:[VectorL10n pinProtectionKickUserAlertMessage]];
         [self logoutWithConfirmation:NO completion:nil];
     }
     else
diff --git a/Riot/Modules/Authentication/AuthenticationViewController.m b/Riot/Modules/Authentication/AuthenticationViewController.m
index ad064f196..6c5f7aa47 100644
--- a/Riot/Modules/Authentication/AuthenticationViewController.m
+++ b/Riot/Modules/Authentication/AuthenticationViewController.m
@@ -128,7 +128,7 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
     [super viewDidLoad];
     
     self.mainNavigationItem.title = nil;
-    self.rightBarButtonItem.title = NSLocalizedStringFromTable(@"auth_register", @"Vector", nil);
+    self.rightBarButtonItem.title = [VectorL10n authRegister];
     
     self.defaultHomeServerUrl = RiotSettings.shared.homeserverUrlString;
     
@@ -138,14 +138,14 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
     
     [self.submitButton.layer setCornerRadius:5];
     self.submitButton.clipsToBounds = YES;
-    [self.submitButton setTitle:NSLocalizedStringFromTable(@"auth_login", @"Vector", nil) forState:UIControlStateNormal];
-    [self.submitButton setTitle:NSLocalizedStringFromTable(@"auth_login", @"Vector", nil) forState:UIControlStateHighlighted];
+    [self.submitButton setTitle:[VectorL10n authLogin] forState:UIControlStateNormal];
+    [self.submitButton setTitle:[VectorL10n authLogin] forState:UIControlStateHighlighted];
     self.submitButton.enabled = YES;
     
     [self.skipButton.layer setCornerRadius:5];
     self.skipButton.clipsToBounds = YES;
-    [self.skipButton setTitle:NSLocalizedStringFromTable(@"auth_skip", @"Vector", nil) forState:UIControlStateNormal];
-    [self.skipButton setTitle:NSLocalizedStringFromTable(@"auth_skip", @"Vector", nil) forState:UIControlStateHighlighted];
+    [self.skipButton setTitle:[VectorL10n authSkip] forState:UIControlStateNormal];
+    [self.skipButton setTitle:[VectorL10n authSkip] forState:UIControlStateHighlighted];
     self.skipButton.enabled = YES;
     
     [self.customServersTickButton setImage:[UIImage imageNamed:@"selection_untick"] forState:UIControlStateNormal];
@@ -163,16 +163,16 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
     // Soft logout section
     self.softLogoutClearDataButton.layer.cornerRadius = 5;
     self.softLogoutClearDataButton.clipsToBounds = YES;
-    [self.softLogoutClearDataButton setTitle:NSLocalizedStringFromTable(@"auth_softlogout_clear_data_button", @"Vector", nil) forState:UIControlStateNormal];
-    [self.softLogoutClearDataButton setTitle:NSLocalizedStringFromTable(@"auth_softlogout_clear_data_button", @"Vector", nil) forState:UIControlStateHighlighted];
+    [self.softLogoutClearDataButton setTitle:[VectorL10n authSoftlogoutClearDataButton] forState:UIControlStateNormal];
+    [self.softLogoutClearDataButton setTitle:[VectorL10n authSoftlogoutClearDataButton] forState:UIControlStateHighlighted];
     self.softLogoutClearDataButton.enabled = YES;
     self.softLogoutClearDataContainer.hidden = YES;
     
     // The view controller dismiss itself on successful login.
     self.delegate = self;
     
-    self.homeServerTextField.placeholder = NSLocalizedStringFromTable(@"auth_home_server_placeholder", @"Vector", nil);
-    self.identityServerTextField.placeholder = NSLocalizedStringFromTable(@"auth_identity_server_placeholder", @"Vector", nil);
+    self.homeServerTextField.placeholder = [VectorL10n authHomeServerPlaceholder];
+    self.identityServerTextField.placeholder = [VectorL10n authIdentityServerPlaceholder];
     
     self.authenticationActivityIndicatorContainerView.layer.cornerRadius = 5;
     [self.authenticationActivityIndicator addObserver:self
@@ -252,7 +252,7 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
     self.authenticationActivityIndicatorContainerView.backgroundColor = ThemeService.shared.theme.baseColor;
     self.noFlowLabel.textColor = ThemeService.shared.theme.warningColor;
     
-    NSMutableAttributedString *forgotPasswordTitle = [[NSMutableAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"auth_forgot_password", @"Vector", nil)];
+    NSMutableAttributedString *forgotPasswordTitle = [[NSMutableAttributedString alloc] initWithString:[VectorL10n authForgotPassword]];
     [forgotPasswordTitle addAttribute:NSUnderlineStyleAttributeName value:@(NSUnderlineStyleSingle) range:NSMakeRange(0, forgotPasswordTitle.length)];
     [forgotPasswordTitle addAttribute:NSForegroundColorAttributeName value:ThemeService.shared.theme.tintColor range:NSMakeRange(0, forgotPasswordTitle.length)];
     [self.forgotPasswordButton setAttributedTitle:forgotPasswordTitle forState:UIControlStateNormal];
@@ -264,7 +264,7 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
     
     [self updateForgotPwdButtonVisibility];
     
-    NSAttributedString *serverOptionsTitle = [[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"auth_use_server_options", @"Vector", nil) attributes:@{NSForegroundColorAttributeName : ThemeService.shared.theme.textSecondaryColor, NSFontAttributeName: [UIFont systemFontOfSize:14]}];
+    NSAttributedString *serverOptionsTitle = [[NSAttributedString alloc] initWithString:[VectorL10n authUseServerOptions] attributes:@{NSForegroundColorAttributeName : ThemeService.shared.theme.textSecondaryColor, NSFontAttributeName: [UIFont systemFontOfSize:14]}];
     [self.customServersTickButton setAttributedTitle:serverOptionsTitle forState:UIControlStateNormal];
     [self.customServersTickButton setAttributedTitle:serverOptionsTitle forState:UIControlStateHighlighted];
     
@@ -407,25 +407,25 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
 
     if (authType == MXKAuthenticationTypeLogin)
     {
-        [self.submitButton setTitle:NSLocalizedStringFromTable(@"auth_login", @"Vector", nil) forState:UIControlStateNormal];
-        [self.submitButton setTitle:NSLocalizedStringFromTable(@"auth_login", @"Vector", nil) forState:UIControlStateHighlighted];
+        [self.submitButton setTitle:[VectorL10n authLogin] forState:UIControlStateNormal];
+        [self.submitButton setTitle:[VectorL10n authLogin] forState:UIControlStateHighlighted];
     }
     else if (authType == MXKAuthenticationTypeRegister)
     {
-        [self.submitButton setTitle:NSLocalizedStringFromTable(@"auth_register", @"Vector", nil) forState:UIControlStateNormal];
-        [self.submitButton setTitle:NSLocalizedStringFromTable(@"auth_register", @"Vector", nil) forState:UIControlStateHighlighted];
+        [self.submitButton setTitle:[VectorL10n authRegister] forState:UIControlStateNormal];
+        [self.submitButton setTitle:[VectorL10n authRegister] forState:UIControlStateHighlighted];
     }
     else if (authType == MXKAuthenticationTypeForgotPassword)
     {
         if (isPasswordReseted)
         {
-            [self.submitButton setTitle:NSLocalizedStringFromTable(@"auth_return_to_login", @"Vector", nil) forState:UIControlStateNormal];
-            [self.submitButton setTitle:NSLocalizedStringFromTable(@"auth_return_to_login", @"Vector", nil) forState:UIControlStateHighlighted];
+            [self.submitButton setTitle:[VectorL10n authReturnToLogin] forState:UIControlStateNormal];
+            [self.submitButton setTitle:[VectorL10n authReturnToLogin] forState:UIControlStateHighlighted];
         }
         else
         {
-            [self.submitButton setTitle:NSLocalizedStringFromTable(@"auth_send_reset_email", @"Vector", nil) forState:UIControlStateNormal];
-            [self.submitButton setTitle:NSLocalizedStringFromTable(@"auth_send_reset_email", @"Vector", nil) forState:UIControlStateHighlighted];
+            [self.submitButton setTitle:[VectorL10n authSendResetEmail] forState:UIControlStateNormal];
+            [self.submitButton setTitle:[VectorL10n authSendResetEmail] forState:UIControlStateHighlighted];
         }
     }
     
@@ -513,7 +513,7 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
     if (!userInteractionEnabled)
     {
         // The right bar button is used to cancel the running request.
-        self.rightBarButtonItem.title = NSLocalizedStringFromTable(@"cancel", @"Vector", nil);
+        self.rightBarButtonItem.title = [VectorL10n cancel];
 
         // Remove the potential back button.
         self.mainNavigationItem.leftBarButtonItem = nil;
@@ -533,7 +533,7 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
                 && !self.softLogoutCredentials
                 && BuildSettings.authScreenShowRegister)
             {
-                self.rightBarButtonItem.title = NSLocalizedStringFromTable(@"auth_register", @"Vector", nil);
+                self.rightBarButtonItem.title = [VectorL10n authRegister];
             }
             else
             {
@@ -544,7 +544,7 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
         }
         else if (self.authType == MXKAuthenticationTypeRegister)
         {
-            self.rightBarButtonItem.title = NSLocalizedStringFromTable(@"auth_login", @"Vector", nil);
+            self.rightBarButtonItem.title = [VectorL10n authLogin];
             
             // Restore the back button
             if (authInputsview)
@@ -555,7 +555,7 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
         else if (self.authType == MXKAuthenticationTypeForgotPassword)
         {
             // The right bar button is used to return to login.
-            self.rightBarButtonItem.title = NSLocalizedStringFromTable(@"cancel", @"Vector", nil);
+            self.rightBarButtonItem.title = [VectorL10n cancel];
         }
     }
 }
@@ -689,23 +689,23 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
     // Customise the screen for soft logout
     self.customServersTickButton.hidden = YES;
     self.rightBarButtonItem.title = nil;
-    self.mainNavigationItem.title = NSLocalizedStringFromTable(@"auth_softlogout_signed_out", @"Vector", nil);
+    self.mainNavigationItem.title = [VectorL10n authSoftlogoutSignedOut];
 
     [self showSoftLogoutClearDataContainer];
 }
 
 - (void)showSoftLogoutClearDataContainer
 {
-    NSMutableAttributedString *message = [[NSMutableAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"auth_softlogout_clear_data", @"Vector", nil)
+    NSMutableAttributedString *message = [[NSMutableAttributedString alloc] initWithString:[VectorL10n authSoftlogoutClearData]
                                                                                 attributes:@{
                                                                                              NSFontAttributeName: [UIFont boldSystemFontOfSize:14]
                                                                                              }];
-
+    
     [message appendAttributedString:[[NSAttributedString alloc] initWithString:@"\n\n"]];
-
+    
     NSString *string = [NSString stringWithFormat:@"%@\n\n%@",
-                        NSLocalizedStringFromTable(@"auth_softlogout_clear_data_message_1", @"Vector", nil),
-                        NSLocalizedStringFromTable(@"auth_softlogout_clear_data_message_2", @"Vector", nil)];
+                        [VectorL10n authSoftlogoutClearDataMessage1],
+                        [VectorL10n authSoftlogoutClearDataMessage2]];
     
     [message appendAttributedString:[[NSAttributedString alloc] initWithString:string
                                                                     attributes:@{
@@ -738,19 +738,20 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
         [alert dismissViewControllerAnimated:NO completion:nil];
     }
 
-    alert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"auth_softlogout_clear_data_sign_out_title", @"Vector", nil)
-                                                message:NSLocalizedStringFromTable(@"auth_softlogout_clear_data_sign_out_msg", @"Vector", nil)
+    alert = [UIAlertController alertControllerWithTitle:[VectorL10n authSoftlogoutClearDataSignOutTitle]
+                                                message:[VectorL10n  authSoftlogoutClearDataSignOutMsg]
                                          preferredStyle:UIAlertControllerStyleAlert];
 
 
-    [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"auth_softlogout_clear_data_sign_out", @"Vector", nil)                                              style:UIAlertActionStyleDestructive
+    [alert addAction:[UIAlertAction actionWithTitle:[VectorL10n authSoftlogoutClearDataSignOut]
+                                              style:UIAlertActionStyleDestructive
                                             handler:^(UIAlertAction * action)
                       {
                           [self clearDataAfterSoftLogout];
                       }]];
 
     MXWeakify(self);
-    [alert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+    [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                               style:UIAlertActionStyleDefault
                                             handler:^(UIAlertAction * action)
                       {
@@ -926,10 +927,10 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
     {
         if (!self.isIdentityServerConfigured)
         {
-            UIAlertController *alert = [UIAlertController alertControllerWithTitle:[NSBundle mxk_localizedStringForKey:@"error"]
-                                                                           message:NSLocalizedStringFromTable(@"auth_forgot_password_error_no_configured_identity_server", @"Vector", nil)
+            UIAlertController *alert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n error]
+                                                                           message:[VectorL10n authForgotPasswordErrorNoConfiguredIdentityServer]
                                                                     preferredStyle:UIAlertControllerStyleAlert];
-            [alert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"] style:UIAlertActionStyleDefault handler:nil]];
+            [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok] style:UIAlertActionStyleDefault handler:nil]];
             [self presentViewController:alert animated:YES completion:nil];
             
             return;
@@ -951,12 +952,12 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
         else if (self.authType == MXKAuthenticationTypeLogin)
         {
             self.authType = MXKAuthenticationTypeRegister;
-            self.rightBarButtonItem.title = NSLocalizedStringFromTable(@"auth_login", @"Vector", nil);
+            self.rightBarButtonItem.title = [VectorL10n authLogin];
         }
         else
         {
             self.authType = MXKAuthenticationTypeLogin;
-            self.rightBarButtonItem.title = NSLocalizedStringFromTable(@"auth_register", @"Vector", nil);
+            self.rightBarButtonItem.title = [VectorL10n authRegister];
         }
     }
     else if (sender == self.mainNavigationItem.leftBarButtonItem)
@@ -1003,7 +1004,7 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
                             if ([mxError.errcode isEqualToString:kMXErrCodeStringUserInUse])
                             {
                                 MXLogDebug(@"[AuthenticationVC] User name is already use");
-                                [self onFailureDuringAuthRequest:[NSError errorWithDomain:MXKAuthErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey:[NSBundle mxk_localizedStringForKey:@"auth_username_in_use"]}]];
+                                [self onFailureDuringAuthRequest:[NSError errorWithDomain:MXKAuthErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey:[VectorL10n authUsernameInUse]}]];
                             }
                             //   - the server quota limits is not reached
                             else if ([mxError.errcode isEqualToString:kMXErrCodeStringResourceLimitExceeded])
@@ -1141,9 +1142,9 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
                 [alert dismissViewControllerAnimated:NO completion:nil];
             }
             
-            alert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"warning", @"Vector", nil) message:NSLocalizedStringFromTable(@"auth_add_email_and_phone_warning", @"Vector", nil) preferredStyle:UIAlertControllerStyleAlert];
+            alert = [UIAlertController alertControllerWithTitle:[VectorL10n warning] message:[VectorL10n authAddEmailAndPhoneWarning] preferredStyle:UIAlertControllerStyleAlert];
             
-            [alert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+            [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                                              style:UIAlertActionStyleDefault
                                                            handler:^(UIAlertAction * action) {
                                                                
@@ -1184,15 +1185,15 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
     
     if (thirdPartyIdentifiersHidden)
     {
-        [self.submitButton setTitle:NSLocalizedStringFromTable(@"auth_register", @"Vector", nil) forState:UIControlStateNormal];
-        [self.submitButton setTitle:NSLocalizedStringFromTable(@"auth_register", @"Vector", nil) forState:UIControlStateHighlighted];
+        [self.submitButton setTitle:[VectorL10n authRegister] forState:UIControlStateNormal];
+        [self.submitButton setTitle:[VectorL10n authRegister] forState:UIControlStateHighlighted];
         
         self.mainNavigationItem.leftBarButtonItem = nil;
     }
     else
     {
-        [self.submitButton setTitle:NSLocalizedStringFromTable(@"auth_submit", @"Vector", nil) forState:UIControlStateNormal];
-        [self.submitButton setTitle:NSLocalizedStringFromTable(@"auth_submit", @"Vector", nil) forState:UIControlStateHighlighted];
+        [self.submitButton setTitle:[VectorL10n authSubmit] forState:UIControlStateNormal];
+        [self.submitButton setTitle:[VectorL10n authSubmit] forState:UIControlStateHighlighted];
         
         UIBarButtonItem *leftBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"back_icon"] style:UIBarButtonItemStylePlain target:self action:@selector(onButtonPressed:)];
         self.mainNavigationItem.leftBarButtonItem = leftBarButtonItem;
@@ -1566,11 +1567,11 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
                     [self->alert dismissViewControllerAnimated:NO completion:nil];
                 }
 
-                self->alert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"auth_autodiscover_invalid_response", @"Vector", nil)
+                self->alert = [UIAlertController alertControllerWithTitle:[VectorL10n authAutodiscoverInvalidResponse]
                                                                   message:nil
                                                            preferredStyle:UIAlertControllerStyleAlert];
 
-                [self->alert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+                [self->alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                                                 style:UIAlertActionStyleDefault
                                                               handler:^(UIAlertAction * action) {
 
diff --git a/Riot/Modules/Authentication/Views/AuthInputsView.m b/Riot/Modules/Authentication/Views/AuthInputsView.m
index 5d869a341..68a79c202 100644
--- a/Riot/Modules/Authentication/Views/AuthInputsView.m
+++ b/Riot/Modules/Authentication/Views/AuthInputsView.m
@@ -71,9 +71,9 @@
     _isThirdPartyIdentifierPending = NO;
     _isSingleSignOnRequired = NO;
     
-    self.userLoginTextField.placeholder = NSLocalizedStringFromTable(@"auth_user_id_placeholder", @"Vector", nil);
-    self.repeatPasswordTextField.placeholder = NSLocalizedStringFromTable(@"auth_repeat_password_placeholder", @"Vector", nil);
-    self.passWordTextField.placeholder = NSLocalizedStringFromTable(@"auth_password_placeholder", @"Vector", nil);
+    self.userLoginTextField.placeholder = [VectorL10n authUserIdPlaceholder];
+    self.repeatPasswordTextField.placeholder = [VectorL10n authRepeatPasswordPlaceholder];
+    self.passWordTextField.placeholder = [VectorL10n authPasswordPlaceholder];
 
     // Apply placeholder color
     [self customizeViewRendering];
@@ -126,8 +126,8 @@
 
     [self.ssoButton.layer setCornerRadius:5];
     self.ssoButton.clipsToBounds = YES;
-    [self.ssoButton setTitle:NSLocalizedStringFromTable(@"auth_login_single_sign_on", @"Vector", nil) forState:UIControlStateNormal];
-    [self.ssoButton setTitle:NSLocalizedStringFromTable(@"auth_login_single_sign_on", @"Vector", nil) forState:UIControlStateHighlighted];
+    [self.ssoButton setTitle:[VectorL10n authLoginSingleSignOn] forState:UIControlStateNormal];
+    [self.ssoButton setTitle:[VectorL10n authLoginSingleSignOn] forState:UIControlStateHighlighted];
     self.ssoButton.backgroundColor = ThemeService.shared.theme.tintColor;
 
     if (self.userLoginTextField.placeholder)
@@ -209,9 +209,9 @@
                     self.passWordTextField.returnKeyType = UIReturnKeyDone;
                     self.phoneTextField.returnKeyType = UIReturnKeyNext;
 
-                    self.userLoginTextField.placeholder = NSLocalizedStringFromTable(@"auth_user_id_placeholder", @"Vector", nil);
-                    self.messageLabel.text = NSLocalizedStringFromTable(@"or", @"Vector", nil);
-                    self.phoneTextField.placeholder = NSLocalizedStringFromTable(@"auth_phone_placeholder", @"Vector", nil);
+                    self.userLoginTextField.placeholder = [VectorL10n authUserIdPlaceholder];
+                    self.messageLabel.text = [VectorL10n or];
+                    self.phoneTextField.placeholder = [VectorL10n authPhonePlaceholder];
 
                     self.userLoginTextField.attributedPlaceholder = [[NSAttributedString alloc]
                                                                      initWithString:self.userLoginTextField.placeholder
@@ -291,12 +291,12 @@
             if ((!self.userLoginTextField.text.length && !nbPhoneNumber) || !self.passWordTextField.text.length)
             {
                 MXLogDebug(@"[AuthInputsView] Invalid user/password");
-                errorMsg = NSLocalizedStringFromTable(@"auth_invalid_login_param", @"Vector", nil);
+                errorMsg = [VectorL10n authInvalidLoginParam];
             }
         }
         else
         {
-            errorMsg = [NSBundle mxk_localizedStringForKey:@"not_supported_yet"];
+            errorMsg = [MatrixKitL10n notSupportedYet];
         }
     }
     else if (type == MXKAuthenticationTypeRegister)
@@ -306,22 +306,22 @@
             if (!self.userLoginTextField.text.length)
             {
                 MXLogDebug(@"[AuthInputsView] Invalid user name");
-                errorMsg = NSLocalizedStringFromTable(@"auth_invalid_user_name", @"Vector", nil);
+                errorMsg = [VectorL10n authInvalidUserName];
             }
             else if (!self.passWordTextField.text.length)
             {
                 MXLogDebug(@"[AuthInputsView] Missing Passwords");
-                errorMsg = NSLocalizedStringFromTable(@"auth_missing_password", @"Vector", nil);
+                errorMsg = [VectorL10n authMissingPassword];
             }
             else if (self.passWordTextField.text.length < 6)
             {
                 MXLogDebug(@"[AuthInputsView] Invalid Passwords");
-                errorMsg = NSLocalizedStringFromTable(@"auth_invalid_password", @"Vector", nil);
+                errorMsg = [VectorL10n authInvalidPassword];
             }
             else if ([self.repeatPasswordTextField.text isEqualToString:self.passWordTextField.text] == NO)
             {
                 MXLogDebug(@"[AuthInputsView] Passwords don't match");
-                errorMsg = NSLocalizedStringFromTable(@"auth_password_dont_match", @"Vector", nil);
+                errorMsg = [VectorL10n authPasswordDontMatch];
             }
             else
             {
@@ -332,7 +332,7 @@
                 if ([regex firstMatchInString:user options:0 range:NSMakeRange(0, user.length)] == nil)
                 {
                     MXLogDebug(@"[AuthInputsView] Invalid user name");
-                    errorMsg = NSLocalizedStringFromTable(@"auth_invalid_user_name", @"Vector", nil);
+                    errorMsg = [VectorL10n authInvalidUserName];
                 }
             }
         }
@@ -344,12 +344,12 @@
                 if (self.areAllThirdPartyIdentifiersRequired)
                 {
                     MXLogDebug(@"[AuthInputsView] Missing email");
-                    errorMsg = NSLocalizedStringFromTable(@"auth_missing_email", @"Vector", nil);
+                    errorMsg = [VectorL10n authMissingEmail];
                 }
                 else if ([self isFlowSupported:kMXLoginFlowTypeMSISDN] && !self.phoneTextField.text.length && self.isThirdPartyIdentifierRequired)
                 {
                     MXLogDebug(@"[AuthInputsView] Missing email or phone number");
-                    errorMsg = NSLocalizedStringFromTable(@"auth_missing_email_or_phone", @"Vector", nil);
+                    errorMsg = [VectorL10n authMissingEmailOrPhone];
                 }
             }
             
@@ -361,7 +361,7 @@
                     if (self.areAllThirdPartyIdentifiersRequired)
                     {
                         MXLogDebug(@"[AuthInputsView] Missing phone");
-                        errorMsg = NSLocalizedStringFromTable(@"auth_missing_phone", @"Vector", nil);
+                        errorMsg = [VectorL10n authMissingPhone];
                     }
                 }
                 
@@ -374,7 +374,7 @@
                         if (![MXTools isEmailAddress:self.emailTextField.text])
                         {
                             MXLogDebug(@"[AuthInputsView] Invalid email");
-                            errorMsg = NSLocalizedStringFromTable(@"auth_invalid_email", @"Vector", nil);
+                            errorMsg = [VectorL10n authInvalidEmail];
                         }
                     }
                     
@@ -384,7 +384,7 @@
                         if (![[NBPhoneNumberUtil sharedInstance] isValidNumber:nbPhoneNumber])
                         {
                             MXLogDebug(@"[AuthInputsView] Invalid phone number");
-                            errorMsg = NSLocalizedStringFromTable(@"auth_invalid_phone", @"Vector", nil);
+                            errorMsg = [VectorL10n authInvalidPhone];
                         }
                     }
                 }
@@ -423,9 +423,9 @@
                 [inputsAlert dismissViewControllerAnimated:NO completion:nil];
             }
             
-            inputsAlert = [UIAlertController alertControllerWithTitle:[NSBundle mxk_localizedStringForKey:@"error"] message:errorMsg preferredStyle:UIAlertControllerStyleAlert];
+            inputsAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n error] message:errorMsg preferredStyle:UIAlertControllerStyleAlert];
             
-            [inputsAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+            [inputsAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                                              style:UIAlertActionStyleDefault
                                                            handler:^(UIAlertAction * action) {
                                                                
@@ -543,7 +543,7 @@
                                 callback(nil, [NSError errorWithDomain:MXKAuthErrorDomain
                                                                   code:0
                                                               userInfo:@{
-                                                                         NSLocalizedDescriptionKey:[NSBundle mxk_localizedStringForKey:@"auth_phone_is_required"]
+                                                                         NSLocalizedDescriptionKey:[VectorL10n authPhoneIsRequired]
                                                                          }]);
                                 return;
                             }
@@ -602,13 +602,13 @@
 
                                      if ([mxError.errcode isEqualToString:kMXErrCodeStringThreePIDInUse])
                                      {
-                                         userInfo[NSLocalizedDescriptionKey] = NSLocalizedStringFromTable(@"auth_phone_in_use", @"Vector", nil);
-                                         userInfo[@"error"] = NSLocalizedStringFromTable(@"auth_phone_in_use", @"Vector", nil);
+                                         userInfo[NSLocalizedDescriptionKey] = [VectorL10n authPhoneInUse];
+                                         userInfo[@"error"] = [VectorL10n authPhoneInUse];
                                      }
                                      else
                                      {
-                                         userInfo[NSLocalizedDescriptionKey] = NSLocalizedStringFromTable(@"auth_untrusted_id_server", @"Vector", nil);
-                                         userInfo[@"error"] = NSLocalizedStringFromTable(@"auth_untrusted_id_server", @"Vector", nil);
+                                         userInfo[NSLocalizedDescriptionKey] = [VectorL10n authUntrustedIdServer];
+                                         userInfo[@"error"] = [VectorL10n authUntrustedIdServer];
                                      }
 
                                      error = [NSError errorWithDomain:error.domain code:error.code userInfo:userInfo];
@@ -652,7 +652,7 @@
                                 callback(nil, [NSError errorWithDomain:MXKAuthErrorDomain
                                                             code:0
                                                         userInfo:@{
-                                                                   NSLocalizedDescriptionKey:[NSBundle mxk_localizedStringForKey:@"auth_email_is_required"]
+                                                                   NSLocalizedDescriptionKey:[VectorL10n authEmailIsRequired]
                                                                    }]);
                                 return;
                             }
@@ -693,7 +693,7 @@
 
                                  [self hideInputsContainer];
 
-                                 self.messageLabel.text = NSLocalizedStringFromTable(@"auth_email_validation_message", @"Vector", nil);
+                                self.messageLabel.text = [VectorL10n authEmailValidationMessage];
                                  self.messageLabel.hidden = NO;
 
                                  callback(parameters, nil);
@@ -728,13 +728,13 @@
 
                                      if ([mxError.errcode isEqualToString:kMXErrCodeStringThreePIDInUse])
                                      {
-                                         userInfo[NSLocalizedDescriptionKey] = NSLocalizedStringFromTable(@"auth_email_in_use", @"Vector", nil);
-                                         userInfo[@"error"] = NSLocalizedStringFromTable(@"auth_email_in_use", @"Vector", nil);
+                                         userInfo[NSLocalizedDescriptionKey] = [VectorL10n authEmailInUse];
+                                         userInfo[@"error"] = [VectorL10n authEmailInUse];
                                      }
                                      else
                                      {
-                                         userInfo[NSLocalizedDescriptionKey] = NSLocalizedStringFromTable(@"auth_untrusted_id_server", @"Vector", nil);
-                                         userInfo[@"error"] = NSLocalizedStringFromTable(@"auth_untrusted_id_server", @"Vector", nil);
+                                         userInfo[NSLocalizedDescriptionKey] = [VectorL10n authUntrustedIdServer];
+                                         userInfo[@"error"] = [VectorL10n authUntrustedIdServer];
                                      }
 
                                      error = [NSError errorWithDomain:error.domain code:error.code userInfo:userInfo];
@@ -774,7 +774,7 @@
                         else
                         {
                             MXLogDebug(@"[AuthInputsView] reCaptcha stage failed");
-                            callback(nil, [NSError errorWithDomain:MXKAuthErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey:[NSBundle mxk_localizedStringForKey:@"not_supported_yet"]}]);
+                            callback(nil, [NSError errorWithDomain:MXKAuthErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey:[MatrixKitL10n notSupportedYet]}]);
                         }
                         
                     }];
@@ -875,7 +875,7 @@
                         else
                         {
                             MXLogDebug(@"[AuthInputsView] reCaptcha stage failed");
-                            callback (nil, [NSError errorWithDomain:MXKAuthErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey:[NSBundle mxk_localizedStringForKey:@"not_supported_yet"]}]);
+                            callback (nil, [NSError errorWithDomain:MXKAuthErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey:[MatrixKitL10n notSupportedYet]}]);
                         }
                     }];
                 }
@@ -913,7 +913,7 @@
         }
         
         MXLogDebug(@"[AuthInputsView] updateAuthSessionWithCompletedStages failed");
-        callback (nil, [NSError errorWithDomain:MXKAuthErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey:[NSBundle mxk_localizedStringForKey:@"not_supported_yet"]}]);
+        callback (nil, [NSError errorWithDomain:MXKAuthErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey:[MatrixKitL10n notSupportedYet]}]);
     }
 }
 
@@ -1064,15 +1064,14 @@
     self.messageLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
     self.messageLabel.hidden = NO;
 
-    NSMutableAttributedString *message = [[NSMutableAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"auth_softlogout_sign_in", @"Vector", nil)
+    NSMutableAttributedString *message = [[NSMutableAttributedString alloc] initWithString:[VectorL10n authSoftlogoutSignIn]
                                                                     attributes:@{
                                                                                  NSFontAttributeName: [UIFont boldSystemFontOfSize:14]
                                                                                  }];
 
     [message appendAttributedString:[[NSAttributedString alloc] initWithString:@"\n\n"]];
 
-    NSString *string = [NSString stringWithFormat:NSLocalizedStringFromTable(@"auth_softlogout_reason", @"Vector", nil),
-                        softLogoutCredentials.homeServerName, userDisplayname, softLogoutCredentials.userId];
+    NSString *string = [VectorL10n authSoftlogoutReason:softLogoutCredentials.homeServerName :userDisplayname :softLogoutCredentials.userId];
     [message appendAttributedString:[[NSAttributedString alloc] initWithString:string
                                                                     attributes:@{
                                                                                  NSFontAttributeName: [UIFont systemFontOfSize:14]
@@ -1081,7 +1080,7 @@
     if (keyBackupNeeded)
     {
         [message appendAttributedString:[[NSAttributedString alloc] initWithString:@"\n\n"]];
-        string = NSLocalizedStringFromTable(@"auth_softlogout_recover_encryption_keys", @"Vector", nil);
+        string = [VectorL10n authSoftlogoutRecoverEncryptionKeys];
         [message appendAttributedString:[[NSAttributedString alloc] initWithString:string
                                                                         attributes:@{
                                                                                      NSFontAttributeName: [UIFont systemFontOfSize:14]
@@ -1215,7 +1214,7 @@
         self.passWordTextField.returnKeyType = UIReturnKeyNext;
 
         self.userLoginTextField.attributedPlaceholder = [[NSAttributedString alloc]
-                                                         initWithString:NSLocalizedStringFromTable(@"auth_user_name_placeholder", @"Vector", nil)
+                                                         initWithString:[VectorL10n authUserNamePlaceholder]
                                                          attributes:@{NSForegroundColorAttributeName: ThemeService.shared.theme.placeholderTextColor}];
         
         self.userLoginContainer.hidden = NO;
@@ -1232,11 +1231,11 @@
         {
             if (self.isThirdPartyIdentifierRequired)
             {
-                self.emailTextField.placeholder = NSLocalizedStringFromTable(@"auth_email_placeholder", @"Vector", nil);
+                self.emailTextField.placeholder = [VectorL10n authEmailPlaceholder];
             }
             else
             {
-                self.emailTextField.placeholder = NSLocalizedStringFromTable(@"auth_optional_email_placeholder", @"Vector", nil);
+                self.emailTextField.placeholder = [VectorL10n authOptionalEmailPlaceholder];
             }
             
             self.emailTextField.attributedPlaceholder = [[NSAttributedString alloc]
@@ -1246,7 +1245,7 @@
             self.emailContainer.hidden = NO;
             
             self.messageLabel.hidden = NO;
-            self.messageLabel.text = NSLocalizedStringFromTable(@"auth_add_email_message_2", @"Vector", nil);
+            self.messageLabel.text = [VectorL10n authAddEmailMessage2];
             
             lastViewContainer = self.emailContainer;
         }
@@ -1257,11 +1256,11 @@
             
             if (self.isThirdPartyIdentifierRequired)
             {
-                self.phoneTextField.placeholder = NSLocalizedStringFromTable(@"auth_phone_placeholder", @"Vector", nil);
+                self.phoneTextField.placeholder = [VectorL10n authPhonePlaceholder];
             }
             else
             {
-                self.phoneTextField.placeholder = NSLocalizedStringFromTable(@"auth_optional_phone_placeholder", @"Vector", nil);
+                self.phoneTextField.placeholder = [VectorL10n authOptionalPhonePlaceholder];
             }
             
             self.phoneTextField.attributedPlaceholder = [[NSAttributedString alloc]
@@ -1275,14 +1274,14 @@
                 self.emailTextField.returnKeyType = UIReturnKeyNext;
                 
                 self.phoneContainerTopConstraint.constant = 50;
-                self.messageLabel.text = NSLocalizedStringFromTable(@"auth_add_email_phone_message_2", @"Vector", nil);
+                self.messageLabel.text = [VectorL10n authAddEmailPhoneMessage2];
             }
             else
             {
                 self.phoneContainerTopConstraint.constant = 0;
                 
                 self.messageLabel.hidden = NO;
-                self.messageLabel.text = NSLocalizedStringFromTable(@"auth_add_phone_message_2", @"Vector", nil);
+                self.messageLabel.text = [VectorL10n authAddPhoneMessage2];
             }
             
             lastViewContainer = self.phoneContainer;
@@ -1486,7 +1485,7 @@
         [self hideInputsContainer];
         
         self.messageLabel.hidden = NO;
-        self.messageLabel.text = NSLocalizedStringFromTable(@"auth_recaptcha_message", @"Vector", nil);
+        self.messageLabel.text = [VectorL10n authRecaptchaMessage];
         
         self.recaptchaContainer.hidden = NO;
         self.currentLastContainer = self.recaptchaContainer;
@@ -1670,9 +1669,9 @@
         [inputsAlert dismissViewControllerAnimated:NO completion:nil];
     }
     
-    inputsAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"auth_msisdn_validation_title", @"Vector", nil) message:NSLocalizedStringFromTable(@"auth_msisdn_validation_message", @"Vector", nil) preferredStyle:UIAlertControllerStyleAlert];
+    inputsAlert = [UIAlertController alertControllerWithTitle:[VectorL10n authMsisdnValidationTitle] message:[VectorL10n authMsisdnValidationMessage] preferredStyle:UIAlertControllerStyleAlert];
     
-    [inputsAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+    [inputsAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                     style:UIAlertActionStyleDefault
                                                   handler:^(UIAlertAction * action) {
                                                       
@@ -1697,7 +1696,7 @@
         
     }];
     
-    [inputsAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"submit"]
+    [inputsAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n submit]
                                                     style:UIAlertActionStyleDefault
                                                   handler:^(UIAlertAction * action) {
                                                       
@@ -1769,13 +1768,13 @@
                                                                       }
                                                                       else
                                                                       {
-                                                                          title = [NSBundle mxk_localizedStringForKey:@"error"];
+                                                                          title = [MatrixKitL10n error];
                                                                       }
                                                                   }
                                                                   
                                                                   self->inputsAlert = [UIAlertController alertControllerWithTitle:title message:msg preferredStyle:UIAlertControllerStyleAlert];
                                                                   
-                                                                  [inputsAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+                                                                  [inputsAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                                                                                                   style:UIAlertActionStyleDefault
                                                                                                                 handler:^(UIAlertAction * action) {
                                                                                                                     
@@ -1820,7 +1819,7 @@
         [self hideInputsContainer];
 
         self.messageLabel.hidden = NO;
-        self.messageLabel.text = NSLocalizedStringFromTable(@"auth_accept_policies", @"Vector", nil);
+        self.messageLabel.text = [VectorL10n authAcceptPolicies];
 
         self.termsView.hidden = NO;
         self.currentLastContainer = self.termsView;
diff --git a/Riot/Modules/Authentication/Views/ForgotPasswordInputsView.m b/Riot/Modules/Authentication/Views/ForgotPasswordInputsView.m
index b6deda549..01fa1f500 100644
--- a/Riot/Modules/Authentication/Views/ForgotPasswordInputsView.m
+++ b/Riot/Modules/Authentication/Views/ForgotPasswordInputsView.m
@@ -52,13 +52,13 @@
 {
     [super awakeFromNib];
     
-    [self.nextStepButton setTitle:[NSBundle mxk_localizedStringForKey:@"auth_reset_password_next_step_button"] forState:UIControlStateNormal];
-    [self.nextStepButton setTitle:[NSBundle mxk_localizedStringForKey:@"auth_reset_password_next_step_button"] forState:UIControlStateHighlighted];
+    [self.nextStepButton setTitle:[VectorL10n authResetPasswordNextStepButton] forState:UIControlStateNormal];
+    [self.nextStepButton setTitle:[VectorL10n authResetPasswordNextStepButton] forState:UIControlStateHighlighted];
     self.nextStepButton.enabled = YES;
     
-    self.emailTextField.placeholder = NSLocalizedStringFromTable(@"auth_email_placeholder", @"Vector", nil);
-    self.passWordTextField.placeholder = NSLocalizedStringFromTable(@"auth_new_password_placeholder", @"Vector", nil);
-    self.repeatPasswordTextField.placeholder = NSLocalizedStringFromTable(@"auth_repeat_new_password_placeholder", @"Vector", nil);
+    self.emailTextField.placeholder = [VectorL10n authEmailPlaceholder];
+    self.passWordTextField.placeholder = [VectorL10n authNewPasswordPlaceholder];
+    self.repeatPasswordTextField.placeholder = [VectorL10n authRepeatNewPasswordPlaceholder];
     
     // Apply placeholder color
     [self customizeViewRendering];
@@ -166,22 +166,22 @@
     if (!self.emailTextField.text.length)
     {
         MXLogDebug(@"[ForgotPasswordInputsView] Missing email");
-        errorMsg = NSLocalizedStringFromTable(@"auth_reset_password_missing_email", @"Vector", nil);
+        errorMsg = [VectorL10n authResetPasswordMissingEmail];
     }
     else if (!self.passWordTextField.text.length)
     {
         MXLogDebug(@"[ForgotPasswordInputsView] Missing Passwords");
-        errorMsg = NSLocalizedStringFromTable(@"auth_reset_password_missing_password", @"Vector", nil);
+        errorMsg = [VectorL10n authResetPasswordMissingPassword];
     }
     else if (self.passWordTextField.text.length < 6)
     {
         MXLogDebug(@"[ForgotPasswordInputsView] Invalid Passwords");
-        errorMsg = NSLocalizedStringFromTable(@"auth_invalid_password", @"Vector", nil);
+        errorMsg = [VectorL10n authInvalidPassword];
     }
     else if ([self.repeatPasswordTextField.text isEqualToString:self.passWordTextField.text] == NO)
     {
         MXLogDebug(@"[ForgotPasswordInputsView] Passwords don't match");
-        errorMsg = NSLocalizedStringFromTable(@"auth_password_dont_match", @"Vector", nil);
+        errorMsg = [VectorL10n authPasswordDontMatch];
     }
     else
     {
@@ -189,7 +189,7 @@
         if ([MXTools isEmailAddress:self.emailTextField.text] == NO)
         {
             MXLogDebug(@"[ForgotPasswordInputsView] Invalid email");
-            errorMsg = NSLocalizedStringFromTable(@"auth_invalid_email", @"Vector", nil);
+            errorMsg = [VectorL10n authInvalidEmail];
         }
     }
     
@@ -213,9 +213,9 @@
                 [inputsAlert dismissViewControllerAnimated:NO completion:nil];
             }
             
-            inputsAlert = [UIAlertController alertControllerWithTitle:[NSBundle mxk_localizedStringForKey:@"error"] message:errorMsg preferredStyle:UIAlertControllerStyleAlert];
+            inputsAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n error] message:errorMsg preferredStyle:UIAlertControllerStyleAlert];
             
-            [inputsAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+            [inputsAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                                             style:UIAlertActionStyleDefault
                                                           handler:^(UIAlertAction * action) {
                                                               
@@ -272,7 +272,7 @@
 
                              [strongSelf hideInputsContainer];
 
-                             strongSelf.messageLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"auth_reset_password_email_validation_message", @"Vector", nil), strongSelf.emailTextField.text];
+                             strongSelf.messageLabel.text = [VectorL10n authResetPasswordEmailValidationMessage:strongSelf.emailTextField.text];
 
                              strongSelf.messageLabel.hidden = NO;
 
@@ -298,9 +298,9 @@
                          // Translate the potential MX error.
                          MXError *mxError = [[MXError alloc] initWithNSError:error];
                          if (mxError && [mxError.errcode isEqualToString:kMXErrCodeStringThreePIDNotFound])
-                             errorMessage = NSLocalizedStringFromTable(@"auth_email_not_found", @"Vector", nil);
+                             errorMessage = [VectorL10n authEmailNotFound];
                          else if (mxError && [mxError.errcode isEqualToString:kMXErrCodeStringServerNotTrusted])
-                             errorMessage = NSLocalizedStringFromTable(@"auth_untrusted_id_server", @"Vector", nil);
+                             errorMessage = [VectorL10n authUntrustedIdServer];
                          else if (error.userInfo[@"error"])
                              errorMessage = error.userInfo[@"error"];
                          else
@@ -315,9 +315,9 @@
                                  [self->inputsAlert dismissViewControllerAnimated:NO completion:nil];
                              }
 
-                             self->inputsAlert = [UIAlertController alertControllerWithTitle:[NSBundle mxk_localizedStringForKey:@"error"] message:errorMessage preferredStyle:UIAlertControllerStyleAlert];
+                             self->inputsAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n error] message:errorMessage preferredStyle:UIAlertControllerStyleAlert];
 
-                             [self->inputsAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+                             [self->inputsAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                                                                    style:UIAlertActionStyleDefault
                                                                                  handler:^(UIAlertAction * action) {
 
@@ -349,7 +349,7 @@
             }
         }
         
-        callback(nil, [NSError errorWithDomain:MXKAuthErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey:[NSBundle mxk_localizedStringForKey:@"not_supported_yet"]}]);
+        callback(nil, [NSError errorWithDomain:MXKAuthErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey:[MatrixKitL10n notSupportedYet]}]);
     }
 }
 
@@ -381,7 +381,7 @@
     
     [self hideInputsContainer];
     
-    self.messageLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"auth_reset_password_success_message", @"Vector", nil), self.emailTextField.text];
+    self.messageLabel.text = [VectorL10n authResetPasswordSuccessMessage];
     
     self.messageLabel.hidden = NO;
 }
@@ -400,7 +400,7 @@
     // Reset UI by hidding all items
     [self hideInputsContainer];
     
-    self.messageLabel.text = NSLocalizedStringFromTable(@"auth_reset_password_message", @"Vector", nil);
+    self.messageLabel.text = [VectorL10n authResetPasswordMessage];
     self.messageLabel.hidden = NO;
     
     self.emailContainer.hidden = NO;
@@ -422,7 +422,7 @@
             failure([NSError errorWithDomain:MXKAuthErrorDomain
                                         code:0
                                     userInfo:@{
-                                               NSLocalizedDescriptionKey:[NSBundle mxk_localizedStringForKey:@"auth_reset_password_error_is_required"]
+                                               NSLocalizedDescriptionKey:[VectorL10n authResetPasswordErrorIsRequired]
                                                }]);
         }
         else
diff --git a/Riot/Modules/Authentication/Views/TermsView.swift b/Riot/Modules/Authentication/Views/TermsView.swift
index 4936c231a..8bd34fa90 100644
--- a/Riot/Modules/Authentication/Views/TermsView.swift
+++ b/Riot/Modules/Authentication/Views/TermsView.swift
@@ -67,8 +67,8 @@ final class TermsView: UIView, NibOwnerLoadable, UITableViewDelegate, UITableVie
         tableView.register(TableViewCellWithCheckBoxAndLabel.nib(), forCellReuseIdentifier: TableViewCellWithCheckBoxAndLabel.defaultReuseIdentifier())
 
         acceptButton.clipsToBounds = true
-        acceptButton.setTitle(NSLocalizedString("accept", tableName: "Vector", comment: ""), for: .normal)
-        acceptButton.setTitle(NSLocalizedString("accept", tableName: "Vector", comment: ""), for: .highlighted)
+        acceptButton.setTitle(VectorL10n.accept, for: .normal)
+        acceptButton.setTitle(VectorL10n.accept, for: .highlighted)
         
         acceptButton.layer.masksToBounds = true
         acceptButton.layer.cornerRadius = 5
diff --git a/Riot/Modules/BugReport/BugReportViewController.m b/Riot/Modules/BugReport/BugReportViewController.m
index 84fc7dc6e..01b04e110 100644
--- a/Riot/Modules/BugReport/BugReportViewController.m
+++ b/Riot/Modules/BugReport/BugReportViewController.m
@@ -71,9 +71,9 @@
 {
     [super viewDidLoad];
 
-    _logsDescriptionLabel.text = NSLocalizedStringFromTable(@"bug_report_logs_description", @"Vector", nil);
-    _sendLogsLabel.text = NSLocalizedStringFromTable(@"bug_report_send_logs", @"Vector", nil);
-    _sendScreenshotLabel.text = NSLocalizedStringFromTable(@"bug_report_send_screenshot", @"Vector", nil);
+    _logsDescriptionLabel.text = [VectorL10n bugReportLogsDescription];
+    _sendLogsLabel.text = [VectorL10n bugReportSendLogs];
+    _sendScreenshotLabel.text = [VectorL10n bugReportSendScreenshot];
 
     _containerView.layer.cornerRadius = 20;
 
@@ -83,21 +83,21 @@
 
     if (_reportCrash)
     {
-        _titleLabel.text = NSLocalizedStringFromTable(@"bug_crash_report_title", @"Vector", nil);
-        _descriptionLabel.text = NSLocalizedStringFromTable(@"bug_crash_report_description", @"Vector", nil);
+        _titleLabel.text = [VectorL10n bugCrashReportTitle];
+        _descriptionLabel.text = [VectorL10n bugCrashReportDescription];
     }
     else
     {
-        _titleLabel.text = NSLocalizedStringFromTable(@"bug_report_title", @"Vector", nil);
-        _descriptionLabel.text = NSLocalizedStringFromTable(@"bug_report_description", @"Vector", nil);
+        _titleLabel.text = [VectorL10n bugReportTitle];
+        _descriptionLabel.text = [VectorL10n bugReportDescription];
     }
     
-    [_cancelButton setTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] forState:UIControlStateNormal];
-    [_cancelButton setTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] forState:UIControlStateHighlighted];
-    [_sendButton setTitle:NSLocalizedStringFromTable(@"bug_report_send", @"Vector", nil) forState:UIControlStateNormal];
-    [_sendButton setTitle:NSLocalizedStringFromTable(@"bug_report_send", @"Vector", nil) forState:UIControlStateHighlighted];
-    [_backgroundButton setTitle:NSLocalizedStringFromTable(@"bug_report_background_mode", @"Vector", nil) forState:UIControlStateNormal];
-    [_backgroundButton setTitle:NSLocalizedStringFromTable(@"bug_report_background_mode", @"Vector", nil) forState:UIControlStateHighlighted];
+    [_cancelButton setTitle:[MatrixKitL10n cancel] forState:UIControlStateNormal];
+    [_cancelButton setTitle:[MatrixKitL10n cancel] forState:UIControlStateHighlighted];
+    [_sendButton setTitle:[VectorL10n bugReportSend] forState:UIControlStateNormal];
+    [_sendButton setTitle:[VectorL10n bugReportSend] forState:UIControlStateHighlighted];
+    [_backgroundButton setTitle:[VectorL10n bugReportBackgroundMode] forState:UIControlStateNormal];
+    [_backgroundButton setTitle:[VectorL10n bugReportBackgroundMode] forState:UIControlStateHighlighted];
 
     // Do not send empty report
     _sendButton.enabled = NO;;
@@ -363,7 +363,7 @@
         NSString *versionLabel = bugReportRestClient.version;
 
         // If this is not the app store version, be more accurate on the build origin
-        if ([build isEqualToString:NSLocalizedStringFromTable(@"settings_config_no_build_info", @"Vector", nil)])
+        if ([build isEqualToString:[VectorL10n settingsConfigNoBuildInfo]])
         {
             // This is a debug session from Xcode
             versionLabel = [versionLabel stringByAppendingString:@"-debug"];
@@ -400,11 +400,11 @@
         switch (state)
         {
             case MXBugReportStateProgressZipping:
-                self.sendingLabel.text = NSLocalizedStringFromTable(@"bug_report_progress_zipping", @"Vector", nil);
+                self.sendingLabel.text = [VectorL10n bugReportProgressZipping];
                 break;
 
             case MXBugReportStateProgressUploading:
-                self.sendingLabel.text = NSLocalizedStringFromTable(@"bug_report_progress_uploading", @"Vector", nil);
+                self.sendingLabel.text = [VectorL10n bugReportProgressUploading];
                 break;
 
             default:
diff --git a/Riot/Modules/Call/CallViewController.m b/Riot/Modules/Call/CallViewController.m
index 3c3c60250..3a448e0b0 100644
--- a/Riot/Modules/Call/CallViewController.m
+++ b/Riot/Modules/Call/CallViewController.m
@@ -205,9 +205,9 @@ CallAudioRouteMenuViewDelegate>
     
     NSString *callInfo;
     if (self.mxCall.isVideoCall)
-        callInfo = NSLocalizedStringFromTable(@"call_incoming_video", @"Vector", nil);
+        callInfo = [VectorL10n callIncomingVideo];
     else
-        callInfo = NSLocalizedStringFromTable(@"call_incoming_voice", @"Vector", nil);
+        callInfo = [VectorL10n callIncomingVoice];
     
     IncomingCallView *incomingCallView = [[IncomingCallView alloc] initWithCallerAvatar:self.peer.avatarUrl
                                                                            mediaManager:self.mainSession.mediaManager
@@ -308,11 +308,11 @@ CallAudioRouteMenuViewDelegate>
         
         [currentAlert dismissViewControllerAnimated:NO completion:nil];
         
-        currentAlert = [UIAlertController alertControllerWithTitle:[NSBundle mxk_localizedStringForKey:@"unknown_devices_alert_title"]
-                                                           message:[NSBundle mxk_localizedStringForKey:@"unknown_devices_alert"]
+        currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n unknownDevicesAlertTitle]
+                                                           message:[VectorL10n unknownDevicesAlert]
                                                     preferredStyle:UIAlertControllerStyleAlert];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"unknown_devices_verify"]
+        [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n unknownDevicesVerify]
                                                          style:UIAlertActionStyleDefault
                                                        handler:^(UIAlertAction * action) {
                                                            
@@ -362,7 +362,7 @@ CallAudioRouteMenuViewDelegate>
                                                        }]];
         
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:(call.isIncoming ? @"unknown_devices_answer_anyway":@"unknown_devices_call_anyway")]
+        [currentAlert addAction:[UIAlertAction actionWithTitle:(call.isIncoming ? [VectorL10n unknownDevicesAnswerAnyway] : [VectorL10n unknownDevicesCallAnyway])
                                                          style:UIAlertActionStyleDefault
                                                        handler:^(UIAlertAction * action) {
                                                            
@@ -682,11 +682,11 @@ CallAudioRouteMenuViewDelegate>
         
         MXWeakify(self);
         
-        self->currentAlert = [UIAlertController alertControllerWithTitle:[NSBundle mxk_localizedStringForKey:@"call_transfer_error_title"]
-                                                                 message:[NSBundle mxk_localizedStringForKey:@"call_transfer_error_message"]
+        self->currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n callTransferErrorTitle]
+                                                                 message:[VectorL10n callTransferErrorMessage]
                                                           preferredStyle:UIAlertControllerStyleAlert];
         
-        [self->currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+        [self->currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                                                style:UIAlertActionStyleDefault
                                                              handler:^(UIAlertAction * action) {
             
diff --git a/Riot/Modules/Call/Views/IncomingCallView.m b/Riot/Modules/Call/Views/IncomingCallView.m
index 9a189ceec..e56e2f513 100644
--- a/Riot/Modules/Call/Views/IncomingCallView.m
+++ b/Riot/Modules/Call/Views/IncomingCallView.m
@@ -99,7 +99,7 @@ static const CGFloat kButtonSize = 80.0;
         self.answerTitleLabel.backgroundColor = ThemeService.shared.theme.backgroundColor;        
         self.answerTitleLabel.textColor = answerButtonBorderColor;
         self.answerTitleLabel.font = [UIFont systemFontOfSize:18.0 weight:UIFontWeightRegular];
-        self.answerTitleLabel.text = NSLocalizedStringFromTable(@"accept", @"Vector", nil);
+        self.answerTitleLabel.text = [VectorL10n accept];
         
         UIColor *rejectButtonBorderColor = ThemeService.shared.theme.warningColor;
         
@@ -113,7 +113,7 @@ static const CGFloat kButtonSize = 80.0;
         self.rejectTitleLabel.backgroundColor = ThemeService.shared.theme.backgroundColor;
         self.rejectTitleLabel.textColor = rejectButtonBorderColor;
         self.rejectTitleLabel.font = [UIFont systemFontOfSize:18.0 weight:UIFontWeightRegular];
-        self.rejectTitleLabel.text = NSLocalizedStringFromTable(@"decline", @"Vector", nil);
+        self.rejectTitleLabel.text = [VectorL10n decline];
 
         [self setupLayout];
     }
diff --git a/Riot/Modules/CallTransfer/SelectContact/MatrixContactsDataSource.m b/Riot/Modules/CallTransfer/SelectContact/MatrixContactsDataSource.m
index 1bc9eea35..b86ecf711 100644
--- a/Riot/Modules/CallTransfer/SelectContact/MatrixContactsDataSource.m
+++ b/Riot/Modules/CallTransfer/SelectContact/MatrixContactsDataSource.m
@@ -16,6 +16,8 @@
 
 #import "MatrixContactsDataSource.h"
 
+#import "Riot-Swift.h"
+
 @implementation MatrixContactsDataSource
 
 - (instancetype)init
@@ -31,11 +33,11 @@
 {
     if (section == filteredLocalContactsSection)
     {
-        return NSLocalizedStringFromTable(@"contacts_address_book_section", @"Vector", nil);
+        return [VectorL10n contactsAddressBookSection];
     }
     else
     {
-        return NSLocalizedStringFromTable(@"call_transfer_contacts_all", @"Vector", nil);
+        return [VectorL10n callTransferContactsAll];
     }
 }
 
diff --git a/Riot/Modules/Common/Recents/CellData/RecentCellData.m b/Riot/Modules/Common/Recents/CellData/RecentCellData.m
index 9d4e3dea8..45926d388 100644
--- a/Riot/Modules/Common/Recents/CellData/RecentCellData.m
+++ b/Riot/Modules/Common/Recents/CellData/RecentCellData.m
@@ -20,6 +20,12 @@
 #import "MXRoom+Riot.h"
 #import "MatrixSDK-Swift.h"
 
+#ifdef IS_SHARE_EXTENSION
+#import "RiotShareExtension-Swift.h"
+#else
+#import "Riot-Swift.h"
+#endif
+
 @implementation RecentCellData
 // trick to hide the mother class property as it is readonly one.
 // self.roomDisplayname returns this value instead of the mother class.
@@ -33,7 +39,7 @@
     if (notificationCount > 1000)
     {
         CGFloat value = notificationCount / 1000.0;
-        stringValue = [NSString stringWithFormat:NSLocalizedStringFromTable(@"large_badge_value_k_format", @"Vector", nil), value];
+        stringValue = [VectorL10n largeBadgeValueKFormat:value];
     }
     else
     {
@@ -61,7 +67,7 @@
     roomDisplayname = self.spaceChildInfo ? self.spaceChildInfo.name: self.roomSummary.displayname;
     if (!roomDisplayname.length)
     {
-        roomDisplayname = [NSBundle mxk_localizedStringForKey:@"room_displayname_empty_room"];
+        roomDisplayname = [MatrixKitL10n roomDisplaynameEmptyRoom];
     }
 }
 
diff --git a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
index 6b0172631..b9feee410 100644
--- a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
+++ b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
@@ -614,12 +614,12 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
     if (section == favoritesSection)
     {
         count = self.favoriteCellDataArray.count;
-        title = NSLocalizedStringFromTable(@"room_recents_favourites_section", @"Vector", nil);
+        title = [VectorL10n roomRecentsFavouritesSection];
     }
     else if (section == peopleSection)
     {
         count = self.peopleCellDataArray.count;
-        title = NSLocalizedStringFromTable(@"room_recents_people_section", @"Vector", nil);
+        title = [VectorL10n roomRecentsPeopleSection];
     }
     else if (section == conversationSection)
     {
@@ -627,26 +627,26 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
         
         if (_recentsDataSourceMode == RecentsDataSourceModePeople)
         {
-            title = NSLocalizedStringFromTable(@"people_conversation_section", @"Vector", nil);
+            title = [VectorL10n peopleConversationSection];
         }
         else
         {
-            title = NSLocalizedStringFromTable(@"room_recents_conversations_section", @"Vector", nil);
+            title = [VectorL10n roomRecentsConversationsSection];
         }
     }
     else if (section == directorySection)
     {
-        title = NSLocalizedStringFromTable(@"room_recents_directory_section", @"Vector", nil);
+        title = [VectorL10n roomRecentsDirectorySection];
     }
     else if (section == lowPrioritySection)
     {
         count = self.lowPriorityCellDataArray.count;
-        title = NSLocalizedStringFromTable(@"room_recents_low_priority_section", @"Vector", nil);
+        title = [VectorL10n roomRecentsLowPrioritySection];
     }
     else if (section == serverNoticeSection)
     {
         count = self.serverNoticeCellDataArray.count;
-        title = NSLocalizedStringFromTable(@"room_recents_server_notice_section", @"Vector", nil);
+        title = [VectorL10n roomRecentsServerNoticeSection];
     }
     else if (section == invitesSection)
     {
@@ -654,17 +654,17 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
         
         if (_recentsDataSourceMode == RecentsDataSourceModePeople)
         {
-            title = NSLocalizedStringFromTable(@"people_invites_section", @"Vector", nil);
+            title = [VectorL10n peopleInvitesSection];
         }
         else
         {
-            title = NSLocalizedStringFromTable(@"room_recents_invites_section", @"Vector", nil);
+            title = [VectorL10n roomRecentsInvitesSection];
         }
     }
     else if (section == suggestedRoomsSection)
     {
         count = self.suggestedRoomCellDataArray.count;
-        title = NSLocalizedStringFromTable(@"room_recents_suggested_rooms_section", @"Vector", nil);
+        title = [VectorL10n roomRecentsSuggestedRoomsSection];
     }
     
     if (count)
@@ -737,7 +737,7 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
         if (count > 1000)
         {
             CGFloat value = count / 1000.0;
-            missedNotifAndUnreadBadgeLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"large_badge_value_k_format", @"Vector", nil), value];
+            missedNotifAndUnreadBadgeLabel.text = [VectorL10n largeBadgeValueKFormat:value];
         }
         else
         {
@@ -932,15 +932,15 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
         // Check whether a search session is in progress
         if (self.searchPatternsList)
         {
-            tableViewCell.textLabel.text = NSLocalizedStringFromTable(@"search_no_result", @"Vector", nil);
+            tableViewCell.textLabel.text = [VectorL10n searchNoResult];
         }
         else if (_recentsDataSourceMode == RecentsDataSourceModePeople || indexPath.section == peopleSection)
         {
-            tableViewCell.textLabel.text = NSLocalizedStringFromTable(@"people_no_conversation", @"Vector", nil);
+            tableViewCell.textLabel.text = [VectorL10n peopleNoConversation];
         }
         else
         {
-            tableViewCell.textLabel.text = NSLocalizedStringFromTable(@"room_recents_no_conversation", @"Vector", nil);
+            tableViewCell.textLabel.text = [VectorL10n roomRecentsNoConversation];
         }
         
         return tableViewCell;
diff --git a/Riot/Modules/Common/Recents/RecentsViewController.m b/Riot/Modules/Common/Recents/RecentsViewController.m
index 7520c4b47..790b26afd 100644
--- a/Riot/Modules/Common/Recents/RecentsViewController.m
+++ b/Riot/Modules/Common/Recents/RecentsViewController.m
@@ -124,7 +124,7 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
     tableSearchBar = [[UISearchBar alloc] initWithFrame:CGRectMake(0, 0, 600, 44)];
     tableSearchBar.autoresizingMask = UIViewAutoresizingFlexibleWidth;
     tableSearchBar.showsCancelButton = NO;
-    tableSearchBar.placeholder = NSLocalizedStringFromTable(@"search_default_placeholder", @"Vector", nil);
+    tableSearchBar.placeholder = [VectorL10n searchDefaultPlaceholder];
     tableSearchBar.delegate = self;
     
     displayedSectionHeaders = [NSMutableArray array];
@@ -165,7 +165,7 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
     }];
     
     self.recentsSearchBar.autocapitalizationType = UITextAutocapitalizationTypeNone;
-    self.recentsSearchBar.placeholder = NSLocalizedStringFromTable(@"search_default_placeholder", @"Vector", nil);        
+    self.recentsSearchBar.placeholder = [VectorL10n searchDefaultPlaceholder];
     
     // Observe user interface theme change.
     kThemeServiceDidChangeThemeNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kThemeServiceDidChangeThemeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
@@ -522,14 +522,14 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
     {
         // minging kludge until https://matrix.org/jira/browse/SYN-678 is fixed
         // 'Error when trying to join an empty room should be more explicit'
-        msg = [NSBundle mxk_localizedStringForKey:@"room_error_join_failed_empty_room"];
+        msg = [MatrixKitL10n roomErrorJoinFailedEmptyRoom];
     }
     
     [self->currentAlert dismissViewControllerAnimated:NO completion:nil];
     
-    self->currentAlert = [UIAlertController alertControllerWithTitle:[NSBundle mxk_localizedStringForKey:@"room_error_join_failed_title"] message:msg preferredStyle:UIAlertControllerStyleAlert];
+    self->currentAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n roomErrorJoinFailedTitle] message:msg preferredStyle:UIAlertControllerStyleAlert];
     
-    [self->currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+    [self->currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                                      style:UIAlertActionStyleDefault
                                                          handler:^(UIAlertAction * action) {
         MXStrongifyAndReturnIfNil(self);
@@ -1162,13 +1162,13 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
         NSString *title, *message;
         if ([self.mainSession roomWithRoomId:currentRoomId].isDirect)
         {
-            title = NSLocalizedStringFromTable(@"room_participants_leave_prompt_title_for_dm", @"Vector", nil);
-            message = NSLocalizedStringFromTable(@"room_participants_leave_prompt_msg_for_dm", @"Vector", nil);
+            title = [VectorL10n roomParticipantsLeavePromptTitleForDm];
+            message = [VectorL10n roomParticipantsLeavePromptMsgForDm];
         }
         else
         {
-            title = NSLocalizedStringFromTable(@"room_participants_leave_prompt_title", @"Vector", nil);
-            message = NSLocalizedStringFromTable(@"room_participants_leave_prompt_msg", @"Vector", nil);
+            title = [VectorL10n roomParticipantsLeavePromptTitle];
+            message = [VectorL10n roomParticipantsLeavePromptMsg];
         }
         
         // confirm leave
@@ -1176,7 +1176,7 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
                                                            message:message
                                                     preferredStyle:UIAlertControllerStyleAlert];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+        [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                          style:UIAlertActionStyleCancel
                                                        handler:^(UIAlertAction * action) {
                                                            
@@ -1188,7 +1188,7 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
                                                            
                                                        }]];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"leave", @"Vector", nil)
+        [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n leave]
                                                          style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
                                                              
                                                              if (weakSelf)
@@ -1809,7 +1809,7 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
     
     currentAlert = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_recents_start_chat_with", @"Vector", nil)
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomRecentsStartChatWith]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
                                                        
@@ -1823,7 +1823,7 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
                                                        
                                                    }]];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_recents_create_empty_room", @"Vector", nil)
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomRecentsCreateEmptyRoom]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
                                                        
@@ -1837,7 +1837,7 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
                                                        
                                                    }]];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_recents_join_room", @"Vector", nil)
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomRecentsJoinRoom]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
                                                        
@@ -1854,7 +1854,7 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
     if (self.mainSession.callManager.supportsPSTN)
     {
         [currentAlert addAction:[UIAlertAction
-            actionWithTitle:NSLocalizedStringFromTable(@"room_open_dialpad", @"Vector", nil)
+            actionWithTitle:[VectorL10n roomOpenDialpad]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
         
@@ -1869,7 +1869,7 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
                                                    }]];
     }
 
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                      style:UIAlertActionStyleCancel
                                                    handler:^(UIAlertAction * action) {
                                                        
@@ -2259,7 +2259,7 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
     else if ([MXTools isMatrixRoomAlias:roomIdOrAlias])
     {
         // Room preview doesn't support room alias
-        [[AppDelegate theDelegate] showAlertWithTitle:[NSBundle mxk_localizedStringForKey:@"error"] message:NSLocalizedStringFromTable(@"room_recents_unknown_room_error_message", @"Vector", nil)];
+        [[AppDelegate theDelegate] showAlertWithTitle:[MatrixKitL10n error] message:[VectorL10n roomRecentsUnknownRoomErrorMessage]];
     }
     else
     {
@@ -2284,7 +2284,7 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
                 }];
                 self.roomsDirectoryCoordinatorBridgePresenter = nil;
             } else {
-                [[AppDelegate theDelegate] showAlertWithTitle:[NSBundle mxk_localizedStringForKey:@"error"] message:NSLocalizedStringFromTable(@"room_recents_unknown_room_error_message", @"Vector", nil)];
+                [[AppDelegate theDelegate] showAlertWithTitle:[MatrixKitL10n error] message:[VectorL10n roomRecentsUnknownRoomErrorMessage]];
             }
         }];
     }
diff --git a/Riot/Modules/Communities/DataSources/GroupsDataSource.m b/Riot/Modules/Communities/DataSources/GroupsDataSource.m
index f0c84e190..68aa32588 100644
--- a/Riot/Modules/Communities/DataSources/GroupsDataSource.m
+++ b/Riot/Modules/Communities/DataSources/GroupsDataSource.m
@@ -97,11 +97,11 @@
     {
         if (section == self.groupInvitesSection)
         {
-            sectionTitle = NSLocalizedStringFromTable(@"group_invite_section", @"Vector", nil);
+            sectionTitle = [VectorL10n groupInviteSection];
         }
         else if (section == self.joinedGroupsSection)
         {
-            sectionTitle = NSLocalizedStringFromTable(@"group_section", @"Vector", nil);
+            sectionTitle = [VectorL10n groupSection];
         }
     }
     
diff --git a/Riot/Modules/Communities/GroupsViewController.m b/Riot/Modules/Communities/GroupsViewController.m
index 5591fdcf6..4339c75c5 100644
--- a/Riot/Modules/Communities/GroupsViewController.m
+++ b/Riot/Modules/Communities/GroupsViewController.m
@@ -69,7 +69,7 @@
     tableSearchBar = [[UISearchBar alloc] initWithFrame:CGRectMake(0, 0, 600, 44)];
     tableSearchBar.autoresizingMask = UIViewAutoresizingFlexibleWidth;
     tableSearchBar.showsCancelButton = NO;
-    tableSearchBar.placeholder = NSLocalizedStringFromTable(@"search_default_placeholder", @"Vector", nil);
+    tableSearchBar.placeholder = [VectorL10n searchDefaultPlaceholder];
     tableSearchBar.delegate = self;
     
     // Set itself as delegate by default.
@@ -107,7 +107,7 @@
     }];
     
     self.groupsSearchBar.autocapitalizationType = UITextAutocapitalizationTypeNone;
-    self.groupsSearchBar.placeholder = NSLocalizedStringFromTable(@"search_default_placeholder", @"Vector", nil);
+    self.groupsSearchBar.placeholder = [VectorL10n searchDefaultPlaceholder];
     
     // @TODO: Add programmatically the (+) button.
 //    plusButtonImageView = [self vc_addFABWithImage:[UIImage imageNamed:@"plus_floating_action"]
@@ -214,7 +214,7 @@
         
     }];
     
-    [AppDelegate theDelegate].masterTabBarController.navigationItem.title = NSLocalizedStringFromTable(@"title_groups", @"Vector", nil);
+    [AppDelegate theDelegate].masterTabBarController.navigationItem.title = [VectorL10n titleGroups];
     [AppDelegate theDelegate].masterTabBarController.tabBar.tintColor = ThemeService.shared.theme.tintColor;        
 }
 
@@ -567,7 +567,7 @@
     
     currentAlert = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
                                                        
diff --git a/Riot/Modules/Communities/Home/GroupHomeViewController.m b/Riot/Modules/Communities/Home/GroupHomeViewController.m
index a76f0096c..3f0d8ac5f 100644
--- a/Riot/Modules/Communities/Home/GroupHomeViewController.m
+++ b/Riot/Modules/Communities/Home/GroupHomeViewController.m
@@ -81,10 +81,10 @@
 {
     [super viewDidLoad];
     
-    [self.leftButton setTitle:NSLocalizedStringFromTable(@"decline", @"Vector", nil) forState:UIControlStateNormal];
-    [self.leftButton setTitle:NSLocalizedStringFromTable(@"decline", @"Vector", nil) forState:UIControlStateHighlighted];
-    [self.rightButton setTitle:NSLocalizedStringFromTable(@"join", @"Vector", nil) forState:UIControlStateNormal];
-    [self.rightButton setTitle:NSLocalizedStringFromTable(@"join", @"Vector", nil) forState:UIControlStateHighlighted];
+    [self.leftButton setTitle:[VectorL10n decline] forState:UIControlStateNormal];
+    [self.leftButton setTitle:[VectorL10n decline] forState:UIControlStateHighlighted];
+    [self.rightButton setTitle:[VectorL10n join] forState:UIControlStateNormal];
+    [self.rightButton setTitle:[VectorL10n join] forState:UIControlStateHighlighted];
     
     UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTapGesture:)];
     [tap setNumberOfTouchesRequired:1];
@@ -382,12 +382,12 @@
         
         if (_group.users.totalUserCountEstimate == 1)
         {
-            _membersCountLabel.text = NSLocalizedStringFromTable(@"group_home_one_member_format", @"Vector", nil);
+            _membersCountLabel.text = [VectorL10n groupHomeOneMemberFormat];
             _membersCountContainer.hidden = NO;
         }
         else if (_group.users.totalUserCountEstimate > 1)
         {
-            _membersCountLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"group_home_multi_members_format", @"Vector", nil), _group.users.totalUserCountEstimate];
+            _membersCountLabel.text = [VectorL10n groupHomeMultiMembersFormat:_group.users.totalUserCountEstimate];
             _membersCountContainer.hidden = NO;
         }
         else
@@ -398,12 +398,12 @@
         
         if (_group.rooms.totalRoomCountEstimate == 1)
         {
-            _roomsCountLabel.text = NSLocalizedStringFromTable(@"group_home_one_room_format", @"Vector", nil);
+            _roomsCountLabel.text = [VectorL10n groupHomeOneRoomFormat];
             _roomsCountContainer.hidden = NO;
         }
         else if (_group.rooms.totalRoomCountEstimate > 1)
         {
-            _roomsCountLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"group_home_multi_rooms_format", @"Vector", nil), _group.rooms.totalRoomCountEstimate];
+            _roomsCountLabel.text = [VectorL10n groupHomeMultiRoomsFormat:_group.rooms.totalRoomCountEstimate];
             _roomsCountContainer.hidden = NO;
         }
         else
@@ -432,7 +432,7 @@
                     }
                 }
                 
-                self.inviteLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"group_invitation_format", @"Vector", nil), inviter];
+                self.inviteLabel.text = [VectorL10n groupInvitationFormat:inviter];
             }
             else
             {
@@ -744,7 +744,7 @@
         avatarFullScreenView.stretchable = YES;
         
         MXWeakify(self);
-        [avatarFullScreenView setRightButtonTitle:[NSBundle mxk_localizedStringForKey:@"ok"] handler:^(MXKImageView* imageView, NSString* buttonTitle) {
+        [avatarFullScreenView setRightButtonTitle:[MatrixKitL10n ok] handler:^(MXKImageView* imageView, NSString* buttonTitle) {
             
             MXStrongifyAndReturnIfNil(self);
             [avatarFullScreenView dismissSelection];
diff --git a/Riot/Modules/Communities/Members/GroupParticipantsViewController.m b/Riot/Modules/Communities/Members/GroupParticipantsViewController.m
index 7d572e363..34aa57c48 100644
--- a/Riot/Modules/Communities/Members/GroupParticipantsViewController.m
+++ b/Riot/Modules/Communities/Members/GroupParticipantsViewController.m
@@ -111,7 +111,7 @@
     
     [NSLayoutConstraint activateConstraints:@[_searchBarTopConstraint, _tableViewBottomConstraint]];
     
-    _searchBarView.placeholder = NSLocalizedStringFromTable(@"group_participants_filter_members", @"Vector", nil);
+    _searchBarView.placeholder = [VectorL10n groupParticipantsFilterMembers];
     _searchBarView.returnKeyType = UIReturnKeyDone;
     _searchBarView.autocapitalizationType = UITextAutocapitalizationTypeNone;
     
@@ -550,7 +550,7 @@
     }
     
     [contactsPickerViewController showSearch:YES];
-    contactsPickerViewController.searchBar.placeholder = NSLocalizedStringFromTable(@"group_participants_invite_another_user", @"Vector", nil);
+    contactsPickerViewController.searchBar.placeholder = [VectorL10n groupParticipantsInviteAnotherUser];
     
     // Apply the search pattern if any
     if (currentSearchText)
@@ -832,7 +832,7 @@
             // Update power level label
             if (contact.mxGroupUser.isPrivileged)
             {
-                powerLevelText = NSLocalizedStringFromTable(@"room_member_power_level_short_admin", @"Vector", nil);
+                powerLevelText = [VectorL10n roomMemberPowerLevelShortAdmin];
             }
             
             participantCell.powerLevelLabel.text = powerLevelText;
@@ -923,7 +923,7 @@
         sectionHeader.mxkLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
         sectionHeader.mxkLabel.font = [UIFont preferredFontForTextStyle:UIFontTextStyleHeadline];
         
-        sectionHeader.mxkLabel.text = NSLocalizedStringFromTable(@"group_participants_invited_section", @"Vector", nil);
+        sectionHeader.mxkLabel.text = [VectorL10n groupParticipantsInvitedSection];
     }
     
     return sectionHeader;
@@ -1052,11 +1052,11 @@
         if (contact && [contact.mxGroupUser.userId isEqualToString:self.mxSession.myUser.userId])
         {
             // Leave this group?
-            currentAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"group_participants_leave_prompt_title", @"Vector", nil)
-                                                               message:NSLocalizedStringFromTable(@"group_participants_leave_prompt_msg", @"Vector", nil)
+            currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n groupParticipantsLeavePromptTitle]
+                                                               message:[VectorL10n groupParticipantsLeavePromptMsg]
                                                         preferredStyle:UIAlertControllerStyleAlert];
             
-            [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                              style:UIAlertActionStyleDefault
                                                            handler:^(UIAlertAction * action) {
                                                                
@@ -1068,7 +1068,7 @@
                                                                
                                                            }]];
             
-            [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"leave", @"Vector", nil)
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n leave]
                                                              style:UIAlertActionStyleDefault
                                                            handler:^(UIAlertAction * action) {
                                                                
@@ -1102,12 +1102,12 @@
             NSString *memberUserId = contact.mxGroupUser.userId;
             
             // Kick ?
-            NSString *promptMsg = [NSString stringWithFormat:NSLocalizedStringFromTable(@"group_participants_remove_prompt_msg", @"Vector", nil), (contact.mxGroupUser.displayname.length ? contact.mxGroupUser.displayname : memberUserId)];
-            currentAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"group_participants_remove_prompt_title", @"Vector", nil)
+            NSString *promptMsg = [VectorL10n groupParticipantsRemovePromptMsg:(contact.mxGroupUser.displayname.length ? contact.mxGroupUser.displayname : memberUserId)];
+            currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n groupParticipantsRemovePromptTitle]
                                                                message:promptMsg
                                                         preferredStyle:UIAlertControllerStyleAlert];
             
-            [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                              style:UIAlertActionStyleDefault
                                                            handler:^(UIAlertAction * action) {
                                                                
@@ -1119,7 +1119,7 @@
                                                                
                                                            }]];
             
-            [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"remove", @"Vector", nil)
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n remove]
                                                              style:UIAlertActionStyleDefault
                                                            handler:^(UIAlertAction * action) {
                                                                
@@ -1130,7 +1130,7 @@
                                                                    
                                                                    MXLogDebug(@"[GroupParticipantsVC] Kick %@ failed", memberUserId);
                                                                    // Alert user
-                                                                   [[AppDelegate theDelegate] showErrorAsAlert:[NSError errorWithDomain:@"GroupDomain" code:0 userInfo:@{NSLocalizedDescriptionKey:[NSBundle mxk_localizedStringForKey:@"not_supported_yet"]}]];
+                                                                   [[AppDelegate theDelegate] showErrorAsAlert:[NSError errorWithDomain:@"GroupDomain" code:0 userInfo:@{NSLocalizedDescriptionKey:[MatrixKitL10n notSupportedYet]}]];
                                                                }
                                                                
                                                            }]];
@@ -1154,12 +1154,12 @@
     }
     
     // Invite ?
-    NSString *promptMsg = [NSString stringWithFormat:NSLocalizedStringFromTable(@"group_participants_invite_prompt_msg", @"Vector", nil), contact.displayName];
-    currentAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"group_participants_invite_prompt_title", @"Vector", nil)
+    NSString *promptMsg = [VectorL10n groupParticipantsInvitePromptMsg:contact.displayName];
+    currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n groupParticipantsInvitePromptTitle]
                                                        message:promptMsg
                                                 preferredStyle:UIAlertControllerStyleAlert];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
                                                        
@@ -1171,7 +1171,7 @@
                                                        
                                                    }]];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"invite", @"Vector", nil)
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n invite]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
                                                        
@@ -1188,7 +1188,7 @@
                                                                participantId = identifiers.firstObject;
                                                                
                                                                MXLogDebug(@"[GroupParticipantsVC] Invite %@ failed", participantId);
-                                                               [[AppDelegate theDelegate] showErrorAsAlert:[NSError errorWithDomain:@"GroupDomain" code:0 userInfo:@{NSLocalizedDescriptionKey:[NSBundle mxk_localizedStringForKey:@"not_supported_yet"]}]];
+                                                               [[AppDelegate theDelegate] showErrorAsAlert:[NSError errorWithDomain:@"GroupDomain" code:0 userInfo:@{NSLocalizedDescriptionKey:[MatrixKitL10n notSupportedYet]}]];
                                                            }
                                                        }
                                                        
diff --git a/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m b/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m
index aece49992..019d34c6d 100644
--- a/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m
+++ b/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m
@@ -97,7 +97,7 @@
     
     [NSLayoutConstraint activateConstraints:@[_searchBarTopConstraint, _tableViewBottomConstraint]];
     
-    _searchBarView.placeholder = NSLocalizedStringFromTable(@"group_rooms_filter_rooms", @"Vector", nil);
+    _searchBarView.placeholder = [VectorL10n groupRoomsFilterRooms];
     _searchBarView.returnKeyType = UIReturnKeyDone;
     _searchBarView.autocapitalizationType = UITextAutocapitalizationTypeNone;
     
diff --git a/Riot/Modules/Communities/TabDetail/GroupDetailsViewController.m b/Riot/Modules/Communities/TabDetail/GroupDetailsViewController.m
index a7920c4be..14752a8ff 100644
--- a/Riot/Modules/Communities/TabDetail/GroupDetailsViewController.m
+++ b/Riot/Modules/Communities/TabDetail/GroupDetailsViewController.m
@@ -83,7 +83,7 @@
     NSMutableArray* titles = [[NSMutableArray alloc] init];
     
     // home tab
-    [titles addObject: NSLocalizedStringFromTable(@"group_details_home", @"Vector", nil)];
+    [titles addObject:[VectorL10n groupDetailsHome]];
     groupHomeViewController = [GroupHomeViewController groupHomeViewController];
     if (_group)
     {
@@ -92,7 +92,7 @@
     [viewControllers addObject:groupHomeViewController];
     
     // People tab
-    [titles addObject: NSLocalizedStringFromTable(@"group_details_people", @"Vector", nil)];
+    [titles addObject:[VectorL10n groupDetailsPeople]];
     groupParticipantsViewController = [GroupParticipantsViewController groupParticipantsViewController];
     if (_group)
     {
@@ -101,7 +101,7 @@
     [viewControllers addObject:groupParticipantsViewController];
     
     // Rooms tab
-    [titles addObject: NSLocalizedStringFromTable(@"group_details_rooms", @"Vector", nil)];
+    [titles addObject:[VectorL10n groupDetailsRooms]];
     groupRoomsViewController = [GroupRoomsViewController groupRoomsViewController];
     if (_group)
     {
@@ -111,7 +111,7 @@
     
     if (!self.title.length)
     {
-        self.title = NSLocalizedStringFromTable(@"group_details_title", @"Vector", nil);
+        self.title = [VectorL10n groupDetailsTitle];
     }
     
     [self initWithTitles:titles viewControllers:viewControllers defaultSelected:0];
diff --git a/Riot/Modules/Communities/Views/GroupInviteTableViewCell.m b/Riot/Modules/Communities/Views/GroupInviteTableViewCell.m
index 5bf0fc3d2..cd3c635cc 100644
--- a/Riot/Modules/Communities/Views/GroupInviteTableViewCell.m
+++ b/Riot/Modules/Communities/Views/GroupInviteTableViewCell.m
@@ -36,14 +36,14 @@ NSString *const kGroupInviteTableViewCellRoomKey = @"kGroupInviteTableViewCellRo
     
     [self.leftButton.layer setCornerRadius:5];
     self.leftButton.clipsToBounds = YES;
-    [self.leftButton setTitle:NSLocalizedStringFromTable(@"decline", @"Vector", nil) forState:UIControlStateNormal];
-    [self.leftButton setTitle:NSLocalizedStringFromTable(@"decline", @"Vector", nil) forState:UIControlStateHighlighted];
+    [self.leftButton setTitle:[VectorL10n decline] forState:UIControlStateNormal];
+    [self.leftButton setTitle:[VectorL10n decline] forState:UIControlStateHighlighted];
     [self.leftButton addTarget:self action:@selector(onDeclinePressed:) forControlEvents:UIControlEventTouchUpInside];
     
     [self.rightButton.layer setCornerRadius:5];
     self.rightButton.clipsToBounds = YES;
-    [self.rightButton setTitle:NSLocalizedStringFromTable(@"preview", @"Vector", nil) forState:UIControlStateNormal];
-    [self.rightButton setTitle:NSLocalizedStringFromTable(@"preview", @"Vector", nil) forState:UIControlStateHighlighted];
+    [self.rightButton setTitle:[VectorL10n preview] forState:UIControlStateNormal];
+    [self.rightButton setTitle:[VectorL10n preview] forState:UIControlStateHighlighted];
     [self.rightButton addTarget:self action:@selector(onPreviewPressed:) forControlEvents:UIControlEventTouchUpInside];
     
     [self.noticeBadgeView.layer setCornerRadius:10];
diff --git a/Riot/Modules/Contacts/DataSources/ContactsDataSource.m b/Riot/Modules/Contacts/DataSources/ContactsDataSource.m
index 6d223cd95..6048304c0 100644
--- a/Riot/Modules/Contacts/DataSources/ContactsDataSource.m
+++ b/Riot/Modules/Contacts/DataSources/ContactsDataSource.m
@@ -615,11 +615,11 @@
             if (indexPath.section == filteredMatrixContactsSection &&
                 (_userDirectoryState == ContactsDataSourceUserDirectoryStateLoading || _userDirectoryState == ContactsDataSourceUserDirectoryStateOfflineLoading))
             {
-                tableViewCell.textLabel.text = [NSBundle mxk_localizedStringForKey:@"search_searching"];
+                tableViewCell.textLabel.text = [MatrixKitL10n searchSearching];
             }
             else
             {
-                tableViewCell.textLabel.text = NSLocalizedStringFromTable(@"search_no_result", @"Vector", nil);
+                tableViewCell.textLabel.text = [VectorL10n searchNoResult];
             }
         }
         else if (indexPath.section == filteredLocalContactsSection)
@@ -633,19 +633,19 @@
                     if (hideNonMatrixEnabledContacts && !self.mxSession.identityService)
                     {
                         // Because we cannot make lookups with no IS
-                        tableViewCell.textLabel.text = NSLocalizedStringFromTable(@"contacts_address_book_no_identity_server", @"Vector", nil);
+                        tableViewCell.textLabel.text = [VectorL10n contactsAddressBookNoIdentityServer];
                     }
                     else
                     {
                         // Because there is no contacts on the device
-                        tableViewCell.textLabel.text = NSLocalizedStringFromTable(@"contacts_address_book_no_contact", @"Vector", nil);
+                        tableViewCell.textLabel.text = [VectorL10n contactsAddressBookNoContact];
                     }
                     break;
 
                 case CNAuthorizationStatusNotDetermined:
                     // Because the user have not granted the permission yet
                     // (The permission request popup is displayed at the same time)
-                    tableViewCell.textLabel.text = NSLocalizedStringFromTable(@"contacts_address_book_permission_required", @"Vector", nil);
+                    tableViewCell.textLabel.text = [VectorL10n contactsAddressBookPermissionRequired];
                     break;
 
                 default:
@@ -735,7 +735,7 @@
     if (section == filteredLocalContactsSection)
     {
         count = filteredLocalContacts.count;
-        title = NSLocalizedStringFromTable(@"contacts_address_book_section", @"Vector", nil);
+        title = [VectorL10n contactsAddressBookSection];
     }
     else //if (section == filteredMatrixContactsSection)
     {
@@ -743,11 +743,11 @@
         {
             case ContactsDataSourceUserDirectoryStateOfflineLoading:
             case ContactsDataSourceUserDirectoryStateOfflineLoaded:
-                title = NSLocalizedStringFromTable(@"contacts_user_directory_offline_section", @"Vector", nil);
+                title = [VectorL10n contactsUserDirectoryOfflineSection];
                 break;
 
             default:
-                title = NSLocalizedStringFromTable(@"contacts_user_directory_section", @"Vector", nil);
+                title = [VectorL10n contactsUserDirectorySection];
                 break;
         }
         
@@ -857,7 +857,7 @@
             
             checkboxLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 0, 30)];
             checkboxLabel.font = [UIFont systemFontOfSize:16.0];
-            checkboxLabel.text = NSLocalizedStringFromTable(@"contacts_address_book_matrix_users_toggle", @"Vector", nil);
+            checkboxLabel.text = [VectorL10n contactsAddressBookMatrixUsersToggle];
             [localContactsCheckboxContainer addSubview:checkboxLabel];
             localContactsCheckboxContainer.checkboxLabel = checkboxLabel;
             
diff --git a/Riot/Modules/Contacts/Details/ContactDetailsViewController.m b/Riot/Modules/Contacts/Details/ContactDetailsViewController.m
index f8289e35a..990b411ea 100644
--- a/Riot/Modules/Contacts/Details/ContactDetailsViewController.m
+++ b/Riot/Modules/Contacts/Details/ContactDetailsViewController.m
@@ -650,7 +650,7 @@
 {
     if (section == directChatsIndex)
     {
-        return NSLocalizedStringFromTable(@"room_participants_action_section_direct_chats", @"Vector", nil);
+        return [VectorL10n roomParticipantsActionSectionDirectChats];
     }
     
     return nil;
@@ -663,19 +663,19 @@
     switch (action)
     {
         case ContactDetailsActionIgnore:
-            title = NSLocalizedStringFromTable(@"room_participants_action_ignore", @"Vector", nil);
+            title = [VectorL10n roomParticipantsActionIgnore];
             break;
         case ContactDetailsActionUnignore:
-            title = NSLocalizedStringFromTable(@"room_participants_action_unignore", @"Vector", nil);
+            title = [VectorL10n roomParticipantsActionUnignore];
             break;
         case ContactDetailsActionStartChat:
-            title = NSLocalizedStringFromTable(@"room_participants_action_start_chat", @"Vector", nil);
+            title = [VectorL10n roomParticipantsActionStartNewChat];
             break;
         case ContactDetailsActionStartVoiceCall:
-            title = NSLocalizedStringFromTable(@"room_participants_action_start_voice_call", @"Vector", nil);
+            title = [VectorL10n roomParticipantsActionStartVoiceCall];
             break;
         case ContactDetailsActionStartVideoCall:
-            title = NSLocalizedStringFromTable(@"room_participants_action_start_video_call", @"Vector", nil);
+            title = [VectorL10n roomParticipantsActionStartVideoCall];
             break;
         default:
             break;
@@ -727,7 +727,7 @@
         {
             roomCell.avatarImageView.image = [UIImage imageNamed:@"start_chat"];
             roomCell.avatarImageView.defaultBackgroundColor = [UIColor clearColor];
-            roomCell.titleLabel.text = NSLocalizedStringFromTable(@"room_participants_action_start_new_chat", @"Vector", nil);
+            roomCell.titleLabel.text = [VectorL10n roomParticipantsActionStartNewChat];
         }
         
         cell = roomCell;
@@ -869,9 +869,9 @@
                 // Prompt user to ignore content from this user
                 __weak __typeof(self) weakSelf = self;
                 [currentAlert dismissViewControllerAnimated:NO completion:nil];
-                currentAlert = [UIAlertController alertControllerWithTitle:[NSBundle mxk_localizedStringForKey:@"room_member_ignore_prompt"] message:nil preferredStyle:UIAlertControllerStyleAlert];
+                currentAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n roomMemberIgnorePrompt] message:nil preferredStyle:UIAlertControllerStyleAlert];
                 
-                [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"yes"]
+                [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n yes]
                                                                  style:UIAlertActionStyleDefault
                                                                handler:^(UIAlertAction * action) {
                                                                    
@@ -900,7 +900,7 @@
                                                                    
                                                                }]];
                 
-                [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"no"]
+                [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n no]
                                                                  style:UIAlertActionStyleDefault
                                                                handler:^(UIAlertAction * action) {
                                                                    
@@ -978,10 +978,10 @@
                         {
                             [self removePendingActionMask];
                             
-                            UIAlertController *alert = [UIAlertController alertControllerWithTitle:[NSBundle mxk_localizedStringForKey:@"error"]
-                                                                                           message:NSLocalizedStringFromTable(@"room_participants_start_new_chat_error_using_user_email_without_identity_server", @"Vector", nil)
+                            UIAlertController *alert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n error]
+                                                                                           message:[VectorL10n roomParticipantsStartNewChatErrorUsingUserEmailWithoutIdentityServer]
                                                                                     preferredStyle:UIAlertControllerStyleAlert];
-                            [alert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"] style:UIAlertActionStyleDefault handler:nil]];
+                            [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok] style:UIAlertActionStyleDefault handler:nil]];
                             [self presentViewController:alert animated:YES completion:nil];
                             
                             return;
@@ -1132,7 +1132,7 @@
         avatarFullScreenView.stretchable = YES;
 
         MXWeakify(self);
-        [avatarFullScreenView setRightButtonTitle:[NSBundle mxk_localizedStringForKey:@"ok"] handler:^(MXKImageView* imageView, NSString* buttonTitle) {
+        [avatarFullScreenView setRightButtonTitle:[MatrixKitL10n ok] handler:^(MXKImageView* imageView, NSString* buttonTitle) {
             
             MXStrongifyAndReturnIfNil(self);
             [avatarFullScreenView dismissSelection];
diff --git a/Riot/Modules/Contacts/Views/ContactTableViewCell.m b/Riot/Modules/Contacts/Views/ContactTableViewCell.m
index a22454161..0a79aba0d 100644
--- a/Riot/Modules/Contacts/Views/ContactTableViewCell.m
+++ b/Riot/Modules/Contacts/Views/ContactTableViewCell.m
@@ -336,7 +336,7 @@
     }
     else if (contact.isThirdPartyInvite)
     {
-        presenceText =  NSLocalizedStringFromTable(@"room_participants_offline", @"Vector", nil);
+        presenceText =  [VectorL10n roomParticipantsOffline];
     }
     
     if (presenceText.length)
diff --git a/Riot/Modules/Favorites/FavouritesViewController.m b/Riot/Modules/Favorites/FavouritesViewController.m
index 9e1c447f9..e5bad0b6f 100644
--- a/Riot/Modules/Favorites/FavouritesViewController.m
+++ b/Riot/Modules/Favorites/FavouritesViewController.m
@@ -60,7 +60,7 @@
 {
     [super viewWillAppear:animated];
     
-    [AppDelegate theDelegate].masterTabBarController.navigationItem.title = NSLocalizedStringFromTable(@"title_favourites", @"Vector", nil);
+    [AppDelegate theDelegate].masterTabBarController.navigationItem.title = [VectorL10n titleFavourites];
     [AppDelegate theDelegate].masterTabBarController.tabBar.tintColor = ThemeService.shared.theme.tintColor;
     
     if (recentsDataSource)
@@ -126,8 +126,8 @@
 - (void)updateEmptyView
 {
     [self.emptyView fillWith:[self emptyViewArtwork]
-                       title:NSLocalizedStringFromTable(@"favourites_empty_view_title", @"Vector", nil)
-             informationText:NSLocalizedStringFromTable(@"favourites_empty_view_information", @"Vector", nil)];
+                       title:[VectorL10n favouritesEmptyViewTitle]
+             informationText:[VectorL10n favouritesEmptyViewInformation]];
 }
 
 - (UIImage*)emptyViewArtwork
diff --git a/Riot/Modules/GDPR/GDPRConsentViewController.swift b/Riot/Modules/GDPR/GDPRConsentViewController.swift
index 4a5cdee8d..8ad4b7ac7 100644
--- a/Riot/Modules/GDPR/GDPRConsentViewController.swift
+++ b/Riot/Modules/GDPR/GDPRConsentViewController.swift
@@ -36,7 +36,7 @@ final public class GDPRConsentViewController: WebViewViewController {
     public override func viewDidLoad() {
         super.viewDidLoad()
         
-        self.title = NSLocalizedString("settings_term_conditions", tableName: "Vector", comment: "")
+        self.title = VectorL10n.settingsTermConditions
     }
     
     // MARK: - Superclass Overrides
diff --git a/Riot/Modules/GlobalSearch/Files/CellData/FilesSearchCellData.m b/Riot/Modules/GlobalSearch/Files/CellData/FilesSearchCellData.m
index f39daa444..d7af35024 100644
--- a/Riot/Modules/GlobalSearch/Files/CellData/FilesSearchCellData.m
+++ b/Riot/Modules/GlobalSearch/Files/CellData/FilesSearchCellData.m
@@ -101,7 +101,7 @@
             roomDisplayName = room.summary.displayname;
             if (!roomDisplayName.length)
             {
-                roomDisplayName = [NSBundle mxk_localizedStringForKey:@"room_displayname_empty_room"];
+                roomDisplayName = [MatrixKitL10n roomDisplaynameEmptyRoom];
             }
         }
         else
diff --git a/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultAttachmentBubbleCell.m b/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultAttachmentBubbleCell.m
index a7e22ae4b..1e1fc3e4b 100644
--- a/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultAttachmentBubbleCell.m
+++ b/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultAttachmentBubbleCell.m
@@ -46,7 +46,7 @@
             self.roomNameLabel.text = room.summary.displayname;
             if (!self.roomNameLabel.text.length)
             {
-                self.roomNameLabel.text = [NSBundle mxk_localizedStringForKey:@"room_displayname_empty_room"];
+                self.roomNameLabel.text = [MatrixKitL10n roomDisplaynameEmptyRoom];
             }
         }
         else
diff --git a/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m b/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m
index 3a6278002..1de1f5b4b 100644
--- a/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m
+++ b/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m
@@ -52,7 +52,7 @@
 {
     [super viewDidLoad];
 
-    self.title = NSLocalizedStringFromTable(@"directory_title", @"Vector", nil);
+    self.title = [VectorL10n directoryTitle];
 
     self.tableView.delegate = self;
 
diff --git a/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m b/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
index e79e9a055..bb0b4879a 100644
--- a/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
+++ b/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
@@ -77,24 +77,24 @@
     NSMutableArray* viewControllers = [[NSMutableArray alloc] init];
     NSMutableArray* titles = [[NSMutableArray alloc] init];
 
-    [titles addObject: NSLocalizedStringFromTable(@"search_rooms", @"Vector", nil)];
+    [titles addObject:[VectorL10n searchRooms]];
     recentsViewController = [RecentsViewController recentListViewController];
     recentsViewController.enableSearchBar = NO;
     recentsViewController.screenName = @"UnifiedSearchRooms";
     [viewControllers addObject:recentsViewController];
 
-    [titles addObject: NSLocalizedStringFromTable(@"search_messages", @"Vector", nil)];
+    [titles addObject:[VectorL10n searchMessages]];
     messagesSearchViewController = [HomeMessagesSearchViewController searchViewController];
     [viewControllers addObject:messagesSearchViewController];
 
     // Add search People tab
-    [titles addObject: NSLocalizedStringFromTable(@"search_people", @"Vector", nil)];
+    [titles addObject:[VectorL10n searchPeople]];
     peopleSearchViewController = [ContactsTableViewController contactsTableViewController];
     peopleSearchViewController.contactsTableViewControllerDelegate = self;
     [viewControllers addObject:peopleSearchViewController];
     
     // add Files tab
-    [titles addObject: NSLocalizedStringFromTable(@"search_files", @"Vector", nil)];
+    [titles addObject:[VectorL10n searchFiles]];
     filesSearchViewController = [HomeFilesSearchViewController searchViewController];
     [viewControllers addObject:filesSearchViewController];
 
@@ -109,7 +109,7 @@
     [self initializeDataSources];
     
     self.searchBar.autocapitalizationType = UITextAutocapitalizationTypeNone;
-    self.searchBar.placeholder = NSLocalizedStringFromTable(@"search_default_placeholder", @"Vector", nil);
+    self.searchBar.placeholder = [VectorL10n searchDefaultPlaceholder];
     
     [super showSearch:NO];
 }
@@ -408,11 +408,11 @@
 
     if (self.selectedViewController == peopleSearchViewController)
     {
-        self.searchBar.placeholder = NSLocalizedStringFromTable(@"search_people_placeholder", @"Vector", nil);
+        self.searchBar.placeholder = [VectorL10n searchPeoplePlaceholder];
     }
     else
     {
-        self.searchBar.placeholder = NSLocalizedStringFromTable(@"search_default_placeholder", @"Vector", nil);
+        self.searchBar.placeholder = [VectorL10n searchDefaultPlaceholder];
     }
     
     [self updateSearch];
diff --git a/Riot/Modules/GlobalSearch/Views/DirectoryRecentTableViewCell.m b/Riot/Modules/GlobalSearch/Views/DirectoryRecentTableViewCell.m
index 26c103fb2..9a168d3f7 100644
--- a/Riot/Modules/GlobalSearch/Views/DirectoryRecentTableViewCell.m
+++ b/Riot/Modules/GlobalSearch/Views/DirectoryRecentTableViewCell.m
@@ -43,7 +43,7 @@
     switch (publicRoomsDirectoryDataSource.state)
     {
         case MXKDataSourceStatePreparing:
-            self.titleLabel.text = NSLocalizedStringFromTable(@"directory_searching_title", @"Vector", nil);
+            self.titleLabel.text = [VectorL10n directorySearchingTitle];
             self.descriptionLabel.text = @"";
             break;
 
@@ -51,20 +51,22 @@
         {
             if (publicRoomsDirectoryDataSource.searchPattern)
             {
-                self.titleLabel.text = NSLocalizedStringFromTable(@"directory_search_results_title", @"Vector", nil);
+                self.titleLabel.text = [VectorL10n directorySearchResultsTitle];
 
                 // Do we need to display like ">20 results found" or "18 results found"?
-                NSString *descriptionLabel = (publicRoomsDirectoryDataSource.searchResultsCountIsLimited && publicRoomsDirectoryDataSource.searchResultsCount > 0) ? NSLocalizedStringFromTable(@"directory_search_results_more_than", @"Vector", nil) : NSLocalizedStringFromTable(@"directory_search_results", @"Vector", nil);
-
-                self.descriptionLabel.text = [NSString stringWithFormat:descriptionLabel,
-                                              publicRoomsDirectoryDataSource.searchResultsCount,
-                                              publicRoomsDirectoryDataSource.searchPattern];
+                if (publicRoomsDirectoryDataSource.searchResultsCountIsLimited && publicRoomsDirectoryDataSource.searchResultsCount > 0)
+                {
+                    self.descriptionLabel.text = [VectorL10n directorySearchResultsMoreThan:publicRoomsDirectoryDataSource.searchResultsCount :publicRoomsDirectoryDataSource.searchPattern];
+                }
+                else
+                {
+                    self.descriptionLabel.text = [VectorL10n directorySearchResults:publicRoomsDirectoryDataSource.searchResultsCount :publicRoomsDirectoryDataSource.searchPattern];
+                }
             }
             else
             {
-                self.titleLabel.text = NSLocalizedStringFromTable(@"directory_cell_title", @"Vector", nil);
-                self.descriptionLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"directory_cell_description", @"Vector", nil),
-                                              publicRoomsDirectoryDataSource.searchResultsCount];
+                self.titleLabel.text = [VectorL10n directoryCellTitle];
+                self.descriptionLabel.text = [VectorL10n directoryCellDescription:publicRoomsDirectoryDataSource.searchResultsCount];
             }
 
             if (publicRoomsDirectoryDataSource.searchResultsCount)
@@ -76,8 +78,8 @@
         }
 
         case MXKDataSourceStateFailed:
-            self.titleLabel.text = NSLocalizedStringFromTable(@"directory_searching_title", @"Vector", nil);
-            self.descriptionLabel.text = NSLocalizedStringFromTable(@"directory_search_fail", @"Vector", nil);
+            self.titleLabel.text = [VectorL10n directorySearchingTitle];
+            self.descriptionLabel.text = [VectorL10n directorySearchFail];
             break;
 
         default:
diff --git a/Riot/Modules/Home/Fallback/AuthFallBackViewController.m b/Riot/Modules/Home/Fallback/AuthFallBackViewController.m
index 8d0e84e14..65084f110 100644
--- a/Riot/Modules/Home/Fallback/AuthFallBackViewController.m
+++ b/Riot/Modules/Home/Fallback/AuthFallBackViewController.m
@@ -102,14 +102,14 @@ NSString *FallBackViewControllerJavascriptOnLogin = @"window.matrixLogin.onLogin
         }
         else
         {
-            title = [NSBundle mxk_localizedStringForKey:@"error"];
+            title = [MatrixKitL10n error];
         }
     }
 
     MXWeakify(self);
 
     UIAlertController *alert = [UIAlertController alertControllerWithTitle:title message:msg preferredStyle:UIAlertControllerStyleAlert];
-    [alert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+    [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                               style:UIAlertActionStyleDefault
                                             handler:^(UIAlertAction * action) {
                                                 MXStrongifyAndReturnIfNil(self);
@@ -142,7 +142,7 @@ NSString *FallBackViewControllerJavascriptOnLogin = @"window.matrixLogin.onLogin
         NSError *error = [NSError errorWithDomain:NSURLErrorDomain
                                              code:NSURLErrorNotConnectedToInternet
                                          userInfo:@{
-                                                    NSLocalizedDescriptionKey : NSLocalizedStringFromTable(@"network_offline_prompt", @"Vector", nil)
+                                                    NSLocalizedDescriptionKey : [VectorL10n networkOfflinePrompt]
                                                     }];
         [self showErrorAsAlert:error];
     }
diff --git a/Riot/Modules/Home/HomeViewController.m b/Riot/Modules/Home/HomeViewController.m
index 3909c1a6f..cd3281eef 100644
--- a/Riot/Modules/Home/HomeViewController.m
+++ b/Riot/Modules/Home/HomeViewController.m
@@ -102,7 +102,7 @@
 {
     [super viewWillAppear:animated];
     
-    [AppDelegate theDelegate].masterTabBarController.navigationItem.title = NSLocalizedStringFromTable(@"title_home", @"Vector", nil);
+    [AppDelegate theDelegate].masterTabBarController.navigationItem.title = [VectorL10n titleHome];
 
     [ThemeService.shared.theme applyStyleOnNavigationBar:[AppDelegate theDelegate].masterTabBarController.navigationController.navigationBar];
 
@@ -274,7 +274,7 @@
     
     currentAlert = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"spaces_explore_rooms", @"Vector", nil)
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n spacesExploreRooms]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
                                                        
@@ -288,7 +288,7 @@
                                                        
                                                    }]];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_details_people", @"Vector", nil)
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomDetailsPeople]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
                                                        
@@ -305,7 +305,7 @@
                                                    }]];
     
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                      style:UIAlertActionStyleCancel
                                                    handler:^(UIAlertAction * action) {
                                                        
@@ -827,7 +827,7 @@
 
 - (void)showCrossSigningSetup
 {
-    [self setupCrossSigningWithTitle:NSLocalizedStringFromTable(@"cross_signing_setup_banner_title", @"Vector", nil) message:NSLocalizedStringFromTable(@"security_settings_user_password_description", @"Vector", nil) success:^{
+    [self setupCrossSigningWithTitle:[VectorL10n crossSigningSetupBannerTitle] message:[VectorL10n securitySettingsUserPasswordDescription] success:^{
         
     } failure:^(NSError *error) {
         
@@ -890,11 +890,11 @@
     displayName = displayName ?: @"";
     
     NSString *appName = [[NSBundle mainBundle] infoDictionary][@"CFBundleDisplayName"];
-    NSString *title = [NSString stringWithFormat:NSLocalizedStringFromTable(@"home_empty_view_title", @"Vector", nil), appName, displayName];
+    NSString *title = [VectorL10n homeEmptyViewTitle:appName :displayName];
     
     [self.emptyView fillWith:[self emptyViewArtwork]
                        title:title
-             informationText:NSLocalizedStringFromTable(@"home_empty_view_information", @"Vector", nil)];
+             informationText:[VectorL10n homeEmptyViewInformation]];
 }
 
 - (UIImage*)emptyViewArtwork
diff --git a/Riot/Modules/Integrations/IntegrationManagerViewController.m b/Riot/Modules/Integrations/IntegrationManagerViewController.m
index e4b48d09c..62dc9d3c4 100644
--- a/Riot/Modules/Integrations/IntegrationManagerViewController.m
+++ b/Riot/Modules/Integrations/IntegrationManagerViewController.m
@@ -203,7 +203,7 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
 
     if (![roomIdInEvent isEqualToString:roomId])
     {
-        [self sendError:[NSString stringWithFormat:NSLocalizedStringFromTable(@"widget_integration_room_not_visible", @"Vector", nil), roomIdInEvent] toRequest:requestId];
+        [self sendError:[VectorL10n widgetIntegrationRoomNotVisible:roomIdInEvent] toRequest:requestId];
         return;
     }
 
@@ -721,12 +721,12 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
 
 - (void)showDisabledIntegrationManagerError
 {
-    NSString *message = NSLocalizedStringFromTable(@"widget_integration_manager_disabled", @"Vector", nil);
+    NSString *message = [VectorL10n widgetIntegrationManagerDisabled];
     UIAlertController *alert = [UIAlertController alertControllerWithTitle:nil
                                                                    message:message
                                                             preferredStyle:UIAlertControllerStyleAlert];
 
-    [alert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+    [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                               style:UIAlertActionStyleDefault
                                             handler:^(UIAlertAction * action) {
                                                 [self withdrawViewControllerAnimated:YES completion:nil];
diff --git a/Riot/Modules/Integrations/WidgetPicker/WidgetPickerViewController.m b/Riot/Modules/Integrations/WidgetPicker/WidgetPickerViewController.m
index 32bb833a0..7d146fd07 100644
--- a/Riot/Modules/Integrations/WidgetPicker/WidgetPickerViewController.m
+++ b/Riot/Modules/Integrations/WidgetPicker/WidgetPickerViewController.m
@@ -44,7 +44,7 @@
         mxSession = theMXSession;
         roomId = theRoomId;
 
-        _alertController = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"widget_picker_title", @"Vector", nil)
+        _alertController = [UIAlertController alertControllerWithTitle:[VectorL10n widgetPickerTitle]
                                                                message:nil
                                                         preferredStyle:UIAlertControllerStyleAlert];
     }
@@ -80,7 +80,7 @@
         // Link to the integration manager
         if (RiotSettings.shared.roomInfoScreenShowIntegrations)
         {
-            alertAction = [UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"widget_picker_manage_integrations", @"Vector", nil)
+            alertAction = [UIAlertAction actionWithTitle:[VectorL10n widgetPickerManageIntegrations]
                                                    style:UIAlertActionStyleDefault
                                                  handler:^(UIAlertAction * _Nonnull action)
                            {
@@ -95,7 +95,7 @@
         }
 
         // Cancel
-        alertAction = [UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+        alertAction = [UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                style:UIAlertActionStyleCancel
                                              handler:nil];
         [self.alertController addAction:alertAction];
diff --git a/Riot/Modules/Integrations/Widgets/StickerPicker/StickerPickerViewController.m b/Riot/Modules/Integrations/Widgets/StickerPicker/StickerPickerViewController.m
index c4270bddc..d56aeef6d 100644
--- a/Riot/Modules/Integrations/Widgets/StickerPicker/StickerPickerViewController.m
+++ b/Riot/Modules/Integrations/Widgets/StickerPicker/StickerPickerViewController.m
@@ -18,6 +18,8 @@
 
 #import "IntegrationManagerViewController.h"
 
+#import "Riot-Swift.h"
+
 @interface StickerPickerViewController ()
 
 @end
@@ -28,7 +30,7 @@
 {
     [super viewDidLoad];
 
-    self.navigationItem.title = NSLocalizedStringFromTable(@"room_action_send_sticker", @"Vector", nil);
+    self.navigationItem.title = [VectorL10n roomActionSendSticker];
 
     // Hide back button title
     self.parentViewController.navigationItem.backBarButtonItem =[[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:nil];
diff --git a/Riot/Modules/Integrations/Widgets/WidgetViewController.m b/Riot/Modules/Integrations/Widgets/WidgetViewController.m
index 9eb26718f..1cf746bc9 100644
--- a/Riot/Modules/Integrations/Widgets/WidgetViewController.m
+++ b/Riot/Modules/Integrations/Widgets/WidgetViewController.m
@@ -143,14 +143,14 @@ NSString *const kJavascriptSendResponseToPostMessageAPI = @"riotIOS.sendResponse
         }
         else
         {
-            title = [NSBundle mxk_localizedStringForKey:@"error"];
+            title = [MatrixKitL10n error];
         }
     }
 
     __weak __typeof__(self) weakSelf = self;
 
     UIAlertController *alert = [UIAlertController alertControllerWithTitle:title message:msg preferredStyle:UIAlertControllerStyleAlert];
-    [alert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+    [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                               style:UIAlertActionStyleDefault
                                             handler:^(UIAlertAction * action) {
 
@@ -213,7 +213,7 @@ NSString *const kJavascriptSendResponseToPostMessageAPI = @"riotIOS.sendResponse
 
 - (void)askPermissionWithCompletion:(void (^)(BOOL granted))completion
 {
-    NSString *widgetCreatorUserId = self.widget.widgetEvent.sender ?: NSLocalizedStringFromTable(@"room_participants_unknown", @"Vector", nil);
+    NSString *widgetCreatorUserId = self.widget.widgetEvent.sender ?: [VectorL10n roomParticipantsUnknown];
     
     MXSession *session = widget.mxSession;
     MXRoom *room = [session roomWithRoomId:self.widget.widgetEvent.roomId];
@@ -236,12 +236,12 @@ NSString *const kJavascriptSendResponseToPostMessageAPI = @"riotIOS.sendResponse
     NSString *widgetCreatorAvatarURL = widgetCreatorRoomMember.avatarUrl;
     
     NSArray<NSString*> *permissionStrings = @[
-                                              NSLocalizedStringFromTable(@"room_widget_permission_display_name_permission", @"Vector", nil),
-                                              NSLocalizedStringFromTable(@"room_widget_permission_avatar_url_permission", @"Vector", nil),
-                                              NSLocalizedStringFromTable(@"room_widget_permission_user_id_permission", @"Vector", nil),
-                                              NSLocalizedStringFromTable(@"room_widget_permission_theme_permission", @"Vector", nil),
-                                              NSLocalizedStringFromTable(@"room_widget_permission_widget_id_permission", @"Vector", nil),
-                                              NSLocalizedStringFromTable(@"room_widget_permission_room_id_permission", @"Vector", nil)
+                                              [VectorL10n roomWidgetPermissionDisplayNamePermission],
+                                              [VectorL10n roomWidgetPermissionAvatarUrlPermission],
+                                              [VectorL10n roomWidgetPermissionUserIdPermission],
+                                              [VectorL10n roomWidgetPermissionThemePermission],
+                                              [VectorL10n roomWidgetPermissionWidgetIdPermission],
+                                              [VectorL10n roomWidgetPermissionRoomIdPermission]
                                             ];
     
     
@@ -293,7 +293,7 @@ NSString *const kJavascriptSendResponseToPostMessageAPI = @"riotIOS.sendResponse
 
     UIAlertController *menu = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
 
-    [menu addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"widget_menu_refresh", @"Vector", nil)
+    [menu addAction:[UIAlertAction actionWithTitle:[VectorL10n widgetMenuRefresh]
                                              style:UIAlertActionStyleDefault
                                            handler:^(UIAlertAction * action)
                      {
@@ -303,7 +303,7 @@ NSString *const kJavascriptSendResponseToPostMessageAPI = @"riotIOS.sendResponse
     NSURL *url = [NSURL URLWithString:self.widgetUrl];
     if (url && [[UIApplication sharedApplication] canOpenURL:url])
     {
-        [menu addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"widget_menu_open_outside", @"Vector", nil)
+        [menu addAction:[UIAlertAction actionWithTitle:[VectorL10n widgetMenuOpenOutside]
                                                  style:UIAlertActionStyleDefault
                                                handler:^(UIAlertAction * action)
                          {
@@ -314,7 +314,7 @@ NSString *const kJavascriptSendResponseToPostMessageAPI = @"riotIOS.sendResponse
 
     if (![widget.widgetEvent.sender isEqualToString:session.myUser.userId])
     {
-        [menu addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"widget_menu_revoke_permission", @"Vector", nil)
+        [menu addAction:[UIAlertAction actionWithTitle:[VectorL10n widgetMenuRevokePermission]
                                                  style:UIAlertActionStyleDefault
                                                handler:^(UIAlertAction * action)
                          {
@@ -325,7 +325,7 @@ NSString *const kJavascriptSendResponseToPostMessageAPI = @"riotIOS.sendResponse
 
     if ([self hasUserEnoughPowerToManageCurrentWidget])
     {
-        [menu addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"widget_menu_remove", @"Vector", nil)
+        [menu addAction:[UIAlertAction actionWithTitle:[VectorL10n widgetMenuRemove]
                                                  style:UIAlertActionStyleDefault
                                                handler:^(UIAlertAction * action)
                          {
@@ -334,7 +334,7 @@ NSString *const kJavascriptSendResponseToPostMessageAPI = @"riotIOS.sendResponse
                          }]];
     }
 
-    [menu addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+    [menu addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                     style:UIAlertActionStyleCancel
                                                   handler:^(UIAlertAction * action) {
                                                   }]];
@@ -365,7 +365,7 @@ NSString *const kJavascriptSendResponseToPostMessageAPI = @"riotIOS.sendResponse
         NSError *error = [NSError errorWithDomain:NSURLErrorDomain
                                              code:NSURLErrorNotConnectedToInternet
                                          userInfo:@{
-                                                    NSLocalizedDescriptionKey : NSLocalizedStringFromTable(@"network_offline_prompt", @"Vector", nil)
+                                                    NSLocalizedDescriptionKey : [VectorL10n networkOfflinePrompt]
                                                     }];
         [self showErrorAsAlert:error];
     }
diff --git a/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.m b/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.m
index 598ef399c..fc3755331 100644
--- a/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.m
+++ b/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.m
@@ -101,7 +101,7 @@
 
     if (_allowsMultipleSelection)
     {
-        self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedStringFromTable(@"media_picker_select", @"Vector", nil) style:UIBarButtonItemStylePlain target:self action:@selector(onSelect:)];
+        self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:[VectorL10n mediaPickerSelect] style:UIBarButtonItemStylePlain target:self action:@selector(onSelect:)];
     }
     
     // Observe user interface theme change.
@@ -351,7 +351,7 @@
     selectedAssets = [NSMutableArray array];
 
     // Update the nav buttons
-    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:[NSBundle mxk_localizedStringForKey:@"send"] style:UIBarButtonItemStylePlain target:self action:@selector(onSelectionSend:)];
+    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:[MatrixKitL10n send] style:UIBarButtonItemStylePlain target:self action:@selector(onSelectionSend:)];
     self.navigationItem.rightBarButtonItem.enabled = NO;
     self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(onSelectionCancel:)];
 }
@@ -373,7 +373,7 @@
     selectedAssets = nil;
 
     // Update the nav buttons
-    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedStringFromTable(@"media_picker_select", @"Vector", nil) style:UIBarButtonItemStylePlain target:self action:@selector(onSelect:)];
+    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:[VectorL10n mediaPickerSelect] style:UIBarButtonItemStylePlain target:self action:@selector(onSelect:)];
     self.navigationItem.rightBarButtonItem.enabled = YES;
     self.navigationItem.leftBarButtonItem = nil;
 
diff --git a/Riot/Modules/MediaPicker/MediaPickerViewController.m b/Riot/Modules/MediaPicker/MediaPickerViewController.m
index e34617241..bd38cd2a8 100644
--- a/Riot/Modules/MediaPicker/MediaPickerViewController.m
+++ b/Riot/Modules/MediaPicker/MediaPickerViewController.m
@@ -126,11 +126,11 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view, typically from a nib.
     
-    self.title = NSLocalizedStringFromTable(@"media_picker_title", @"Vector", nil);
+    self.title = [VectorL10n mediaPickerTitle];
     
     MXWeakify(self);
     
-    UIBarButtonItem *closeBarButtonItem = [[MXKBarButtonItem alloc] initWithTitle:NSLocalizedStringFromTable(@"cancel", @"Vector", nil) style:UIBarButtonItemStylePlain action:^{
+    UIBarButtonItem *closeBarButtonItem = [[MXKBarButtonItem alloc] initWithTitle:[VectorL10n cancel] style:UIBarButtonItemStylePlain action:^{
         MXStrongifyAndReturnIfNil(self);
         [self.delegate mediaPickerControllerDidCancel:self];
     }];
@@ -267,13 +267,13 @@
 {
     NSString *appDisplayName = [[NSBundle mainBundle] infoDictionary][@"CFBundleDisplayName"];
     
-    NSString *message = [NSString stringWithFormat:NSLocalizedStringFromTable(@"photo_library_access_not_granted", @"Vector", nil), appDisplayName];
+    NSString *message = [VectorL10n photoLibraryAccessNotGranted:appDisplayName];
     
-    UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"media_picker_title", @"Vector", nil)
+    UIAlertController *alert = [UIAlertController alertControllerWithTitle:[VectorL10n mediaPickerTitle]
                                                                    message:message
                                                             preferredStyle:UIAlertControllerStyleAlert];
     
-    [alert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+    [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                               style:UIAlertActionStyleCancel
                                             handler:^(UIAlertAction * action) {
                                                 [self.delegate mediaPickerControllerDidCancel:self];
@@ -281,7 +281,7 @@
     
     NSURL *settingsURL = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
     
-    [alert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"settings"]
+    [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n settings]
                                               style:UIAlertActionStyleDefault
                                             handler:^(UIAlertAction * action) {
                                                 [UIApplication.sharedApplication openURL:settingsURL options:@{} completionHandler:^(BOOL success) {
@@ -656,7 +656,7 @@
     validationView.stretchable = YES;
     
     // the user validates the image
-    [validationView setRightButtonTitle:[NSBundle mxk_localizedStringForKey:@"ok"] handler:^(MXKImageView* imageView, NSString* buttonTitle) {
+    [validationView setRightButtonTitle:[MatrixKitL10n ok] handler:^(MXKImageView* imageView, NSString* buttonTitle) {
         __strong __typeof(weakSelf)strongSelf = weakSelf;
         
         // Dismiss the image view
@@ -666,7 +666,7 @@
     }];
     
     // the user wants to use an other image
-    [validationView setLeftButtonTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] handler:^(MXKImageView* imageView, NSString* buttonTitle) {
+    [validationView setLeftButtonTitle:[MatrixKitL10n cancel] handler:^(MXKImageView* imageView, NSString* buttonTitle) {
         __strong __typeof(weakSelf)strongSelf = weakSelf;
         
         // dismiss the image view
@@ -695,7 +695,7 @@
     validationView.stretchable = NO;
     
     // the user validates the image
-    [validationView setRightButtonTitle:[NSBundle mxk_localizedStringForKey:@"ok"] handler:^(MXKImageView* imageView, NSString* buttonTitle) {
+    [validationView setRightButtonTitle:[MatrixKitL10n ok] handler:^(MXKImageView* imageView, NSString* buttonTitle) {
         __strong __typeof(weakSelf)strongSelf = weakSelf;
         
         // Dismiss the image view
@@ -705,7 +705,7 @@
     }];
     
     // the user wants to use an other image
-    [validationView setLeftButtonTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] handler:^(MXKImageView* imageView, NSString* buttonTitle) {
+    [validationView setLeftButtonTitle:[MatrixKitL10n cancel] handler:^(MXKImageView* imageView, NSString* buttonTitle) {
         __strong __typeof(weakSelf)strongSelf = weakSelf;
         
         // dismiss the image view
diff --git a/Riot/Modules/People/PeopleViewController.m b/Riot/Modules/People/PeopleViewController.m
index 7d4e9260c..1072e7742 100644
--- a/Riot/Modules/People/PeopleViewController.m
+++ b/Riot/Modules/People/PeopleViewController.m
@@ -82,7 +82,7 @@
 {
     [super viewWillAppear:animated];
     
-    [AppDelegate theDelegate].masterTabBarController.navigationItem.title = NSLocalizedStringFromTable(@"title_people", @"Vector", nil);
+    [AppDelegate theDelegate].masterTabBarController.navigationItem.title = [VectorL10n titlePeople];
     [AppDelegate theDelegate].masterTabBarController.tabBar.tintColor = ThemeService.shared.theme.tintColor;
     
     if ([self.dataSource isKindOfClass:RecentsDataSource.class])
@@ -149,8 +149,8 @@
 - (void)updateEmptyView
 {
     [self.emptyView fillWith:[self emptyViewArtwork]
-                       title:NSLocalizedStringFromTable(@"people_empty_view_title", @"Vector", nil)
-             informationText:NSLocalizedStringFromTable(@"people_empty_view_information", @"Vector", nil)];
+                       title:[VectorL10n peopleEmptyViewTitle]
+             informationText:[VectorL10n peopleEmptyViewInformation]];
 }
 
 - (UIImage*)emptyViewArtwork
diff --git a/Riot/Modules/People/Views/InviteRecentTableViewCell.m b/Riot/Modules/People/Views/InviteRecentTableViewCell.m
index 796e1d938..aa691a871 100644
--- a/Riot/Modules/People/Views/InviteRecentTableViewCell.m
+++ b/Riot/Modules/People/Views/InviteRecentTableViewCell.m
@@ -42,12 +42,12 @@ NSString *const kInviteRecentTableViewCellRoomKey = @"kInviteRecentTableViewCell
     
     [self.leftButton.layer setCornerRadius:5];
     self.leftButton.clipsToBounds = YES;
-    [self.leftButton setTitle:NSLocalizedStringFromTable(@"decline", @"Vector", nil) forState:UIControlStateNormal];
+    [self.leftButton setTitle:[VectorL10n decline] forState:UIControlStateNormal];
     [self.leftButton addTarget:self action:@selector(onDeclinePressed:) forControlEvents:UIControlEventTouchUpInside];
     
     [self.rightButton.layer setCornerRadius:5];
     self.rightButton.clipsToBounds = YES;
-    [self.rightButton setTitle:NSLocalizedStringFromTable(@"accept", @"Vector", nil) forState:UIControlStateNormal];
+    [self.rightButton setTitle:[VectorL10n accept] forState:UIControlStateNormal];
     [self.rightButton addTarget:self action:@selector(onRightButtonPressed:) forControlEvents:UIControlEventTouchUpInside];
     
     [self.noticeBadgeView.layer setCornerRadius:10];
@@ -114,12 +114,12 @@ NSString *const kInviteRecentTableViewCellRoomKey = @"kInviteRecentTableViewCell
     
     if (!showPreviewButton)
     {
-        rightButtonTitle = NSLocalizedStringFromTable(@"accept", @"Vector", nil);
+        rightButtonTitle = [VectorL10n accept];
         [self vc_setAccessoryDisclosureIndicatorWithCurrentTheme];
     }
     else
     {
-        rightButtonTitle = NSLocalizedStringFromTable(@"preview", @"Vector", nil);
+        rightButtonTitle = [VectorL10n preview];
         self.accessoryView = nil;
     }
     
diff --git a/Riot/Modules/PublicRoomList/DataSources/PublicRoomsDirectoryDataSource.m b/Riot/Modules/PublicRoomList/DataSources/PublicRoomsDirectoryDataSource.m
index fa8ac0ab0..db260be11 100644
--- a/Riot/Modules/PublicRoomList/DataSources/PublicRoomsDirectoryDataSource.m
+++ b/Riot/Modules/PublicRoomList/DataSources/PublicRoomsDirectoryDataSource.m
@@ -83,7 +83,7 @@ static NSString *const kNSFWKeyword = @"nsfw";
         else
         {
             // We display only Matrix rooms of the user's HS
-            directoryServerDisplayname = [NSBundle mxk_localizedStringForKey:@"matrix"];
+            directoryServerDisplayname = [MatrixKitL10n matrix];
         }
     }
 
@@ -391,18 +391,18 @@ static NSString *const kNSFWKeyword = @"nsfw";
         {
             if (_searchPattern.length)
             {
-                tableViewCell.textLabel.text = NSLocalizedStringFromTable(@"search_no_result", @"Vector", nil);
+                tableViewCell.textLabel.text = [VectorL10n searchNoResult];
             }
             else
             {
-                tableViewCell.textLabel.text = NSLocalizedStringFromTable(@"room_directory_no_public_room", @"Vector", nil);
+                tableViewCell.textLabel.text = [VectorL10n roomDirectoryNoPublicRoom];
             }
         }
         else
         {
             if (_searchPattern.length)
             {
-                tableViewCell.textLabel.text = NSLocalizedStringFromTable(@"search_in_progress", @"Vector", nil);
+                tableViewCell.textLabel.text = [VectorL10n searchInProgress];
             }
             else
             {
diff --git a/Riot/Modules/Room/CellData/RoomBubbleCellData.m b/Riot/Modules/Room/CellData/RoomBubbleCellData.m
index 15cdee58d..ba19a08fe 100644
--- a/Riot/Modules/Room/CellData/RoomBubbleCellData.m
+++ b/Riot/Modules/Room/CellData/RoomBubbleCellData.m
@@ -1041,25 +1041,25 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
     switch (attachmentType)
     {
         case MXKAttachmentTypeImage:
-            accessibilityLabel = NSLocalizedStringFromTable(@"media_type_accessibility_image", @"Vector", nil);
+            accessibilityLabel = [VectorL10n mediaTypeAccessibilityImage];
             break;
         case MXKAttachmentTypeAudio:
-            accessibilityLabel = NSLocalizedStringFromTable(@"media_type_accessibility_audio", @"Vector", nil);
+            accessibilityLabel = [VectorL10n mediaTypeAccessibilityAudio];
             break;
         case MXKAttachmentTypeVoiceMessage:
-            accessibilityLabel = NSLocalizedStringFromTable(@"media_type_accessibility_audio", @"Vector", nil);
+            accessibilityLabel = [VectorL10n mediaTypeAccessibilityAudio];
             break;
         case MXKAttachmentTypeVideo:
-            accessibilityLabel = NSLocalizedStringFromTable(@"media_type_accessibility_video", @"Vector", nil);
+            accessibilityLabel = [VectorL10n mediaTypeAccessibilityVideo];
             break;
         case MXKAttachmentTypeLocation:
-            accessibilityLabel = NSLocalizedStringFromTable(@"media_type_accessibility_location", @"Vector", nil);
+            accessibilityLabel = [VectorL10n mediaTypeAccessibilityLocation];
             break;
         case MXKAttachmentTypeFile:
-            accessibilityLabel = NSLocalizedStringFromTable(@"media_type_accessibility_file", @"Vector", nil);
+            accessibilityLabel = [VectorL10n mediaTypeAccessibilityFile];
             break;
         case MXKAttachmentTypeSticker:
-            accessibilityLabel = NSLocalizedStringFromTable(@"media_type_accessibility_sticker", @"Vector", nil);
+            accessibilityLabel = [VectorL10n mediaTypeAccessibilitySticker];
             break;
         default:
             accessibilityLabel = @"";
diff --git a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
index 517a44fa5..0c000ae7d 100644
--- a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
+++ b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
@@ -356,8 +356,6 @@
         [self.mxRoom state:^(MXRoomState *roomState) {
             MXStrongifyAndReturnIfNil(self);
 
-            NSString *powerLevelTextFormat;
-            
             MXRoomPowerLevels *powerLevels = [roomState powerLevels];
             NSInteger powerLevel = [powerLevels powerLevelOfUserWithUserID:self.mxRoomMember.userId];
             
@@ -365,26 +363,18 @@
             
             switch (roomPowerLevel) {
                 case RoomPowerLevelAdmin:
-                    powerLevelTextFormat = NSLocalizedStringFromTable(@"room_member_power_level_admin_in", @"Vector", nil);
+                    self.roomMemberPowerLevelLabel.text = [VectorL10n roomMemberPowerLevelAdminIn:self.mxRoom.summary.displayname];
+                    self.roomMemberPowerLevelContainerView.hidden = NO;
                     break;
                 case RoomPowerLevelModerator:
-                    powerLevelTextFormat = NSLocalizedStringFromTable(@"room_member_power_level_moderator_in", @"Vector", nil);
+                    self.roomMemberPowerLevelLabel.text = [VectorL10n roomMemberPowerLevelModeratorIn:self.mxRoom.summary.displayname];
+                    self.roomMemberPowerLevelContainerView.hidden = NO;
                     break;
                 default:
-                    powerLevelTextFormat = nil;
+                    self.roomMemberPowerLevelLabel.text = nil;
+                    self.roomMemberPowerLevelContainerView.hidden = YES;
                     break;
             }
-            
-            NSString *powerLevelText;
-            
-            if (powerLevelTextFormat)
-            {
-                NSString *roomName = self.mxRoom.summary.displayname;
-                powerLevelText = [NSString stringWithFormat:powerLevelTextFormat, roomName];
-            }
-            
-            self.roomMemberPowerLevelLabel.text = powerLevelText;
-            self.roomMemberPowerLevelContainerView.hidden = !powerLevelTextFormat;
         }];
         
         NSString* presenceText;
@@ -727,23 +717,23 @@
 {
     if (section == securityIndex)
     {
-        return NSLocalizedStringFromTable(@"room_participants_action_section_security", @"Vector", nil);
+        return [VectorL10n roomParticipantsActionSectionSecurity];
     }
     else if (section == adminToolsIndex)
     {
-        return NSLocalizedStringFromTable(@"room_participants_action_section_admin_tools", @"Vector", nil);
+        return [VectorL10n roomParticipantsActionSectionAdminTools];
     }
     else if (section == otherActionsIndex)
     {
-        return NSLocalizedStringFromTable(@"room_participants_action_section_other", @"Vector", nil);
+        return [VectorL10n roomParticipantsActionSectionOther];
     }
     else if (section == directChatsIndex)
     {
-        return NSLocalizedStringFromTable(@"room_participants_action_section_direct_chats", @"Vector", nil);
+        return [VectorL10n roomParticipantsActionSectionDirectChats];
     }
     else if (section == devicesIndex)
     {
-        return NSLocalizedStringFromTable(@"room_participants_action_section_devices", @"Vector", nil);
+        return [VectorL10n roomParticipantsActionSectionDevices];
     }
     
     return nil;
@@ -756,60 +746,60 @@
     switch (action)
     {
         case MXKRoomMemberDetailsActionInvite:
-            title = NSLocalizedStringFromTable(@"room_participants_action_invite", @"Vector", nil);
+            title = [VectorL10n roomParticipantsActionInvite];
             break;
         case MXKRoomMemberDetailsActionLeave:
-            title = NSLocalizedStringFromTable(@"room_participants_action_leave", @"Vector", nil);
+            title = [VectorL10n roomParticipantsActionLeave];
             break;
         case MXKRoomMemberDetailsActionKick:
             if (self.mxRoom.summary.roomType == MXRoomTypeSpace)
             {
-                title = NSLocalizedStringFromTable(@"space_participants_action_remove", @"Vector", nil);
+                title = [VectorL10n spaceParticipantsActionRemove];
             }
             else
             {
-                title = NSLocalizedStringFromTable(@"room_participants_action_remove", @"Vector", nil);
+                title = [VectorL10n roomParticipantsActionRemove];
             }
             break;
         case MXKRoomMemberDetailsActionBan:
             if (self.mxRoom.summary.roomType == MXRoomTypeSpace)
             {
-                title = NSLocalizedStringFromTable(@"space_participants_action_ban", @"Vector", nil);
+                title = [VectorL10n spaceParticipantsActionBan];
             }
             else
             {
-                title = NSLocalizedStringFromTable(@"room_participants_action_ban", @"Vector", nil);
+                title = [VectorL10n roomParticipantsActionBan];
             }
             break;
         case MXKRoomMemberDetailsActionUnban:
-            title = NSLocalizedStringFromTable(@"room_participants_action_unban", @"Vector", nil);
+            title = [VectorL10n roomParticipantsActionUnban];
             break;
         case MXKRoomMemberDetailsActionIgnore:
-            title = NSLocalizedStringFromTable(@"room_participants_action_ignore", @"Vector", nil);
+            title = [VectorL10n roomParticipantsActionIgnore];
             break;
         case MXKRoomMemberDetailsActionUnignore:
-            title = NSLocalizedStringFromTable(@"room_participants_action_unignore", @"Vector", nil);
+            title = [VectorL10n roomParticipantsActionUnignore];
             break;
         case MXKRoomMemberDetailsActionSetDefaultPowerLevel:
-            title = NSLocalizedStringFromTable(@"room_participants_action_set_default_power_level", @"Vector", nil);
+            title = [VectorL10n roomParticipantsActionSetDefaultPowerLevel];
             break;
         case MXKRoomMemberDetailsActionSetModerator:
-            title = NSLocalizedStringFromTable(@"room_participants_action_set_moderator", @"Vector", nil);
+            title = [VectorL10n roomParticipantsActionSetModerator];
             break;
         case MXKRoomMemberDetailsActionSetAdmin:
-            title = NSLocalizedStringFromTable(@"room_participants_action_set_admin", @"Vector", nil);
+            title = [VectorL10n roomParticipantsActionSetAdmin];
             break;
         case MXKRoomMemberDetailsActionStartChat:
-            title = NSLocalizedStringFromTable(@"room_participants_action_start_chat", @"Vector", nil);
+            title = [VectorL10n roomParticipantsActionStartNewChat];
             break;
         case MXKRoomMemberDetailsActionStartVoiceCall:
-            title = NSLocalizedStringFromTable(@"room_participants_action_start_voice_call", @"Vector", nil);
+            title = [VectorL10n roomParticipantsActionStartVoiceCall];
             break;
         case MXKRoomMemberDetailsActionStartVideoCall:
-            title = NSLocalizedStringFromTable(@"room_participants_action_start_video_call", @"Vector", nil);
+            title = [VectorL10n roomParticipantsActionStartVideoCall];
             break;
         case MXKRoomMemberDetailsActionMention:
-            title = NSLocalizedStringFromTable(@"room_participants_action_mention", @"Vector", nil);
+            title = [VectorL10n roomParticipantsActionMention];
             break;
         default:
             break;
@@ -834,26 +824,26 @@
             
             switch (self.encryptionTrustLevel) {
                 case UserEncryptionTrustLevelTrusted:
-                    statusText = NSLocalizedStringFromTable(@"room_participants_action_security_status_verified", @"Vector", nil);
+                    statusText = [VectorL10n roomParticipantsActionSecurityStatusVerified];
                     break;
                 case UserEncryptionTrustLevelNotVerified:
                 case UserEncryptionTrustLevelNoCrossSigning:
                 {
                     if (self.isRoomMemberCurrentUser)
                     {
-                        statusText = NSLocalizedStringFromTable(@"room_participants_action_security_status_complete_security", @"Vector", nil);
+                        statusText = [VectorL10n roomParticipantsActionSecurityStatusCompleteSecurity];
                     }
                     else
                     {
-                        statusText = NSLocalizedStringFromTable(@"room_participants_action_security_status_verify", @"Vector", nil);
+                        statusText = [VectorL10n roomParticipantsActionSecurityStatusVerify];
                     }
                 }
                     break;
                 case UserEncryptionTrustLevelWarning:
-                    statusText = NSLocalizedStringFromTable(@"room_participants_action_security_status_warning", @"Vector", nil);
+                    statusText = [VectorL10n roomParticipantsActionSecurityStatusWarning];
                     break;
                 default:
-                    statusText = NSLocalizedStringFromTable(@"room_participants_action_security_status_loading", @"Vector", nil);
+                    statusText = [VectorL10n roomParticipantsActionSecurityStatusLoading];
                     break;
             }
             
@@ -884,16 +874,16 @@
                 case UserEncryptionTrustLevelTrusted:
                 {
                     NSString *info = (self.mxRoom.isDirect) ?
-                    NSLocalizedStringFromTable(@"room_participants_security_information_room_encrypted_for_dm", @"Vector", nil) :
-                    NSLocalizedStringFromTable(@"room_participants_security_information_room_encrypted", @"Vector", nil);
+                    [VectorL10n roomParticipantsSecurityInformationRoomEncryptedForDm] :
+                    [VectorL10n roomParticipantsSecurityInformationRoomEncrypted];
                     [encryptionInformation appendString:info];
                 }
                     break;
                 case UserEncryptionTrustLevelNone:
                     {
                         NSString *info = (self.mxRoom.isDirect) ?
-                        NSLocalizedStringFromTable(@"room_participants_security_information_room_not_encrypted_for_dm", @"Vector", nil) :
-                        NSLocalizedStringFromTable(@"room_participants_security_information_room_not_encrypted", @"Vector", nil);
+                        [VectorL10n roomParticipantsSecurityInformationRoomNotEncryptedForDm] :
+                        [VectorL10n roomParticipantsSecurityInformationRoomNotEncrypted];
                         [encryptionInformation appendString:info];
                     }
                     break;
@@ -984,7 +974,7 @@
             roomCell.avatarImageView.image = [UIImage imageNamed:@"start_chat"];
             roomCell.avatarImageView.defaultBackgroundColor = [UIColor clearColor];
             roomCell.avatarImageView.userInteractionEnabled = NO;
-            roomCell.titleLabel.text = NSLocalizedStringFromTable(@"room_participants_action_start_new_chat", @"Vector", nil);
+            roomCell.titleLabel.text = [VectorL10n roomParticipantsActionStartNewChat];
         }
         
         cell = roomCell;
@@ -1132,7 +1122,7 @@
                 __weak typeof(self) weakSelf = self;
                 
                 // Ban
-                currentAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"room_event_action_ban_prompt_reason", @"Vector", nil)
+                currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n roomEventActionBanPromptReason]
                                                                    message:nil
                                                             preferredStyle:UIAlertControllerStyleAlert];
                 
@@ -1142,7 +1132,7 @@
                     textField.keyboardType = UIKeyboardTypeDefault;
                 }];
                 
-                [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+                [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                                  style:UIAlertActionStyleDefault
                                                                handler:^(UIAlertAction * action) {
                                                                    
@@ -1196,7 +1186,7 @@
                 __weak typeof(self) weakSelf = self;
                 
                 // Kick
-                currentAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"room_event_action_kick_prompt_reason", @"Vector", nil)
+                currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n roomEventActionKickPromptReason]
                                                                    message:nil
                                                             preferredStyle:UIAlertControllerStyleAlert];
                 
@@ -1206,7 +1196,7 @@
                     textField.keyboardType = UIKeyboardTypeDefault;
                 }];
                 
-                [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+                [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                                  style:UIAlertActionStyleDefault
                                                                handler:^(UIAlertAction * action) {
                                                                    
@@ -1218,7 +1208,7 @@
                                                                    
                                                                }]];
                 
-                [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"remove", @"Vector", nil)
+                [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n remove]
                                                                  style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
                                                                    
                                                                    if (weakSelf)
@@ -1288,7 +1278,7 @@
         __block MXKImageView * avatarFullScreenView = [[MXKImageView alloc] initWithFrame:CGRectZero];
         avatarFullScreenView.stretchable = YES;
 
-        [avatarFullScreenView setRightButtonTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+        [avatarFullScreenView setRightButtonTitle:[MatrixKitL10n ok]
                                           handler:^(MXKImageView* imageView, NSString* buttonTitle) {
                                               
                                               MXStrongifyAndReturnIfNil(self);
diff --git a/Riot/Modules/Room/Members/RoomParticipantsViewController.m b/Riot/Modules/Room/Members/RoomParticipantsViewController.m
index 2d84fa595..7858ab241 100644
--- a/Riot/Modules/Room/Members/RoomParticipantsViewController.m
+++ b/Riot/Modules/Room/Members/RoomParticipantsViewController.m
@@ -112,19 +112,19 @@
     
     [NSLayoutConstraint activateConstraints:@[_searchBarTopConstraint]];
     
-    self.navigationItem.title = NSLocalizedStringFromTable(@"room_participants_title", @"Vector", nil);
+    self.navigationItem.title = [VectorL10n roomParticipantsTitle];
     
     if (self.mxRoom.summary.roomType == MXRoomTypeSpace)
     {
-        _searchBarView.placeholder = NSLocalizedStringFromTable(@"search_default_placeholder", @"Vector", nil);
+        _searchBarView.placeholder = [VectorL10n searchDefaultPlaceholder];
     }
     else if (self.mxRoom.isDirect)
     {
-        _searchBarView.placeholder = NSLocalizedStringFromTable(@"room_participants_filter_room_members_for_dm", @"Vector", nil);
+        _searchBarView.placeholder = [VectorL10n roomParticipantsFilterRoomMembersForDm];
     }
     else
     {
-        _searchBarView.placeholder = NSLocalizedStringFromTable(@"room_participants_filter_room_members", @"Vector", nil);
+        _searchBarView.placeholder = [VectorL10n roomParticipantsFilterRoomMembers];
     }
     _searchBarView.returnKeyType = UIReturnKeyDone;
     _searchBarView.autocapitalizationType = UITextAutocapitalizationTypeNone;
@@ -347,15 +347,15 @@
             
             if (self.mxRoom.summary.roomType == MXRoomTypeSpace)
             {
-                self.searchBarView.placeholder = NSLocalizedStringFromTable(@"search_default_placeholder", @"Vector", nil);
+                self.searchBarView.placeholder = [VectorL10n searchDefaultPlaceholder];
             }
             else if (self.mxRoom.isDirect)
             {
-                self.searchBarView.placeholder = NSLocalizedStringFromTable(@"room_participants_filter_room_members_for_dm", @"Vector", nil);
+                self.searchBarView.placeholder = [VectorL10n roomParticipantsFilterRoomMembersForDm];
             }
             else
             {
-                self.searchBarView.placeholder = NSLocalizedStringFromTable(@"room_participants_filter_room_members", @"Vector", nil);
+                self.searchBarView.placeholder = [VectorL10n roomParticipantsFilterRoomMembers];
             }
 
             // Update the current matrix session.
@@ -574,7 +574,7 @@
     }
     
     [contactsPickerViewController showSearch:YES];
-    contactsPickerViewController.searchBar.placeholder = NSLocalizedStringFromTable(@"room_participants_invite_another_user", @"Vector", nil);
+    contactsPickerViewController.searchBar.placeholder = [VectorL10n roomParticipantsInviteAnotherUser];
     
     // Apply the search pattern if any
     if (currentSearchText)
@@ -613,7 +613,7 @@
                     if (mxMember.membership == MXMembershipJoin || mxMember.membership == MXMembershipInvite)
                     {
                         // The user is in this room
-                        NSString *displayName = NSLocalizedStringFromTable(@"you", @"Vector", nil);
+                        NSString *displayName = [VectorL10n you];
 
                         self->userParticipant = [[Contact alloc] initMatrixContactWithDisplayName:displayName andMatrixID:userId];
                         self->userParticipant.mxMember = [roomState.members memberWithUserId:userId];
@@ -1038,10 +1038,10 @@
                 
                 switch (roomPowerLevel) {
                     case RoomPowerLevelAdmin:
-                        powerLevelText = NSLocalizedStringFromTable(@"room_member_power_level_short_admin", @"Vector", nil);
+                        powerLevelText = [VectorL10n roomMemberPowerLevelShortAdmin];
                         break;
                     case RoomPowerLevelModerator:
-                        powerLevelText = NSLocalizedStringFromTable(@"room_member_power_level_short_moderator", @"Vector", nil);
+                        powerLevelText = [VectorL10n roomMemberPowerLevelShortModerator];
                         break;
                     default:
                         powerLevelText = nil;
@@ -1139,7 +1139,7 @@
         headerLabel.font = [UIFont boldSystemFontOfSize:15.0];
         headerLabel.backgroundColor = [UIColor clearColor];
         
-        headerLabel.text = NSLocalizedStringFromTable(@"room_participants_invited_section", @"Vector", nil);
+        headerLabel.text = [VectorL10n roomParticipantsInvitedSection];
         
         [sectionHeader addSubview:headerLabel];
     }
@@ -1290,20 +1290,20 @@
             NSString *title, *message;
             if (self.mxRoom.isDirect)
             {
-                title = NSLocalizedStringFromTable(@"room_participants_leave_prompt_title_for_dm", @"Vector", nil);
-                message = NSLocalizedStringFromTable(@"room_participants_leave_prompt_msg_for_dm", @"Vector", nil);
+                title = [VectorL10n roomParticipantsLeavePromptTitleForDm];
+                message = [VectorL10n roomParticipantsLeavePromptMsgForDm];
             }
             else
             {
-                title = NSLocalizedStringFromTable(@"room_participants_leave_prompt_title", @"Vector", nil);
-                message = NSLocalizedStringFromTable(@"room_participants_leave_prompt_msg", @"Vector", nil);
+                title = [VectorL10n roomParticipantsLeavePromptTitle];
+                message = [VectorL10n roomParticipantsLeavePromptMsg];
             }
             
             currentAlert = [UIAlertController alertControllerWithTitle:title
                                                                message:message
                                                         preferredStyle:UIAlertControllerStyleAlert];
             
-            [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                              style:UIAlertActionStyleCancel
                                                            handler:^(UIAlertAction * action) {
                                                                
@@ -1312,7 +1312,7 @@
                                                                
                                                            }]];
             
-            [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"leave", @"Vector", nil)
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n leave]
                                                              style:UIAlertActionStyleDefault
                                                            handler:^(UIAlertAction * action) {
                                                                
@@ -1383,12 +1383,12 @@
                     NSString *memberUserId = contact.mxMember.userId;
                     
                     // Kick ?
-                    NSString *promptMsg = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_participants_remove_prompt_msg", @"Vector", nil), (contact ? contact.displayName : memberUserId)];
-                    currentAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"room_participants_remove_prompt_title", @"Vector", nil)
+                    NSString *promptMsg = [VectorL10n roomParticipantsRemovePromptMsg:(contact ? contact.displayName : memberUserId)];
+                    currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n roomParticipantsRemovePromptTitle]
                                                                        message:promptMsg
                                                                 preferredStyle:UIAlertControllerStyleAlert];
                     
-                    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+                    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                                      style:UIAlertActionStyleCancel
                                                                    handler:^(UIAlertAction * action) {
                                                                        
@@ -1397,7 +1397,7 @@
                                                                        
                                                                    }]];
                     
-                    [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"remove", @"Vector", nil)
+                    [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n remove]
                                                                      style:UIAlertActionStyleDefault
                                                                    handler:^(UIAlertAction * action) {
                                                                        
@@ -1434,10 +1434,10 @@
                 {
                     // This is a third-party invite
                     currentAlert = [UIAlertController alertControllerWithTitle:nil
-                                                                       message:NSLocalizedStringFromTable(@"room_participants_remove_third_party_invite_prompt_msg", @"Vector", nil)
+                                                                       message:[VectorL10n roomParticipantsRemoveThirdPartyInvitePromptMsg]
                                                                 preferredStyle:UIAlertControllerStyleAlert];
                     
-                    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+                    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                                      style:UIAlertActionStyleCancel
                                                                    handler:^(UIAlertAction * action) {
                                                                        
@@ -1446,7 +1446,7 @@
                                                                        
                                                                    }]];
                     
-                    [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"remove", @"Vector", nil)
+                    [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n remove]
                                                                      style:UIAlertActionStyleDefault
                                                                    handler:^(UIAlertAction * action) {
                                                                        
@@ -1504,12 +1504,12 @@
     }
     
     // Invite ?
-    NSString *promptMsg = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_participants_invite_prompt_msg", @"Vector", nil), contact.displayName];
-    currentAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"room_participants_invite_prompt_title", @"Vector", nil)
+    NSString *promptMsg = [VectorL10n roomParticipantsInvitePromptMsg:contact.displayName];
+    currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n roomParticipantsInvitePromptTitle]
                                                        message:promptMsg
                                                 preferredStyle:UIAlertControllerStyleAlert];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                      style:UIAlertActionStyleCancel
                                                    handler:^(UIAlertAction * action) {
                                                        
@@ -1521,7 +1521,7 @@
                                                        
                                                    }]];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"invite", @"Vector", nil)
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n invite]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
                                                        
@@ -1595,7 +1595,7 @@
                                                                        if ([error.domain isEqualToString:kMXRestClientErrorDomain]
                                                                            && error.code == MXRestClientErrorMissingIdentityServer)
                                                                        {
-                                                                           NSString *message = [NSBundle mxk_localizedStringForKey:@"error_invite_3pid_with_no_identity_server"];
+                                                                           NSString *message = [VectorL10n errorInvite3pidWithNoIdentityServer];
                                                                            [[AppDelegate theDelegate] showAlertWithTitle:message message:nil];
                                                                        }
                                                                        else
diff --git a/Riot/Modules/Room/ReadReceiptsDetail/ReadReceiptsViewController.m b/Riot/Modules/Room/ReadReceiptsDetail/ReadReceiptsViewController.m
index 4fad512d2..d69f8f936 100644
--- a/Riot/Modules/Room/ReadReceiptsDetail/ReadReceiptsViewController.m
+++ b/Riot/Modules/Room/ReadReceiptsDetail/ReadReceiptsViewController.m
@@ -146,10 +146,10 @@
 - (void)configureViews
 {
     self.containerView.layer.cornerRadius = 20;
-    self.titleLabel.text = NSLocalizedStringFromTable(@"read_receipts_list", @"Vector", nil);
+    self.titleLabel.text = [VectorL10n readReceiptsList];
     
-    [_closeButton setTitle:[NSBundle mxk_localizedStringForKey:@"close"] forState:UIControlStateNormal];
-    [_closeButton setTitle:[NSBundle mxk_localizedStringForKey:@"close"] forState:UIControlStateHighlighted];
+    [_closeButton setTitle:[MatrixKitL10n close] forState:UIControlStateNormal];
+    [_closeButton setTitle:[MatrixKitL10n close] forState:UIControlStateHighlighted];
 }
 
 - (void)configureReceiptsTableView
@@ -223,7 +223,7 @@
     }
     if (indexPath.row < self.receipts.count)
     {
-        NSString *receiptReadText = NSLocalizedStringFromTable(@"receipt_status_read", @"Vector", nil);
+        NSString *receiptReadText = [VectorL10n receiptStatusRead];
         NSString *receiptTimeText = [(MXKEventFormatter*)self.session.roomSummaryUpdateDelegate dateStringFromTimestamp:self.receipts[indexPath.row].ts withTime:YES];
         
         NSMutableAttributedString *receiptDescription = [[NSMutableAttributedString alloc] initWithString:receiptReadText attributes:@{NSForegroundColorAttributeName : ThemeService.shared.theme.textSecondaryColor, NSFontAttributeName : [UIFont  boldSystemFontOfSize:15]}];
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 8e574e082..538b02bb1 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -441,7 +441,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
     self.errorPresenter = [MXKErrorAlertPresentation new];
     self.roomMessageURLParser = [RoomMessageURLParser new];
     
-    self.jumpToLastUnreadLabel.text = NSLocalizedStringFromTable(@"room_jump_to_first_unread", @"Vector", nil);
+    self.jumpToLastUnreadLabel.text = [VectorL10n roomJumpToFirstUnread];
     
     // Observe user interface theme change.
     kThemeServiceDidChangeThemeNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kThemeServiceDidChangeThemeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
@@ -1463,7 +1463,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
                                                              style:UIBarButtonItemStylePlain
                                                             target:self
                                                             action:@selector(onVideoCallPressed:)];
-    item.accessibilityLabel = NSLocalizedStringFromTable(@"room_accessibility_video_call", @"Vector", nil);
+    item.accessibilityLabel = [VectorL10n roomAccessibilityVideoCall];
     
     return item;
 }
@@ -1603,7 +1603,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
                                                                                   style:UIBarButtonItemStylePlain
                                                                                  target:self
                                                                                  action:@selector(onVoiceCallPressed:)];
-                    itemVoice.accessibilityLabel = NSLocalizedStringFromTable(@"room_accessibility_call", @"Vector", nil);
+                    itemVoice.accessibilityLabel = [VectorL10n roomAccessibilityCall];
                     itemVoice.enabled = !self.isCallActive;
                     [rightBarButtonItems addObject:itemVoice];
                     
@@ -1630,14 +1630,14 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
                             CallTileActionButton *button = [CallTileActionButton new];
                             [button setImage:[UIImage imageNamed:@"call_video_icon"]
                                     forState:UIControlStateNormal];
-                            [button setTitle:NSLocalizedStringFromTable(@"room_join_group_call", @"Vector", nil)
+                            [button setTitle:[VectorL10n roomJoinGroupCall]
                                     forState:UIControlStateNormal];
                             [button addTarget:self
                                        action:@selector(onVideoCallPressed:)
                              forControlEvents:UIControlEventTouchUpInside];
                             button.contentEdgeInsets = UIEdgeInsetsMake(4, 12, 4, 12);
                             UIBarButtonItem *item = [[UIBarButtonItem alloc] initWithCustomView:button];
-                            item.accessibilityLabel = NSLocalizedStringFromTable(@"room_accessibility_video_call", @"Vector", nil);
+                            item.accessibilityLabel = [VectorL10n roomAccessibilityVideoCall];
                             [rightBarButtonItems addObject:item];
                             
                             hasCustomJoinButton = YES;
@@ -1663,7 +1663,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
                                                                          style:UIBarButtonItemStylePlain
                                                                         target:self
                                                                         action:@selector(onIntegrationsPressed:)];
-                item.accessibilityLabel = NSLocalizedStringFromTable(@"room_accessibility_integrations", @"Vector", nil);
+                item.accessibilityLabel = [VectorL10n roomAccessibilityIntegrations];
                 if (hasCustomJoinButton)
                 {
                     item.imageInsets = UIEdgeInsetsMake(0, -5, 0, -5);
@@ -1711,7 +1711,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         userPictureView = roomInputToolbarView.pictureView;
         
         // For the moment, there is only one reason to use `DisabledRoomInputToolbarView`
-        [roomInputToolbarView setDisabledReason:NSLocalizedStringFromTable(@"room_do_not_have_permission_to_post", @"Vector", nil)];
+        [roomInputToolbarView setDisabledReason:[VectorL10n roomDoNotHavePermissionToPost]];
     }
     
     // Set user picture in input toolbar
@@ -2020,17 +2020,16 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
     {
         // The Sticker picker widget is not installed yet. Propose the user to install it
         MXWeakify(self);
-
+        
         [currentAlert dismissViewControllerAnimated:NO completion:nil];
         
         NSString *alertMessage = [NSString stringWithFormat:@"%@\n%@",
-                                  NSLocalizedStringFromTable(@"widget_sticker_picker_no_stickerpacks_alert", @"Vector", nil),
-                                  NSLocalizedStringFromTable(@"widget_sticker_picker_no_stickerpacks_alert_add_now", @"Vector", nil)
-                                  ];
-        
+                                  [VectorL10n widgetStickerPickerNoStickerpacksAlert],
+                                  [VectorL10n widgetStickerPickerNoStickerpacksAlertAddNow]];
+                                   
         currentAlert = [UIAlertController alertControllerWithTitle:nil message:alertMessage preferredStyle:UIAlertControllerStyleAlert];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"no"]
+        [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n no]
                                                          style:UIAlertActionStyleCancel
                                                        handler:^(UIAlertAction * action)
                                  {
@@ -2039,7 +2038,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
             
         }]];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"yes"]
+        [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n yes]
                                                          style:UIAlertActionStyleDefault
                                                        handler:^(UIAlertAction * action)
                                  {
@@ -2986,8 +2985,8 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
 
             // Check app permissions first
             [MXKTools checkAccessForCall:YES
-             manualChangeMessageForAudio:[NSString stringWithFormat:[NSBundle mxk_localizedStringForKey:@"microphone_access_not_granted_for_call"], AppInfo.current.displayName]
-             manualChangeMessageForVideo:[NSString stringWithFormat:[NSBundle mxk_localizedStringForKey:@"camera_access_not_granted_for_call"], AppInfo.current.displayName]
+             manualChangeMessageForAudio:[MatrixKitL10n microphoneAccessNotGrantedForCall:AppInfo.current.displayName]
+             manualChangeMessageForVideo:[MatrixKitL10n cameraAccessNotGrantedForCall:AppInfo.current.displayName]
                showPopUpInViewController:self completionHandler:^(BOOL granted) {
                 
                 MXStrongifyAndReturnIfNil(self);
@@ -3084,7 +3083,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
     // Add actions for a failed event
     if (selectedEvent.sentState == MXEventSentStateFailed)
     {
-        [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"retry", @"Vector", nil)
+        [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n retry]
                                                          style:UIAlertActionStyleDefault
                                                        handler:^(UIAlertAction * action) {
             
@@ -3100,7 +3099,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
             
         }]];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_event_action_delete", @"Vector", nil)
+        [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionDelete]
                                                          style:UIAlertActionStyleDefault
                                                        handler:^(UIAlertAction * action) {
             
@@ -3137,7 +3136,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
             selectedEvent.sentState == MXEventSentStateEncrypting ||
             selectedEvent.sentState == MXEventSentStateSending)
         {
-            [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_event_action_cancel_send", @"Vector", nil)
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionCancelSend]
                                                              style:UIAlertActionStyleDefault
                                                            handler:^(UIAlertAction * action)
                                      {
@@ -3159,7 +3158,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         
         if (!isJitsiCallEvent)
         {
-            [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_event_action_quote", @"Vector", nil)
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionQuote]
                                                              style:UIAlertActionStyleDefault
                                                            handler:^(UIAlertAction * action) {
                 
@@ -3181,7 +3180,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         
         if (!isJitsiCallEvent && BuildSettings.messageDetailsAllowShare)
         {
-            [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_event_action_share", @"Vector", nil)
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionShare]
                                                              style:UIAlertActionStyleDefault
                                                            handler:^(UIAlertAction * action) {
                 
@@ -3214,7 +3213,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         {
             if (attachment.type == MXKAttachmentTypeImage || attachment.type == MXKAttachmentTypeVideo)
             {
-                [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_event_action_save", @"Vector", nil)
+                [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionSave]
                                                                  style:UIAlertActionStyleDefault
                                                                handler:^(UIAlertAction * action) {
                     
@@ -3259,7 +3258,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
             NSString *uploadId = roomBubbleTableViewCell.bubbleData.attachment.contentURL;
             if ([MXMediaManager existingUploaderWithId:uploadId])
             {
-                [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_event_action_cancel_send", @"Vector", nil)
+                [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionCancelSend]
                                                                  style:UIAlertActionStyleDefault
                                                                handler:^(UIAlertAction * action) {
                     
@@ -3297,7 +3296,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         {
             if (BuildSettings.messageDetailsAllowShare)
             {
-                [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_event_action_share", @"Vector", nil)
+                [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionShare]
                                                                  style:UIAlertActionStyleDefault
                                                                handler:^(UIAlertAction * action) {
                     
@@ -3346,7 +3345,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
             NSString *downloadId = roomBubbleTableViewCell.bubbleData.attachment.downloadId;
             if ([MXMediaManager existingDownloaderWithIdentifier:downloadId])
             {
-                [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_event_action_cancel_download", @"Vector", nil)
+                [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionCancelDownload]
                                                                  style:UIAlertActionStyleDefault
                                                                handler:^(UIAlertAction * action) {
                     
@@ -3374,7 +3373,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         // because it breaks everything
         if (selectedEvent.eventType != MXEventTypeRoomEncryption)
         {
-            [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_event_action_redact", @"Vector", nil)
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionRedact]
                                                              style:UIAlertActionStyleDefault
                                                            handler:^(UIAlertAction * action) {
                 
@@ -3408,7 +3407,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         
         if (BuildSettings.messageDetailsAllowPermalink)
         {
-            [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_event_action_permalink", @"Vector", nil)
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionPermalink]
                                                              style:UIAlertActionStyleDefault
                                                            handler:^(UIAlertAction * action) {
                 
@@ -3437,7 +3436,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         // Add reaction history if event contains reactions
         if (roomBubbleTableViewCell.bubbleData.reactions[selectedEvent.eventId].aggregatedReactionsWithNonZeroCount)
         {
-            [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_event_action_reaction_history", @"Vector", nil)
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionReactionHistory]
                                                              style:UIAlertActionStyleDefault
                                                            handler:^(UIAlertAction * action) {
                 
@@ -3450,7 +3449,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         
         if (BuildSettings.messageDetailsAllowViewSource)
         {
-            [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_event_action_view_source", @"Vector", nil)
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionViewSource]
                                                              style:UIAlertActionStyleDefault
                                                            handler:^(UIAlertAction * action) {
                 
@@ -3470,7 +3469,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
             // Add "View Decrypted Source" for e2ee event we can decrypt
             if (selectedEvent.isEncrypted && selectedEvent.clearEvent)
             {
-                [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_event_action_view_decrypted_source", @"Vector", nil)
+                [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionViewDecryptedSource]
                                                                  style:UIAlertActionStyleDefault
                                                                handler:^(UIAlertAction * action) {
                     
@@ -3490,7 +3489,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         
         if (![selectedEvent.sender isEqualToString:self.mainSession.myUser.userId] && RiotSettings.shared.roomContextualMenuShowReportContentOption)
         {
-            [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_event_action_report", @"Vector", nil)
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionReport]
                                                              style:UIAlertActionStyleDefault
                                                            handler:^(UIAlertAction * action) {
                 
@@ -3501,7 +3500,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
                     [self cancelEventSelection];
                     
                     // Prompt user to enter a description of the problem content.
-                    self->currentAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"room_event_action_report_prompt_reason", @"Vector", nil)  message:nil preferredStyle:UIAlertControllerStyleAlert];
+                    self->currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n roomEventActionReportPromptReason]  message:nil preferredStyle:UIAlertControllerStyleAlert];
                     
                     [self->currentAlert addTextFieldWithConfigurationHandler:^(UITextField *textField) {
                         textField.secureTextEntry = NO;
@@ -3509,7 +3508,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
                         textField.keyboardType = UIKeyboardTypeDefault;
                     }];
                     
-                    [self->currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+                    [self->currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
                         
                         if (weakSelf)
                         {
@@ -3525,9 +3524,9 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
                                 [self stopActivityIndicator];
                                 
                                 // Prompt user to ignore content from this user
-                                self->currentAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"room_event_action_report_prompt_ignore_user", @"Vector", nil)  message:nil preferredStyle:UIAlertControllerStyleAlert];
+                                self->currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n roomEventActionReportPromptIgnoreUser]  message:nil preferredStyle:UIAlertControllerStyleAlert];
                                 
-                                [self->currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"yes"] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+                                [self->currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n yes] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
                                     
                                     if (weakSelf)
                                     {
@@ -3556,7 +3555,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
                                     
                                 }]];
                                 
-                                [self->currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"no"] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+                                [self->currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n no] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
                                     
                                     if (weakSelf)
                                     {
@@ -3582,7 +3581,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
                         
                     }]];
                     
-                    [self->currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) {
+                    [self->currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel] style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) {
                         
                         if (weakSelf)
                         {
@@ -3600,7 +3599,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         
         if (!isJitsiCallEvent && self.roomDataSource.room.summary.isEncrypted)
         {
-            [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_event_action_view_encryption", @"Vector", nil)
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionViewEncryption]
                                                              style:UIAlertActionStyleDefault
                                                            handler:^(UIAlertAction * action) {
                 
@@ -3617,7 +3616,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         }
     }
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"cancel", @"Vector", nil)
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n cancel]
                                                      style:UIAlertActionStyleCancel
                                                    handler:^(UIAlertAction * action) {
         
@@ -3778,10 +3777,9 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
                                 if (visibleURL && ![url isEqual:visibleURL])
                                 {
                                     //  urls are different, show confirmation alert
-                                    NSString *formatStr = NSLocalizedStringFromTable(@"external_link_confirmation_message", @"Vector", nil);
-                                    UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"external_link_confirmation_title", @"Vector", nil) message:[NSString stringWithFormat:formatStr, visibleURL.absoluteString, url.absoluteString] preferredStyle:UIAlertControllerStyleAlert];
+                                    UIAlertController *alert = [UIAlertController alertControllerWithTitle:[VectorL10n externalLinkConfirmationTitle] message:[VectorL10n externalLinkConfirmationMessage:visibleURL.absoluteString :url.absoluteString] preferredStyle:UIAlertControllerStyleAlert];
                                     
-                                    UIAlertAction *continueAction = [UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"continue", @"Vector", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+                                    UIAlertAction *continueAction = [UIAlertAction actionWithTitle:[VectorL10n continue] style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
                                         // Try to open the link
                                         [[UIApplication sharedApplication] vc_open:url completionHandler:^(BOOL success) {
                                             if (!success)
@@ -3791,7 +3789,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
                                         }];
                                     }];
                                     
-                                    UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"cancel", @"Vector", nil) style:UIAlertActionStyleCancel handler:nil];
+                                    UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:[VectorL10n cancel] style:UIAlertActionStyleCancel handler:nil];
                                     
                                     [alert addAction:continueAction];
                                     [alert addAction:cancelAction];
@@ -3880,8 +3878,8 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
 
 - (void)showUnableToOpenLinkErrorAlert
 {
-    [self showAlertWithTitle:[NSBundle mxk_localizedStringForKey:@"error"]
-                     message:NSLocalizedStringFromTable(@"room_message_unable_open_link_error_message", @"Vector", nil)];
+    [self showAlertWithTitle:[MatrixKitL10n error]
+                     message:[VectorL10n roomMessageUnableOpenLinkErrorMessage]];
 }
 
 - (void)editEventContentWithId:(NSString*)eventId
@@ -3983,8 +3981,8 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
     
     // Check app permissions first
     [MXKTools checkAccessForCall:video
-     manualChangeMessageForAudio:[NSString stringWithFormat:[NSBundle mxk_localizedStringForKey:@"microphone_access_not_granted_for_call"], AppInfo.current.displayName]
-     manualChangeMessageForVideo:[NSString stringWithFormat:[NSBundle mxk_localizedStringForKey:@"camera_access_not_granted_for_call"], AppInfo.current.displayName]
+     manualChangeMessageForAudio:[MatrixKitL10n microphoneAccessNotGrantedForCall:AppInfo.current.displayName]
+     manualChangeMessageForVideo:[MatrixKitL10n cameraAccessNotGrantedForCall:AppInfo.current.displayName]
        showPopUpInViewController:self completionHandler:^(BOOL granted) {
         
         if (weakSelf)
@@ -4022,7 +4020,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
                                                 preferredStyle:UIAlertControllerStyleActionSheet];
     
     __weak typeof(self) weakSelf = self;
-    [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_place_voice_call", @"Vector", nil)
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomPlaceVoiceCall]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
         
@@ -4036,7 +4034,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         
     }]];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_open_dialpad", @"Vector", nil)
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomOpenDialpad]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
         
@@ -4050,7 +4048,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         
     }]];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                      style:UIAlertActionStyleCancel
                                                    handler:^(UIAlertAction * action) {
         
@@ -4116,11 +4114,11 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
                 MXWeakify(self);
                 [currentAlert dismissViewControllerAnimated:NO completion:nil];
                 
-                currentAlert = [UIAlertController alertControllerWithTitle:[NSBundle mxk_localizedStringForKey:@"room_no_privileges_to_create_group_call"]
+                currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n roomNoPrivilegesToCreateGroupCall]
                                                                    message:nil
                                                             preferredStyle:UIAlertControllerStyleAlert];
                 
-                [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+                [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                                                  style:UIAlertActionStyleDefault
                                                                handler:^(UIAlertAction * action)
                                          {
@@ -4776,7 +4774,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         error = [NSError errorWithDomain:error.domain
                                     code:error.code
                                 userInfo:@{
-                                    NSLocalizedDescriptionKey: NSLocalizedStringFromTable(@"room_conference_call_no_power", @"Vector", nil)
+                                    NSLocalizedDescriptionKey: [VectorL10n roomConferenceCallNoPower]
                                 }];
     }
     
@@ -4826,7 +4824,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         else if ([AppDelegate theDelegate].isOffline)
         {
             self.activitiesViewExpanded = YES;
-            [roomActivitiesView displayNetworkErrorNotification:NSLocalizedStringFromTable(@"room_offline_notification", @"Vector", nil)];
+            [roomActivitiesView displayNetworkErrorNotification:[VectorL10n roomOfflineNotification]];
         }
         else if (customizedRoomDataSource.roomState.isObsolete)
         {
@@ -5041,8 +5039,8 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         if (sentStatus != RoomSentStatusOk)
         {
             NSString *notification = sentStatus == RoomSentStatusSentFailedDueToUnknownDevices ?
-            NSLocalizedStringFromTable(@"room_unsent_messages_unknown_devices_notification", @"Vector", nil) :
-            NSLocalizedStringFromTable(@"room_unsent_messages_notification", @"Vector", nil);
+            [VectorL10n roomUnsentMessagesUnknownDevicesNotification] :
+            [VectorL10n roomUnsentMessagesNotification];
             
             RoomActivitiesView *roomActivitiesView = (RoomActivitiesView*) self.activitiesView;
             self.activitiesViewExpanded = YES;
@@ -5064,7 +5062,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
                 __weak __typeof(self) weakSelf = self;
                 currentAlert = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
                 
-                [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_resend_unsent_messages", @"Vector", nil)
+                [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomResendUnsentMessages]
                                                                  style:UIAlertActionStyleDefault
                                                                handler:^(UIAlertAction * action) {
                     
@@ -5077,7 +5075,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
                     
                 }]];
                 
-                [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_delete_unsent_messages", @"Vector", nil)
+                [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomDeleteUnsentMessages]
                                                                  style:UIAlertActionStyleDefault
                                                                handler:^(UIAlertAction * action) {
                     
@@ -5090,7 +5088,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
                     
                 }]];
                 
-                [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"cancel", @"Vector", nil)
+                [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n cancel]
                                                                  style:UIAlertActionStyleCancel
                                                                handler:^(UIAlertAction * action) {
                     
@@ -5145,11 +5143,11 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
             }
         }
         
-        currentAlert = [UIAlertController alertControllerWithTitle:[NSBundle mxk_localizedStringForKey:@"unknown_devices_alert_title"]
-                                                           message:[NSBundle mxk_localizedStringForKey:@"unknown_devices_alert"]
+        currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n unknownDevicesAlertTitle]
+                                                           message:[VectorL10n unknownDevicesAlertTitle]
                                                     preferredStyle:UIAlertControllerStyleAlert];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"unknown_devices_verify"]
+        [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n unknownDevicesVerify]
                                                          style:UIAlertActionStyleDefault
                                                        handler:^(UIAlertAction * action) {
             
@@ -5163,7 +5161,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
             
         }]];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"unknown_devices_send_anyway"]
+        [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n unknownDevicesSendAnyway]
                                                          style:UIAlertActionStyleDefault
                                                        handler:^(UIAlertAction * action) {
             
@@ -5249,15 +5247,15 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
 
 - (void)cancelAllUnsentMessages
 {
-    currentAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"room_unsent_messages_cancel_title", @"Vector", nil) message:NSLocalizedStringFromTable(@"room_unsent_messages_cancel_message", @"Vector", nil) preferredStyle:UIAlertControllerStyleAlert];
+    currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n roomUnsentMessagesCancelTitle] message:[VectorL10n roomUnsentMessagesCancelMessage] preferredStyle:UIAlertControllerStyleAlert];
     
     MXWeakify(self);
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) {
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel] style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) {
         MXStrongifyAndReturnIfNil(self);
         self->currentAlert = nil;
     }]];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"delete"] style:UIAlertActionStyleDestructive handler:^(UIAlertAction * action) {
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n delete] style:UIAlertActionStyleDestructive handler:^(UIAlertAction * action) {
         MXStrongifyAndReturnIfNil(self);
         // Remove unsent event ids
         for (NSUInteger index = 0; index < self.roomDataSource.room.outgoingMessages.count;)
@@ -5502,12 +5500,12 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
     }
     
     // Invite ?
-    NSString *promptMsg = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_participants_invite_prompt_msg", @"Vector", nil), contact.displayName];
-    currentAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"room_participants_invite_prompt_title", @"Vector", nil)
+    NSString *promptMsg = [VectorL10n roomParticipantsInvitePromptMsg:contact.displayName];
+    currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n roomParticipantsInvitePromptTitle]
                                                        message:promptMsg
                                                 preferredStyle:UIAlertControllerStyleAlert];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                      style:UIAlertActionStyleCancel
                                                    handler:^(UIAlertAction * action) {
         
@@ -5519,7 +5517,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         
     }]];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"invite", @"Vector", nil)
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n invite]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
         
@@ -5587,8 +5585,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
                     if ([error.domain isEqualToString:kMXRestClientErrorDomain]
                         && error.code == MXRestClientErrorMissingIdentityServer)
                     {
-                        NSString *message = [NSBundle mxk_localizedStringForKey:@"error_invite_3pid_with_no_identity_server"];
-                        [self showAlertWithTitle:message message:nil];
+                        [self showAlertWithTitle:[VectorL10n errorInvite3pidWithNoIdentityServer] message:nil];
                     }
                     else
                     {
@@ -5663,7 +5660,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
     currentAlert = alert;
     
     
-    [alert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+    [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                               style:UIAlertActionStyleDefault
                                             handler:^(UIAlertAction * action)
                       {
@@ -5684,17 +5681,17 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
     
     [currentAlert dismissViewControllerAnimated:NO completion:nil];
     
-    UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"key_verification_self_verify_unverified_sessions_alert_title", @"Vector", nil)
-                                                                   message:NSLocalizedStringFromTable(@"key_verification_self_verify_unverified_sessions_alert_message", @"Vector", nil)
+    UIAlertController *alert = [UIAlertController alertControllerWithTitle:[VectorL10n keyVerificationSelfVerifyUnverifiedSessionsAlertTitle]
+                                                                   message:[VectorL10n keyVerificationSelfVerifyUnverifiedSessionsAlertMessage]
                                                             preferredStyle:UIAlertControllerStyleAlert];
     
-    [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"key_verification_self_verify_unverified_sessions_alert_validate_action", @"Vector", nil)
+    [alert addAction:[UIAlertAction actionWithTitle:[VectorL10n keyVerificationSelfVerifyUnverifiedSessionsAlertValidateAction]
                                               style:UIAlertActionStyleDefault
                                             handler:^(UIAlertAction * action) {
         [self showSettingsSecurityScreen];
     }]];
     
-    [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"later", @"Vector", nil)
+    [alert addAction:[UIAlertAction actionWithTitle:[VectorL10n later]
                                               style:UIAlertActionStyleCancel
                                             handler:nil]];
     
@@ -5945,12 +5942,14 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         [self hideContextualMenuAnimated:YES cancelEventSelection:YES completion:^{
             MXStrongifyAndReturnIfNil(self);
             
-            self->currentAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"room_event_action_delete_confirmation_title", @"Vector", nil)  message:NSLocalizedStringFromTable(@"room_event_action_delete_confirmation_message", @"Vector", nil) preferredStyle:UIAlertControllerStyleAlert];
+            self->currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n roomEventActionDeleteConfirmationTitle]
+                                                                     message:[VectorL10n roomEventActionDeleteConfirmationMessage]
+                                                              preferredStyle:UIAlertControllerStyleAlert];
             
-            [self->currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+            [self->currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
             }]];
             
-            [self->currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"delete"] style:UIAlertActionStyleDestructive handler:^(UIAlertAction * action) {
+            [self->currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n delete] style:UIAlertActionStyleDestructive handler:^(UIAlertAction * action) {
                 [self.roomDataSource removeEventWithEventId:event.eventId];
             }]];
             
@@ -6255,8 +6254,8 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
     {
         MXLogDebug(@"[MXKRoomViewController] File upload using MIME type %@ is not supported.", mimeType);
         
-        [self showAlertWithTitle:NSLocalizedStringFromTable(@"file_upload_error_title", @"Vector", nil)
-                         message:NSLocalizedStringFromTable(@"file_upload_error_unsupported_file_type_message", @"Vector", nil)];
+        [self showAlertWithTitle:[VectorL10n fileUploadErrorTitle]
+                         message:[VectorL10n fileUploadErrorUnsupportedFileTypeMessage]];
     }
 }
 
@@ -6458,7 +6457,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
 
 - (void)voiceMessageControllerDidRequestMicrophonePermission:(VoiceMessageController *)voiceMessageController
 {
-    NSString *message = [NSString stringWithFormat:[NSBundle mxk_localizedStringForKey:@"microphone_access_not_granted_for_voice_message"], AppInfo.current.displayName];
+    NSString *message = [MatrixKitL10n microphoneAccessNotGrantedForVoiceMessage:AppInfo.current.displayName];
     
     [MXKTools checkAccessForMediaType:AVMediaTypeAudio
                   manualChangeMessage: message
diff --git a/Riot/Modules/Room/Search/RoomSearchViewController.m b/Riot/Modules/Room/Search/RoomSearchViewController.m
index f3c99c0e9..b6a17df46 100644
--- a/Riot/Modules/Room/Search/RoomSearchViewController.m
+++ b/Riot/Modules/Room/Search/RoomSearchViewController.m
@@ -50,12 +50,12 @@
     NSMutableArray* viewControllers = [[NSMutableArray alloc] init];
     NSMutableArray* titles = [[NSMutableArray alloc] init];
     
-    [titles addObject: NSLocalizedStringFromTable(@"search_messages", @"Vector", nil)];
+    [titles addObject:[VectorL10n searchMessages]];
     messagesSearchViewController = [RoomMessagesSearchViewController searchViewController];
     [viewControllers addObject:messagesSearchViewController];
     
     // add Files tab
-    [titles addObject: NSLocalizedStringFromTable(@"search_files", @"Vector", nil)];
+     [titles addObject:[VectorL10n searchFiles]];
     filesSearchViewController = [RoomFilesSearchViewController searchViewController];
     [viewControllers addObject:filesSearchViewController];
     
diff --git a/Riot/Modules/Room/Settings/RoomSettingsViewController.m b/Riot/Modules/Room/Settings/RoomSettingsViewController.m
index c57058dfe..bf1e96655 100644
--- a/Riot/Modules/Room/Settings/RoomSettingsViewController.m
+++ b/Riot/Modules/Room/Settings/RoomSettingsViewController.m
@@ -559,11 +559,11 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
         
         if (mxRoom.isDirect)
         {
-            sectionAccess.headerTitle = NSLocalizedStringFromTable(@"room_details_access_section_for_dm", @"Vector", nil);
+            sectionAccess.headerTitle = [VectorL10n roomDetailsAccessSectionAnyoneForDm];
         }
         else
         {
-            sectionAccess.headerTitle = NSLocalizedStringFromTable(@"room_details_access_section", @"Vector", nil);
+            sectionAccess.headerTitle = [VectorL10n roomDetailsAccessSection];
         }
         [tmpSections addObject:sectionAccess];
     }
@@ -575,7 +575,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
         [sectionHistory addRowWithTag:ROOM_SETTINGS_HISTORY_VISIBILITY_SECTION_ROW_MEMBERS_ONLY];
         [sectionHistory addRowWithTag:ROOM_SETTINGS_HISTORY_VISIBILITY_SECTION_ROW_MEMBERS_ONLY_SINCE_INVITED];
         [sectionHistory addRowWithTag:ROOM_SETTINGS_HISTORY_VISIBILITY_SECTION_ROW_MEMBERS_ONLY_SINCE_JOINED];
-        sectionHistory.headerTitle = NSLocalizedStringFromTable(@"room_details_history_section", @"Vector", nil);
+        sectionHistory.headerTitle = [VectorL10n roomDetailsHistorySection];
         [tmpSections addObject:sectionHistory];
     }
     
@@ -594,7 +594,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
             [sectionAddresses addRowWithTag:ROOM_SETTINGS_ROOM_ADDRESS_NO_LOCAL_ADDRESS];
         }
         [sectionAddresses addRowWithTag:ROOM_SETTINGS_ROOM_ADDRESS_NEW_ALIAS];
-        sectionAddresses.headerTitle = NSLocalizedStringFromTable(@"room_details_addresses_section", @"Vector", nil);
+        sectionAddresses.headerTitle = [VectorL10n roomDetailsAddressesSection];
         [tmpSections addObject:sectionAddresses];
     }
     
@@ -619,7 +619,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
             }
         }
         
-        sectionFlair.headerTitle = NSLocalizedStringFromTable(@"room_details_flair_section", @"Vector", nil);
+        sectionFlair.headerTitle = [VectorL10n roomDetailsFlairSection];
         if ([sectionFlair hasAnyRows])
         {
             [tmpSections addObject:sectionFlair];
@@ -635,7 +635,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
             [sectionBannedUsers addRowWithTag:counter];
         }
         
-        sectionBannedUsers.headerTitle = NSLocalizedStringFromTable(@"room_details_banned_users_section", @"Vector", nil);
+        sectionBannedUsers.headerTitle = [VectorL10n roomDetailsBannedUsersSection];
         [tmpSections addObject:sectionBannedUsers];
     }
     
@@ -671,7 +671,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
             }
         }
         
-        sectionAdvanced.headerTitle = NSLocalizedStringFromTable(@"room_details_advanced_section", @"Vector", nil);
+        sectionAdvanced.headerTitle = [VectorL10n roomDetailsAdvancedSection];
         [tmpSections addObject:sectionAdvanced];
     }
     
@@ -845,9 +845,11 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
     
     __weak typeof(self) weakSelf = self;
     
-    currentAlert = [UIAlertController alertControllerWithTitle:nil message:NSLocalizedStringFromTable(@"room_details_save_changes_prompt", @"Vector", nil) preferredStyle:UIAlertControllerStyleAlert];
+    currentAlert = [UIAlertController alertControllerWithTitle:nil
+                                                       message:[VectorL10n roomDetailsSaveChangesPrompt]
+                                                preferredStyle:UIAlertControllerStyleAlert];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"no"]
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n no]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
                                                        
@@ -863,7 +865,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
                                                        
                                                    }]];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"yes"]
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n yes]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
                                                        
@@ -891,7 +893,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
         
         currentAlert = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_details_copy_room_id", @"Vector", nil)
+        [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomDetailsCopyRoomId]
                                                          style:UIAlertActionStyleDefault
                                                        handler:^(UIAlertAction * action) {
                                                            
@@ -914,7 +916,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
                                                            
                                                        }]];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+        [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                          style:UIAlertActionStyleCancel
                                                        handler:^(UIAlertAction * action) {
                                                            
@@ -961,7 +963,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
             
             if (canonicalAlias && [roomAliasLabel.text isEqualToString:canonicalAlias])
             {
-                [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_details_unset_main_address", @"Vector", nil)
+                [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomDetailsUnsetMainAddress]
                                                                  style:UIAlertActionStyleDefault
                                                                handler:^(UIAlertAction * action) {
                                                                    
@@ -983,7 +985,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
             else
             {
                 // Invite user to define this alias as the main room address
-                [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_details_set_main_address", @"Vector", nil)
+                [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomDetailsSetMainAddress]
                                                                  style:UIAlertActionStyleDefault
                                                                handler:^(UIAlertAction * action) {
                                                                    
@@ -999,7 +1001,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
             }
         }
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_details_copy_room_address", @"Vector", nil)
+        [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomDetailsCopyRoomAddress]
                                                          style:UIAlertActionStyleDefault
                                                        handler:^(UIAlertAction * action) {
                                                            
@@ -1022,7 +1024,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
                                                            
                                                        }]];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_details_copy_room_url", @"Vector", nil)
+        [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomDetailsCopyRoomUrl]
                                                          style:UIAlertActionStyleDefault
                                                        handler:^(UIAlertAction * action) {
                                                            
@@ -1049,7 +1051,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
         
         // The user can only delete alias they has created, even if the Admin has set it as canonical.
         // So, let the server answer if it's possible to delete an alias.
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"delete"]
+        [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n delete]
                                                          style:UIAlertActionStyleDefault
                                                        handler:^(UIAlertAction * action) {
 
@@ -1063,7 +1065,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
 
                                                        }]];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+        [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                          style:UIAlertActionStyleCancel
                                                        handler:^(UIAlertAction * action) {
                                                            
@@ -1393,7 +1395,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
     
     currentAlert = [UIAlertController alertControllerWithTitle:nil message:message preferredStyle:UIAlertControllerStyleAlert];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                      style:UIAlertActionStyleCancel
                                                    handler:^(UIAlertAction * action) {
                                                        
@@ -1414,7 +1416,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
                                                        
                                                    }]];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"retry", @"Vector", nil)
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n retry]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
                                                        
@@ -1480,7 +1482,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
                             NSString* message = error.localizedDescription;
                             if (!message.length)
                             {
-                                message = NSLocalizedStringFromTable(@"room_details_fail_to_update_avatar", @"Vector", nil);
+                                message = [VectorL10n roomDetailsFailToUpdateAvatar];
                             }
                             [self onSaveFailed:message withKeys:@[kRoomSettingsAvatarKey]];
                             
@@ -1521,7 +1523,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
                             NSString* message = error.localizedDescription;
                             if (!message.length)
                             {
-                                message = NSLocalizedStringFromTable(@"room_details_fail_to_update_avatar", @"Vector", nil);
+                                message = [VectorL10n roomDetailsFailToUpdateAvatar];
                             }
                             [self onSaveFailed:message withKeys:@[kRoomSettingsAvatarURLKey]];
                             
@@ -1563,7 +1565,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
                             NSString* message = error.localizedDescription;
                             if (!message.length)
                             {
-                                message = NSLocalizedStringFromTable(@"room_details_fail_to_update_room_name", @"Vector", nil);
+                                message = [VectorL10n roomDetailsFailToUpdateRoomName];
                             }
                             [self onSaveFailed:message withKeys:@[kRoomSettingsNameKey]];
                             
@@ -1605,7 +1607,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
                             NSString* message = error.localizedDescription;
                             if (!message.length)
                             {
-                                message = NSLocalizedStringFromTable(@"room_details_fail_to_update_topic", @"Vector", nil);
+                                message = [VectorL10n roomDetailsFailToUpdateTopic];
                             }
                             [self onSaveFailed:message withKeys:@[kRoomSettingsTopicKey]];
                             
@@ -1647,7 +1649,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
                             NSString* message = error.localizedDescription;
                             if (!message.length)
                             {
-                                message = NSLocalizedStringFromTable(@"room_details_fail_to_update_room_guest_access", @"Vector", nil);
+                                message = [VectorL10n roomDetailsFailToUpdateRoomGuestAccess];
                             }
                             [self onSaveFailed:message withKeys:@[kRoomSettingsGuestAccessKey]];
                             
@@ -1689,7 +1691,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
                             NSString* message = error.localizedDescription;
                             if (!message.length)
                             {
-                                message = NSLocalizedStringFromTable(@"room_details_fail_to_update_room_join_rule", @"Vector", nil);
+                                message = [VectorL10n roomDetailsFailToUpdateRoomJoinRule];
                             }
                             [self onSaveFailed:message withKeys:@[kRoomSettingsJoinRuleKey]];
                             
@@ -1731,7 +1733,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
                             NSString* message = error.localizedDescription;
                             if (!message.length)
                             {
-                                message = NSLocalizedStringFromTable(@"room_details_fail_to_update_history_visibility", @"Vector", nil);
+                                message = [VectorL10n roomDetailsFailToUpdateHistoryVisibility];
                             }
                             [self onSaveFailed:message withKeys:@[kRoomSettingsHistoryVisibilityKey]];
                             
@@ -1785,7 +1787,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
                             NSString* message = error.localizedDescription;
                             if (!message.length)
                             {
-                                message = NSLocalizedStringFromTable(@"room_details_fail_to_add_room_aliases", @"Vector", nil);
+                                message = [VectorL10n roomDetailsFailToAddRoomAliases];
                             }
                             [self onSaveFailed:message withKeys:@[kRoomSettingsNewAliasesKey]];
                             
@@ -1838,7 +1840,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
                             NSString* message = error.localizedDescription;
                             if (!message.length)
                             {
-                                message = NSLocalizedStringFromTable(@"room_details_fail_to_remove_room_aliases", @"Vector", nil);
+                                message = [VectorL10n roomDetailsFailToRemoveRoomAliases];
                             }
                             [self onSaveFailed:message withKeys:@[kRoomSettingsRemovedAliasesKey]];
                             
@@ -1879,7 +1881,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
                             NSString* message = error.localizedDescription;
                             if (!message.length)
                             {
-                                message = NSLocalizedStringFromTable(@"room_details_fail_to_update_room_canonical_alias", @"Vector", nil);
+                                message = [VectorL10n roomDetailsFailToUpdateRoomCanonicalAlias];
                             }
                             [self onSaveFailed:message withKeys:@[kRoomSettingsCanonicalAliasKey]];
                             
@@ -1925,7 +1927,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
                             NSString* message = error.localizedDescription;
                             if (!message.length)
                             {
-                                message = NSLocalizedStringFromTable(@"room_details_fail_to_update_room_communities", @"Vector", nil);
+                                message = [VectorL10n roomDetailsFailToUpdateRoomCommunities];
                             }
                             [self onSaveFailed:message withKeys:@[kRoomSettingsNewRelatedGroupKey,kRoomSettingsRemovedRelatedGroupKey]];
                             
@@ -2023,7 +2025,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
                         NSString* message = error.localizedDescription;
                         if (!message.length)
                         {
-                            message = NSLocalizedStringFromTable(@"room_details_fail_to_update_room_direct", @"Vector", nil);
+                            message = [VectorL10n roomDetailsFailToUpdateRoomDirect];
                         }
                         [self onSaveFailed:message withKeys:@[kRoomSettingsDirectChatKey]];
                         
@@ -2063,7 +2065,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
                         NSString* message = error.localizedDescription;
                         if (!message.length)
                         {
-                            message = NSLocalizedStringFromTable(@"room_details_fail_to_update_room_directory_visibility", @"Vector", nil);
+                            message = [VectorL10n roomDetailsFailToUpdateRoomDirectoryVisibility];
                         }
                         [self onSaveFailed:message withKeys:@[kRoomSettingsDirectoryKey]];
                         
@@ -2105,7 +2107,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
                         NSString* message = error.localizedDescription;
                         if (!message.length)
                         {
-                            message = NSLocalizedStringFromTable(@"room_details_fail_to_enable_encryption", @"Vector", nil);
+                            message = [VectorL10n roomDetailsFailToEnableEncryption];
                         }
                         [self onSaveFailed:message withKeys:@[kRoomSettingsEncryptionKey]];
                         
@@ -2201,7 +2203,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
 
             [roomNotifCell.mxkSwitch addTarget:self action:@selector(toggleRoomNotification:) forControlEvents:UIControlEventValueChanged];
             
-            roomNotifCell.mxkLabel.text = NSLocalizedStringFromTable(@"room_details_mute_notifs", @"Vector", nil);
+            roomNotifCell.mxkLabel.text = [VectorL10n roomDetailsMuteNotifs];
             
             if (updatedItemsDict[kRoomSettingsMuteNotifKey])
             {
@@ -2220,7 +2222,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
             
             [roomDirectChat.mxkSwitch addTarget:self action:@selector(toggleDirectChat:) forControlEvents:UIControlEventValueChanged];
             
-            roomDirectChat.mxkLabel.text = NSLocalizedStringFromTable(@"room_details_direct_chat", @"Vector", nil);
+            roomDirectChat.mxkLabel.text = [VectorL10n roomDetailsDirectChat];
             
             if (updatedItemsDict[kRoomSettingsDirectChatKey])
             {
@@ -2255,11 +2257,11 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
             
             if (mxRoom.isDirect)
             {
-                roomPhotoCell.mxkLabel.text = NSLocalizedStringFromTable(@"room_details_photo_for_dm", @"Vector", nil);
+                roomPhotoCell.mxkLabel.text = [VectorL10n roomDetailsPhotoForDm];
             }
             else
             {
-                roomPhotoCell.mxkLabel.text = NSLocalizedStringFromTable(@"room_details_photo", @"Vector", nil);
+                roomPhotoCell.mxkLabel.text = [VectorL10n roomDetailsPhoto];
             }
             roomPhotoCell.mxkLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
             
@@ -2283,7 +2285,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
             
             roomTopicCell.labelLeadingConstraint.constant = roomTopicCell.vc_separatorInset.left;
             
-            roomTopicCell.label.text = NSLocalizedStringFromTable(@"room_details_topic", @"Vector", nil);
+            roomTopicCell.label.text = [VectorL10n roomDetailsTopic];
             
             topicTextView = roomTopicCell.textView;
             
@@ -2319,11 +2321,11 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
             
             if (mxRoom.isDirect)
             {
-                roomNameCell.mxkLabel.text = NSLocalizedStringFromTable(@"room_details_room_name_for_dm", @"Vector", nil);
+                roomNameCell.mxkLabel.text = [VectorL10n roomDetailsRoomNameForDm];
             }
             else
             {
-                roomNameCell.mxkLabel.text = NSLocalizedStringFromTable(@"room_details_room_name", @"Vector", nil);
+                roomNameCell.mxkLabel.text = [VectorL10n roomDetailsRoomName];
             }
             roomNameCell.mxkLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
             
@@ -2371,10 +2373,10 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
                 UILabel *label;
                 label = labels[0];
                 label.textColor = ThemeService.shared.theme.textPrimaryColor;
-                label.text = NSLocalizedStringFromTable(@"room_details_favourite_tag", @"Vector", nil);
+                label.text = [VectorL10n roomDetailsFavouriteTag];
                 label = labels[1];
                 label.textColor = ThemeService.shared.theme.textPrimaryColor;
-                label.text = NSLocalizedStringFromTable(@"room_details_low_priority_tag", @"Vector", nil);
+                label.text = [VectorL10n roomDetailsLowPriorityTag];
                 
                 if (updatedItemsDict[kRoomSettingsTagKey])
                 {
@@ -2409,7 +2411,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
                 
                 [favoriteCell.mxkSwitch addTarget:self action:@selector(toggleFavorite:) forControlEvents:UIControlEventValueChanged];
                 
-                favoriteCell.mxkLabel.text = NSLocalizedStringFromTable(@"room_details_favourite_tag", @"Vector", nil);
+                favoriteCell.mxkLabel.text = [VectorL10n roomDetailsFavouriteTag];
                 
                 if ([updatedItemsDict[kRoomSettingsTagKey] isEqualToString:kMXRoomTagFavourite])
                 {
@@ -2427,7 +2429,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
         {
             MXKTableViewCellWithButton *leaveCell = [tableView dequeueReusableCellWithIdentifier:[MXKTableViewCellWithButton defaultReuseIdentifier] forIndexPath:indexPath];
             
-            NSString* title = NSLocalizedStringFromTable(@"leave", @"Vector", nil);
+            NSString* title = [VectorL10n leave];
             
             [leaveCell.mxkButton setTitle:title forState:UIControlStateNormal];
             [leaveCell.mxkButton setTitle:title forState:UIControlStateHighlighted];
@@ -2448,11 +2450,11 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
             
             if (mxRoom.isDirect)
             {
-                directoryToggleCell.mxkLabel.text = NSLocalizedStringFromTable(@"room_details_access_section_directory_toggle_for_dm", @"Vector", nil);
+                directoryToggleCell.mxkLabel.text = [VectorL10n roomDetailsAccessSectionDirectoryToggleForDm];
             }
             else
             {
-                directoryToggleCell.mxkLabel.text = NSLocalizedStringFromTable(@"room_details_access_section_directory_toggle", @"Vector", nil);
+                directoryToggleCell.mxkLabel.text = [VectorL10n roomDetailsAccessSectionDirectoryToggle];
             }
             
             [directoryToggleCell.mxkSwitch addTarget:self action:@selector(toggleDirectoryVisibility:) forControlEvents:UIControlEventValueChanged];
@@ -2485,7 +2487,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
             cell.accessoryView = nil;
             cell.accessoryType = UITableViewCellAccessoryNone;
             cell.selectionStyle = UITableViewCellSelectionStyleNone;
-            cell.textLabel.text = NSLocalizedStringFromTable(@"room_details_access_section_no_address_warning", @"Vector", nil);
+            cell.textLabel.text = [VectorL10n roomDetailsAccessSectionNoAddressWarning];
         }
         else
         {
@@ -2509,7 +2511,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
             
             if (row == ROOM_SETTINGS_ROOM_ACCESS_SECTION_ROW_INVITED_ONLY)
             {
-                roomAccessCell.label.text = NSLocalizedStringFromTable(@"room_details_access_section_invited_only", @"Vector", nil);
+                roomAccessCell.label.text = [VectorL10n roomDetailsAccessSectionInvitedOnly];
                 
                 roomAccessCell.enabled = ([joinRule isEqualToString:kMXRoomJoinRuleInvite]);
                 
@@ -2519,11 +2521,11 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
             {
                 if (mxRoom.isDirect)
                 {
-                    roomAccessCell.label.text = NSLocalizedStringFromTable(@"room_details_access_section_anyone_apart_from_guest_for_dm", @"Vector", nil);
+                    roomAccessCell.label.text = [VectorL10n roomDetailsAccessSectionAnyoneApartFromGuestForDm];
                 }
                 else
                 {
-                    roomAccessCell.label.text = NSLocalizedStringFromTable(@"room_details_access_section_anyone_apart_from_guest", @"Vector", nil);
+                    roomAccessCell.label.text = [VectorL10n roomDetailsAccessSectionAnyoneApartFromGuest];
                 }
                 
                 roomAccessCell.enabled = ([joinRule isEqualToString:kMXRoomJoinRulePublic] && [guestAccess isEqualToString:kMXRoomGuestAccessForbidden]);
@@ -2534,11 +2536,11 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
             {
                 if (mxRoom.isDirect)
                 {
-                    roomAccessCell.label.text = NSLocalizedStringFromTable(@"room_details_access_section_anyone_for_dm", @"Vector", nil);
+                    roomAccessCell.label.text = [VectorL10n roomDetailsAccessSectionAnyoneForDm];
                 }
                 else
                 {
-                    roomAccessCell.label.text = NSLocalizedStringFromTable(@"room_details_access_section_anyone", @"Vector", nil);
+                    roomAccessCell.label.text = [VectorL10n roomDetailsAccessSectionAnyone];
                 }
                 
                 roomAccessCell.enabled = ([joinRule isEqualToString:kMXRoomJoinRulePublic] && [guestAccess isEqualToString:kMXRoomGuestAccessCanJoin]);
@@ -2571,7 +2573,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
         if (row == ROOM_SETTINGS_HISTORY_VISIBILITY_SECTION_ROW_ANYONE)
         {
             historyVisibilityCell.label.lineBreakMode = NSLineBreakByTruncatingMiddle;
-            historyVisibilityCell.label.text = NSLocalizedStringFromTable(@"room_details_history_section_anyone", @"Vector", nil);
+            historyVisibilityCell.label.text = [VectorL10n roomDetailsHistorySectionAnyone];
             
             historyVisibilityCell.enabled = ([visibility isEqualToString:kMXRoomHistoryVisibilityWorldReadable]);
             
@@ -2580,7 +2582,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
         else if (row == ROOM_SETTINGS_HISTORY_VISIBILITY_SECTION_ROW_MEMBERS_ONLY)
         {
             historyVisibilityCell.label.lineBreakMode = NSLineBreakByTruncatingMiddle;
-            historyVisibilityCell.label.text = NSLocalizedStringFromTable(@"room_details_history_section_members_only", @"Vector", nil);
+            historyVisibilityCell.label.text = [VectorL10n roomDetailsHistorySectionMembersOnly];
             
             historyVisibilityCell.enabled = ([visibility isEqualToString:kMXRoomHistoryVisibilityShared]);
             
@@ -2589,7 +2591,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
         else if (row == ROOM_SETTINGS_HISTORY_VISIBILITY_SECTION_ROW_MEMBERS_ONLY_SINCE_INVITED)
         {
             historyVisibilityCell.label.lineBreakMode = NSLineBreakByTruncatingMiddle;
-            historyVisibilityCell.label.text = NSLocalizedStringFromTable(@"room_details_history_section_members_only_since_invited", @"Vector", nil);
+            historyVisibilityCell.label.text = [VectorL10n roomDetailsHistorySectionMembersOnlySinceInvited];
             
             historyVisibilityCell.enabled = ([visibility isEqualToString:kMXRoomHistoryVisibilityInvited]);
             
@@ -2598,7 +2600,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
         else if (row == ROOM_SETTINGS_HISTORY_VISIBILITY_SECTION_ROW_MEMBERS_ONLY_SINCE_JOINED)
         {
             historyVisibilityCell.label.lineBreakMode = NSLineBreakByTruncatingMiddle;
-            historyVisibilityCell.label.text = NSLocalizedStringFromTable(@"room_details_history_section_members_only_since_joined", @"Vector", nil);
+            historyVisibilityCell.label.text = [VectorL10n roomDetailsHistorySectionMembersOnlySinceJoined];
             
             historyVisibilityCell.enabled = ([visibility isEqualToString:kMXRoomHistoryVisibilityJoined]);
             
@@ -2630,7 +2632,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
             addAddressCell.accessoryView = [[UIImageView alloc] initWithImage:[[UIImage imageNamed:@"plus_icon"] vc_tintedImageUsingColor:ThemeService.shared.theme.textPrimaryColor]];
             
             addAddressTextField = addAddressCell.mxkTextField;
-            addAddressTextField.placeholder = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_details_new_address_placeholder", @"Vector", nil), self.mainSession.matrixRestClient.homeserverSuffix];
+            addAddressTextField.placeholder = [VectorL10n roomDetailsNewAddressPlaceholder:self.mainSession.matrixRestClient.homeserverSuffix];
             addAddressTextField.attributedPlaceholder = [[NSAttributedString alloc]
                                                          initWithString:addAddressTextField.placeholder
                                                          attributes:@{NSForegroundColorAttributeName: ThemeService.shared.theme.placeholderTextColor}];
@@ -2661,11 +2663,11 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
             addressCell.selectionStyle = UITableViewCellSelectionStyleNone;
             if (mxRoom.isDirect)
             {
-                addressCell.textLabel.text = NSLocalizedStringFromTable(@"room_details_no_local_addresses_for_dm", @"Vector", nil);
+                addressCell.textLabel.text = [VectorL10n roomDetailsNoLocalAddressesForDm];
             }
             else
             {
-                addressCell.textLabel.text = NSLocalizedStringFromTable(@"room_details_no_local_addresses", @"Vector", nil);
+                addressCell.textLabel.text = [VectorL10n roomDetailsNoLocalAddresses];
             }
             
             cell = addressCell;
@@ -2731,7 +2733,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
             addCommunityCell.accessoryView = [[UIImageView alloc] initWithImage:[[UIImage imageNamed:@"plus_icon"] vc_tintedImageUsingColor:ThemeService.shared.theme.textPrimaryColor]];
 
             addGroupTextField = addCommunityCell.mxkTextField;
-            addGroupTextField.placeholder = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_details_new_flair_placeholder", @"Vector", nil), self.mainSession.matrixRestClient.homeserverSuffix];
+            addGroupTextField.placeholder = [VectorL10n roomDetailsNewFlairPlaceholder:self.mainSession.matrixRestClient.homeserverSuffix];
             addGroupTextField.attributedPlaceholder = [[NSAttributedString alloc]
                                                        initWithString:addGroupTextField.placeholder
                                                        attributes:@{NSForegroundColorAttributeName: ThemeService.shared.theme.placeholderTextColor}];
@@ -2798,11 +2800,11 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
             cell.textLabel.font = [UIFont systemFontOfSize:17];
             if (mxRoom.isDirect)
             {
-                cell.textLabel.text = NSLocalizedStringFromTable(@"room_details_advanced_room_id_for_dm", @"Vector", nil);
+                cell.textLabel.text = [VectorL10n roomDetailsAdvancedRoomIdForDm];
             }
             else
             {
-                cell.textLabel.text = NSLocalizedStringFromTable(@"room_details_advanced_room_id", @"Vector", nil);
+                cell.textLabel.text = [VectorL10n roomDetailsAdvancedRoomId];
             }
             cell.textLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
             
@@ -2820,7 +2822,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
             [roomBlacklistUnverifiedDevicesCell.mxkSwitch addTarget:self action:@selector(toggleBlacklistUnverifiedDevice:) forControlEvents:UIControlEventValueChanged];
             roomBlacklistUnverifiedDevicesCell.mxkSwitch.onTintColor = ThemeService.shared.theme.tintColor;
             
-            roomBlacklistUnverifiedDevicesCell.mxkLabel.text = NSLocalizedStringFromTable(@"room_details_advanced_e2e_encryption_blacklist_unverified_devices", @"Vector", nil);
+            roomBlacklistUnverifiedDevicesCell.mxkLabel.text = [VectorL10n roomDetailsAdvancedE2eEncryptionBlacklistUnverifiedDevices];
             
             // For the switch value, use by order:
             // - the MXCrypto.globalBlacklistUnverifiedDevices if its value is YES
@@ -2866,11 +2868,11 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
             cell.textLabel.numberOfLines = 0;
             if (mxRoom.isDirect)
             {
-                cell.textLabel.text = NSLocalizedStringFromTable(@"room_details_advanced_e2e_encryption_enabled_for_dm", @"Vector", nil);
+                cell.textLabel.text = [VectorL10n roomDetailsAdvancedE2eEncryptionEnabledForDm];
             }
             else
             {
-                cell.textLabel.text = NSLocalizedStringFromTable(@"room_details_advanced_e2e_encryption_enabled", @"Vector", nil);
+                cell.textLabel.text = [VectorL10n roomDetailsAdvancedE2eEncryptionEnabled];
             }
             cell.textLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
             
@@ -2882,7 +2884,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
             
             [roomEncryptionCell.mxkSwitch addTarget:self action:@selector(toggleEncryption:) forControlEvents:UIControlEventValueChanged];
             
-            roomEncryptionCell.mxkLabel.text = NSLocalizedStringFromTable(@"room_details_advanced_enable_e2e_encryption", @"Vector", nil);
+            roomEncryptionCell.mxkLabel.text = [VectorL10n roomDetailsAdvancedEnableE2eEncryption];
             
             roomEncryptionCell.mxkSwitch.on = (updatedItemsDict[kRoomSettingsEncryptionKey] != nil);
             
@@ -2900,11 +2902,11 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
             cell.textLabel.numberOfLines = 0;
             if (mxRoom.isDirect)
             {
-                cell.textLabel.text = NSLocalizedStringFromTable(@"room_details_advanced_e2e_encryption_disabled_for_dm", @"Vector", nil);
+                cell.textLabel.text = [VectorL10n roomDetailsAdvancedE2eEncryptionDisabledForDm];
             }
             else
             {
-                cell.textLabel.text = NSLocalizedStringFromTable(@"room_details_advanced_e2e_encryption_disabled", @"Vector", nil);
+                cell.textLabel.text = [VectorL10n roomDetailsAdvancedE2eEncryptionDisabled];
             }
             cell.textLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
             
@@ -3303,9 +3305,11 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
     
     __weak typeof(self) weakSelf = self;
     
-    currentAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"room_details_history_section_prompt_title", @"Vector", nil) message:NSLocalizedStringFromTable(@"room_details_history_section_prompt_msg", @"Vector", nil) preferredStyle:UIAlertControllerStyleAlert];
+    currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n roomDetailsHistorySectionPromptTitle]
+                                                       message:[VectorL10n roomDetailsHistorySectionPromptMsg]
+                                                preferredStyle:UIAlertControllerStyleAlert];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                      style:UIAlertActionStyleCancel
                                                    handler:^(UIAlertAction * action) {
                                                        
@@ -3317,7 +3321,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
                                                        
                                                    }]];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"continue"]
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n continue]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
                                                        
@@ -3389,9 +3393,11 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
     
     __weak typeof(self) weakSelf = self;
     
-    currentAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"room_details_addresses_disable_main_address_prompt_title", @"Vector", nil) message:NSLocalizedStringFromTable(@"room_details_addresses_disable_main_address_prompt_msg", @"Vector", nil) preferredStyle:UIAlertControllerStyleAlert];
+    currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n roomDetailsAddressesDisableMainAddressPromptTitle]
+                                                       message:[VectorL10n roomDetailsAddressesDisableMainAddressPromptMsg]
+                                                preferredStyle:UIAlertControllerStyleAlert];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                      style:UIAlertActionStyleCancel
                                                    handler:^(UIAlertAction * action) {
                                                        
@@ -3403,7 +3409,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
                                                        
                                                    }]];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"continue"]
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n continue]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
                                                        
@@ -3457,20 +3463,20 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
     NSString *title, *message;
     if ([self.mainSession roomWithRoomId:self.roomId].isDirect)
     {
-        title = NSLocalizedStringFromTable(@"room_participants_leave_prompt_title_for_dm", @"Vector", nil);
-        message = NSLocalizedStringFromTable(@"room_participants_leave_prompt_msg_for_dm", @"Vector", nil);
+        title = [VectorL10n roomParticipantsLeavePromptTitleForDm];
+        message = [VectorL10n roomParticipantsLeavePromptMsgForDm];
     }
     else
     {
-        title = NSLocalizedStringFromTable(@"room_participants_leave_prompt_title", @"Vector", nil);
-        message = NSLocalizedStringFromTable(@"room_participants_leave_prompt_msg", @"Vector", nil);
+        title = [VectorL10n roomParticipantsLeavePromptTitle];
+        message = [VectorL10n roomParticipantsLeavePromptMsg];
     }
     
     currentAlert = [UIAlertController alertControllerWithTitle:title
                                                        message:message
                                                 preferredStyle:UIAlertControllerStyleAlert];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                      style:UIAlertActionStyleCancel
                                                    handler:^(UIAlertAction * action) {
                                                        
@@ -3482,7 +3488,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
                                                        
                                                    }]];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"leave", @"Vector", nil)
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n leave]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
                                                        
@@ -3848,13 +3854,13 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
     
     [currentAlert dismissViewControllerAnimated:NO completion:nil];
     
-    NSString *alertMsg = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_details_addresses_invalid_address_prompt_msg", @"Vector", nil), roomAlias];
+    NSString *alertMsg = [VectorL10n roomDetailsAddressesInvalidAddressPromptMsg:roomAlias];
     
-    currentAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"room_details_addresses_invalid_address_prompt_title", @"Vector", nil)
+    currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n roomDetailsAddressesInvalidAddressPromptTitle]
                                                        message:alertMsg
                                                 preferredStyle:UIAlertControllerStyleAlert];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
                                                        
@@ -3913,13 +3919,13 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
     
     [currentAlert dismissViewControllerAnimated:NO completion:nil];
     
-    NSString *alertMsg = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_details_flair_invalid_id_prompt_msg", @"Vector", nil), groupId];
+    NSString *alertMsg = [VectorL10n roomDetailsFlairInvalidIdPromptMsg:groupId];
     
-    currentAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"room_details_flair_invalid_id_prompt_title", @"Vector", nil)
+    currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n roomDetailsFlairInvalidIdPromptTitle]
                                                        message:alertMsg
                                                 preferredStyle:UIAlertControllerStyleAlert];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
                                                        
diff --git a/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m b/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m
index 1f65678ad..6c272a6d9 100644
--- a/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m
+++ b/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m
@@ -121,7 +121,7 @@
     
     [self.resendButton.layer setCornerRadius:5];
     self.resendButton.clipsToBounds = YES;
-    [self.resendButton setTitle:NSLocalizedStringFromTable(@"retry", @"Vector", nil) forState:UIControlStateNormal];
+    [self.resendButton setTitle:[VectorL10n retry] forState:UIControlStateNormal];
     self.resendButton.backgroundColor = ThemeService.shared.theme.tintColor;
     
     UIImage *image = [[UIImage imageNamed:@"room_context_menu_delete"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
@@ -214,37 +214,32 @@
 
     if (!onOngoingConferenceCallClosePressed)
     {
-        onGoingConferenceCall = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_ongoing_conference_call", @"Vector", nil),
-                                 NSLocalizedStringFromTable(@"voice", @"Vector", nil),
-                                 NSLocalizedStringFromTable(@"video", @"Vector", nil)];
+        onGoingConferenceCall = [VectorL10n roomOngoingConferenceCall:[VectorL10n voice] :[VectorL10n video]];
     }
     else
     {
         // Display the banner with a "Close it" string
         objc_setAssociatedObject(self.messageTextView, "onOngoingConferenceCallClosePressed", [onOngoingConferenceCallClosePressed copy], OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-
-        onGoingConferenceCall = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_ongoing_conference_call_with_close", @"Vector", nil),
-                                 NSLocalizedStringFromTable(@"voice", @"Vector", nil),
-                                 NSLocalizedStringFromTable(@"video", @"Vector", nil),
-                                 NSLocalizedStringFromTable(@"room_ongoing_conference_call_close", @"Vector", nil)];
+        
+        onGoingConferenceCall = [VectorL10n roomOngoingConferenceCallWithClose:[VectorL10n voice] :[VectorL10n video] :[VectorL10n roomOngoingConferenceCallClose]];
     }
 
     NSMutableAttributedString *onGoingConferenceCallAttibutedString = [[NSMutableAttributedString alloc] initWithString:onGoingConferenceCall];
 
     // Add a link on the "voice" string
-    NSRange voiceRange = [onGoingConferenceCall rangeOfString:NSLocalizedStringFromTable(@"voice", @"Vector", nil)];
+    NSRange voiceRange = [onGoingConferenceCall rangeOfString:[VectorL10n voice]];
     [onGoingConferenceCallAttibutedString addAttribute:NSUnderlineStyleAttributeName value:@(NSUnderlineStyleSingle) range:voiceRange];
     [onGoingConferenceCallAttibutedString addAttribute:NSLinkAttributeName value:@"onOngoingConferenceCallWithVoicePressed" range:voiceRange];
 
     // Add a link on the "video" string
-    NSRange videoRange = [onGoingConferenceCall rangeOfString:NSLocalizedStringFromTable(@"video", @"Vector", nil)];
+    NSRange videoRange = [onGoingConferenceCall rangeOfString:[VectorL10n video]];
     [onGoingConferenceCallAttibutedString addAttribute:NSUnderlineStyleAttributeName value:@(NSUnderlineStyleSingle) range:videoRange];
     [onGoingConferenceCallAttibutedString addAttribute:NSLinkAttributeName value:@"onOngoingConferenceCallWithVideoPressed" range:videoRange];
 
     // Add a link on the "Close" string
     if (onOngoingConferenceCallClosePressed)
     {
-        NSRange closeRange = [onGoingConferenceCall rangeOfString:NSLocalizedStringFromTable(@"room_ongoing_conference_call_close", @"Vector", nil)];
+        NSRange closeRange = [onGoingConferenceCall rangeOfString:[VectorL10n roomOngoingConferenceCallClose]];
         [onGoingConferenceCallAttibutedString addAttribute:NSUnderlineStyleAttributeName value:@(NSUnderlineStyleSingle) range:closeRange];
         [onGoingConferenceCallAttibutedString addAttribute:NSLinkAttributeName value:@"onOngoingConferenceCallClosePressed" range:closeRange];
     }
@@ -290,11 +285,11 @@
         
         NSMutableAttributedString *roomReplacementAttributedString = [NSMutableAttributedString new];
         
-        NSString *roomReplacementReasonString = [NSString stringWithFormat:@"%@\n", NSLocalizedStringFromTable(@"room_replacement_information", @"Vector", nil)];
+        NSString *roomReplacementReasonString = [NSString stringWithFormat:@"%@\n", [VectorL10n roomReplacementInformation]];
         
         NSAttributedString *roomReplacementReasonAttributedString = [[NSAttributedString alloc] initWithString:roomReplacementReasonString attributes:roomReplacementReasonAttributes];
         
-        NSString *roomLinkString = NSLocalizedStringFromTable(@"room_replacement_link", @"Vector", nil);
+                                                 NSString *roomLinkString = [VectorL10n roomReplacementLink];
         NSAttributedString *roomLinkAttributedString = [[NSAttributedString alloc] initWithString:roomLinkString attributes:roomLinkAttributes];
         
         [roomReplacementAttributedString appendAttributedString:roomReplacementReasonAttributedString];
@@ -307,7 +302,7 @@
     }
     else
     {
-        self.messageTextView.text = NSLocalizedStringFromTable(@"room_replacement_information", @"Vector", nil);
+        self.messageTextView.text = [VectorL10n roomReplacementInformation];
     }
     
     self.messageTextView.tintColor = ThemeService.shared.theme.textPrimaryColor;
@@ -357,29 +352,29 @@
         // Reuse MatrixKit as is for the beginning of hardLimit
         if ([limitType isEqualToString:kMXErrorResourceLimitExceededLimitTypeMonthlyActiveUserValue])
         {
-            [message appendString:[NSBundle mxk_localizedStringForKey:@"login_error_resource_limit_exceeded_message_monthly_active_user"]];
+            [message appendString:[MatrixKitL10n loginErrorResourceLimitExceededMessageMonthlyActiveUser]];
         }
         else
         {
-            [message appendString:[NSBundle mxk_localizedStringForKey:@"login_error_resource_limit_exceeded_message_default"]];
+            [message appendString:[MatrixKitL10n loginErrorResourceLimitExceededMessageDefault]];
         }
     }
     else
     {
         if ([limitType isEqualToString:kMXErrorResourceLimitExceededLimitTypeMonthlyActiveUserValue])
         {
-            [message appendString:NSLocalizedStringFromTable(@"room_resource_usage_limit_reached_message_1_monthly_active_user", @"Vector", nil)];
+            [message appendString:[VectorL10n roomResourceUsageLimitReachedMessage1MonthlyActiveUser]];
         }
         else
         {
-            [message appendString:NSLocalizedStringFromTable(@"room_resource_usage_limit_reached_message_1_default", @"Vector", nil)];
+            [message appendString:[VectorL10n roomResourceUsageLimitReachedMessage1Default]];
         }
-
-        message2 = [[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"room_resource_usage_limit_reached_message_2", @"Vector", nil)
+        
+        message2 = [[NSAttributedString alloc] initWithString:[VectorL10n roomResourceUsageLimitReachedMessage2]
                                                    attributes:@{
-                                                                NSFontAttributeName: [UIFont boldSystemFontOfSize:fontSize],
-                                                                NSForegroundColorAttributeName: ThemeService.shared.theme.backgroundColor
-                                                                }];
+                                                       NSFontAttributeName: [UIFont boldSystemFontOfSize:fontSize],
+                                                       NSForegroundColorAttributeName: ThemeService.shared.theme.backgroundColor
+                                                   }];
     }
 
     NSDictionary *attributes = @{
@@ -406,16 +401,16 @@
         messageContact2LinkAttributes = attributes;
     }
 
-    NSAttributedString *messageContact1 = [[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"room_resource_limit_exceeded_message_contact_1", @"Vector", nil) attributes:attributes];
-    NSAttributedString *messageContact2Link =  [[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"room_resource_limit_exceeded_message_contact_2_link", @"Vector", nil) attributes:messageContact2LinkAttributes];
+    NSAttributedString *messageContact1 = [[NSAttributedString alloc] initWithString:[VectorL10n roomResourceLimitExceededMessageContact1] attributes:attributes];
+    NSAttributedString *messageContact2Link =  [[NSAttributedString alloc] initWithString:[VectorL10n roomResourceLimitExceededMessageContact2Link] attributes:messageContact2LinkAttributes];
     NSAttributedString *messageContact3;
     if (hardLimit)
     {
-        messageContact3 = [[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"room_resource_limit_exceeded_message_contact_3", @"Vector", nil) attributes:attributes];
+        messageContact3 = [[NSAttributedString alloc] initWithString:[VectorL10n roomResourceLimitExceededMessageContact3] attributes:attributes];
     }
     else
     {
-        messageContact3 = [[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"room_resource_usage_limit_reached_message_contact_3", @"Vector", nil) attributes:attributes];
+        messageContact3 = [[NSAttributedString alloc] initWithString:[VectorL10n roomResourceUsageLimitReachedMessageContact3] attributes:attributes];
     }
 
     NSMutableAttributedString *attributedText = [[NSMutableAttributedString alloc] initWithString:message attributes:attributes];
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomMembershipExpandedBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomMembershipExpandedBubbleCell.m
index 709d7d1b5..56c0ca6c8 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomMembershipExpandedBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomMembershipExpandedBubbleCell.m
@@ -29,7 +29,7 @@ NSString *const kRoomMembershipExpandedBubbleCellTapOnCollapseButton = @"kRoomMe
 {
     [super awakeFromNib];
 
-    NSString* title = NSLocalizedStringFromTable(@"collapse", @"Vector", nil);
+    NSString* title = [VectorL10n collapse];
     [self.collapseButton setTitle:title forState:UIControlStateNormal];
     [self.collapseButton setTitle:title forState:UIControlStateHighlighted];
 }
diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
index 00d5bf2f7..a0ab6b833 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
@@ -119,7 +119,7 @@ const CGFloat kComposerContainerTrailingPadding = 12;
         [growingTextView becomeFirstResponder];
     }
 
-    self.attachMediaButton.accessibilityLabel = NSLocalizedStringFromTable(@"room_accessibility_upload", @"Vector", nil);
+    self.attachMediaButton.accessibilityLabel = [VectorL10n roomAccessibilityUpload];
     
     UIImage *image = [UIImage imageNamed:@"input_text_background"];
     image = [image resizableImageWithCapInsets:UIEdgeInsetsMake(9, 15, 10, 16)];
@@ -180,7 +180,7 @@ const CGFloat kComposerContainerTrailingPadding = 12;
         case RoomInputToolbarViewSendModeReply:
             buttonImage = [UIImage imageNamed:@"send_icon"];
             self.inputContextImageView.image = [UIImage imageNamed:@"input_reply_icon"];
-            self.inputContextLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_message_replying_to", @"Vector", nil), self.eventSenderDisplayName];
+            self.inputContextLabel.text = [VectorL10n roomMessageReplyingTo:self.eventSenderDisplayName];
 
             self.inputContextViewHeightConstraint.constant = kContextBarHeight;
             updatedHeight += kContextBarHeight;
@@ -189,7 +189,7 @@ const CGFloat kComposerContainerTrailingPadding = 12;
         case RoomInputToolbarViewSendModeEdit:
             buttonImage = [UIImage imageNamed:@"save_icon"];
             self.inputContextImageView.image = [UIImage imageNamed:@"input_edit_icon"];
-            self.inputContextLabel.text = NSLocalizedStringFromTable(@"room_message_editing", @"Vector", nil);
+            self.inputContextLabel.text = [VectorL10n roomMessageEditing];
 
             self.inputContextViewHeightConstraint.constant = kContextBarHeight;
             updatedHeight += kContextBarHeight;
@@ -249,11 +249,11 @@ const CGFloat kComposerContainerTrailingPadding = 12;
         switch (_sendMode)
         {
             case RoomInputToolbarViewSendModeReply:
-                placeholder = NSLocalizedStringFromTable(@"room_message_reply_to_short_placeholder", @"Vector", nil);
+                placeholder = [VectorL10n roomMessageReplyToShortPlaceholder];
                 break;
 
             default:
-                placeholder = NSLocalizedStringFromTable(@"room_message_short_placeholder", @"Vector", nil);
+                placeholder = [VectorL10n roomMessageShortPlaceholder];
                 break;
         }
     }
@@ -264,11 +264,11 @@ const CGFloat kComposerContainerTrailingPadding = 12;
             switch (_sendMode)
             {
                 case RoomInputToolbarViewSendModeReply:
-                    placeholder = NSLocalizedStringFromTable(@"encrypted_room_message_reply_to_placeholder", @"Vector", nil);
+                    placeholder = [VectorL10n encryptedRoomMessageReplyToPlaceholder];
                     break;
 
                 default:
-                    placeholder = NSLocalizedStringFromTable(@"encrypted_room_message_placeholder", @"Vector", nil);
+                    placeholder = [VectorL10n encryptedRoomMessagePlaceholder];
                     break;
             }
         }
@@ -277,11 +277,11 @@ const CGFloat kComposerContainerTrailingPadding = 12;
             switch (_sendMode)
             {
                 case RoomInputToolbarViewSendModeReply:
-                    placeholder = NSLocalizedStringFromTable(@"room_message_reply_to_placeholder", @"Vector", nil);
+                    placeholder = [VectorL10n roomMessageReplyToPlaceholder];
                     break;
 
                 default:
-                    placeholder = NSLocalizedStringFromTable(@"room_message_placeholder", @"Vector", nil);
+                    placeholder = [VectorL10n roomMessagePlaceholder];
                     break;
             }
         }
diff --git a/Riot/Modules/Room/Views/Title/Expanded/ExpandedRoomTitleView.m b/Riot/Modules/Room/Views/Title/Expanded/ExpandedRoomTitleView.m
index 20fa6fab5..f64f8fd6a 100644
--- a/Riot/Modules/Room/Views/Title/Expanded/ExpandedRoomTitleView.m
+++ b/Riot/Modules/Room/Views/Title/Expanded/ExpandedRoomTitleView.m
@@ -69,23 +69,23 @@
                     activeCount ++;
                 }
             }
-
+            
             if (memberCount)
             {
                 // Check whether the logged in user is alone in this room
                 if (memberCount == 1 && self.mxRoom.summary.membership == MXMembershipJoin)
                 {
-                    self.roomMembers.text = NSLocalizedStringFromTable(@"room_title_invite_members", @"Vector", nil);
+                    self.roomMembers.text = [VectorL10n roomTitleInviteMembers];
                 }
                 else
                 {
                     if (activeCount > 1)
                     {
-                        self.roomMembers.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_title_multiple_active_members", @"Vector", nil), @(activeCount), @(memberCount)];
+                        self.roomMembers.text = [VectorL10n roomTitleMultipleActiveMembers:@(activeCount).stringValue :@(memberCount).stringValue];
                     }
                     else
                     {
-                        self.roomMembers.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_title_one_active_member", @"Vector", nil), @(activeCount), @(memberCount)];
+                        self.roomMembers.text = [VectorL10n roomTitleOneActiveMember:@(activeCount).stringValue :@(memberCount).stringValue];
                     }
                 }
             }
diff --git a/Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m b/Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m
index 9ad2037e1..8aab86425 100644
--- a/Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m
+++ b/Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m
@@ -38,8 +38,8 @@
     self.previewLabel.text = nil;
     self.subNoticeLabel.text = nil;
     
-    [self.leftButton setTitle:NSLocalizedStringFromTable(@"decline", @"Vector", nil) forState:UIControlStateNormal];
-    [self.leftButton setTitle:NSLocalizedStringFromTable(@"decline", @"Vector", nil) forState:UIControlStateHighlighted];
+    [self.leftButton setTitle:[VectorL10n decline] forState:UIControlStateNormal];
+    [self.leftButton setTitle:[VectorL10n decline] forState:UIControlStateHighlighted];
     
     UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(reportTapGesture:)];
     [tap setNumberOfTouchesRequired:1];
@@ -48,8 +48,8 @@
     [self.leftButton addGestureRecognizer:tap];
     self.leftButton.userInteractionEnabled = YES;
     
-    [self.rightButton setTitle:NSLocalizedStringFromTable(@"join", @"Vector", nil) forState:UIControlStateNormal];
-    [self.rightButton setTitle:NSLocalizedStringFromTable(@"join", @"Vector", nil) forState:UIControlStateHighlighted];
+    [self.rightButton setTitle:[VectorL10n join] forState:UIControlStateNormal];
+    [self.rightButton setTitle:[VectorL10n join] forState:UIControlStateHighlighted];
     
     tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(reportTapGesture:)];
     [tap setNumberOfTouchesRequired:1];
@@ -121,11 +121,11 @@
         // Joined members count
         if (self.roomPreviewData.numJoinedMembers > 1)
         {
-            self.roomMembers.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_title_members", @"Vector", nil), @(self.roomPreviewData.numJoinedMembers)];
+            self.roomMembers.text = [VectorL10n roomTitleMembers:@(self.roomPreviewData.numJoinedMembers)];
         }
         else if (self.roomPreviewData.numJoinedMembers == 1)
         {
-            self.roomMembers.text = NSLocalizedStringFromTable(@"room_title_one_member", @"Vector", nil);
+            self.roomMembers.text = [VectorL10n roomTitleOneMember];
         }
         else
         {
@@ -136,7 +136,7 @@
         if (self.roomPreviewData.roomDataSource)
         {
             // Display the default preview subtitle in case of peeking
-            self.subNoticeLabel.text = NSLocalizedStringFromTable(@"room_preview_subtitle", @"Vector", nil);
+            self.subNoticeLabel.text = [VectorL10n roomPreviewSubtitle];
         }
         else
         {
@@ -146,10 +146,10 @@
         if (self.roomPreviewData.emailInvitation.email)
         {
             // The user has been invited to join this room by email
-            self.previewLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_preview_invitation_format", @"Vector", nil), self.roomPreviewData.emailInvitation.inviterName];
+            self.previewLabel.text = [VectorL10n roomPreviewInvitationFormat:self.roomPreviewData.emailInvitation.inviterName];
             
             // Warn the user that the email is not bound to his matrix account
-            self.subNoticeLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_preview_unlinked_email_warning", @"Vector", nil), self.roomPreviewData.emailInvitation.email];
+            self.subNoticeLabel.text = [VectorL10n roomPreviewUnlinkedEmailWarning:self.roomPreviewData.emailInvitation.email];
         }
         else
         {
@@ -157,7 +157,7 @@
             NSString *roomName = self.roomPreviewData.roomName;
             if (!roomName)
             {
-                roomName = NSLocalizedStringFromTable(@"room_preview_try_join_an_unknown_room_default", @"Vector", nil);
+                roomName = [VectorL10n roomPreviewTryJoinAnUnknownRoomDefault];
             }
             else if (roomName.length > 20)
             {
@@ -167,7 +167,7 @@
                 roomName = [NSString stringWithFormat:@"%@…",[roomName substringToIndex:20]];
             }
 
-            self.previewLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_preview_try_join_an_unknown_room", @"Vector", nil), roomName];
+            self.previewLabel.text = [VectorL10n roomPreviewTryJoinAnUnknownRoom:roomName];
         }
     }
     else if (self.mxRoom)
@@ -204,11 +204,11 @@
             //                    {
             //                        if (activeCount > 1)
             //                        {
-            //                            self.roomMembers.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_title_multiple_active_members", @"Vector", nil), @(activeCount), @(memberCount)];
+            //                            self.roomMembers.text = [VectorL10n roomTitleMultipleActiveMembers:@(activeCount).stringValue :@(memberCount).stringValue];
             //                        }
             //                        else
             //                        {
-            //                            self.roomMembers.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_title_one_active_member", @"Vector", nil), @(activeCount), @(memberCount)];
+            //                            self.roomMembers.text = [VectorL10n roomTitleOneActiveMember:@(activeCount).stringValue :@(memberCount).stringValue];
             //                        }
             //                    }
             //                    else
@@ -218,7 +218,7 @@
             //                    }
 
             NSString *displayName = [inviter isEqualToString:inviterUserId] ? inviter : [NSString stringWithFormat:@"%@ (%@)", inviter, inviterUserId];
-            self.previewLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_preview_invitation_format", @"Vector", nil), displayName];
+            self.previewLabel.text = [VectorL10n roomPreviewInvitationFormat:displayName];
         };
 
         [self.mxRoom members:^(MXRoomMembers *roomMembers) {
diff --git a/Riot/Modules/Room/Views/Title/RoomTitleView.m b/Riot/Modules/Room/Views/Title/RoomTitleView.m
index 4829578ed..6f7d38edf 100644
--- a/Riot/Modules/Room/Views/Title/RoomTitleView.m
+++ b/Riot/Modules/Room/Views/Title/RoomTitleView.m
@@ -112,7 +112,7 @@
         self.displayNameTextField.text = self.mxRoom.summary.displayname;
         if (!self.displayNameTextField.text.length)
         {
-            self.displayNameTextField.text = [NSBundle mxk_localizedStringForKey:@"room_displayname_empty_room"];
+            self.displayNameTextField.text = [MatrixKitL10n roomDisplaynameEmptyRoom];
             self.displayNameTextField.textColor = ThemeService.shared.theme.textSecondaryColor;
         }
         else
diff --git a/Riot/Modules/RoomKeyRequest/RoomKeyRequestViewController.m b/Riot/Modules/RoomKeyRequest/RoomKeyRequestViewController.m
index 40c44964a..f6141d9cf 100644
--- a/Riot/Modules/RoomKeyRequest/RoomKeyRequestViewController.m
+++ b/Riot/Modules/RoomKeyRequest/RoomKeyRequestViewController.m
@@ -49,15 +49,15 @@
     UIViewController *rootViewController = [AppDelegate theDelegate].window.rootViewController;
     if (rootViewController)
     {
-        NSString *title = NSLocalizedStringFromTable(@"e2e_room_key_request_title", @"Vector", nil);
+        NSString *title = [VectorL10n e2eRoomKeyRequestTitle];
         NSString *message;
         if (wasNewDevice)
         {
-            message = [NSString stringWithFormat:NSLocalizedStringFromTable(@"e2e_room_key_request_message_new_device", @"Vector", nil), _device.displayName];
+            message = [VectorL10n e2eRoomKeyRequestMessageNewDevice:_device.displayName];
         }
         else
         {
-            message = [NSString stringWithFormat:NSLocalizedStringFromTable(@"e2e_room_key_request_message", @"Vector", nil), _device.displayName];
+            message = [VectorL10n e2eRoomKeyRequestMessage:_device.displayName];
         }
 
         _alertController = [UIAlertController alertControllerWithTitle:title
@@ -66,7 +66,7 @@
 
         __weak typeof(self) weakSelf = self;
 
-        [_alertController addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"e2e_room_key_request_start_verification", @"Vector", nil)
+        [_alertController addAction:[UIAlertAction actionWithTitle:[VectorL10n e2eRoomKeyRequestStartVerification]
                                                              style:UIAlertActionStyleDefault
                                                            handler:^(UIAlertAction * action) {
 
@@ -79,7 +79,7 @@
                                                                }
                                                            }]];
 
-        [_alertController addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"e2e_room_key_request_share_without_verifying", @"Vector", nil)
+        [_alertController addAction:[UIAlertAction actionWithTitle:[VectorL10n e2eRoomKeyRequestShareWithoutVerifying]
                                                              style:UIAlertActionStyleDefault
                                                            handler:^(UIAlertAction * action) {
 
@@ -97,7 +97,7 @@
                                                                }
                                                            }]];
 
-        [_alertController addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"e2e_room_key_request_ignore_request", @"Vector", nil)
+        [_alertController addAction:[UIAlertAction actionWithTitle:[VectorL10n e2eRoomKeyRequestIgnoreRequest]
                                                              style:UIAlertActionStyleDefault
                                                            handler:^(UIAlertAction * action) {
 
diff --git a/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.m b/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.m
index 0ac6943b4..e31c5fb43 100644
--- a/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.m
+++ b/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.m
@@ -89,7 +89,7 @@
 {
     [super viewDidLoad];
 
-    self.title = NSLocalizedStringFromTable(@"directory_server_picker_title", @"Vector", nil);
+    self.title = [VectorL10n directoryServerPickerTitle];
 
     self.tableView.delegate = self;
 
@@ -285,16 +285,16 @@
     [currentAlert dismissViewControllerAnimated:NO completion:nil];
 
     // Prompt the user to enter a homeserver
-    currentAlert = [UIAlertController alertControllerWithTitle:nil message:NSLocalizedStringFromTable(@"directory_server_type_homeserver", @"Vector", nil) preferredStyle:UIAlertControllerStyleAlert];
+    currentAlert = [UIAlertController alertControllerWithTitle:nil message:[VectorL10n directoryServerTypeHomeserver] preferredStyle:UIAlertControllerStyleAlert];
 
     [currentAlert addTextFieldWithConfigurationHandler:^(UITextField *textField) {
 
         textField.secureTextEntry = NO;
-        textField.placeholder = NSLocalizedStringFromTable(@"directory_server_placeholder", @"Vector", nil);
+        textField.placeholder = [VectorL10n directoryServerPlaceholder];
         textField.keyboardType = UIKeyboardTypeDefault;
     }];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
                                                        
@@ -306,7 +306,7 @@
                                                        
                                                    }]];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
                                                        
diff --git a/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerDetailTableViewCell.m b/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerDetailTableViewCell.m
index dfa59ad8e..a43ee7b39 100644
--- a/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerDetailTableViewCell.m
+++ b/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerDetailTableViewCell.m
@@ -35,11 +35,11 @@
     if (cellData.includeAllNetworks)
     {
 
-        self.detailDescLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"directory_server_all_rooms", @"Vector", nil), cellData.homeserver];
+        self.detailDescLabel.text = [VectorL10n directoryServerAllRooms:cellData.homeserver];
     }
     else
     {
-        self.detailDescLabel.text = NSLocalizedStringFromTable(@"directory_server_all_native_rooms", @"Vector", nil);
+        self.detailDescLabel.text = [VectorL10n directoryServerAllNativeRooms];
     }
 }
 
diff --git a/Riot/Modules/Rooms/RoomsViewController.m b/Riot/Modules/Rooms/RoomsViewController.m
index 19a37050b..a69bbd033 100644
--- a/Riot/Modules/Rooms/RoomsViewController.m
+++ b/Riot/Modules/Rooms/RoomsViewController.m
@@ -64,7 +64,7 @@
 {
     [super viewWillAppear:animated];
     
-    [AppDelegate theDelegate].masterTabBarController.navigationItem.title = NSLocalizedStringFromTable(@"title_rooms", @"Vector", nil);
+    [AppDelegate theDelegate].masterTabBarController.navigationItem.title = [VectorL10n titleRooms];
     [AppDelegate theDelegate].masterTabBarController.tabBar.tintColor = ThemeService.shared.theme.tintColor;
     
     if ([self.dataSource isKindOfClass:RecentsDataSource.class])
@@ -128,8 +128,8 @@
 - (void)updateEmptyView
 {
     [self.emptyView fillWith:[self emptyViewArtwork]
-                       title:NSLocalizedStringFromTable(@"rooms_empty_view_title", @"Vector", nil)
-             informationText:NSLocalizedStringFromTable(@"rooms_empty_view_information", @"Vector", nil)];
+                       title:[VectorL10n roomsEmptyViewTitle]
+             informationText:[VectorL10n roomsEmptyViewInformation]];
 }
 
 - (UIImage*)emptyViewArtwork
diff --git a/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m b/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
index 0c93b1873..33284c4e9 100644
--- a/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
+++ b/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
@@ -82,7 +82,7 @@ static CGFloat const kTextFontSize = 15.0;
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     
-    self.title = NSLocalizedStringFromTable(@"deactivate_account_title", @"Vector", nil);
+    self.title = [VectorL10n deactivateAccountTitle];
 
     [self setupViews];
     
@@ -156,7 +156,7 @@ static CGFloat const kTextFontSize = 15.0;
 - (void)setupViews
 {
     // Cancel bar button
-    UIBarButtonItem *cancelBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedStringFromTable(@"cancel", @"Vector", nil) style:UIBarButtonItemStylePlain target:self action:@selector(cancelButtonAction:)];
+    UIBarButtonItem *cancelBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:[VectorL10n cancel] style:UIBarButtonItemStylePlain target:self action:@selector(cancelButtonAction:)];
     self.navigationItem.rightBarButtonItem = cancelBarButtonItem;
 
     // Deactivate button
@@ -165,7 +165,7 @@ static CGFloat const kTextFontSize = 15.0;
     self.deactivateAcccountButton.titleLabel.minimumScaleFactor = 0.5;
     self.deactivateAcccountButton.titleLabel.baselineAdjustment = UIBaselineAdjustmentAlignCenters;
     self.deactivateAcccountButton.layer.masksToBounds = YES;
-    [self.deactivateAcccountButton setTitle:NSLocalizedStringFromTable(@"deactivate_account_validate_action", @"Vector", nil) forState:UIControlStateNormal];
+    [self.deactivateAcccountButton setTitle:[VectorL10n deactivateAccountValidateAction] forState:UIControlStateNormal];
 }
 
 - (void)updateNavigationBar
@@ -183,15 +183,15 @@ static CGFloat const kTextFontSize = 15.0;
 {
     NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] init];
     
-    [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"deactivate_account_informations_part1", @"Vector", nil) attributes:self.normalStringAttributes]];
+    [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:[VectorL10n deactivateAccountInformationsPart1] attributes:self.normalStringAttributes]];
     
-    [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"deactivate_account_informations_part2_emphasize", @"Vector", nil) attributes:self.emphasizeStringAttributes]];
+    [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:[VectorL10n deactivateAccountInformationsPart2Emphasize] attributes:self.emphasizeStringAttributes]];
     
-    [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"deactivate_account_informations_part3", @"Vector", nil) attributes:self.normalStringAttributes]];
+    [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:[VectorL10n deactivateAccountInformationsPart3] attributes:self.normalStringAttributes]];
     
-    [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"deactivate_account_informations_part4_emphasize", @"Vector", nil) attributes:self.emphasizeStringAttributes]];
+    [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:[VectorL10n deactivateAccountInformationsPart4Emphasize] attributes:self.emphasizeStringAttributes]];
     
-    [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"deactivate_account_informations_part5", @"Vector", nil) attributes:self.normalStringAttributes]];
+    [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:[VectorL10n deactivateAccountInformationsPart5] attributes:self.normalStringAttributes]];
     
     [self.deactivateAccountInfosLabel setAttributedText:attributedString];
 }
@@ -200,11 +200,11 @@ static CGFloat const kTextFontSize = 15.0;
 {
     NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] init];
     
-    [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"deactivate_account_forget_messages_information_part1", @"Vector", nil) attributes:self.normalStringAttributes]];
+    [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:[VectorL10n deactivateAccountForgetMessagesInformationPart1] attributes:self.normalStringAttributes]];
     
-    [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"deactivate_account_forget_messages_information_part2_emphasize", @"Vector", nil) attributes:self.emphasizeStringAttributes]];
+    [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:[VectorL10n deactivateAccountForgetMessagesInformationPart2Emphasize] attributes:self.emphasizeStringAttributes]];
     
-    [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"deactivate_account_forget_messages_information_part3", @"Vector", nil) attributes:self.normalStringAttributes]];
+    [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:[VectorL10n deactivateAccountForgetMessagesInformationPart3] attributes:self.normalStringAttributes]];
     
     [self.forgetMessagesInfoLabel setAttributedText:attributedString];
 }
@@ -219,8 +219,8 @@ static CGFloat const kTextFontSize = 15.0;
 - (void)presentPasswordRequiredAlertWithSubmitHandler:(void (^)(NSString *password))submitHandler
                                         cancelHandler:(dispatch_block_t)cancelHandler
 {
-    UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"deactivate_account_password_alert_title", @"Vector", nil)
-                                                                   message:NSLocalizedStringFromTable(@"deactivate_account_password_alert_message", @"Vector", nil) preferredStyle:UIAlertControllerStyleAlert];
+    UIAlertController *alert = [UIAlertController alertControllerWithTitle:[VectorL10n deactivateAccountPasswordAlertTitle]
+                                                                   message:[VectorL10n deactivateAccountPasswordAlertMessage] preferredStyle:UIAlertControllerStyleAlert];
     
     [alert addTextFieldWithConfigurationHandler:^(UITextField *textField) {
         textField.secureTextEntry = YES;
@@ -228,7 +228,7 @@ static CGFloat const kTextFontSize = 15.0;
         textField.keyboardType = UIKeyboardTypeDefault;
     }];
     
-    [alert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+    [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                               style:UIAlertActionStyleCancel
                                             handler:^(UIAlertAction * action) {
                                                 if (cancelHandler)
@@ -239,7 +239,7 @@ static CGFloat const kTextFontSize = 15.0;
     
     __weak typeof(self) weakSelf = self;
     
-    [alert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"submit"]
+    [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                               style:UIAlertActionStyleDefault
                                             handler:^(UIAlertAction * action) {
                                                 UITextField *textField = alert.textFields.firstObject;
diff --git a/Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m b/Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m
index fd2b37f36..b38d68892 100644
--- a/Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m
+++ b/Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m
@@ -96,7 +96,7 @@ enum {
     [super viewDidLoad];
     // Do any additional setup after loading the view, typically from a nib.
     
-    self.navigationItem.title = NSLocalizedStringFromTable(@"manage_session_title", @"Vector", nil);
+    self.navigationItem.title = [VectorL10n manageSessionTitle];
     
     // Remove back bar button title when pushing a view controller
     self.navigationItem.backBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:nil];
@@ -387,12 +387,12 @@ enum {
 
     if (deviceInfo.trustLevel.isVerified)
     {
-        cell.textLabel.text = NSLocalizedStringFromTable(@"manage_session_trusted", @"Vector", nil);
+        cell.textLabel.text = [VectorL10n manageSessionTrusted];
         cell.imageView.image = [UIImage imageNamed:@"encryption_trusted"];
     }
     else
     {
-        cell.textLabel.text = NSLocalizedStringFromTable(@"manage_session_not_trusted", @"Vector", nil);
+        cell.textLabel.text = [VectorL10n manageSessionNotTrusted];
         cell.imageView.image = [UIImage imageNamed:@"encryption_warning"];
     }
 
@@ -444,7 +444,7 @@ enum {
             {
                 MXKTableViewCellWithLabelAndTextField *displaynameCell = [self getLabelAndTextFieldCell:tableView forIndexPath:indexPath];
                 
-                displaynameCell.mxkLabel.text = NSLocalizedStringFromTable(@"manage_session_name", @"Vector", nil);
+                displaynameCell.mxkLabel.text = [VectorL10n manageSessionName];
                 displaynameCell.mxkTextField.text = device.displayName;
                 displaynameCell.mxkTextField.userInteractionEnabled = NO;
                 displaynameCell.selectionStyle = UITableViewCellSelectionStyleDefault;
@@ -477,7 +477,7 @@ enum {
                     removeSessionBtnCell.mxkButton.titleLabel.text = nil;
                 }
                 
-                NSString *btnTitle = NSLocalizedStringFromTable(@"manage_session_sign_out", @"Vector", nil);
+                NSString *btnTitle = [VectorL10n manageSessionSignOut];
                 [removeSessionBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateNormal];
                 [removeSessionBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateHighlighted];
                 [removeSessionBtnCell.mxkButton setTintColor:ThemeService.shared.theme.warningColor];
@@ -501,7 +501,7 @@ enum {
     switch (section)
     {
         case SECTION_SESSION_INFO:
-            return NSLocalizedStringFromTable(@"manage_session_info", @"Vector", nil);
+            return [VectorL10n manageSessionInfo];
         case SECTION_ACTION:
             return @"";
 
@@ -612,8 +612,9 @@ enum {
     [currentAlert dismissViewControllerAnimated:NO completion:nil];
     
     MXWeakify(self);
-    currentAlert = [UIAlertController alertControllerWithTitle:[NSBundle mxk_localizedStringForKey:@"device_details_rename_prompt_title"]
-                                                       message:[NSBundle mxk_localizedStringForKey:@"device_details_rename_prompt_message"] preferredStyle:UIAlertControllerStyleAlert];
+    currentAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n deviceDetailsRenamePromptTitle]
+                                                       message:[MatrixKitL10n deviceDetailsRenamePromptMessage]
+                                                preferredStyle:UIAlertControllerStyleAlert];
     
     [currentAlert addTextFieldWithConfigurationHandler:^(UITextField *textField) {
         MXStrongifyAndReturnIfNil(self);
@@ -623,7 +624,7 @@ enum {
         textField.text = self->device.displayName;
     }];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action)
                              {
@@ -631,7 +632,7 @@ enum {
                                  self->currentAlert = nil;
                              }]];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action)
                              {
@@ -691,8 +692,8 @@ enum {
         self.reauthenticationCoordinatorBridgePresenter = nil;
     };
     
-    NSString *title = [NSBundle mxk_localizedStringForKey:@"device_details_delete_prompt_title"];
-    NSString *message = [NSBundle mxk_localizedStringForKey:@"device_details_delete_prompt_message"];
+    NSString *title = [MatrixKitL10n deviceDetailsDeletePromptTitle];
+    NSString *message = [MatrixKitL10n deviceDetailsDeletePromptMessage];
     
     AuthenticatedEndpointRequest *deleteDeviceRequest = [[AuthenticatedEndpointRequest alloc] initWithPath:[NSString stringWithFormat:@"%@/devices/%@", kMXAPIPrefixPathR0, [MXTools encodeURIComponent:device.deviceId]] httpMethod:@"DELETE"];
     
diff --git a/Riot/Modules/Settings/Security/SecurityViewController.m b/Riot/Modules/Settings/Security/SecurityViewController.m
index b09aec119..c77a2f23b 100644
--- a/Riot/Modules/Settings/Security/SecurityViewController.m
+++ b/Riot/Modules/Settings/Security/SecurityViewController.m
@@ -153,7 +153,7 @@ TableViewSectionsDelegate>
     [super viewDidLoad];
     // Do any additional setup after loading the view, typically from a nib.
     
-    self.navigationItem.title = NSLocalizedStringFromTable(@"security_settings_title", @"Vector", nil);
+    self.navigationItem.title = [VectorL10n securitySettingsTitle];
     
     // Remove back bar button title when pushing a view controller
     self.navigationItem.backBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:nil];
@@ -294,11 +294,9 @@ TableViewSectionsDelegate>
     // Header title
     if ([PinCodePreferences shared].isBiometricsAvailable)
     {
-        NSString *pinCodeSectionHeaderTitleFormat = NSLocalizedStringFromTable(@"pin_protection_settings_section_header_with_biometrics", @"Vector", nil);
-        NSString *pinCodeSectionHeaderTitle = [NSString stringWithFormat:pinCodeSectionHeaderTitleFormat, [PinCodePreferences shared].localizedBiometricsName];
-        pinCodeSection.headerTitle = pinCodeSectionHeaderTitle;
+        pinCodeSection.headerTitle = [VectorL10n pinProtectionSettingsSectionHeaderWithBiometrics:[PinCodePreferences shared].localizedBiometricsName];
     } else {
-        pinCodeSection.headerTitle = NSLocalizedStringFromTable(@"pin_protection_settings_section_header", @"Vector", nil);;
+        pinCodeSection.headerTitle = [VectorL10n pinProtectionSettingsSectionHeader];
     }
     
     // Rows
@@ -323,7 +321,7 @@ TableViewSectionsDelegate>
     {
         Section *sessionsSection = [Section sectionWithTag:SECTION_CRYPTO_SESSIONS];
         
-        sessionsSection.headerTitle = NSLocalizedStringFromTable(@"security_settings_crypto_sessions", @"Vector", nil);
+        sessionsSection.headerTitle = [VectorL10n securitySettingsCryptoSessions];
             
         NSUInteger sessionsSectionRowsCount;
         
@@ -344,7 +342,7 @@ TableViewSectionsDelegate>
     // Secure backup
     
     Section *secureBackupSection = [Section sectionWithTag:SECTION_SECURE_BACKUP];
-    secureBackupSection.headerTitle = NSLocalizedStringFromTable(@"security_settings_secure_backup", @"Vector", nil);
+    secureBackupSection.headerTitle = [VectorL10n securitySettingsSecureBackup];
     
     [secureBackupSection addRowsWithCount:self->secureBackupSection.numberOfRows];
     
@@ -353,7 +351,7 @@ TableViewSectionsDelegate>
     // Cross-Signing
     
     Section *crossSigningSection = [Section sectionWithTag:SECTION_CROSSSIGNING];
-    crossSigningSection.headerTitle = NSLocalizedStringFromTable(@"security_settings_crosssigning", @"Vector", nil);
+    crossSigningSection.headerTitle = [VectorL10n securitySettingsCrosssigning];
     
     [crossSigningSection addRowsWithCount:[self numberOfRowsInCrossSigningSection]];
     
@@ -362,7 +360,7 @@ TableViewSectionsDelegate>
     // Cryptograhpy
     
     Section *cryptograhpySection = [Section sectionWithTag:SECTION_CRYPTOGRAPHY];
-    cryptograhpySection.headerTitle = NSLocalizedStringFromTable(@"security_settings_cryptography", @"Vector", nil);
+    cryptograhpySection.headerTitle = [VectorL10n securitySettingsCryptography];
     
     if (RiotSettings.shared.settingsSecurityScreenShowCryptographyInfo)
     {
@@ -384,7 +382,7 @@ TableViewSectionsDelegate>
     // Keybackup
     
     Section *keybackupSection = [Section sectionWithTag:SECTION_KEYBACKUP];
-    keybackupSection.headerTitle = NSLocalizedStringFromTable(@"security_settings_backup", @"Vector", nil);
+    keybackupSection.headerTitle = [VectorL10n securitySettingsBackup];
     
     [keybackupSection addRowsWithCount:self->keyBackupSection.numberOfRows];
     
@@ -395,7 +393,7 @@ TableViewSectionsDelegate>
     // Advanced
     
     Section *advancedSection = [Section sectionWithTag:SECTION_ADVANCED];
-    advancedSection.headerTitle = NSLocalizedStringFromTable(@"security_settings_advanced", @"Vector", nil);
+    advancedSection.headerTitle = [VectorL10n securitySettingsAdvanced];
     
     if (RiotSettings.shared.settingsSecurityScreenShowAdvancedUnverifiedDevices)
     {
@@ -479,7 +477,7 @@ TableViewSectionsDelegate>
 
     // Crypto information
     NSMutableAttributedString *cryptoInformationString = [[NSMutableAttributedString alloc]
-                                                          initWithString:NSLocalizedStringFromTable(@"settings_crypto_device_name", @"Vector", nil)
+                                                          initWithString:[VectorL10n settingsCryptoDeviceName]
                                                           attributes:@{NSForegroundColorAttributeName : ThemeService.shared.theme.textPrimaryColor,
                                                                        NSFontAttributeName: [UIFont systemFontOfSize:17]}];
     [cryptoInformationString appendAttributedString:[[NSMutableAttributedString alloc]
@@ -488,7 +486,7 @@ TableViewSectionsDelegate>
                                                                   NSFontAttributeName: [UIFont systemFontOfSize:17]}]];
 
     [cryptoInformationString appendAttributedString:[[NSMutableAttributedString alloc]
-                                                     initWithString:NSLocalizedStringFromTable(@"settings_crypto_device_id", @"Vector", nil)
+                                                     initWithString:[VectorL10n settingsCryptoDeviceId]
                                                      attributes:@{NSForegroundColorAttributeName : ThemeService.shared.theme.textPrimaryColor,
                                                                   NSFontAttributeName: [UIFont systemFontOfSize:17]}]];
     [cryptoInformationString appendAttributedString:[[NSMutableAttributedString alloc]
@@ -497,7 +495,7 @@ TableViewSectionsDelegate>
                                                                   NSFontAttributeName: [UIFont systemFontOfSize:17]}]];
 
     [cryptoInformationString appendAttributedString:[[NSMutableAttributedString alloc]
-                                                     initWithString:NSLocalizedStringFromTable(@"settings_crypto_device_key", @"Vector", nil)
+                                                     initWithString:[VectorL10n settingsCryptoDeviceKey]
                                                      attributes:@{NSForegroundColorAttributeName : ThemeService.shared.theme.textPrimaryColor,
                                                                   NSFontAttributeName: [UIFont systemFontOfSize:17]}]];
     NSString *fingerprint = account.mxSession.crypto.deviceEd25519Key;
@@ -669,16 +667,16 @@ TableViewSectionsDelegate>
     switch (crossSigning.state)
     {
         case MXCrossSigningStateNotBootstrapped:
-            crossSigningInformation = [NSBundle mxk_localizedStringForKey:@"security_settings_crosssigning_info_not_bootstrapped"];
+            crossSigningInformation = [VectorL10n securitySettingsCrosssigningInfoNotBootstrapped];
             break;
         case MXCrossSigningStateCrossSigningExists:
-            crossSigningInformation = [NSBundle mxk_localizedStringForKey:@"security_settings_crosssigning_info_exists"];
+            crossSigningInformation = [VectorL10n securitySettingsCrosssigningInfoExists];
             break;
         case MXCrossSigningStateTrustCrossSigning:
-            crossSigningInformation = [NSBundle mxk_localizedStringForKey:@"security_settings_crosssigning_info_trusted"];
+            crossSigningInformation = [VectorL10n securitySettingsCrosssigningInfoTrusted];
             break;
         case MXCrossSigningStateCanCrossSign:
-            crossSigningInformation = [NSBundle mxk_localizedStringForKey:@"security_settings_crosssigning_info_ok"];
+            crossSigningInformation = [VectorL10n securitySettingsCrosssigningInfoOk];
             
             if (![self.mainSession.crypto.recoveryService hasSecretLocally:MXSecretId.crossSigningMaster])
             {
@@ -749,7 +747,7 @@ TableViewSectionsDelegate>
 
 - (void)setUpcrossSigningButtonCellForBootstrap:(MXKTableViewCellWithButton*)buttonCell
 {
-    NSString *btnTitle = [NSBundle mxk_localizedStringForKey:@"security_settings_crosssigning_bootstrap"];
+    NSString *btnTitle = [VectorL10n securitySettingsCrosssigningBootstrap];
     [buttonCell.mxkButton setTitle:btnTitle forState:UIControlStateNormal];
     [buttonCell.mxkButton setTitle:btnTitle forState:UIControlStateHighlighted];
  
@@ -759,7 +757,7 @@ TableViewSectionsDelegate>
 - (void)setupCrossSigning:(id)sender
 {
     [self setupCrossSigningWithTitle:@"Set up cross-signing"    // TODO
-                             message:NSLocalizedStringFromTable(@"security_settings_user_password_description", @"Vector", nil)
+                             message:[VectorL10n securitySettingsUserPasswordDescription]
                              success:^{
                              } failure:^(NSError *error) {
                              }];
@@ -823,7 +821,7 @@ TableViewSectionsDelegate>
                                     [self setupCrossSigning:nil];
                                 }]];
     
-    [alertController addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+    [alertController addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                                 style:UIAlertActionStyleCancel
                                                               handler:nil]];
     
@@ -833,7 +831,7 @@ TableViewSectionsDelegate>
 
 - (void)setUpcrossSigningButtonCellForReset:(MXKTableViewCellWithButton*)buttonCell
 {
-    NSString *btnTitle = [NSBundle mxk_localizedStringForKey:@"security_settings_crosssigning_reset"];
+    NSString *btnTitle = [VectorL10n securitySettingsCrosssigningReset];
     [buttonCell.mxkButton setTitle:btnTitle forState:UIControlStateNormal];
     [buttonCell.mxkButton setTitle:btnTitle forState:UIControlStateHighlighted];
     
@@ -844,7 +842,7 @@ TableViewSectionsDelegate>
 
 - (void)setUpcrossSigningButtonCellForCompletingSecurity:(MXKTableViewCellWithButton*)buttonCell
 {
-    NSString *btnTitle = [NSBundle mxk_localizedStringForKey:@"security_settings_crosssigning_complete_security"];
+    NSString *btnTitle = [VectorL10n securitySettingsCrosssigningCompleteSecurity];
     [buttonCell.mxkButton setTitle:btnTitle forState:UIControlStateNormal];
     [buttonCell.mxkButton setTitle:btnTitle forState:UIControlStateHighlighted];
     
@@ -984,8 +982,8 @@ TableViewSectionsDelegate>
     else
     {
         // Set up cross-signing first
-        [self setupCrossSigningWithTitle:NSLocalizedStringFromTable(@"secure_key_backup_setup_intro_title", @"Vector", nil)
-                                 message:NSLocalizedStringFromTable(@"security_settings_user_password_description", @"Vector", nil)
+        [self setupCrossSigningWithTitle:[VectorL10n secureKeyBackupSetupIntroTitle]
+                                 message:[VectorL10n securitySettingsUserPasswordDescription]
                                  success:^{
                                      [self setupSecureBackup2];
                                  } failure:^(NSError *error) {
@@ -1205,13 +1203,13 @@ TableViewSectionsDelegate>
             if ([PinCodePreferences shared].forcePinProtection)
             {
                 cell = [self getDefaultTableViewCell:tableView];
-                cell.textLabel.text = NSLocalizedStringFromTable(@"pin_protection_settings_enabled_forced", @"Vector", nil);
+                cell.textLabel.text = [VectorL10n pinProtectionSettingsEnabledForced];
             }
             else
             {
                 MXKTableViewCellWithLabelAndSwitch *switchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
                 
-                switchCell.mxkLabel.text = NSLocalizedStringFromTable(@"pin_protection_settings_enable_pin", @"Vector", nil);
+                switchCell.mxkLabel.text = [VectorL10n pinProtectionSettingsEnablePin];
                 switchCell.mxkSwitch.on = [PinCodePreferences shared].isPinSet;
                 [switchCell.mxkSwitch addTarget:self action:@selector(enablePinCodeSwitchValueChanged:) forControlEvents:UIControlEventValueChanged];
                 
@@ -1225,7 +1223,7 @@ TableViewSectionsDelegate>
             if ([PinCodePreferences shared].isPinSet)
             {
                 cell = [self descriptionCellForTableView:tableView
-                                                withText:NSLocalizedStringFromTable(@"pin_protection_settings_section_footer", @"Vector", nil) ];
+                                                withText:[VectorL10n pinProtectionSettingsSectionFooter]];
             }
             else
             {
@@ -1234,14 +1232,13 @@ TableViewSectionsDelegate>
         }
         else if (rowTag == PIN_CODE_CHANGE)
         {
-            cell = [self buttonCellWithTitle:NSLocalizedStringFromTable(@"pin_protection_settings_change_pin", @"Vector", nil) action:@selector(changePinCode:  ) forTableView:tableView atIndexPath:indexPath];
+            cell = [self buttonCellWithTitle:[VectorL10n pinProtectionSettingsChangePin] action:@selector(changePinCode:) forTableView:tableView atIndexPath:indexPath];
         }
         else if (rowTag == PIN_CODE_BIOMETRICS)
         {
             MXKTableViewCellWithLabelAndSwitch *switchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
             
-            NSString *format = NSLocalizedStringFromTable(@"biometrics_settings_enable_x", @"Vector", nil);
-            switchCell.mxkLabel.text = [NSString stringWithFormat:format, [PinCodePreferences shared].localizedBiometricsName];
+            switchCell.mxkLabel.text = [VectorL10n biometricsSettingsEnableX:[PinCodePreferences shared].localizedBiometricsName];
             switchCell.mxkSwitch.on = [PinCodePreferences shared].isBiometricsSet;
             switchCell.mxkSwitch.enabled = [PinCodePreferences shared].isBiometricsAvailable;
             [switchCell.mxkSwitch addTarget:self action:@selector(enableBiometricsSwitchValueChanged:) forControlEvents:UIControlEventValueChanged];
@@ -1256,12 +1253,12 @@ TableViewSectionsDelegate>
             if (rowTag == 0)
             {
                 cell = [self descriptionCellForTableView:tableView
-                                                withText:NSLocalizedStringFromTable(@"security_settings_crypto_sessions_loading", @"Vector", nil) ];
+                                                withText:[VectorL10n securitySettingsCryptoSessionsLoading]];
             }
             else
             {
                 cell = [self descriptionCellForTableView:tableView
-                                                withText:NSLocalizedStringFromTable(@"security_settings_crypto_sessions_description_2", @"Vector", nil) ];
+                                                withText:[VectorL10n securitySettingsCryptoSessionsDescription2]];
             }
         }
         else
@@ -1273,7 +1270,7 @@ TableViewSectionsDelegate>
             else if (rowTag == devicesArray.count)
             {
                 cell = [self descriptionCellForTableView:tableView
-                                                withText:NSLocalizedStringFromTable(@"security_settings_crypto_sessions_description_2", @"Vector", nil) ];
+                                                withText:[VectorL10n securitySettingsCryptoSessionsDescription2]];
                 
             }
         }
@@ -1320,7 +1317,7 @@ TableViewSectionsDelegate>
             }
             case CRYPTOGRAPHY_EXPORT:
             {
-                MXKTableViewCellWithButton *exportKeysBtnCell = [self buttonCellWithTitle:NSLocalizedStringFromTable(@"security_settings_export_keys_manually", @"Vector", nil)
+                MXKTableViewCellWithButton *exportKeysBtnCell = [self buttonCellWithTitle:[VectorL10n securitySettingsExportKeysManually]
                                                                                    action:@selector(exportEncryptionKeys:)
                                                                              forTableView:tableView
                                                                               atIndexPath:indexPath];
@@ -1337,7 +1334,7 @@ TableViewSectionsDelegate>
             {
                 MXKTableViewCellWithLabelAndSwitch* labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
                 
-                labelAndSwitchCell.mxkLabel.text = NSLocalizedStringFromTable(@"security_settings_blacklist_unverified_devices", @"Vector", nil);
+                labelAndSwitchCell.mxkLabel.text = [VectorL10n securitySettingsBlacklistUnverifiedDevices];
                 labelAndSwitchCell.mxkSwitch.on = session.crypto.globalBlacklistUnverifiedDevices;
                 labelAndSwitchCell.mxkSwitch.onTintColor = ThemeService.shared.theme.tintColor;
                 labelAndSwitchCell.mxkSwitch.enabled = YES;
@@ -1349,7 +1346,7 @@ TableViewSectionsDelegate>
             case ADVANCED_BLACKLIST_UNVERIFIED_DEVICES_DESCRIPTION:
             {
                 cell = [self descriptionCellForTableView:tableView
-                                                withText:NSLocalizedStringFromTable(@"security_settings_blacklist_unverified_devices_description", @"Vector", nil) ];
+                                                withText:[VectorL10n securitySettingsBlacklistUnverifiedDevicesDescription]];
                 
                 break;
             }
@@ -1474,17 +1471,17 @@ TableViewSectionsDelegate>
 {
     [currentAlert dismissViewControllerAnimated:NO completion:nil];
     
-    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"security_settings_complete_security_alert_title", @"Vector", nil)
-                                                                             message:NSLocalizedStringFromTable(@"security_settings_complete_security_alert_message", @"Vector", nil)
+    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:[VectorL10n securitySettingsCompleteSecurityAlertTitle]
+                                                                             message:[VectorL10n securitySettingsCompleteSecurityAlertMessage]
                                                                       preferredStyle:UIAlertControllerStyleAlert];
     
-    [alertController addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+    [alertController addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                               style:UIAlertActionStyleDefault
                                             handler:^(UIAlertAction * action) {
                                                     [self presentCompleteSecurity];
                                             }]];
     
-    [alertController addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"later", @"Vector", nil)
+    [alertController addAction:[UIAlertAction actionWithTitle:[VectorL10n later]
                                               style:UIAlertActionStyleCancel
                                             handler:nil]];
     
@@ -1684,18 +1681,18 @@ TableViewSectionsDelegate>
     [currentAlert dismissViewControllerAnimated:NO completion:nil];
     
     currentAlert =
-    [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"settings_key_backup_delete_confirmation_prompt_title", @"Vector", nil)
-                                        message:NSLocalizedStringFromTable(@"settings_key_backup_delete_confirmation_prompt_msg", @"Vector", nil)
+    [UIAlertController alertControllerWithTitle:[VectorL10n settingsKeyBackupDeleteConfirmationPromptTitle]
+                                        message:[VectorL10n settingsKeyBackupDeleteConfirmationPromptMsg]
                                  preferredStyle:UIAlertControllerStyleAlert];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                      style:UIAlertActionStyleCancel
                                                    handler:^(UIAlertAction * action) {
         MXStrongifyAndReturnIfNil(self);
         self->currentAlert = nil;
     }]];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"settings_key_backup_button_delete", @"Vector", nil)
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n settingsKeyBackupButtonDelete]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
         MXStrongifyAndReturnIfNil(self);
@@ -1813,18 +1810,18 @@ TableViewSectionsDelegate>
     [currentAlert dismissViewControllerAnimated:NO completion:nil];
 
     currentAlert =
-    [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"settings_key_backup_delete_confirmation_prompt_title", @"Vector", nil)
-                                        message:NSLocalizedStringFromTable(@"settings_key_backup_delete_confirmation_prompt_msg", @"Vector", nil)
+    [UIAlertController alertControllerWithTitle:[VectorL10n  settingsKeyBackupDeleteConfirmationPromptTitle]
+                                        message:[VectorL10n  settingsKeyBackupDeleteConfirmationPromptMsg]
                                  preferredStyle:UIAlertControllerStyleAlert];
 
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                      style:UIAlertActionStyleCancel
                                                    handler:^(UIAlertAction * action) {
                                                        MXStrongifyAndReturnIfNil(self);
                                                        self->currentAlert = nil;
                                                    }]];
 
-    [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"settings_key_backup_button_delete", @"Vector", nil)
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n  settingsKeyBackupButtonDelete]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
                                                        MXStrongifyAndReturnIfNil(self);
diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m
index 2c70a2b4a..359d2c1b8 100644
--- a/Riot/Modules/Settings/SettingsViewController.m
+++ b/Riot/Modules/Settings/SettingsViewController.m
@@ -365,7 +365,7 @@ TableViewSectionsDelegate>
         [sectionUserSettings addRowWithTag:USER_SETTINGS_INVITE_FRIENDS_INDEX];
     }
     
-    sectionUserSettings.headerTitle = NSLocalizedStringFromTable(@"settings_user_settings", @"Vector", nil);
+    sectionUserSettings.headerTitle = [VectorL10n settingsUserSettings];
     [tmpSections addObject:sectionUserSettings];
     
     if (BuildSettings.settingsScreenShowConfirmMediaSize)
@@ -373,19 +373,19 @@ TableViewSectionsDelegate>
         Section *sectionMedia = [Section sectionWithTag:SECTION_TAG_SENDING_MEDIA];
         [sectionMedia addRowWithTag:SENDING_MEDIA_CONFIRM_SIZE];
         [sectionMedia addRowWithTag:SENDING_MEDIA_CONFIRM_SIZE_DESCRIPTION];
-        sectionMedia.headerTitle = NSLocalizedStringFromTable(@"settings_sending_media", @"Vector", nil);
+        sectionMedia.headerTitle = [VectorL10n settingsSendingMedia];
         [tmpSections addObject:sectionMedia];
     }
     
     Section *sectionLinks = [Section sectionWithTag:SECTION_TAG_LINKS];
     [sectionLinks addRowWithTag:LINKS_SHOW_URL_PREVIEWS_INDEX];
     [sectionLinks addRowWithTag:LINKS_SHOW_URL_PREVIEWS_DESCRIPTION_INDEX];
-    sectionLinks.headerTitle = NSLocalizedStringFromTable(@"settings_links", @"Vector", nil);
+    sectionLinks.headerTitle = [VectorL10n settingsLinks];
     [tmpSections addObject:sectionLinks];
     
     Section *sectionSecurity = [Section sectionWithTag:SECTION_TAG_SECURITY];
     [sectionSecurity addRowWithTag:SECURITY_BUTTON_INDEX];
-    sectionSecurity.headerTitle = NSLocalizedStringFromTable(@"settings_security", @"Vector", nil);
+    sectionSecurity.headerTitle = [VectorL10n settingsSecurity];
     [tmpSections addObject:sectionSecurity];
     
     Section *sectionNotificationSettings = [Section sectionWithTag:SECTION_TAG_NOTIFICATIONS];
@@ -413,13 +413,13 @@ TableViewSectionsDelegate>
         // Don't add new sections on pre iOS 14
     }
 
-    sectionNotificationSettings.headerTitle = NSLocalizedStringFromTable(@"settings_notifications", @"Vector", nil);
+    sectionNotificationSettings.headerTitle = [VectorL10n settingsNotifications];
     [tmpSections addObject:sectionNotificationSettings];
     
     if (BuildSettings.allowVoIPUsage && BuildSettings.stunServerFallbackUrlString)
     {
         Section *sectionCalls = [Section sectionWithTag:SECTION_TAG_CALLS];
-        sectionCalls.headerTitle = NSLocalizedStringFromTable(@"settings_calls_settings", @"Vector", nil);
+        sectionCalls.headerTitle = [VectorL10n settingsCallsSettings];
 
         if (RiotSettings.shared.settingsScreenShowEnableStunServerFallback)
         {
@@ -441,7 +441,7 @@ TableViewSectionsDelegate>
         {
             [sectionDiscovery addRowWithTag:index];
         }
-        sectionDiscovery.headerTitle = NSLocalizedStringFromTable(@"settings_discovery_settings", @"Vector", nil);
+        sectionDiscovery.headerTitle = [VectorL10n settingsDiscoverySettings];
         [tmpSections addObject:sectionDiscovery];
     }
     
@@ -450,7 +450,7 @@ TableViewSectionsDelegate>
         Section *sectionIdentityServer = [Section sectionWithTag:SECTION_TAG_IDENTITY_SERVER];
         [sectionIdentityServer addRowWithTag:IDENTITY_SERVER_INDEX];
         [sectionIdentityServer addRowWithTag:IDENTITY_SERVER_DESCRIPTION_INDEX];
-        sectionIdentityServer.headerTitle = NSLocalizedStringFromTable(@"settings_identity_server_settings", @"Vector", nil);
+        sectionIdentityServer.headerTitle = [VectorL10n settingsIdentityServerSettings];
         [tmpSections addObject:sectionIdentityServer];
     }
     
@@ -462,7 +462,7 @@ TableViewSectionsDelegate>
         {
             [sectionLocalContacts addRowWithTag:LOCAL_CONTACTS_PHONEBOOK_COUNTRY_INDEX];
         }
-        sectionLocalContacts.headerTitle = NSLocalizedStringFromTable(@"settings_contacts", @"Vector", nil);
+        sectionLocalContacts.headerTitle = [VectorL10n settingsContacts];
         [tmpSections addObject:sectionLocalContacts];
     }
     
@@ -474,7 +474,7 @@ TableViewSectionsDelegate>
         {
             [sectionIgnoredUsers addRowWithTag:index];
         }
-        sectionIgnoredUsers.headerTitle = NSLocalizedStringFromTable(@"settings_ignored_users", @"Vector", nil);
+        sectionIgnoredUsers.headerTitle = [VectorL10n settingsIgnoredUsers];
         [tmpSections addObject:sectionIgnoredUsers];
     }
     
@@ -483,21 +483,21 @@ TableViewSectionsDelegate>
         Section *sectionIntegrations = [Section sectionWithTag:SECTION_TAG_INTEGRATIONS];
         [sectionIntegrations addRowWithTag:INTEGRATIONS_INDEX];
         [sectionIntegrations addRowWithTag:INTEGRATIONS_DESCRIPTION_INDEX];
-        sectionIntegrations.headerTitle = NSLocalizedStringFromTable(@"settings_integrations", @"Vector", nil);
+        sectionIntegrations.headerTitle = [VectorL10n settingsIntegrations];
         [tmpSections addObject:sectionIntegrations];
     }
     
     Section *sectionUserInterface = [Section sectionWithTag:SECTION_TAG_USER_INTERFACE];
     [sectionUserInterface addRowWithTag:USER_INTERFACE_LANGUAGE_INDEX];
     [sectionUserInterface addRowWithTag:USER_INTERFACE_THEME_INDEX];
-    sectionUserInterface.headerTitle = NSLocalizedStringFromTable(@"settings_user_interface", @"Vector", nil);
+    sectionUserInterface.headerTitle = [VectorL10n settingsUserInterface];
     [tmpSections addObject: sectionUserInterface];
     
     if (BuildSettings.settingsScreenShowAdvancedSettings)
     {
         Section *sectionAdvanced = [Section sectionWithTag:SECTION_TAG_ADVANCED];
         [sectionAdvanced addRowWithTag:0];
-        sectionAdvanced.headerTitle = NSLocalizedStringFromTable(@"settings_advanced", @"Vector", nil);
+        sectionAdvanced.headerTitle = [VectorL10n settingsAdvanced];
         [tmpSections addObject:sectionAdvanced];
     }
     
@@ -536,14 +536,14 @@ TableViewSectionsDelegate>
     {
         [sectionOther addRowWithTag:OTHER_REPORT_BUG_INDEX];
     }
-    sectionOther.headerTitle = NSLocalizedStringFromTable(@"settings_other", @"Vector", nil);
+    sectionOther.headerTitle = [VectorL10n settingsOther];
     [tmpSections addObject:sectionOther];
     
     if (BuildSettings.settingsScreenShowLabSettings)
     {
         Section *sectionLabs = [Section sectionWithTag:SECTION_TAG_LABS];
         [sectionLabs addRowWithTag:LABS_ENABLE_RINGING_FOR_GROUP_CALLS_INDEX];
-        sectionLabs.headerTitle = NSLocalizedStringFromTable(@"settings_labs", @"Vector", nil);
+        sectionLabs.headerTitle = [VectorL10n settingsLabs];
         if (sectionLabs.hasAnyRows)
         {
             [tmpSections addObject:sectionLabs];
@@ -559,7 +559,7 @@ TableViewSectionsDelegate>
         {
             [sectionFlair addRowWithTag:index];
         }
-        sectionFlair.headerTitle = NSLocalizedStringFromTable(@"settings_flair", @"Vector", nil);
+        sectionFlair.headerTitle = [VectorL10n settingsFlair];
         [tmpSections addObject:sectionFlair];
     }
     
@@ -567,7 +567,7 @@ TableViewSectionsDelegate>
     {
         Section *sectionDeactivate = [Section sectionWithTag:SECTION_TAG_DEACTIVATE_ACCOUNT];
         [sectionDeactivate addRowWithTag:0];
-        sectionDeactivate.headerTitle = NSLocalizedStringFromTable(@"settings_deactivate_my_account", @"Vector", nil);
+        sectionDeactivate.headerTitle = [VectorL10n settingsDeactivateMyAccount];
         [tmpSections addObject:sectionDeactivate];
     }
     
@@ -580,7 +580,7 @@ TableViewSectionsDelegate>
     [super viewDidLoad];
     // Do any additional setup after loading the view, typically from a nib.
     
-    self.navigationItem.title = NSLocalizedStringFromTable(@"settings_title", @"Vector", nil);
+    self.navigationItem.title = [VectorL10n settingsTitle];
     
     // Remove back bar button title when pushing a view controller
     self.navigationItem.backBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:nil];
@@ -961,9 +961,9 @@ TableViewSectionsDelegate>
 {
     MXWeakify(self);
     [currentAlert dismissViewControllerAnimated:NO completion:nil];
-    currentAlert = [UIAlertController alertControllerWithTitle:[NSBundle mxk_localizedStringForKey:@"account_email_validation_title"] message:message preferredStyle:UIAlertControllerStyleAlert];
+    currentAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n accountEmailValidationTitle] message:message preferredStyle:UIAlertControllerStyleAlert];
 
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
         MXStrongifyAndReturnIfNil(self);
         self->currentAlert = nil;
         [self stopActivityIndicator];
@@ -972,7 +972,7 @@ TableViewSectionsDelegate>
         self.newEmailEditingEnabled = NO;
     }]];
 
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"continue"] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n continue] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
         MXStrongifyAndReturnIfNil(self);
         [self tryFinaliseAddEmailSession:threePidAddSession withAuthenticationParameters:authenticationParameters
                       threePidAddManager:threePidAddManager];
@@ -1020,10 +1020,10 @@ TableViewSectionsDelegate>
 
             // Ask password again
             self->currentAlert = [UIAlertController alertControllerWithTitle:nil
-                                                                     message:NSLocalizedStringFromTable(@"settings_add_3pid_invalid_password_message", @"Vector", nil)
+                                                                     message:[VectorL10n settingsAdd3pidInvalidPasswordMessage]
                                                               preferredStyle:UIAlertControllerStyleAlert];
 
-            [self->currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"retry", @"Vector", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+            [self->currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n retry] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
                 self->currentAlert = nil;
                 
                 [self showAuthenticationIfNeededForAdding:kMX3PIDMediumEmail withSession:self.mainSession completion:^(NSDictionary *authParams) {
@@ -1053,7 +1053,7 @@ TableViewSectionsDelegate>
             MXError *mxError = [[MXError alloc] initWithNSError:error];
             if (mxError && [mxError.errcode isEqualToString:kMXErrCodeStringThreePIDAuthFailed])
             {
-                [self showValidationEmailDialogWithMessage:[NSBundle mxk_localizedStringForKey:@"account_email_validation_error"] for3PidAddSession:threePidAddSession threePidAddManager:threePidAddManager authenticationParameters:authParams];
+                [self showValidationEmailDialogWithMessage:[MatrixKitL10n accountEmailValidationError] for3PidAddSession:threePidAddSession threePidAddManager:threePidAddManager authenticationParameters:authParams];
             }
             else
             {
@@ -1072,9 +1072,9 @@ TableViewSectionsDelegate>
     MXWeakify(self);
     
     [currentAlert dismissViewControllerAnimated:NO completion:nil];
-    currentAlert = [UIAlertController alertControllerWithTitle:[NSBundle mxk_localizedStringForKey:@"account_msisdn_validation_title"] message:message preferredStyle:UIAlertControllerStyleAlert];
+    currentAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n accountMsisdnValidationTitle] message:message preferredStyle:UIAlertControllerStyleAlert];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
         MXStrongifyAndReturnIfNil(self);
 
         self->currentAlert = nil;
@@ -1091,7 +1091,7 @@ TableViewSectionsDelegate>
         textField.keyboardType = UIKeyboardTypeDecimalPad;
     }];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"submit"] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n submit] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
 
         MXStrongifyAndReturnIfNil(self);
 
@@ -1151,10 +1151,10 @@ TableViewSectionsDelegate>
 
             // Ask password again
             self->currentAlert = [UIAlertController alertControllerWithTitle:nil
-                                                                     message:NSLocalizedStringFromTable(@"settings_add_3pid_invalid_password_message", @"Vector", nil)
+                                                                     message:[VectorL10n settingsAdd3pidPasswordMessage]
                                                               preferredStyle:UIAlertControllerStyleAlert];
 
-            [self->currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"retry", @"Vector", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+            [self->currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n retry] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
                 self->currentAlert = nil;
                 
                 [self showAuthenticationIfNeededForAdding:kMX3PIDMediumMSISDN withSession:self.mainSession completion:^(NSDictionary *authParams) {
@@ -1197,14 +1197,14 @@ TableViewSectionsDelegate>
                 }
                 else
                 {
-                    title = [NSBundle mxk_localizedStringForKey:@"error"];
+                    title = [MatrixKitL10n error];
                 }
             }
 
 
             self->currentAlert = [UIAlertController alertControllerWithTitle:title message:msg preferredStyle:UIAlertControllerStyleAlert];
 
-            [self->currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+            [self->currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
                 self->currentAlert = nil;
 
                 // Ask again the sms token
@@ -1368,14 +1368,14 @@ TableViewSectionsDelegate>
     
     if ([medium isEqualToString:kMX3PIDMediumMSISDN])
     {
-        title = NSLocalizedStringFromTable(@"settings_add_3pid_password_title_msidsn", @"Vector", nil);
+        title = [VectorL10n settingsAdd3pidPasswordTitleMsidsn];
     }
     else
     {
-        title = NSLocalizedStringFromTable(@"settings_add_3pid_password_title_email", @"Vector", nil);
+        title = [VectorL10n settingsAdd3pidPasswordTitleEmail];
     }
     
-    NSString *message = NSLocalizedStringFromTable(@"settings_add_3pid_password_message", @"Vector", nil);
+    NSString *message = [VectorL10n settingsAdd3pidInvalidPasswordMessage];
     
     
     [session.matrixRestClient add3PIDOnlyWithSessionId:@"" clientSecret:[MXTools generateSecret] authParams:nil success:^{
@@ -1563,7 +1563,7 @@ TableViewSectionsDelegate>
             signOutCell.mxkButton.titleLabel.text = nil;
         }
         
-        NSString* title = NSLocalizedStringFromTable(@"settings_sign_out", @"Vector", nil);
+        NSString* title = [VectorL10n settingsSignOut];
         
         [signOutCell.mxkButton setTitle:title forState:UIControlStateNormal];
         [signOutCell.mxkButton setTitle:title forState:UIControlStateHighlighted];
@@ -1597,7 +1597,7 @@ TableViewSectionsDelegate>
                 [profileCell.mxkImageView addGestureRecognizer:tap];
             }
             
-            profileCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_profile_picture", @"Vector", nil);
+            profileCell.mxkLabel.text = [VectorL10n settingsProfilePicture];
             profileCell.accessibilityIdentifier=@"SettingsVCProfilPictureStaticText";
             profileCell.mxkLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
             
@@ -1634,7 +1634,7 @@ TableViewSectionsDelegate>
         {
             MXKTableViewCellWithLabelAndTextField *displaynameCell = [self getLabelAndTextFieldCell:tableView forIndexPath:indexPath];
             
-            displaynameCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_display_name", @"Vector", nil);
+            displaynameCell.mxkLabel.text = [VectorL10n settingsDisplayName];
             displaynameCell.mxkTextField.text = myUser.displayname;
             
             displaynameCell.mxkTextField.tag = row;
@@ -1649,7 +1649,7 @@ TableViewSectionsDelegate>
         {
             MXKTableViewCellWithLabelAndTextField *firstCell = [self getLabelAndTextFieldCell:tableView forIndexPath:indexPath];
         
-            firstCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_first_name", @"Vector", nil);
+            firstCell.mxkLabel.text = [VectorL10n settingsFirstName];
             firstCell.mxkTextField.userInteractionEnabled = NO;
             
             cell = firstCell;
@@ -1658,7 +1658,7 @@ TableViewSectionsDelegate>
         {
             MXKTableViewCellWithLabelAndTextField *surnameCell = [self getLabelAndTextFieldCell:tableView forIndexPath:indexPath];
             
-            surnameCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_surname", @"Vector", nil);
+            surnameCell.mxkLabel.text = [VectorL10n settingsSurname];
             surnameCell.mxkTextField.userInteractionEnabled = NO;
             
             cell = surnameCell;
@@ -1668,7 +1668,7 @@ TableViewSectionsDelegate>
             NSInteger emailIndex = row - USER_SETTINGS_EMAILS_OFFSET;
             MXKTableViewCellWithLabelAndTextField *emailCell = [self getLabelAndTextFieldCell:tableView forIndexPath:indexPath];
             
-            emailCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_email_address", @"Vector", nil);
+            emailCell.mxkLabel.text = [VectorL10n settingsEmailAddress];
             emailCell.mxkTextField.text = account.linkedEmails[emailIndex];
             emailCell.mxkTextField.userInteractionEnabled = NO;
             
@@ -1679,7 +1679,7 @@ TableViewSectionsDelegate>
             NSInteger phoneNumberIndex = row - USER_SETTINGS_PHONENUMBERS_OFFSET;
             MXKTableViewCellWithLabelAndTextField *phoneCell = [self getLabelAndTextFieldCell:tableView forIndexPath:indexPath];
             
-            phoneCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_phone_number", @"Vector", nil);
+            phoneCell.mxkLabel.text = [VectorL10n settingsPhoneNumber];
             
             phoneCell.mxkTextField.text = [MXKTools readableMSISDN:account.linkedPhoneNumbers[phoneNumberIndex]];
             phoneCell.mxkTextField.userInteractionEnabled = NO;
@@ -1693,7 +1693,7 @@ TableViewSectionsDelegate>
             // Render the cell according to the `newEmailEditingEnabled` property
             if (!_newEmailEditingEnabled)
             {
-                newEmailCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_add_email_address", @"Vector", nil);
+                newEmailCell.mxkLabel.text = [VectorL10n settingsAddEmailAddress];
                 newEmailCell.mxkTextField.text = nil;
                 newEmailCell.mxkTextField.userInteractionEnabled = NO;
                 newEmailCell.accessoryView = [[UIImageView alloc] initWithImage:[[UIImage imageNamed:@"plus_icon"] vc_tintedImageUsingColor:ThemeService.shared.theme.textPrimaryColor]];
@@ -1701,7 +1701,7 @@ TableViewSectionsDelegate>
             else
             {
                 newEmailCell.mxkLabel.text = nil;
-                newEmailCell.mxkTextField.placeholder = NSLocalizedStringFromTable(@"settings_email_address_placeholder", @"Vector", nil);
+                newEmailCell.mxkTextField.placeholder = [VectorL10n settingsEmailAddressPlaceholder];
                 newEmailCell.mxkTextField.attributedPlaceholder = [[NSAttributedString alloc]
                                                                    initWithString:newEmailCell.mxkTextField.placeholder
                                                                    attributes:@{NSForegroundColorAttributeName: ThemeService.shared.theme.placeholderTextColor}];
@@ -1746,7 +1746,7 @@ TableViewSectionsDelegate>
             {
                 MXKTableViewCellWithLabelAndTextField *newPhoneCell = [self getLabelAndTextFieldCell:tableView forIndexPath:indexPath];
                 
-                newPhoneCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_add_phone_number", @"Vector", nil);
+                newPhoneCell.mxkLabel.text = [VectorL10n settingsAddPhoneNumber];
                 newPhoneCell.mxkTextField.text = nil;
                 newPhoneCell.mxkTextField.userInteractionEnabled = NO;
                 newPhoneCell.accessoryView = [[UIImageView alloc] initWithImage:[[UIImage imageNamed:@"plus_icon"] vc_tintedImageUsingColor:ThemeService.shared.theme.textPrimaryColor]];
@@ -1821,9 +1821,9 @@ TableViewSectionsDelegate>
         {
             MXKTableViewCell *threePidsInformationCell = [self getDefaultTableViewCell:self.tableView];
             
-            NSMutableAttributedString *attributedString =  [[NSMutableAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"settings_three_pids_management_information_part1", @"Vector", nil) attributes:@{NSForegroundColorAttributeName: ThemeService.shared.theme.textPrimaryColor}];
-            [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"settings_three_pids_management_information_part2", @"Vector", nil) attributes:@{NSForegroundColorAttributeName: ThemeService.shared.theme.tintColor}]];
-            [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"settings_three_pids_management_information_part3", @"Vector", nil) attributes:@{NSForegroundColorAttributeName: ThemeService.shared.theme.textPrimaryColor}]];
+            NSMutableAttributedString *attributedString =  [[NSMutableAttributedString alloc] initWithString:[VectorL10n settingsThreePidsManagementInformationPart1] attributes:@{NSForegroundColorAttributeName: ThemeService.shared.theme.textPrimaryColor}];
+            [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:[VectorL10n settingsThreePidsManagementInformationPart2] attributes:@{NSForegroundColorAttributeName: ThemeService.shared.theme.tintColor}]];
+            [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:[VectorL10n settingsThreePidsManagementInformationPart3] attributes:@{NSForegroundColorAttributeName: ThemeService.shared.theme.textPrimaryColor}]];
             
             threePidsInformationCell.textLabel.attributedText = attributedString;
             threePidsInformationCell.textLabel.numberOfLines = 0;
@@ -1836,7 +1836,7 @@ TableViewSectionsDelegate>
         {
             MXKTableViewCell *inviteFriendsCell = [self getDefaultTableViewCell:tableView];
 
-            inviteFriendsCell.textLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"invite_friends_action", @"Vector", nil), BuildSettings.bundleDisplayName];
+            inviteFriendsCell.textLabel.text = [VectorL10n inviteFriendsAction:BuildSettings.bundleDisplayName];
             
             UIImage *shareActionImage = [[UIImage imageNamed:@"share_action_button"] vc_tintedImageUsingColor:ThemeService.shared.theme.tintColor];
             UIImageView *accessoryView = [[UIImageView alloc] initWithImage:shareActionImage];
@@ -1848,7 +1848,7 @@ TableViewSectionsDelegate>
         {
             MXKTableViewCellWithLabelAndTextField *passwordCell = [self getLabelAndTextFieldCell:tableView forIndexPath:indexPath];
             
-            passwordCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_change_password", @"Vector", nil);
+            passwordCell.mxkLabel.text = [VectorL10n settingsChangePassword];
             passwordCell.mxkTextField.text = @"*********";
             passwordCell.mxkTextField.userInteractionEnabled = NO;
             passwordCell.mxkLabel.accessibilityIdentifier=@"SettingsVCChangePwdStaticText";
@@ -1862,7 +1862,7 @@ TableViewSectionsDelegate>
         {
             MXKTableViewCellWithLabelAndSwitch* labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
     
-            labelAndSwitchCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_confirm_media_size", @"Vector", nil);
+            labelAndSwitchCell.mxkLabel.text = [VectorL10n settingsConfirmMediaSize];
             labelAndSwitchCell.mxkSwitch.on =  RiotSettings.shared.showMediaCompressionPrompt;
             labelAndSwitchCell.mxkSwitch.onTintColor = ThemeService.shared.theme.tintColor;
             labelAndSwitchCell.mxkSwitch.enabled = YES;
@@ -1873,7 +1873,7 @@ TableViewSectionsDelegate>
         else if (row == SENDING_MEDIA_CONFIRM_SIZE_DESCRIPTION)
         {
             MXKTableViewCell *infoCell = [self getDefaultTableViewCell:tableView];
-            infoCell.textLabel.text = NSLocalizedStringFromTable(@"settings_confirm_media_size_description", @"Vector", nil);
+            infoCell.textLabel.text = [VectorL10n settingsConfirmMediaSizeDescription];
             infoCell.textLabel.numberOfLines = 0;
             infoCell.selectionStyle = UITableViewCellSelectionStyleNone;
 
@@ -1886,7 +1886,7 @@ TableViewSectionsDelegate>
         {
             MXKTableViewCellWithLabelAndSwitch *labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
             
-            labelAndSwitchCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_show_url_previews", @"Vector", nil);
+            labelAndSwitchCell.mxkLabel.text = [VectorL10n settingsShowUrlPreviews];
             labelAndSwitchCell.mxkSwitch.on = RiotSettings.shared.roomScreenShowsURLPreviews;
             labelAndSwitchCell.mxkSwitch.onTintColor = ThemeService.shared.theme.tintColor;
             labelAndSwitchCell.mxkSwitch.enabled = YES;
@@ -1898,7 +1898,7 @@ TableViewSectionsDelegate>
         else if (row == LINKS_SHOW_URL_PREVIEWS_DESCRIPTION_INDEX)
         {
             MXKTableViewCell *descriptionCell = [self getDefaultTableViewCell:tableView];
-            descriptionCell.textLabel.text = NSLocalizedStringFromTable(@"settings_show_url_previews_description", @"Vector", nil);
+            descriptionCell.textLabel.text = [VectorL10n settingsShowUrlPreviewsDescription];
             descriptionCell.textLabel.numberOfLines = 0;
             descriptionCell.selectionStyle = UITableViewCellSelectionStyleNone;
 
@@ -1911,7 +1911,7 @@ TableViewSectionsDelegate>
         {
             MXKTableViewCellWithLabelAndSwitch* labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
     
-            labelAndSwitchCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_enable_push_notif", @"Vector", nil);
+            labelAndSwitchCell.mxkLabel.text = [VectorL10n settingsEnablePushNotif];
             labelAndSwitchCell.mxkSwitch.onTintColor = ThemeService.shared.theme.tintColor;
             labelAndSwitchCell.mxkSwitch.enabled = YES;
             [labelAndSwitchCell.mxkSwitch addTarget:self action:@selector(togglePushNotifications:) forControlEvents:UIControlEventTouchUpInside];
@@ -1938,7 +1938,7 @@ TableViewSectionsDelegate>
 
             cell.textLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
 
-            cell.textLabel.text = NSLocalizedStringFromTable(@"settings_device_notifications", @"Vector", nil);
+            cell.textLabel.text = [VectorL10n settingsDeviceNotifications];
             cell.detailTextLabel.text = @"";
 
             [cell vc_setAccessoryDisclosureIndicatorWithCurrentTheme];
@@ -1948,7 +1948,7 @@ TableViewSectionsDelegate>
         {
             MXKTableViewCellWithLabelAndSwitch* labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
             
-            labelAndSwitchCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_show_decrypted_content", @"Vector", nil);
+            labelAndSwitchCell.mxkLabel.text = [VectorL10n settingsShowDecryptedContent];
             labelAndSwitchCell.mxkSwitch.on = RiotSettings.shared.showDecryptedContentInNotifications;
             labelAndSwitchCell.mxkSwitch.onTintColor = ThemeService.shared.theme.tintColor;
             labelAndSwitchCell.mxkSwitch.enabled = account.pushNotificationServiceIsActive;
@@ -1963,7 +1963,7 @@ TableViewSectionsDelegate>
 
             NSString *appDisplayName = [[NSBundle mainBundle] infoDictionary][@"CFBundleDisplayName"];
 
-            globalInfoCell.textLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"settings_global_settings_info", @"Vector", nil), appDisplayName];
+            globalInfoCell.textLabel.text = [VectorL10n settingsGlobalSettingsInfo:appDisplayName];
             globalInfoCell.textLabel.numberOfLines = 0;
             
             globalInfoCell.selectionStyle = UITableViewCellSelectionStyleNone;
@@ -1974,7 +1974,7 @@ TableViewSectionsDelegate>
         {
             MXKTableViewCellWithLabelAndSwitch* labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
             
-            labelAndSwitchCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_pin_rooms_with_missed_notif", @"Vector", nil);
+            labelAndSwitchCell.mxkLabel.text = [VectorL10n settingsPinRoomsWithMissedNotif];
             labelAndSwitchCell.mxkSwitch.on = RiotSettings.shared.pinRoomsWithMissedNotificationsOnHome;
             labelAndSwitchCell.mxkSwitch.onTintColor = ThemeService.shared.theme.tintColor;
             labelAndSwitchCell.mxkSwitch.enabled = YES;
@@ -1986,7 +1986,7 @@ TableViewSectionsDelegate>
         {
             MXKTableViewCellWithLabelAndSwitch* labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
             
-            labelAndSwitchCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_pin_rooms_with_unread", @"Vector", nil);
+            labelAndSwitchCell.mxkLabel.text = [VectorL10n settingsPinRoomsWithUnread];
             labelAndSwitchCell.mxkSwitch.on = RiotSettings.shared.pinRoomsWithUnreadMessagesOnHome;
             labelAndSwitchCell.mxkSwitch.onTintColor = ThemeService.shared.theme.tintColor;
             labelAndSwitchCell.mxkSwitch.enabled = YES;
@@ -1999,15 +1999,15 @@ TableViewSectionsDelegate>
             cell = [self getDefaultTableViewCell:tableView];
             if (row == NOTIFICATION_SETTINGS_DEFAULT_SETTINGS_INDEX)
             {
-                cell.textLabel.text = NSLocalizedStringFromTable(@"settings_default", @"Vector", nil);
+                cell.textLabel.text = [VectorL10n settingsDefault];
             }
             else if (row == NOTIFICATION_SETTINGS_MENTION_AND_KEYWORDS_SETTINGS_INDEX)
             {
-                cell.textLabel.text = NSLocalizedStringFromTable(@"settings_mentions_and_keywords", @"Vector", nil);
+                cell.textLabel.text = [VectorL10n settingsMentionsAndKeywords];
             }
             else if (row == NOTIFICATION_SETTINGS_OTHER_SETTINGS_INDEX)
             {
-                cell.textLabel.text = NSLocalizedStringFromTable(@"settings_other", @"Vector", nil);
+                cell.textLabel.text = [VectorL10n settingsOther];
             }
             [cell vc_setAccessoryDisclosureIndicatorWithCurrentTheme];
         }
@@ -2017,7 +2017,7 @@ TableViewSectionsDelegate>
         if (row == CALLS_ENABLE_STUN_SERVER_FALLBACK_INDEX)
         {
             MXKTableViewCellWithLabelAndSwitch* labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
-            labelAndSwitchCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_calls_stun_server_fallback_button", @"Vector", nil);
+            labelAndSwitchCell.mxkLabel.text = [VectorL10n settingsCallsStunServerFallbackButton];
             labelAndSwitchCell.mxkSwitch.on = RiotSettings.shared.allowStunServerFallback;
             labelAndSwitchCell.mxkSwitch.onTintColor = ThemeService.shared.theme.tintColor;
             labelAndSwitchCell.mxkSwitch.enabled = YES;
@@ -2032,7 +2032,7 @@ TableViewSectionsDelegate>
             stunFallbackHost = [stunFallbackHost componentsSeparatedByString:@":"].lastObject;
 
             MXKTableViewCell *globalInfoCell = [self getDefaultTableViewCell:tableView];
-            globalInfoCell.textLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"settings_calls_stun_server_fallback_description", @"Vector", nil), stunFallbackHost];
+            globalInfoCell.textLabel.text = [VectorL10n settingsCallsStunServerFallbackDescription:stunFallbackHost];
             globalInfoCell.textLabel.numberOfLines = 0;
             globalInfoCell.selectionStyle = UITableViewCellSelectionStyleNone;
 
@@ -2057,7 +2057,7 @@ TableViewSectionsDelegate>
                 }
                 else
                 {
-                    isCell.textLabel.text = NSLocalizedStringFromTable(@"settings_identity_server_no_is", @"Vector", nil);
+                    isCell.textLabel.text = [VectorL10n settingsIdentityServerNoIs];
                 }
                 [isCell vc_setAccessoryDisclosureIndicatorWithCurrentTheme];
                 cell = isCell;
@@ -2070,11 +2070,11 @@ TableViewSectionsDelegate>
 
                 if (account.mxSession.identityService.identityServer)
                 {
-                    descriptionCell.textLabel.text = NSLocalizedStringFromTable(@"settings_identity_server_description", @"Vector", nil);
+                    descriptionCell.textLabel.text = [VectorL10n settingsIdentityServerDescription];
                 }
                 else
                 {
-                    descriptionCell.textLabel.text = NSLocalizedStringFromTable(@"settings_identity_server_no_is_description", @"Vector", nil);
+                    descriptionCell.textLabel.text = [VectorL10n settingsIdentityServerNoIsDescription];
                 }
                 descriptionCell.textLabel.numberOfLines = 0;
                 descriptionCell.selectionStyle = UITableViewCellSelectionStyleNone;
@@ -2095,7 +2095,7 @@ TableViewSectionsDelegate>
                 RiotSharedSettings *sharedSettings = [[RiotSharedSettings alloc] initWithSession:session];
 
                 MXKTableViewCellWithLabelAndSwitch* labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
-                labelAndSwitchCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_integrations_allow_button", @"Vector", nil);
+                labelAndSwitchCell.mxkLabel.text = [VectorL10n settingsIntegrationsAllowButton];
                 labelAndSwitchCell.mxkSwitch.on = sharedSettings.hasIntegrationProvisioningEnabled;
                 labelAndSwitchCell.mxkSwitch.onTintColor = ThemeService.shared.theme.tintColor;
                 labelAndSwitchCell.mxkSwitch.enabled = YES;
@@ -2112,7 +2112,7 @@ TableViewSectionsDelegate>
                 NSString *integrationManager = [WidgetManager.sharedManager configForUser:session.myUser.userId].apiUrl;
                 NSString *integrationManagerDomain = [NSURL URLWithString:integrationManager].host;
 
-                NSString *description = [NSString stringWithFormat:NSLocalizedStringFromTable(@"settings_integrations_allow_description", @"Vector", nil), integrationManagerDomain];
+                NSString *description = [VectorL10n settingsIntegrationsAllowDescription:integrationManagerDomain];
                 descriptionCell.textLabel.text = description;
                 descriptionCell.textLabel.numberOfLines = 0;
                 descriptionCell.selectionStyle = UITableViewCellSelectionStyleNone;
@@ -2148,7 +2148,7 @@ TableViewSectionsDelegate>
 
             cell.textLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
 
-            cell.textLabel.text = NSLocalizedStringFromTable(@"settings_ui_language", @"Vector", nil);
+            cell.textLabel.text = [VectorL10n settingsUiLanguage];
             cell.detailTextLabel.text = languageDescription;
 
             [cell vc_setAccessoryDisclosureIndicatorWithCurrentTheme];
@@ -2170,13 +2170,11 @@ TableViewSectionsDelegate>
             }
 
             theme = [NSString stringWithFormat:@"settings_ui_theme_%@", theme];
-            NSString *i18nTheme = NSLocalizedStringFromTable(theme,
-                                                              @"Vector",
-                                                             nil);
+            NSString *i18nTheme = NSLocalizedStringFromTable(theme, @"Vector", nil);
 
             cell.textLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
 
-            cell.textLabel.text = NSLocalizedStringFromTable(@"settings_ui_theme", @"Vector", nil);
+            cell.textLabel.text = [VectorL10n settingsUiTheme];
             cell.detailTextLabel.text = i18nTheme;
 
             [cell vc_setAccessoryDisclosureIndicatorWithCurrentTheme];
@@ -2198,7 +2196,7 @@ TableViewSectionsDelegate>
             MXKTableViewCellWithLabelAndSwitch* labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
 
             labelAndSwitchCell.mxkLabel.numberOfLines = 0;
-            labelAndSwitchCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_contacts_discover_matrix_users", @"Vector", nil);
+            labelAndSwitchCell.mxkLabel.text = [VectorL10n settingsContactsDiscoverMatrixUsers];
             labelAndSwitchCell.mxkSwitch.on = [MXKAppSettings standardAppSettings].syncLocalContacts;
             labelAndSwitchCell.mxkSwitch.onTintColor = ThemeService.shared.theme.tintColor;
             labelAndSwitchCell.mxkSwitch.enabled = YES;
@@ -2220,7 +2218,7 @@ TableViewSectionsDelegate>
             
             cell.textLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
             
-            cell.textLabel.text = NSLocalizedStringFromTable(@"settings_contacts_phonebook_country", @"Vector", nil);
+            cell.textLabel.text = [VectorL10n settingsContactsPhonebookCountry];
             cell.detailTextLabel.text = countryName;
             
             [cell vc_setAccessoryDisclosureIndicatorWithCurrentTheme];
@@ -2231,9 +2229,7 @@ TableViewSectionsDelegate>
     {
         MXKTableViewCellWithTextView *configCell = [self textViewCellForTableView:tableView atIndexPath:indexPath];
         
-        NSString *configFormat = [NSString stringWithFormat:@"%@\n%@\n%@", [NSBundle mxk_localizedStringForKey:@"settings_config_user_id"], [NSBundle mxk_localizedStringForKey:@"settings_config_home_server"], [NSBundle mxk_localizedStringForKey:@"settings_config_identity_server"]];
-        
-        configCell.mxkTextView.text =[NSString stringWithFormat:configFormat, account.mxCredentials.userId, account.mxCredentials.homeServer, account.identityServerURL];
+        configCell.mxkTextView.text = [NSString stringWithFormat:@"%@\n%@\n%@", [MatrixKitL10n settingsConfigUserId:account.mxCredentials.userId], [MatrixKitL10n settingsConfigHomeServer:account.mxCredentials.homeServer], [MatrixKitL10n settingsConfigIdentityServer:account.identityServerURL]];
         configCell.mxkTextView.accessibilityIdentifier=@"SettingsVCConfigStaticText";
         
         cell = configCell;
@@ -2247,7 +2243,7 @@ TableViewSectionsDelegate>
             NSString* appVersion = [AppDelegate theDelegate].appVersion;
             NSString* build = [AppDelegate theDelegate].build;
             
-            versionCell.textLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"settings_version", @"Vector", nil), [NSString stringWithFormat:@"%@ %@", appVersion, build]];
+            versionCell.textLabel.text = [VectorL10n settingsVersion:[NSString stringWithFormat:@"%@ %@", appVersion, build]];
             
             versionCell.selectionStyle = UITableViewCellSelectionStyleNone;
             
@@ -2257,7 +2253,7 @@ TableViewSectionsDelegate>
         {
             MXKTableViewCell *versionCell = [self getDefaultTableViewCell:tableView];
             
-            versionCell.textLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"settings_olm_version", @"Vector", nil), [OLMKit versionString]];
+            versionCell.textLabel.text = [VectorL10n settingsOlmVersion:[OLMKit versionString]];
             
             versionCell.selectionStyle = UITableViewCellSelectionStyleNone;
             
@@ -2267,7 +2263,7 @@ TableViewSectionsDelegate>
         {
             MXKTableViewCell *termAndConditionCell = [self getDefaultTableViewCell:tableView];
 
-            termAndConditionCell.textLabel.text = NSLocalizedStringFromTable(@"settings_term_conditions", @"Vector", nil);
+            termAndConditionCell.textLabel.text = [VectorL10n settingsTermConditions];
             
             [termAndConditionCell vc_setAccessoryDisclosureIndicatorWithCurrentTheme];
             
@@ -2277,7 +2273,7 @@ TableViewSectionsDelegate>
         {
             MXKTableViewCell *copyrightCell = [self getDefaultTableViewCell:tableView];
 
-            copyrightCell.textLabel.text = NSLocalizedStringFromTable(@"settings_copyright", @"Vector", nil);
+            copyrightCell.textLabel.text = [VectorL10n settingsCopyright];
             
             [copyrightCell vc_setAccessoryDisclosureIndicatorWithCurrentTheme];
             
@@ -2287,7 +2283,7 @@ TableViewSectionsDelegate>
         {
             MXKTableViewCell *privacyPolicyCell = [self getDefaultTableViewCell:tableView];
             
-            privacyPolicyCell.textLabel.text = NSLocalizedStringFromTable(@"settings_privacy_policy", @"Vector", nil);
+            privacyPolicyCell.textLabel.text = [VectorL10n settingsPrivacyPolicy];
             
             [privacyPolicyCell vc_setAccessoryDisclosureIndicatorWithCurrentTheme];
             
@@ -2297,7 +2293,7 @@ TableViewSectionsDelegate>
         {
             MXKTableViewCell *thirdPartyCell = [self getDefaultTableViewCell:tableView];
             
-            thirdPartyCell.textLabel.text = NSLocalizedStringFromTable(@"settings_third_party_notices", @"Vector", nil);
+            thirdPartyCell.textLabel.text = [VectorL10n settingsThirdPartyNotices];
             
             [thirdPartyCell vc_setAccessoryDisclosureIndicatorWithCurrentTheme];
             
@@ -2307,7 +2303,7 @@ TableViewSectionsDelegate>
         {
             MXKTableViewCellWithLabelAndSwitch* labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
             
-            labelAndSwitchCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_show_NSFW_public_rooms", @"Vector", nil);
+            labelAndSwitchCell.mxkLabel.text = [VectorL10n settingsShowNSFWPublicRooms];
             
             labelAndSwitchCell.mxkSwitch.on = RiotSettings.shared.showNSFWPublicRooms;
             labelAndSwitchCell.mxkSwitch.onTintColor = ThemeService.shared.theme.tintColor;
@@ -2320,7 +2316,7 @@ TableViewSectionsDelegate>
         {
             MXKTableViewCellWithLabelAndSwitch* sendCrashReportCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
             
-            sendCrashReportCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_send_crash_report", @"Vector", nil);
+            sendCrashReportCell.mxkLabel.text = [VectorL10n settingsSendCrashReport];
             sendCrashReportCell.mxkSwitch.on = RiotSettings.shared.enableCrashReport;
             sendCrashReportCell.mxkSwitch.onTintColor = ThemeService.shared.theme.tintColor;
             sendCrashReportCell.mxkSwitch.enabled = YES;
@@ -2332,7 +2328,7 @@ TableViewSectionsDelegate>
         {
             MXKTableViewCellWithLabelAndSwitch* enableRageShakeCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
 
-            enableRageShakeCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_enable_rageshake", @"Vector", nil);
+            enableRageShakeCell.mxkLabel.text = [VectorL10n settingsEnableRageshake];
             enableRageShakeCell.mxkSwitch.on = RiotSettings.shared.enableRageShake;
             enableRageShakeCell.mxkSwitch.onTintColor = ThemeService.shared.theme.tintColor;
             enableRageShakeCell.mxkSwitch.enabled = YES;
@@ -2353,7 +2349,7 @@ TableViewSectionsDelegate>
                 markAllBtnCell.mxkButton.titleLabel.text = nil;
             }
             
-            NSString *btnTitle = NSLocalizedStringFromTable(@"settings_mark_all_as_read", @"Vector", nil);
+            NSString *btnTitle = [VectorL10n settingsMarkAllAsRead];
             [markAllBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateNormal];
             [markAllBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateHighlighted];
             [markAllBtnCell.mxkButton setTintColor:ThemeService.shared.theme.tintColor];
@@ -2378,7 +2374,7 @@ TableViewSectionsDelegate>
                 clearCacheBtnCell.mxkButton.titleLabel.text = nil;
             }
             
-            NSString *btnTitle = NSLocalizedStringFromTable(@"settings_clear_cache", @"Vector", nil);
+            NSString *btnTitle = [VectorL10n settingsClearCache];
             [clearCacheBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateNormal];
             [clearCacheBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateHighlighted];
             [clearCacheBtnCell.mxkButton setTintColor:ThemeService.shared.theme.tintColor];
@@ -2403,7 +2399,7 @@ TableViewSectionsDelegate>
                 reportBugBtnCell.mxkButton.titleLabel.text = nil;
             }
 
-            NSString *btnTitle = NSLocalizedStringFromTable(@"settings_report_bug", @"Vector", nil);
+            NSString *btnTitle = [VectorL10n settingsReportBug];
             [reportBugBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateNormal];
             [reportBugBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateHighlighted];
             [reportBugBtnCell.mxkButton setTintColor:ThemeService.shared.theme.tintColor];
@@ -2422,7 +2418,7 @@ TableViewSectionsDelegate>
         {
             MXKTableViewCellWithLabelAndSwitch *labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
             
-            labelAndSwitchCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_labs_enable_ringing_for_group_calls", @"Vector", nil);
+            labelAndSwitchCell.mxkLabel.text = [VectorL10n settingsLabsEnableRingingForGroupCalls];
             labelAndSwitchCell.mxkSwitch.on = RiotSettings.shared.enableRingingForGroupCalls;
             labelAndSwitchCell.mxkSwitch.onTintColor = ThemeService.shared.theme.tintColor;
             
@@ -2463,7 +2459,7 @@ TableViewSectionsDelegate>
         {
             case SECURITY_BUTTON_INDEX:
                 cell = [self getDefaultTableViewCell:tableView];
-                cell.textLabel.text = NSLocalizedStringFromTable(@"security_settings_title", @"Vector", nil);
+                cell.textLabel.text = [VectorL10n securitySettingsTitle];
                 [cell vc_setAccessoryDisclosureIndicatorWithCurrentTheme];
                 break;
         }
@@ -2482,7 +2478,7 @@ TableViewSectionsDelegate>
             deactivateAccountBtnCell.mxkButton.titleLabel.text = nil;
         }
         
-        NSString *btnTitle = NSLocalizedStringFromTable(@"settings_deactivate_my_account", @"Vector", nil);
+        NSString *btnTitle = [VectorL10n settingsDeactivateMyAccount];
         [deactivateAccountBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateNormal];
         [deactivateAccountBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateHighlighted];
         [deactivateAccountBtnCell.mxkButton setTintColor:ThemeService.shared.theme.warningColor];
@@ -2682,9 +2678,9 @@ TableViewSectionsDelegate>
 
                 __weak typeof(self) weakSelf = self;
                 
-                currentAlert = [UIAlertController alertControllerWithTitle:[NSString stringWithFormat:NSLocalizedStringFromTable(@"settings_unignore_user", @"Vector", nil), ignoredUserId] message:nil preferredStyle:UIAlertControllerStyleAlert];
+                currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n settingsUnignoreUser:ignoredUserId] message:nil preferredStyle:UIAlertControllerStyleAlert];
 
-                [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"yes"]
+                [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n yes]
                                                                  style:UIAlertActionStyleDefault
                                                                handler:^(UIAlertAction * action) {
                                                                    
@@ -2715,7 +2711,7 @@ TableViewSectionsDelegate>
                                                                    
                                                                }]];
                 
-                [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"no"]
+                [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n no]
                                                                  style:UIAlertActionStyleDefault
                                                                handler:^(UIAlertAction * action) {
                                                                    
@@ -2737,7 +2733,7 @@ TableViewSectionsDelegate>
             {
                 WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:BuildSettings.applicationCopyrightUrlString];
                 
-                webViewViewController.title = NSLocalizedStringFromTable(@"settings_copyright", @"Vector", nil);
+                webViewViewController.title = [VectorL10n settingsCopyright];
                 
                 [self pushViewController:webViewViewController];
             }
@@ -2745,7 +2741,7 @@ TableViewSectionsDelegate>
             {
                 WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:BuildSettings.applicationTermsConditionsUrlString];
                 
-                webViewViewController.title = NSLocalizedStringFromTable(@"settings_term_conditions", @"Vector", nil);
+                webViewViewController.title = [VectorL10n settingsTermConditions];
                 
                 [self pushViewController:webViewViewController];
             }
@@ -2753,7 +2749,7 @@ TableViewSectionsDelegate>
             {
                 WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:BuildSettings.applicationPrivacyPolicyUrlString];
                 
-                webViewViewController.title = NSLocalizedStringFromTable(@"settings_privacy_policy", @"Vector", nil);
+                webViewViewController.title = [VectorL10n settingsPrivacyPolicy];
                 
                 [self pushViewController:webViewViewController];
             }
@@ -2763,7 +2759,7 @@ TableViewSectionsDelegate>
 
                 WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithLocalHTMLFile:htmlFile];
                 
-                webViewViewController.title = NSLocalizedStringFromTable(@"settings_third_party_notices", @"Vector", nil);
+                webViewViewController.title = [VectorL10n settingsThirdPartyNotices];
                 
                 [self pushViewController:webViewViewController];
             }
@@ -2884,7 +2880,7 @@ TableViewSectionsDelegate>
             if (row < linkedEmails.count)
             {
                 address = linkedEmails[row];
-                promptMsg = [NSString stringWithFormat:NSLocalizedStringFromTable(@"settings_remove_email_prompt_msg", @"Vector", nil), address];
+                promptMsg = [VectorL10n settingsRemoveEmailPromptMsg:address];
             }
         }
         else if (row >= USER_SETTINGS_PHONENUMBERS_OFFSET)
@@ -2897,9 +2893,9 @@ TableViewSectionsDelegate>
                 address = linkedPhones[row];
                 NSString *e164 = [NSString stringWithFormat:@"+%@", address];
                 NBPhoneNumber *phoneNb = [[NBPhoneNumberUtil sharedInstance] parse:e164 defaultRegion:nil error:nil];
-                NSString *phoneMunber = [[NBPhoneNumberUtil sharedInstance] format:phoneNb numberFormat:NBEPhoneNumberFormatINTERNATIONAL error:nil];
+                NSString *phoneNumber = [[NBPhoneNumberUtil sharedInstance] format:phoneNb numberFormat:NBEPhoneNumberFormatINTERNATIONAL error:nil];
                 
-                promptMsg = [NSString stringWithFormat:NSLocalizedStringFromTable(@"settings_remove_phone_prompt_msg", @"Vector", nil), phoneMunber];
+                promptMsg = [VectorL10n settingsRemovePhonePromptMsg:phoneNumber];
             }
         }
         
@@ -2914,9 +2910,9 @@ TableViewSectionsDelegate>
             }
             
             // Remove ?
-            currentAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"settings_remove_prompt_title", @"Vector", nil) message:promptMsg preferredStyle:UIAlertControllerStyleAlert];
+            currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n settingsRemovePromptTitle] message:promptMsg preferredStyle:UIAlertControllerStyleAlert];
             
-            [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                              style:UIAlertActionStyleCancel
                                                            handler:^(UIAlertAction * action) {
                                                                
@@ -2928,7 +2924,7 @@ TableViewSectionsDelegate>
                                                                
                                                            }]];
             
-            [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"remove", @"Vector", nil)
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n remove]
                                                              style:UIAlertActionStyleDefault
                                                            handler:^(UIAlertAction * action) {
                                                                
@@ -2988,12 +2984,12 @@ TableViewSectionsDelegate>
         
         __weak typeof(self) weakSelf = self;
         
-        NSString *title = NSLocalizedStringFromTable(@"settings_notifications_disabled_alert_title", @"Vector", nil);
-        NSString *message = NSLocalizedStringFromTable(@"settings_notifications_disabled_alert_message", @"Vector", nil);
+        NSString *title = [VectorL10n settingsNotificationsDisabledAlertTitle];
+        NSString *message = [VectorL10n settingsNotificationsDisabledAlertMessage];
         
         currentAlert = [UIAlertController alertControllerWithTitle:title message:message preferredStyle:UIAlertControllerStyleAlert];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+        [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                          style:UIAlertActionStyleCancel
                                                        handler:^(UIAlertAction * action) {
                                                            
@@ -3005,7 +3001,7 @@ TableViewSectionsDelegate>
                                                            
                                                        }]];
         
-        UIAlertAction *settingsAction = [UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"settings"]
+        UIAlertAction *settingsAction = [UIAlertAction actionWithTitle:[MatrixKitL10n settings]
                                                                  style:UIAlertActionStyleDefault
                                                                handler:^(UIAlertAction * action) {
                                                             if (weakSelf)
@@ -3402,7 +3398,7 @@ TableViewSectionsDelegate>
         NSString *title = [error.userInfo valueForKey:NSLocalizedFailureReasonErrorKey];
         if (!title)
         {
-            title = [NSBundle mxk_localizedStringForKey:@"settings_fail_to_update_profile"];
+            title = [VectorL10n settingsFailToUpdateProfile];
         }
         NSString *msg = [error.userInfo valueForKey:NSLocalizedDescriptionKey];
         
@@ -3410,7 +3406,7 @@ TableViewSectionsDelegate>
         
         currentAlert = [UIAlertController alertControllerWithTitle:title message:msg preferredStyle:UIAlertControllerStyleAlert];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+        [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                          style:UIAlertActionStyleDefault
                                                        handler:^(UIAlertAction * action) {
                                                            
@@ -3433,7 +3429,7 @@ TableViewSectionsDelegate>
                                                            
                                                        }]];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"retry"]
+        [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n retry]
                                                          style:UIAlertActionStyleDefault
                                                        handler:^(UIAlertAction * action) {
                                                            
@@ -3471,9 +3467,11 @@ TableViewSectionsDelegate>
         
         [currentAlert dismissViewControllerAnimated:NO completion:nil];
         
-        currentAlert = [UIAlertController alertControllerWithTitle:[NSBundle mxk_localizedStringForKey:@"account_error_email_wrong_title"] message:[NSBundle mxk_localizedStringForKey:@"account_error_email_wrong_description"] preferredStyle:UIAlertControllerStyleAlert];
+        currentAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n accountErrorEmailWrongTitle]
+                                                           message:[MatrixKitL10n accountErrorEmailWrongDescription]
+                                                    preferredStyle:UIAlertControllerStyleAlert];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+        [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                                          style:UIAlertActionStyleDefault
                                                        handler:^(UIAlertAction * action) {
                                                            
@@ -3503,7 +3501,7 @@ TableViewSectionsDelegate>
         __block MX3PidAddSession *thirdPidAddSession;
         thirdPidAddSession = [session.threePidAddManager startAddEmailSessionWithEmail:self->newEmailTextField.text nextLink:nil success:^{
 
-            [self showValidationEmailDialogWithMessage:[NSBundle mxk_localizedStringForKey:@"account_email_validation_message"]
+            [self showValidationEmailDialogWithMessage:[MatrixKitL10n accountEmailValidationMessage]
                                      for3PidAddSession:thirdPidAddSession
                                     threePidAddManager:session.threePidAddManager
                                               authenticationParameters:authParams];
@@ -3534,13 +3532,13 @@ TableViewSectionsDelegate>
 
                 if ([mxError.errcode isEqualToString:kMXErrCodeStringThreePIDInUse])
                 {
-                    userInfo[NSLocalizedDescriptionKey] = NSLocalizedStringFromTable(@"auth_email_in_use", @"Vector", nil);
-                    userInfo[@"error"] = NSLocalizedStringFromTable(@"auth_email_in_use", @"Vector", nil);
+                    userInfo[NSLocalizedDescriptionKey] = [VectorL10n authEmailInUse];
+                    userInfo[@"error"] = [VectorL10n authEmailInUse];
                 }
                 else
                 {
-                    userInfo[NSLocalizedDescriptionKey] = NSLocalizedStringFromTable(@"auth_untrusted_id_server", @"Vector", nil);
-                    userInfo[@"error"] = NSLocalizedStringFromTable(@"auth_untrusted_id_server", @"Vector", nil);
+                    userInfo[NSLocalizedDescriptionKey] = [VectorL10n authUntrustedIdServer];
+                    userInfo[@"error"] = [VectorL10n authUntrustedIdServer];
                 }
 
                 error = [NSError errorWithDomain:error.domain code:error.code userInfo:userInfo];
@@ -3551,7 +3549,7 @@ TableViewSectionsDelegate>
                 error = [NSError errorWithDomain:error.domain
                                             code:error.code
                                         userInfo:@{
-                                                   NSLocalizedDescriptionKey: [NSBundle mxk_localizedStringForKey:@"auth_email_is_required"]
+                                                   NSLocalizedDescriptionKey: [VectorL10n authEmailIsRequired]
                                                    }];
             }
 
@@ -3579,9 +3577,11 @@ TableViewSectionsDelegate>
         [currentAlert dismissViewControllerAnimated:NO completion:nil];
         __weak typeof(self) weakSelf = self;
 
-        currentAlert = [UIAlertController alertControllerWithTitle:[NSBundle mxk_localizedStringForKey:@"account_error_msisdn_wrong_title"] message:[NSBundle mxk_localizedStringForKey:@"account_error_msisdn_wrong_description"] preferredStyle:UIAlertControllerStyleAlert];
+        currentAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n accountErrorMsisdnWrongTitle]
+                                                           message:[MatrixKitL10n accountErrorMsisdnWrongDescription]
+                                                    preferredStyle:UIAlertControllerStyleAlert];
 
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+        [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                                          style:UIAlertActionStyleDefault
                                                        handler:^(UIAlertAction * action) {
 
@@ -3621,7 +3621,7 @@ TableViewSectionsDelegate>
         __block MX3PidAddSession *new3Pid;
         new3Pid = [session.threePidAddManager startAddPhoneNumberSessionWithPhoneNumber:msisdn countryCode:nil success:^{
 
-            [self showValidationMsisdnDialogWithMessage:[NSBundle mxk_localizedStringForKey:@"account_msisdn_validation_message"] for3PidAddSession:new3Pid threePidAddManager:session.threePidAddManager authenticationParameters:authParams];
+            [self showValidationMsisdnDialogWithMessage:[MatrixKitL10n accountMsisdnValidationMessage] for3PidAddSession:new3Pid threePidAddManager:session.threePidAddManager authenticationParameters:authParams];
 
         } failure:^(NSError *error) {
 
@@ -3649,13 +3649,13 @@ TableViewSectionsDelegate>
 
                 if ([mxError.errcode isEqualToString:kMXErrCodeStringThreePIDInUse])
                 {
-                    userInfo[NSLocalizedDescriptionKey] = NSLocalizedStringFromTable(@"auth_phone_in_use", @"Vector", nil);
-                    userInfo[@"error"] = NSLocalizedStringFromTable(@"auth_phone_in_use", @"Vector", nil);
+                    userInfo[NSLocalizedDescriptionKey] = [VectorL10n authPhoneInUse];
+                    userInfo[@"error"] = [VectorL10n authPhoneInUse];
                 }
                 else
                 {
-                    userInfo[NSLocalizedDescriptionKey] = NSLocalizedStringFromTable(@"auth_untrusted_id_server", @"Vector", nil);
-                    userInfo[@"error"] = NSLocalizedStringFromTable(@"auth_untrusted_id_server", @"Vector", nil);
+                    userInfo[NSLocalizedDescriptionKey] = [VectorL10n authUntrustedIdServer];
+                    userInfo[@"error"] = [VectorL10n authUntrustedIdServer];
                 }
 
                 error = [NSError errorWithDomain:error.domain code:error.code userInfo:userInfo];
@@ -3666,7 +3666,7 @@ TableViewSectionsDelegate>
                 error = [NSError errorWithDomain:error.domain
                                             code:error.code
                                         userInfo:@{
-                                                   NSLocalizedDescriptionKey: [NSBundle mxk_localizedStringForKey:@"auth_phone_is_required"]
+                                                   NSLocalizedDescriptionKey: [VectorL10n authPhoneIsRequired]
                                                    }];
             }
 
@@ -3764,7 +3764,7 @@ TableViewSectionsDelegate>
     };
     
     // Show "auto" only from iOS 11
-    autoAction = [UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"settings_ui_theme_auto", @"Vector", nil)
+    autoAction = [UIAlertAction actionWithTitle:[VectorL10n settingsUiThemeAuto]
                                           style:UIAlertActionStyleDefault
                                         handler:actionBlock];
 
@@ -3772,27 +3772,27 @@ TableViewSectionsDelegate>
     if (@available(iOS 13, *))
     {
         // Observe application did become active for iOS appearance setting changes
-        themePickerMessage = NSLocalizedStringFromTable(@"settings_ui_theme_picker_message_match_system_theme", @"Vector", nil);
+        themePickerMessage = [VectorL10n settingsUiThemePickerMessageMatchSystemTheme];
     }
     else
     {
         // Observe "Invert Colours" settings changes (available since iOS 11)
-        themePickerMessage = NSLocalizedStringFromTable(@"settings_ui_theme_picker_message_invert_colours", @"Vector", nil);
+        themePickerMessage = [VectorL10n settingsUiThemePickerMessageInvertColours];
     }
-
-    lightAction = [UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"settings_ui_theme_light", @"Vector", nil)
-                                          style:UIAlertActionStyleDefault
-                                        handler:actionBlock];
-
-    darkAction = [UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"settings_ui_theme_dark", @"Vector", nil)
+    
+    lightAction = [UIAlertAction actionWithTitle:[VectorL10n settingsUiThemeLight]
                                            style:UIAlertActionStyleDefault
                                          handler:actionBlock];
-    blackAction = [UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"settings_ui_theme_black", @"Vector", nil)
+    
+    darkAction = [UIAlertAction actionWithTitle:[VectorL10n settingsUiThemeDark]
                                           style:UIAlertActionStyleDefault
                                         handler:actionBlock];
+    blackAction = [UIAlertAction actionWithTitle:[VectorL10n settingsUiThemeBlack]
+                                           style:UIAlertActionStyleDefault
+                                         handler:actionBlock];
 
 
-    UIAlertController *themePicker = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"settings_ui_theme_picker_title", @"Vector", nil)
+    UIAlertController *themePicker = [UIAlertController alertControllerWithTitle:[VectorL10n settingsUiThemePickerTitle]
                                                                          message:themePickerMessage
                                                                   preferredStyle:UIAlertControllerStyleActionSheet];
 
@@ -3805,7 +3805,7 @@ TableViewSectionsDelegate>
     [themePicker addAction:blackAction];
 
     // Cancel button
-    [themePicker addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+    [themePicker addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                         style:UIAlertActionStyleCancel
                                                       handler:nil]];
 
@@ -3934,9 +3934,9 @@ TableViewSectionsDelegate>
     __weak typeof(self) weakSelf = self;
     [resetPwdAlertController dismissViewControllerAnimated:NO completion:nil];
     
-    resetPwdAlertController = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"settings_change_password", @"Vector", nil) message:nil preferredStyle:UIAlertControllerStyleAlert];
+    resetPwdAlertController = [UIAlertController alertControllerWithTitle:[VectorL10n settingsChangePassword] message:nil preferredStyle:UIAlertControllerStyleAlert];
     resetPwdAlertController.accessibilityLabel=@"ChangePasswordAlertController";
-    savePasswordAction = [UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"save", @"Vector", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+    savePasswordAction = [UIAlertAction actionWithTitle:[VectorL10n save] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
         
         if (weakSelf)
         {
@@ -3965,9 +3965,9 @@ TableViewSectionsDelegate>
                         {
                             [self->currentAlert dismissViewControllerAnimated:NO completion:nil];
                             
-                            self->currentAlert = [UIAlertController alertControllerWithTitle:nil message:NSLocalizedStringFromTable(@"settings_password_updated", @"Vector", nil) preferredStyle:UIAlertControllerStyleAlert];
+                            self->currentAlert = [UIAlertController alertControllerWithTitle:nil message:[VectorL10n settingsPasswordUpdated] preferredStyle:UIAlertControllerStyleAlert];
                             
-                            [self->currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+                            [self->currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                                                              style:UIAlertActionStyleDefault
                                                                            handler:^(UIAlertAction * action) {
                                                                                
@@ -4013,9 +4013,9 @@ TableViewSectionsDelegate>
                         {
                             [self->currentAlert dismissViewControllerAnimated:NO completion:nil];
                             
-                            self->currentAlert = [UIAlertController alertControllerWithTitle:nil message:NSLocalizedStringFromTable(@"settings_fail_to_update_password", @"Vector", nil) preferredStyle:UIAlertControllerStyleAlert];
+                            self->currentAlert = [UIAlertController alertControllerWithTitle:nil message:[VectorL10n settingsFailToUpdatePassword] preferredStyle:UIAlertControllerStyleAlert];
                             
-                            [self->currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
+                            [self->currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                                                                    style:UIAlertActionStyleDefault
                                                                                  handler:^(UIAlertAction * action) {
                                                                                      
@@ -4069,7 +4069,7 @@ TableViewSectionsDelegate>
             typeof(self) self = weakSelf;
             
             self->currentPasswordTextField = textField;
-            self->currentPasswordTextField.placeholder = NSLocalizedStringFromTable(@"settings_old_password", @"Vector", nil);
+            self->currentPasswordTextField.placeholder = [VectorL10n settingsOldPassword];
             self->currentPasswordTextField.secureTextEntry = YES;
             [self->currentPasswordTextField addTarget:self action:@selector(passwordTextFieldDidChange:) forControlEvents:UIControlEventEditingChanged];
         }
@@ -4083,7 +4083,7 @@ TableViewSectionsDelegate>
             typeof(self) self = weakSelf;
             
             self->newPasswordTextField1 = textField;
-            self->newPasswordTextField1.placeholder = NSLocalizedStringFromTable(@"settings_new_password", @"Vector", nil);
+            self->newPasswordTextField1.placeholder = [VectorL10n settingsNewPassword];
             self->newPasswordTextField1.secureTextEntry = YES;
             [self->newPasswordTextField1 addTarget:self action:@selector(passwordTextFieldDidChange:) forControlEvents:UIControlEventEditingChanged];
         }
@@ -4097,7 +4097,7 @@ TableViewSectionsDelegate>
             typeof(self) self = weakSelf;
             
             self->newPasswordTextField2 = textField;
-            self->newPasswordTextField2.placeholder = NSLocalizedStringFromTable(@"settings_confirm_password", @"Vector", nil);
+            self->newPasswordTextField2.placeholder = [VectorL10n settingsConfirmPassword];
             self->newPasswordTextField2.secureTextEntry = YES;
             [self->newPasswordTextField2 addTarget:self action:@selector(passwordTextFieldDidChange:) forControlEvents:UIControlEventEditingChanged];
         }
@@ -4226,8 +4226,8 @@ TableViewSectionsDelegate>
     else
     {
         // Set up cross-signing first
-        [self setupCrossSigningWithTitle:NSLocalizedStringFromTable(@"secure_key_backup_setup_intro_title", @"Vector", nil)
-                                 message:NSLocalizedStringFromTable(@"security_settings_user_password_description", @"Vector", nil)
+        [self setupCrossSigningWithTitle:[VectorL10n secureKeyBackupSetupIntroTitle]
+                                 message:[VectorL10n securitySettingsUserPasswordDescription]
                                  success:^{
                                      [self setupSecureBackup2];
                                  } failure:^(NSError *error) {
diff --git a/Riot/Modules/StartChat/StartChatViewController.m b/Riot/Modules/StartChat/StartChatViewController.m
index 428fa13fc..62987ea5a 100644
--- a/Riot/Modules/StartChat/StartChatViewController.m
+++ b/Riot/Modules/StartChat/StartChatViewController.m
@@ -89,7 +89,7 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view, typically from a nib.
 
-    self.navigationItem.title = NSLocalizedStringFromTable(@"room_creation_title", @"Vector", nil);
+    self.navigationItem.title = [VectorL10n roomCreationTitle];
     
     // Add each matrix session by default.
     NSArray *sessions = [AppDelegate theDelegate].mxSessions;
@@ -112,10 +112,10 @@
     cancelBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(onButtonPressed:)];
     self.navigationItem.leftBarButtonItem = cancelBarButtonItem;
     
-    createBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedStringFromTable(@"start", @"Vector", nil) style:UIBarButtonItemStylePlain target:self action:@selector(onButtonPressed:)];
+    createBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:[VectorL10n start] style:UIBarButtonItemStylePlain target:self action:@selector(onButtonPressed:)];
     self.navigationItem.rightBarButtonItem = createBarButtonItem;
     
-    _searchBarView.placeholder = NSLocalizedStringFromTable(@"room_creation_invite_another_user", @"Vector", nil);
+    _searchBarView.placeholder = [VectorL10n roomCreationInviteAnotherUser];
     _searchBarView.returnKeyType = UIReturnKeyDone;
     _searchBarView.autocapitalizationType = UITextAutocapitalizationTypeNone;    
     [self refreshSearchBarItemsColor:_searchBarView];
@@ -210,7 +210,7 @@
     [super addMatrixSession:mxSession];
     
     // FIXME: Handle multi accounts
-    NSString *displayName = NSLocalizedStringFromTable(@"you", @"Vector", nil);
+    NSString *displayName = [VectorL10n you];
     userContact = [[MXKContact alloc] initMatrixContactWithDisplayName:displayName andMatrixID:self.mainSession.myUser.userId];
     
     [self refreshParticipants];
@@ -624,7 +624,7 @@
                 MXLogDebug(@"[StartChatViewController] Create room failed");
 
                 // Alert user
-                [[AppDelegate theDelegate] showAlertWithTitle:nil message:NSLocalizedStringFromTable(@"room_creation_dm_error", @"Vector", nil)];
+                [[AppDelegate theDelegate] showAlertWithTitle:nil message:[VectorL10n roomCreationDmError]];
             };
 
             [self.mainSession vc_canEnableE2EByDefaultInNewRoomWithUsers:inviteArray success:^(BOOL canEnableE2E) {
@@ -757,10 +757,10 @@
             
             [contactsTableViewController refreshCurrentSelectedCell:YES];
             
-            UIAlertController *alert = [UIAlertController alertControllerWithTitle:[NSBundle mxk_localizedStringForKey:@"error"]
-                                                                           message:NSLocalizedStringFromTable(@"room_creation_error_invite_user_by_email_without_identity_server", @"Vector", nil)
+            UIAlertController *alert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n error]
+                                                                           message:[VectorL10n roomCreationErrorInviteUserByEmailWithoutIdentityServer]
                                                                     preferredStyle:UIAlertControllerStyleAlert];
-            [alert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"] style:UIAlertActionStyleDefault handler:nil]];
+            [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok] style:UIAlertActionStyleDefault handler:nil]];
             [self presentViewController:alert animated:YES completion:nil];
             
             return;
diff --git a/Riot/Modules/TabBar/MasterTabBarController.m b/Riot/Modules/TabBar/MasterTabBarController.m
index 846829256..e84078a19 100644
--- a/Riot/Modules/TabBar/MasterTabBarController.m
+++ b/Riot/Modules/TabBar/MasterTabBarController.m
@@ -117,7 +117,7 @@
     [self vc_removeBackTitle];
     
     [self setupTitleView];
-    titleView.titleLabel.text = NSLocalizedStringFromTable(@"title_home", @"Vector", nil);
+    titleView.titleLabel.text = [VectorL10n titleHome];
     
     childViewControllers = [NSMutableArray array];
     
@@ -1081,7 +1081,7 @@
     if (count > 1000)
     {
         CGFloat value = count / 1000.0;
-        badgeValue = [NSString stringWithFormat:NSLocalizedStringFromTable(@"large_badge_value_k_format", @"Vector", nil), value];
+        badgeValue = [VectorL10n largeBadgeValueKFormat:value];
     }
     else
     {
@@ -1116,9 +1116,9 @@
     
     NSString *appDisplayName = [[NSBundle mainBundle] infoDictionary][@"CFBundleDisplayName"];
     
-    currentAlert = [UIAlertController alertControllerWithTitle:[NSString stringWithFormat:NSLocalizedStringFromTable(@"google_analytics_use_prompt", @"Vector", nil), appDisplayName] message:nil preferredStyle:UIAlertControllerStyleAlert];
+    currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n googleAnalyticsUsePrompt:appDisplayName] message:nil preferredStyle:UIAlertControllerStyleAlert];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"no"]
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n no]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
                                                        
@@ -1132,7 +1132,7 @@
                                                        
                                                    }]];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"yes"]
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n yes]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
                                                                                                               
@@ -1173,21 +1173,21 @@
     
     [currentAlert dismissViewControllerAnimated:NO completion:nil];
     
-    UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"key_verification_self_verify_current_session_alert_title", @"Vector", nil)
-                                                                   message:NSLocalizedStringFromTable(@"key_verification_self_verify_current_session_alert_message", @"Vector", nil)
+    UIAlertController *alert = [UIAlertController alertControllerWithTitle:[VectorL10n keyVerificationSelfVerifyCurrentSessionAlertTitle]
+                                                                   message:[VectorL10n keyVerificationSelfVerifyCurrentSessionAlertMessage]
                                                             preferredStyle:UIAlertControllerStyleAlert];
     
-    [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"key_verification_self_verify_current_session_alert_validate_action", @"Vector", nil)
+    [alert addAction:[UIAlertAction actionWithTitle:[VectorL10n keyVerificationSelfVerifyCurrentSessionAlertValidateAction]
                                               style:UIAlertActionStyleDefault
                                             handler:^(UIAlertAction * action) {
                                                 [[AppDelegate theDelegate] presentCompleteSecurityForSession:session];
                                             }]];
     
-    [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"later", @"Vector", nil)
+    [alert addAction:[UIAlertAction actionWithTitle:[VectorL10n later]
                                               style:UIAlertActionStyleCancel
                                             handler:nil]];
     
-    [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"do_not_ask_again", @"Vector", nil)
+    [alert addAction:[UIAlertAction actionWithTitle:[VectorL10n doNotAskAgain]
                                               style:UIAlertActionStyleDestructive
                                             handler:^(UIAlertAction * action) {
                                                 RiotSettings.shared.hideVerifyThisSessionAlert = YES;
@@ -1232,21 +1232,21 @@
     
     [currentAlert dismissViewControllerAnimated:NO completion:nil];
     
-    UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"key_verification_self_verify_unverified_sessions_alert_title", @"Vector", nil)
-                                                                   message:NSLocalizedStringFromTable(@"key_verification_self_verify_unverified_sessions_alert_message", @"Vector", nil)
+    UIAlertController *alert = [UIAlertController alertControllerWithTitle:[VectorL10n keyVerificationSelfVerifyUnverifiedSessionsAlertTitle]
+                                                                   message:[VectorL10n keyVerificationSelfVerifyUnverifiedSessionsAlertMessage]
                                                             preferredStyle:UIAlertControllerStyleAlert];
     
-    [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"key_verification_self_verify_unverified_sessions_alert_validate_action", @"Vector", nil)
+    [alert addAction:[UIAlertAction actionWithTitle:[VectorL10n keyVerificationSelfVerifyUnverifiedSessionsAlertValidateAction]
                                               style:UIAlertActionStyleDefault
                                             handler:^(UIAlertAction * action) {
                                                 [self showSettingsSecurityScreenForSession:session];
                                             }]];
     
-    [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"later", @"Vector", nil)
+    [alert addAction:[UIAlertAction actionWithTitle:[VectorL10n later]
                                               style:UIAlertActionStyleCancel
                                             handler:nil]];
     
-    [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"do_not_ask_again", @"Vector", nil)
+    [alert addAction:[UIAlertAction actionWithTitle:[VectorL10n doNotAskAgain]
                                               style:UIAlertActionStyleDestructive
                                             handler:^(UIAlertAction * action) {
                                                 RiotSettings.shared.hideReviewSessionsAlert = YES;
diff --git a/Riot/Modules/UserDevices/UsersDevicesViewController.m b/Riot/Modules/UserDevices/UsersDevicesViewController.m
index fb8567f56..5d6a1f8eb 100644
--- a/Riot/Modules/UserDevices/UsersDevicesViewController.m
+++ b/Riot/Modules/UserDevices/UsersDevicesViewController.m
@@ -56,7 +56,7 @@
 {
     [super viewDidLoad];
 
-    self.title = NSLocalizedStringFromTable(@"unknown_devices_title", @"Vector", nil);
+    self.title = [VectorL10n unknownDevicesTitle];
     self.accessibilityLabel=@"UsersDevicesVCTitleStaticText";
     self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(onDone:)];
     self.navigationItem.rightBarButtonItem.accessibilityIdentifier=@"UsersDevicesVCDoneButton";
diff --git a/Riot/Modules/UserDevices/Views/DeviceTableViewCell.m b/Riot/Modules/UserDevices/Views/DeviceTableViewCell.m
index af66909b8..6ac1a31fa 100644
--- a/Riot/Modules/UserDevices/Views/DeviceTableViewCell.m
+++ b/Riot/Modules/UserDevices/Views/DeviceTableViewCell.m
@@ -57,20 +57,20 @@
         {
             self.deviceStatus.image = [UIImage imageNamed:@"e2e_warning"];
             
-            [_verifyButton setTitle:[NSBundle mxk_localizedStringForKey:@"room_event_encryption_info_verify"] forState:UIControlStateNormal];
-            [_verifyButton setTitle:[NSBundle mxk_localizedStringForKey:@"room_event_encryption_info_verify"] forState:UIControlStateHighlighted];
-            [_blockButton setTitle:[NSBundle mxk_localizedStringForKey:@"room_event_encryption_info_block"] forState:UIControlStateNormal];
-            [_blockButton setTitle:[NSBundle mxk_localizedStringForKey:@"room_event_encryption_info_block"] forState:UIControlStateHighlighted];
+            [_verifyButton setTitle:[MatrixKitL10n roomEventEncryptionInfoVerify] forState:UIControlStateNormal];
+            [_verifyButton setTitle:[MatrixKitL10n roomEventEncryptionInfoVerify] forState:UIControlStateHighlighted];
+            [_blockButton setTitle:[MatrixKitL10n roomEventEncryptionInfoBlock] forState:UIControlStateNormal];
+            [_blockButton setTitle:[MatrixKitL10n roomEventEncryptionInfoBlock] forState:UIControlStateHighlighted];
             break;
         }
         case MXDeviceVerified:
         {
             self.deviceStatus.image = [UIImage imageNamed:@"e2e_verified"];
             
-            [_verifyButton setTitle:[NSBundle mxk_localizedStringForKey:@"room_event_encryption_info_unverify"] forState:UIControlStateNormal];
-            [_verifyButton setTitle:[NSBundle mxk_localizedStringForKey:@"room_event_encryption_info_unverify"] forState:UIControlStateHighlighted];
-            [_blockButton setTitle:[NSBundle mxk_localizedStringForKey:@"room_event_encryption_info_block"] forState:UIControlStateNormal];
-            [_blockButton setTitle:[NSBundle mxk_localizedStringForKey:@"room_event_encryption_info_block"] forState:UIControlStateHighlighted];
+            [_verifyButton setTitle:[MatrixKitL10n roomEventEncryptionInfoUnverify] forState:UIControlStateNormal];
+            [_verifyButton setTitle:[MatrixKitL10n roomEventEncryptionInfoUnverify] forState:UIControlStateHighlighted];
+            [_blockButton setTitle:[MatrixKitL10n roomEventEncryptionInfoBlock] forState:UIControlStateNormal];
+            [_blockButton setTitle:[MatrixKitL10n roomEventEncryptionInfoBlock] forState:UIControlStateHighlighted];
             
             break;
         }
@@ -78,10 +78,10 @@
         {
             self.deviceStatus.image = [UIImage imageNamed:@"e2e_blocked"];
             
-            [_verifyButton setTitle:[NSBundle mxk_localizedStringForKey:@"room_event_encryption_info_verify"] forState:UIControlStateNormal];
-            [_verifyButton setTitle:[NSBundle mxk_localizedStringForKey:@"room_event_encryption_info_verify"] forState:UIControlStateHighlighted];
-            [_blockButton setTitle:[NSBundle mxk_localizedStringForKey:@"room_event_encryption_info_unblock"] forState:UIControlStateNormal];
-            [_blockButton setTitle:[NSBundle mxk_localizedStringForKey:@"room_event_encryption_info_unblock"] forState:UIControlStateHighlighted];
+            [_verifyButton setTitle:[MatrixKitL10n roomEventEncryptionInfoVerify] forState:UIControlStateNormal];
+            [_verifyButton setTitle:[MatrixKitL10n roomEventEncryptionInfoVerify] forState:UIControlStateHighlighted];
+            [_blockButton setTitle:[MatrixKitL10n roomEventEncryptionInfoUnblock] forState:UIControlStateNormal];
+            [_blockButton setTitle:[MatrixKitL10n roomEventEncryptionInfoUnblock] forState:UIControlStateHighlighted];
             
             break;
         }
diff --git a/Riot/Utils/EventFormatter.m b/Riot/Utils/EventFormatter.m
index b5135a47c..248850691 100644
--- a/Riot/Utils/EventFormatter.m
+++ b/Riot/Utils/EventFormatter.m
@@ -88,25 +88,22 @@ static NSString *const kEventFormatterTimeFormat = @"HH:mm";
                     // This is an alive jitsi widget
                     if (isEventSenderMyUser)
                     {
-                        displayText = NSLocalizedStringFromTable(@"event_formatter_jitsi_widget_added_by_you", @"Vector", nil);
+                        displayText = [VectorL10n eventFormatterJitsiWidgetAddedByYou];
                     }
                     else
                     {
-                        displayText = [NSString stringWithFormat:NSLocalizedStringFromTable(@"event_formatter_jitsi_widget_added", @"Vector", nil), senderDisplayName];
+                        displayText = [VectorL10n eventFormatterJitsiWidgetAdded:senderDisplayName];
                     }
                 }
                 else
                 {
                     if (isEventSenderMyUser)
                     {
-                        displayText = [NSString stringWithFormat:NSLocalizedStringFromTable(@"event_formatter_widget_added_by_you", @"Vector", nil),
-                        widget.name ? widget.name : widget.type];
+                        displayText = [VectorL10n eventFormatterWidgetAddedByYou:(widget.name ? widget.name : widget.type)];
                     }
                     else
                     {
-                        displayText = [NSString stringWithFormat:NSLocalizedStringFromTable(@"event_formatter_widget_added", @"Vector", nil),
-                        widget.name ? widget.name : widget.type,
-                        senderDisplayName];
+                        displayText = [VectorL10n eventFormatterWidgetAdded:(widget.name ? widget.name : widget.type) :senderDisplayName];
                     }
                 }
             }
@@ -136,14 +133,11 @@ static NSString *const kEventFormatterTimeFormat = @"HH:mm";
                             {
                                 if (isEventSenderMyUser)
                                 {
-                                    displayText = [NSString stringWithFormat:NSLocalizedStringFromTable(@"event_formatter_widget_removed_by_you", @"Vector", nil),
-                                                   activeWidget.name ? activeWidget.name : activeWidget.type];
+                                    displayText = [VectorL10n eventFormatterWidgetRemovedByYou:(activeWidget.name ? activeWidget.name : activeWidget.type)];
                                 }
                                 else
                                 {
-                                    displayText = [NSString stringWithFormat:NSLocalizedStringFromTable(@"event_formatter_widget_removed", @"Vector", nil),
-                                                   activeWidget.name ? activeWidget.name : activeWidget.type,
-                                                   senderDisplayName];
+                                    displayText = [VectorL10n eventFormatterWidgetRemoved:(activeWidget.name ? activeWidget.name : activeWidget.type) :senderDisplayName];
                                 }
                             }
                             break;
@@ -236,7 +230,7 @@ static NSString *const kEventFormatterTimeFormat = @"HH:mm";
                                           event.eventId];
 
             [attributedStringWithRerequestMessage appendAttributedString:
-             [[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"event_formatter_rerequest_keys_part1_link", @"Vector", nil)
+             [[NSAttributedString alloc] initWithString:[VectorL10n eventFormatterRerequestKeysPart1Link]
                                              attributes:@{
                                                           NSLinkAttributeName: linkActionString,
                                                           NSForegroundColorAttributeName: self.sendingTextColor,
@@ -244,7 +238,7 @@ static NSString *const kEventFormatterTimeFormat = @"HH:mm";
                                                           }]];
 
             [attributedStringWithRerequestMessage appendAttributedString:
-             [[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"event_formatter_rerequest_keys_part2", @"Vector", nil)
+             [[NSAttributedString alloc] initWithString:[VectorL10n eventFormatterRerequestKeysPart2]
                                              attributes:@{
                                                           NSForegroundColorAttributeName: self.sendingTextColor,
                                                           NSFontAttributeName: self.encryptedMessagesTextFont
@@ -262,7 +256,7 @@ static NSString *const kEventFormatterTimeFormat = @"HH:mm";
                                       event.eventId];
         
         [attributedStringWithEditMention appendAttributedString:
-         [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@" %@", NSLocalizedStringFromTable(@"event_formatter_message_edited_mention", @"Vector", nil)]
+         [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@" %@", [VectorL10n eventFormatterMessageEditedMention]]
                                          attributes:@{
                                                       NSLinkAttributeName: linkActionString,
                                                       // NOTE: Color is curretly overidden by UIText.tintColor as we use `NSLinkAttributeName`.
@@ -302,7 +296,7 @@ static NSString *const kEventFormatterTimeFormat = @"HH:mm";
             //  add one-char space
             [result appendAttributedString:[[NSAttributedString alloc] initWithString:@" "]];
             //  add more link
-            NSAttributedString *linkMore = [[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"more", @"Vector", nil) attributes:@{
+            NSAttributedString *linkMore = [[NSAttributedString alloc] initWithString:[VectorL10n more] attributes:@{
                 NSFontAttributeName: [UIFont systemFontOfSize:13],
                 NSForegroundColorAttributeName: ThemeService.shared.theme.tintColor
             }];
@@ -318,7 +312,7 @@ static NSString *const kEventFormatterTimeFormat = @"HH:mm";
         {
             // This is a series for cells tagged with RoomBubbleCellDataTagMembership
             // TODO: Build a complete summary like Riot-web
-            displayText = [NSString stringWithFormat:NSLocalizedStringFromTable(@"event_formatter_member_updates", @"Vector", nil), events.count];
+            displayText = [VectorL10n eventFormatterMemberUpdates:events.count];
         }
     }
 
@@ -525,9 +519,9 @@ static NSString *const kEventFormatterTimeFormat = @"HH:mm";
         if (time)
         {
             [dateFormatter setDateFormat:nil];
-            return [NSString stringWithFormat:@"%@ %@", NSLocalizedStringFromTable(@"yesterday", @"Vector", nil), [super dateStringFromDate:date withTime:YES]];
+            return [NSString stringWithFormat:@"%@ %@", [VectorL10n yesterday], [super dateStringFromDate:date withTime:YES]];
         }
-        return NSLocalizedStringFromTable(@"yesterday", @"Vector", nil);
+        return [VectorL10n yesterday];
     }
     else if (interval > - 60*60*24)
     {
@@ -536,7 +530,7 @@ static NSString *const kEventFormatterTimeFormat = @"HH:mm";
             [dateFormatter setDateFormat:nil];
             return [NSString stringWithFormat:@"%@", [super dateStringFromDate:date withTime:YES]];
         }
-        return NSLocalizedStringFromTable(@"today", @"Vector", nil);
+        return [VectorL10n today];
     }
     else
     {
@@ -561,10 +555,10 @@ static NSString *const kEventFormatterTimeFormat = @"HH:mm";
     
     NSMutableAttributedString *roomPredecessorAttributedString = [NSMutableAttributedString new];
     
-    NSString *roomPredecessorReasonString = [NSString stringWithFormat:@"%@\n", NSLocalizedStringFromTable(@"room_predecessor_information", @"Vector", nil)];
+    NSString *roomPredecessorReasonString = [NSString stringWithFormat:@"%@\n", [VectorL10n roomPredecessorInformation]];
     NSAttributedString *roomPredecessorReasonAttributedString = [[NSAttributedString alloc] initWithString:roomPredecessorReasonString attributes:roomPredecessorReasonAttributes];
     
-    NSString *predecessorRoomLinkString = NSLocalizedStringFromTable(@"room_predecessor_link", @"Vector", nil);
+    NSString *predecessorRoomLinkString = [VectorL10n roomPredecessorLink];
     NSAttributedString *predecessorRoomLinkAttributedString = [[NSAttributedString alloc] initWithString:predecessorRoomLinkString attributes:roomLinkAttributes];
     
     [roomPredecessorAttributedString appendAttributedString:roomPredecessorReasonAttributedString];
diff --git a/Riot/Utils/Tools.m b/Riot/Utils/Tools.m
index c9402d152..dfb212b84 100644
--- a/Riot/Utils/Tools.m
+++ b/Riot/Utils/Tools.m
@@ -22,39 +22,38 @@
 
 + (NSString *)presenceText:(MXUser *)user
 {
-    NSString* presenceText = NSLocalizedStringFromTable(@"room_participants_unknown", @"Vector", nil);
+    NSString* presenceText = [VectorL10n roomParticipantsUnknown];
 
     if (user)
     {
         switch (user.presence)
         {
             case MXPresenceOnline:
-                presenceText = NSLocalizedStringFromTable(@"room_participants_online", @"Vector", nil);
+                presenceText = [VectorL10n roomParticipantsOnline];
                 break;
 
             case MXPresenceUnavailable:
-                presenceText = NSLocalizedStringFromTable(@"room_participants_idle", @"Vector", nil);
+                presenceText = [VectorL10n roomParticipantsIdle];
                 break;
-
+                
             case MXPresenceUnknown: // Do like matrix-js-sdk
             case MXPresenceOffline:
-                presenceText = NSLocalizedStringFromTable(@"room_participants_offline", @"Vector", nil);
+                presenceText = [VectorL10n roomParticipantsOffline];
                 break;
-
+                
             default:
                 break;
         }
-
+        
         if (user.currentlyActive)
         {
-            presenceText = [presenceText stringByAppendingString:[NSString stringWithFormat:@" %@",
-                                                                  NSLocalizedStringFromTable(@"room_participants_now", @"Vector", nil)]];
+            presenceText = [presenceText stringByAppendingString:[VectorL10n roomParticipantsNow]];
         }
         else if (-1 != user.lastActiveAgo && 0 < user.lastActiveAgo)
         {
             presenceText = [presenceText stringByAppendingString:[NSString stringWithFormat:@" %@ %@",
                                                                   [MXKTools formatSecondsIntervalFloored:(user.lastActiveAgo / 1000)],
-                                                                  NSLocalizedStringFromTable(@"room_participants_ago", @"Vector", nil)]];
+                                                                  [VectorL10n roomParticipantsAgo]]];
         }
     }
 
diff --git a/RiotShareExtension/Managers/ShareExtensionManager.m b/RiotShareExtension/Managers/ShareExtensionManager.m
index de9bc9baf..ea58a7d34 100644
--- a/RiotShareExtension/Managers/ShareExtensionManager.m
+++ b/RiotShareExtension/Managers/ShareExtensionManager.m
@@ -511,15 +511,15 @@ typedef NS_ENUM(NSInteger, ImageCompressionMode)
     {
         __weak typeof(self) weakSelf = self;
         
-        compressionPrompt = [UIAlertController alertControllerWithTitle:[NSBundle mxk_localizedStringForKey:@"attachment_size_prompt_title"]
-                                                                message:[NSBundle mxk_localizedStringForKey:@"attachment_size_prompt_message"]
+        compressionPrompt = [UIAlertController alertControllerWithTitle:[MatrixKitL10n attachmentSizePromptTitle]
+                                                                message:[MatrixKitL10n attachmentSizePromptMessage]
                                                          preferredStyle:UIAlertControllerStyleActionSheet];
         
         if (compressionSizes.small.fileSize)
         {
             NSString *fileSizeString = [MXTools fileSizeToString:compressionSizes.small.fileSize];
             
-            NSString *title = [NSString stringWithFormat:[NSBundle mxk_localizedStringForKey:@"attachment_small"], fileSizeString];
+            NSString *title = [MatrixKitL10n attachmentSmall:fileSizeString];
             
             [compressionPrompt addAction:[UIAlertAction actionWithTitle:title
                                                                   style:UIAlertActionStyleDefault
@@ -547,7 +547,7 @@ typedef NS_ENUM(NSInteger, ImageCompressionMode)
         {
             NSString *fileSizeString = [MXTools fileSizeToString:compressionSizes.medium.fileSize];
             
-            NSString *title = [NSString stringWithFormat:[NSBundle mxk_localizedStringForKey:@"attachment_medium"], fileSizeString];
+            NSString *title = [MatrixKitL10n attachmentMedium:fileSizeString];
             
             [compressionPrompt addAction:[UIAlertAction actionWithTitle:title
                                                                   style:UIAlertActionStyleDefault
@@ -577,7 +577,7 @@ typedef NS_ENUM(NSInteger, ImageCompressionMode)
         {
             NSString *fileSizeString = [MXTools fileSizeToString:compressionSizes.large.fileSize];
             
-            NSString *title = [NSString stringWithFormat:[NSBundle mxk_localizedStringForKey:@"attachment_large"], fileSizeString];
+            NSString *title = [MatrixKitL10n attachmentLarge:fileSizeString];
             
             [compressionPrompt addAction:[UIAlertAction actionWithTitle:title
                                                                   style:UIAlertActionStyleDefault
@@ -607,7 +607,7 @@ typedef NS_ENUM(NSInteger, ImageCompressionMode)
         {
             NSString *fileSizeString = [MXTools fileSizeToString:compressionSizes.original.fileSize];
             
-            NSString *title = [NSString stringWithFormat:[NSBundle mxk_localizedStringForKey:@"attachment_original"], fileSizeString];
+            NSString *title = [MatrixKitL10n attachmentOriginal:fileSizeString];
             
             [compressionPrompt addAction:[UIAlertAction actionWithTitle:title
                                                                   style:UIAlertActionStyleDefault
@@ -629,7 +629,7 @@ typedef NS_ENUM(NSInteger, ImageCompressionMode)
                                                                 }]];
         }
         
-        [compressionPrompt addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
+        [compressionPrompt addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                               style:UIAlertActionStyleCancel
                                                             handler:nil]];
         
diff --git a/RiotShareExtension/Modules/Fallback/FallbackViewController.m b/RiotShareExtension/Modules/Fallback/FallbackViewController.m
index ce5774a69..74f81b4a0 100644
--- a/RiotShareExtension/Modules/Fallback/FallbackViewController.m
+++ b/RiotShareExtension/Modules/Fallback/FallbackViewController.m
@@ -38,7 +38,7 @@
     
     self.view.backgroundColor = ThemeService.shared.theme.backgroundColor;
     self.titleLabel.textColor = ThemeService.shared.theme.textSecondaryColor;
-    self.titleLabel.text = NSLocalizedStringFromTable(@"share_extension_auth_prompt", @"Vector", nil);
+    self.titleLabel.text = [VectorL10n shareExtensionAuthPrompt];
     self.logoImageView.tintColor = ThemeService.shared.theme.tintColor;
 }
 
diff --git a/RiotShareExtension/Modules/Share/Listing/RoomsListViewController.m b/RiotShareExtension/Modules/Share/Listing/RoomsListViewController.m
index cdaa816b7..3f6e67b2e 100644
--- a/RiotShareExtension/Modules/Share/Listing/RoomsListViewController.m
+++ b/RiotShareExtension/Modules/Share/Listing/RoomsListViewController.m
@@ -65,7 +65,7 @@
     _tableSearchBar.autoresizingMask = UIViewAutoresizingFlexibleWidth;
     _tableSearchBar.showsCancelButton = NO;
     _tableSearchBar.searchBarStyle = UISearchBarStyleMinimal;
-    _tableSearchBar.placeholder = NSLocalizedStringFromTable(@"search_default_placeholder", @"Vector", nil);
+    _tableSearchBar.placeholder = [VectorL10n searchDefaultPlaceholder];
     _tableSearchBar.delegate = self;
 }
 
@@ -96,7 +96,7 @@
     self.recentsSearchBar.autocapitalizationType = UITextAutocapitalizationTypeNone;
     
     self.recentsSearchBar.searchBarStyle = UISearchBarStyleMinimal;
-    self.recentsSearchBar.placeholder = NSLocalizedStringFromTable(@"search_default_placeholder", @"Vector", nil);
+    self.recentsSearchBar.placeholder = [VectorL10n searchDefaultPlaceholder];
     self.recentsSearchBar.tintColor = ThemeService.shared.theme.tintColor;
     self.recentsSearchBar.backgroundColor = ThemeService.shared.theme.baseColor;
     
@@ -144,15 +144,15 @@
     NSString *roomName = recentCellData.roomSummary.displayname;
     if (!roomName.length)
     {
-        roomName = [NSBundle mxk_localizedStringForKey:@"room_displayname_empty_room"];
+        roomName = [MatrixKitL10n roomDisplaynameEmptyRoom];
     }
     
-    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:[NSString stringWithFormat:NSLocalizedStringFromTable(@"send_to", @"Vector", nil), roomName] message:nil preferredStyle:UIAlertControllerStyleAlert];
+    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:[VectorL10n sendTo:roomName] message:nil preferredStyle:UIAlertControllerStyleAlert];
     
-    UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] style:UIAlertActionStyleCancel handler:nil];
+    UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:[MatrixKitL10n cancel] style:UIAlertActionStyleCancel handler:nil];
     [alertController addAction:cancelAction];
     
-    UIAlertAction *sendAction = [UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"send"] style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+    UIAlertAction *sendAction = [UIAlertAction actionWithTitle:[MatrixKitL10n send] style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         
         // The selected room is instanciated here
         MXSession *session = [[MXSession alloc] initWithMatrixRestClient:[[MXRestClient alloc] initWithCredentials:[ShareExtensionManager sharedManager].userAccount.mxCredentials andOnUnrecognizedCertificateBlock:nil]];
@@ -175,7 +175,7 @@
                 NSString *title;
                 if ([error.domain isEqualToString:MXEncryptingErrorDomain])
                 {
-                    title = NSLocalizedStringFromTable(@"share_extension_failed_to_encrypt", @"Vector", nil);
+                    title = [VectorL10n shareExtensionFailedToEncrypt];
                 }
 
                 [self showFailureAlert:title];
@@ -195,8 +195,8 @@
 
 - (void)showFailureAlert:(NSString *)title
 {
-    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:title.length ? title : NSLocalizedStringFromTable(@"room_event_failed_to_send", @"Vector", nil) message:nil preferredStyle:UIAlertControllerStyleAlert];
-    UIAlertAction *okAction = [UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"] style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:title.length ? title : [VectorL10n roomEventFailedToSend] message:nil preferredStyle:UIAlertControllerStyleAlert];
+    UIAlertAction *okAction = [UIAlertAction actionWithTitle:[MatrixKitL10n ok] style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         if (self.failureBlock)
         {
             self.failureBlock();
@@ -321,7 +321,7 @@
         if (!self.hudView)
         {
             self.parentViewController.view.userInteractionEnabled = NO;
-            self.hudView = [MXKPieChartHUD showLoadingHudOnView:self.view WithMessage:NSLocalizedStringFromTable(@"sending", @"Vector", nil)];
+            self.hudView = [MXKPieChartHUD showLoadingHudOnView:self.view WithMessage:[VectorL10n sending]];
             [self.hudView setProgress:0.0];
         }
     });
diff --git a/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m b/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m
index 386d25835..90550a99e 100644
--- a/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m
+++ b/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m
@@ -75,7 +75,7 @@
         self.roomTitleLabel.text = roomCellData.roomSummary.displayname;
         if (!self.roomTitleLabel.text.length)
         {
-            self.roomTitleLabel.text = [NSBundle mxk_localizedStringForKey:@"room_displayname_empty_room"];
+            self.roomTitleLabel.text = [MatrixKitL10n roomDisplaynameEmptyRoom];
         }  
         
         self.encryptedRoomIcon.hidden = YES;
diff --git a/RiotShareExtension/Modules/Share/ShareViewController.m b/RiotShareExtension/Modules/Share/ShareViewController.m
index 54976634b..af4796e72 100644
--- a/RiotShareExtension/Modules/Share/ShareViewController.m
+++ b/RiotShareExtension/Modules/Share/ShareViewController.m
@@ -103,7 +103,7 @@
     
     if ([ShareExtensionManager sharedManager].userAccount)
     {
-        self.titleLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"send_to", @"Vector", nil), @""];
+        self.titleLabel.text = [VectorL10n sendTo:@""];
         [self configureSegmentedViewController];
     }
     else
@@ -119,7 +119,7 @@
 {
     self.segmentedViewController = [SegmentedViewController segmentedViewController];
     
-    NSArray *titles = @[NSLocalizedStringFromTable(@"title_rooms", @"Vector", nil) , NSLocalizedStringFromTable(@"title_people", @"Vector", nil)];
+    NSArray *titles = @[[VectorL10n titleRooms], [VectorL10n titlePeople]];
     
     void (^failureBlock)(void) = ^void() {
         [self dismissViewControllerAnimated:YES completion:^{
diff --git a/RiotShareExtension/target.yml b/RiotShareExtension/target.yml
index e9c2653d8..2fb6d6fe9 100644
--- a/RiotShareExtension/target.yml
+++ b/RiotShareExtension/target.yml
@@ -56,6 +56,9 @@ targets:
     - path: ../Riot/Categories/String.swift
     - path: ../Riot/Modules/Common/Recents/CellData/RecentCellData.m
     - path: ../Riot/PropertyWrappers/UserDefaultsBackedPropertyWrapper.swift
+    - path: ../Riot/Generated/Strings.swift
+    - path: ../Riot/Managers/Locale/LocaleProviderType.swift
+    - path: ../Riot/Managers/Locale/LocaleProvider.swift
     - path: ../Riot/Modules/Common/SegmentedViewController/SegmentedViewController.xib
       buildPhase: resources
     - path: ../Riot/Assets/en.lproj/Vector.strings

From 010178f397dc6fc58490f6a4f69c5f2a21e67ff0 Mon Sep 17 00:00:00 2001
From: Stefan Ceriu <stefanc@matrix.org>
Date: Tue, 28 Sep 2021 08:47:47 +0300
Subject: [PATCH 35/59] vector-im/element-ios/issues/4899 - Fixed various
 localization issues.

---
 Riot/Managers/Call/CallPresenter.swift        |  3 +-
 .../Call/Views/CallAudioRouteView.swift       |  2 +-
 .../Camera/CameraAccessAlertPresenter.swift   |  4 +--
 .../IntegrationManagerViewController.m        | 28 +++++++++----------
 .../Widgets/WidgetViewController.h            |  8 ------
 .../Widgets/WidgetViewController.m            |  6 ----
 ...cationScanConfirmationViewController.swift |  4 +--
 ...cationVerifyByScanningViewController.swift |  2 +-
 .../User/UserVerificationCoordinator.swift    |  2 +-
 .../Detail/RoomMemberDetailsViewController.m  |  4 +--
 ...scoveryThreePidDetailsViewController.swift | 12 ++++----
 .../SpaceFeatureUnavailablePresenter.swift    |  2 +-
 ...eAuthenticationViewControllerFactory.swift |  4 +--
 changelog.d/4899.change                       |  1 +
 14 files changed, 35 insertions(+), 47 deletions(-)
 create mode 100644 changelog.d/4899.change

diff --git a/Riot/Managers/Call/CallPresenter.swift b/Riot/Managers/Call/CallPresenter.swift
index 940ac98f3..c0d286ab9 100644
--- a/Riot/Managers/Call/CallPresenter.swift
+++ b/Riot/Managers/Call/CallPresenter.swift
@@ -165,9 +165,10 @@ class CallPresenter: NSObject {
         } else {
             createJitsiBlock()
         }
+        
         #else
         AppDelegate.theDelegate().showAlert(withTitle: nil,
-                                            message: Bundle.mxk_localizedString(forKey: "not_supported_yet"))
+                                            message: MatrixKitL10n.notSupportedYet)
         #endif
     }
     
diff --git a/Riot/Modules/Call/Views/CallAudioRouteView.swift b/Riot/Modules/Call/Views/CallAudioRouteView.swift
index 3220d1b32..afac0eb2c 100644
--- a/Riot/Modules/Call/Views/CallAudioRouteView.swift
+++ b/Riot/Modules/Call/Views/CallAudioRouteView.swift
@@ -55,7 +55,7 @@ class CallAudioRouteView: UIView {
             titleLabel.text = route.name
         case .loudSpeakers:
             iconImageView.image = Asset.Images.callAudioRouteSpeakers.image
-            titleLabel.text = Bundle.mxk_localizedString(forKey: "call_more_actions_audio_use_device")
+            titleLabel.text = MatrixKitL10n.callMoreActionsAudioUseDevice
         case .externalWired, .externalBluetooth, .externalCar:
             iconImageView.image = Asset.Images.callAudioRouteHeadphones.image
             titleLabel.text = route.name
diff --git a/Riot/Modules/Camera/CameraAccessAlertPresenter.swift b/Riot/Modules/Camera/CameraAccessAlertPresenter.swift
index 34c30408f..42d4fb9f9 100644
--- a/Riot/Modules/Camera/CameraAccessAlertPresenter.swift
+++ b/Riot/Modules/Camera/CameraAccessAlertPresenter.swift
@@ -29,10 +29,10 @@ final class CameraAccessAlertPresenter {
         
         let alert = UIAlertController(title: VectorL10n.camera, message: VectorL10n.cameraAccessNotGranted(appDisplayName), preferredStyle: .alert)
         
-        let cancelActionTitle = Bundle.mxk_localizedString(forKey: "ok")
+        let cancelActionTitle = MatrixKitL10n.ok
         let cancelAction = UIAlertAction(title: cancelActionTitle, style: .cancel)
         
-        let settingsActionTitle = Bundle.mxk_localizedString(forKey: "settings")
+        let settingsActionTitle = MatrixKitL10n.settings
         let settingsAction = UIAlertAction(title: settingsActionTitle, style: .default, handler: { _ in
             UIApplication.shared.open(settingsURL, options: [:], completionHandler: { (succeed) in
                 if !succeed {
diff --git a/Riot/Modules/Integrations/IntegrationManagerViewController.m b/Riot/Modules/Integrations/IntegrationManagerViewController.m
index 62dc9d3c4..596e4f8c2 100644
--- a/Riot/Modules/Integrations/IntegrationManagerViewController.m
+++ b/Riot/Modules/Integrations/IntegrationManagerViewController.m
@@ -196,7 +196,7 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
         }
         else
         {
-            [self sendLocalisedError:@"widget_integration_missing_room_id" toRequest:requestId];
+            [self sendError:[VectorL10n widgetIntegrationMissingRoomId] toRequest:requestId];
             return;
         }
     }
@@ -249,7 +249,7 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
 
     if (!userId)
     {
-        [self sendLocalisedError:@"widget_integration_missing_user_id" toRequest:requestId];
+        [self sendError:[VectorL10n widgetIntegrationMissingUserId] toRequest:requestId];
         return;
     }
 
@@ -292,7 +292,7 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
     }
     else
     {
-        [self sendLocalisedError:@"widget_integration_room_not_recognised" toRequest:requestId];
+        [self sendError:[VectorL10n widgetIntegrationRoomNotRecognised] toRequest:requestId];
     }
 }
 
@@ -324,7 +324,7 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
             } failure:^(NSError *error) {
                 MXStrongifyAndReturnIfNil(self);
 
-                [self sendLocalisedError:@"widget_integration_need_to_be_able_to_invite" toRequest:requestId];
+                [self sendError:[VectorL10n widgetIntegrationNeedToBeAbleToInvite] toRequest:requestId];
             }];
         }
     }];
@@ -348,13 +348,13 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
 
     if (!widget_id)
     {
-        [self sendLocalisedError:@"widget_integration_unable_to_create" toRequest:requestId];
+        [self sendError:[VectorL10n widgetIntegrationUnableToCreate] toRequest:requestId];
         return;
     }
 
     if (!widgetType)
     {
-        [self sendLocalisedError:@"widget_integration_unable_to_create" toRequest:requestId];
+        [self sendError:[VectorL10n widgetIntegrationUnableToCreate] toRequest:requestId];
         return;
     }
 
@@ -412,7 +412,7 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
             typeof(self) self = weakSelf;
             if (self)
             {
-                [self sendLocalisedError:@"widget_integration_unable_to_create" toRequest:requestId];
+                [self sendError:[VectorL10n widgetIntegrationUnableToCreate] toRequest:requestId];
             }
         }];
     }
@@ -441,7 +441,7 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
                                    typeof(self) self = weakSelf;
                                    if (self)
                                    {
-                                       [self sendLocalisedError:@"widget_integration_failed_to_send_request" toRequest:requestId];
+                                       [self sendError:[VectorL10n widgetIntegrationFailedToSendRequest] toRequest:requestId];
                                    }
                                }];
         }];
@@ -490,7 +490,7 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
 
         if (room.summary.membership != MXMembershipJoin)
         {
-            [self sendLocalisedError:@"widget_integration_must_be_in_room" toRequest:requestId];
+            [self sendError:[VectorL10n widgetIntegrationMustBeInRoom] toRequest:requestId];
             return;
         }
 
@@ -517,7 +517,7 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
         }
         else
         {
-            [self sendLocalisedError:@"widget_integration_no_permission_in_room" toRequest:requestId];
+            [self sendError:[VectorL10n widgetIntegrationNoPermissionInRoom] toRequest:requestId];
         }
 
     }];
@@ -576,7 +576,7 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
                                    typeof(self) self = weakSelf;
                                    if (self)
                                    {
-                                       [self sendLocalisedError:@"widget_integration_failed_to_send_request" toRequest:requestId];
+                                       [self sendError:[VectorL10n widgetIntegrationFailedToSendRequest] toRequest:requestId];
                                    }
                                }];
         }
@@ -648,7 +648,7 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
                                    typeof(self) self = weakSelf;
                                    if (self)
                                    {
-                                       [self sendLocalisedError:@"widget_integration_failed_to_send_request" toRequest:requestId];
+                                       [self sendError:[VectorL10n widgetIntegrationFailedToSendRequest] toRequest:requestId];
                                    }
                                }];
         }
@@ -687,14 +687,14 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
                 typeof(self) self = weakSelf;
                 if (self)
                 {
-                    [self sendLocalisedError:@"widget_integration_failed_to_send_request" toRequest:requestId];
+                    [self sendError:[VectorL10n widgetIntegrationFailedToSendRequest] toRequest:requestId];
                 }
             }];
         }
         else
         {
             MXLogDebug(@"[IntegrationManagerVC] setBotPower. Power level must be positive integer.");
-            [self sendLocalisedError:@"widget_integration_positive_power_level" toRequest:requestId];
+            [self sendError:[VectorL10n widgetIntegrationPositivePowerLevel] toRequest:requestId];
         }
     }];
 }
diff --git a/Riot/Modules/Integrations/Widgets/WidgetViewController.h b/Riot/Modules/Integrations/Widgets/WidgetViewController.h
index 70c280c93..49b6a6ac2 100644
--- a/Riot/Modules/Integrations/Widgets/WidgetViewController.h
+++ b/Riot/Modules/Integrations/Widgets/WidgetViewController.h
@@ -99,12 +99,4 @@
  */
 - (void)sendError:(NSString*)message toRequest:(NSString*)requestId;
 
-/**
- Send a localised message error to a request from the widget.
-
- @param errorKey the string id of the message error.
- @param requestId the id of the widget request.
- */
-- (void)sendLocalisedError:(NSString*)errorKey toRequest:(NSString*)requestId;
-
 @end
diff --git a/Riot/Modules/Integrations/Widgets/WidgetViewController.m b/Riot/Modules/Integrations/Widgets/WidgetViewController.m
index 1cf746bc9..bb0def197 100644
--- a/Riot/Modules/Integrations/Widgets/WidgetViewController.m
+++ b/Riot/Modules/Integrations/Widgets/WidgetViewController.m
@@ -582,12 +582,6 @@ NSString *const kJavascriptSendResponseToPostMessageAPI = @"riotIOS.sendResponse
                        toRequest:requestId];
 }
 
-- (void)sendLocalisedError:(NSString*)errorKey toRequest:(NSString*)requestId
-{
-    [self sendError:NSLocalizedStringFromTable(errorKey, @"Vector", nil) toRequest:requestId];
-}
-
-
 #pragma mark - Private methods
 
 - (NSString *)stringByReplacingScalarTokenInString:(NSString*)string byScalarToken:(NSString*)scalarToken
diff --git a/Riot/Modules/KeyVerification/Common/ScanConfirmation/KeyVerificationScanConfirmationViewController.swift b/Riot/Modules/KeyVerification/Common/ScanConfirmation/KeyVerificationScanConfirmationViewController.swift
index 7770204e8..ff46e3c05 100644
--- a/Riot/Modules/KeyVerification/Common/ScanConfirmation/KeyVerificationScanConfirmationViewController.swift
+++ b/Riot/Modules/KeyVerification/Common/ScanConfirmation/KeyVerificationScanConfirmationViewController.swift
@@ -119,8 +119,8 @@ final class KeyVerificationScanConfirmationViewController: UIViewController {
         self.confirmButton.layer.masksToBounds = true
         self.rejectButton.layer.masksToBounds = true
         
-        self.confirmButton.setTitle(Bundle.mxk_localizedString(forKey: "yes"), for: .normal)
-        self.rejectButton.setTitle(Bundle.mxk_localizedString(forKey: "no"), for: .normal)
+        self.confirmButton.setTitle(MatrixKitL10n.yes, for: .normal)
+        self.rejectButton.setTitle(MatrixKitL10n.no, for: .normal)
         self.rejectButton.actionStyle = .cancel
     }
 
diff --git a/Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewController.swift b/Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewController.swift
index 49f1a80ca..7c675bb69 100644
--- a/Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewController.swift
+++ b/Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewController.swift
@@ -275,7 +275,7 @@ final class KeyVerificationVerifyByScanningViewController: UIViewController {
                                       message: VectorL10n.keyVerificationVerifyQrCodeScanOtherCodeSuccessMessage,
                                       preferredStyle: .alert)
         
-        let okAction = UIAlertAction(title: Bundle.mxk_localizedString(forKey: "ok"), style: .default, handler: { _ in
+        let okAction = UIAlertAction(title: MatrixKitL10n.ok, style: .default, handler: { _ in
             completion()
         })
         alert.addAction(okAction)
diff --git a/Riot/Modules/KeyVerification/User/UserVerificationCoordinator.swift b/Riot/Modules/KeyVerification/User/UserVerificationCoordinator.swift
index 05befabe2..64489b091 100644
--- a/Riot/Modules/KeyVerification/User/UserVerificationCoordinator.swift
+++ b/Riot/Modules/KeyVerification/User/UserVerificationCoordinator.swift
@@ -134,7 +134,7 @@ final class UserVerificationCoordinator: NSObject, UserVerificationCoordinatorTy
                                       message: VectorL10n.keyVerificationBootstrapNotSetupMessage,
                                       preferredStyle: .alert)
         
-        let cancelAction = UIAlertAction(title: Bundle.mxk_localizedString(forKey: "ok"), style: .cancel)
+        let cancelAction = UIAlertAction(title: MatrixKitL10n.ok, style: .cancel)
         alert.addAction(cancelAction)
         
         self.presenter.toPresentable().present(alert, animated: true, completion: nil)        
diff --git a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
index 0c000ae7d..aab1f1653 100644
--- a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
+++ b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
@@ -888,7 +888,7 @@
                     }
                     break;
                 case UserEncryptionTrustLevelUnknown:
-                    [encryptionInformation appendString:NSLocalizedStringFromTable(@"room_participants_security_information_loading", @"Vector", nil)];
+                    [encryptionInformation appendString:[VectorL10n roomParticipantsSecurityLoading]];
                     break;
                 default:
                     break;
@@ -1144,7 +1144,7 @@
                                                                    
                                                                }]];
                 
-                [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"ban", @"Vector", nil)
+                [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ban]
                                                                  style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
                                                                      
                                                                      if (weakSelf)
diff --git a/Riot/Modules/Settings/Discovery/ThreePidDetails/SettingsDiscoveryThreePidDetailsViewController.swift b/Riot/Modules/Settings/Discovery/ThreePidDetails/SettingsDiscoveryThreePidDetailsViewController.swift
index 2652e207d..44e49b07c 100644
--- a/Riot/Modules/Settings/Discovery/ThreePidDetails/SettingsDiscoveryThreePidDetailsViewController.swift
+++ b/Riot/Modules/Settings/Discovery/ThreePidDetails/SettingsDiscoveryThreePidDetailsViewController.swift
@@ -226,15 +226,15 @@ final class SettingsDiscoveryThreePidDetailsViewController: UIViewController {
     
     private func presentPendingEmailVerificationAlert() {
         
-        let alert = UIAlertController(title: Bundle.mxk_localizedString(forKey: "account_email_validation_title"),
-                                      message: Bundle.mxk_localizedString(forKey: "account_email_validation_message"),
+        let alert = UIAlertController(title: MatrixKitL10n.accountEmailValidationTitle,
+                                      message: MatrixKitL10n.accountEmailValidationMessage,
                                       preferredStyle: .alert)
         
         alert.addAction(UIAlertAction(title: VectorL10n.continue, style: .default, handler: { _ in
             self.viewModel.process(viewAction: .confirmEmailValidation)
         }))
         
-        alert.addAction(UIAlertAction(title: Bundle.mxk_localizedString(forKey: "cancel"), style: .cancel, handler: { _ in
+        alert.addAction(UIAlertAction(title: MatrixKitL10n.cancel, style: .cancel, handler: { _ in
             self.viewModel.process(viewAction: .cancelThreePidValidation)
         }))
         
@@ -244,8 +244,8 @@ final class SettingsDiscoveryThreePidDetailsViewController: UIViewController {
     
     private func presentPendingMSISDNVerificationAlert() {
         
-        let alert = UIAlertController(title: Bundle.mxk_localizedString(forKey: "account_msisdn_validation_title"),
-                                      message: Bundle.mxk_localizedString(forKey: "account_msisdn_validation_message"),
+        let alert = UIAlertController(title: MatrixKitL10n.accountMsisdnValidationTitle,
+                                      message: MatrixKitL10n.accountMsisdnValidationMessage,
                                       preferredStyle: .alert)
         
         alert.addTextField { (textField) in
@@ -260,7 +260,7 @@ final class SettingsDiscoveryThreePidDetailsViewController: UIViewController {
             self.viewModel.process(viewAction: .confirmMSISDNValidation(code: smsCode))
         }))
         
-        alert.addAction(UIAlertAction(title: Bundle.mxk_localizedString(forKey: "cancel"), style: .cancel, handler: { _ in
+        alert.addAction(UIAlertAction(title: MatrixKitL10n.cancel, style: .cancel, handler: { _ in
             self.viewModel.process(viewAction: .cancelThreePidValidation)
         }))
         
diff --git a/Riot/Modules/Spaces/SpaceFeatureUnavailablePresenter.swift b/Riot/Modules/Spaces/SpaceFeatureUnavailablePresenter.swift
index c7633f06a..62b51f756 100644
--- a/Riot/Modules/Spaces/SpaceFeatureUnavailablePresenter.swift
+++ b/Riot/Modules/Spaces/SpaceFeatureUnavailablePresenter.swift
@@ -37,7 +37,7 @@ final class SpaceFeatureUnavailablePresenter: NSObject {
         
         let navigationVC = RiotNavigationController(rootViewController: spaceFeatureUnavailableVC)
         
-        spaceFeatureUnavailableVC.navigationItem.rightBarButtonItem = MXKBarButtonItem(title: Bundle.mxk_localizedString(forKey: "ok"), style: .plain, action: { [weak navigationVC] in
+        spaceFeatureUnavailableVC.navigationItem.rightBarButtonItem = MXKBarButtonItem(title: MatrixKitL10n.ok, style: .plain, action: { [weak navigationVC] in
             navigationVC?.dismiss(animated: true)
         })
                         
diff --git a/Riot/Modules/UserInteractiveAuthentication/UserInteractiveAuthenticationViewControllerFactory.swift b/Riot/Modules/UserInteractiveAuthentication/UserInteractiveAuthenticationViewControllerFactory.swift
index 39bb1fc6a..09ea9270e 100644
--- a/Riot/Modules/UserInteractiveAuthentication/UserInteractiveAuthenticationViewControllerFactory.swift
+++ b/Riot/Modules/UserInteractiveAuthentication/UserInteractiveAuthenticationViewControllerFactory.swift
@@ -43,11 +43,11 @@ final class UserInteractiveAuthenticationViewControllerFactory: NSObject {
             textField.keyboardType = .default
         }
         
-        alertController.addAction(UIAlertAction(title: Bundle.mxk_localizedString(forKey: "cancel"), style: .cancel, handler: { _ in
+        alertController.addAction(UIAlertAction(title: MatrixKitL10n.cancel, style: .cancel, handler: { _ in
             onCancelled()
         }))
         
-        alertController.addAction(UIAlertAction(title: Bundle.mxk_localizedString(forKey: "ok"), style: .default, handler: { _ in
+        alertController.addAction(UIAlertAction(title: MatrixKitL10n.ok, style: .default, handler: { _ in
             
             guard let password = alertController.textFields?.first?.text else {
                 // Should not happen
diff --git a/changelog.d/4899.change b/changelog.d/4899.change
new file mode 100644
index 000000000..b53120223
--- /dev/null
+++ b/changelog.d/4899.change
@@ -0,0 +1 @@
+Replaced localizable strings with generated ones throughout the code. Fixed various translation issues.
\ No newline at end of file

From b78fe11c542330c12edc3a039804a75394518fb6 Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Thu, 30 Sep 2021 23:51:20 +0100
Subject: [PATCH 36/59] Prepare for new sprint

---
 Config/AppVersion.xcconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig
index 51e60cfea..2f0eca71b 100644
--- a/Config/AppVersion.xcconfig
+++ b/Config/AppVersion.xcconfig
@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.6.1
-CURRENT_PROJECT_VERSION = 1.6.1
+MARKETING_VERSION = 1.6.2
+CURRENT_PROJECT_VERSION = 1.6.2

From 040ad23118875396ee7e2d1f3f7192cac8cc0b37 Mon Sep 17 00:00:00 2001
From: Doug <6060466+pixlwave@users.noreply.github.com>
Date: Fri, 1 Oct 2021 09:47:41 +0100
Subject: [PATCH 37/59] Update alpha release to build on macOS 11.

---
 .github/workflows/release-alpha.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-alpha.yml b/.github/workflows/release-alpha.yml
index af74f4827..ed175fe20 100644
--- a/.github/workflows/release-alpha.yml
+++ b/.github/workflows/release-alpha.yml
@@ -15,7 +15,7 @@ env:
 jobs:
   build:
     name: Release
-    runs-on: macos-latest
+    runs-on: macos-11
 
     steps:
       - uses: actions/checkout@v2

From d2d61ff9eecdccabe065892d1d345316d58a70a8 Mon Sep 17 00:00:00 2001
From: Doug <6060466+pixlwave@users.noreply.github.com>
Date: Fri, 1 Oct 2021 10:12:38 +0100
Subject: [PATCH 38/59] Add changelog entry.

---
 changelog.d/4937.build | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/4937.build

diff --git a/changelog.d/4937.build b/changelog.d/4937.build
new file mode 100644
index 000000000..2e67b1197
--- /dev/null
+++ b/changelog.d/4937.build
@@ -0,0 +1 @@
+Element Alpha: Build on macOS 11 to fix iOS 15 installation error.

From 7cde4c5892aa27e8a388bbbb495ceb180c6bfce7 Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Thu, 30 Sep 2021 17:15:11 +0100
Subject: [PATCH 39/59] Pods: Update ffmpeg-kit-ios-audio, FLEX, FlowCommoniOS,
 Reusable and SwiftLint.

---
 Podfile                 |  8 ++++----
 Podfile.lock            | 38 +++++++++++++++++++-------------------
 changelog.d/4939.change |  1 +
 3 files changed, 24 insertions(+), 23 deletions(-)
 create mode 100644 changelog.d/4939.change

diff --git a/Podfile b/Podfile
index f495b4ef3..b06b5f92b 100644
--- a/Podfile
+++ b/Podfile
@@ -59,22 +59,22 @@ abstract_target 'RiotPods' do
 
   # Tools
   pod 'SwiftGen', '~> 6.3'
-  pod 'SwiftLint', '~> 0.43.0'
+  pod 'SwiftLint', '~> 0.44.0'
 
   target "Riot" do
     import_MatrixKit
     pod 'DGCollectionViewLeftAlignFlowLayout', '~> 1.0.4'
     pod 'KTCenterFlowLayout', '~> 1.3.1'
     pod 'ZXingObjC', '~> 3.6.5'
-    pod 'FlowCommoniOS', '~> 1.10.0'
+    pod 'FlowCommoniOS', '~> 1.12.0'
     pod 'ReadMoreTextView', '~> 3.0.1'
     pod 'SwiftBase32', '~> 0.9.0'
     pod 'SwiftJWT', '~> 3.6.200'
     pod 'SideMenu', '~> 6.5'
     pod 'DSWaveformImage', '~> 6.1.1'
-    pod 'ffmpeg-kit-ios-audio', '~> 4.4'
+    pod 'ffmpeg-kit-ios-audio', '~> 4.5'
 
-    pod 'FLEX', '~> 4.4.1', :configurations => ['Debug']
+    pod 'FLEX', '~> 4.5.0', :configurations => ['Debug']
 
     target 'RiotTests' do
       inherit! :search_paths
diff --git a/Podfile.lock b/Podfile.lock
index 4c40e016b..27e8a2ced 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -37,9 +37,9 @@ PODS:
     - DTFoundation/Core
   - DTFoundation/UIKit (1.7.18):
     - DTFoundation/Core
-  - ffmpeg-kit-ios-audio (4.4)
-  - FLEX (4.4.1)
-  - FlowCommoniOS (1.10.0)
+  - ffmpeg-kit-ios-audio (4.5)
+  - FLEX (4.5.0)
+  - FlowCommoniOS (1.12.0)
   - GBDeviceInfo (6.6.0):
     - GBDeviceInfo/Core (= 6.6.0)
   - GBDeviceInfo/Core (6.6.0)
@@ -92,11 +92,11 @@ PODS:
   - Realm (10.7.6):
     - Realm/Headers (= 10.7.6)
   - Realm/Headers (10.7.6)
-  - Reusable (4.1.1):
-    - Reusable/Storyboard (= 4.1.1)
-    - Reusable/View (= 4.1.1)
-  - Reusable/Storyboard (4.1.1)
-  - Reusable/View (4.1.1)
+  - Reusable (4.1.2):
+    - Reusable/Storyboard (= 4.1.2)
+    - Reusable/View (= 4.1.2)
+  - Reusable/Storyboard (4.1.2)
+  - Reusable/View (4.1.2)
   - SideMenu (6.5.0)
   - SwiftBase32 (0.9.0)
   - SwiftGen (6.4.0)
@@ -106,7 +106,7 @@ PODS:
     - BlueRSA (~> 1.0)
     - KituraContracts (~> 1.2)
     - LoggerAPI (~> 1.7)
-  - SwiftLint (0.43.1)
+  - SwiftLint (0.44.0)
   - SwiftyBeaver (1.9.5)
   - zxcvbn-ios (1.0.4)
   - ZXingObjC (3.6.5):
@@ -116,9 +116,9 @@ PODS:
 DEPENDENCIES:
   - DGCollectionViewLeftAlignFlowLayout (~> 1.0.4)
   - DSWaveformImage (~> 6.1.1)
-  - ffmpeg-kit-ios-audio (~> 4.4)
-  - FLEX (~> 4.4.1)
-  - FlowCommoniOS (~> 1.10.0)
+  - ffmpeg-kit-ios-audio (~> 4.5)
+  - FLEX (~> 4.5.0)
+  - FlowCommoniOS (~> 1.12.0)
   - GBDeviceInfo (~> 6.6.0)
   - HPGrowingTextView
   - KeychainAccess (~> 4.2.2)
@@ -134,7 +134,7 @@ DEPENDENCIES:
   - SwiftBase32 (~> 0.9.0)
   - SwiftGen (~> 6.3)
   - SwiftJWT (~> 3.6.200)
-  - SwiftLint (~> 0.43.0)
+  - SwiftLint (~> 0.44.0)
   - zxcvbn-ios
   - ZXingObjC (~> 3.6.5)
 
@@ -189,9 +189,9 @@ SPEC CHECKSUMS:
   DSWaveformImage: 3c718a0cf99291887ee70d1d0c18d80101d3d9ce
   DTCoreText: ec749e013f2e1f76de5e7c7634642e600a7467ce
   DTFoundation: a53f8cda2489208cbc71c648be177f902ee17536
-  ffmpeg-kit-ios-audio: ddfc3dac6f574e83d53f8ae33586711162685d3e
-  FLEX: 7ca2c8cd3a435ff501ff6d2f2141e9bdc934eaab
-  FlowCommoniOS: bcdf81a5f30717e711af08a8c812eb045411ba94
+  ffmpeg-kit-ios-audio: 8c44d93054e1a9743a7014ec3dd26cd1ad8f2a59
+  FLEX: e51461dd6f0bfb00643c262acdfea5d5d12c596b
+  FlowCommoniOS: e9ecbc97fb9ce5c593fb3da0e1073b65a3902026
   GBDeviceInfo: ed0db16230d2fa280e1cbb39a5a7f60f6946aaec
   GZIP: 416858efbe66b41b206895ac6dfd5493200d95b3
   HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
@@ -209,16 +209,16 @@ SPEC CHECKSUMS:
   OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
   Realm: ed860452717c8db8f4bf832b6807f7f2ce708839
-  Reusable: 53a9acf5c536f229b31b5865782414b508252ddb
+  Reusable: 6bae6a5e8aa793c9c441db0213c863a64bce9136
   SideMenu: f583187d21c5b1dd04c72002be544b555a2627a2
   SwiftBase32: 9399c25a80666dc66b51e10076bf591e3bbb8f17
   SwiftGen: 67860cc7c3cfc2ed25b9b74cfd55495fc89f9108
   SwiftJWT: 88c412708f58c169d431d344c87bc79a87c830ae
-  SwiftLint: 99f82d07b837b942dd563c668de129a03fc3fb52
+  SwiftLint: e96c0a8c770c7ebbc4d36c55baf9096bb65c4584
   SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: bdf413811d39894c938e52a7f4faf550040ab370
+PODFILE CHECKSUM: 367d7a514c7d8ea3cc4b0adb5878c8a192c7c2c8
 
 COCOAPODS: 1.10.1
diff --git a/changelog.d/4939.change b/changelog.d/4939.change
new file mode 100644
index 000000000..aed2767eb
--- /dev/null
+++ b/changelog.d/4939.change
@@ -0,0 +1 @@
+Pods: Update ffmpeg-kit-ios-audio, FLEX, FlowCommoniOS, Reusable and SwiftLint.
\ No newline at end of file

From e40d5b0babe62fcac10840d827f9ccacfb4f6d79 Mon Sep 17 00:00:00 2001
From: jelv <post@jelv.nl>
Date: Wed, 29 Sep 2021 07:59:53 +0000
Subject: [PATCH 40/59] Translated using Weblate (Dutch)

Currently translated at 100.0% (1316 of 1316 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/nl/
---
 Riot/Assets/nl.lproj/Vector.strings | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Riot/Assets/nl.lproj/Vector.strings b/Riot/Assets/nl.lproj/Vector.strings
index 4d8f5d3ba..2389ac4af 100644
--- a/Riot/Assets/nl.lproj/Vector.strings
+++ b/Riot/Assets/nl.lproj/Vector.strings
@@ -21,7 +21,7 @@
 "title_rooms" = "Kamers";
 "warning" = "Waarschuwing";
 // Actions
-"view" = "Weergeven";
+"view" = "Bekijken";
 "next" = "Volgende";
 "back" = "Terug";
 "continue" = "Verdergaan";
@@ -1510,7 +1510,7 @@
 "room_notifs_settings_encrypted_room_notice" = "Let op dat vermeldingen & trefwoorden-meldingen niet beschikbaar zijn in versleutelde kamers op mobiel.";
 "room_notifs_settings_account_settings" = "Accountinstellingen";
 "room_notifs_settings_manage_notifications" = "U kunt uw meldingen beheren in %@";
-"room_notifs_settings_cancel_action" = "Annuleer";
+"room_notifs_settings_cancel_action" = "Annuleren";
 "room_notifs_settings_done_action" = "Klaar";
 "room_notifs_settings_none" = "Geen";
 "room_notifs_settings_mentions_and_keywords" = "Alleen vermeldingen en trefwoorden";

From 2af18d578158b35e42c76b5bbe6ad64a742da367 Mon Sep 17 00:00:00 2001
From: artevaeckt <timucin.boldt@udo.edu>
Date: Tue, 28 Sep 2021 16:42:32 +0000
Subject: [PATCH 41/59] Translated using Weblate (German)

Currently translated at 99.8% (1314 of 1316 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/de/
---
 Riot/Assets/de.lproj/Vector.strings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Riot/Assets/de.lproj/Vector.strings b/Riot/Assets/de.lproj/Vector.strings
index 30c80ce35..b1d4e7e5c 100644
--- a/Riot/Assets/de.lproj/Vector.strings
+++ b/Riot/Assets/de.lproj/Vector.strings
@@ -1482,3 +1482,4 @@
 "spaces_home_space_title" = "Start";
 "space_tag" = "space";
 "open" = "Öffnen";
+"settings_links" = "LINKS";

From d26ad51a8f70463d076e27089e209d0f6e837e36 Mon Sep 17 00:00:00 2001
From: libexus <libexus@gmail.com>
Date: Tue, 28 Sep 2021 16:41:49 +0000
Subject: [PATCH 42/59] Translated using Weblate (German)

Currently translated at 99.8% (1314 of 1316 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/de/
---
 Riot/Assets/de.lproj/Vector.strings | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Riot/Assets/de.lproj/Vector.strings b/Riot/Assets/de.lproj/Vector.strings
index b1d4e7e5c..f19085499 100644
--- a/Riot/Assets/de.lproj/Vector.strings
+++ b/Riot/Assets/de.lproj/Vector.strings
@@ -1480,6 +1480,6 @@
 "spaces_left_panel_title" = "Spaces";
 "room_recents_suggested_rooms_section" = "VORGESCHLAGENE RÄUME";
 "spaces_home_space_title" = "Start";
-"space_tag" = "space";
+"space_tag" = "Space";
 "open" = "Öffnen";
 "settings_links" = "LINKS";

From 439d3b9c5704bf6c37803d75d9018ee7c84449d6 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Thu, 30 Sep 2021 23:38:47 +0000
Subject: [PATCH 43/59] Translated using Weblate (Ukrainian)

Currently translated at 48.7% (641 of 1316 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/uk/
---
 Riot/Assets/uk.lproj/Vector.strings | 105 +++++++++++++++++++++++++++-
 1 file changed, 104 insertions(+), 1 deletion(-)

diff --git a/Riot/Assets/uk.lproj/Vector.strings b/Riot/Assets/uk.lproj/Vector.strings
index 11988a6b1..5e3d39baa 100644
--- a/Riot/Assets/uk.lproj/Vector.strings
+++ b/Riot/Assets/uk.lproj/Vector.strings
@@ -139,7 +139,7 @@
 "client_web_name" = "Element Web";
 "client_ios_name" = "Element iOS";
 "auth_login_single_sign_on" = "Увійти";
-"room_creation_invite_another_user" = "Пошук / запрошення по ідентифікатору користувача, імені або адреси електронної пошти";
+"room_creation_invite_another_user" = "Пошук / запрошення за ID користувача, іменем або е-поштою";
 "room_creation_error_invite_user_by_email_without_identity_server" = "Сервер ідентифікації не налаштовано, тому ви не можете додати учасника з е-поштою.";
 // Room recents
 "room_recents_directory_section" = "КАТАЛОГ КІМНАТ";
@@ -686,3 +686,106 @@
 "space_beta_announce_title" = "Простори скоро з'являться";
 "space_beta_announce_subtitle" = "Нова версія спільнот";
 "space_beta_announce_information" = "Простори — це новий спосіб об'єднати кімнати та людей. Їх ще не додано на iOS, але ви вже можете користуватися ними у вебпереглядачі та на комп'ютері.";
+
+// No VoIP support
+"no_voip_title" = "Вхідний виклик";
+"call_actions_unhold" = "Продовжити";
+
+// MARK: - Call Transfer
+"call_transfer_title" = "Переведення";
+"space_avatar_view_accessibility_hint" = "Змінити аватар простору";
+
+// Mark: Avatar
+
+"space_avatar_view_accessibility_label" = "аватар";
+"invite_friends_share_text" = "Агов, побалакай зі мною в %@: %@";
+
+// MARK: - Invite friends
+
+"invite_friends_action" = "Запросити друзів до %@";
+
+// MARK: - Dial Pad
+"dialpad_title" = "Номеронабирач";
+"call_transfer_contacts_all" = "Усі";
+"call_transfer_contacts_recent" = "Недавні";
+"call_transfer_dialpad" = "Номеронабирач";
+"room_open_dialpad" = "Номеронабирач";
+"room_accessibility_search" = "Пошук";
+"room_action_send_file" = "Надіслати файл";
+"room_action_send_sticker" = "Надіслати наліпку";
+"room_action_send_photo_or_video" = "Надіслати світлину або відео";
+"room_event_failed_to_send" = "Не вдалося надіслати";
+"room_event_action_edit" = "Редагувати";
+"room_event_action_view_encryption" = "Відомості про шифрування";
+"room_event_action_cancel_download" = "Скасувати завантаження";
+"room_event_action_cancel_send" = "Скасувати надсилання";
+"room_message_reply_to_short_placeholder" = "Надіслати відповідь…";
+"room_message_short_placeholder" = "Надіслати повідомлення…";
+"room_message_replying_to" = "У відповідь %@";
+"room_message_editing" = "Редагування";
+"room_message_unable_open_link_error_message" = "Неможливо відкрити посилання.";
+"room_message_reply_to_placeholder" = "Надіслати відповідь (не зашифровану)…";
+"room_message_placeholder" = "Надіслати повідомлення (не зашифроване)…";
+"room_many_users_are_typing" = "%@, %@ та інші друкують…";
+"room_two_users_are_typing" = "%@ і %@ друкують…";
+"room_one_user_is_typing" = "%@ друкує…";
+"room_new_messages_notification" = "%d нових повідомлень";
+"room_new_message_notification" = "%d нове повідомлення";
+"room_member_power_level_short_moderator" = "Модератор";
+"room_member_power_level_short_admin" = "Адміністратор";
+"room_member_power_level_moderator_in" = "Модератор у %@";
+"room_member_power_level_admin_in" = "Адміністратор у %@";
+"room_participants_security_loading" = "Завантаження…";
+"room_participants_action_security_status_loading" = "Завантаження…";
+"room_participants_action_security_status_warning" = "Попередження";
+"public_room_section_title" = "Загальнодоступні кімнати (на %@):";
+"do_not_ask_again" = "Не запитувати знову";
+"event_formatter_group_call_join" = "Приєднатися";
+"event_formatter_call_retry" = "Повторити";
+"event_formatter_message_edited_mention" = "(змінено)";
+"image_picker_action_library" = "Вибрати з бібліотеки";
+
+// Image picker
+"image_picker_action_camera" = "Сфотографувати";
+"media_picker_select" = "Вибрати";
+"room_participants_action_start_video_call" = "Почати відеовиклик";
+"room_participants_action_start_voice_call" = "Почати голосовий виклик";
+"security_settings_crypto_sessions_loading" = "Завантаження сеансів…";
+"room_participants_action_start_new_chat" = "Почати нову бесіду";
+"room_participants_action_set_admin" = "Зробити адміністратором";
+"room_participants_action_set_moderator" = "Зробити модератором";
+"security_settings_crypto_sessions" = "МОЇ СЕАНСИ";
+"room_participants_action_section_security" = "Безпека";
+
+// Security settings
+"security_settings_title" = "Безпека";
+"media_picker_library" = "Бібліотека";
+
+// Media picker
+"media_picker_title" = "Медіабібліотека";
+"room_participants_action_section_other" = "Опції";
+"room_participants_action_section_devices" = "Сеанси";
+"room_participants_action_section_admin_tools" = "Засоби адміністратора";
+"room_participants_ago" = "тому";
+"room_participants_now" = "зараз";
+
+// Group rooms
+"group_rooms_filter_rooms" = "Фільтр кімнат спільноти";
+"group_participants_invited_section" = "ЗАПРОШЕНІ";
+"room_participants_invited_section" = "ЗАПРОШЕНІ";
+"room_participants_invite_malformed_id" = "Хибний ID. Повинні бути адреса е-пошти або Matrix ID, наприклад, «@localpart:domain»";
+"room_participants_invite_another_user" = "Пошук / запрошення за ID користувача, іменем або е-поштою";
+"room_participants_filter_room_members_for_dm" = "Фільтр учасників";
+"room_participants_filter_room_members" = "Фільтр учасників кімнати";
+"room_participants_invite_prompt_msg" = "Ви впевнені, що хочете запросити %@ до цієї бесіди?";
+"room_participants_remove_third_party_invite_prompt_msg" = "Ви впевнені, що хочете відкликати запрошення?";
+"directory_search_results_title" = "Переглянути результати пошуку";
+
+// Directory
+"directory_cell_title" = "Огляд каталогу";
+"rooms_empty_view_information" = "Кімнати чудові для будь-яких групових бесід, приватних чи загальнодоступних. Натисніть +, щоб знайти наявні кімнати або створити нові.";
+"room_recents_unknown_room_error_message" = "Не вдалося знайти цю кімнату. Переконайтеся, що вона існує";
+"room_recents_suggested_rooms_section" = "ПРОПОНОВАНІ КІМНАТИ";
+"room_creation_dm_error" = "Ми не можемо створити ваше особисте повідомлення. Перевірте користувачів, яких ви хочете запросити й повторіть спробу.";
+"done" = "Готово";
+"open" = "Відкрити";

From 99ece5d7ad8e0c98b5ca78f521ced43de5a3d005 Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Mon, 4 Oct 2021 15:39:38 +0100
Subject: [PATCH 44/59] Bundler: Update CocoaPods, fastlane and xcode-install.

---
 Gemfile                |   2 +-
 Gemfile.lock           | 122 +++++++++++++++++++++--------------------
 changelog.d/4951.build |   1 +
 3 files changed, 65 insertions(+), 60 deletions(-)
 create mode 100644 changelog.d/4951.build

diff --git a/Gemfile b/Gemfile
index 3ba15fb52..53efbaf92 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gem "xcode-install"
 gem "fastlane"
-gem "cocoapods", '~>1.10.1'
+gem "cocoapods", '~>1.11.2'
 
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
 eval_gemfile(plugins_path) if File.exist?(plugins_path)
diff --git a/Gemfile.lock b/Gemfile.lock
index d1cdbdf51..a8674758c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,14 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.3)
-    activesupport (5.2.4.5)
+    CFPropertyList (3.0.4)
+      rexml
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     algoliasearch (1.27.5)
@@ -14,28 +16,28 @@ GEM
       json (>= 1.5.1)
     artifactory (3.0.15)
     atomos (0.1.3)
-    aws-eventstream (1.1.1)
-    aws-partitions (1.487.0)
-    aws-sdk-core (3.119.0)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.510.0)
+    aws-sdk-core (3.121.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.46.0)
-      aws-sdk-core (~> 3, >= 3.119.0)
+    aws-sdk-kms (1.48.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.98.0)
-      aws-sdk-core (~> 3, >= 3.119.0)
+    aws-sdk-s3 (1.103.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.4)
+      aws-sigv4 (~> 1.4)
+    aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.0.3)
-    cocoapods (1.10.1)
-      addressable (~> 2.6)
+    cocoapods (1.11.2)
+      addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.10.1)
+      cocoapods-core (= 1.11.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.4.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -46,26 +48,26 @@ GEM
       escape (~> 0.0.4)
       fourflusher (>= 2.3.0, < 3.0)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.6.6)
+      molinillo (~> 0.8.0)
       nap (~> 1.0)
-      ruby-macho (~> 1.4)
-      xcodeproj (>= 1.19.0, < 2.0)
-    cocoapods-core (1.10.1)
-      activesupport (> 5.0, < 6)
-      addressable (~> 2.6)
+      ruby-macho (>= 1.0, < 3.0)
+      xcodeproj (>= 1.21.0, < 2.0)
+    cocoapods-core (1.11.2)
+      activesupport (>= 5.0, < 7)
+      addressable (~> 2.8)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
       netrc (~> 0.11)
-      public_suffix
+      public_suffix (~> 4.0)
       typhoeus (~> 1.0)
-    cocoapods-deintegrate (1.0.4)
-    cocoapods-downloader (1.4.0)
+    cocoapods-deintegrate (1.0.5)
+    cocoapods-downloader (1.5.1)
     cocoapods-plugins (1.0.0)
       nap
-    cocoapods-search (1.0.0)
-    cocoapods-trunk (1.5.0)
+    cocoapods-search (1.0.1)
+    cocoapods-trunk (1.6.0)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
@@ -73,19 +75,19 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     declarative (0.0.20)
     digest-crc (0.6.4)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
-    emoji_regex (3.2.2)
+    emoji_regex (3.2.3)
     escape (0.0.4)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
-    excon (0.85.0)
-    faraday (1.7.0)
+    ethon (0.14.0)
+      ffi (>= 1.15.0)
+    excon (0.86.0)
+    faraday (1.8.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -110,7 +112,7 @@ GEM
     faraday_middleware (1.1.0)
       faraday (~> 1.0)
     fastimage (2.2.5)
-    fastlane (2.191.0)
+    fastlane (2.195.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -136,6 +138,7 @@ GEM
       mini_magick (>= 4.9.4, < 5.0.0)
       multipart-post (~> 2.0.0)
       naturally (~> 2.2)
+      optparse (~> 0.1.1)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
       security (= 0.1.3)
@@ -152,13 +155,13 @@ GEM
     fastlane-plugin-diawi (2.1.0)
       rest-client (>= 2.0.0)
     fastlane-plugin-versioning (0.5.0)
-    fastlane-plugin-xcodegen (1.0.0)
+    fastlane-plugin-xcodegen (1.1.0)
       fastlane-plugin-brew (~> 0.1.1)
-    ffi (1.13.1)
+    ffi (1.15.4)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.10.0)
+    google-apis-androidpublisher_v3 (0.11.0)
       google-apis-core (>= 0.4, < 2.a)
     google-apis-core (0.4.1)
       addressable (~> 2.5, >= 2.5.1)
@@ -169,18 +172,18 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.6.0)
+    google-apis-iamcredentials_v1 (0.7.0)
       google-apis-core (>= 0.4, < 2.a)
     google-apis-playcustomapp_v1 (0.5.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.6.0)
+    google-apis-storage_v1 (0.8.0)
       google-apis-core (>= 0.4, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.5.0)
       faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.1.0)
+    google-cloud-errors (1.2.0)
     google-cloud-storage (1.34.1)
       addressable (~> 2.5)
       digest-crc (~> 0.4)
@@ -189,37 +192,38 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (0.17.0)
+    googleauth (1.0.0)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.14)
+      signet (>= 0.16, < 2.a)
     highline (2.0.3)
     http-accept (1.7.0)
     http-cookie (1.0.4)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.8.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
     json (2.5.1)
-    jwt (2.2.3)
+    jwt (2.3.0)
     memoist (0.16.2)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0704)
+    mime-types-data (3.2021.0901)
     mini_magick (4.11.0)
-    mini_mime (1.1.0)
+    mini_mime (1.1.1)
     minitest (5.14.4)
-    molinillo (0.6.6)
+    molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.0.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
+    optparse (0.1.1)
     os (1.1.1)
     plist (3.6.0)
     public_suffix (4.0.6)
@@ -236,12 +240,12 @@ GEM
     retriable (3.1.2)
     rexml (3.2.5)
     rouge (2.0.7)
-    ruby-macho (1.4.0)
+    ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     security (0.1.3)
-    signet (0.15.0)
-      addressable (~> 2.3)
+    signet (0.16.0)
+      addressable (~> 2.8)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
@@ -251,7 +255,6 @@ GEM
     terminal-notifier (2.0.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    thread_safe (0.3.6)
     trailblazer-option (0.1.1)
     tty-cursor (0.7.1)
     tty-screen (0.8.1)
@@ -259,16 +262,16 @@ GEM
       tty-cursor (~> 0.7)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
-    unicode-display_width (1.7.0)
+    unf_ext (0.0.8)
+    unicode-display_width (1.8.0)
     webrick (1.7.0)
     word_wrap (1.0.0)
-    xcode-install (2.6.7)
+    xcode-install (2.8.0)
       claide (>= 0.9.1, < 1.1.0)
       fastlane (>= 2.1.0, < 3.0.0)
     xcodeproj (1.21.0)
@@ -282,12 +285,13 @@ GEM
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.10.1)
+  cocoapods (~> 1.11.2)
   fastlane
   fastlane-plugin-diawi
   fastlane-plugin-versioning
@@ -295,4 +299,4 @@ DEPENDENCIES
   xcode-install
 
 BUNDLED WITH
-   2.2.24
+   2.2.28
diff --git a/changelog.d/4951.build b/changelog.d/4951.build
new file mode 100644
index 000000000..6e7d3ab86
--- /dev/null
+++ b/changelog.d/4951.build
@@ -0,0 +1 @@
+Bundler: Update CocoaPods and fastlane and xcode-install.
\ No newline at end of file

From a50027e76df502f81ef3e2155313be45dec03271 Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Tue, 5 Oct 2021 17:19:19 +0100
Subject: [PATCH 45/59] Track an analytics value on accept/decline of an
 identity server.

---
 Riot/Managers/Analytics/Analytics.h           |  4 +++
 Riot/Managers/Analytics/Analytics.m           |  1 +
 ...TermsModalCoordinatorBridgePresenter.swift | 27 ++++++++++++++++++-
 changelog.d/4955.change                       |  1 +
 4 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/4955.change

diff --git a/Riot/Managers/Analytics/Analytics.h b/Riot/Managers/Analytics/Analytics.h
index 03870bef7..5ad851929 100644
--- a/Riot/Managers/Analytics/Analytics.h
+++ b/Riot/Managers/Analytics/Analytics.h
@@ -22,6 +22,10 @@
 // Metrics related to notifications
 FOUNDATION_EXPORT NSString *const AnalyticsNoficationsCategory;
 FOUNDATION_EXPORT NSString *const AnalyticsNoficationsTimeToDisplayContent;
+/**
+ The analytics value for accept/decline of the identity server's terms.
+ */
+FOUNDATION_EXPORT NSString *const AnalyticsContactsIdentityServerAccepted;
 
 
 /**
diff --git a/Riot/Managers/Analytics/Analytics.m b/Riot/Managers/Analytics/Analytics.m
index fc7c3576c..cb7062932 100644
--- a/Riot/Managers/Analytics/Analytics.m
+++ b/Riot/Managers/Analytics/Analytics.m
@@ -21,6 +21,7 @@
 
 NSString *const AnalyticsNoficationsCategory = @"notifications";
 NSString *const AnalyticsNoficationsTimeToDisplayContent = @"timelineDisplay";
+NSString *const AnalyticsContactsIdentityServerAccepted = @"identityServerAccepted";
 
 
 // Duration data will be visible under the Piwik category called "Performance".
diff --git a/Riot/Modules/ServiceTerms/Modal/ServiceTermsModalCoordinatorBridgePresenter.swift b/Riot/Modules/ServiceTerms/Modal/ServiceTermsModalCoordinatorBridgePresenter.swift
index 201ea33b1..4b55a86f0 100644
--- a/Riot/Modules/ServiceTerms/Modal/ServiceTermsModalCoordinatorBridgePresenter.swift
+++ b/Riot/Modules/ServiceTerms/Modal/ServiceTermsModalCoordinatorBridgePresenter.swift
@@ -69,7 +69,9 @@ final class ServiceTermsModalCoordinatorBridgePresenter: NSObject {
     func present(from viewController: UIViewController, animated: Bool) {
         let serviceTermsModalCoordinator = ServiceTermsModalCoordinator(session: self.session, baseUrl: self.baseUrl, serviceType: self.serviceType, outOfContext: self.outOfContext, accessToken: accessToken)
         serviceTermsModalCoordinator.delegate = self
-        viewController.present(serviceTermsModalCoordinator.toPresentable(), animated: animated, completion: nil)
+        let presentable = serviceTermsModalCoordinator.toPresentable()
+        presentable.presentationController?.delegate = self
+        viewController.present(presentable, animated: animated, completion: nil)
         serviceTermsModalCoordinator.start()
         
         if let coordinator = self.coordinator {
@@ -98,13 +100,36 @@ extension ServiceTermsModalCoordinatorBridgePresenter: ServiceTermsModalCoordina
 
     func serviceTermsModalCoordinatorDidAccept(_ coordinator: ServiceTermsModalCoordinatorType) {
         self.delegate?.serviceTermsModalCoordinatorBridgePresenterDelegateDidAccept(self)
+        
+        if serviceType == MXServiceTypeIdentityService {
+            Analytics.sharedInstance().trackValue(1, category: kMXKAnalyticsContactsCategory, name: AnalyticsContactsIdentityServerAccepted)
+        }
     }
 
     func serviceTermsModalCoordinatorDidDecline(_ coordinator: ServiceTermsModalCoordinatorType) {
         self.delegate?.serviceTermsModalCoordinatorBridgePresenterDelegateDidDecline(self, session: self.session)
+
+        if serviceType == MXServiceTypeIdentityService {
+            Analytics.sharedInstance().trackValue(0, category: kMXKAnalyticsContactsCategory, name: AnalyticsContactsIdentityServerAccepted)
+        }
     }
 
     func serviceTermsModalCoordinatorDidCancel(_ coordinator: ServiceTermsModalCoordinatorType) {
         self.delegate?.serviceTermsModalCoordinatorBridgePresenterDelegateDidCancel(self)
+        
+        if serviceType == MXServiceTypeIdentityService {
+            Analytics.sharedInstance().trackValue(0, category: kMXKAnalyticsContactsCategory, name: AnalyticsContactsIdentityServerAccepted)
+        }
+    }
+}
+
+// MARK: - UIAdaptivePresentationControllerDelegate
+extension ServiceTermsModalCoordinatorBridgePresenter: UIAdaptivePresentationControllerDelegate {
+    func presentationControllerDidDismiss(_ presentationController: UIPresentationController) {
+        self.delegate?.serviceTermsModalCoordinatorBridgePresenterDelegateDidCancel(self)
+        
+        if serviceType == MXServiceTypeIdentityService {
+            Analytics.sharedInstance().trackValue(0, category: kMXKAnalyticsContactsCategory, name: AnalyticsContactsIdentityServerAccepted)
+        }
     }
 }
diff --git a/changelog.d/4955.change b/changelog.d/4955.change
new file mode 100644
index 000000000..ef63ba876
--- /dev/null
+++ b/changelog.d/4955.change
@@ -0,0 +1 @@
+Service Terms: Track an analytics value on accept/decline of an identity server.
\ No newline at end of file

From a6e0f5560df87c58cab95bc1899365586ba80ec9 Mon Sep 17 00:00:00 2001
From: artevaeckt <timucin.boldt@udo.edu>
Date: Sat, 2 Oct 2021 09:12:36 +0000
Subject: [PATCH 46/59] Translated using Weblate (German)

Currently translated at 99.8% (1314 of 1316 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/de/
---
 Riot/Assets/de.lproj/Vector.strings | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Riot/Assets/de.lproj/Vector.strings b/Riot/Assets/de.lproj/Vector.strings
index f19085499..244995f29 100644
--- a/Riot/Assets/de.lproj/Vector.strings
+++ b/Riot/Assets/de.lproj/Vector.strings
@@ -254,9 +254,9 @@
 "room_details_access_section_anyone" = "Alle, die den Raumlink kennen - auch Gäste";
 "room_details_history_section" = "Wer kann die Historie lesen?";
 "room_details_history_section_anyone" = "Alle";
-"room_details_history_section_members_only" = "Nur Mitglieder (seit diese Option ausgewählt ist)";
+"room_details_history_section_members_only" = "Nur Mitglieder (ab Auswahl dieser Option)";
 "room_details_history_section_members_only_since_invited" = "Nur Mitglieder (ab ihrer Einladung)";
-"room_details_history_section_members_only_since_joined" = "Nur Mitglieder (Ab ihrem Beitritt)";
+"room_details_history_section_members_only_since_joined" = "Nur Mitglieder (ab ihrem Beitritt)";
 "room_details_history_section_prompt_title" = "Datenschutzwarnung";
 "room_details_addresses_section" = "Adressen";
 "room_details_no_local_addresses" = "Dieser Raum hat keine lokalen Adressen";
@@ -1438,7 +1438,7 @@
 "settings_direct_messages" = "Direktnachrichten";
 "settings_notify_me_for" = "Benachrichtige mich bei";
 "settings_mentions_and_keywords" = "Erwähnungen und Schlüsselwörter";
-"settings_confirm_media_size_description" = "Wenn dies aktiviert ist, wirst du beim Senden von Bildern und Videos gefragt, wie groß sie gesendet werden sollen.";
+"settings_confirm_media_size_description" = "Wenn dies aktiviert ist, wirst du beim Senden von Bildern und Videos gefragt, in welcher Größe sie gesendet werden sollen.";
 "settings_confirm_media_size" = "Größe beim Senden bestätigen";
 "settings_notifications" = "BENACHRICHTIGUNGEN";
 "settings_mentions_and_keywords_encryption_notice" = "Auf deinem Mobilgerät wirst du keine Benachrichtigungen für Erwähnungen und Schlüsselwörter in verschlüsselten Räumen erhalten.";

From 1909ba14d5e0e86478c4b3fe4f9371e2ec681c07 Mon Sep 17 00:00:00 2001
From: Thibault Martin <mail@thibaultmart.in>
Date: Sat, 2 Oct 2021 20:30:25 +0000
Subject: [PATCH 47/59] Translated using Weblate (French)

Currently translated at 100.0% (1316 of 1316 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/fr/
---
 Riot/Assets/fr.lproj/Vector.strings | 40 ++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/Riot/Assets/fr.lproj/Vector.strings b/Riot/Assets/fr.lproj/Vector.strings
index c9179bc7e..e46331558 100644
--- a/Riot/Assets/fr.lproj/Vector.strings
+++ b/Riot/Assets/fr.lproj/Vector.strings
@@ -1056,7 +1056,7 @@
 "security_settings_complete_security_alert_message" = "Vous devriez d’abord améliorer la sécurité de votre session actuelle.";
 "security_settings_coming_soon" = "Désolé, cette action n’est pas encore disponible dans %@ iOS. Utilisez un autre client Matrix pour le configurer. %@ iOS l’utilisera.";
 "device_verification_self_verify_wait_new_sign_in_title" = "Vérifier cette connexion";
-"device_verification_self_verify_wait_additional_information" = "ou un autre client Matrix qui prend en charge la signature croisée.";
+"device_verification_self_verify_wait_additional_information" = "Ceci fonctionne avec %@ ou un autre client Matrix prenant en charge la signature croisée.";
 // MARK: - Device Verification
 "key_verification_other_session_title" = "Vérifier la session";
 "key_verification_new_session_title" = "Vérifiez votre nouvelle session";
@@ -1482,3 +1482,41 @@
 "settings_mentions_and_keywords" = "Mentions et mots-clés";
 "settings_default" = "Notifications par défaut";
 "settings_notifications" = "NOTIFICATIONS";
+"version_check_modal_subtitle_deprecated" = "Nous avons travailler à améliorer %@ pour plus de rapidité et de confort. Malheureusement, la version d’iOS que vous utilisez n’est pas compatible avec certaines de ces améliorations et n’est plus prise en charge.\nNous vous recommandons de mettre à jour votre système pour utiliser %@ à son plein potentiel.";
+"space_avatar_view_accessibility_hint" = "Changer l’avatar de l’espace";
+
+// Mark: Avatar
+
+"space_avatar_view_accessibility_label" = "avatar";
+"space_public_join_rule" = "Espace public";
+"space_private_join_rule" = "Espace privé";
+"space_participants_action_ban" = "Supprimer de cet espace";
+"space_participants_action_remove" = "Enlever de cet espace";
+"spaces_coming_soon_detail" = "Cette fonctionnalité n’a pas été implémentée ici, mais elle arrive. Pour effectuer cette action, vous pouvez utiliser Element sur votre ordinateur.";
+"spaces_invites_coming_soon_title" = "Les invitations arrivent prochainement";
+"spaces_add_rooms_coming_soon_title" = "L’ajout de salons arrive bientôt";
+"spaces_coming_soon_title" = "Prochainement";
+"spaces_no_member_found_detail" = "Vous cherchez quelqu’un qui n’est pas dans %@ ? Pour l’instant, vous pouvez l’inviter sur l’application web ou de bureau.";
+"spaces_no_room_found_detail" = "Certains résultat peuvent être cachés car ils sont privés et requièrent une invitation.";
+"spaces_no_result_found_title" = "Aucun résultat";
+"spaces_empty_space_detail" = "Certains salons peuvent être cachés car ils sont privés et requièrent une invitation.";
+"spaces_empty_space_title" = "Cet espace n’a pas (encore) de salon";
+"space_tag" = "espace";
+"spaces_suggested_room" = "Recommandé";
+"spaces_explore_rooms" = "Parcourir les salons";
+"leave_space_and_all_rooms_action" = "Quitter tous les salons et espaces";
+"leave_space_only_action" = "Ne quitter aucun salon";
+"leave_space_message_admin_warning" = "Vous êtes administrateur de cet espace. Assurez-vous d’avoir transmis les droits d’administration à un autre membre avant de partir.";
+"leave_space_message" = "Êtes vous sûr de vouloir quitter %@ ? Voulez-vous également quitter tous les salons et espaces faisant partie de cet espace ?";
+"leave_space_title" = "Quitter %@";
+"spaces_left_panel_title" = "Espaces";
+"spaces_home_space_title" = "Accueil";
+"settings_show_url_previews_description" = "Les aperçus ne seront affichés que dans les salons non-chiffrés.";
+"settings_show_url_previews" = "Afficher les aperçus des sites web";
+"settings_confirm_media_size_description" = "Si activé, il vous sera demandé de préciser en quelle taille les images et vidéos doivent être envoyées.";
+"settings_confirm_media_size" = "Préciser la taille lors de l’envoi";
+"settings_links" = "LIENS";
+"settings_sending_media" = "ENVOI D’IMAGES ET DE VIDÉOS";
+"room_recents_suggested_rooms_section" = "SALONS RECOMMANDÉS";
+"done" = "Terminé";
+"open" = "Ouvrir";

From 8022894e35573ac02d1d70ea13088f45b9876d57 Mon Sep 17 00:00:00 2001
From: Argyropus <liuguns@gmail.com>
Date: Mon, 4 Oct 2021 16:47:03 +0000
Subject: [PATCH 48/59] Translated using Weblate (Korean)

Currently translated at 61.8% (814 of 1316 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/ko/
---
 Riot/Assets/ko.lproj/Vector.strings | 118 ++++++++++++++++++----------
 1 file changed, 76 insertions(+), 42 deletions(-)

diff --git a/Riot/Assets/ko.lproj/Vector.strings b/Riot/Assets/ko.lproj/Vector.strings
index 90d153d91..7e4ef9aac 100644
--- a/Riot/Assets/ko.lproj/Vector.strings
+++ b/Riot/Assets/ko.lproj/Vector.strings
@@ -43,7 +43,7 @@
 "auth_register" = "등록";
 "auth_submit" = "제출";
 "auth_skip" = "넘기기";
-"auth_login_single_sign_on" = "통합 인증(SSO)으로 로그인";
+"auth_login_single_sign_on" = "로그인";
 "auth_send_reset_email" = "초기화 이메일 보내기";
 "auth_return_to_login" = "로그인 화면으로 돌아가기";
 "auth_user_id_placeholder" = "이메일 혹은 사용자 이름";
@@ -170,7 +170,7 @@
 "contacts_address_book_matrix_users_toggle" = "Matrix 사용자만";
 "contacts_address_book_no_contact" = "로컬 연락처 없음";
 "contacts_address_book_permission_required" = "로컬 연락처에 접근하는데 필요한 권한";
-"contacts_address_book_permission_denied" = "Riot이 로컬 연락처에 접근하도록 허용하지 않음";
+"contacts_address_book_permission_denied" = "%@이(가) 연락처에 접근하도록 허용하지 않음";
 "contacts_user_directory_section" = "사용자 목록";
 "contacts_user_directory_offline_section" = "사용자 목록 (오프라인)";
 // Chat participants
@@ -199,8 +199,8 @@
 "room_participants_ago" = "전";
 "room_participants_action_section_admin_tools" = "관리자 도구";
 "room_participants_action_section_direct_chats" = "다이렉트 대화";
-"room_participants_action_section_devices" = "기기";
-"room_participants_action_section_other" = "기타";
+"room_participants_action_section_devices" = "세션";
+"room_participants_action_section_other" = "옵션";
 "room_participants_action_invite" = "초대";
 "room_participants_action_leave" = "이 방 떠나기";
 "room_participants_action_remove" = "이 방에서 제거";
@@ -216,7 +216,7 @@
 "room_participants_action_start_video_call" = "영상 통화 시작";
 "room_participants_action_mention" = "언급";
 // Chat
-"room_jump_to_first_unread" = "처음으로 읽지 않은 메시지로 가기";
+"room_jump_to_first_unread" = "읽지 않은 메시지로 가기";
 "room_new_message_notification" = "%d개의 새 메시지";
 "room_new_messages_notification" = "%d개의 새 메시지";
 "room_one_user_is_typing" = "%@님이 입력하는 중…";
@@ -231,8 +231,8 @@
 "room_message_short_placeholder" = "메시지를 보내세요…";
 "room_message_reply_to_short_placeholder" = "답장을 보내세요…";
 "room_offline_notification" = "서버와의 연결이 끊겼습니다.";
-"room_unsent_messages_notification" = "메시지가 보내지지 않았습니다. %1$s, %2$s, 둘 중 어느 것을 하겠습니까?";
-"room_unsent_messages_unknown_devices_notification" = "알 수 없는 기기가 있어 메시지가 보내지지 않았습니다. %1$s, %2$s, 둘 중 어느 것을 하겠습니까?";
+"room_unsent_messages_notification" = "메시지가 보내지지 않았습니다.";
+"room_unsent_messages_unknown_devices_notification" = "알 수 없는 기기가 있어 메시지 전송이 실패했습니다.";
 "room_ongoing_conference_call" = "회의 전화가 진행 중입니다. %1$s 또는 %2$s로 참가하세요.";
 "room_ongoing_conference_call_with_close" = "회의 전화가 진행 중입니다. %1$s 또는 %2$s로 참가하세요. %@.";
 "room_ongoing_conference_call_close" = "닫기";
@@ -286,7 +286,7 @@
 "room_message_edits_history_title" = "메시지 편집";
 // Unknown devices
 "unknown_devices_alert_title" = "방에 알 수 없는 기기가 있음";
-"unknown_devices_alert" = "이 방에 확인되지 않은 알 수 없는 기기가 있습니다.이 기기가 확인한 사용자의 것이라는 보장이 없습니다.\n계속하기 전에 각 기기마다 확인 절차를 거치기를 권합니다, 하지만 원한다면 확인하지 않고 메시지를 다시 보낼 수 있습니다.";
+"unknown_devices_alert" = "이 방에 검증되지 않은 알 수 없는 기기가 있습니다.\n이 기기가 사용자의 것이라는 보장이 없습니다.\n계속하기 전에 각 기기마다 검증 절차를 거치기를 권합니다, 하지만 원한다면 검증하지 않고 메시지를 다시 보낼 수 있습니다.";
 "unknown_devices_send_anyway" = "무시하고 보내기";
 "unknown_devices_call_anyway" = "무시하고 전화";
 "unknown_devices_answer_anyway" = "무시하고 답하기";
@@ -325,7 +325,7 @@
 "settings_other" = "기타";
 "settings_labs" = "연구실";
 "settings_flair" = "허용되는 곳에 재능 보이기";
-"settings_devices" = "기기";
+"settings_devices" = "세션";
 "settings_cryptography" = "암호화";
 "settings_key_backup" = "키 백업";
 "settings_deactivate_account" = "계정 비활성화";
@@ -354,7 +354,7 @@
 "settings_pin_rooms_with_unread" = "읽지 않은 메시지가 있는 방을 고정";
 "settings_on_denied_notification" = "%@에 의해 알림이 거부됬습니다, 기기 설정에서 %@을(를) 허용해주세요";
 "settings_enable_callkit" = "통합 전화";
-"settings_callkit_info" = "잠금 화면에서 수신 전화를 받습니다. 시스템의 통화 내역에서 Riot 통화를 확인하세요. iCloud가 켜져있다면, 이 통화 기록은 Apple과 공유됩니다.";
+"settings_callkit_info" = "잠금 화면에서 수신 전화를 받습니다. 시스템의 통화 내역에서 %@ 통화를 확인하세요. iCloud가 켜져있다면, 이 통화 기록은 Apple과 공유됩니다.";
 "settings_ui_language" = "언어";
 "settings_ui_theme" = "테마";
 "settings_ui_theme_auto" = "자동";
@@ -388,24 +388,24 @@
 "settings_confirm_password" = "비밀번호 확인";
 "settings_fail_to_update_password" = "비밀번호 업데이트에 실패함";
 "settings_password_updated" = "비밀번호가 업데이트되었습니다";
-"settings_crypto_device_name" = "기기 공개 이름: ";
-"settings_crypto_device_id" = "\n기기 ID: ";
-"settings_crypto_device_key" = "\n기기 키:\n";
+"settings_crypto_device_name" = "세션 이름: ";
+"settings_crypto_device_id" = "\n세션 ID: ";
+"settings_crypto_device_key" = "\n세션 키:\n";
 "settings_crypto_export" = "키 내보내기";
-"settings_crypto_blacklist_unverified_devices" = "확인된 기기만 암호화";
+"settings_crypto_blacklist_unverified_devices" = "검증된 세션만 암호화";
 "settings_deactivate_my_account" = "내 계정 비활성화";
 "settings_key_backup_info" = "암호화된 메시지는 종단간 암호화로 보호됩니다. 오직 당신과 참가자만 키를 갖고 있어서 이 메시지를 읽을 수 있습니다.";
-"settings_key_backup_info_checking" = "확인 중...";
-"settings_key_backup_info_none" = "키가 이 기기에서 백업되지 않았습니다.";
+"settings_key_backup_info_checking" = "확인 중…";
+"settings_key_backup_info_none" = "키가 이 세션에서 백업되지 않았습니다.";
 "settings_key_backup_info_signout_warning" = "이 기기에만 있을 수 있는 키를 잃지 않도록, 로그아웃하기 전에 이 기기를 키 백업에 연결하세요.";
 "settings_key_backup_info_version" = "키 백업 버전: %@";
 "settings_key_backup_info_algorithm" = "알고리즘: %@";
-"settings_key_backup_info_valid" = "이 기기는 키를 백업하고 있습니다.";
-"settings_key_backup_info_not_valid" = "이 기기는 키를 백업하고 있지 않습니다, 하지만 존재하는 백업이 있고 이것을 복구한 뒤 키를 추가할 수 있습니다.";
-"settings_key_backup_info_progress" = "%@ 키를 백업하는 중...";
+"settings_key_backup_info_valid" = "이 세션은 키를 백업하고 있습니다.";
+"settings_key_backup_info_not_valid" = "이 세션은 키를 백업하고 있지 않습니다, 하지만 존재하는 백업이 있고 이것을 복구한 뒤 키를 추가할 수 있습니다.";
+"settings_key_backup_info_progress" = "%@ 키를 백업하는 중…";
 "settings_key_backup_info_progress_done" = "모든 키가 백업됨";
-"settings_key_backup_info_trust_signature_unknown" = "백업은 기기로부터 ID로 된 서명을 갖습니다: %@";
-"settings_key_backup_info_trust_signature_valid" = "백업이 이 기기로부터 올바른 서명을 갖고 있음";
+"settings_key_backup_info_trust_signature_unknown" = "백업은 다음의 ID를 가진 세션으로부터 서명을 갖습니다: %@";
+"settings_key_backup_info_trust_signature_valid" = "백업이 이 세션부터 올바른 서명을 갖고 있음";
 "settings_key_backup_info_trust_signature_valid_device_verified" = "백업이 %@(으)로부터 올바른 서명을 갖고 있음";
 "settings_key_backup_info_trust_signature_valid_device_unverified" = "백업이 %@(으)로부터 서명을 갖고 있음";
 "settings_key_backup_info_trust_signature_invalid_device_verified" = "백업이 %@(으)로부터 올바르지 않은 서명을 갖고 있음";
@@ -413,13 +413,13 @@
 "settings_key_backup_button_create" = "키 백업 시작";
 "settings_key_backup_button_restore" = "백업에서 복구";
 "settings_key_backup_button_delete" = "백업 삭제";
-"settings_key_backup_button_connect" = "이 기기를 키 백업에 연결";
+"settings_key_backup_button_connect" = "이 세션을 키 백업에 연결";
 "settings_key_backup_delete_confirmation_prompt_title" = "백업 삭제";
 "settings_key_backup_delete_confirmation_prompt_msg" = "확신합니까? 키가 정상적으로 백업되지 않으면 암호화된 메시지를 잃게 됩니다.";
 // Room Details
 "room_details_title" = "방 세부 사항";
 "room_details_people" = "구성원";
-"room_details_files" = "파일";
+"room_details_files" = "업로드";
 "room_details_settings" = "설정";
 "room_details_photo" = "방 사진";
 "room_details_room_name" = "방 이름";
@@ -459,7 +459,7 @@
 "room_details_advanced_enable_e2e_encryption" = "암호화 켜짐 (경고: 다시 끌 수 없습니다!)";
 "room_details_advanced_e2e_encryption_enabled" = "이 방의 암호화가 켜졌습니다";
 "room_details_advanced_e2e_encryption_disabled" = "이 방의 암호화가 꺼졌습니다.";
-"room_details_advanced_e2e_encryption_blacklist_unverified_devices" = "확인된 기기만 암호화";
+"room_details_advanced_e2e_encryption_blacklist_unverified_devices" = "검증된 세션만 암호화";
 "room_details_fail_to_update_avatar" = "방 사진 업데이트에 실패함";
 "room_details_fail_to_update_room_name" = "방 이름 업데이트에 실패함";
 "room_details_fail_to_update_topic" = "주제 업데이트에 실패함";
@@ -529,7 +529,7 @@
 "event_formatter_jitsi_widget_added" = "%@님이 VoIP 회의를 추가했습니다";
 "event_formatter_jitsi_widget_removed" = "%@님이 VoIP 회의를 제거했습니다";
 "event_formatter_rerequest_keys_part1_link" = "암호화 키 다시 요청";
-"event_formatter_rerequest_keys_part2" = " 다른 기기에서.";
+"event_formatter_rerequest_keys_part2" = " 다른 세션에서.";
 "event_formatter_message_edited_mention" = "(편집됨)";
 // Others
 "or" = "또는";
@@ -539,7 +539,7 @@
 "network_offline_prompt" = "인터넷이 오프라인입니다.";
 "homeserver_connection_lost" = "홈 서버에 연결할 수 없습니다.";
 "public_room_section_title" = "공개 방 (%@에 있음):";
-"bug_report_prompt" = "애플리케이션이 방금 충돌했군요.\n충돌 보고서를 제출하겠습니까?";
+"bug_report_prompt" = "애플리케이션이 방금 충돌했군요. 충돌 보고서를 제출하겠습니까?";
 "rage_shake_prompt" = "좌절감에 휴대 전화를 흔들고 있군요. 버그 보고서를 제출하겠습니까?";
 "do_not_ask_again" = "다시 묻지 않기";
 "camera_access_not_granted" = "%@님은 카메라를 사용할 권한이 없습니다, 개인 정보 설정을 바꿔주세요";
@@ -550,8 +550,8 @@
 // Call
 "call_incoming_voice_prompt" = "%@님으로부터 온 음성 통화";
 "call_incoming_video_prompt" = "%@님으로부터 온 영상 통화";
-"call_incoming_voice" = "전화 수신 중...";
-"call_incoming_video" = "영상 통화 수신 중...";
+"call_incoming_voice" = "전화 수신 중...…";
+"call_incoming_video" = "영상 통화 수신 중...…";
 "call_already_displayed" = "이미 전화가 진행 중입니다.";
 "call_jitsi_error" = "회의 전화 참가에 실패했습니다.";
 // No VoIP support
@@ -560,8 +560,8 @@
 // Crash report
 "google_analytics_use_prompt" = "%@이(가) 개선하도록 자동으로 익명의 충돌 보고서와 사용 데이터를 제공하겠습니까?";
 // Crypto
-"e2e_enabling_on_app_update" = "Riot는 이제 종단간 암호화를 지원하지만 암호화를 켜려면 다시 로그인해야 합니다.\n\n지금 다시 로그인하거나 나중에 애플리케이션 설정에서 할 수 있습니다.";
-"e2e_need_log_in_again" = "이 기기에 종단간 암호화 키를 생성하고 공개 키를 홈서버에 제출하려면 다시 로그인해야 함니다.\n한 번만 하면 됩니다, 불편을 드려 죄송합니다.";
+"e2e_enabling_on_app_update" = "%@는 이제 종단간 암호화를 지원하지만 암호화를 켜려면 다시 로그인해야 합니다.\n\n지금 다시 로그인하거나 나중에 애플리케이션 설정에서 할 수 있습니다.";
+"e2e_need_log_in_again" = "이 세션에 종단간 암호화 키를 생성하고 공개 키를 홈서버에 제출하려면 다시 로그인해야 함니다.\n한 번만 하면 됩니다. 불편을 드려 죄송합니다.";
 // Key backup wrong version
 "e2e_key_backup_wrong_version_title" = "새 키 백업";
 "e2e_key_backup_wrong_version" = "새 보안 메시지 키 백업이 감지되었습니다.\n\n당신이 한 것이 아니라면 설정에서 새 암호를 설정하세요.";
@@ -601,9 +601,9 @@
 "share_extension_failed_to_encrypt" = "보내기에 실패함. 기본 앱에서 이 방의 암호화 설정을 확인하세요";
 // Room key request dialog
 "e2e_room_key_request_title" = "암호화 키 요청";
-"e2e_room_key_request_message_new_device" = "암호화 키를 요청한 새 기기 '%@'을(를) 추가했습니다.";
-"e2e_room_key_request_message" = "확인하지 않은 기기 '%@'이(가) 암호화 키를 요청하고 있습니다.";
-"e2e_room_key_request_start_verification" = "확인 시작...";
+"e2e_room_key_request_message_new_device" = "암호화 키를 요청한 새 세션 '%@'을(를) 추가했습니다.";
+"e2e_room_key_request_message" = "확인하지 않은 세션 '%@'이(가) 암호화 키를 요청하고 있습니다.";
+"e2e_room_key_request_start_verification" = "확인 시작…";
 "e2e_room_key_request_share_without_verifying" = "확인없이 공유";
 "e2e_room_key_request_ignore_request" = "요청 무시";
 // GDPR
@@ -629,7 +629,7 @@
 "deactivate_account_password_alert_message" = "계속하려면, 비밀번호를 입력해주세요";
 // Re-request confirmation dialog
 "rerequest_keys_alert_title" = "요청을 보냈습니다";
-"rerequest_keys_alert_message" = "메시지를 복호화해서 이 기기로 키를 보낼 수 있도록 Riot을 다른 기기에 설치해주세요.";
+"rerequest_keys_alert_message" = "메시지를 복호화해서 이 세션으로 키를 보낼 수 있도록 %@를 다른 기기에 설치해주세요.";
 "key_backup_setup_title" = "키 백업";
 "key_backup_setup_skip_alert_title" = "확신합니까?";
 "key_backup_setup_skip_alert_message" = "로그아웃하거나 기기를 잃어버리면 보안 메시지를 잃게 됩니다.";
@@ -703,21 +703,21 @@
 "device_verification_security_advice" = "보안을 최대화하려면, 직접 또는 다른 신뢰할만한 통신 수단으로 확인하기를 추천합니다";
 "device_verification_cancelled" = "상대방이 확인을 취소했습니다.";
 "device_verification_cancelled_by_me" = "확인이 취소됬습니다. 이유: %@";
-"device_verification_error_cannot_load_device" = "기기 정보를 불러올 수 없습니다.";
+"device_verification_error_cannot_load_device" = "세션 정보를 불러올 수 없습니다.";
 // Mark: Incoming
 "device_verification_incoming_title" = "수신 확인 요청";
-"device_verification_incoming_description_1" = "이 기기를 신뢰하도록 확인합니다. 상대방의 신뢰하는 기기는 종단간 암호화된 메시지를 사용할 때 더 마음에 안심을 줍니다.";
-"device_verification_incoming_description_2" = "이 기기를 신뢰하도록 확인합니다, 그리고 상대방도 당신의 기기를 신뢰하도록 합니다.";
+"device_verification_incoming_description_1" = "이 세션을 신뢰하도록 확인합니다. 상대방의 신뢰하는 세션은 종단간 암호화된 메시지를 사용할 때 더 마음에 안심을 줍니다.";
+"device_verification_incoming_description_2" = "이 세션을 신뢰하도록 확인합니다, 그리고 상대방도 당신의 세션을 신뢰하도록 합니다.";
 // MARK: Start
 "device_verification_start_title" = "짧은 문장을 비교하여 확인";
-"device_verification_start_wait_partner" = "상대방이 수락하기를 기다리는 중...";
+"device_verification_start_wait_partner" = "상대방이 수락하기를 기다리는 중…";
 "device_verification_start_use_legacy" = "아무것도 안 나타나나요? 일부 클라이언트는 아직 상호작용 확인을 지원하지 않습니다. 예전 확인 방식을 사용하세요.";
 "device_verification_start_verify_button" = "확인 시작";
 "device_verification_start_use_legacy_action" = "예전 확인 방식 사용";
 // MARK: Verify
 "device_verification_verify_title_emoji" = "상대방의 화면에 나타나는 다음 이모지를 확인하는 것으로 이 기기를 확인합니다";
 "device_verification_verify_title_number" = "상대방의 화면에 나타나는 다음 숫자를 확인하는 것으로 이 기기를 확인합니다";
-"device_verification_verify_wait_partner" = "상대방이 확인하기를 기다리는 중...";
+"device_verification_verify_wait_partner" = "상대방이 확인하기를 기다리는 중…";
 // MARK: Verified
 "device_verification_verified_title" = "확인되었습니다!";
 "device_verification_verified_description_1" = "성공적으로 이 기기를 확인했습니다.";
@@ -834,7 +834,7 @@
 "settings_three_pids_management_information_part3" = ".";
 "settings_calls_stun_server_fallback_button" = "대체 전화 지원 서버 허용";
 "settings_calls_stun_server_fallback_description" = "홈서버가 전화 서버를 지원하지 않는다면 대체 전화 지원 서버 %@를 허용합니다 (전화하는 동안 IP 주소가 공유됩니다).";
-"settings_devices_description" = "기기 공개 이름은 소통하는 사람들에게 보여집니다";
+"settings_devices_description" = "세션의 공개 명칭은 대화하는 사람들에게 보여집니다";
 "settings_discovery_no_identity_server" = "현재 ID 서버를 사용하고 있지 않습니다. 연락처에 알고 있는 사람들이 당신을 찾을 수 있도록 하려면 서버를 하나 추가하세요.";
 "settings_discovery_terms_not_signed" = "이메일이나 전화번호로 당신을 찾을 수 있도록 하려면 ID 서버 (%@)의 서비스 약관에 동의하세요.";
 "settings_discovery_three_pids_management_information_part1" = "무슨 이메일 주소나 전화번호로 다른 사용자가 당신을 찾고 방에 초대할 수 있는지 관리하세요. 이 목록에서 이메일 주소나 전화번호를 추가하거나 제거할 수 있습니다. ";
@@ -886,8 +886,8 @@
 "service_terms_modal_message_identity_server" = "연락처를 탐색하려면 ID 서버 (%@)의 약관에 동의해야 합니다.";
 "settings_add_3pid_password_title_email" = "이메일 주소 추가";
 "settings_add_3pid_password_title_msidsn" = "전화번호 추가";
-"settings_add_3pid_password_message" = "계속하려면 비밀번호를 입력해주세요";
-"settings_add_3pid_invalid_password_message" = "잘못된 비밀번호";
+"settings_add_3pid_password_message" = "계속하려면, 비밀번호를 입력해주세요";
+"settings_add_3pid_invalid_password_message" = "유효하지 않은 인증정보";
 "error_not_supported_on_mobile" = "%@ 모바일에서 할 수 없습니다.";
 "settings_integrations" = "통합";
 "settings_integrations_allow_button" = "통합 관리";
@@ -897,3 +897,37 @@
 "widget_menu_revoke_permission" = "액세스 취소";
 "widget_menu_remove" = "모두를 위해 제거";
 "widget_integration_manager_disabled" = "설정에서 통합 관리자를 켜야 합니다";
+"people_empty_view_information" = "누구든지 안전하게 대화하세요. 사람을 추가하려면 + 버튼을 누르세요.";
+"people_empty_view_title" = "사람들";
+"room_recents_unknown_room_error_message" = "이 방을 찾을 수 없습니다. 방이 존재하는지 확인하세요";
+"room_recents_suggested_rooms_section" = "추천 방";
+"room_creation_dm_error" = "DM을 보내지 못했습니다. 초대하고 싶은 사람을 다시 확인하고 다시 시도해주세요.";
+"social_login_button_title_sign_up" = "%@ (으)로 가입";
+"social_login_button_title_sign_in" = "%@ 으로 로그인하기";
+"social_login_button_title_continue" = "%@ 으로 계속하기";
+"social_login_list_title_sign_up" = "또는";
+"social_login_list_title_sign_in" = "또는";
+
+// Social login
+
+"social_login_list_title_continue" = "다음으로 계속하기";
+
+// Accessibility
+"accessibility_checkbox_label" = "체크박스";
+"callbar_only_single_active_group" = "그룹 통화에 참여하기 (%@)";
+"callbar_return" = "돌아가기";
+"callbar_only_multiple_paused" = "%@ 일시정지된 통화";
+"callbar_only_single_paused" = "일시정지된 통화";
+"callbar_active_and_multiple_paused" = "1 활성화된 통화 (%@) · %@ 일시정지된 통화";
+"callbar_active_and_single_paused" = "1 활성화된 통화 (%@) · 1 일시정지된 통화";
+
+// Call Bar
+"callbar_only_single_active" = "전화로 돌아가기 (%@)";
+"done" = "완료";
+"open" = "열기";
+"less" = "줄이기";
+"more" = "더 보기";
+"switch" = "변경";
+"joined" = "참여했습니다";
+"skip" = "넘기기";
+"store_promotional_text" = "개방된 네트워크에서 프라이버시를 보장받을 수 있는 대화와 협업 앱. 분산화된 네트워크를 통해 정보를 제어할 수 있습니다. 데이터마이닝도 백도어도 다른 곳에서의 접근도 존재하지 않습니다.";

From 1a46a3cc1e5b3cc30d912fe65219992de8fdaa1a Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Tue, 5 Oct 2021 11:14:58 +0000
Subject: [PATCH 49/59] Translated using Weblate (Ukrainian)

Currently translated at 55.3% (729 of 1316 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/uk/
---
 Riot/Assets/uk.lproj/Vector.strings | 120 ++++++++++++++++++++++++++--
 1 file changed, 113 insertions(+), 7 deletions(-)

diff --git a/Riot/Assets/uk.lproj/Vector.strings b/Riot/Assets/uk.lproj/Vector.strings
index 5e3d39baa..d91f1d708 100644
--- a/Riot/Assets/uk.lproj/Vector.strings
+++ b/Riot/Assets/uk.lproj/Vector.strings
@@ -76,8 +76,8 @@
 "auth_use_server_options" = "Власні налаштування сервера";
 "auth_email_validation_message" = "Перевірте свою пошту для продовження реєстрації";
 "auth_msisdn_validation_title" = "Очікування перевірки";
-"auth_msisdn_validation_message" = "Ми надіслали SMS з кодом активації. Введіть цей код внизу.";
-"auth_msisdn_validation_error" = "Неможливо перевірити номер телефону.";
+"auth_msisdn_validation_message" = "Ми надіслали СМС із кодом активації. Введіть цей код унизу.";
+"auth_msisdn_validation_error" = "Не вдалося перевірити номер телефону.";
 "auth_recaptcha_message" = "Цей домашній сервер бажає переконатися, що ви не робот";
 "auth_reset_password_message" = "Щоб відновити пароль, введіть адресу е-пошти, пов'язану з вашим обліковим записом:";
 "auth_reset_password_missing_email" = "Необхідно ввести адресу е-пошти, пов'язану з вашим обліковим записом.";
@@ -234,7 +234,7 @@
 "settings_change_password" = "Змінити пароль";
 "settings_add_phone_number" = "Додати номер телефону";
 "settings_phone_number" = "Телефон";
-"settings_add_email_address" = "Додати адресу електронної пошти";
+"settings_add_email_address" = "Додати адресу е-пошти";
 "settings_email_address_placeholder" = "Введіть вашу адресу електронної пошти";
 "room_title_one_active_member" = "%@/%@ активний учасник";
 
@@ -664,13 +664,13 @@
 
 // MARK: QR code
 
-"key_verification_verify_qr_code_title" = "Підтвердити скануванням";
+"key_verification_verify_qr_code_title" = "Звірити скануванням";
 
 // Incoming key verification request
 
-"key_verification_incoming_request_incoming_alert_message" = "%@ просить підтвердження";
+"key_verification_incoming_request_incoming_alert_message" = "%@ бажає звіритись";
 "key_verification_tile_conclusion_warning_title" = "Не довірений вхід";
-"key_verification_tile_conclusion_done_title" = "Підтверджений";
+"key_verification_tile_conclusion_done_title" = "Звірений";
 "key_verification_tile_request_incoming_approval_accept" = "Прийняти";
 "key_verification_tile_request_status_accepted" = "Ви прийняли";
 "key_verification_tile_request_status_cancelled" = "%@ скасовує";
@@ -681,7 +681,7 @@
 
 // Tiles
 
-"key_verification_tile_request_incoming_title" = "Запит підтвердження";
+"key_verification_tile_request_incoming_title" = "Запит звірення";
 "space_beta_announce_badge" = "БЕТА";
 "space_beta_announce_title" = "Простори скоро з'являться";
 "space_beta_announce_subtitle" = "Нова версія спільнот";
@@ -789,3 +789,109 @@
 "room_creation_dm_error" = "Ми не можемо створити ваше особисте повідомлення. Перевірте користувачів, яких ви хочете запросити й повторіть спробу.";
 "done" = "Готово";
 "open" = "Відкрити";
+"settings_devices_description" = "Загальнодоступну назву сеансу бачать люди, з якими ви спілкуєтесь";
+"no_voip" = "%@ викликає вас, але %@ поки що не підтримує дзвінки.\nВи можете знехтувати це сповіщення та відповісти на виклик з іншого пристрою, а можете відхилити його.";
+"room_details_mute_notifs" = "Заглушити сповіщення";
+"settings_mentions_and_keywords_encryption_notice" = "Ви не отримуватимете сповіщення про згадки та ключові слова в зашифрованих кімнатах на мобільних пристроях.";
+"settings_default" = "Типові сповіщення";
+"settings_notifications_disabled_alert_message" = "Щоб увімкнути сповіщення, перейдіть до налаштувань свого пристрою.";
+"settings_notifications_disabled_alert_title" = "Сповіщення вимкнено";
+"room_offline_notification" = "Зв'язок з сервером втрачено.";
+"room_unsent_messages_unknown_devices_notification" = "Не вдалося надіслати повідомлення через наявність невідомих сеансів.";
+"room_unsent_messages_notification" = "Не вдалося надіслати повідомлення.";
+"directory_server_all_native_rooms" = "Усі кімнати сервера Matrix";
+"group_participants_invite_malformed_id_title" = "Помилка запрошення";
+"group_participants_remove_prompt_msg" = "Ви справді хочете вилучити %@ з цієї групи?";
+"room_notifs_settings_encrypted_room_notice" = "Зверніть увагу, що сповіщення про згадки та ключові слова недоступні в зашифрованих кімнатах на мобільних пристроях.";
+"room_notifs_settings_account_settings" = "Налаштування облікового запису";
+"room_notifs_settings_manage_notifications" = "Ви можете керувати сповіщеннями у %@";
+"room_notifs_settings_cancel_action" = "Скасувати";
+"key_backup_setup_success_from_passphrase_done_action" = "Готово";
+"room_notifs_settings_done_action" = "Готово";
+"room_notifs_settings_none" = "Нічого";
+"room_notifs_settings_mentions_and_keywords" = "Згадки та ключові слова";
+"room_notifs_settings_all_messages" = "Усі повідомлення";
+"settings_notify_me_for" = "Сповістити мене про";
+
+// Room Notification Settings
+"room_notifs_settings_notify_me_for" = "Сповістити мене про";
+"room_details_copy_room_url" = "Копіювати URL-адресу кімнати";
+"room_details_copy_room_address" = "Копіювати адресу кімнати";
+"room_details_copy_room_id" = "Копіювати ID кімнати";
+"room_details_unset_main_address" = "Не використовувати основною адресою";
+"room_details_set_main_address" = "Установити основною адресою";
+"room_details_save_changes_prompt" = "Бажаєте зберегти зміни?";
+"room_details_fail_to_enable_encryption" = "Не вдалося увімкнути шифрування цієї кімнати";
+"room_details_fail_to_update_room_communities" = "Не вдалося оновити пов'язані спільноти";
+"room_details_new_address_placeholder" = "Додати нову адресу (напр., #foo%@)";
+"room_details_new_address" = "Додати нову адресу";
+
+// Re-request confirmation dialog
+"rerequest_keys_alert_title" = "Запит надіслано";
+"settings_key_backup_info_algorithm" = "Алгоритм: %@";
+"settings_add_3pid_password_title_msidsn" = "Додати номер телефону";
+"settings_device_notifications" = "Сповіщення пристрою";
+"settings_add_3pid_password_title_email" = "Додати адресу е-пошти";
+"settings_password_updated" = "Пароль оновлено";
+"settings_fail_to_update_password" = "Не вдалося оновити пароль";
+"settings_confirm_password" = "підтвердити пароль";
+"settings_new_password" = "новий пароль";
+"settings_old_password" = "старий пароль";
+"room_details_advanced_e2e_encryption_disabled_for_dm" = "Шифрування не увімкнено тут.";
+"room_details_advanced_e2e_encryption_disabled" = "Шифрування не увімкнено в цій кімнаті.";
+"room_details_advanced_e2e_encryption_enabled_for_dm" = "Шифрування увімкнено тут";
+"room_details_advanced_e2e_encryption_enabled" = "Шифрування увімкнено в цій кімнаті";
+"room_details_advanced_enable_e2e_encryption" = "Увімкнути шифрування (попередження: вимкнути не можливо!)";
+"room_details_advanced_room_id_for_dm" = "ID:";
+"room_details_advanced_room_id" = "ID кімнати:";
+"room_details_advanced_section" = "Розширені";
+"room_details_fail_to_update_room_canonical_alias" = "Не вдалося оновити основну адресу";
+"room_details_fail_to_remove_room_aliases" = "Не вдалося вилучити адресу кімнати";
+"room_details_fail_to_add_room_aliases" = "Не вдалося додати нову адресу кімнати";
+"room_details_fail_to_update_history_visibility" = "Не вдалося оновити видимість історії";
+"room_details_fail_to_update_room_directory_visibility" = "Не вдалося оновити видимість каталогу кімнати";
+"room_details_fail_to_update_room_join_rule" = "Не вдалося оновити правила приєднання";
+"room_details_fail_to_update_room_guest_access" = "Не вдалося оновити гостьовий доступ до кімнати";
+"room_details_fail_to_update_topic" = "Не вдалося оновити тему";
+"room_details_fail_to_update_room_name" = "Не вдалося оновити назву кімнати";
+"room_details_fail_to_update_avatar" = "Не вдалося оновити світлину кімнати";
+"room_details_advanced_e2e_encryption_blacklist_unverified_devices" = "Шифрування лише для звірених сеансів";
+"settings_crypto_blacklist_unverified_devices" = "Шифрування лише для звірених сеансів";
+"settings_crypto_export" = "Експорт ключів";
+"settings_crypto_device_key" = "\nКлюч сеансу:\n";
+"settings_crypto_device_id" = "\nID сеансу: ";
+"settings_crypto_device_name" = "Назва сеансу: ";
+"settings_add_3pid_invalid_password_message" = "Хибні облікові дані";
+"settings_add_3pid_password_message" = "Щоб продовжити, введіть пароль";
+"deactivate_account_password_alert_message" = "Щоб продовжити, введіть пароль";
+
+// Deactivate account
+
+"deactivate_account_title" = "Деактивувати обліковий запис";
+"deactivate_account_password_alert_title" = "Деактивувати обліковий запис";
+"deactivate_account_validate_action" = "Деактивувати обліковий запис";
+"deactivate_account_forget_messages_information_part2_emphasize" = "Попередження";
+"key_verification_self_verify_unverified_sessions_alert_validate_action" = "Перевірити";
+"key_verification_self_verify_unverified_sessions_alert_message" = "Звірити всі свої сеанси, щоб переконатися, що ваш обліковий запис і повідомлення у безпеці.";
+
+// Unverified sessions
+
+"key_verification_self_verify_unverified_sessions_alert_title" = "Перевірте, де ви увійшли";
+"key_verification_self_verify_current_session_alert_validate_action" = "Звірити";
+"device_verification_self_verify_start_verify_action" = "Почати звірення";
+"device_verification_self_verify_alert_validate_action" = "Звірити";
+"key_verification_verified_new_session_title" = "Новий сеанс звірено!";
+"device_verification_verified_got_it_button" = "Зрозуміло";
+
+// MARK: Verified
+
+// Device
+
+"device_verification_verified_title" = "Звірено!";
+
+// Device
+
+"device_verification_verify_wait_partner" = "Очікування підтвердження партнером…";
+"key_verification_manually_verify_device_validate_action" = "Звірити";
+"room_participants_action_security_status_verify" = "Звірити";
+"room_participants_action_security_status_verified" = "Звірений";

From f4317e9b0d375b362b53963236196ab8f28f8be6 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gile@element.io>
Date: Wed, 6 Oct 2021 22:06:00 +0200
Subject: [PATCH 50/59] Fix performance issues with Spaces on very large
 accounts #4898

- Listen to `MXSpaceNotificationCounter` to update the notification badge
---
 Riot/Modules/TabBar/MasterTabBarController.m | 10 +++++++++-
 changelog.d/4898.bugfix                      |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/4898.bugfix

diff --git a/Riot/Modules/TabBar/MasterTabBarController.m b/Riot/Modules/TabBar/MasterTabBarController.m
index e84078a19..ef2f10427 100644
--- a/Riot/Modules/TabBar/MasterTabBarController.m
+++ b/Riot/Modules/TabBar/MasterTabBarController.m
@@ -64,6 +64,8 @@
     
     // Custom title view of the navigation bar
     MainTitleView *titleView;
+    
+    id spaceNotificationCounterDidUpdateNotificationCountObserver;
 }
 
 @property(nonatomic,getter=isHidden) BOOL hidden;
@@ -122,7 +124,7 @@
     childViewControllers = [NSMutableArray array];
     
     MXWeakify(self);
-    [[NSNotificationCenter defaultCenter] addObserverForName:MXSpaceService.didBuildSpaceGraph object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) {
+    spaceNotificationCounterDidUpdateNotificationCountObserver = [[NSNotificationCenter defaultCenter] addObserverForName:MXSpaceNotificationCounter.didUpdateNotificationCount object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) {
         MXStrongifyAndReturnIfNil(self);
         [self updateSideMenuNotifcationIcon];
     }];
@@ -272,6 +274,12 @@
         kThemeServiceDidChangeThemeNotificationObserver = nil;
     }
     
+    if (spaceNotificationCounterDidUpdateNotificationCountObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:spaceNotificationCounterDidUpdateNotificationCountObserver];
+        spaceNotificationCounterDidUpdateNotificationCountObserver = nil;
+    }
+    
     childViewControllers = nil;
 }
 
diff --git a/changelog.d/4898.bugfix b/changelog.d/4898.bugfix
new file mode 100644
index 000000000..0f4c5faf1
--- /dev/null
+++ b/changelog.d/4898.bugfix
@@ -0,0 +1 @@
+MasterTabBarController: Listen to `MXSpaceNotificationCounter` to update the notification badge
\ No newline at end of file

From cf910b0f91c61e0e36e2f6bec84f1ca82f2fce4d Mon Sep 17 00:00:00 2001
From: Gil Eluard <gile@element.io>
Date: Thu, 7 Oct 2021 07:16:15 +0200
Subject: [PATCH 51/59] Fix performance issues with Spaces on very large
 accounts #4898

- Listen to `MXSpaceNotificationCounter` to update the notification badge
---
 Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift b/Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift
index 9a7c030c8..ed11d2df9 100644
--- a/Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift
+++ b/Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift
@@ -53,6 +53,8 @@ final class SpaceListViewModel: SpaceListViewModelType {
         self.userSessionsService = userSessionsService
         
         NotificationCenter.default.addObserver(self, selector: #selector(self.sessionDidSync(notification:)), name: MXSpaceService.didBuildSpaceGraph, object: nil)
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(self.counterDidUpdateNotificationCount(notification:)), name: MXSpaceNotificationCounter.didUpdateNotificationCount, object: nil)
 
     }
     
@@ -122,6 +124,10 @@ final class SpaceListViewModel: SpaceListViewModelType {
         loadData()
     }
     
+    @objc private func counterDidUpdateNotificationCount(notification: Notification) {
+        loadData()
+    }
+    
     private func loadData() {
         guard let session = self.userSessionsService.mainUserSession?.matrixSession else {
             return

From b7da17925d69463ac64293be63c7bf5ff77b8eec Mon Sep 17 00:00:00 2001
From: Gil Eluard <gile@element.io>
Date: Thu, 7 Oct 2021 08:46:19 +0200
Subject: [PATCH 52/59] Fix performance issues with Spaces on very large
 accounts #4898

- Support optional `MXSpace.room` property
---
 .../Spaces/SpaceDetail/SpaceDetailViewController.swift      | 3 +++
 Riot/Modules/Spaces/SpaceMenu/SpaceMenuViewModel.swift      | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Riot/Modules/Spaces/SpaceDetail/SpaceDetailViewController.swift b/Riot/Modules/Spaces/SpaceDetail/SpaceDetailViewController.swift
index 95f7e7b19..bca282949 100644
--- a/Riot/Modules/Spaces/SpaceDetail/SpaceDetailViewController.swift
+++ b/Riot/Modules/Spaces/SpaceDetail/SpaceDetailViewController.swift
@@ -231,6 +231,9 @@ class SpaceDetailViewController: UIViewController {
         let membersString = membersCount == 1 ? VectorL10n.roomTitleOneMember : VectorL10n.roomTitleMembers("\(membersCount)")
         self.spaceTypeLabel.text = "\(joinRuleString) · \(membersString)"
         
+        let joinRuleIcon = parameters.joinRule == .public ? Asset.Images.spaceTypeIcon : Asset.Images.spacePrivateIcon
+        self.spaceTypeIconView.image = joinRuleIcon.image
+        
         self.inviterIdLabel.text = parameters.inviterId
         if let inviterId = parameters.inviterId {
             self.inviterTitleLabel.text = "\(parameters.inviter?.displayname ?? inviterId) invited you"
diff --git a/Riot/Modules/Spaces/SpaceMenu/SpaceMenuViewModel.swift b/Riot/Modules/Spaces/SpaceMenu/SpaceMenuViewModel.swift
index 34442e730..be6ad2514 100644
--- a/Riot/Modules/Spaces/SpaceMenu/SpaceMenuViewModel.swift
+++ b/Riot/Modules/Spaces/SpaceMenu/SpaceMenuViewModel.swift
@@ -76,12 +76,12 @@ class SpaceMenuViewModel: SpaceMenuViewModelType {
     }
 
     private func leaveSpace() {
-        guard let space = self.session.spaceService.getSpace(withId: self.spaceId), let displayName = space.summary?.displayname else {
+        guard let room = self.session.room(withRoomId: self.spaceId), let displayName = room.summary?.displayname else {
             return
         }
 
         var isAdmin = false
-        if let roomState = space.room.dangerousSyncState, let powerLevels = roomState.powerLevels {
+        if let roomState = room.dangerousSyncState, let powerLevels = roomState.powerLevels {
             let powerLevel = powerLevels.powerLevelOfUser(withUserID: self.session.myUserId)
             let roomPowerLevel = RoomPowerLevelHelper.roomPowerLevel(from: powerLevel)
             isAdmin = roomPowerLevel == .admin
@@ -156,7 +156,7 @@ class SpaceMenuViewModel: SpaceMenuViewModelType {
     }
     
     private func leaveSpace(_ space: MXSpace) {
-        space.room.leave(completion: { [weak self] response in
+        space.room?.leave(completion: { [weak self] response in
             guard let self = self else {
                 return
             }

From 6bf9683e6a49d9486b60737f6c83895ba0a2b0ae Mon Sep 17 00:00:00 2001
From: Gil Eluard <gile@element.io>
Date: Thu, 7 Oct 2021 08:48:41 +0200
Subject: [PATCH 53/59] Fix performance issues with Spaces on very large
 accounts #4898

- Support optional `MXSpace.room` property
---
 .../Modules/Spaces/SpaceDetail/SpaceDetailViewController.swift | 3 ---
 Riot/Modules/Spaces/SpaceDetail/SpaceDetailViewModel.swift     | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Riot/Modules/Spaces/SpaceDetail/SpaceDetailViewController.swift b/Riot/Modules/Spaces/SpaceDetail/SpaceDetailViewController.swift
index bca282949..95f7e7b19 100644
--- a/Riot/Modules/Spaces/SpaceDetail/SpaceDetailViewController.swift
+++ b/Riot/Modules/Spaces/SpaceDetail/SpaceDetailViewController.swift
@@ -231,9 +231,6 @@ class SpaceDetailViewController: UIViewController {
         let membersString = membersCount == 1 ? VectorL10n.roomTitleOneMember : VectorL10n.roomTitleMembers("\(membersCount)")
         self.spaceTypeLabel.text = "\(joinRuleString) · \(membersString)"
         
-        let joinRuleIcon = parameters.joinRule == .public ? Asset.Images.spaceTypeIcon : Asset.Images.spacePrivateIcon
-        self.spaceTypeIconView.image = joinRuleIcon.image
-        
         self.inviterIdLabel.text = parameters.inviterId
         if let inviterId = parameters.inviterId {
             self.inviterTitleLabel.text = "\(parameters.inviter?.displayname ?? inviterId) invited you"
diff --git a/Riot/Modules/Spaces/SpaceDetail/SpaceDetailViewModel.swift b/Riot/Modules/Spaces/SpaceDetail/SpaceDetailViewModel.swift
index 4ba44c856..ac4583718 100644
--- a/Riot/Modules/Spaces/SpaceDetail/SpaceDetailViewModel.swift
+++ b/Riot/Modules/Spaces/SpaceDetail/SpaceDetailViewModel.swift
@@ -80,7 +80,7 @@ class SpaceDetailViewModel: SpaceDetailViewModelType {
             self.update(viewState: .loaded(parameters))
             
             self.update(viewState: .loading)
-            space.room.state { state in
+            space.room?.state { state in
                 let joinRule = state?.joinRule
                 let membersCount = summary.membersCount.members
                 

From 7e94bda898f3611acd6c84868b66a1e97d7ffa6c Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Wed, 6 Oct 2021 11:53:00 +0000
Subject: [PATCH 54/59] Translated using Weblate (Swedish)

Currently translated at 98.3% (1294 of 1316 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sv/
---
 Riot/Assets/sv.lproj/Vector.strings | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Riot/Assets/sv.lproj/Vector.strings b/Riot/Assets/sv.lproj/Vector.strings
index a51817da3..ccffe08ef 100644
--- a/Riot/Assets/sv.lproj/Vector.strings
+++ b/Riot/Assets/sv.lproj/Vector.strings
@@ -1406,7 +1406,14 @@
 "settings_default" = "Förvalda aviseringar";
 "settings_notifications" = "AVISERINGAR";
 "settings_show_url_previews_description" = "Förhandsgranskningar kommer bara att visas i okrypterade rum.";
-"settings_show_url_previews" = "Visa inbäddade URL-förhandsgranskningar";
+"settings_show_url_previews" = "Visa förhandsgranskningar av webbsidor";
 "settings_confirm_media_size_description" = "När detta är på så kommer du få bekräfta vilken storlek bilder och videor kommer att skickas som.";
 "settings_confirm_media_size" = "Bekräfta storlek vid sparning";
 "settings_sending_media" = "SÄNDNING AV BILDER OCH VIDEO";
+"leave_space_title" = "Lämna %@";
+"spaces_left_panel_title" = "Utrymmen";
+"spaces_home_space_title" = "Hem";
+"settings_links" = "LÄNKAR";
+"room_recents_suggested_rooms_section" = "FÖRESLAGNA RUM";
+"done" = "Klar";
+"open" = "Öppna";

From 715d1382ed49f3520d2669ab39a289bd985939da Mon Sep 17 00:00:00 2001
From: Stefan Ceriu <stefanc@matrix.org>
Date: Fri, 8 Oct 2021 11:23:56 +0300
Subject: [PATCH 55/59] vector-im/element-ios/issues/4899 - Fixed various
 localization issues.

---
 Riot/Modules/Authentication/AuthenticationViewController.m    | 2 +-
 Riot/Modules/Room/RoomViewController.m                        | 2 +-
 .../DeactivateAccount/DeactivateAccountViewController.m       | 2 +-
 Riot/Modules/Settings/SettingsViewController.m                | 4 ++--
 Riot/Utils/Tools.m                                            | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Riot/Modules/Authentication/AuthenticationViewController.m b/Riot/Modules/Authentication/AuthenticationViewController.m
index 6c5f7aa47..d40090c3d 100644
--- a/Riot/Modules/Authentication/AuthenticationViewController.m
+++ b/Riot/Modules/Authentication/AuthenticationViewController.m
@@ -739,7 +739,7 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
     }
 
     alert = [UIAlertController alertControllerWithTitle:[VectorL10n authSoftlogoutClearDataSignOutTitle]
-                                                message:[VectorL10n  authSoftlogoutClearDataSignOutMsg]
+                                                message:[VectorL10n authSoftlogoutClearDataSignOutMsg]
                                          preferredStyle:UIAlertControllerStyleAlert];
 
 
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 538b02bb1..7fc46819a 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -5144,7 +5144,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         }
         
         currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n unknownDevicesAlertTitle]
-                                                           message:[VectorL10n unknownDevicesAlertTitle]
+                                                           message:[VectorL10n unknownDevicesAlert]
                                                     preferredStyle:UIAlertControllerStyleAlert];
         
         [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n unknownDevicesVerify]
diff --git a/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m b/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
index 33284c4e9..67b66479e 100644
--- a/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
+++ b/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
@@ -239,7 +239,7 @@ static CGFloat const kTextFontSize = 15.0;
     
     __weak typeof(self) weakSelf = self;
     
-    [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+    [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n submit]
                                               style:UIAlertActionStyleDefault
                                             handler:^(UIAlertAction * action) {
                                                 UITextField *textField = alert.textFields.firstObject;
diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m
index d99233749..d8dbda6ae 100644
--- a/Riot/Modules/Settings/SettingsViewController.m
+++ b/Riot/Modules/Settings/SettingsViewController.m
@@ -1151,7 +1151,7 @@ TableViewSectionsDelegate>
 
             // Ask password again
             self->currentAlert = [UIAlertController alertControllerWithTitle:nil
-                                                                     message:[VectorL10n settingsAdd3pidPasswordMessage]
+                                                                     message:[VectorL10n settingsAdd3pidInvalidPasswordMessage]
                                                               preferredStyle:UIAlertControllerStyleAlert];
 
             [self->currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n retry] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
@@ -1375,7 +1375,7 @@ TableViewSectionsDelegate>
         title = [VectorL10n settingsAdd3pidPasswordTitleEmail];
     }
     
-    NSString *message = [VectorL10n settingsAdd3pidInvalidPasswordMessage];
+    NSString *message = [VectorL10n settingsAdd3pidPasswordMessage];
     
     
     [session.matrixRestClient add3PIDOnlyWithSessionId:@"" clientSecret:[MXTools generateSecret] authParams:nil success:^{
diff --git a/Riot/Utils/Tools.m b/Riot/Utils/Tools.m
index dfb212b84..aefdea642 100644
--- a/Riot/Utils/Tools.m
+++ b/Riot/Utils/Tools.m
@@ -47,7 +47,7 @@
         
         if (user.currentlyActive)
         {
-            presenceText = [presenceText stringByAppendingString:[VectorL10n roomParticipantsNow]];
+            presenceText = [presenceText stringByAppendingString:[NSString stringWithFormat:@" %@",[VectorL10n roomParticipantsNow]]];
         }
         else if (-1 != user.lastActiveAgo && 0 < user.lastActiveAgo)
         {

From f988fadaf0681fd2e35b1bc328c982643f1d4ec4 Mon Sep 17 00:00:00 2001
From: Stefan Ceriu <stefanc@matrix.org>
Date: Thu, 7 Oct 2021 14:07:17 +0300
Subject: [PATCH 56/59] Fixes #4935 - Enable voice message scrubbing pan
 gesture only after long press.

---
 .../VoiceMessagePlaybackView.swift            | 48 +++++++++++++------
 .../VoiceMessagePlaybackView.xib              | 14 ------
 changelog.d/4935.change                       |  1 +
 3 files changed, 34 insertions(+), 29 deletions(-)
 create mode 100644 changelog.d/4935.change

diff --git a/Riot/Modules/Room/VoiceMessages/VoiceMessagePlaybackView.swift b/Riot/Modules/Room/VoiceMessages/VoiceMessagePlaybackView.swift
index 77638d38b..8c13de2d3 100644
--- a/Riot/Modules/Room/VoiceMessages/VoiceMessagePlaybackView.swift
+++ b/Riot/Modules/Room/VoiceMessages/VoiceMessagePlaybackView.swift
@@ -43,7 +43,6 @@ class VoiceMessagePlaybackView: UIView, NibLoadable, Themable {
     
     private var _waveformView: VoiceMessageWaveformView!
     private var currentTheme: Theme?
-    private var scrubProgress: CGFloat?
     
     @IBOutlet private var backgroundView: UIView!
     @IBOutlet private var recordingIcon: UIView!
@@ -51,6 +50,9 @@ class VoiceMessagePlaybackView: UIView, NibLoadable, Themable {
     @IBOutlet private var elapsedTimeLabel: UILabel!
     @IBOutlet private var waveformContainerView: UIView!
     
+    private var longPressGestureRecognizer: UILongPressGestureRecognizer!
+    private var panGestureRecognizer: UIPanGestureRecognizer!
+    
     weak var delegate: VoiceMessagePlaybackViewDelegate?
     
     var details: VoiceMessagePlaybackViewDetails?
@@ -75,6 +77,14 @@ class VoiceMessagePlaybackView: UIView, NibLoadable, Themable {
         
         _waveformView = VoiceMessageWaveformView(frame: waveformContainerView.bounds)
         waveformContainerView.vc_addSubViewMatchingParent(_waveformView)
+        
+        longPressGestureRecognizer = UILongPressGestureRecognizer(target: self, action: #selector(handleLongPressGesture(_:)))
+        longPressGestureRecognizer.minimumPressDuration = 0.2
+        waveformView.addGestureRecognizer(longPressGestureRecognizer)
+        
+        panGestureRecognizer = UIPanGestureRecognizer(target: self, action: #selector(handlePanGesture(_:)))
+        panGestureRecognizer.isEnabled = false
+        waveformView.addGestureRecognizer(panGestureRecognizer)
     }
     
     func configureWithDetails(_ details: VoiceMessagePlaybackViewDetails?) {
@@ -136,28 +146,36 @@ class VoiceMessagePlaybackView: UIView, NibLoadable, Themable {
         currentTheme = theme
         configureWithDetails(details)
     }
-    
+        
     // MARK: - Private
         
     @IBAction private func onPlayButtonTap() {
         delegate?.voiceMessagePlaybackViewDidRequestPlaybackToggle()
     }
     
-    @IBAction private func tap(gestureRecognizer: UITapGestureRecognizer) {
+    @objc private func handleLongPressGesture(_ gestureRecognizer: UITapGestureRecognizer) {
         let x = gestureRecognizer.location(in: waveformContainerView).x.clamped(to: 0...waveformContainerView.bounds.width)
         let progress = x / waveformContainerView.bounds.width
         delegate?.voiceMessagePlaybackViewDidRequestSeek(to: progress)
-    }
-
-    @IBAction private func pan(gestureRecognizer: UIPanGestureRecognizer) {
-            switch gestureRecognizer.state {
-            case .began, .changed:
-                let x = gestureRecognizer.location(in: waveformContainerView).x.clamped(to: 0...waveformContainerView.bounds.width)
-                let progress = x / waveformContainerView.bounds.width
-                scrubProgress = progress
-                delegate?.voiceMessagePlaybackViewDidRequestSeek(to: progress)
-            default:
-                scrubProgress = nil
-            }
+        
+        switch gestureRecognizer.state {
+        case .began:
+            panGestureRecognizer.isEnabled = true
+        case .ended, .failed, .cancelled:
+            panGestureRecognizer.isEnabled = false
+        default:
+            break
         }
+    }
+    
+    @objc private func handlePanGesture(_ gestureRecognizer: UIPanGestureRecognizer) {
+        switch gestureRecognizer.state {
+        case .began, .changed:
+            let x = gestureRecognizer.location(in: waveformContainerView).x.clamped(to: 0...waveformContainerView.bounds.width)
+            let progress = x / waveformContainerView.bounds.width
+            delegate?.voiceMessagePlaybackViewDidRequestSeek(to: progress)
+        default:
+            break
+        }
+    }
 }
diff --git a/Riot/Modules/Room/VoiceMessages/VoiceMessagePlaybackView.xib b/Riot/Modules/Room/VoiceMessages/VoiceMessagePlaybackView.xib
index d60ec0b68..1bbca0184 100644
--- a/Riot/Modules/Room/VoiceMessages/VoiceMessagePlaybackView.xib
+++ b/Riot/Modules/Room/VoiceMessages/VoiceMessagePlaybackView.xib
@@ -51,10 +51,6 @@
                             <rect key="frame" x="94" y="7" width="317" height="30"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <gestureRecognizers/>
-                            <connections>
-                                <outletCollection property="gestureRecognizers" destination="TvB-7x-51j" appends="YES" id="2ac-M3-OKn"/>
-                                <outletCollection property="gestureRecognizers" destination="Fwa-Eg-VFh" appends="YES" id="meS-g1-yIc"/>
-                            </connections>
                         </view>
                     </subviews>
                     <constraints>
@@ -86,16 +82,6 @@
             </connections>
             <point key="canvasLocation" x="-1742.753623188406" y="-299.33035714285711"/>
         </view>
-        <panGestureRecognizer minimumNumberOfTouches="1" id="TvB-7x-51j">
-            <connections>
-                <action selector="panWithGestureRecognizer:" destination="cGR-49-HWB" id="mcT-Wy-ePL"/>
-            </connections>
-        </panGestureRecognizer>
-        <tapGestureRecognizer id="Fwa-Eg-VFh">
-            <connections>
-                <action selector="tapWithGestureRecognizer:" destination="cGR-49-HWB" id="VMd-gQ-DPy"/>
-            </connections>
-        </tapGestureRecognizer>
     </objects>
     <resources>
         <image name="voice_message_play_button" width="15.5" height="15"/>
diff --git a/changelog.d/4935.change b/changelog.d/4935.change
new file mode 100644
index 000000000..93c0dcc9c
--- /dev/null
+++ b/changelog.d/4935.change
@@ -0,0 +1 @@
+Voice Message scrubbing should require a slightly longer press, to avoid accidental scrubbing when scrolling the timeline
\ No newline at end of file

From 625b9902d896682ae15ba46c023c299060e364a4 Mon Sep 17 00:00:00 2001
From: Stefan Ceriu <stefanc@matrix.org>
Date: Fri, 8 Oct 2021 15:56:05 +0300
Subject: [PATCH 57/59] Fixes #4970 - Fixed unintentional voice message drafts
 on automatically cancelled recordings.

---
 .../VoiceMessageController.swift              | 22 ++++++++++++++-----
 changelog.d/4970.bugfix                       |  1 +
 2 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 changelog.d/4970.bugfix

diff --git a/Riot/Modules/Room/VoiceMessages/VoiceMessageController.swift b/Riot/Modules/Room/VoiceMessages/VoiceMessageController.swift
index 5d1d48254..01a57e742 100644
--- a/Riot/Modules/Room/VoiceMessages/VoiceMessageController.swift
+++ b/Riot/Modules/Room/VoiceMessages/VoiceMessageController.swift
@@ -130,12 +130,7 @@ public class VoiceMessageController: NSObject, VoiceMessageToolbarViewDelegate,
     }
     
     func voiceMessageToolbarViewDidRequestRecordingCancel(_ toolbarView: VoiceMessageToolbarView) {
-        isInLockedMode = false
-        audioPlayer?.stop()
-        audioRecorder?.stopRecording()
-        deleteRecordingAtURL(temporaryFileURL)
-        UINotificationFeedbackGenerator().notificationOccurred(.error)
-        updateUI()
+        cancelRecording()
     }
     
     func voiceMessageToolbarViewDidRequestLockedModeRecording(_ toolbarView: VoiceMessageToolbarView) {
@@ -259,6 +254,8 @@ public class VoiceMessageController: NSObject, VoiceMessageToolbarViewDelegate,
         guard isInLockedMode else {
             if recordDuration ?? 0 >= Constants.minimumRecordingDuration {
                 sendRecordingAtURL(temporaryFileURL)
+            } else {
+                cancelRecording()
             }
             return
         }
@@ -268,6 +265,19 @@ public class VoiceMessageController: NSObject, VoiceMessageToolbarViewDelegate,
         updateUI()
     }
     
+    private func cancelRecording() {
+        isInLockedMode = false
+        
+        audioPlayer?.stop()
+        audioRecorder?.stopRecording()
+        
+        deleteRecordingAtURL(temporaryFileURL)
+        
+        UINotificationFeedbackGenerator().notificationOccurred(.error)
+        
+        updateUI()
+    }
+    
     private func loadDraftRecording() {
         guard let temporaryFileURL = temporaryFileURL,
               let roomId = roomId else {
diff --git a/changelog.d/4970.bugfix b/changelog.d/4970.bugfix
new file mode 100644
index 000000000..365cf4aee
--- /dev/null
+++ b/changelog.d/4970.bugfix
@@ -0,0 +1 @@
+Fixed unintentional voice message drafts on automatically cancelled recordings (under 1 second)
\ No newline at end of file

From a7b482aa8b4a04a1db91f55fdffd5ec9a7cf735d Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Fri, 8 Oct 2021 17:04:44 +0200
Subject: [PATCH 58/59] changelog.d: Upgrade MatrixKit version
 ([v0.16.5](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.16.5)).

---
 Podfile                       | 2 +-
 changelog.d/x-nolink-0.change | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/x-nolink-0.change

diff --git a/Podfile b/Podfile
index b06b5f92b..49dec32b5 100644
--- a/Podfile
+++ b/Podfile
@@ -13,7 +13,7 @@ use_frameworks!
 # - `{ {kit spec hash} => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for each repo. Used by Fastfile during CI
 #
 # Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
-$matrixKitVersion = '= 0.16.4'
+$matrixKitVersion = '= 0.16.5'
 # $matrixKitVersion = :local
 # $matrixKitVersion = {'develop' => 'develop'}
 
diff --git a/changelog.d/x-nolink-0.change b/changelog.d/x-nolink-0.change
new file mode 100644
index 000000000..a9359bea0
--- /dev/null
+++ b/changelog.d/x-nolink-0.change
@@ -0,0 +1 @@
+Upgrade MatrixKit version ([v0.16.5](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.16.5)).
\ No newline at end of file

From a0aca6a1693b39385b2453283a7c2717f1f536cc Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Fri, 8 Oct 2021 17:04:44 +0200
Subject: [PATCH 59/59] version++

---
 CHANGES.md                    | 28 ++++++++++++++++++++++++++++
 changelog.d/4559.bugfix       |  1 -
 changelog.d/4896.change       |  1 -
 changelog.d/4898.bugfix       |  1 -
 changelog.d/4899.change       |  1 -
 changelog.d/4920.doc          |  1 -
 changelog.d/4935.change       |  1 -
 changelog.d/4937.build        |  1 -
 changelog.d/4939.change       |  1 -
 changelog.d/4951.build        |  1 -
 changelog.d/4955.change       |  1 -
 changelog.d/4970.bugfix       |  1 -
 changelog.d/pr-4193.bugfix    |  1 -
 changelog.d/x-nolink-0.change |  1 -
 14 files changed, 28 insertions(+), 13 deletions(-)
 delete mode 100644 changelog.d/4559.bugfix
 delete mode 100644 changelog.d/4896.change
 delete mode 100644 changelog.d/4898.bugfix
 delete mode 100644 changelog.d/4899.change
 delete mode 100644 changelog.d/4920.doc
 delete mode 100644 changelog.d/4935.change
 delete mode 100644 changelog.d/4937.build
 delete mode 100644 changelog.d/4939.change
 delete mode 100644 changelog.d/4951.build
 delete mode 100644 changelog.d/4955.change
 delete mode 100644 changelog.d/4970.bugfix
 delete mode 100644 changelog.d/pr-4193.bugfix
 delete mode 100644 changelog.d/x-nolink-0.change

diff --git a/CHANGES.md b/CHANGES.md
index 7ace58680..ecde7c1af 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,31 @@
+## Changes in 1.6.2 (2021-10-08)
+
+🙌 Improvements
+
+- Upgrade MatrixKit version ([v0.16.5](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.16.5)).
+- URL Previews: Use attributed string whitespace for cell heights and stop breaking up the bubble data. ([#4896](https://github.com/vector-im/element-ios/issues/4896))
+- Replaced localizable strings with generated ones throughout the code. Fixed various translation issues. ([#4899](https://github.com/vector-im/element-ios/issues/4899))
+- Voice Message scrubbing should require a slightly longer press, to avoid accidental scrubbing when scrolling the timeline ([#4935](https://github.com/vector-im/element-ios/issues/4935))
+- Pods: Update ffmpeg-kit-ios-audio, FLEX, FlowCommoniOS, Reusable and SwiftLint. ([#4939](https://github.com/vector-im/element-ios/issues/4939))
+- Service Terms: Track an analytics value on accept/decline of an identity server. ([#4955](https://github.com/vector-im/element-ios/issues/4955))
+
+🐛 Bugfixes
+
+- RecentsDataSource: Memory leak in [RecentsDataSource dataSource:didStateChange:]. ([#4193](https://github.com/vector-im/element-ios/pull/4193))
+- i18n: Standardise casing of identity server and integration manager. ([#4559](https://github.com/vector-im/element-ios/issues/4559))
+- MasterTabBarController: Listen to `MXSpaceNotificationCounter` to update the notification badge ([#4898](https://github.com/vector-im/element-ios/issues/4898))
+- Fixed unintentional voice message drafts on automatically cancelled recordings (under 1 second) ([#4970](https://github.com/vector-im/element-ios/issues/4970))
+
+🧱 Build
+
+- Element Alpha: Build on macOS 11 to fix iOS 15 installation error. ([#4937](https://github.com/vector-im/element-ios/issues/4937))
+- Bundler: Update CocoaPods and fastlane and xcode-install. ([#4951](https://github.com/vector-im/element-ios/issues/4951))
+
+📄 Documentation
+
+- Update PR template with a checkbox for accessibility and self review. ([#4920](https://github.com/vector-im/element-ios/issues/4920))
+
+
 ## Changes in 1.6.1 (2021-09-30)
 
 🙌 Improvements
diff --git a/changelog.d/4559.bugfix b/changelog.d/4559.bugfix
deleted file mode 100644
index 1e0688197..000000000
--- a/changelog.d/4559.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-i18n: Standardise casing of identity server and integration manager.
\ No newline at end of file
diff --git a/changelog.d/4896.change b/changelog.d/4896.change
deleted file mode 100644
index 00f6d5b4e..000000000
--- a/changelog.d/4896.change
+++ /dev/null
@@ -1 +0,0 @@
-URL Previews: Use attributed string whitespace for cell heights and stop breaking up the bubble data.
\ No newline at end of file
diff --git a/changelog.d/4898.bugfix b/changelog.d/4898.bugfix
deleted file mode 100644
index 0f4c5faf1..000000000
--- a/changelog.d/4898.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-MasterTabBarController: Listen to `MXSpaceNotificationCounter` to update the notification badge
\ No newline at end of file
diff --git a/changelog.d/4899.change b/changelog.d/4899.change
deleted file mode 100644
index b53120223..000000000
--- a/changelog.d/4899.change
+++ /dev/null
@@ -1 +0,0 @@
-Replaced localizable strings with generated ones throughout the code. Fixed various translation issues.
\ No newline at end of file
diff --git a/changelog.d/4920.doc b/changelog.d/4920.doc
deleted file mode 100644
index 746bc48aa..000000000
--- a/changelog.d/4920.doc
+++ /dev/null
@@ -1 +0,0 @@
-Update PR template with a checkbox for accessibility and self review.
\ No newline at end of file
diff --git a/changelog.d/4935.change b/changelog.d/4935.change
deleted file mode 100644
index 93c0dcc9c..000000000
--- a/changelog.d/4935.change
+++ /dev/null
@@ -1 +0,0 @@
-Voice Message scrubbing should require a slightly longer press, to avoid accidental scrubbing when scrolling the timeline
\ No newline at end of file
diff --git a/changelog.d/4937.build b/changelog.d/4937.build
deleted file mode 100644
index 2e67b1197..000000000
--- a/changelog.d/4937.build
+++ /dev/null
@@ -1 +0,0 @@
-Element Alpha: Build on macOS 11 to fix iOS 15 installation error.
diff --git a/changelog.d/4939.change b/changelog.d/4939.change
deleted file mode 100644
index aed2767eb..000000000
--- a/changelog.d/4939.change
+++ /dev/null
@@ -1 +0,0 @@
-Pods: Update ffmpeg-kit-ios-audio, FLEX, FlowCommoniOS, Reusable and SwiftLint.
\ No newline at end of file
diff --git a/changelog.d/4951.build b/changelog.d/4951.build
deleted file mode 100644
index 6e7d3ab86..000000000
--- a/changelog.d/4951.build
+++ /dev/null
@@ -1 +0,0 @@
-Bundler: Update CocoaPods and fastlane and xcode-install.
\ No newline at end of file
diff --git a/changelog.d/4955.change b/changelog.d/4955.change
deleted file mode 100644
index ef63ba876..000000000
--- a/changelog.d/4955.change
+++ /dev/null
@@ -1 +0,0 @@
-Service Terms: Track an analytics value on accept/decline of an identity server.
\ No newline at end of file
diff --git a/changelog.d/4970.bugfix b/changelog.d/4970.bugfix
deleted file mode 100644
index 365cf4aee..000000000
--- a/changelog.d/4970.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed unintentional voice message drafts on automatically cancelled recordings (under 1 second)
\ No newline at end of file
diff --git a/changelog.d/pr-4193.bugfix b/changelog.d/pr-4193.bugfix
deleted file mode 100644
index 10e269cb8..000000000
--- a/changelog.d/pr-4193.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-RecentsDataSource: Memory leak in [RecentsDataSource dataSource:didStateChange:].
\ No newline at end of file
diff --git a/changelog.d/x-nolink-0.change b/changelog.d/x-nolink-0.change
deleted file mode 100644
index a9359bea0..000000000
--- a/changelog.d/x-nolink-0.change
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade MatrixKit version ([v0.16.5](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.16.5)).
\ No newline at end of file