diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index c105f7ebf..f170a1fd1 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -23,12 +23,12 @@ body:
   - type: textarea
     id: result
     attributes:
-      label: What happened?
+      label: Outcome
       placeholder: Tell us what went wrong
       value: |
-        ### What did you expect?
+        #### What did you expect?
 
-        ### What happened?
+        #### What happened instead?
     validations:
       required: true
   - type: input
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index c86de1d80..24e8ab2e6 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -4,7 +4,6 @@ on:
   # Triggers the workflow on any pull request and push to develop
   push:
     branches: [ develop ]
-  pull_request:
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -17,6 +16,8 @@ jobs:
   build:
     name: Build
     runs-on: macos-11
+    
+    # Concurrency group not needed as this workflow only runs on develop which we always want to test.
 
     steps:
       - uses: actions/checkout@v2
@@ -36,9 +37,9 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gems-
 
-      # Make sure we use the latest version of MatrixKit
-      - name: Reset MatrixKit pod
-        run: rm -rf Pods/MatrixKit
+      # Make sure we use the latest version of MatrixSDK
+      - name: Reset MatrixSDK pod
+        run: rm -rf Pods/MatrixSDK
 
       # Common setup
       # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
@@ -46,7 +47,7 @@ jobs:
         run: |
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3    
-      - name: Use right MatrixKit and MatrixSDK versions
+      - name: Use right MatrixSDK versions
         run: bundle exec fastlane point_dependencies_to_related_branches
 
       # Main step
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 65846be15..00d4fa2f9 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -17,6 +17,12 @@ jobs:
   tests:
     name: Tests
     runs-on: macos-11
+    
+    concurrency:
+      # When running on develop, use the sha to allow all runs of this workflow to run concurrently.
+      # Otherwise only allow a single run of this workflow on each branch, automatically cancelling older runs.
+      group: ${{ github.ref == 'refs/heads/develop' && format('tests-develop-{0}', github.sha) || format('tests-{0}', github.ref) }}
+      cancel-in-progress: true
 
     steps:
       - uses: actions/checkout@v2
@@ -36,9 +42,9 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gems-
 
-      # Make sure we use the latest version of MatrixKit
-      - name: Reset MatrixKit pod
-        run: rm -rf Pods/MatrixKit
+      # Make sure we use the latest version of MatrixSDK
+      - name: Reset MatrixSDK pod
+        run: rm -rf Pods/MatrixSDK
 
       # Common setup
       # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
@@ -46,7 +52,7 @@ jobs:
         run: |
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3    
-      - name: Use right MatrixKit and MatrixSDK versions
+      - name: Use right MatrixSDK versions
         run: bundle exec fastlane point_dependencies_to_related_branches
 
       # Main step
diff --git a/.github/workflows/release-alpha.yml b/.github/workflows/release-alpha.yml
index ed175fe20..dfbd7ac6a 100644
--- a/.github/workflows/release-alpha.yml
+++ b/.github/workflows/release-alpha.yml
@@ -16,6 +16,11 @@ jobs:
   build:
     name: Release
     runs-on: macos-11
+    
+    concurrency:
+      # Only allow a single run of this workflow on each branch, automatically cancelling older runs.
+      group: alpha-${{ github.head_ref }}
+      cancel-in-progress: true
 
     steps:
       - uses: actions/checkout@v2
@@ -38,9 +43,9 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gems-
 
-      # Make sure we use the latest version of MatrixKit
-      - name: Reset MatrixKit pod
-        run: rm -rf Pods/MatrixKit
+      # Make sure we use the latest version of MatrixSDK
+      - name: Reset MatrixSDK pod
+        run: rm -rf Pods/MatrixSDK
 
       # Common setup
       # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
@@ -49,7 +54,7 @@ jobs:
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
 
-      - name: Use right MatrixKit and MatrixSDK versions
+      - name: Use right MatrixSDK versions
         run: bundle exec fastlane point_dependencies_to_related_branches
 
       # Import alpha release private signing certificate
diff --git a/.github/workflows/triage-incoming.yml b/.github/workflows/triage-incoming.yml
index 40d550741..4ecc82442 100644
--- a/.github/workflows/triage-incoming.yml
+++ b/.github/workflows/triage-incoming.yml
@@ -8,7 +8,7 @@ jobs:
   automate-project-columns:
     runs-on: ubuntu-latest
     steps:
-      - uses: alex-page/github-project-automation-plus@v0.8.1
+      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
         with:
           project: Issue triage
           column: Incoming
diff --git a/.github/workflows/triage-move-labelled.yml b/.github/workflows/triage-move-labelled.yml
new file mode 100644
index 000000000..44704833b
--- /dev/null
+++ b/.github/workflows/triage-move-labelled.yml
@@ -0,0 +1,142 @@
+name: Move labelled issues to correct boards and columns
+
+on:
+  issues:
+    types: [labeled]
+
+jobs:
+  move_needs_info_issues:
+    name: X-Needs-Info issues to Need info column on triage board
+    runs-on: ubuntu-latest
+    steps:
+      - uses: konradpabjan/move-labeled-or-milestoned-issue@219d384e03fa4b6460cd24f9f37d19eb033a4338
+        with:
+          action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
+          project-url: "https://github.com/vector-im/element-ios/projects/12"
+          column-name: "Need info"
+          label-name: "X-Needs-Info"
+
+  add_priority_design_issues_to_project:
+    name: P1 X-Needs-Design to Design project board
+    runs-on: ubuntu-latest
+    if: >
+        contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
+        (contains(github.event.issue.labels.*.name, 'S-Critical') &&
+         (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+          contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
+         contains(github.event.issue.labels.*.name, 'S-Major') &&
+         contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+         contains(github.event.issue.labels.*.name, 'A11y') &&
+         contains(github.event.issue.labels.*.name, 'O-Frequent'))
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_project
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:String!,$contentid:String!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAM0swc0sUA"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  Delight_issues_to_board:
+    name: Spaces issues to Delight project board
+    runs-on: ubuntu-latest
+    if: >
+        contains(github.event.issue.labels.*.name, 'A-Spaces') ||
+        contains(github.event.issue.labels.*.name, 'A-Space-Settings') ||
+        contains(github.event.issue.labels.*.name, 'A-Subspaces')
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:String!,$contentid:String!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAM0swc1HvQ"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  move_voice-message_issues:
+    name: A-Voice Messages to voice message board
+    runs-on: ubuntu-latest
+    if: >
+        contains(github.event.issue.labels.*.name, 'A-Voice Messages')
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:String!,$contentid:String!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAM0swc2KCw"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  move_threads_issues:
+    name: A-Threads to Thread board
+    runs-on: ubuntu-latest
+    if: >
+        contains(github.event.issue.labels.*.name, 'A-Threads')
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:String!,$contentid:String!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAM0swc0rRA"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  move_message_bubble_issues:
+    name: A-Message-Bubbles to Message bubble board
+    runs-on: ubuntu-latest
+    if: >
+        contains(github.event.issue.labels.*.name, 'A-Message-Bubbles')
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:String!,$contentid:String!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAM0swc3m-g"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
diff --git a/.github/workflows/triage-move-unlabelled.yml b/.github/workflows/triage-move-unlabelled.yml
new file mode 100644
index 000000000..94bd049b9
--- /dev/null
+++ b/.github/workflows/triage-move-unlabelled.yml
@@ -0,0 +1,35 @@
+name: Move unlabelled from needs info columns to triaged
+
+on:
+  issues:
+    types: [unlabeled]
+    
+jobs:
+  Move_Unabeled_Issue_On_Project_Board:
+    name: Move no longer X-Needs-Info issues to Triaged
+    runs-on: ubuntu-latest
+    if: >
+        ${{
+        !contains(github.event.issue.labels.*.name, 'X-Needs-Info') }}
+    env:
+      BOARD_NAME: "Issue triage"
+      OWNER: ${{ github.repository_owner }}
+      REPO: ${{ github.event.repository.name }}
+      ISSUE: ${{ github.event.issue.number }}
+    steps:
+      - name: Check if issue is already in "${{ env.BOARD_NAME }}"
+        run: |
+          if curl -i -H 'Content-Type: application/json' -H "Authorization: bearer ${{ secrets.GITHUB_TOKEN }}" -X POST -d '{"query": "query($issue: Int!, $owner: String!, $repo: String!) { repository(owner: $owner, name: $repo) { issue(number: $issue) { projectCards { nodes { project { name } } } } } } ", "variables" : "{ \"issue\": '${ISSUE}', \"owner\": \"'${OWNER}'\", \"repo\": \"'${REPO}'\" }" }' https://api.github.com/graphql | grep "\b$BOARD_NAME\b"; then
+            echo "Issue is already in Project '$BOARD_NAME', proceeding";
+            echo "ALREADY_IN_BOARD=true" >> $GITHUB_ENV
+          else
+            echo "Issue is not in project '$BOARD_NAME', cancelling this workflow"
+            echo "ALREADY_IN_BOARD=false" >> $GITHUB_ENV
+          fi
+      - name: Move issue
+        uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
+        if: ${{ env.ALREADY_IN_BOARD == 'true' }}
+        with:
+          project: Issue triage
+          column: Triaged
+          repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
diff --git a/.github/workflows/triage-needs-info.yml b/.github/workflows/triage-needs-info.yml
deleted file mode 100644
index 4a4a6a7c0..000000000
--- a/.github/workflows/triage-needs-info.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Move X-Needs-Info into Need info column in the Issue triage board
-
-on:
-  issues:
-    types: [labeled]
-    
-jobs:
-  Move_Labeled_Issue_On_Project_Board:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: konradpabjan/move-labeled-or-milestoned-issue@v2.0
-      with:
-        action-token: ${{ secrets.GITHUB_TOKEN }}
-        project-url: "https://github.com/vector-im/element-ios/projects/12"
-        column-name: "Need info"
-        label-name: "X-Needs-Info"
diff --git a/.github/workflows/triage-priority-bugs.yml b/.github/workflows/triage-priority-bugs.yml
new file mode 100644
index 000000000..0a4d1c49f
--- /dev/null
+++ b/.github/workflows/triage-priority-bugs.yml
@@ -0,0 +1,55 @@
+name: Move P1 bugs to boards
+
+on:
+  issues:
+    types: [labeled, unlabeled]
+
+jobs:
+  p1_issues_to_team_workboard:
+    runs-on: ubuntu-latest
+    if: >
+        (!contains(github.event.issue.labels.*.name, 'A-E2EE') &&
+         !contains(github.event.issue.labels.*.name, 'A-E2EE-Cross-Signing') &&
+         !contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') &&
+         !contains(github.event.issue.labels.*.name, 'A-E2EE-Key-Backup') &&
+         !contains(github.event.issue.labels.*.name, 'A-E2EE-SAS-Verification') &&
+         !contains(github.event.issue.labels.*.name, 'A-Spaces') &&
+         !contains(github.event.issue.labels.*.name, 'A-Spaces-Settings') &&
+         !contains(github.event.issue.labels.*.name, 'A-Subspaces')) &&
+        (contains(github.event.issue.labels.*.name, 'T-Defect') &&
+         contains(github.event.issue.labels.*.name, 'S-Critical') &&
+         (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+          contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
+         contains(github.event.issue.labels.*.name, 'S-Major') &&
+         contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+         contains(github.event.issue.labels.*.name, 'A11y') &&
+         contains(github.event.issue.labels.*.name, 'O-Frequent'))
+    steps:
+      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
+        with:
+          project: iOS App Team
+          column: P1
+          repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  P1_issues_to_crypto_team_workboard:
+    runs-on: ubuntu-latest
+    if: >
+        (contains(github.event.issue.labels.*.name, 'A-E2EE') ||
+         contains(github.event.issue.labels.*.name, 'A-E2EE-Cross-Signing') ||
+         contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
+         contains(github.event.issue.labels.*.name, 'A-E2EE-Key-Backup') ||
+         contains(github.event.issue.labels.*.name, 'A-E2EE-SAS-Verification')) &&
+        (contains(github.event.issue.labels.*.name, 'T-Defect') &&
+         contains(github.event.issue.labels.*.name, 'S-Critical') &&
+         (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+          contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
+         contains(github.event.issue.labels.*.name, 'S-Major') &&
+         contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+         contains(github.event.issue.labels.*.name, 'A11y') &&
+         contains(github.event.issue.labels.*.name, 'O-Frequent'))
+    steps:
+      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
+        with:
+          project: Crypto Team
+          column: Ready
+          repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
diff --git a/CHANGES.md b/CHANGES.md
index 966ee4efa..e530b5806 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,108 @@
+## Changes in 1.6.11 (2021-12-14)
+
+✨ Features
+
+- Added support for creating, displaying and interacting with polls in the timeline. ([#5114](https://github.com/vector-im/element-ios/issues/5114))
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.20.15](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.20.15)).
+- Room member details: Display user Matrix ID and make it copyable. ([#4568](https://github.com/vector-im/element-ios/issues/4568))
+
+🐛 Bugfixes
+
+- Fix crash when trying to scroll the people's tab to the top. ([#5190](https://github.com/vector-im/element-ios/issues/5190))
+
+🧱 Build
+
+- Fix SwiftGen only generating strings for MatrixKit. ([#5280](https://github.com/vector-im/element-ios/issues/5280))
+
+Others
+
+- Update issue workflow automation for the Delight team ([#5285](https://github.com/vector-im/element-ios/issues/5285))
+- Update workflow to add automation for the new Message Bubbles board ([#5289](https://github.com/vector-im/element-ios/issues/5289))
+
+
+## Changes in 1.6.10 (2021-12-09)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.20.14](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.20.14))
+
+🧱 Build
+
+- BuildRelease.sh: Add an option to build the ipa from local source code copy
+
+
+## Changes in 1.6.9 (2021-12-07)
+
+✨ Features
+
+- Allow audio file attachments to be played back inline by reusing the existing voice message UI. Prevent unnecessary conversions if final file already exists on disk. ([#4753](https://github.com/vector-im/element-ios/issues/4753))
+- SpaceExploreRoomViewModel: Support pagination in the Space Summary API ([#4893](https://github.com/vector-im/element-ios/issues/4893))
+- Adds clientPermalinkBaseUrl for a custom permalink base url. ([#4981](https://github.com/vector-im/element-ios/issues/4981))
+- Remember keyboard layout per room and restore it when opening the room again. ([#5067](https://github.com/vector-im/element-ios/issues/5067))
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.20.13](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.20.13)).
+- Forward original message content and remove the need to re-upload media. ([#5014](https://github.com/vector-im/element-ios/issues/5014))
+- Use DTCoreText's callback option to sanitise formatted messages ([#5165](https://github.com/vector-im/element-ios/issues/5165))
+
+🐛 Bugfixes
+
+- Remove duplicate sources for some strings files in Riot/target.yml. ([#3908](https://github.com/vector-im/element-ios/issues/3908))
+- Invalid default value set for clientPermalinkBaseUrl. ([#5098](https://github.com/vector-im/element-ios/issues/5098))
+- Ignore badge updates from virtual rooms. ([#5155](https://github.com/vector-im/element-ios/issues/5155))
+- Fix rooms that should be hidden(such as virtual rooms) from showing. ([#5185](https://github.com/vector-im/element-ios/issues/5185))
+- Improve generated Swift header imports. ([#5194](https://github.com/vector-im/element-ios/issues/5194))
+- Fix bug where VoIP calls would not connect reliably after signout/signin. ([#5199](https://github.com/vector-im/element-ios/issues/5199))
+
+🧱 Build
+
+- Only run Build CI on develop, as it is already covered by Tests and Alpha. ([#5112](https://github.com/vector-im/element-ios/pull/5112))
+- Add concurrency to the GitHub workflows to auto-cancel older runs of each action for PRs. ([#5039](https://github.com/vector-im/element-ios/issues/5039))
+
+Others
+
+- Improve the Obj-C Generated Interface Header Name definition ([#4722](https://github.com/vector-im/element-ios/issues/4722))
+- Fix redundancy in heading in the bug report issue form ([#4984](https://github.com/vector-im/element-ios/issues/4984))
+- Update automation for issue triage ([#5153](https://github.com/vector-im/element-ios/issues/5153))
+- Improve issue automation workflows ([#5235](https://github.com/vector-im/element-ios/issues/5235))
+
+
+## Changes in 1.6.8 (2021-11-17)
+
+🙌 Improvements
+
+- Upgrade MatrixKit version ([v0.16.10](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.16.10)).
+- Using mutable room list fetch sort options after chaning them to be a structure. ([#4384](https://github.com/vector-im/element-ios/issues/4384))
+- Share Extension: Remove the image compression prompt when the showMediaSizeSelection setting is disabled. ([#4815](https://github.com/vector-im/element-ios/issues/4815))
+- Replaced GrowingTextView with simpler, custom implementation.  Cleaned up the RoomInputToolbar header. ([#4976](https://github.com/vector-im/element-ios/issues/4976))
+- Settings: Update about section footer text. ([#5090](https://github.com/vector-im/element-ios/issues/5090))
+- MXSession: Add logs to track if E2EE is enabled by default on the current HS. ([#5129](https://github.com/vector-im/element-ios/issues/5129))
+
+🐛 Bugfixes
+
+- Fixed share extension and message forwarding room list accessory view icon. ([#5041](https://github.com/vector-im/element-ios/issues/5041))
+- Fixed message composer not following keyboard when swiping to dismiss. ([#5042](https://github.com/vector-im/element-ios/issues/5042))
+- RoomVC: Fix retain cycles that prevents `RoomViewController` to be deallocated. ([#5055](https://github.com/vector-im/element-ios/issues/5055))
+- Share Extension: Fix missing avatars and don't list spaces as rooms. ([#5057](https://github.com/vector-im/element-ios/issues/5057))
+- Fix retain cycles that prevents deallocation in several classes. ([#5058](https://github.com/vector-im/element-ios/issues/5058))
+- Fixed retain cycles between the user suggestion coordinator and the suggestion service, and in the suggestion service currentTextTrigger subject sink. ([#5063](https://github.com/vector-im/element-ios/issues/5063))
+- Ensure alerts with weak references are retained until they've been presented. ([#5071](https://github.com/vector-im/element-ios/issues/5071))
+- Message Composer: Ensure there is no text view when the user isn't allowed to send messages. ([#5079](https://github.com/vector-im/element-ios/issues/5079))
+- Home: Fix bug where favourited DM would be shown in both Favourites and People section. ([#5081](https://github.com/vector-im/element-ios/issues/5081))
+- Fix a crash when selected space is not home and a clear cache or logout is performed. ([#5082](https://github.com/vector-im/element-ios/issues/5082))
+- Room Previews: Fix room previews not loading. ([#5083](https://github.com/vector-im/element-ios/issues/5083))
+- Do not make the placeholder appearing when leaving a room on iPhone. ([#5084](https://github.com/vector-im/element-ios/issues/5084))
+- Fix room ordering when switching between Home and People/Rooms/Favourites. ([#5105](https://github.com/vector-im/element-ios/issues/5105))
+
+Others
+
+- Improve wording around rageshakes in the defect issue template. ([#4987](https://github.com/vector-im/element-ios/issues/4987))
+
+
 ## Changes in 1.6.6 (2021-10-21)
 
 ✨ Features
diff --git a/Config/AppConfiguration.swift b/Config/AppConfiguration.swift
index 597876852..52b041656 100644
--- a/Config/AppConfiguration.swift
+++ b/Config/AppConfiguration.swift
@@ -15,7 +15,6 @@
 //
 
 import Foundation
-import MatrixKit
 
 /// AppConfiguration is CommonConfiguration plus configurations dedicated to the app
 class AppConfiguration: CommonConfiguration {
diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig
index 5e6c9928e..b213c8623 100644
--- a/Config/AppVersion.xcconfig
+++ b/Config/AppVersion.xcconfig
@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.6.7
-CURRENT_PROJECT_VERSION = 1.6.7
+MARKETING_VERSION = 1.6.12
+CURRENT_PROJECT_VERSION = 1.6.12
diff --git a/Config/BuildSettings.swift b/Config/BuildSettings.swift
index bb1b25a0a..d07f6efb5 100644
--- a/Config/BuildSettings.swift
+++ b/Config/BuildSettings.swift
@@ -16,8 +16,6 @@
 
 import Foundation
 
-import MatrixKit
-
 /// BuildSettings provides settings computed at build time.
 /// In future, it may be automatically generated from xcconfig files
 @objcMembers
@@ -118,9 +116,9 @@ final class BuildSettings: NSObject {
     "https://element.io/help"
     
     
-    // MARk: - Matrix permalinks
-    // Paths for URLs that will considered as Matrix permalinks. Those permalinks are opened within the app
-    static let matrixPermalinkPaths: [String: [String]] = [
+    // MARK: - Permalinks
+    // Hosts/Paths for URLs that will considered as valid permalinks. Those permalinks are opened within the app.
+    static let permalinkSupportedHosts: [String: [String]] = [
         "app.element.io": [],
         "staging.element.io": [],
         "develop.element.io": [],
@@ -133,8 +131,16 @@ final class BuildSettings: NSObject {
         // Official Matrix ones
         "matrix.to": ["/"],
         "www.matrix.to": ["/"],
+        // Client Permalinks (for use with `BuildSettings.clientPermalinkBaseUrl`)
+//        "example.com": ["/"],
+//        "www.example.com": ["/"],
     ]
     
+    // For use in clients that use a custom base url for permalinks rather than matrix.to.
+    // This baseURL is used to generate permalinks within the app (E.g. timeline message permalinks).
+    // Optional String that when set is used as permalink base, when nil matrix.to format is used.
+    // Example value would be "https://www.example.com", note there is no trailing '/'.
+    static let clientPermalinkBaseUrl: String? = nil
     
     // MARK: - VoIP
     static var allowVoIPUsage: Bool {
@@ -146,7 +152,6 @@ final class BuildSettings: NSObject {
     }
     static let stunServerFallbackUrlString: String? = "stun:turn.matrix.org"
     
-    
     // MARK: -  Public rooms Directory
     #warning("Unused build setting: should this be implemented in ShowDirectory?")
     static let publicRoomsAllowServerChange: Bool = true
@@ -160,8 +165,20 @@ final class BuildSettings: NSObject {
     static let roomsAllowToJoinPublicRooms: Bool = true
     
     // MARK: - Analytics
-    static let analyticsServerUrl = URL(string: "https://piwik.riot.im/piwik.php")
-    static let analyticsAppId = "14"
+    #if DEBUG
+    /// Host to use for PostHog analytics during development. Set to nil to disable analytics in debug builds.
+    static let analyticsHost: String? = "https://posthog-poc.lab.element.dev"
+    /// Public key for submitting analytics during development. Set to nil to disable analytics in debug builds.
+    static let analyticsKey: String? = "rs-pJjsYJTuAkXJfhaMmPUNBhWliDyTKLOOxike6ck8"
+    #else
+    /// Host to use for PostHog analytics. Set to nil to disable analytics.
+    static let analyticsHost: String? = "https://posthog.hss.element.io"
+    /// Public key for submitting analytics. Set to nil to disable analytics.
+    static let analyticsKey: String? = "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO"
+    #endif
+    
+    /// The URL to open with more information about analytics terms.
+    static let analyticsTermsURL = URL(string: "https://element.io/cookie-policy")!
     
     
     // MARK: - Bug report
@@ -280,7 +297,7 @@ final class BuildSettings: NSObject {
     static let roomScreenAllowMediaLibraryAction: Bool = true
     static let roomScreenAllowStickerAction: Bool = true
     static let roomScreenAllowFilesAction: Bool = true
-    
+
     /// Allow split view detail view stacking    
     static let allowSplitViewDetailsScreenStacking: Bool = true
     
@@ -337,4 +354,14 @@ final class BuildSettings: NSObject {
     
     // MARK: - Secrets Recovery
     static let secretsRecoveryAllowReset = true
+    
+    // MARK: - Polls
+    
+    static var pollsEnabled: Bool {
+        guard #available(iOS 14, *) else {
+            return false
+        }
+        
+        return true
+    }
 }
diff --git a/Config/CommonConfiguration.swift b/Config/CommonConfiguration.swift
index b6aa77dad..5edcacc37 100644
--- a/Config/CommonConfiguration.swift
+++ b/Config/CommonConfiguration.swift
@@ -15,7 +15,7 @@
 //
 
 import Foundation
-import MatrixKit
+import MatrixSDK
 
 /// CommonConfiguration is the central point to setup settings for MatrixSDK, MatrixKit and common configurations for all targets.
 class CommonConfiguration: NSObject, Configurable {
@@ -75,6 +75,7 @@ class CommonConfiguration: NSObject, Configurable {
         // Disable key backup on common
         sdkOptions.enableKeyBackupWhenStartingMXCrypto = false
         
+        sdkOptions.clientPermalinkBaseUrl = BuildSettings.clientPermalinkBaseUrl
         // Configure key provider delegate
         MXKeyProvider.sharedInstance().delegate = EncryptionKeyManager.shared
     }
diff --git a/Config/Configurable.swift b/Config/Configurable.swift
index a5a6d980e..acfb97605 100644
--- a/Config/Configurable.swift
+++ b/Config/Configurable.swift
@@ -15,9 +15,7 @@
 //
 
 import Foundation
-
-import Foundation
-import MatrixKit
+import MatrixSDK
 
 /// Configurable expose settings app and its entensions must use.
 @objc protocol Configurable {
diff --git a/DesignKit/Source/FontsSwiftUI.swift b/DesignKit/Source/FontsSwiftUI.swift
index 223936286..ddf6a1754 100644
--- a/DesignKit/Source/FontsSwiftUI.swift
+++ b/DesignKit/Source/FontsSwiftUI.swift
@@ -22,6 +22,9 @@ import SwiftUI
  */
 @available(iOS 14.0, *)
 public struct FontSwiftUI: Fonts {
+    
+    public let uiFonts: ElementFonts
+    
     public var largeTitle: Font
     
     public var largeTitleB: Font
@@ -63,6 +66,8 @@ public struct FontSwiftUI: Fonts {
     public var caption2SB: Font
     
     public init(values: ElementFonts) {
+        self.uiFonts = values
+        
         self.largeTitle = Font(values.largeTitle)
         self.largeTitleB = Font(values.largeTitleB)
         self.title1 = Font(values.title1)
@@ -85,4 +90,3 @@ public struct FontSwiftUI: Fonts {
         self.caption2SB = Font(values.caption2SB)
     }
 }
-
diff --git a/INSTALL.md b/INSTALL.md
index b10f6c609..667f308f4 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -44,35 +44,35 @@ $ gem install bundler
 
 ## Choose Matrix SDKs version to build
 
-To choose the [MatrixKit](https://github.com/matrix-org/matrix-ios-kit) version (and depending MatrixSDK and OLMKit) you want to develop and build against you will have to modify the right definitions of `$matrixKitVersion` variable in the `Podfile`. 
+To choose the [MatrixSDK](https://github.com/matrix-org/matrix-ios-sdk) version (and depending OLMKit) you want to develop and build against you will have to modify the right definitions of `$matrixSDKVersion` variable in the `Podfile`. 
 
 ### Determine your needs
 
-To select which `$matrixKitVersion` value to use you have to determine your needs:
+To select which `$matrixSDKVersion` value to use you have to determine your needs:
 
 - **Build an App Store release version**
 
-To build the last published App Store code you just need to checkout master branch. If you want to build an older App Store version just checkout the tag of the corresponding version. You have nothing to modify in the `Podfile`. In this case `$matrixKitVersion` will be set to a specific version of the MatrixKit already published on CocoaPods repository.
+To build the last published App Store code you just need to checkout master branch. If you want to build an older App Store version just checkout the tag of the corresponding version. You have nothing to modify in the `Podfile`. In this case `$matrixSDKVersion` will be set to a specific version of the MatrixSDK already published on CocoaPods repository.
 
 - **Build last development code and modify Element project only**
 
-If you want to build last development code you have to checkout the develop branch and use `$matrixKitVersion = {'develop' => 'develop'}` in the `Podfile`. This will also use MatrixKit and MatrixSDK develop branches.
+If you want to build last development code you have to checkout the `develop` branch and use `$matrixSDKVersion = {:branch => 'develop'}` in the `Podfile`. This will also use MatrixSDK develop branch.
 
-- **Build specific branch of Kit and SDK and modify Element project only**
+- **Build specific branch of SDK and modify Element project only**
 
-If you want to build a specific branch for the MatrixKit and the MatrixSDK you have to indicate them using a dictionary like this: `$matrixKitVersion = {'kit_branch_name' => 'sdk_branch_name'}`.
+If you want to build a specific branch for the MatrixSDK you have to indicate it using a dictionary like this: `$matrixSDKVersion = {:branch => 'sdk_branch_name'}`.
 
-- **Build any branch and be able to modify MatrixKit and MatrixSDK locally**
+- **Build any branch and be able to modify MatrixSDK locally**
 
-If you want to modify MatrixKit and/or MatrixSDK locally and see the result in Element project you have to uncommment `$matrixKitVersion = :local` in the `Podfile`.
-But before you have to checkout [MatrixKit](https://github.com/matrix-org/matrix-ios-kit) repository in `../matrix-ios-kit` and [MatrixSDK](https://github.com/matrix-org/matrix-ios-sdk) in `../matrix-ios-sdk` locally relatively to your Element iOS project folder.
-Be sure to use compatible branches for Element iOS, MatrixKit and MatrixSDK. For example, if you want to modify Element iOS from develop branch, use MatrixKit and MatrixSDK develop branches and then make your modifications.
+If you want to modify MatrixSDK locally and see the result in Element project you have to uncommment `$matrixSDKVersion = :local` in the `Podfile`.
+But before you have to checkout [MatrixSDK](https://github.com/matrix-org/matrix-ios-sdk) in `../matrix-ios-sdk` locally relatively to your Element iOS project folder.
+Be sure to use compatible branches for Element iOS and MatrixSDK. For example, if you want to modify Element iOS from develop branch, use MatrixSDK develop branch and then make your modifications.
 
 **Important**: By working with [XcodeGen](https://github.com/yonaskolb/XcodeGen) you will need to use the _New Build System_ in Xcode, to have your some of the xcconfig variables taken into account. It should be enabled by default on the latest Xcode versions, but if you need to enable it go to Xcode menu and select `File > Workspace Settings… > Build System` and then choose `New Build System`.
 
-### `$matrixKitVersion` Modification
+### `$matrixSDKVersion` Modification
 
-Every time you change the `$matrixKitVersion` variable in the `Podfile`, you have to run the `pod install` command again.
+Every time you change the `$matrixSDKVersion` variable in the `Podfile`, you have to run the `pod install` command again.
 
 
 ## Build
@@ -110,8 +110,7 @@ Or if you prefer to use directly CocoaPods:
 $ pod install
 ```
 
-This will load all dependencies for the Element source code, including [MatrixKit](https://github.com/matrix-org/matrix-ios-kit) 
-and [MatrixSDK](https://github.com/matrix-org/matrix-ios-sdk).
+This will load all dependencies for the Element source code, including [MatrixSDK](https://github.com/matrix-org/matrix-ios-sdk).
 
 
 ### Open workspace
diff --git a/Podfile b/Podfile
index f2fab251b..714154461 100644
--- a/Podfile
+++ b/Podfile
@@ -3,46 +3,63 @@ source 'https://cdn.cocoapods.org/'
 # Uncomment this line to define a global platform for your project
 platform :ios, '12.1'
 
-# Use frameforks to allow usage of pod written in Swift (like PiwikTracker)
+# Use frameworks to allow usage of pods written in Swift
 use_frameworks!
 
-# Different flavours of pods to MatrixKit. Can be one of:
-# - a String indicating an official MatrixKit released version number
+# Different flavours of pods to MatrixSDK. Can be one of:
+# - a String indicating an official MatrixSDK released version number
 # - `:local` (to use Development Pods)
-# - `{'kit branch name' => 'sdk branch name'}` to depend on specific branches of each repo
-# - `{ {kit spec hash} => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for each repo. Used by Fastfile during CI
+# - `{ :branch => 'sdk branch name'}` to depend on specific branch of MatrixSDK repo
+# - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK 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.9'
-# $matrixKitVersion = :local
-# $matrixKitVersion = {'develop' => 'develop'}
+$matrixSDKVersion = '0.20.15'
+# $matrixSDKVersion = :local
+# $matrixSDKVersion = { :branch => 'develop'}
+# $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
 
 ########################################
 
-case $matrixKitVersion
+case $matrixSDKVersion
 when :local
-$matrixKitVersionSpec = { :path => '../matrix-ios-kit/MatrixKit.podspec' }
 $matrixSDKVersionSpec = { :path => '../matrix-ios-sdk/MatrixSDK.podspec' }
-when Hash # kit branch name => sdk branch name – or {kit spec Hash} => {sdk spec Hash}
-kit_spec, sdk_spec = $matrixKitVersion.first # extract first and only key/value pair; key is kit_spec, value is sdk_spec
-kit_spec = { :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => kit_spec.to_s } unless kit_spec.is_a?(Hash)
-sdk_spec = { :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => sdk_spec.to_s } unless sdk_spec.is_a?(Hash)
-$matrixKitVersionSpec = kit_spec
+when Hash
+spec_mode, sdk_spec = $matrixSDKVersion.first # extract first and only key/value pair; key is spec_mode, value is sdk_spec
+
+  case spec_mode
+  when :branch
+  # :branch => sdk branch name
+  sdk_spec = { :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => sdk_spec.to_s } unless sdk_spec.is_a?(Hash)
+  when :specHash
+  # :specHash => {sdk spec Hash}
+  sdk_spec = sdk_spec
+  end
+
 $matrixSDKVersionSpec = sdk_spec
-when String # specific MatrixKit released version
-$matrixKitVersionSpec = $matrixKitVersion
-$matrixSDKVersionSpec = {}
+when String # specific MatrixSDK released version
+$matrixSDKVersionSpec = $matrixSDKVersion
 end
 
-# Method to import the MatrixKit
-def import_MatrixKit
+# Method to import the MatrixSDK
+def import_MatrixSDK
   pod 'MatrixSDK', $matrixSDKVersionSpec
   pod 'MatrixSDK/JingleCallStack', $matrixSDKVersionSpec
-  pod 'MatrixKit', $matrixKitVersionSpec
 end
 
 ########################################
 
+def import_MatrixKit_pods
+  pod 'HPGrowingTextView', '~> 1.1'  
+  pod 'libPhoneNumber-iOS', '~> 0.9.13'  
+  pod 'DTCoreText', '~> 1.6.25'
+  #pod 'DTCoreText/Extension', '~> 1.6.25'
+  pod 'Down', '~> 0.11.0'
+end
+
+def import_SwiftUI_pods
+    pod 'Introspect', '~> 0.1'
+end
+
 abstract_target 'RiotPods' do
 
   pod 'GBDeviceInfo', '~> 6.6.0'
@@ -50,8 +67,10 @@ abstract_target 'RiotPods' do
   pod 'KeychainAccess', '~> 4.2.2'
   pod 'WeakDictionary', '~> 2.0'
 
-  # Piwik for analytics
-  pod 'MatomoTracker', '~> 7.4.1'
+  # PostHog for analytics
+  pod 'PostHog', '~> 1.4.4'
+  pod 'AnalyticsEvents', :git => 'https://github.com/matrix-org/matrix-analytics-events.git', :branch => 'release/swift'
+  # pod 'AnalyticsEvents', :path => '../matrix-analytics-events/AnalyticsEvents.podspec'
 
   # Remove warnings from "bad" pods
   pod 'OLMKit', :inhibit_warnings => true
@@ -62,7 +81,11 @@ abstract_target 'RiotPods' do
   pod 'SwiftLint', '~> 0.44.0'
 
   target "Riot" do
-    import_MatrixKit
+    import_MatrixSDK
+    import_MatrixKit_pods
+
+    import_SwiftUI_pods
+
     pod 'DGCollectionViewLeftAlignFlowLayout', '~> 1.0.4'
     pod 'KTCenterFlowLayout', '~> 1.3.1'
     pod 'ZXingObjC', '~> 3.6.5'
@@ -73,7 +96,7 @@ abstract_target 'RiotPods' do
     pod 'SideMenu', '~> 6.5'
     pod 'DSWaveformImage', '~> 6.1.1'
     pod 'ffmpeg-kit-ios-audio', '~> 4.5'
-
+    
     pod 'FLEX', '~> 4.5.0', :configurations => ['Debug']
 
     target 'RiotTests' do
@@ -82,15 +105,26 @@ abstract_target 'RiotPods' do
   end
 
   target "RiotShareExtension" do
-    import_MatrixKit
+    import_MatrixSDK
+    import_MatrixKit_pods
   end
 
+  target "RiotSwiftUI" do
+    import_SwiftUI_pods
+  end 
+
+  target "RiotSwiftUITests" do
+    import_SwiftUI_pods
+  end 
+
   target "SiriIntents" do
-    import_MatrixKit
+    import_MatrixSDK
+    import_MatrixKit_pods
   end
 
   target "RiotNSE" do
-    import_MatrixKit
+    import_MatrixSDK
+    import_MatrixKit_pods
   end
 
 end
diff --git a/Podfile.lock b/Podfile.lock
index 00be05819..8ff43e554 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -14,9 +14,10 @@ PODS:
   - AFNetworking/Serialization (4.0.1)
   - AFNetworking/UIKit (4.0.1):
     - AFNetworking/NSURLSession
+  - AnalyticsEvents (0.1.0)
   - BlueCryptor (1.0.32)
   - BlueECC (1.2.5)
-  - BlueRSA (1.0.34)
+  - BlueRSA (1.0.200)
   - DGCollectionViewLeftAlignFlowLayout (1.0.4)
   - Down (0.11.0)
   - DSWaveformImage (6.1.1)
@@ -39,13 +40,13 @@ PODS:
     - DTFoundation/Core
   - ffmpeg-kit-ios-audio (4.5)
   - FLEX (4.5.0)
-  - FlowCommoniOS (1.12.0)
+  - FlowCommoniOS (1.12.2)
   - GBDeviceInfo (6.6.0):
     - GBDeviceInfo/Core (= 6.6.0)
   - GBDeviceInfo/Core (6.6.0)
-  - GrowingTextView (0.7.2)
   - GZIP (1.3.0)
   - HPGrowingTextView (1.1)
+  - Introspect (0.1.3)
   - JitsiMeetSDK (3.10.2)
   - KeychainAccess (4.2.2)
   - KituraContracts (1.2.1):
@@ -56,32 +57,16 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatomoTracker (7.4.1):
-    - MatomoTracker/Core (= 7.4.1)
-  - MatomoTracker/Core (7.4.1)
-  - MatrixKit (0.16.9):
-    - Down (~> 0.11.0)
-    - DTCoreText (~> 1.6.25)
-    - HPGrowingTextView (~> 1.1)
-    - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixKit/Core (= 0.16.9)
-    - MatrixSDK (= 0.20.9)
-  - MatrixKit/Core (0.16.9):
-    - Down (~> 0.11.0)
-    - DTCoreText (~> 1.6.25)
-    - HPGrowingTextView (~> 1.1)
-    - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixSDK (= 0.20.9)
-  - MatrixSDK (0.20.9):
-    - MatrixSDK/Core (= 0.20.9)
-  - MatrixSDK/Core (0.20.9):
+  - MatrixSDK (0.20.15):
+    - MatrixSDK/Core (= 0.20.15)
+  - MatrixSDK/Core (0.20.15):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
     - OLMKit (~> 3.2.5)
     - Realm (= 10.16.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/JingleCallStack (0.20.9):
+  - MatrixSDK/JingleCallStack (0.20.15):
     - JitsiMeetSDK (= 3.10.2)
     - MatrixSDK/Core
   - OLMKit (3.2.5):
@@ -89,6 +74,7 @@ PODS:
     - OLMKit/olmcpp (= 3.2.5)
   - OLMKit/olmc (3.2.5)
   - OLMKit/olmcpp (3.2.5)
+  - PostHog (1.4.4)
   - ReadMoreTextView (3.0.1)
   - Realm (10.16.0):
     - Realm/Headers (= 10.16.0)
@@ -100,7 +86,7 @@ PODS:
   - Reusable/View (4.1.2)
   - SideMenu (6.5.0)
   - SwiftBase32 (0.9.0)
-  - SwiftGen (6.4.0)
+  - SwiftGen (6.5.1)
   - SwiftJWT (3.6.200):
     - BlueCryptor (~> 1.0)
     - BlueECC (~> 1.1)
@@ -116,20 +102,24 @@ PODS:
   - ZXingObjC/All (3.6.5)
 
 DEPENDENCIES:
+  - AnalyticsEvents (from `https://github.com/matrix-org/matrix-analytics-events.git`, branch `release/swift`)
   - DGCollectionViewLeftAlignFlowLayout (~> 1.0.4)
+  - Down (~> 0.11.0)
   - DSWaveformImage (~> 6.1.1)
+  - DTCoreText (~> 1.6.25)
   - ffmpeg-kit-ios-audio (~> 4.5)
   - FLEX (~> 4.5.0)
   - FlowCommoniOS (~> 1.12.0)
   - GBDeviceInfo (~> 6.6.0)
-  - GrowingTextView (~> 0.7.2)
+  - HPGrowingTextView (~> 1.1)
+  - Introspect (~> 0.1)
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
-  - MatomoTracker (~> 7.4.1)
-  - MatrixKit (= 0.16.9)
-  - MatrixSDK
-  - MatrixSDK/JingleCallStack
+  - libPhoneNumber-iOS (~> 0.9.13)
+  - MatrixSDK (= 0.20.15)
+  - MatrixSDK/JingleCallStack (= 0.20.15)
   - OLMKit
+  - PostHog (~> 1.4.4)
   - ReadMoreTextView (~> 3.0.1)
   - Reusable (~> 4.1)
   - SideMenu (~> 6.5)
@@ -156,9 +146,9 @@ SPEC REPOS:
     - FLEX
     - FlowCommoniOS
     - GBDeviceInfo
-    - GrowingTextView
     - GZIP
     - HPGrowingTextView
+    - Introspect
     - JitsiMeetSDK
     - KeychainAccess
     - KituraContracts
@@ -167,10 +157,9 @@ SPEC REPOS:
     - libPhoneNumber-iOS
     - LoggerAPI
     - Logging
-    - MatomoTracker
-    - MatrixKit
     - MatrixSDK
     - OLMKit
+    - PostHog
     - ReadMoreTextView
     - Realm
     - Reusable
@@ -184,11 +173,22 @@ SPEC REPOS:
     - zxcvbn-ios
     - ZXingObjC
 
+EXTERNAL SOURCES:
+  AnalyticsEvents:
+    :branch: release/swift
+    :git: https://github.com/matrix-org/matrix-analytics-events.git
+
+CHECKOUT OPTIONS:
+  AnalyticsEvents:
+    :commit: f1805ad7c3fafa7fd9c6e2eaa9e0165f8142ecd2
+    :git: https://github.com/matrix-org/matrix-analytics-events.git
+
 SPEC CHECKSUMS:
   AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
+  AnalyticsEvents: 333bf47d67dc628fadd29ce887b7ac93d8bd6e05
   BlueCryptor: b0aee3d9b8f367b49b30de11cda90e1735571c24
   BlueECC: 0d18e93347d3ec6d41416de21c1ffa4d4cd3c2cc
-  BlueRSA: 6f9776d62d9773502415a7db3bcbb2bbb3f71fc3
+  BlueRSA: dfeef51db96bcc4edec654956c1581adbda4e6a3
   DGCollectionViewLeftAlignFlowLayout: a0fa58797373ded039cafba8133e79373d048399
   Down: b6ba1bc985c9d2f4e15e3b293d2207766fa12612
   DSWaveformImage: 3c718a0cf99291887ee70d1d0c18d80101d3d9ce
@@ -196,11 +196,11 @@ SPEC CHECKSUMS:
   DTFoundation: a53f8cda2489208cbc71c648be177f902ee17536
   ffmpeg-kit-ios-audio: 8c44d93054e1a9743a7014ec3dd26cd1ad8f2a59
   FLEX: e51461dd6f0bfb00643c262acdfea5d5d12c596b
-  FlowCommoniOS: e9ecbc97fb9ce5c593fb3da0e1073b65a3902026
+  FlowCommoniOS: ca92071ab526dc89905495a37844fd7e78d1a7f2
   GBDeviceInfo: ed0db16230d2fa280e1cbb39a5a7f60f6946aaec
-  GrowingTextView: 876bf42005b5e4a4fd740597db12caaf41f0fe6c
   GZIP: 416858efbe66b41b206895ac6dfd5493200d95b3
   HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
+  Introspect: 2be020f30f084ada52bb4387fff83fa52c5c400e
   JitsiMeetSDK: 2f118fa770f23e518f3560fc224fae3ac7062223
   KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
   KituraContracts: e845e60dc8627ad0a76fa55ef20a45451d8f830b
@@ -209,16 +209,15 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatomoTracker: 24a846c9d3aa76933183fe9d47fd62c9efa863fb
-  MatrixKit: ed209774b5c3408974c52cfe2aaba4d2e8b4b05b
-  MatrixSDK: 9e312e3874027bf9eab61be7d0779102f8bd323a
+  MatrixSDK: 2f4d3aacb1c53e2785f0be71d24b8e62e5c5c056
   OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
+  PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
   Realm: b6027801398f3743fc222f096faa85281b506e6c
   Reusable: 6bae6a5e8aa793c9c441db0213c863a64bce9136
   SideMenu: f583187d21c5b1dd04c72002be544b555a2627a2
   SwiftBase32: 9399c25a80666dc66b51e10076bf591e3bbb8f17
-  SwiftGen: 67860cc7c3cfc2ed25b9b74cfd55495fc89f9108
+  SwiftGen: a6d22010845f08fe18fbdf3a07a8e380fd22e0ea
   SwiftJWT: 88c412708f58c169d431d344c87bc79a87c830ae
   SwiftLint: e96c0a8c770c7ebbc4d36c55baf9096bb65c4584
   SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82
@@ -226,6 +225,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 2740772a9b2d32e17876526875dfc58f67240ba0
+PODFILE CHECKSUM: e60814fe2084a7dca3f82c3a1c4a1b763ae822c0
 
 COCOAPODS: 1.11.2
diff --git a/README.md b/README.md
index 31edf7a51..704f07064 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
 ![GitHub](https://img.shields.io/github/license/vector-im/element-ios)
 [![Twitter URL](https://img.shields.io/twitter/url?label=Element&url=https%3A%2F%2Ftwitter.com%2Felement_hq)](https://twitter.com/element_hq)
 
-Element iOS is an iOS [Matrix](https://matrix.org/) client provided by [Element](https://element.io/). It is based on [MatrixKit](https://github.com/matrix-org/matrix-ios-kit) and [MatrixSDK](https://github.com/matrix-org/matrix-ios-sdk).
+Element iOS is an iOS [Matrix](https://matrix.org/) client provided by [Element](https://element.io/). It is based on [MatrixSDK](https://github.com/matrix-org/matrix-ios-sdk).
 
 <p align="center">  
   <a href=https://itunes.apple.com/us/app/element/id1083446067?mt=8>
@@ -34,7 +34,7 @@ $ pod install               # Create the xcworkspace with all project dependenci
 $ open Riot.xcworkspace     # Open Xcode
 ```
 
-Else, you can visit our [installation guide](./INSTALL.md). This guide also offers more details and advanced usage like using [MatrixSDK](https://github.com/matrix-org/matrix-ios-sdk) and [MatrixKit](https://github.com/matrix-org/matrix-ios-kit) in their development versions.
+Else, you can visit our [installation guide](./INSTALL.md). This guide also offers more details and advanced usage like using [MatrixSDK](https://github.com/matrix-org/matrix-ios-sdk) in its development version.
 
 ## Contributing
 
diff --git a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
index 84ecb908a..a9bea1d96 100644
--- a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
+++ b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
@@ -4,7 +4,8 @@
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "YES"
+      runPostActionsOnFailure = "NO">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
diff --git a/Riot/Assets/Images.xcassets/Authentication/Analytics/AnalyticsCheckmark.imageset/AnalyticsTick.pdf b/Riot/Assets/Images.xcassets/Authentication/Analytics/AnalyticsCheckmark.imageset/AnalyticsTick.pdf
new file mode 100644
index 000000000..9696208e3
--- /dev/null
+++ b/Riot/Assets/Images.xcassets/Authentication/Analytics/AnalyticsCheckmark.imageset/AnalyticsTick.pdf
@@ -0,0 +1,123 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 1.000000 -1.000000 cm
+0.049479 0.742188 0.545395 scn
+10.000000 23.000000 m
+3.947715 23.000000 -1.000000 18.052284 -1.000000 12.000000 c
+1.000000 12.000000 l
+1.000000 16.947716 5.052285 21.000000 10.000000 21.000000 c
+10.000000 23.000000 l
+h
+-1.000000 12.000000 m
+-1.000000 5.947716 3.947715 1.000000 10.000000 1.000000 c
+10.000000 3.000000 l
+5.052285 3.000000 1.000000 7.052285 1.000000 12.000000 c
+-1.000000 12.000000 l
+h
+10.000000 1.000000 m
+16.052284 1.000000 21.000000 5.947716 21.000000 12.000000 c
+19.000000 12.000000 l
+19.000000 7.052285 14.947715 3.000000 10.000000 3.000000 c
+10.000000 1.000000 l
+h
+21.000000 12.000000 m
+21.000000 18.052284 16.052284 23.000000 10.000000 23.000000 c
+10.000000 21.000000 l
+14.947715 21.000000 19.000000 16.947716 19.000000 12.000000 c
+21.000000 12.000000 l
+h
+f
+n
+Q
+q
+1.000000 0.000000 -0.000000 1.000000 5.545532 4.655060 cm
+0.049479 0.742188 0.545395 scn
+0.717378 6.153159 m
+0.332610 6.549356 -0.300487 6.558620 -0.696684 6.173852 c
+-1.092881 5.789084 -1.102146 5.155987 -0.717378 4.759790 c
+0.717378 6.153159 l
+h
+3.257576 2.102139 m
+2.540198 1.405455 l
+2.728505 1.211555 2.987285 1.102139 3.257576 1.102139 c
+3.527867 1.102139 3.786646 1.211555 3.974954 1.405455 c
+3.257576 2.102139 l
+h
+11.626469 9.284243 m
+12.011237 9.680439 12.001972 10.313537 11.605776 10.698304 c
+11.209579 11.083073 10.576482 11.073808 10.191713 10.677610 c
+11.626469 9.284243 l
+h
+-0.717378 4.759790 m
+2.540198 1.405455 l
+3.974954 2.798823 l
+0.717378 6.153159 l
+-0.717378 4.759790 l
+h
+3.974954 1.405455 m
+11.626469 9.284243 l
+10.191713 10.677610 l
+2.540198 2.798823 l
+3.974954 1.405455 l
+h
+f
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  1679
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 22.000000 22.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000001769 00000 n
+0000001792 00000 n
+0000001965 00000 n
+0000002039 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+2098
+%%EOF
\ No newline at end of file
diff --git a/Riot/Assets/Images.xcassets/Authentication/Analytics/AnalyticsCheckmark.imageset/Contents.json b/Riot/Assets/Images.xcassets/Authentication/Analytics/AnalyticsCheckmark.imageset/Contents.json
new file mode 100644
index 000000000..146a290ce
--- /dev/null
+++ b/Riot/Assets/Images.xcassets/Authentication/Analytics/AnalyticsCheckmark.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "AnalyticsTick.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/Riot/Assets/Images.xcassets/Authentication/Analytics/AnalyticsLogo.imageset/AnalyticsLogo.pdf b/Riot/Assets/Images.xcassets/Authentication/Analytics/AnalyticsLogo.imageset/AnalyticsLogo.pdf
new file mode 100644
index 000000000..096c22d4b
--- /dev/null
+++ b/Riot/Assets/Images.xcassets/Authentication/Analytics/AnalyticsLogo.imageset/AnalyticsLogo.pdf
@@ -0,0 +1,641 @@
+%PDF-1.7
+
+1 0 obj
+  << /Type /XObject
+     /Length 2 0 R
+     /Group << /Type /Group
+               /S /Transparency
+            >>
+     /Subtype /Form
+     /Resources << /ExtGState << /E2 << /ca 0.400000 >>
+                                 /E1 << /ca 0.400000 >>
+                              >> >>
+     /BBox [ 0.000000 0.000000 119.000000 93.000000 ]
+  >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 14.875000 -0.000015 cm
+0.049479 0.742188 0.545395 scn
+0.000000 44.521278 m
+0.000000 69.109695 20.036579 89.042557 44.625000 89.042557 c
+44.625000 89.042557 l
+69.213417 89.042557 89.250000 69.109695 89.250000 44.521278 c
+89.250000 44.521278 l
+89.250000 19.932861 69.213417 0.000000 44.625000 0.000000 c
+44.625000 0.000000 l
+20.036579 0.000000 0.000000 19.932861 0.000000 44.521278 c
+0.000000 44.521278 l
+h
+f
+n
+Q
+q
+1.000000 0.000000 -0.000000 1.000000 52.227402 46.594299 cm
+1.000000 1.000000 1.000000 scn
+0.000000 20.730219 m
+0.000000 22.447567 1.395428 23.839752 3.116776 23.839752 c
+14.592426 23.839752 23.895279 14.558517 23.895279 3.109533 c
+23.895279 1.392185 22.499851 0.000000 20.778503 0.000000 c
+19.057156 0.000000 17.661728 1.392185 17.661728 3.109533 c
+17.661728 11.123821 11.149731 17.620686 3.116776 17.620686 c
+1.395428 17.620686 0.000000 19.012871 0.000000 20.730219 c
+h
+f*
+n
+Q
+q
+-1.000000 0.000000 -0.000000 -1.000000 66.772202 42.448242 cm
+1.000000 1.000000 1.000000 scn
+0.000000 20.730206 m
+0.000000 22.447552 1.395429 23.839737 3.116779 23.839737 c
+14.592443 23.839737 23.895306 14.558502 23.895306 3.109520 c
+23.895306 1.392172 22.499878 -0.000011 20.778526 -0.000011 c
+19.057177 -0.000011 17.661749 1.392172 17.661749 3.109520 c
+17.661749 11.123808 11.149744 17.620672 3.116779 17.620672 c
+1.395429 17.620672 0.000000 19.012857 0.000000 20.730206 c
+h
+f*
+n
+Q
+q
+-0.000000 1.000000 -1.000000 -0.000000 57.366512 37.265598 cm
+1.000000 1.000000 1.000000 scn
+0.000000 20.722975 m
+0.000000 22.444323 1.392186 23.839752 3.109534 23.839752 c
+14.558520 23.839752 23.839758 14.536892 23.839758 3.061234 c
+23.839758 1.339886 22.447573 -0.055544 20.730225 -0.055544 c
+19.012875 -0.055544 17.620689 1.339886 17.620689 3.061234 c
+17.620689 11.094195 11.123824 17.606197 3.109534 17.606197 c
+1.392186 17.606197 0.000000 19.001625 0.000000 20.722975 c
+h
+f*
+n
+Q
+q
+-0.000000 -1.000000 1.000000 -0.000000 61.633194 51.777008 cm
+1.000000 1.000000 1.000000 scn
+0.000000 20.722975 m
+0.000000 22.444324 1.392186 23.839752 3.109534 23.839752 c
+14.558520 23.839752 23.839758 14.536893 23.839758 3.061237 c
+23.839758 1.339888 22.447573 -0.055540 20.730225 -0.055540 c
+19.012875 -0.055540 17.620689 1.339888 17.620689 3.061237 c
+17.620689 11.094196 11.123824 17.606197 3.109534 17.606197 c
+1.392186 17.606197 0.000000 19.001627 0.000000 20.722975 c
+h
+f*
+n
+Q
+q
+1.000000 0.000000 -0.000000 1.000000 28.123089 16.695465 cm
+1.000000 1.000000 1.000000 scn
+10.448288 0.000008 m
+11.057861 0.000008 11.560491 0.448122 11.646045 1.077618 c
+12.576446 7.617959 13.464069 8.514189 19.795069 9.229038 c
+20.436726 9.303724 20.917965 9.826525 20.917965 10.434681 c
+20.917965 11.053506 20.447418 11.554968 19.805763 11.640323 c
+13.506846 12.461866 12.694082 13.262072 11.646045 19.802414 c
+11.539103 20.431910 11.057861 20.869354 10.448288 20.869354 c
+9.849410 20.869354 9.346780 20.431910 9.250531 19.791744 c
+8.330826 13.251402 7.443202 12.355172 1.112203 11.640323 c
+0.470547 11.565637 0.000000 11.053506 0.000000 10.434681 c
+0.000000 9.826525 0.459853 9.314394 1.112203 9.229038 c
+7.411120 8.354148 8.191800 7.607290 9.250531 1.066948 c
+9.368169 0.437452 9.860105 0.000008 10.448288 0.000008 c
+h
+f
+n
+Q
+q
+1.000000 0.000000 -0.000000 1.000000 28.123089 15.195465 cm
+0.049479 0.742188 0.545395 scn
+11.646045 2.577618 m
+10.903506 2.683247 l
+10.902877 2.678619 l
+11.646045 2.577618 l
+h
+19.795069 10.729038 m
+19.879219 9.983770 l
+19.881781 9.984068 l
+19.795069 10.729038 l
+h
+19.805763 13.140323 m
+19.904661 13.883777 l
+19.902761 13.884024 l
+19.805763 13.140323 l
+h
+11.646045 21.302414 m
+12.386630 21.421087 l
+12.385450 21.428030 l
+11.646045 21.302414 l
+h
+9.250531 21.291744 m
+8.508834 21.403259 l
+8.507838 21.396183 l
+9.250531 21.291744 l
+h
+1.112203 13.140323 m
+1.028052 13.885592 l
+1.025491 13.885293 l
+1.112203 13.140323 l
+h
+1.112203 10.729038 m
+1.215387 11.471931 l
+1.209505 11.472700 l
+1.112203 10.729038 l
+h
+9.250531 2.566948 m
+8.510169 2.447100 l
+8.511623 2.438120 l
+8.513294 2.429176 l
+9.250531 2.566948 l
+h
+10.448288 0.750008 m
+11.450765 0.750008 12.255557 1.493191 12.389213 2.476614 c
+10.902877 2.678619 l
+10.865425 2.403053 10.664957 2.250008 10.448288 2.250008 c
+10.448288 0.750008 l
+h
+12.388570 2.471989 m
+12.620602 4.103085 12.844038 5.334888 13.138243 6.288948 c
+13.429995 7.235054 13.776924 7.858273 14.225985 8.307880 c
+15.140809 9.223818 16.666159 9.620979 19.879219 9.983774 c
+19.710920 11.474303 l
+16.592981 11.122249 14.509018 10.713870 13.164680 9.367895 c
+12.484159 8.686545 12.039045 7.814714 11.704848 6.730967 c
+11.373105 5.655174 11.136688 4.322321 10.903521 2.683245 c
+12.388570 2.471989 l
+h
+19.881781 9.984068 m
+20.873766 10.099530 21.667965 10.918526 21.667965 11.934681 c
+20.167965 11.934681 l
+20.167965 11.734525 19.999683 11.507918 19.708359 11.474010 c
+19.881781 9.984068 l
+h
+21.667965 11.934681 m
+21.667965 12.966555 20.881077 13.753887 19.904659 13.883774 c
+19.706867 12.396872 l
+20.013762 12.356048 20.167965 12.140457 20.167965 11.934681 c
+21.667965 11.934681 l
+h
+19.902761 13.884024 m
+18.330524 14.089085 17.151228 14.287123 16.235826 14.561028 c
+15.331247 14.831694 14.731587 15.163220 14.286853 15.607450 c
+13.840208 16.053589 13.492528 16.670565 13.191763 17.611713 c
+12.888441 18.560867 12.648228 19.788363 12.386598 21.421082 c
+10.905493 21.183746 l
+11.167881 19.546295 11.422276 18.221136 11.762950 17.155106 c
+12.106180 16.081072 12.551881 15.220337 13.226795 14.546188 c
+13.903622 13.870131 14.753702 13.438795 15.805837 13.123979 c
+16.847151 12.812399 18.131544 12.602333 19.708765 12.396622 c
+19.902761 13.884024 l
+h
+12.385450 21.428030 m
+12.223795 22.379583 11.461336 23.119354 10.448288 23.119354 c
+10.448288 21.619354 l
+10.654386 21.619354 10.854410 21.484234 10.906639 21.176800 c
+12.385450 21.428030 l
+h
+10.448288 23.119354 m
+9.455997 23.119354 8.656921 22.387987 8.508867 21.403254 c
+9.992196 21.180237 l
+10.036638 21.475830 10.242823 21.619354 10.448288 21.619354 c
+10.448288 23.119354 l
+h
+8.507838 21.396183 m
+8.278477 19.765110 8.056973 18.533388 7.764218 17.579443 c
+7.473907 16.633463 7.127907 16.010515 6.679636 15.561167 c
+5.766263 14.645599 4.241331 14.248406 1.028053 13.885587 c
+1.196352 12.395059 l
+4.314074 12.747088 6.398453 13.155437 7.741569 14.501781 c
+8.421542 15.183390 8.865580 16.055490 9.198210 17.139366 c
+9.528394 18.215273 9.762733 19.548208 9.993224 21.187307 c
+8.507838 21.396183 l
+h
+1.025491 13.885293 m
+0.028613 13.769261 -0.750000 12.956783 -0.750000 11.934681 c
+0.750000 11.934681 l
+0.750000 12.150229 0.912482 12.362013 1.198914 12.395352 c
+1.025491 13.885293 l
+h
+-0.750000 11.934681 m
+-0.750000 10.922595 0.016880 10.115961 1.014900 9.985377 c
+1.209505 11.472700 l
+0.902826 11.512827 0.750000 11.730454 0.750000 11.934681 c
+-0.750000 11.934681 l
+h
+1.009022 9.986170 m
+2.582546 9.767614 3.760892 9.563175 4.675031 9.286510 c
+5.578484 9.013078 6.174878 8.682938 6.616406 8.241908 c
+7.059544 7.799271 7.404263 7.187467 7.703608 6.250257 c
+8.005574 5.304842 8.245770 4.080437 8.510169 2.447100 c
+9.990894 2.686794 l
+9.725928 4.323629 9.471515 5.645210 9.132493 6.706642 c
+8.790851 7.776280 8.348207 8.632186 7.676467 9.303166 c
+7.003119 9.975756 6.157125 10.405144 5.109545 10.722197 c
+4.072651 11.036015 2.791318 11.253017 1.215384 11.471908 c
+1.009022 9.986170 l
+h
+8.513294 2.429176 m
+8.688872 1.489628 9.455215 0.750008 10.448288 0.750008 c
+10.448288 2.250008 l
+10.264993 2.250008 10.047464 2.385277 9.987769 2.704720 c
+8.513294 2.429176 l
+h
+f
+n
+Q
+q
+1.000000 0.000000 -0.000000 1.000000 72.573807 58.608093 cm
+1.000000 1.000000 1.000000 scn
+8.619835 -0.000011 m
+9.122732 -0.000011 9.537402 0.373419 9.607985 0.897997 c
+10.375565 6.348283 11.107853 7.095141 16.330927 7.690849 c
+16.860292 7.753087 17.257317 8.188755 17.257317 8.695551 c
+17.257317 9.211239 16.869114 9.629124 16.339748 9.700253 c
+11.143145 10.384872 10.472614 11.051710 9.607985 16.501997 c
+9.519756 17.026575 9.122732 17.391113 8.619835 17.391113 c
+8.125761 17.391113 7.711091 17.026575 7.631686 16.493105 c
+6.872929 11.042820 6.140640 10.295961 0.917567 9.700253 c
+0.388201 9.638015 0.000000 9.211239 0.000000 8.695551 c
+0.000000 8.188755 0.379379 7.761978 0.917567 7.690849 c
+6.114172 6.961774 6.758233 6.339392 7.631686 0.889107 c
+7.728737 0.364527 8.134583 -0.000011 8.619835 -0.000011 c
+h
+f
+n
+Q
+q
+1.000000 0.000000 -0.000000 1.000000 72.573807 57.608093 cm
+0.049479 0.742188 0.545395 scn
+9.607985 1.897997 m
+9.112861 1.967726 l
+9.112450 1.964672 l
+9.607985 1.897997 l
+h
+16.330927 8.690849 m
+16.387587 8.194067 l
+16.389311 8.194269 l
+16.330927 8.690849 l
+h
+16.339748 10.700253 m
+16.406334 11.195801 l
+16.405056 11.195970 l
+16.339748 10.700253 l
+h
+9.607985 17.501997 m
+10.101830 17.580339 l
+10.101059 17.584925 l
+9.607985 17.501997 l
+h
+7.631686 17.493105 m
+7.137113 17.566721 l
+7.136462 17.562048 l
+7.631686 17.493105 l
+h
+0.917567 10.700253 m
+0.860907 11.197035 l
+0.859183 11.196833 l
+0.917567 10.700253 l
+h
+0.917567 8.690849 m
+0.987038 9.186015 l
+0.983079 9.186539 l
+0.917567 8.690849 l
+h
+7.631686 1.889107 m
+7.137843 1.809963 l
+7.140029 1.798147 l
+7.631686 1.889107 l
+h
+8.619835 0.499989 m
+9.388696 0.499989 10.001672 1.074373 10.103518 1.831324 c
+9.112450 1.964672 l
+9.073133 1.672462 8.856770 1.499989 8.619835 1.499989 c
+8.619835 0.499989 l
+h
+10.103099 1.828268 m
+10.294624 3.188222 10.480069 4.223436 10.725984 5.028956 c
+10.970345 5.829387 11.264832 6.369568 11.654185 6.763333 c
+12.442908 7.560994 13.744701 7.892640 16.387587 8.194070 c
+16.274267 9.187629 l
+13.694078 8.893350 12.018190 8.553713 10.943106 7.466446 c
+10.400556 6.917747 10.041607 6.212054 9.769561 5.320940 c
+9.499068 4.434915 9.305134 3.332915 9.112870 1.967726 c
+10.103099 1.828268 l
+h
+16.389311 8.194269 m
+17.155991 8.284410 17.757317 8.920855 17.757317 9.695551 c
+16.757317 9.695551 l
+16.757317 9.456655 16.564592 9.221766 16.272543 9.187428 c
+16.389311 8.194269 l
+h
+17.757317 9.695551 m
+17.757317 10.482604 17.162529 11.094193 16.406334 11.195800 c
+16.273165 10.204706 l
+16.575699 10.164056 16.757317 9.939874 16.757317 9.695551 c
+17.757317 9.695551 l
+h
+16.405056 11.195970 m
+15.107601 11.366901 14.126670 11.532858 13.361839 11.764020 c
+12.604449 11.992933 12.090017 12.277006 11.704502 12.665974 c
+11.317406 13.056538 11.022324 13.591100 10.770527 14.386979 c
+10.517109 15.187984 10.317721 16.219311 10.101810 17.580338 c
+9.114160 17.423656 l
+9.330563 16.059540 9.539227 14.963654 9.817105 14.085340 c
+10.096603 13.201900 10.456060 12.505035 10.994250 11.962027 c
+11.534022 11.417421 12.215625 11.065775 13.072525 10.806786 c
+13.921983 10.550046 14.973595 10.375915 16.274443 10.204536 c
+16.405056 11.195970 l
+h
+10.101059 17.584925 m
+9.977288 18.320837 9.395552 18.891113 8.619835 18.891113 c
+8.619835 17.891113 l
+8.849913 17.891113 9.062225 17.732313 9.114909 17.419067 c
+10.101059 17.584925 l
+h
+8.619835 18.891113 m
+7.859531 18.891113 7.250215 18.326427 7.137135 17.566717 c
+8.126238 17.419493 l
+8.171968 17.726725 8.391990 17.891113 8.619835 17.891113 c
+8.619835 18.891113 l
+h
+7.136462 17.562048 m
+6.947139 16.202108 6.763302 15.166948 6.518592 14.361504 c
+6.275430 13.561155 5.981721 13.021152 5.592998 12.627558 c
+4.805452 11.830145 3.503936 11.498478 0.860908 11.197033 c
+0.974226 10.203474 l
+3.554271 10.497736 5.230436 10.837353 6.304493 11.924868 c
+6.846570 12.473737 7.204643 13.179608 7.475406 14.070805 c
+7.744622 14.956905 7.936855 16.058958 8.126910 17.424164 c
+7.136462 17.562048 l
+h
+0.859183 11.196833 m
+0.089259 11.106312 -0.500000 10.475979 -0.500000 9.695551 c
+0.500000 9.695551 l
+0.500000 9.946500 0.687143 10.169718 0.975950 10.203673 c
+0.859183 11.196833 l
+h
+-0.500000 9.695551 m
+-0.500000 8.923503 0.079786 8.297226 0.852054 8.195160 c
+0.983079 9.186539 l
+0.678971 9.226731 0.500000 9.454006 0.500000 9.695551 c
+-0.500000 9.695551 l
+h
+0.848098 8.195699 m
+2.146421 8.013546 3.126409 7.842214 3.889960 7.608789 c
+4.646159 7.377612 5.157835 7.094736 5.540681 6.708459 c
+5.924912 6.320785 6.217544 5.790504 6.468155 4.997945 c
+6.720429 4.200129 6.919805 3.171420 7.137986 1.809986 c
+8.125387 1.968225 l
+7.906841 3.331934 7.698164 4.424881 7.421624 5.299438 c
+7.143422 6.179253 6.786478 6.872063 6.250936 7.412404 c
+5.714010 7.954142 5.035716 8.304206 4.182313 8.565100 c
+3.336262 8.823746 2.287016 9.003614 0.987036 9.186000 c
+0.848098 8.195699 l
+h
+7.140029 1.798147 m
+7.274719 1.070122 7.860904 0.499989 8.619835 0.499989 c
+8.619835 1.499989 l
+8.408263 1.499989 8.182755 1.658932 8.123343 1.980066 c
+7.140029 1.798147 l
+h
+f
+n
+Q
+q
+1.000000 0.000000 -0.000000 1.000000 107.227104 75.129669 cm
+0.049479 0.742188 0.545395 scn
+5.619252 -0.000010 m
+5.947090 -0.000010 6.217412 0.238985 6.263425 0.574716 c
+6.763808 4.062898 7.241186 4.540888 10.646096 4.922141 c
+10.991189 4.961974 11.250008 5.240800 11.250008 5.565150 c
+11.250008 5.895190 10.996941 6.162637 10.651848 6.208159 c
+7.264192 6.646316 6.827075 7.073092 6.263425 10.561275 c
+6.205909 10.897006 5.947090 11.130310 5.619252 11.130310 c
+5.297166 11.130310 5.026845 10.897006 4.975080 10.555585 c
+4.480448 7.067402 4.003070 6.589413 0.598160 6.208159 c
+0.253068 6.168327 0.000000 5.895190 0.000000 5.565150 c
+0.000000 5.240800 0.247316 4.967664 0.598160 4.922141 c
+3.985816 4.455533 4.405678 4.057208 4.975080 0.569025 c
+5.038347 0.233294 5.302918 -0.000010 5.619252 -0.000010 c
+h
+f
+n
+Q
+q
+1.000000 0.000000 -0.000000 1.000000 103.008408 84.868683 cm
+0.049479 0.742188 0.545395 scn
+3.160831 -0.000001 m
+3.345240 -0.000001 3.497297 0.134433 3.523178 0.323282 c
+3.804644 2.285384 4.073170 2.554254 5.988433 2.768708 c
+6.182547 2.791114 6.328133 2.947954 6.328133 3.130401 c
+6.328133 3.316049 6.185782 3.466487 5.991668 3.492094 c
+4.086111 3.738557 3.840232 3.978619 3.523178 5.940721 c
+3.490826 6.129570 3.345240 6.260803 3.160831 6.260803 c
+2.979658 6.260803 2.827601 6.129570 2.798484 5.937521 c
+2.520254 3.975418 2.251728 3.706549 0.336465 3.492094 c
+0.142351 3.469688 0.000000 3.316049 0.000000 3.130401 c
+0.000000 2.947954 0.139115 2.794315 0.336465 2.768708 c
+2.242023 2.506241 2.478195 2.282184 2.798484 0.320081 c
+2.834072 0.131233 2.982893 -0.000001 3.160831 -0.000001 c
+h
+f
+n
+Q
+q
+1.000000 0.000000 -0.000000 1.000000 103.711479 69.564484 cm
+0.049479 0.742188 0.545395 scn
+3.863233 0.000004 m
+4.088622 0.000004 4.274468 0.164312 4.306101 0.395127 c
+4.650115 2.793253 4.978312 3.121871 7.319186 3.383983 c
+7.556437 3.411368 7.734375 3.603061 7.734375 3.826052 c
+7.734375 4.052955 7.560391 4.236824 7.323141 4.268121 c
+4.994129 4.569354 4.693611 4.862762 4.306101 7.260888 c
+4.266560 7.491703 4.088622 7.652100 3.863233 7.652100 c
+3.641799 7.652100 3.455953 7.491703 3.420365 7.256976 c
+3.080306 4.858850 2.752109 4.530232 0.411235 4.268121 c
+0.173984 4.240736 0.000000 4.052955 0.000000 3.826052 c
+0.000000 3.603061 0.170030 3.415280 0.411235 3.383983 c
+2.740246 3.063190 3.028902 2.789341 3.420365 0.391215 c
+3.463861 0.160400 3.645753 0.000004 3.863233 0.000004 c
+h
+f
+n
+Q
+q
+1.000000 0.000000 -0.000000 1.000000 -0.070938 78.607880 cm
+0.049479 0.742188 0.545395 scn
+5.268045 -0.000012 m
+5.575393 -0.000012 5.828820 0.224045 5.871957 0.538792 c
+6.341066 3.808963 6.788608 4.257079 9.980709 4.614503 c
+10.304233 4.651846 10.546875 4.913247 10.546875 5.217325 c
+10.546875 5.526737 10.309625 5.777468 9.986101 5.820146 c
+6.810176 6.230918 6.400379 6.631021 5.871957 9.901192 c
+5.818036 10.215940 5.575393 10.434662 5.268045 10.434662 c
+4.966090 10.434662 4.712663 10.215940 4.664135 9.895857 c
+4.200418 6.625686 3.752876 6.177571 0.560775 5.820146 c
+0.237251 5.782803 0.000000 5.526737 0.000000 5.217325 c
+0.000000 4.913247 0.231859 4.657181 0.560775 4.614503 c
+3.736700 4.177058 4.130321 3.803629 4.664135 0.533457 c
+4.723447 0.218710 4.971482 -0.000012 5.268045 -0.000012 c
+h
+f
+n
+Q
+q
+/E1 gs
+1.000000 0.000000 -0.000000 1.000000 9.772858 88.346924 cm
+0.049479 0.742188 0.545395 scn
+2.458421 -0.000008 m
+2.601850 -0.000008 2.720115 0.104552 2.740246 0.251434 c
+2.959164 1.777514 3.168016 1.986634 4.657663 2.153433 c
+4.808641 2.170859 4.921874 2.292846 4.921874 2.434749 c
+4.921874 2.579142 4.811157 2.696150 4.660179 2.716066 c
+3.178081 2.907759 2.986843 3.094474 2.740246 4.620554 c
+2.715083 4.767436 2.601850 4.869507 2.458421 4.869507 c
+2.317508 4.869507 2.199242 4.767436 2.176596 4.618064 c
+1.960194 3.091985 1.751342 2.882864 0.261695 2.716066 c
+0.110717 2.698639 0.000000 2.579142 0.000000 2.434749 c
+0.000000 2.292846 0.108201 2.173349 0.261695 2.153433 c
+1.743793 1.949291 1.927482 1.775024 2.176596 0.248944 c
+2.204275 0.102062 2.320024 -0.000008 2.458421 -0.000008 c
+h
+f
+n
+Q
+q
+/E2 gs
+1.000000 0.000000 -0.000000 1.000000 13.288479 82.086121 cm
+0.049479 0.742188 0.545395 scn
+2.458421 -0.000008 m
+2.601850 -0.000008 2.720116 0.104552 2.740247 0.251434 c
+2.959164 1.777514 3.168017 1.986634 4.657664 2.153433 c
+4.808642 2.170859 4.921875 2.292846 4.921875 2.434749 c
+4.921875 2.579142 4.811158 2.696150 4.660181 2.716066 c
+3.178082 2.907759 2.986844 3.094474 2.740247 4.620554 c
+2.715084 4.767436 2.601850 4.869507 2.458421 4.869507 c
+2.317509 4.869507 2.199243 4.767436 2.176596 4.618064 c
+1.960195 3.091985 1.751342 2.882864 0.261695 2.716066 c
+0.110717 2.698639 0.000000 2.579142 0.000000 2.434749 c
+0.000000 2.292846 0.108201 2.173349 0.261695 2.153433 c
+1.743793 1.949291 1.927483 1.775024 2.176596 0.248944 c
+2.204276 0.102062 2.320025 -0.000008 2.458421 -0.000008 c
+h
+f
+n
+Q
+
+endstream
+endobj
+
+2 0 obj
+  17245
+endobj
+
+3 0 obj
+  << /Type /XObject
+     /Length 4 0 R
+     /Group << /Type /Group
+               /S /Transparency
+            >>
+     /Subtype /Form
+     /Resources << >>
+     /BBox [ 0.000000 0.000000 119.000000 93.000000 ]
+  >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm
+0.000000 0.000000 0.000000 scn
+0.000000 93.000000 m
+119.000000 93.000000 l
+119.000000 0.000000 l
+0.000000 0.000000 l
+0.000000 93.000000 l
+h
+f
+n
+Q
+
+endstream
+endobj
+
+4 0 obj
+  234
+endobj
+
+5 0 obj
+  << /XObject << /X1 1 0 R >>
+     /ExtGState << /E1 << /SMask << /Type /Mask
+                                    /G 3 0 R
+                                    /S /Alpha
+                                 >>
+                          /Type /ExtGState
+                       >> >>
+  >>
+endobj
+
+6 0 obj
+  << /Length 7 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+/E1 gs
+/X1 Do
+Q
+
+endstream
+endobj
+
+7 0 obj
+  46
+endobj
+
+8 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 119.000000 93.000000 ]
+     /Resources 5 0 R
+     /Contents 6 0 R
+     /Parent 9 0 R
+  >>
+endobj
+
+9 0 obj
+  << /Kids [ 8 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+10 0 obj
+  << /Pages 9 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 11
+0000000000 65535 f
+0000000010 00000 n
+0000017630 00000 n
+0000017654 00000 n
+0000018137 00000 n
+0000018159 00000 n
+0000018457 00000 n
+0000018559 00000 n
+0000018580 00000 n
+0000018754 00000 n
+0000018828 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 10 0 R
+   /Size 11
+>>
+startxref
+18888
+%%EOF
\ No newline at end of file
diff --git a/Riot/Assets/Images.xcassets/Authentication/Analytics/AnalyticsLogo.imageset/Contents.json b/Riot/Assets/Images.xcassets/Authentication/Analytics/AnalyticsLogo.imageset/Contents.json
new file mode 100644
index 000000000..7d49fc335
--- /dev/null
+++ b/Riot/Assets/Images.xcassets/Authentication/Analytics/AnalyticsLogo.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "AnalyticsLogo.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/Riot/Assets/Images.xcassets/Authentication/Analytics/Contents.json b/Riot/Assets/Images.xcassets/Authentication/Analytics/Contents.json
new file mode 100644
index 000000000..73c00596a
--- /dev/null
+++ b/Riot/Assets/Images.xcassets/Authentication/Analytics/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Riot/Assets/Images.xcassets/Room/Actions/action_poll.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/Actions/action_poll.imageset/Contents.json
new file mode 100644
index 000000000..7c6421fc2
--- /dev/null
+++ b/Riot/Assets/Images.xcassets/Room/Actions/action_poll.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "action_poll.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "action_poll@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "action_poll@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Riot/Assets/Images.xcassets/Room/Actions/action_poll.imageset/action_poll.png b/Riot/Assets/Images.xcassets/Room/Actions/action_poll.imageset/action_poll.png
new file mode 100644
index 000000000..5672e65a7
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Actions/action_poll.imageset/action_poll.png differ
diff --git a/Riot/Assets/Images.xcassets/Room/Actions/action_poll.imageset/action_poll@2x.png b/Riot/Assets/Images.xcassets/Room/Actions/action_poll.imageset/action_poll@2x.png
new file mode 100644
index 000000000..888064245
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Actions/action_poll.imageset/action_poll@2x.png differ
diff --git a/Riot/Assets/Images.xcassets/Room/Actions/action_poll.imageset/action_poll@3x.png b/Riot/Assets/Images.xcassets/Room/Actions/action_poll.imageset/action_poll@3x.png
new file mode 100644
index 000000000..c588e1f8f
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Actions/action_poll.imageset/action_poll@3x.png differ
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/Contents.json b/Riot/Assets/Images.xcassets/Room/Polls/Contents.json
new file mode 100644
index 000000000..73c00596a
--- /dev/null
+++ b/Riot/Assets/Images.xcassets/Room/Polls/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_checkbox_default.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/Polls/poll_checkbox_default.imageset/Contents.json
new file mode 100644
index 000000000..dad70857c
--- /dev/null
+++ b/Riot/Assets/Images.xcassets/Room/Polls/poll_checkbox_default.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "poll_checkbox_default.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "poll_checkbox_default@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "poll_checkbox_default@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_checkbox_default.imageset/poll_checkbox_default.png b/Riot/Assets/Images.xcassets/Room/Polls/poll_checkbox_default.imageset/poll_checkbox_default.png
new file mode 100644
index 000000000..84e419079
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Polls/poll_checkbox_default.imageset/poll_checkbox_default.png differ
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_checkbox_default.imageset/poll_checkbox_default@2x.png b/Riot/Assets/Images.xcassets/Room/Polls/poll_checkbox_default.imageset/poll_checkbox_default@2x.png
new file mode 100644
index 000000000..7e6083bc3
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Polls/poll_checkbox_default.imageset/poll_checkbox_default@2x.png differ
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_checkbox_default.imageset/poll_checkbox_default@3x.png b/Riot/Assets/Images.xcassets/Room/Polls/poll_checkbox_default.imageset/poll_checkbox_default@3x.png
new file mode 100644
index 000000000..316a8eab7
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Polls/poll_checkbox_default.imageset/poll_checkbox_default@3x.png differ
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_checkbox_selected.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/Polls/poll_checkbox_selected.imageset/Contents.json
new file mode 100644
index 000000000..e1f28a0dc
--- /dev/null
+++ b/Riot/Assets/Images.xcassets/Room/Polls/poll_checkbox_selected.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "poll_checkbox_selected.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "poll_checkbox_selected@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "poll_checkbox_selected@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_checkbox_selected.imageset/poll_checkbox_selected.png b/Riot/Assets/Images.xcassets/Room/Polls/poll_checkbox_selected.imageset/poll_checkbox_selected.png
new file mode 100644
index 000000000..8771564f4
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Polls/poll_checkbox_selected.imageset/poll_checkbox_selected.png differ
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_checkbox_selected.imageset/poll_checkbox_selected@2x.png b/Riot/Assets/Images.xcassets/Room/Polls/poll_checkbox_selected.imageset/poll_checkbox_selected@2x.png
new file mode 100644
index 000000000..deee479e9
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Polls/poll_checkbox_selected.imageset/poll_checkbox_selected@2x.png differ
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_checkbox_selected.imageset/poll_checkbox_selected@3x.png b/Riot/Assets/Images.xcassets/Room/Polls/poll_checkbox_selected.imageset/poll_checkbox_selected@3x.png
new file mode 100644
index 000000000..cb6195cb5
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Polls/poll_checkbox_selected.imageset/poll_checkbox_selected@3x.png differ
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_delete_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/Polls/poll_delete_icon.imageset/Contents.json
new file mode 100644
index 000000000..19dac30ff
--- /dev/null
+++ b/Riot/Assets/Images.xcassets/Room/Polls/poll_delete_icon.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "poll_delete_icon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "poll_delete_icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "poll_delete_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_delete_icon.imageset/poll_delete_icon.png b/Riot/Assets/Images.xcassets/Room/Polls/poll_delete_icon.imageset/poll_delete_icon.png
new file mode 100644
index 000000000..e2ad14546
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Polls/poll_delete_icon.imageset/poll_delete_icon.png differ
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_delete_icon.imageset/poll_delete_icon@2x.png b/Riot/Assets/Images.xcassets/Room/Polls/poll_delete_icon.imageset/poll_delete_icon@2x.png
new file mode 100644
index 000000000..b45ce02ed
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Polls/poll_delete_icon.imageset/poll_delete_icon@2x.png differ
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_delete_icon.imageset/poll_delete_icon@3x.png b/Riot/Assets/Images.xcassets/Room/Polls/poll_delete_icon.imageset/poll_delete_icon@3x.png
new file mode 100644
index 000000000..e960f0ffa
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Polls/poll_delete_icon.imageset/poll_delete_icon@3x.png differ
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_delete_option_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/Polls/poll_delete_option_icon.imageset/Contents.json
new file mode 100644
index 000000000..29638e38a
--- /dev/null
+++ b/Riot/Assets/Images.xcassets/Room/Polls/poll_delete_option_icon.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "poll_delete_option_icon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "poll_delete_option_icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "poll_delete_option_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_delete_option_icon.imageset/poll_delete_option_icon.png b/Riot/Assets/Images.xcassets/Room/Polls/poll_delete_option_icon.imageset/poll_delete_option_icon.png
new file mode 100644
index 000000000..0a1dc0a32
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Polls/poll_delete_option_icon.imageset/poll_delete_option_icon.png differ
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_delete_option_icon.imageset/poll_delete_option_icon@2x.png b/Riot/Assets/Images.xcassets/Room/Polls/poll_delete_option_icon.imageset/poll_delete_option_icon@2x.png
new file mode 100644
index 000000000..bfc0e272d
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Polls/poll_delete_option_icon.imageset/poll_delete_option_icon@2x.png differ
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_delete_option_icon.imageset/poll_delete_option_icon@3x.png b/Riot/Assets/Images.xcassets/Room/Polls/poll_delete_option_icon.imageset/poll_delete_option_icon@3x.png
new file mode 100644
index 000000000..a209b1b37
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Polls/poll_delete_option_icon.imageset/poll_delete_option_icon@3x.png differ
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_edit_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/Polls/poll_edit_icon.imageset/Contents.json
new file mode 100644
index 000000000..b83445a6b
--- /dev/null
+++ b/Riot/Assets/Images.xcassets/Room/Polls/poll_edit_icon.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "poll_edit_icon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "poll_edit_icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "poll_edit_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_edit_icon.imageset/poll_edit_icon.png b/Riot/Assets/Images.xcassets/Room/Polls/poll_edit_icon.imageset/poll_edit_icon.png
new file mode 100644
index 000000000..9bcc9356e
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Polls/poll_edit_icon.imageset/poll_edit_icon.png differ
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_edit_icon.imageset/poll_edit_icon@2x.png b/Riot/Assets/Images.xcassets/Room/Polls/poll_edit_icon.imageset/poll_edit_icon@2x.png
new file mode 100644
index 000000000..bb7f31e2d
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Polls/poll_edit_icon.imageset/poll_edit_icon@2x.png differ
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_edit_icon.imageset/poll_edit_icon@3x.png b/Riot/Assets/Images.xcassets/Room/Polls/poll_edit_icon.imageset/poll_edit_icon@3x.png
new file mode 100644
index 000000000..c3a7e3aeb
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Polls/poll_edit_icon.imageset/poll_edit_icon@3x.png differ
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_end_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/Polls/poll_end_icon.imageset/Contents.json
new file mode 100644
index 000000000..165d80098
--- /dev/null
+++ b/Riot/Assets/Images.xcassets/Room/Polls/poll_end_icon.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "poll_end_icon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "poll_end_icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "poll_end_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_end_icon.imageset/poll_end_icon.png b/Riot/Assets/Images.xcassets/Room/Polls/poll_end_icon.imageset/poll_end_icon.png
new file mode 100644
index 000000000..8ca40ab42
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Polls/poll_end_icon.imageset/poll_end_icon.png differ
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_end_icon.imageset/poll_end_icon@2x.png b/Riot/Assets/Images.xcassets/Room/Polls/poll_end_icon.imageset/poll_end_icon@2x.png
new file mode 100644
index 000000000..2d93bd402
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Polls/poll_end_icon.imageset/poll_end_icon@2x.png differ
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_end_icon.imageset/poll_end_icon@3x.png b/Riot/Assets/Images.xcassets/Room/Polls/poll_end_icon.imageset/poll_end_icon@3x.png
new file mode 100644
index 000000000..282514b32
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Polls/poll_end_icon.imageset/poll_end_icon@3x.png differ
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_winner_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/Polls/poll_winner_icon.imageset/Contents.json
new file mode 100644
index 000000000..61c735d9b
--- /dev/null
+++ b/Riot/Assets/Images.xcassets/Room/Polls/poll_winner_icon.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "poll_winner_icon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "poll_winner_icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "poll_winner_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_winner_icon.imageset/poll_winner_icon.png b/Riot/Assets/Images.xcassets/Room/Polls/poll_winner_icon.imageset/poll_winner_icon.png
new file mode 100644
index 000000000..255cdff73
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Polls/poll_winner_icon.imageset/poll_winner_icon.png differ
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_winner_icon.imageset/poll_winner_icon@2x.png b/Riot/Assets/Images.xcassets/Room/Polls/poll_winner_icon.imageset/poll_winner_icon@2x.png
new file mode 100644
index 000000000..a9a25f56d
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Polls/poll_winner_icon.imageset/poll_winner_icon@2x.png differ
diff --git a/Riot/Assets/Images.xcassets/Room/Polls/poll_winner_icon.imageset/poll_winner_icon@3x.png b/Riot/Assets/Images.xcassets/Room/Polls/poll_winner_icon.imageset/poll_winner_icon@3x.png
new file mode 100644
index 000000000..1ee4637cd
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Polls/poll_winner_icon.imageset/poll_winner_icon@3x.png differ
diff --git a/Riot/Assets/de.lproj/InfoPlist.strings b/Riot/Assets/de.lproj/InfoPlist.strings
index d5f41184b..571d56f44 100644
--- a/Riot/Assets/de.lproj/InfoPlist.strings
+++ b/Riot/Assets/de.lproj/InfoPlist.strings
@@ -2,6 +2,6 @@
 "NSCameraUsageDescription" = "Die Kamera wird verwendet, um Fotos und Videos aufzunehmen sowie Videoanrufe durchzuführen.";
 "NSPhotoLibraryUsageDescription" = "Die Fotobibliothek wird verwendet, um Fotos und Videos zu versenden.";
 "NSMicrophoneUsageDescription" = "Element benötigt Zugriff auf das Mikrofon um Anrufe zu tätigen und Videos oder Sprachnachrichten aufzunehmen.";
-"NSContactsUsageDescription" = "Element kann E-Mail-Adressen und Telefonnummern aus deinem Adressbuch zu deinem Matrix-Identitätsserver schicken, um Kontakte zu finden, die bereits Matrix verwenden. Wenn verfügbar, werden persönliche Daten vor dem Versand gehasht. Für weitere Informationen schaue bitte in die Datenschutzerklärung deines Identitätsservers.";
+"NSContactsUsageDescription" = "Element zeigt deine Kontakte an, damit du sie zum chatten einladen kannst.";
 "NSCalendarsUsageDescription" = "Sieh dir deine geplanten Meetings in der App an.";
 "NSFaceIDUsageDescription" = "Face-ID wird zum Zugriff auf deine App verwendet.";
diff --git a/Riot/Assets/de.lproj/Vector.strings b/Riot/Assets/de.lproj/Vector.strings
index 7dd14568c..63ea02f51 100644
--- a/Riot/Assets/de.lproj/Vector.strings
+++ b/Riot/Assets/de.lproj/Vector.strings
@@ -286,7 +286,7 @@
 "auth_reset_password_success_message" = "Dein Passwort wurde zurückgesetzt.\n\nDu wurdest aus allen Sitzungen abgemeldet, diese bekommen jetzt keine Push-Benachrichtigungen mehr. Um diese wieder einzuschalten, melde dich auf den Geräten erneut an.";
 "auth_add_email_and_phone_warning" = "Registrierung mit E-Mail und Telefonnummer zugleich ist noch nicht unterstützt. Nur die Telefonnummer wird berücksichtigt. Du kannst deine E-Mail-Adresse in deinem Profil ergänzen.";
 "room_creation_make_public_prompt_msg" = "Sicher, dass du diesen Raum öffentlich machen willst? Jeder kann deine Nachrichten lesen und dem Raum beitreten.";
-"room_creation_invite_another_user" = "Suchen/Einladen mittels Benutzer-ID, Name oder E-Mail-Adresse";
+"room_creation_invite_another_user" = "Benutzer-ID, Name oder E-Mail";
 "room_recents_join_room_prompt" = "Gib eine Raum-ID oder einem Raum-Alias an";
 "directory_cell_description" = "%tu Räume";
 "directory_search_results" = "%tu Treffer gefunden für %@";
@@ -835,7 +835,7 @@
 "settings_calls_stun_server_fallback_button" = "Ausweich-Anruf-Assistenz-Server zulassen";
 "settings_devices_description" = "Der öffentliche Name der Sitzung ist für Personen sichtbar, mit denen du kommunizierst";
 "settings_discovery_no_identity_server" = "Du verwendest derzeit keinen Identitätsserver. Füge einen hinzu, um für vorhandene, dir bekannte Kontakte sichtbar zu sein.";
-"settings_discovery_terms_not_signed" = "Stimme den Nutzungsbedingungen des Identitätsservers (%@) zu, um zu erlauben per E-Mail oder Telefonnummer gefunden zu werden.";
+"settings_discovery_terms_not_signed" = "Stimme den Nutzungsbedingungen des Identitätsservers (%@) zu, um per E-Mail oder Telefonnummer gefunden zu werden.";
 "settings_discovery_three_pids_management_information_part1" = "Verwalte, welche E-Mail-Adressen oder Telefonnummern andere Benutzer verwenden können, um dich zu entdecken und dich in Räume einzuladen. Füge in dieser Liste E-Mail-Adressen oder Telefonnummern hinzu oder entferne sie ";
 "settings_discovery_three_pids_management_information_part2" = "Nutzereinstellungen";
 "settings_discovery_three_pids_management_information_part3" = ".";
@@ -910,7 +910,7 @@
 "room_participants_security_loading" = "Lade…";
 "room_participants_security_information_room_not_encrypted" = "Nachrichten in diesem Raum sind nicht Ende-zu-Ende verschlüsselt.";
 "settings_security" = "SICHERHEIT";
-"settings_integrations_allow_description" = "Benutze einen Integrationsverwalter (%@), um Bots, Bridges, Widgets und Aufkleberpakete zu verwalten.\n\nIntegrationsverwalter erhalten Konfigurationsdaten und können Widgets verändern, Raum-Einladungen versenden sowie Berechtigungen in deinem Namen einstellen.";
+"settings_integrations_allow_description" = "Benutze einen Integrationsmanager (%@), um Bots, Bridges, Widgets und Aufkleberpakete zu verwalten.\n\nIntegrationsmanager erhalten Konfigurationsdaten und können Widgets verändern, Raum-Einladungen versenden sowie Berechtigungen in deinem Namen einstellen.";
 "settings_labs_enable_cross_signing" = "Aktiviere Cross-Signing, um deinen Gesprächspartner anstatt dessen Gerät zu verifizieren (in Entwicklung)";
 // Security settings
 "security_settings_title" = "Sicherheit";
@@ -1484,3 +1484,26 @@
 "open" = "Öffnen";
 "settings_links" = "LINKS";
 "find_your_contacts_footer" = "Dies kann jederzeit in den Einstellungen deaktiviert werden.";
+"settings_contacts_enable_sync" = "Finde deine Kontakte";
+"space_home_show_all_rooms" = "Alle Räume anzeigen";
+"service_terms_modal_information_description_integration_manager" = "Ein Integrationsmanager erlaubt dir, externe Funktionen hinzuzufügen.";
+"service_terms_modal_information_description_identity_server" = "Der Identitätsserver sucht anhand der Telefonnummern und E-Mails in deinen Kontakten, ob diese einen Matrix-Account haben.";
+"service_terms_modal_information_title_integration_manager" = "Integrationsmanager";
+
+// Alert explaining what an identity server / integration manager is.
+"service_terms_modal_information_title_identity_server" = "Indentitätsserver";
+"service_terms_modal_description_integration_manager" = "Das erlaubt dir Bots, Bridges und Stickerpacks zu verwenden.";
+"service_terms_modal_description_identity_server" = "Dies erlaubt Personen, die deine Telefonnummer oder E-Mail in ihren Kontakten hat, dich zu finden.";
+"service_terms_modal_table_header_identity_server" = "NUTZUNGSBEDINGUNGEN IDENTITÄTSSERVER";
+"service_terms_modal_table_header_integration_manager" = "NUTZUNGSBEDINGUNGEN INTEGRATIONSMANAGER";
+"service_terms_modal_footer" = "Dies kann jederzeit in den Einstellungen deaktiviert werden.";
+
+// Service terms
+"service_terms_modal_title_message" = "Zum Fortfahren musst du die Nutzungsbedingungen akzeptieren";
+"settings_contacts_enable_sync_description" = "Dies verwendet deinen Identitätsserver um dich mit deinen Kontakten zu verbinden.";
+"settings_phone_contacts" = "KONTAKTE AM HANDY";
+"room_event_action_forward" = "Weiter";
+"find_your_contacts_identity_service_error" = "Konnte keine Verbindung zum Identitätsserver aufbauen.";
+"find_your_contacts_button_title" = "Finde deine Kontakte";
+"contacts_address_book_permission_denied_alert_message" = "Um Kontakte zu aktivieren, öffne die Einstellungen deines Gerätes.";
+"contacts_address_book_permission_denied_alert_title" = "Kontakte deaktiviert";
diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings
index 0ff5e437d..119391d9a 100644
--- a/Riot/Assets/en.lproj/Vector.strings
+++ b/Riot/Assets/en.lproj/Vector.strings
@@ -41,6 +41,7 @@
 "retry" = "Retry";
 "on" = "On";
 "off" = "Off";
+"enable" = "Enable";
 "cancel" = "Cancel";
 "save" = "Save";
 "join" = "Join";
@@ -77,6 +78,7 @@
 
 // Accessibility
 "accessibility_checkbox_label" = "checkbox";
+"accessibility_button_label" = "button";
 
 // Authentication
 "auth_login" = "Log in";
@@ -357,6 +359,8 @@ Tap the + to start adding people.";
 "room_delete_unsent_messages" = "Delete unsent messages";
 "room_event_action_copy" = "Copy";
 "room_event_action_quote" = "Quote";
+"room_event_action_remove_poll" = "Remove poll";
+"room_event_action_end_poll" = "End poll";
 "room_event_action_redact" = "Remove";
 "room_event_action_more" = "More";
 "room_event_action_share" = "Share";
@@ -567,7 +571,7 @@ Tap the + to start adding people.";
 "settings_labs_create_conference_with_jitsi" = "Create conference calls with jitsi";
 "settings_labs_message_reaction" = "React to messages with emoji";
 "settings_labs_enable_ringing_for_group_calls" = "Ring for group calls";
-"settings_labs_voice_messages" = "Voice messages";
+"settings_labs_enabled_polls" = "Polls";
 
 "settings_version" = "Version %@";
 "settings_olm_version" = "Olm Version %@";
@@ -575,7 +579,7 @@ Tap the + to start adding people.";
 "settings_term_conditions" = "Terms & Conditions";
 "settings_privacy_policy" = "Privacy Policy";
 "settings_third_party_notices" = "Third-party Notices";
-"settings_send_crash_report" = "Send anon crash & usage data";
+"settings_analytics_and_crash_data" = "Send crash and analytics data";
 "settings_enable_rageshake" = "Rage shake to report bug";
 "settings_clear_cache" = "Clear cache";
 
@@ -943,8 +947,24 @@ Tap the + to start adding people.";
 "no_voip_title" = "Incoming call";
 "no_voip" = "%@ is calling you but %@ does not support calls yet.\nYou can ignore this notification and answer the call from another device or you can reject it.";
 
-// Crash report
-"google_analytics_use_prompt" = "Would you like to help improve %@ by automatically reporting anonymous crash reports and usage data?";
+// Analytics
+"analytics_prompt_title" = "Help improve %@";
+"analytics_prompt_message_new_user" = "Help us identify issues and improve Element by sharing anonymous usage data. To understand how people use multiple devices, we’ll generate a random identifier, shared by your devices.";
+"analytics_prompt_message_upgrade" = "You previously consented to share anonymous usage data with us. Now, to help understand how people use multiple devices, we’ll generate a random identifier, shared by your devices.";
+/* Note: The placeholder is for the contents of analytics_prompt_terms_link_new_user */
+"analytics_prompt_terms_new_user" = "You can read all our terms %@.";
+"analytics_prompt_terms_link_new_user" = "here";
+/* Note: The placeholder is for the contents of analytics_prompt_terms_link_upgrade */
+"analytics_prompt_terms_upgrade" = "Read all our terms %@. Is that OK?";
+"analytics_prompt_terms_link_upgrade" = "here";
+/* Note: The word "don't" is formatted in bold */
+"analytics_prompt_point_1" = "We <b>don't</b> record or profile any account data";
+/* Note: The word "don't" is formatted in bold */
+"analytics_prompt_point_2" = "We <b>don't</b> share information with third parties";
+"analytics_prompt_point_3" = "You can turn this off anytime in settings";
+"analytics_prompt_not_now" = "Not now";
+"analytics_prompt_yes" = "Yes, that's fine";
+"analytics_prompt_stop" = "Stop sharing";
 
 // Crypto
 "e2e_enabling_on_app_update" = "%@ now supports end-to-end encryption but you need to log in again to enable it.\n\nYou can do it now or later from the application settings.";
@@ -1780,3 +1800,55 @@ Tap the + to start adding people.";
 "version_check_modal_title_deprecated" = "We’re no longer supporting iOS %@";
 "version_check_modal_subtitle_deprecated" = "We've been working on enhancing %@ for a faster and more polished experience. Unfortunately your current version of iOS is not  compatible with some of those fixes and is no longer supported.\nWe're advising you to upgrade your operating system to use %@ to its full potential.";
 "version_check_modal_action_title_deprecated" = "Find out how";
+
+// Mark: - Polls
+
+"poll_edit_form_create_poll" = "Create poll";
+
+"poll_edit_form_poll_question_or_topic" = "Poll question or topic";
+
+"poll_edit_form_question_or_topic" = "Question or topic";
+
+"poll_edit_form_input_placeholder" = "Write something";
+
+"poll_edit_form_create_options" = "Create options";
+
+"poll_edit_form_option_number" = "Option %lu";
+
+"poll_edit_form_add_option" = "Add option";
+
+"poll_edit_form_post_failure_title" = "Failed to post poll";
+
+"poll_edit_form_post_failure_subtitle" = "Please try again";
+
+"poll_edit_form_post_failure_action" = "OK";
+
+"poll_timeline_one_vote" = "1 vote";
+
+"poll_timeline_votes_count" = "%lu votes";
+
+"poll_timeline_total_no_votes" = "No votes cast";
+
+"poll_timeline_total_one_vote" = "1 vote cast";
+
+"poll_timeline_total_votes" = "%lu votes cast";
+
+"poll_timeline_total_one_vote_not_voted" = "1 vote cast. Vote to the see the results";
+
+"poll_timeline_total_votes_not_voted" = "%lu votes cast. Vote to the see the results";
+
+"poll_timeline_total_final_results_one_vote" = "Final results based on 1 vote";
+
+"poll_timeline_total_final_results" = "Final results based on %lu votes";
+
+"poll_timeline_vote_not_registered_title" = "Vote not registered";
+
+"poll_timeline_vote_not_registered_subtitle" = "Sorry, your vote was not registered, please try again";
+
+"poll_timeline_vote_not_registered_action" = "OK";
+
+"poll_timeline_not_closed_title" = "Failed to end poll";
+
+"poll_timeline_not_closed_subtitle" = "Please try again";
+
+"poll_timeline_not_closed_action" = "OK";
diff --git a/Riot/Assets/et.lproj/Vector.strings b/Riot/Assets/et.lproj/Vector.strings
index e33a6047c..9e209a1f2 100644
--- a/Riot/Assets/et.lproj/Vector.strings
+++ b/Riot/Assets/et.lproj/Vector.strings
@@ -759,7 +759,7 @@
 "settings_ignored_users" = "EIRATUD KASUTAJAD";
 "settings_contacts" = "KONTAKTID SEADMES";
 "settings_advanced" = "KEERUKAMAD SEADISTUSED";
-"settings_other" = "MUUD SEADISTUSED";
+"settings_other" = "Muud seadistused";
 "settings_labs" = "KATSED";
 "settings_discovery_no_identity_server" = "Sa hetkel ei kasuta isikutuvastusserverit. Et olla leitav ja ise leida sinule teadaolevaid inimesi seadista ta alljärgnevalt.";
 "settings_discovery_terms_not_signed" = "Selleks, et sind võiks leida e-posti aadressi või telefoninumbri alusel, nõustu isikutuvastusserveri (%@) kasutustingimustega.";
@@ -1467,3 +1467,20 @@
 "find_your_contacts_title" = "Alusta kontaktide looendist";
 "contacts_address_book_permission_denied_alert_message" = "Palun luba seadistustest aadressiraamatu lugemine.";
 "contacts_address_book_permission_denied_alert_title" = "Kontaktid pole kasutusel";
+"space_home_show_all_rooms" = "Näita kõiki jututubasid";
+"room_event_action_forward" = "Edasta";
+"share_extension_send_now" = "Saada nüüd";
+"share_extension_low_quality_video_message" = "Parema kvaliteedi jaoks saada %@ vormingus või alljärgnevaga madalama kvaliteediga.";
+"share_extension_low_quality_video_title" = "Saadame video madalama kvalitediga";
+"settings_about" = "TEAVE MEIST";
+"poll_edit_form_add_option" = "Lisa valik";
+"poll_edit_form_option_number" = "Valik %d";
+"poll_edit_form_create_options" = "Koosta valikud";
+"poll_edit_form_input_placeholder" = "Kirjuta midagi";
+"poll_edit_form_question_or_topic" = "Küsimus või teema";
+"poll_edit_form_poll_question_or_topic" = "Küsitluse küsimus või teema";
+
+// Mark: - Polls
+
+"poll_edit_form_create_poll" = "Koosta üks küsitlus";
+"settings_discovery_accept_terms" = "Nõustu isikutuvastusserveri tingimustega";
diff --git a/Riot/Assets/fa.lproj/Vector.strings b/Riot/Assets/fa.lproj/Vector.strings
index 06e5d76d2..70464fddd 100644
--- a/Riot/Assets/fa.lproj/Vector.strings
+++ b/Riot/Assets/fa.lproj/Vector.strings
@@ -17,7 +17,7 @@
 "back" = "بازگشت";
 "store_full_description" = "المنت یک پیام‌رسان جدید و ابزاری برای همکاری افراد است که:\n\n۱. امکانات کنترلی لازم برای حفاظت از حریم خصوصی را در اختیار شما قرار می‌دهد.\n۲. امکان برقراری ارتباط با هر کسی را بر بستر شبکه‌ی ماتریکس و حتی فراتر از آن، امکان برقراری ارتباط با برنامه‌های دیگر نظیر Slack را در اختیار شما قرار می‌دهد.\n۳. شما را در برابر تبلیغات، کندوکاو داده‌هایتان، در پشتی و همچنین یک زیست‌بوم بسته و محصور محافظت می‌کند.\n۴. شما را از طریق رمزنگاری سرتاسری و همچنین امضاء متقابل برای تائيد هویت دیگران، امن می‌کند.\n\nالمنت یک پیام‌رسان و ابزار ارتباطی کاملا متفاوت است، چرا که از معماری غیرمتمرکز بهره برده و متن‌باز است.\n\nالمنت امکان استقرار محلی - یا انتخاب هر میزبان دلخواهی - را به شما داده و از این طریق حریم خصوصی، مالکیت و کنترل داده‌ها و گفتگوهایتان برای شما به ارمغان می‌آورد. همچنین دسترسی به یک شبکه‌ی باز را برای شما فراهم کرده، به طوری که مجبور نیستید فقط با کاربران المنت به گفتگو و صحبت بپردازید. در کنار همه‌ی این‌ها، بسیار امن است.\n\nپشتوانه‌ی قابلیت‌های بالا، استفاده از ماتریکس است - یک استاندارد برای ارتباطات غیرمحدود و متمرکز.\n\nالمنت به شما اختیار می‌دهد سرور گفتگو‌های خود را انتخاب کنید. در برنامه المنت، به طرق مختلف می‌توانید سرور مورد نظر خود را انتخاب کنید:\n\n۱. ساختن یک حساب‌کاربری رایگان بر روی سرور عمومی matrix.org\n۲. استقرار محلی و راه‌اندازی سرور بر روی سخت‌افزار خودتان و ایجاد حساب کاربری بر روی آن\n۳. ایجاد حساب کاربری بر روی یک سرور دلخواه از طریق عضویت در پلتفورم استقرار Element Matrix Services\n\nچرا المنت گزینه‌ی جذابی است؟\n\nمالک حقیقی داده‌های خود باشید: شما تصمیم بگیرید داده‌ها و پیام‌هایتان کجا ذخیره شوند. المنت مانند برخی اَبَرشرکت ها، در داده‌های شما کاوش نکرده و آن‌ها را در اختیار شخص ثالثی قرار نمی‌دهد.\n\nپیام‌رسانی و ارتباطات باز: شما می‌توانید با هر کسی بر بستر ماتریکس ارتباط بگیرید، فارغ از اینکه از کدام کلاینت ماتریکسی استفاده می‌کنند؛ حتی فراتر، شما می‌توانید افراد بر بستر سازوکارهای پیام‌رسانی دیگر نظیر Slack ،XMPP و یا IRC نیز ارتباط برقرار نمائید.\n\nفوق‌العاده امن: رمزنگاری سرتاسری واقعی (فقط افرادی که در حال گفتگو هستند امکان رمزگشایی پیام‌ها را دارند)، به همراه قابلیت امضاء متقابل برای تائید هویت دستگاه و هویت طرف‌های گفتگو.\n\nپکیج ارتباطی کامل: پیام‌رسانی، تماس‌های صوتی و تصویری، ارسال فایل، به اشتراک‌گذاری صفحه نمایش و یک طیف گسترده‌ای از یکپارچه‌سازی‌ها، بات‌ها و ابزارک‌ها. اتاق‌ها و فضاهای کاری مختلف بسازید و برای به سرانجام رسیدن امور، در ارتباط باشید.\n\nحاضر در همه جا: هرجا و هر زمان در دسترس بوده و پیام‌های خود را به صورت همگام‌سازی‌شده بر روی دستگاه‌های مختلف در اختیار داشته باشید.";
 // String for App Store
-"store_short_description" = "پیامرسان/تماس صوتی تصویری اینترنتی امن مبتنی بر بستر غیرمتمرکز";
+"store_short_description" = "پیام رسان/تماس صوتی تصویری اینترنتی امن مبتنی بر بستر غیرمتمرکز";
 "auth_missing_password" = "لطفا رمز عبور را وارد نمایید";
 "auth_invalid_phone" = "شماره تماس وارد شده بنظر اشتباه است";
 "auth_invalid_email" = "آدرس پست الکترونیکی وارد شده بنظر اشتباه است";
@@ -91,3 +91,646 @@
 // Titles
 "title_home" = "خانه";
 "store_promotional_text" = "نرم‌افزار چت و همکاری حافظ حریم خصوصی، در یک شبکه باز. غیر متمرکز، جهت واگذاری اختیار کنترل به شما. بدون کندوکاو اطلاعات ، بدون درپشتی و بدون دسترسی شخص ثالث.";
+"bug_report_send" = "ارسال";
+"done" = "انجام شد";
+"open" = "باز کردن";
+"contacts_address_book_matrix_users_toggle" = "فقط کاربران ماتریس";
+"directory_search_results_more_than" = ">%tu نتیجه برای %@ یافت شد";
+"directory_search_results" = "%tu نتیجه برای %@ یافت شد";
+"search_in_progress" = "در حال جست وجو";
+"search_no_result" = "نتیچه ای یافت نشد";
+"search_people_placeholder" = "جستجو بر اساس شناسه کاربری، نام یا آدرس ایمیل";
+"search_default_placeholder" = "جست و جو";
+"search_files" = "فایل ها";
+"search_people" = "افراد";
+"search_messages" = "پیام ها";
+
+// Search
+"search_rooms" = "اتاق های گفت و گو";
+
+// Groups tab
+"group_invite_section" = "دعوت ها";
+"rooms_empty_view_information" = "اتاق ها برای هر چت گروهی، خصوصی یا عمومی عالی هستند. برای پیدا کردن اتاق‌های موجود یا ایجاد اتاق‌های جدید، روی علامت + ضربه بزنید.";
+"rooms_empty_view_title" = "اتاق های گفت و گو";
+
+// Rooms tab
+"room_directory_no_public_room" = "هیچ اتاق گفت و گو عمومی موجود نیست";
+"people_empty_view_information" = "ایمن چت کنید. برای اضافه کردن افراد، روی علامت + ضربه بزنید.";
+"people_empty_view_title" = "افراد";
+"people_no_conversation" = "هیچ گفت و گویی موجود نیست";
+"people_conversation_section" = "گفت و گو ها";
+
+// People tab
+"people_invites_section" = "دعوت ها";
+"room_recents_unknown_room_error_message" = "اتاق گفت و گو مورد نظر یافت نشد. مطمئن شوید که این اتاق وجود دارد";
+"room_recents_join_room_prompt" = "شناسه اتاق گفت و گو یا نام مستعار آن را تایپ کنید";
+"room_recents_join_room_title" = "به یک اتاق گفت و گو بپیوندید";
+"room_recents_join_room" = "پیوستن به اتاق گفت و گو";
+"room_recents_create_empty_room" = "ایجاد اتاق گفت و گو";
+"room_recents_start_chat_with" = "شروع چت";
+"room_recents_suggested_rooms_section" = "اتاق های گفت و گوی پیشنهادی";
+"room_recents_invites_section" = "دعوت ها";
+"room_recents_server_notice_section" = "هشدارهای سیستم";
+"room_recents_no_conversation" = "اتاق گفت و گو موجود نیست";
+"room_recents_conversations_section" = "اتاق های گفت و گو(چت)";
+"room_recents_people_section" = "افراد";
+"room_recents_favourites_section" = "علاقه مندی ها";
+"room_creation_make_public_prompt_title" = "چت عمومی شود؟";
+"room_creation_invite_another_user" = "شناسه کاربری، نام یاآدرس ایمیل";
+"room_creation_wait_for_creation" = "یک اتاق گفت و گو از قبل در حال ایجاد است. لطفا صبر کنید.";
+"room_creation_make_private" = "شخصی سازی";
+"room_creation_keep_private" = "خصوصی نگه دارید";
+"room_creation_make_public_prompt_msg" = "آیا مطمئن هستید که می خواهید این چت را عمومی کنید؟ هر کسی می تواند پیام های شما را بخواند و به چت بپیوندد.";
+"room_creation_make_public" = "عمومی کردن";
+"room_creation_public_room" = "این چت عمومی است";
+"room_creation_private_room" = "این چت خصوصی است";
+"room_creation_privacy" = "حریم خصوصی";
+"room_creation_appearance_picture" = "تصویر چت (اختیاری)";
+"room_creation_appearance_name" = "نام";
+"room_creation_account" = "حساب کاربری";
+
+// Chat creation
+"room_creation_title" = "چت جدید";
+"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" = "ادامه دادن با";
+"auth_softlogout_clear_data_sign_out" = "خروج";
+"auth_softlogout_clear_data_sign_out_msg" = "آیا مطمئن هستید که می خواهید تمام داده های ذخیره شده در این دستگاه را پاک کنید؟ برای دسترسی به داده ها و پیام های حساب خود دوباره وارد شوید.";
+"auth_softlogout_clear_data_sign_out_title" = "آیا مطمئن هستید؟";
+"auth_softlogout_clear_data_button" = "تمام داده ها را پاک کنید";
+"auth_softlogout_clear_data_message_2" = "اگر استفاده از این دستگاه را تمام کرده‌اید یا می‌خواهید به حساب دیگری وارد شوید، آن را پاک کنید.";
+"auth_softlogout_clear_data_message_1" = "هشدار: اطلاعات شخصی شما (از جمله کلیدهای رمزگذاری) همچنان در این دستگاه ذخیره است.";
+"auth_softlogout_clear_data" = "پاک کردن اطلاعات شخصی";
+"auth_softlogout_recover_encryption_keys" = "برای بازیابی کلیدهای رمزگذاری ذخیره شده منحصراً در این دستگاه وارد سیستم شوید. برای خواندن همه پیام‌های امن خود در هر دستگاهی به آنها نیاز دارید.";
+"auth_softlogout_sign_in" = "ورود";
+"auth_softlogout_signed_out" = "شما از سیستم خارج شده اید";
+"auth_add_email_and_phone_warning" = "تا زمانی که api وجود داشته باشد ثبت نام همزمان با آدرس ایمیل و شماره تلفن همراه پشتیبانی نمی شود. فقط شماره تلفن همراه شما در نظر گرفته خواهد شد. می توانید ایمیل خود را در تنظیمات به نمایه خود اضافه کنید.";
+"auth_reset_password_success_message" = "رمز عبور شما بازنشانی شده است\n\nشما از تمام قسمت ها خارج شده اید و دیگر اعلان ها را دریافت نخواهید کرد. برای فعال کردن دوباره اعلان‌ها، مجدداً در هر دستگاه وارد سیستم شوید.";
+"auth_reset_password_error_unauthorized" = "آدرس ایمیل تأیید نشد: مطمئن شوید که روی لینک موجود در ایمیل کلیک کرده اید";
+"auth_reset_password_next_step_button" = "من آدرس ایمیلم را تایید کرده ام";
+"auth_reset_password_email_validation_message" = "یک ایمیل به %@ ارسال شده است. پس از دنبال کردن لینک موجود در آن، در قسمت پایین کلیک کنید.";
+"auth_reset_password_missing_password" = "رمز جدید را وارد نمایید.";
+"auth_reset_password_missing_email" = "آدرس ایمیل مرتبط با حساب کاربری شما باید وارد شود.";
+"auth_reset_password_message" = "برای بازنشانی رمز عبور، آدرس ایمیل مرتبط با حساب کاربری خود را وارد کنید:";
+"auth_msisdn_validation_error" = "تأیید شماره تلفن امکان پذیر نیست.";
+"auth_msisdn_validation_message" = "ما یک پیامک حاوی کد فعال سازی ارسال کرده ایم. لطفا این کد را در زیر وارد کنید.";
+"auth_msisdn_validation_title" = "تأیید در حال انتظار";
+"auth_email_validation_message" = "لطفا برای ادامه ثبت نام ایمیل خود را بررسی کنید";
+"auth_email_not_found" = "خطا در ارسال ایمیل: آدرس ایمیل مورد نظر یافت نشد";
+"auth_forgot_password" = "فراموشی رمز؟";
+"auth_username_in_use" = "این نام کاربری در حال حاضر موجود است";
+"auth_password_dont_match" = "رمز ورود همخوانی است";
+"auth_phone_in_use" = "این شماره تلفن همراه در حال حاضر موجود است";
+"auth_email_in_use" = "این آدرس ایمیل در حال حاضر موجود است";
+"auth_missing_email_or_phone" = "لطفا آدرس ایمیل یا شماره تلفن همراه خود را وارد کنید";
+"auth_missing_phone" = "لطفا شماره تلفن همراه خود را وارد کنید";
+"auth_add_phone_message_2" = "یک شماره تلفن تنظیم نمایید که بعداً برای افرادی که شما را می شناسند به صورت اختیاری قابل شناسایی باشد.";
+"auth_add_email_message_2" = "یک ایمیل برای بازیابی حساب کاربری خود تنظیم کنید که بعداً برای افرادی که شما را می شناسند به صورت اختیاری قابل شناسایی باشد.";
+"auth_missing_email" = "لطفا آدرس ایمیل خود را وارد کنید";
+"settings_other" = "سایر";
+"settings_phone_contacts" = "مخاطبین تلفن همراه";
+"settings_contacts" = "مخاطبین دستگاه";
+"settings_calls_settings" = "تماس ها";
+"settings_notifications" = "اعلان ها";
+"settings_links" = "لینک ها";
+"settings_sending_media" = "ارسال عکس ها و ویدیو ها";
+"settings_user_settings" = "تنظیمات کاربر";
+"settings_config_user_id" = "ورود به عنوان %@";
+"settings_clear_cache" = "پاک کردن حافظه پنهان";
+"settings_report_bug" = "گزارش اشکال";
+"settings_mark_all_as_read" = "همه پیام ها را به عنوان خوانده شده علامت گذاری کنید";
+"settings_config_no_build_info" = "بدون اطلاعات ساخت";
+"account_logout_all" = "خروج از تمامی حساب ها";
+
+// Settings
+"settings_title" = "تنظیمات";
+"room_preview_try_join_an_unknown_room_default" = "یک اتاق گفت و گو";
+"room_preview_try_join_an_unknown_room" = "شما در حال تلاش برای دسترسی به %@ هستید. آیا می خواهید در بحث شرکت کنید؟";
+"room_preview_unlinked_email_warning" = "این دعوت نامه به %@ ارسال شد که با این حساب مرتبط نیست. ممکن است بخواهید با حساب دیگری وارد شوید یا این ایمیل را به حساب خود اضافه کنید.";
+
+// Room Preview
+"room_preview_invitation_format" = "شما توسط %@ برای پیوستن به این اتاق دعوت شده اید";
+"room_title_one_member" = "۱ عضو";
+"room_title_members" = "٪@ اعضا";
+"room_title_invite_members" = "دعوت از اعضا";
+"room_title_one_active_member" = "%@/%@ عضو فعال";
+"room_title_multiple_active_members" = "%@/%@ اعضای فعال";
+
+// Room Title
+"room_title_new_room" = "اتاق گفت و گو جدید";
+"unknown_devices_verify" = "تایید…";
+"unknown_devices_answer_anyway" = "به هر حال پاسخ دهید";
+"unknown_devices_call_anyway" = "به هر حال تماس بگیرید";
+"unknown_devices_send_anyway" = "به هر حال ارسال کنید";
+"room_multiple_typing_notification" = "٪@ و دیگران";
+"external_link_confirmation_message" = "پیوند %@ شما را به سایت دیگری انتقال می دهد: %@\n\nآیا مطمئن هستید که میخواهید ادامه دهید؟";
+"external_link_confirmation_title" = "این لینک را دوبار بررسی کنید";
+"media_type_accessibility_sticker" = "استیکر";
+"media_type_accessibility_file" = "فایل";
+"media_type_accessibility_location" = "موقعیت";
+"media_type_accessibility_video" = "ویدیو";
+"media_type_accessibility_audio" = "شنیداری";
+"media_type_accessibility_image" = "تصویر";
+"room_no_privileges_to_create_group_call" = "برای شروع تماس باید ادمین یا ناظر باشید.";
+"room_join_group_call" = "پیوستن";
+"room_open_dialpad" = "صفحه شماره گیری";
+"room_place_voice_call" = "تماس صوتی";
+"room_accessibility_hangup" = "پایان دادن به تماس";
+"room_accessibility_video_call" = "تماس تصویری";
+"room_accessibility_call" = "تماس";
+"room_accessibility_upload" = "بارگذاری";
+"room_accessibility_search" = "جستجو";
+"room_message_edits_history_title" = "ویرایش های پیام";
+"room_resource_usage_limit_reached_message_2" = "برخی از کاربران نمی توانند وارد سیستم شوند.";
+"room_resource_limit_exceeded_message_contact_3" = " برای ادامه استفاده از این سرویس";
+"room_resource_limit_exceeded_message_contact_2_link" = "با سرپرست سرویس خود تماس بگیرید";
+"room_resource_limit_exceeded_message_contact_1" = " لطفا ";
+"room_predecessor_link" = "برای دیدن پیام‌های قدیمی‌تر به اینجاضربه بزنید.";
+"room_predecessor_information" = "این اتاق ادامه گفتگوی دیگری است.";
+"room_replacement_link" = "گفتگو در اینجا ادامه دارد.";
+"room_replacement_information" = "این اتاق جایگزین شده است و دیگر فعال نیست.";
+"room_action_reply" = "پاسخ";
+"room_action_send_file" = "ارسال فایل";
+"room_action_send_sticker" = "ارسال استیکر";
+"room_action_camera" = "گرفتن عکس یا فیلم";
+"room_action_send_photo_or_video" = "ارسال عکس یا فیلم";
+"room_event_failed_to_send" = "ارسال نشد";
+"room_event_action_reaction_show_less" = "نمایش کمتر";
+"room_event_action_reaction_show_all" = "نمایش همه";
+"room_event_action_edit" = "ویرایش";
+"room_event_action_reply" = "پاسخ";
+"room_event_action_cancel_send" = "لغو ارسال";
+"room_event_action_cancel_download" = "لغو دانلود";
+"room_event_action_view_encryption" = "اطلاعات رمزگذاری";
+"room_event_action_delete_confirmation_message" = "آیا مطمئن هستید که می خواهید این پیام ارسال نشده را حذف کنید؟";
+"room_event_action_delete_confirmation_title" = "حذف پیام های ارسال نشده";
+"room_event_action_delete" = "پاک کردن";
+"room_event_action_resend" = "ارسال مجدد";
+"room_event_action_save" = "ذخیره";
+"room_event_action_report_prompt_ignore_user" = "آیا می خواهید همه پیام های این کاربر را پنهان کنید؟";
+"room_event_action_ban_prompt_reason" = "دلیل ممنوعیت این کاربر";
+"room_event_action_kick_prompt_reason" = "دلیل حذف این کاربر";
+"room_event_action_report_prompt_reason" = "دلیل گزارش این محتوا";
+"room_event_action_report" = "گزارش محتوا";
+"room_event_action_forward" = "فوروارد کردن";
+"room_event_action_share" = "اشتراک گذاری";
+"room_event_action_more" = "بیشتر";
+"room_event_action_redact" = "حذف";
+"room_event_action_quote" = "نقل قول";
+"room_event_action_copy" = "کپی کردن";
+"room_delete_unsent_messages" = "حذف پیام های ارسال نشده";
+"room_resend_unsent_messages" = "ارسال مجدد پیام های ارسال نشده";
+"room_prompt_cancel" = "کنسل کردن همه";
+"room_prompt_resend" = "ارسال مجدد همه";
+"room_conference_call_no_power" = "برای مدیریت تماس کنفرانسی در این اتاق به مجوز نیاز دارید";
+"room_ongoing_conference_call_close" = "بستن";
+"room_ongoing_conference_call" = "به عنوان %@ یا %@ به تماس کنفرانسی بپیوندید.";
+"room_unsent_messages_cancel_message" = "آیا مطمئن هستید که می خواهید همه پیام های ارسال نشده در این اتاق را حذف کنید؟";
+"room_unsent_messages_cancel_title" = "حذف پیام های ارسال نشده";
+"room_unsent_messages_notification" = "پیام ها ارسال نشدند.";
+"room_offline_notification" = "اتصال به سرور قطع شده است.";
+"room_message_reply_to_short_placeholder" = "ارسال پاسخ…";
+"room_message_short_placeholder" = "ارسال پیام…";
+"encrypted_room_message_reply_to_placeholder" = "ارسال پاسخ رمزگذاری شده…";
+"encrypted_room_message_placeholder" = "ارسال پیام رمزگذاری شده…";
+"room_do_not_have_permission_to_post" = "شما اجازه ندارید در این اتاق پست ارسال کنید";
+"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_accessiblity_scroll_to_bottom" = "به پایین اسکرول کنید";
+"room_jump_to_first_unread" = "گریز به پیام های خوانده نشده";
+"room_participants_security_loading" = "درحال بارگذاری…";
+"room_participants_action_security_status_loading" = "درحال بارگذاری…";
+
+// Chat
+"room_slide_to_end_group_call" = "برای پایان دادن به تماس صفحه را بکشید";
+"room_member_power_level_short_admin" = "ادمین";
+"room_participants_security_information_room_encrypted_for_dm" = "پیام‌های موجود در این اتاق رمزگذاری شده‌اند.\n\nپیام‌های شما با قفل محافظت می‌شوند و فقط شما و گیرنده کلیدهای باز کردن قفل آن‌ها را دارید.";
+"room_participants_security_information_room_encrypted" = "پیام‌های موجود در این اتاق رمزگذاری شده‌اند.\n\nپیام‌های شما با قفل محافظت می‌شوند و فقط شما و گیرنده کلیدهای باز کردن قفل آن‌ها را دارید.";
+"room_participants_security_information_room_not_encrypted_for_dm" = "پیام‌های اینجا رمزگذاری‌شده نیستند.";
+"room_participants_security_information_room_not_encrypted" = "پیام‌های موجود در این اتاق رمزگذاری‌شده نیستند.";
+"room_participants_action_security_status_warning" = "هشدار";
+"room_participants_action_security_status_complete_security" = "امنیت کامل";
+"room_participants_action_security_status_verified" = "تایید شد";
+"room_participants_action_security_status_verify" = "تایید";
+"room_participants_action_mention" = "اشاره";
+"room_participants_action_start_video_call" = "شروع تماس تصویری";
+"room_participants_action_start_voice_call" = "شروع تماس صوتی";
+"room_participants_action_start_new_chat" = "شروع چت جدید";
+"room_participants_action_set_admin" = "ایجاد ادمین ( مدیر)";
+"room_participants_action_set_default_power_level" = "بازنشانی به کاربر عادی";
+"room_participants_action_ignore" = "عدم نمایش پیام های این کاربر";
+"room_participants_action_unignore" = "نمایش همه پیام های این کاربر";
+"room_participants_action_unban" = "لغو ممنوعیت";
+"room_participants_action_ban" = "ممنوعیت ورود به این اتاق";
+"room_participants_action_remove" = "از این اتاق حذف کنید";
+"room_participants_action_leave" = "این اتاق را ترک کنید";
+"room_participants_action_invite" = "دعوت";
+"room_participants_action_section_security" = "امنیت";
+"room_participants_action_section_other" = "گزینه ها";
+"room_participants_action_section_direct_chats" = "چت های مستقیم";
+"room_participants_action_section_admin_tools" = "ابزارهای مدیریت";
+"room_participants_ago" = "گذشته";
+"room_participants_now" = "اکنون";
+"room_participants_unknown" = "ناشناس";
+"room_participants_offline" = "آفلاین";
+"room_participants_online" = "آنلاین";
+"room_participants_invited_section" = "دعوت شده ها";
+"room_participants_invite_malformed_id" = "شناسه ناقص. باید یک آدرس ایمیل یا یک شناسه ماتریکس مانند '@localpart:domain' باشد";
+"room_participants_invite_malformed_id_title" = "خطای دعوت";
+"room_participants_invite_another_user" = "جستجو / دعوت با شناسه کاربری، نام یاآدرس ایمیل";
+"room_participants_filter_room_members_for_dm" = "فیلتر کردن اعضا";
+"room_participants_filter_room_members" = "اعضای اتاق را فیلتر کنید";
+"room_participants_invite_prompt_msg" = "آیا مطمئنید که می‌خواهید %@ را به این چت دعوت کنید؟";
+"room_participants_invite_prompt_title" = "تایید";
+"room_participants_remove_third_party_invite_prompt_msg" = "آیا مطمئنید که می خواهید این دعوت را لغو کنید؟";
+"room_participants_remove_prompt_msg" = "آیا مطمئن هستید که می خواهید %@ را از این چت حذف کنید؟";
+"room_participants_remove_prompt_title" = "تایید";
+"room_participants_leave_prompt_msg_for_dm" = "آیا مطمئن هستید که می خواهید اتاق را ترک کنید؟";
+"room_participants_leave_prompt_msg" = "آیا مطمئن هستید که می خواهید اتاق را ترک کنید؟";
+"room_participants_leave_prompt_title_for_dm" = "ترک کردن";
+"room_participants_leave_prompt_title" = "ترک کردن اتاق گفت و گو";
+"room_participants_multi_participants" = "%d شرکت کننده ها";
+"room_participants_one_participant" = "۱شرکت کننده";
+"room_participants_add_participant" = "افزودن شرکت کننده";
+
+// Chat participants
+"room_participants_title" = "شركت كنندگان";
+"find_your_contacts_footer" = "این گزینه را می توان در هر زمان از قسمت تنظیمات غیرفعال کرد.";
+"find_your_contacts_button_title" = "مخاطبین خود را پیدا کنید";
+"find_your_contacts_message" = "به %@ اجازه دهید مخاطبین شما را نشان دهد تا بتوانید سریعاً با کسانی که می شناسید چت کنید.";
+"find_your_contacts_title" = "با فهرست کردن مخاطبین خود شروع کنید";
+"contacts_address_book_permission_denied_alert_message" = "برای فعال کردن مخاطبین، به تنظیمات دستگاه خود بروید.";
+"contacts_address_book_permission_denied_alert_title" = "لیست مخاطبین غیرفعال شد";
+"directory_cell_description" = "%tu اتاق ها";
+"auth_add_email_phone_message_2" = "یک ایمیل برای بازیابی حساب کاربری خود تنظیم کنید. از این ایمیل یا شماره تلفن استفاده کنید تا به صورت اختیاری توسط افرادی که شما را می شناسند قابل شناسایی باشید.";
+"no_voip" = "%@ در حال تماس با شما است اما %@ هنوز از تماس ها پشتیبانی نمی کند.\nمی توانید این اعلان را نادیده بگیرید و به تماس از دستگاه دیگری پاسخ دهید یا می توانید آن را رد کنید.";
+
+// No VoIP support
+"no_voip_title" = "تماس ورودی";
+"call_actions_unhold" = "ادامه";
+"call_no_stun_server_error_use_fallback_button" = "سعی کنید از %@ استفاده کنید";
+"call_no_stun_server_error_message_2" = "از طرف دیگر، می‌توانید سعی کنید از سرور عمومی در %@ استفاده کنید، اما قابل اعتماد نخواهد بود و آدرس IP شما را با آن سرور به اشتراک می‌گذارد. شما همچنین می توانید این را در تنظیمات مدیریت کنید";
+"call_no_stun_server_error_title" = "تماس به دلیل پیکربندی اشتباه سرور انجام نشد";
+"call_jitsi_error" = "پیوستن به تماس کنفرانس ناموفق بود.";
+"call_already_displayed" = "در حال حاضر یک تماس در حال انجام است.";
+"call_incoming_video" = "تماس تصویری ورودی…";
+"call_incoming_voice" = "تماس ورودی…";
+"call_incoming_video_prompt" = "تماس تصویری ورودی از %@";
+
+// Call
+"call_incoming_voice_prompt" = "تماس صوتی ورودی از %@";
+"room_does_not_exist" = "٪@ وجود ندارد";
+"photo_library_access_not_granted" = "%@ اجازه دسترسی به عکس های دستگاه شما را ندارد، لطفاً تنظیمات حریم خصوصی را تغییر دهید";
+"camera_unavailable" = "دوربین در دستگاه شما قابل دسترسی نیست";
+"camera_access_not_granted" = "%@ اجازه استفاده از دوربین را ندارد، لطفاً تنظیمات حریم خصوصی را تغییر دهید";
+"do_not_ask_again" = "دوباره نپرس";
+"bug_report_prompt" = "برنامه آخرین بار از کار افتاده بود. آیا می خواهید یک گزارش خرابی ارسال کنید؟";
+"public_room_section_title" = "اتاق‌های عمومی (در %@):";
+"homeserver_connection_lost" = "عدم اتصال به سرور خانگی.";
+"network_offline_prompt" = "به نظر می رسد اتصال اینترنت آفلاین است.";
+"yesterday" = "دیروز";
+"today" = "امروز";
+"you" = "شما";
+
+// Others
+"or" = "یا";
+"event_formatter_jitsi_widget_removed_by_you" = "کنفرانس VoIP را حذف کردید";
+"event_formatter_jitsi_widget_added_by_you" = "شما کنفرانس VoIP را اضافه کردید";
+"event_formatter_widget_removed_by_you" = "ویجت را حذف کردید:@%";
+
+// Events formatter with you
+"event_formatter_widget_added_by_you" = "ویجت را اضافه کردید:@ %";
+"event_formatter_group_call_incoming" = "@٪ در@ ٪";
+"event_formatter_group_call_leave" = "ترک";
+"event_formatter_group_call_join" = "پیوستن";
+"event_formatter_group_call" = "تماس گروهی";
+"event_formatter_call_end_call" = "پایان تماس";
+"event_formatter_call_retry" = "تلاش مجدد";
+"event_formatter_call_answer" = "پاسخ";
+"event_formatter_call_decline" = "رد تماس";
+"event_formatter_call_back" = "تماس";
+"event_formatter_call_connection_failed" = "ارتباط ناموفق بود";
+"event_formatter_call_missed_video" = "تماس ویدیویی از دست رفته";
+"event_formatter_call_missed_voice" = "تماس صوتی از دست رفته";
+"event_formatter_call_you_declined" = "تماس رد شد";
+"event_formatter_call_active_video" = "فعال کردن تماس تصویری";
+"event_formatter_call_active_voice" = "فعال کردن تماس صوتی";
+"event_formatter_call_incoming_video" = "تماس تصویری ورودی";
+"event_formatter_call_incoming_voice" = "تماس صوتی ورودی";
+"event_formatter_call_has_ended_with_time" = "تماس تلفنی پایان یافت.%@";
+"event_formatter_call_has_ended" = "تماس تلفنی پایان یافت";
+"event_formatter_call_ringing" = "در حال زنگ خوردن…";
+"event_formatter_call_connecting" = "در حال برقراری ارتباط…";
+"event_formatter_message_edited_mention" = "(ویرایش شده)";
+"event_formatter_rerequest_keys_part2" = " از سشن های دیگر شما.";
+"event_formatter_rerequest_keys_part1_link" = "درخواست مجدد کلیدهای رمزگذاری";
+"event_formatter_jitsi_widget_removed" = "کنفرانس VoIP توسط %@ حذف شد";
+"event_formatter_jitsi_widget_added" = "کنفرانس VoIP توسط %@ اضافه شد";
+"event_formatter_widget_removed" = "%@ ویجت توسط %@ حذف شد";
+"event_formatter_widget_added" = "%@ ویجت اضافه شده توسط %@";
+
+// Events formatter
+"event_formatter_member_updates" = "%tu تغییر عضویت";
+"directory_server_placeholder" = "matrix.org";
+"directory_server_type_homeserver" = "برای فهرست کردن اتاق های عمومی یک سرور خانگی را تایپ کنید";
+"directory_server_all_rooms" = "همه اتاق ها در سرور %@";
+
+// Directory
+"directory_title" = "فهرست راهنما";
+"image_picker_action_library" = "انتخاب از کتابخانه";
+
+// Image picker
+"image_picker_action_camera" = "گرفتن عکس";
+"media_picker_select" = "انتخاب";
+"media_picker_library" = "کتابخانه";
+
+// Media picker
+"media_picker_title" = "کتابخانه ی رسانه";
+"receipt_status_read" = "خواندن: ";
+
+// Read Receipts
+"read_receipts_list" = "خواندن لیست رسیدها";
+
+// Group rooms
+"group_rooms_filter_rooms" = "فیلتر کردن اتاق های انجمن";
+"group_participants_invited_section" = "دعوت شده";
+"group_participants_invite_malformed_id_title" = "خطای دعوت";
+"group_participants_invite_another_user" = "جستجو / دعوت با شناسه کاربری یا نام";
+"group_participants_filter_members" = "اعضای انجمن را فیلتر کنید";
+"group_participants_invite_prompt_msg" = "آیا مطمئنید که می خواهید %@ را به این گروه دعوت کنید؟";
+"group_participants_invite_prompt_title" = "تایید";
+"group_participants_remove_prompt_msg" = "آیا مطمئنید که می خواهید %@ را از این گروه حذف کنید؟";
+"room_notifs_settings_encrypted_room_notice" = "لطفاً توجه داشته باشید که اشاره‌ها و اعلان‌های کلید واژه در اتاق‌های رمزگذاری‌شده روی موبایل در دسترس نیستند.";
+"group_participants_leave_prompt_title" = "ترک گروه";
+"group_participants_remove_prompt_title" = "تایید";
+"group_participants_leave_prompt_msg" = "آیا مطمئن هستید که می خواهید گروه را ترک کنید؟";
+
+// Group participants
+"group_participants_add_participant" = "افزودن شرکت کننده(عضو)";
+"group_invitation_format" = "%@ از شما دعوت کرده است که به این انجمن بپیوندید";
+"group_home_multi_rooms_format" = "%tu اتاق ها";
+"group_home_one_room_format" = "۱ اتاق";
+"group_home_multi_members_format" = "%tu اعضا";
+
+// Group Home
+"group_home_one_member_format" = "۱ عضو";
+"group_details_rooms" = "اتاق ها";
+"group_details_people" = "افراد";
+"group_details_home" = "خانه";
+
+// Group Details
+"group_details_title" = "جزئیات انجمن";
+"room_notifs_settings_account_settings" = "تنظیمات حساب";
+"room_notifs_settings_manage_notifications" = "می توانید اعلان ها را در %@ مدیریت کنید";
+"room_notifs_settings_cancel_action" = "لغو";
+"room_notifs_settings_done_action" = "انجام شد";
+"room_notifs_settings_none" = "هیچ کدام";
+"room_notifs_settings_mentions_and_keywords" = "فقط ذکر و کلمات کلیدی";
+"room_notifs_settings_all_messages" = "تمام پیام ها";
+
+// 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" = "کپی کردن شناسه اتاق";
+"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_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_room_directory_visibility" = "مشاهده فهرست راهنمای اتاق به روز رسانی نشد";
+"room_details_fail_to_update_history_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" = "فقط در سشن های تأیید شده رمزگذاری شود";
+"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" = "شناسه:";
+"room_details_advanced_room_id" = "شناسه اتاق:";
+"room_details_advanced_section" = "پیشرفته";
+"room_details_banned_users_section" = "کاربران ممنوع";
+"room_details_flair_invalid_id_prompt_msg" = "%@ یک شناسه معتبر برای یک انجمن نیست";
+"room_details_flair_invalid_id_prompt_title" = "قالب نامعتبر";
+"room_details_new_flair_placeholder" = "افزودن شناسه انجمن جدید (به عنوان مثال +foo%@)";
+"room_details_addresses_disable_main_address_prompt_msg" = "هیچ آدرس اصلی مشخصی نخواهید داشت. آدرس اصلی پیش‌فرض برای این اتاق به‌طور تصادفی انتخاب می‌شود";
+"room_details_addresses_disable_main_address_prompt_title" = "هشدار آدرس اصلی";
+"room_details_addresses_invalid_address_prompt_msg" = "%@ قالب معتبری برای نام مستعار نیست";
+"room_details_addresses_invalid_address_prompt_title" = "قالب نامعتبر است";
+"room_details_new_address_placeholder" = "افزودن آدرس جدید( به طور مثال %@ #foo)";
+"room_details_new_address" = "افزودن آدرس جدید";
+"room_details_no_local_addresses_for_dm" = "این آدرس محلی ندارد";
+"room_details_no_local_addresses" = "این اتاق هیچ آدرس محلی ندارد";
+"room_details_addresses_section" = "آدرس ها";
+"room_details_history_section_prompt_msg" = "تغییرات مربوط به افرادی که می توانند تاریخچه را بخوانند فقط برای پیام های بعدی در این اتاق اعمال می شود. نمایان شدن تاریخچه موجود بدون تغییر خواهد بود.";
+"room_details_history_section_prompt_title" = "هشدار حفظ حریم خصوصی";
+"room_details_history_section_members_only_since_joined" = "فقط اعضا (از زمانی که عضو شدند)";
+"room_details_history_section_members_only_since_invited" = "فقط اعضا (از زمانی که دعوت شده اند)";
+"room_details_history_section_members_only" = "فقط اعضا (از زمان انتخاب این گزینه)";
+"room_details_history_section_anyone" = "همه";
+"room_details_history_section" = "چه کسی می تواند تاریخچه را بخواند؟";
+"room_details_access_section_directory_toggle_for_dm" = "لیست کردن در فهرست اتاق";
+"room_details_access_section_directory_toggle" = "این اتاق را در فهرست راهنمای اتاق لیست کنید";
+"room_details_access_section_no_address_warning" = "برای لینک شدن به یک اتاق، باید یک آدرس داشته باشد";
+"room_details_access_section_anyone_for_dm" = "هر کسی که لینک را می داند، از جمله مهمانان";
+"room_details_access_section_anyone" = "هر کسی که لینک اتاق را می داند، از جمله مهمانان";
+"room_details_access_section_anyone_apart_from_guest_for_dm" = "هر کسی که لینک را می داند، به غیر از مهمانان";
+"room_details_access_section_anyone_apart_from_guest" = "هر کسی که لینک اتاق را می داند، به غیر از مهمانان";
+"room_details_access_section_invited_only" = "فقط افرادی که دعوت شده اند";
+"room_details_access_section_for_dm" = "چه کسی می تواند به این دسترسی داشته باشد؟";
+"room_details_access_section" = "چه کسی می تواند به این اتاق دسترسی داشته باشد؟";
+"room_details_direct_chat" = "چت مستقیم";
+"room_details_mute_notifs" = "بی صدا کردن اعلان ها";
+"room_details_notifs" = "اعلان ها";
+"room_details_low_priority_tag" = "اولویت کم";
+"room_details_favourite_tag" = "علاقه مندی";
+"room_details_topic" = "موضوع";
+"room_details_room_name_for_dm" = "نام";
+"room_details_room_name" = "نام اتاق";
+"room_details_photo_for_dm" = "عکس";
+"room_details_photo" = "عکس اتاق";
+"room_details_settings" = "تنظیمات";
+"room_details_search" = "جستجو اتاق";
+"room_details_files" = "بارگذاری شده ها";
+"room_details_people" = "اعضا";
+"room_details_title_for_dm" = "جزییات";
+"identity_server_settings_alert_disconnect_still_sharing_3pid_button" = "به هر حال قطع کن";
+"identity_server_settings_alert_disconnect_button" = "قطع کردن";
+"identity_server_settings_disconnect" = "قطع کردن";
+"identity_server_settings_change" = "تغییر دادن";
+"identity_server_settings_add" = "افزودن";
+"identity_server_settings_description" = "شما در حال حاضر از %@ استفاده می‌کنید تا مخاطبینی را که می‌شناسید را پیدا کنید و برای آن ها قابل شناسایی باشید.";
+
+// AuthenticatedSessionViewControllerFactory
+"authenticated_session_flow_not_supported" = "این برنامه از مکانیسم احراز هویت در سرور خانه شما پشتیبانی نمی کند.";
+"manage_session_sign_out" = "خروج از این سشن";
+"manage_session_not_trusted" = "قابل اعتماد نیست";
+"manage_session_trusted" = "مورد اعتماد شما است";
+"manage_session_name" = "نام سشن";
+"manage_session_info" = "اطلاعات سشن";
+
+// Manage session
+"manage_session_title" = "مدیریت سشن";
+"security_settings_user_password_description" = "هویت خود را با وارد کردن رمز عبور حساب خود تأیید کنید";
+"security_settings_complete_security_alert_message" = "ابتدا باید امنیت را در سشن فعلی خود کامل کنید.";
+"security_settings_complete_security_alert_title" = "امنیت کامل";
+"security_settings_blacklist_unverified_devices_description" = "تمام سشن های کاربران را تأیید کنید تا آنها به عنوان مورد اعتماد علامت گذاری شوند و برای آنها پیام ارسال کنید.";
+"security_settings_blacklist_unverified_devices" = "هرگز به سشن های غیرقابل اعتماد پیام ارسال نشود";
+"security_settings_cryptography" = "رمزنگاری";
+"security_settings_crosssigning_complete_security" = "امنیت کامل";
+"security_settings_crosssigning_reset" = "بازنشانی کردن";
+"security_settings_crosssigning_bootstrap" = "راه اندازی کردن";
+"security_settings_backup" = "پشتیبانی پیام";
+"security_settings_secure_backup_delete" = "حذف نسخه پشتیبان";
+"security_settings_secure_backup_restore" = "بازیابی ازنسخه پشتیبان";
+"security_settings_secure_backup_reset" = "بازنشانی کردن";
+"security_settings_secure_backup_setup" = "راه اندازی کردن";
+"security_settings_secure_backup_info_valid" = "این سشن از کلیدهای شما نسخه پشتیبان تهیه می کند.";
+"security_settings_secure_backup_info_checking" = "چک کردن…";
+"security_settings_secure_backup_description" = "در صورت از دست دادن دسترسی به سشن های خود، از کلیدهای رمزگذاری خود بوسیله داده های حساب خود نسخه پشتیبان تهیه کنید. کلیدهای شما با یک کلید امنیتی منحصر به فرد ایمن می شوند.";
+"security_settings_secure_backup" = "نسخه پشتیبان ایمن";
+"security_settings_crypto_sessions_description_2" = "اگر ورود به سیستم را نمی شناسید، رمز عبور خود را تغییر دهید و نسخه پشتیبان امن را بازنشانی کنید.";
+"security_settings_crypto_sessions_loading" = "در حال بار گذاری سشن ها…";
+"security_settings_crypto_sessions" = "سشن های من";
+
+// Security settings
+"security_settings_title" = "امنیت";
+"settings_discovery_three_pid_details_enter_sms_code_action" = "کد فعال سازی پیامکی را وارد کنید";
+"settings_discovery_three_pid_details_cancel_email_validation_action" = "لغو اعتبارسنجی ایمیل";
+"settings_discovery_three_pid_details_revoke_action" = "لغو";
+"settings_discovery_three_pid_details_share_action" = "اشتراک گذاری";
+"settings_discovery_three_pid_details_information_phone_number" = "تنظیمات برگزیده برای این آدرس شماره تلفن ، که سایر کاربران می توانند از آن برای پیدا کردن و دعوت شما به اتاق استفاده کنند را مدیریت کنید. شماره تلقن ها را در حساب‌ها اضافه یا حذف کنید.";
+"settings_discovery_three_pid_details_title_phone_number" = "مدیریت شماره تلفن";
+"settings_discovery_three_pid_details_information_email" = "تنظیمات برگزیده برای این آدرس ایمیل ، که سایر کاربران می توانند از آن برای پیدا کردن و دعوت شما به اتاق استفاده کنند را مدیریت کنید. آدرس‌های ایمیل را در حساب‌ها اضافه یا حذف کنید.";
+"settings_discovery_three_pid_details_title_email" = "مدیریت ایمیل";
+"settings_discovery_error_message" = "خطایی رخ داده است. لطفا دوباره امتحان کنید.";
+"settings_discovery_three_pids_management_information_part3" = ".";
+"settings_discovery_three_pids_management_information_part2" = "تنظیمات کاربر";
+"settings_discovery_three_pids_management_information_part1" = "آدرس‌های ایمیل یا شماره تلفن‌هایی را که کاربران دیگر می‌توانند برای پیداکردن شما و دعوت شما به اتاق‌ها استفاده کنند، مدیریت کنید. آدرس ایمیل یا شماره تلفن را از این لیست اضافه یا حذف کنید ";
+"settings_devices_description" = "نام عمومی سشن برای افرادی که با آنها ارتباط برقرار می کنید قابل مشاهده است";
+"settings_key_backup_delete_confirmation_prompt_msg" = "آیامطمئن هستید؟ اگر از کلیدهای شما به درستی پشتیبان گیری نشود، پیام های رمزگذاری شده خود را از دست خواهید داد.";
+"settings_key_backup_delete_confirmation_prompt_title" = "حذف نسخه پشتیبان";
+"settings_key_backup_button_connect" = "این سشن را به کلید پشتیبان متصل کنید";
+"settings_key_backup_button_delete" = "حذف پشتیبان";
+"settings_key_backup_button_restore" = "بازیابی از نسخه پشتیبان";
+"settings_key_backup_button_create" = "استفاده ازکلید نسخه پشتیبان را شروع کنید";
+"settings_key_backup_info_progress_done" = "از همه کلیدها نسخه پشتیبان تهیه شد";
+"settings_key_backup_info_progress" = "در حال پشتیبان گیری از کلیدهای %@…";
+"settings_key_backup_info_not_valid" = "این سشن از کلیدهای شما نسخه پشتیبان تهیه نمی کند، اما شما یک نسخه پشتیبان موجود دارید که می توانید آن را بازیابی کنید و به آن اضافه کنید.";
+"settings_key_backup_info_valid" = "این سشن از کلیدهای شما نسخه پشتیبان تهیه می کند.";
+"settings_key_backup_info_algorithm" = "الگوریتم: %@";
+"settings_key_backup_info_version" = "نسخه پشتیبان کلید: %@";
+"settings_key_backup_info_signout_warning" = "قبل از خروج از سیستم، برای جلوگیری از گم شدن از کلیدهای خود نسخه پشتیبان تهیه کنید .";
+"settings_key_backup_info_none" = "از کلیدهای شما در این سشن پشتیبان‌گیری نمی‌شود.";
+"settings_key_backup_info_checking" = "چک کردن…";
+"settings_key_backup_info" = "پیام های رمزگذاری شده با رمزگذاری سراسری ایمن می شوند. فقط شما و گیرنده(ها) کلید خواندن این پیام ها را دارید.";
+"settings_deactivate_my_account" = "حساب من را غیر فعال کنید";
+"settings_crypto_blacklist_unverified_devices" = "فقط در سشن تأیید شده رمزگذاری کنید";
+"settings_crypto_device_key" = "\nکلید سشن\n";
+"settings_crypto_device_id" = "\nآیدی سشن ";
+"settings_add_3pid_password_message" = "برای ادامه، لطفا رمز عبور خود را وارد کنید";
+"settings_add_3pid_password_title_msidsn" = "شماره تلفن را اضافه کنید";
+"settings_add_3pid_password_title_email" = "آدرس ایمیل را اضافه کنید";
+"settings_password_updated" = "رمز عبور شما به روز شده است";
+"settings_fail_to_update_password" = "رمز عبور به روز نشد";
+"settings_confirm_password" = "تایید رمز";
+"settings_new_password" = "رمز جدید";
+"settings_old_password" = "رمز قدیمی";
+"settings_third_party_notices" = "اعلامیه های شخص ثالث";
+"settings_privacy_policy" = "سیاست حفظ حریم خصوصی";
+"settings_term_conditions" = "شرایط و ضوابط";
+"settings_copyright" = "کپی رایت";
+"settings_version" = "نسخه %@";
+"settings_labs_voice_messages" = "پیام صوتی";
+"settings_labs_message_reaction" = "با ایموجی به پیام ها واکنش نشان دهید";
+"settings_labs_create_conference_with_jitsi" = "با jitsi تماس های کنفرانسی ایجاد کنید";
+"settings_labs_e2e_encryption_prompt_message" = "برای تکمیل تنظیمات رمزگذاری، باید دوباره وارد شوید.";
+"settings_contacts_enable_sync_description" = "این گزینه از سرور هویت شما برای اتصال شما به مخاطبینتان استفاده می کند و به آنها کمک می کند شما را پیدا کنند.";
+"settings_contacts_phonebook_country" = "کشور دفترچه تلفن";
+"settings_contacts_enable_sync" = "مخاطبین خود را پیدا کنید";
+"settings_unignore_user" = "نمایش همه پیام‌های %@؟";
+"settings_show_url_previews_description" = "پیش‌نمایش‌ها فقط در اتاق‌های رمزگذاری نشده نشان داده می‌شوند.";
+"settings_show_url_previews" = "نمایش پیش نمایش وب سایت";
+"settings_ui_theme_picker_message_match_system_theme" = "\"حالت خودکار\" با زمینه سیستم دستگاه شما مطابقت دارد";
+"settings_ui_theme_picker_message_invert_colours" = "\"حالت خودکار\" از تنظیمات \"Invert Colors\" دستگاه شما استفاده می کند";
+"settings_ui_theme_picker_title" = "انتخاب زمینه";
+"settings_ui_theme" = "زمینه";
+"settings_ui_theme_black" = "سیاه";
+"settings_ui_theme_dark" = "تیره";
+"settings_ui_theme_light" = "روشن";
+"settings_ui_theme_auto" = "خودکار";
+"settings_ui_language" = "زبان";
+"settings_calls_stun_server_fallback_button" = "به سرور کمک تماس مجدد اجازه دهید";
+"settings_callkit_info" = "تماس های دریافتی را در صفحه قفل خود دریافت کنید. تماس های %@ خود را در تاریخچه تماس های سیستم مشاهده کنید. اگر iCloud فعال باشد، این سابقه تماس با اپل به اشتراک گذاشته خواهد شد.";
+"settings_mentions_and_keywords_encryption_notice" = "در اتاق‌های رمزگذاری‌شده در تلفن همراه، اعلان‌هایی برای ذکر و کلمات کلیدی دریافت نخواهید کرد.";
+"settings_new_keyword" = "اضافه کردن کلمات کلیدی";
+"settings_your_keywords" = "کلمات کلیدی شما";
+"settings_room_upgrades" = "ارتقاء اتاق";
+"settings_messages_by_a_bot" = "پیام های ربات";
+"settings_call_invitations" = "دعوت نامه های تماس";
+"settings_room_invitations" = "دعوت نامه های اتاق";
+"settings_messages_containing_keywords" = "کلمات کلیدی";
+"settings_messages_containing_at_room" = "@ اتاق";
+"settings_messages_containing_user_name" = "نام کاربری من";
+"settings_messages_containing_display_name" = "نام نمایشی من";
+"settings_encrypted_group_messages" = "پیام های گروهی رمزگذاری شده";
+"settings_group_messages" = "پیام های گروهی";
+"settings_encrypted_direct_messages" = "پیام های مستقیم رمزگذاری شده";
+"settings_direct_messages" = "پیام مستقیم";
+"settings_notify_me_for" = "به من اطلاع بده برای";
+"settings_mentions_and_keywords" = "ذکر و کلمات کلیدی";
+"settings_default" = "اعلان های پیش فرض";
+"settings_notifications_disabled_alert_message" = "برای فعال کردن اعلان‌ها، به تنظیمات دستگاه خود بروید.";
+"settings_notifications_disabled_alert_title" = "غیر فعال کردن اعلان ها";
+"settings_pin_rooms_with_missed_notif" = "پین کردن اتاق هایی با اعلان های از دست رفته";
+"settings_pin_rooms_with_unread" = "پین کردن اتاق هایی با پیام های خوانده نشده";
+"settings_global_settings_info" = "تنظیمات اعلان جهانی در سرویس گیرنده وب %@ شما موجود است";
+"settings_show_decrypted_content" = "نمایش محتوای رمزگشایی شده";
+"settings_device_notifications" = "اعلان های دستگاه";
+"settings_enable_push_notif" = "اعلان ها در این دستگاه";
+"settings_security" = "امنیت";
+"settings_confirm_media_size_description" = "وقتی این گزینه روشن است، از شما خواسته می‌شود که تأیید کنید تصاویر و ویدیوها با چه اندازه ای ارسال شوند.";
+"settings_confirm_media_size" = "هنگام ارسال اندازه را تأیید کنید";
+"settings_three_pids_management_information_part3" = ".";
+"settings_three_pids_management_information_part1" = "آدرس‌های ایمیل یا شماره تلفن‌هایی را که می‌توانید برای ورود به سیستم یا بازیابی حساب خود در اینجا استفاده کنید، مدیریت کنید. کنترل کنید چه کسی می تواند شما را در آن پیدا کند ";
+"settings_fail_to_update_profile" = "پروفایل به روز نشد";
+"settings_night_mode" = "حالت شب";
+"settings_change_password" = "رمز را تغییر دهید";
+"settings_add_phone_number" = "شماره تلفن را اضافه کنید";
+"settings_phone_number" = "تلفن";
+"settings_add_email_address" = "آدرس ایمیل را اضافه کنید";
+"settings_email_address_placeholder" = "آدرس ایمیل خود را وارد نمایید";
+"settings_email_address" = "ایمیل";
+"settings_remove_phone_prompt_msg" = "آیا مطمئن هستید که می خواهید شماره تلفن %@ را حذف کنید؟";
+"settings_remove_email_prompt_msg" = "آیا مطمئن هستید که می خواهید آدرس ایمیل %@ را حذف کنید؟";
+"settings_remove_prompt_title" = "تایید";
+"settings_surname" = "نام خانوادگی";
+"settings_first_name" = "نام";
+"settings_display_name" = "نام نمایشی";
+"settings_profile_picture" = "عکس پروفایل";
+"settings_sign_out_e2e_warn" = "کلیدهای رمزگذاری خود را از دست خواهید داد. یعنی دیگر نمی‌توانید پیام‌های قدیمی را در اتاق‌های رمزگذاری‌شده این دستگاه بخوانید.";
+"settings_sign_out_confirmation" = "آیا مطمئن هستید؟";
+"settings_sign_out" = "خروج";
+"settings_deactivate_account" = "غیرفعال کردن حساب";
diff --git a/Riot/Assets/hu.lproj/Vector.strings b/Riot/Assets/hu.lproj/Vector.strings
index ed2f5b3a5..0d8050079 100644
--- a/Riot/Assets/hu.lproj/Vector.strings
+++ b/Riot/Assets/hu.lproj/Vector.strings
@@ -283,7 +283,7 @@
 "settings_ignored_users" = "FIGYELMEN KÍVÜL HAGYOTT FELHASZNÁLÓK";
 "settings_contacts" = "ESZKÖZ NÉVJEGYZÉK";
 "settings_advanced" = "HALADÓ";
-"settings_other" = "MÁS";
+"settings_other" = "Más";
 "settings_labs" = "LABOR";
 "settings_flair" = "Kitűző mutatása ahol lehet";
 "settings_devices" = "MUNKAMENETEK";
@@ -1530,3 +1530,20 @@
 "find_your_contacts_footer" = "Bármikor letiltható a beállításokban.";
 "contacts_address_book_permission_denied_alert_message" = "A névjegyzék engedélyezéséhez lépj be az eszköz beállításokba.";
 "contacts_address_book_permission_denied_alert_title" = "Névjegyzék letiltva";
+"space_home_show_all_rooms" = "Minden szoba megjelenítése";
+"room_event_action_forward" = "Továbbítás";
+"poll_edit_form_add_option" = "Lehetőség hozzáadása";
+"poll_edit_form_option_number" = "%d lehetőség";
+"poll_edit_form_create_options" = "Lehetőségek hozzáadása";
+"poll_edit_form_input_placeholder" = "Írjon valamit";
+"poll_edit_form_question_or_topic" = "Kérdés vagy téma";
+"poll_edit_form_poll_question_or_topic" = "Szavazás kérdés vagy téma";
+
+// Mark: - Polls
+
+"poll_edit_form_create_poll" = "Szavazás létrehozása";
+"share_extension_send_now" = "Küldés most";
+"share_extension_low_quality_video_message" = "Jobb minőségért küld így: %@ vagy gyengébb minőségben alább.";
+"share_extension_low_quality_video_title" = "Alacsony minőségű videó lesz elküldve";
+"settings_discovery_accept_terms" = "Azonosítási Szolgáltatás felhasználási feltételeinek elfogadása";
+"settings_about" = "NÉVJEGY";
diff --git a/Riot/Assets/id.lproj/Vector.strings b/Riot/Assets/id.lproj/Vector.strings
index aaeece68f..62d27b60d 100644
--- a/Riot/Assets/id.lproj/Vector.strings
+++ b/Riot/Assets/id.lproj/Vector.strings
@@ -48,8 +48,8 @@
 "join" = "Bergabung";
 "save" = "Simpan";
 "cancel" = "Batalkan";
-"off" = "Nonaktif";
-"on" = "Aktif";
+"off" = "Mati";
+"on" = "Nyala";
 "retry" = "Coba Lagi";
 "invite" = "Undang";
 "remove" = "Hapus";
@@ -63,9 +63,9 @@
 // Actions
 "view" = "Tampilkan";
 "warning" = "Peringatan";
-"title_groups" = "Komunitas-komunitas";
-"title_rooms" = "Ruangan-ruangan";
-"title_people" = "Orang-orang";
+"title_groups" = "Komunitas";
+"title_rooms" = "Ruangan";
+"title_people" = "Orang";
 "title_favourites" = "Favorit";
 
 // Titles
@@ -101,8 +101,8 @@
 "callbar_only_single_active_group" = "Ketuk untuk Bergabung panggilan grup (%@)";
 "joined" = "Bergabung";
 "collapse" = "tutup";
-"store_promotional_text" = "Aplikasi perpesanan dan kolaborasi yang menjaga privasi, pada jaringan terbuka. Terdesentralisasi untuk Anda kendali. Tidak ada penambangan data, tidak ada backdoor dan tidak ada akses pihak ketiga.";
-"store_full_description" = "Element adalah aplikasi messenger dan kolaborasi tipe baru yang:\n\n1. Menempatkan Anda dalam kendali untuk mempertahankan privasi Anda\n2. Memungkinkan Anda berkomunikasi dengan siapa pun di jaringan Matrix, dan bahkan di luar dengan mengintegrasikan dengan aplikasi seperti Slack\n3. Melindungi Anda dari iklan, menambangan data, backdoor, dan taman berdinding\n4. Mengamankan Anda melalui enkripsi ujung-ke-ujung, dengan penandatanganan-silang untuk memverifikasi orang lain\n\nElement benar-benar berbeda dari aplikasi perpesanan dan kolaborasi lain karena terdesentralisasi dan sumber terbuka.\n\nElement memungkinkan Anda host sendiri - atau memilih host - sehingga Anda memiliki privasi, kepemilikan, dan kontrol data dan percakapan Anda. Ini memberi Anda akses ke jaringan terbuka; jadi Anda tidak hanya terjebak berbicara dengan pengguna Element. Itu sangat aman.\n\nElement dapat melakukan semua ini karena beroperasi pada Matrix - standar untuk komunikasi terdesentralisasi terbuka.\n\nElement menempatkan Anda dalam kendali dengan membiarkan Anda memilih siapa yang meng-host percakapan Anda. Dari aplikasi Element, Anda dapat memilih untuk meng-host dengan cara yang berbeda:\n\n1. Dapatkan akun gratis pada server publik matrix.org\n2. Host sendiri akun Anda dengan menjalankan server pada perangkat keras Anda sendiri\n3. Mendaftar untuk akun di server khusus dengan hanya berlangganan platform hosting Element Matrix Services\n\nMengapa memilih Element?\n\nMILIKI DATA ANDA: Anda memutuskan di mana harus menyimpan data dan pesan Anda. Anda memilikinya dan mengendalikannya, bukan perusahaan besar yang menambang data Anda atau memberikan akses ke pihak ketiga.\n\nPESAN DAN KOLABORASI TERBUKA: Anda dapat mengobrol dengan orang lain di jaringan Matrix, jika mereka menggunakan Element atau aplikasi Matrix lain, dan bahkan jika mereka menggunakan sistem perpesanan seperti Slack, IRC atau XMPP.\n\nSUPER-AMAN: Enkripsi ujung-ke-ujung (hanya mereka yang dalam percakapan dapat mendekripsi pesan), dan penandatanganan-silang untuk memverifikasi perangkat peserta percakapan.\n\nKOMUNIKASI LENGKAP: Pesan, panggilan suara dan video, berbagi file, berbagi layar dan banyak integrasi, bot dan widget. Buat ruangan, komunitas, tetap terhubung dan selesaikan hal-hal.\n\nDI MANA PUN ANDA BERADA: Tetap berkomunikasi di mana pun Anda berada dengan riwayat pesan yang sepenuhnya disinkronkan di semua perangkat Anda dan di web di https://app.element.io/.";
+"store_promotional_text" = "Aplikasi perpesanan dan kolaborasi yang menjaga privasi, pada jaringan terbuka. Terdesentralisasi untuk Anda kendali. Tidak ada penambangan data, tidak ada pintu belakang dan tidak ada akses pihak ketiga.";
+"store_full_description" = "Element adalah aplikasi messenger dan kolaborasi tipe baru yang:\n\n1. Menempatkan Anda dalam kendali untuk mempertahankan privasi Anda\n2. Memungkinkan Anda berkomunikasi dengan siapa pun di jaringan Matrix, dan bahkan di luar dengan mengintegrasikan dengan aplikasi seperti Slack\n3. Melindungi Anda dari iklan, menambangan data, pintu belakang, dan taman berdinding\n4. Mengamankan Anda melalui enkripsi ujung-ke-ujung, dengan penandatanganan silang untuk memverifikasi orang lain\n\nElement benar-benar berbeda dari aplikasi perpesanan dan kolaborasi lain karena Element terdesentralisasi dan sumber terbuka.\n\nElement memungkinkan Anda host sendiri - atau memilih host - sehingga Anda memiliki privasi, kepemilikan, dan kontrol data dan obrolan Anda. Ini memberi Anda akses ke jaringan terbuka, jadi Anda tidak hanya terjebak berbicara dengan pengguna Element. Itu sangat aman.\n\nElement dapat melakukan semua ini karena beroperasi pada Matrix - standar untuk komunikasi terdesentralisasi terbuka.\n\nElement menempatkan Anda dalam kendali dengan membiarkan Anda memilih siapa yang menghost percakapan Anda. Dari aplikasi Element, Anda dapat memilih untuk menghost dengan cara yang berbeda:\n\n1. Dapatkan akun gratis pada server publik matrix.org\n2. Host sendiri akun Anda dengan menjalankan server pada perangkat keras Anda sendiri\n3. Mendaftar untuk akun di server khusus dengan hanya berlangganan platform hosting Element Matrix Services\n\nMengapa memilih Element?\n\nMILIKI DATA ANDA: Anda memutuskan di mana untuk menyimpan data dan pesan Anda. Anda memilikinya dan mengendalikannya, bukan perusahaan besar yang menambang data Anda atau memberikan akses ke pihak ketiga.\n\nPESAN DAN KOLABORASI TERBUKA: Anda dapat mengobrol dengan orang lain di jaringan Matrix, jika mereka menggunakan Element atau aplikasi Matrix lain, dan bahkan jika mereka menggunakan sistem perpesanan seperti Slack, IRC atau XMPP.\n\nSANGAT AMAN: Enkripsi ujung-ke-ujung yang nyata (hanya mereka yang dalam percakapan dapat mendekripsi pesan), dan penandatanganan silang untuk memverifikasi perangkat anggota obrolan.\n\nKOMUNIKASI LENGKAP: Perpesanan, panggilan suara dan video, pembagian file, pembagian layar dan banyak integrasi, bot dan widget. Buat ruangan, komunitas, tetap terhubung dan selesaikan hal-hal.\n\nDI MANA PUN ANDA BERADA: Tetap berkomunikasi di mana pun Anda berada dengan riwayat pesan yang sepenuhnya disinkronkan di semua perangkat Anda dan di web di https://app.element.io/.";
 // String for App Store
 "store_short_description" = "Obrolan/VoIP terdesentralisasi aman";
 
@@ -166,7 +166,7 @@
 "room_message_edits_history_title" = "Editan pesan";
 "room_action_send_file" = "Kirim file";
 "room_action_send_sticker" = "Kirim stiker";
-"room_event_action_reaction_history" = "Sejarah reaksi";
+"room_event_action_reaction_history" = "Riwayat reaksi";
 "room_event_action_reaction_show_less" = "Tampilkan lebih sedikit";
 "room_event_action_reaction_show_all" = "Tampilkan semua";
 "room_event_action_view_encryption" = "Informasi enkripsi";
@@ -472,7 +472,7 @@
 "settings_cryptography" = "KRIPTOGRAFI";
 "settings_devices" = "SESI";
 "settings_labs" = "UJI COBA";
-"settings_other" = "LAINNYA";
+"settings_other" = "Lainnya";
 "settings_advanced" = "LANJUTAN";
 "settings_integrations" = "INTEGRASI";
 "settings_discovery_settings" = "PENEMUAN";
@@ -609,3 +609,1057 @@
 "auth_msisdn_validation_title" = "Menunggu Verifikasi";
 "done" = "Selesai";
 "open" = "Buka";
+"version_check_banner_subtitle_deprecated" = "Kami tidak mendukung %@ di iOS %@ lagi. Untuk terus menggunakan %@ secara maksimal, kami menyarankan Anda untuk meningkatkan versi iOS Anda.";
+"version_check_banner_subtitle_supported" = "Kami akan segera mengakhiri dukungan untuk %@ di iOS %@. Untuk terus menggunakan %@ secara maksimal, kami menyarankan Anda untuk meningkatkan versi iOS Anda.";
+"spaces_coming_soon_detail" = "Fitur ini belum ada di sini, tetapi sedang dalam proses. Untuk saat ini, Anda dapat melakukannya dengan Element di komputer Anda.";
+"spaces_no_member_found_detail" = "Mencari seseorang yang tidak ada di %@? Untuk saat ini, Anda dapat mengundangnya di web atau desktop.";
+"spaces_no_room_found_detail" = "Beberapa hasil mungkin disembunyikan karena ruangannya pribadi dan Anda memerlukan sebuah undangan untuk bergabung.";
+"spaces_empty_space_detail" = "Beberapa ruangan mungkin disembunyikan karena ruangannya pribadi dan Anda memerlukan sebuah undangan.";
+"leave_space_message" = "Apakah anda Anda yakin ingin keluar dari %@? Apakah Anda juga ingin meninggalkan semua ruangan dan space lainnya di space ini?";
+"space_beta_announce_information" = "Space adalah cara baru untuk mengelompokkan ruangan dan orang. Mereka belum ada di iOS, tetapi Anda dapat menggunakannya sekarang di Web dan Desktop.";
+"favourites_empty_view_information" = "Anda dapat memfavoritkan dengan beberapa cara - yang tercepat adalah dengan menekan dan menahan. Ketuk ikon bintang dan mereka akan secara otomatis muncul di sini.";
+"home_empty_view_information" = "Aplikasi obrolan aman semua-dalam-satu untuk tim, teman, dan organisasi. Ketuk tombol + di bawah untuk menambahkan orang dan ruangan.";
+"pin_protection_explanatory" = "Menyiapkan PIN memungkinkan Anda melindungi data seperti pesan dan kontak, jadi hanya Anda yang dapat mengaksesnya dengan memasukkan PIN di awal aplikasi.";
+"major_update_information" = "Kami senang mengumumkan bahwa kami telah mengubah nama kami! Aplikasi Anda telah diperbarui dan Anda masuk ke akun Anda.";
+"secrets_reset_warning_message" = "Anda akan memulai ulang tanpa riwayat, tanpa pesan, perangkat tepercaya, atau pengguna tepercaya.";
+"secrets_setup_recovery_key_storage_alert_message" = "✓ Cetak dan simpan di tempat yang aman\n✓ Simpan di flashdisk USB atau drive cadangan\n✓ Salin ke penyimpanan awan pribadi Anda";
+"secrets_recovery_with_key_information_default" = "Akses riwayat pesan terenkripsi Anda dan identitas penandatanganan silang Anda untuk memverifikasi sesi lain dengan memasukkan Kunci Keamanan Anda.";
+"secrets_recovery_with_passphrase_information_default" = "Akses riwayat pesan terenkripsi Anda dan identitas penandatanganan silang Anda untuk memverifikasi sesi lain dengan memasukkan Frasa Keamanan Anda.";
+"user_verification_session_details_additional_information_untrusted_other_user" = "Hingga pengguna ini memercayai sesi ini, pesan yang dikirim ke dan dari sesi ini akan diberi label peringatan. Atau, Anda dapat memverifikasinya secara manual.";
+"user_verification_session_details_information_untrusted_current_user" = "Verifikasi sesi ini untuk menandainya sebagai tepercaya & memberikan akses ke pesan terenkripsi:";
+"user_verification_sessions_list_information" = "Pesan dengan pengguna ini di ruangan ini dienkripsi secara ujung-ke-ujung dan tidak dapat dibaca oleh pihak ketiga.";
+
+// User
+
+"key_verification_verified_user_information" = "Pesan dengan pengguna ini dienkripsi secara ujung-ke-ujung dan tidak dapat dibaca oleh pihak ketiga.";
+"key_verification_verified_this_session_information" = "Anda sekarang dapat membaca pesan aman di perangkat ini, dan pengguna lain akan tahu bahwa mereka dapat mempercayainya.";
+"key_verification_verified_new_session_information" = "Anda sekarang dapat membaca pesan aman di perangkat baru Anda, dan pengguna lain akan tahu bahwa mereka dapat mempercayainya.";
+"key_verification_verified_other_session_information" = "Anda sekarang dapat membaca pesan terenkripsi di sesi Anda yang lain, dan pengguna lain akan tahu bahwa mereka dapat mempercayainya.";
+"key_verification_manually_verify_device_additional_information" = "Jika tidak cocok, keamanan komunikasi Anda mungkin dikompromikan.";
+"key_verification_manually_verify_device_instruction" = "Konfirmasi dengan membandingkan berikut ini dengan Pengaturan Pengguna di sesi Anda yang lain:";
+"key_verification_verify_sas_additional_information" = "Untuk keamanan yang maksimal, gunakan sarana komunikasi tepercaya lainnya atau lakukan ini secara langsung.";
+"device_verification_self_verify_wait_information" = "Verifikasi sesi ini dari salah satu sesi Anda yang lain, memberikan akses ke pesan terenkripsi.\n\nGunakan %@ yang terbaru di perangkat Anda yang lain:";
+"key_verification_self_verify_unverified_sessions_alert_message" = "Verifikasi semua sesi Anda untuk memastikan akun & pesan Anda aman.";
+"device_verification_self_verify_start_information" = "Gunakan sesi ini untuk memverifikasi sesi Anda yang baru, memberikan akses ke pesan terenkripsi.";
+"device_verification_start_use_legacy" = "Tidak ada yang muncul? Belum semua klien mendukung verifikasi interaktif. Gunakan verifikasi warisan.";
+"device_verification_incoming_description_2" = "Memverifikasi sesi ini akan menandainya sebagai tepercaya, dan juga menandai sesi Anda sebagai terpercaya kepada pengguna yang lain.";
+"device_verification_incoming_description_1" = "Verifikasi sesi ini untuk menandainya sebagai tepercaya. Mempercayai sesi pengguna memberi Anda ketenangan pikiran ekstra saat menggunakan enkripsi ujung-ke-ujung.";
+"sign_out_key_backup_in_progress_alert_title" = "Pencadangan kunci sedang berlangsung. Jika Anda keluar sekarang, Anda akan kehilangan akses ke pesan terenkripsi Anda.";
+"sign_out_non_existing_key_backup_sign_out_confirmation_alert_message" = "Anda akan kehilangan akses ke pesan terenkripsi Anda kecuali jika Anda mencadangkan kunci Anda sebelum keluar.";
+"key_backup_recover_from_recovery_key_lost_recovery_key_action" = "Kehilangan Kunci Keamanan Anda dapat menyiapkan yang baru di pengaturan.";
+"key_backup_recover_invalid_recovery_key" = "Cadangan tidak dapat didekripsi dengan kunci ini: harap verifikasi bahwa Anda memasukkan Kunci Keamanan yang benar.";
+"key_backup_recover_invalid_passphrase" = "Cadangan tidak dapat didekripsi dengan frasa ini: harap verifikasi bahwa Anda memasukkan Frasa Keamanan yang benar.";
+
+// Success from recovery key
+"key_backup_setup_success_from_recovery_key_info" = "Kunci Anda sedang dicadangkan.\n\nBuat sebuah salinan dari Kunci Keamanan ini dan simpan di tempat yang aman.";
+"key_backup_setup_skip_alert_message" = "Anda mungkin kehilangan akses ke pesan terenkripsi jika Anda keluar atau menghilangkan perangkat Anda.";
+"secure_key_backup_setup_existing_backup_error_info" = "Buka kunci untuk menggunakannya kembali di cadangan aman atau hapus untuk membuat cadangan pesan baru di cadangan aman.";
+"secure_key_backup_setup_intro_use_security_passphrase_info" = "Masukkan frasa rahasia yang hanya Anda yang tahu, dan buat kunci untuk cadangan.";
+"secure_key_backup_setup_intro_use_security_key_info" = "Buat sebuah kunci keamanan untuk disimpan di tempat yang aman seperti pengelola kata sandi atau brankas.";
+"secure_key_backup_setup_intro_info" = "Lindungi dari kehilangan akses ke pesan & data terenkripsi dengan mencadangkan kunci enkripsi di server Anda.";
+"rerequest_keys_alert_message" = "Mohon buka %@ pada perangkat yang lain yang dapat mendekripsi pesan sehingga dapat mengirim kunci ke sesi ini.";
+"deactivate_account_forget_messages_information_part3" = ": ini akan menyebabkan pengguna di masa mendatang melihat tampilan percakapan yang tidak lengkap)";
+"deactivate_account_forget_messages_information_part1" = "Mohon lupakan semua pesan yang saya telah kirim ketika akun saya dinonaktifkan (";
+"service_terms_modal_information_description_identity_server" = "Sebuah server identitas membantu Anda menemukan kontak Anda, dengan mencari nomor telepon atau alamat email mereka, untuk melihat apakah mereka sudah memiliki akun.";
+"service_terms_modal_description_identity_server" = "Ini akan mengizinkan seseorang untuk menemukan Anda jika mereka menyimpan nomor telepon atau email Anda di kontak telepon mereka.";
+"service_terms_modal_description_integration_manager" = "Ini akan mengizinkan Anda untuk menggunakan bot, jembatan, widget, dan paket stiker.";
+
+// GDPR
+"gdpr_consent_not_given_alert_message" = "Untuk terus menggunakan homeserver %@, Anda harus menyetujui syarat dan ketentuannya.";
+"share_extension_failed_to_encrypt" = "Gagal untuk mengirim. Periksa di aplikasi utama pengaturan enkripsi untuk ruangan ini";
+"bug_report_logs_description" = "Untuk mendiagnosis masalah, log dari klien ini akan dikirim dengan laporan bug ini. Jika Anda lebih memilih untuk hanya mengirim teks di atas, harap hapus centang:";
+"bug_report_description" = "Harap jelaskan bugnya. Apa yang Anda lakukan? Apa yang Anda harapkan terjadi? Apa yang sebenarnya terjadi?";
+"e2e_key_backup_wrong_version" = "Cadangan kunci pesan aman baru telah terdeteksi.\n\nJika ini bukan Anda, atur Frasa Keamanan baru di Pengaturan.";
+
+// Crypto
+"e2e_enabling_on_app_update" = "%@ sekarang mendukung enkripsi ujung-ke-ujung tetapi Anda harus masuk lagi untuk mengaktifkannya.\n\nAnda dapat melakukannya sekarang atau nanti di pengaturan aplikasi.";
+
+// Crash report
+"google_analytics_use_prompt" = "Apakah Anda ingin membantu meningkatkan %@ dengan secara otomatis melaporkan laporan kerusakan dan data penggunaan secara anonim?";
+"no_voip" = "%@ sedang memanggil Anda tetapi %@ belum mendukung panggilan.\nAnda dapat mengabaikan notifikasi ini dan jawab panggilannya di perangkat yang lain atau menolak panggilannya.";
+"call_no_stun_server_error_message_1" = "Mohon hubungi administrator homeserver %@ Anda untuk mengatur sebuah server TURN supaya panggilan dapat bekerja dengan handal.";
+"rage_shake_prompt" = "Anda tampaknya menggoyangkan telepon dengan frustrasi. Apakah Anda ingin mengirimkan laporan bug?";
+"bug_report_prompt" = "Aplikasi telah crash terakhir kali. Apakah Anda ingin mengirimkan laporan crash?";
+"room_notifs_settings_encrypted_room_notice" = "Harap dicatat bahwa notifikasi sebutan & keyword tidak tersedia di ruang terenkripsi di ponsel.";
+"room_details_addresses_disable_main_address_prompt_msg" = "Anda tidak akan memiliki alamat utama yang ditentukan. Alamat utama default untuk ruangan ini akan dipilih secara acak";
+"room_details_history_section_prompt_msg" = "Perubahan siapa yang dapat membaca riwayat hanya akan berlaku untuk pesan berikutnya di ruang ini. Visibilitas riwayat yang ada tidak akan berubah.";
+"identity_server_settings_alert_error_terms_not_accepted" = "Anda harus menerima syaratnya %@ untuk menyetelnya sebagai server identitas.";
+"identity_server_settings_alert_change" = "Lepaskan hubungan dari server identitas %1$@ dan hubungkan ke %2$@?";
+"identity_server_settings_alert_no_terms" = "Server identitas ini yang Anda pilih tidak memiliki syarat layanan. Hanya lanjutkan jika Anda mempercayai pemilik server itu.";
+"identity_server_settings_disconnect_info" = "Melepas hubungan dari server identitas Anda akan berarti Anda tidak akan dapat ditemukan oleh pengguna lain dan tidak akan dapat mengundang orang lain menggunakan email atau telepon.";
+"identity_server_settings_no_is_description" = "Anda saat ini tidak menggunakan sebuah server identitas. Untuk menemukan dan dapat ditemukan oleh kontak yang sudah ada, tambahkan satu di atas.";
+"identity_server_settings_description" = "Anda saat ini menggunakan %@ untuk menemukan dan dapat ditemukan oleh kontak yang Anda tahu.";
+
+// AuthenticatedSessionViewControllerFactory
+"authenticated_session_flow_not_supported" = "Aplikasi ini tidak mendukung mekanisme otentikasi di homeserver Anda.";
+"security_settings_coming_soon" = "Maaf. Aksi ini belum tersedia di %@ iOS. Mohon gunakan klien Matrix yang lain untuk menyiapkannya. %@ iOS akan menggunakannya.";
+"security_settings_blacklist_unverified_devices_description" = "Verifikasi semua sesi pengguna untuk menandainya sebagai terpercaya dan kirim pesan ke mereka.";
+"security_settings_crosssigning_info_exists" = "Akun Anda memiliki identitas penandatanganan silang, tetapi belum dipercayai oleh sesi ini. Selesaikan keamanan sesi ini.";
+"security_settings_secure_backup_description" = "Cadangkan kunci enkripsi Anda dengan data akun Anda untuk berjaga-jaga jika Anda kehilangan akses ke sesi Anda. Kunci Anda akan diamankan dengan Kunci Keamanan yang unik.";
+"security_settings_crypto_sessions_description_2" = "Jika Anda tidak tahu sebuah login, ubah kata sandi Anda dan atur ulang Cadangan Aman.";
+"settings_identity_server_no_is_description" = "Anda saat ini tidak menggunakan sebuah server identitas. Untuk menemukan dan dapat ditemukan oleh kontak yang Anda tahu, tambahkan satu di atas.";
+"settings_identity_server_description" = "Dengan menggunakan set server identitas di atas, Anda dapat menemukan dan dapat ditemukan oleh kontak yang ada yang Anda kenal.";
+"settings_discovery_three_pid_details_information_phone_number" = "Kelola preferensi untuk nomor telepon ini, yang dapat digunakan pengguna lain untuk menemukan Anda dan digunakan untuk mengundang Anda ke ruangan. Tambahkan atau hapus nomor telepon di Akun.";
+"settings_discovery_three_pid_details_information_email" = "Kelola preferensi untuk alamat email ini, yang dapat digunakan pengguna lain untuk menemukan Anda dan digunakan untuk mengundang Anda ke ruangan. Tambahkan atau hapus alamat email di Akun.";
+"settings_discovery_terms_not_signed" = "Setujui server identitas (%@) Persyaratan Layanan agar Anda dapat ditemukan dengan alamat email atau nomor telepon.";
+"settings_discovery_no_identity_server" = "Saat ini Anda tidak menggunakan sebuah server identitas. Supaya Anda dapat ditemukan oleh kontak yang sudah ada yang Anda kenal, tambahkan satu.";
+"pin_protection_reset_alert_message" = "Untuk mengatur ulang PIN, Anda harus masuk kembali dan buat yang baru lagi";
+"device_verification_security_advice_emoji" = "Bandingkan emoji yang unik, memastikannya muncul dengan urutan yang sama.";
+"secrets_reset_information" = "Lakukan ini hanya jika Anda tidak memiliki perangkat lain yang dapat digunakan untuk memverifikasi perangkat ini.";
+"secrets_setup_recovery_passphrase_summary_information" = "Ingat Frasa Keamanan Anda. Itu dapat digunakan untuk mengakses pesan & data terenkripsi Anda.";
+"secrets_setup_recovery_passphrase_information" = "Masukkan frasa keamanan yang hanya Anda tahu, akan digunakan untuk mengamankan rahasia di server Anda.";
+"secrets_setup_recovery_key_information" = "Simpan Kunci Keamanan Anda di tempat yang aman. Itu bisa digunakan untuk mengakses pesan % data terenkripsi Anda.";
+"leave_space_message_admin_warning" = "Anda adalah admin space ini, pastikan Anda telah mentransfer hak admin ke anggota lain sebelum keluar.";
+"space_feature_unavailable_subtitle" = "Space belum ada di iOS, tetapi Anda bisa menggunakannya di Web dan Desktop";
+"room_intro_cell_information_multiple_dm_sentence2" = "Hanya Anda yang ada dalam obrolan ini, kecuali jika Anda mengundang seseorang untuk bergabung.";
+"room_intro_cell_information_dm_sentence2" = "Hanya Anda berdua yang ada dalam obrolan ini, tidak ada orang lain yang bisa bergabung.";
+"create_room_section_footer_type" = "Orang-orang bergabung ke ruang pribadi hanya dengan undangan ruangan.";
+"biometrics_cant_unlocked_alert_message_x" = "Untuk mengakses, gunakan %@ atau masuk kembali dan aktifkan %@ lagi";
+"pin_protection_not_allowed_pin" = "Untuk keamanan, PIN ini tidak tersedia. Coba PIN yang lain";
+"pin_protection_settings_section_footer" = "Untuk mengatur ulang PIN, Anda harus masuk lagi dan buat yang baru.";
+"pin_protection_mismatch_too_many_times_error_message" = "JIka Anda lupa PIN Anda, ketuk tombol lupa PIN.";
+"secrets_recovery_with_key_invalid_recovery_key_message" = "Mohon verifikasi jika Anda telah masukkan Kunci Keamanan yang benar.";
+"secrets_recovery_with_passphrase_invalid_passphrase_message" = "Mohon verifikasi jika Anda telah masukkan Frasa Keamanan yang benar.";
+"user_verification_session_details_additional_information_untrusted_current_user" = "Jika Anda tidak masuk ke sesi ini, akun Anda mungkin dikompromikan.";
+"user_verification_session_details_information_trusted_current_user" = "Sesi ini dipercayai untuk perpesanan aman karena Anda memverifikasinya:";
+"user_verification_start_additional_information" = "Supaya aman, lakukan ini secara langsung atau gunakan cara yang lain untuk berkomunikasi.";
+"user_verification_start_information_part2" = " dengan memeriksa sebuah kode sekali-pakai di kedua perangkat Anda.";
+"key_verification_verify_qr_code_other_scan_my_code_title" = "Apakah pengguna yang lain berhasil memindai kode QR-nya?";
+
+
+// Generic errors
+"error_invite_3pid_with_no_identity_server" = "Tambahkan sebuah server identitas di pengaturan Anda untuk mengundang dengan email.";
+"device_verification_self_verify_wait_additional_information" = "Ini bekerja dengan %@ dan klien Matrix lainnya yang mampu melakukan penandatanganan silang.";
+"device_verification_security_advice_number" = "Bandingkan nomornya, memastikannya muncul dengan urutan yang sama.";
+"sign_out_non_existing_key_backup_alert_title" = "Anda akan kehilangan akses ke pesan terenkripsi jika Anda keluar";
+
+// Recover from recovery key
+
+"key_backup_recover_from_recovery_key_info" = "Gunakan Frasa Keamanan Anda untuk mengakses riwayat pesan secara aman";
+
+// Recover from passphrase
+
+"key_backup_recover_from_passphrase_info" = "Gunakan Frasa Keamanan Anda untuk mengakses riwayat pesan secara aman";
+"key_backup_setup_passphrase_setup_recovery_key_info" = "Atau, amankan cadangan Anda dengan sebuah Kunci Keamanan, menyimpannya di tempat yang aman.";
+"secure_backup_setup_banner_subtitle" = "Amankan dari kehilangan akses ke pesan & data terenkripsi";
+"deactivate_account_informations_part4_emphasize" = "tidak secara default menyebabkan kami melupakan pesan yang telah Anda kirim. ";
+"service_terms_modal_information_description_integration_manager" = "Sebuah pengelola integrasi mengizinkan Anda untuk menambahkan fitur dari pihak ketiga.";
+"e2e_room_key_request_message_new_device" = "Anda menambahkan sebuah sesi baru '%@', yang meminta kunci enkripsi.";
+"room_widget_permission_webview_information_title" = "Menggunakannya mungkin mengatur cookie dan membagikan data dengan %@:\n";
+"widget_integration_no_permission_in_room" = "Anda tidak memiliki izin untuk melakukannya di ruangan ini.";
+
+// Widget Integration Manager
+"widget_integration_need_to_be_able_to_invite" = "Anda harus dapat mengundang pengguna untuk melakukannya.";
+"widget_no_power_to_manage" = "Anda perlu izin untuk mengelola widget di ruangan ini";
+"photo_library_access_not_granted" = "%@ tidak memiliki izin untuk mengakses perpustakaan foto, mohon ubah pengaturan privasi";
+"camera_access_not_granted" = "%@ tidak memiliki izin untuk menggunakan Kamera, mohon ubah pengaturan privasi";
+"group_participants_invite_malformed_id" = "ID yang cacat. Seharusnya sebuah ID Matrix seperti '@pengguna:domain'";
+"group_participants_invite_prompt_msg" = "Apakah Anda yakin untuk mengundang %@ ke grup ini?";
+"group_participants_remove_prompt_msg" = "Apakah Anda yakin untuk mengeluarkan %@ dari grup ini?";
+"group_participants_leave_prompt_msg" = "Apakah Anda yakin untuk meninggalkan grup ini?";
+"room_details_fail_to_update_room_direct" = "Gagal untuk memperbarui detail ruangan ini";
+"room_details_flair_invalid_id_prompt_msg" = "%@ bukan pengenal yang valid untuk sebuah komunitas";
+"room_details_addresses_invalid_address_prompt_msg" = "%@ bukan format yang valid untuk sebuah alias";
+"room_details_history_section_members_only" = "Anggota saha (sejak opsi ini dipilih)";
+"room_details_access_section_no_address_warning" = "Untuk menautkan ke ruangan itu harus memiliki alamat";
+"voice_message_stop_locked_mode_recording" = "Ketuk pada rekaman Anda untuk berhenti atau dengarkan";
+"room_intro_cell_information_dm_sentence1_part1" = "Ini adalah awal dari pesan langsung Anda dengan ";
+"room_intro_cell_information_room_without_topic_sentence2_part2" = " supaya orang tahu tentang ruangan ini.";
+"invite_friends_share_text" = "Hai, bicara kepada saya di %@: %@";
+"biometrics_usage_reason" = "Otentikasi diperlukan untuk mengakses aplikasi ini";
+"pin_protection_kick_user_alert_message" = "Terlalu banyak kesalahan, Anda telah dikeluarkan";
+"secrets_setup_recovery_passphrase_confirm_information" = "Masukkan Frasa Keamanan Anda untuk mengkonfirmasi.";
+"secrets_recovery_with_key_information_verify_device" = "Gunakan Kunci Keamanan Anda untuk memverifikasi perangkat ini.";
+"secrets_recovery_with_passphrase_lost_passphrase_action_part1" = "Tidak tahu Frasa Keamanan Anda? Anda dapat ";
+"secrets_recovery_with_passphrase_information_verify_device" = "Gunakan Frasa Keamanan Anda untuk memverifikasi perangkat ini.";
+"user_verification_session_details_information_trusted_other_user_part1" = "Sesi ini dipercayai untuk perpesanan Aman karena ";
+"device_verification_self_verify_alert_message" = "Verifikasi login baru yang mengakses akun Anda: %@";
+
+// MARK: Sign out warning
+
+"sign_out_existing_key_backup_alert_title" = "Apakah Anda yakin untuk keluar?";
+
+// Passphrase
+
+"key_backup_setup_passphrase_title" = "Amankan cadangan Anda dengan sebuah Frasa Sandi";
+
+// Service terms
+"service_terms_modal_title_message" = "Untuk melanjutkan, setujui syarat dan ketentuan di bawah";
+"e2e_room_key_request_message" = "Sesi '%@' yang belum diverifikasi meminta kunci enkripsi.";
+
+// Share extension
+"share_extension_auth_prompt" = "Masuk di aplikasi utama untuk membagikan konten";
+"widget_integration_manager_disabled" = "Anda perlu mengaktifkan pengelola integrasi di pengaturan";
+"bug_crash_report_description" = "Jelaskan apa yang Anda lakukan sebelum crashnya:";
+"directory_server_type_homeserver" = "Ketik sebuah homeserver untuk menampilkan daftar ruangan publik";
+"room_details_access_section_anyone_apart_from_guest" = "Siapa saja yang tahu tautan ruangan, selain dari tamu";
+"security_settings_complete_security_alert_message" = "Anda seharusnya menyelesaikan keamanan di sesi Anda saat ini dulu.";
+"key_verification_scan_confirmation_scanned_device_information" = "Apakah perangkat yang lain menampilkan perisai yang sama?";
+"key_verification_verify_qr_code_information" = "Pindai kodenya untuk memverifikasi dengan sesama dengan aman.";
+"error_not_supported_on_mobile" = "Anda tidak melakukannya dari %@ mobile.";
+"device_verification_self_verify_wait_recover_secrets_additional_information" = "Jika Anda tidak dapat mengakses sesi yang sudah ada";
+
+// MARK: Start
+"device_verification_start_title" = "Verifikasi dengan membandingkan string teks pendek";
+"device_verification_cancelled_by_me" = "Verifikasi telah dibatalkan. Alasan: %@";
+"key_backup_recover_from_passphrase_lost_passphrase_action_part1" = "Tidak tahu Frasa Keamanan Anda? Anda dapat ";
+"service_terms_modal_footer" = "Ini dapat dinonaktifkan di pengaturan.";
+"room_widget_permission_information_title" = "Menggunakannya mungkin membagikan data dengan %@:\n";
+"widget_sticker_picker_no_stickerpacks_alert" = "Saat ini Anda tidak mengaktifkan paket stiker apapun.";
+"call_already_displayed" = "Sudah ada panggilan yang sedang berlangsung.";
+"camera_unavailable" = "Kamera tidak tersedia di perangkat Anda";
+"network_offline_prompt" = "Koneksi internetnya terlihat offline.";
+"group_participants_invite_another_user" = "Cari/undang dengan ID Pengguna atau Nama";
+"group_invitation_format" = "%@ telah mengundang Anda untuk bergabung ke komunitas ini";
+"room_notifs_settings_manage_notifications" = "Anda dapat mengelola notifikasi di %@";
+"room_details_fail_to_enable_encryption" = "Gagal untuk mengaktifkan enkripsi di ruangan ini";
+"room_details_fail_to_add_room_aliases" = "Gagal untuk menambahkan alamat ruangan baru";
+"room_details_fail_to_update_room_guest_access" = "Gagal untuk memperbarui akses tamu";
+"room_details_fail_to_update_room_directory_visibility" = "Gagal untuk memperbarui visibilitas direktori ruangan";
+"room_details_advanced_e2e_encryption_disabled" = "Enkripsi tidak diaktifkan di ruangan ini.";
+"room_details_advanced_enable_e2e_encryption" = "Aktifkan enkripsi (peringatan: tidak dapat dinonaktifkan lagi!)";
+"room_details_access_section_anyone_for_dm" = "Siapa saja yang tahu tautannya, termasuk tamu";
+"room_details_access_section_anyone" = "Siapa saja yang tahu tautannya ruangan, termasuk tamu";
+"room_details_access_section_anyone_apart_from_guest_for_dm" = "Siapa saja yang tahu linknya, selain dari tamu";
+"identity_server_settings_alert_error_invalid_identity_server" = "%@ bukan server identitas yang valid.";
+"identity_server_settings_alert_no_terms_title" = "Server identitas tidak mempunyai kebijakan layanan";
+"security_settings_user_password_description" = "Konfirmasi identitas Anda dengan memasukkan kata sandi akun Anda";
+"security_settings_secure_backup_info_valid" = "Sesi ini mencadangkan kunci Anda.";
+"version_check_modal_title_deprecated" = "Kami tidak mendukung iOS %@ lagi";
+"version_check_modal_title_supported" = "Kami mengakhiri dukungan untuk iOS %@";
+"version_check_banner_title_deprecated" = "Kami tidak mendukung iOS %@ lagi";
+
+// Mark: - Version check
+
+"version_check_banner_title_supported" = "Kami mengakhiri dukungan untuk iOS %@";
+
+// Mark: - Voice Messages
+
+"voice_message_release_to_send" = "Tahan untuk merekam, lepaskan untuk mengirim";
+"spaces_empty_space_title" = "Space ini belum ada ruangan";
+"create_room_show_in_directory" = "Tampilkan ruangan di direktori";
+"secrets_reset_authentication_message" = "Masukkan kata sandi akun Anda untuk mengkonfirmasi";
+"secrets_recovery_with_key_information_unlock_secure_backup_with_key" = "Masukkan Kunci Keamanan Anda untuk melanjutkan.";
+"secrets_recovery_with_key_information_unlock_secure_backup_with_phrase" = "Masukkan Frasa Keamanan Anda untuk melanjutkan.";
+
+// MARK: - Secrets recovery
+
+"secrets_recovery_reset_action_part_1" = "Lupa atau kehilangan semua opsi pemulihan? ";
+"user_verification_session_details_information_untrusted_other_user" = " masuk dengan sesi baru:";
+"key_verification_scan_confirmation_scanned_user_information" = "Apakah %@ menampilkan perisai yang sama?";
+"key_verification_verify_qr_code_scan_other_code_success_message" = "Kode QR berhasil divalidasi.";
+"key_verification_verify_qr_code_information_other_device" = "Pindai kode di bawah untuk memverifikasi:";
+"key_verification_bootstrap_not_setup_message" = "Anda harus mem-bootstrap penandatanganan-silang dulu.";
+"device_verification_self_verify_wait_recover_secrets_checking_availability" = "Memeriksa untuk kemampuan verifikasi lain ...";
+"key_verification_self_verify_current_session_alert_message" = "Pengguna yang lain mungkin tidak mempercayainya.";
+"device_verification_cancelled" = "Pengguna yang lain membatalkan verifikasinya.";
+"sign_out_key_backup_in_progress_alert_discard_key_backup_action" = "Saya tidak ingin pesan terenkripsi saya";
+"sign_out_non_existing_key_backup_sign_out_confirmation_alert_title" = "Anda akan kehilangan pesan terenkripsi Anda";
+"sign_out_non_existing_key_backup_alert_discard_key_backup_action" = "Saya tidak ingin pesan terenkripsi saya";
+
+// Success from secure backup
+"key_backup_setup_success_from_secure_backup_info" = "Kunci Anda sedang dicadangkan.";
+"key_backup_setup_passphrase_setup_recovery_key_action" = "(Lanjutan) Siapkan dengan Kunci Keamanan";
+"key_backup_setup_intro_setup_connect_action_with_existing_backup" = "Hubungkan perangkat ini ke Cadangan Kunci";
+"secure_key_backup_setup_existing_backup_error_title" = "Sudah ada cadangan untuk pesan";
+"room_predecessor_link" = "Ketuk di sini untuk melihat pesan lama.";
+"room_many_users_are_typing" = "%@, %@ & lainnya sedang mengetik…";
+"room_two_users_are_typing" = "%@ & %@ sedang mengetik…";
+"room_participants_security_information_room_not_encrypted_for_dm" = "Pesan di sini tidak terenkripsi secara ujung-ke-ujung.";
+"room_participants_action_unignore" = "Tampilkan semua pesan dari penguna ini";
+"room_participants_action_ignore" = "Sembunyikan semua pesan dari pengguna ini";
+"find_your_contacts_title" = "Mulai dengan mendaftar kontak Anda";
+"contacts_address_book_permission_required" = "Izin diperlukan untuk mengakses kontak lokal";
+"settings_labs_message_reaction" = "Bereaksi ke pesan dengan emoji";
+"settings_labs_create_conference_with_jitsi" = "Buat panggilan konferensi dengan jitsi";
+"settings_unignore_user" = "Tampilkan semua pesan dari %@?";
+"settings_calls_stun_server_fallback_button" = "Izinkan cadangan server untuk panggilan";
+"settings_messages_by_a_bot" = "Pesan dari sebuah bot";
+"settings_pin_rooms_with_unread" = "Pin ruangan dengan pesan yang belum dibaca";
+"settings_pin_rooms_with_missed_notif" = "Pin ruangan dengan notifikasi yang terlewat";
+"settings_confirm_media_size" = "Konfirmasi ukuran saat mengirim";
+"settings_sending_media" = "MENGIRIM GAMBAR DAN VIDEO";
+"settings_mark_all_as_read" = "Tandai semua pesan sebagai terbaca";
+"room_resource_usage_limit_reached_message_contact_3" = " untuk menambahkan batas ini.";
+"room_resource_limit_exceeded_message_contact_3" = " untuk melanjutkan menggunakan perangkat ini.";
+"room_event_action_ban_prompt_reason" = "Alasan untuk mencekal pengguna ini";
+"room_event_action_kick_prompt_reason" = "Alasan untuk mengeluarkan pengguna ini";
+"room_event_action_report_prompt_reason" = "Alasan untuk melaporkan konten ini";
+"room_message_unable_open_link_error_message" = "Tidak dapat membuka tautan ini.";
+"directory_search_results_more_than" = ">%tu hasil ditemukan untuk %@";
+"directory_search_results" = "%tu hasil ditemukan untuk %@";
+"room_creation_invite_another_user" = "ID Pengguna, nama atau email";
+"space_participants_action_ban" = "Cekal dari space ini";
+"space_participants_action_remove" = "Keluarkan dari space ini";
+"leave_space_only_action" = "Jangan tinggalkan ruangan apapun";
+"space_beta_announce_title" = "Space akan segera datang";
+
+// Mark: - Spaces
+
+"space_feature_unavailable_title" = "Space belum ada disini";
+
+// MARK: - Invite friends
+
+"invite_friends_action" = "Undang teman-teman ke %@";
+
+// MARK: - Favourites
+
+"favourites_empty_view_title" = "Ruangan dan orang favorit";
+
+// MARK: - Home
+
+"home_empty_view_title" = "Selamat datang di %@,\n%@";
+
+// MARK: - Searchable Directory View Controller
+
+"searchable_directory_create_new_room" = "Buat sebuah ruangan baru";
+
+// MARK: - Major update
+
+"major_update_title" = "Riot sekarang adalah %@";
+"secrets_reset_warning_title" = "Jika Anda mengatur ulang semua";
+"secrets_setup_recovery_passphrase_summary_title" = "Simpan Frasa Sandi Anda";
+
+// Recovery passphrase
+
+"secrets_setup_recovery_passphrase_title" = "Atur sebuah Frasa Sandi";
+
+// MARK: - Secrets set up
+
+// Recovery Key
+
+"secrets_setup_recovery_key_title" = "Simpan Kunci Keamanan Anda";
+"secrets_recovery_with_passphrase_lost_passphrase_action_part2" = "gunakan Kunci Kemanan anda";
+"user_verification_session_details_verify_action_current_user_manually" = "Verifikasi dengan Teks Secara Manual";
+"user_verification_start_information_part1" = "Untuk keamanan lebih, verifikasi ";
+"key_verification_scan_confirmation_scanning_device_waiting_other" = "Menunggu untuk perangkat lainnya…";
+
+// Incoming key verification request
+
+"key_verification_incoming_request_incoming_alert_message" = "%@ ingin memverifikasi";
+"file_upload_error_unsupported_file_type_message" = "Tipe file tidak didukung.";
+
+// MARK: Manually Verify Device
+
+"key_verification_manually_verify_device_title" = "Verifikasi dengan Teks Secara Manual";
+"device_verification_error_cannot_load_device" = "Tidak dapat memuat informasi sesi.";
+"key_verification_new_session_title" = "Verifikasi sesi baru Anda";
+"sign_out_non_existing_key_backup_alert_setup_secure_backup_action" = "Mulai menggunakan Cadangan Aman";
+"secure_key_backup_setup_intro_use_security_passphrase_title" = "Gunakan sebuah Frasa Keamanan";
+"key_backup_recover_from_passphrase_lost_passphrase_action_part2" = "gunakan Kunci Kemanan Anda";
+"key_backup_setup_success_from_recovery_key_made_copy_action" = "Saya telah membuat sebuah salinan";
+"key_backup_setup_passphrase_passphrase_invalid" = "Coba menambahkan sebuah kata";
+"key_backup_setup_intro_setup_action_without_existing_backup" = "Mulai menggunakan Cadangan Kunci";
+
+// Intro
+
+"key_backup_setup_intro_title" = "Jangan kehilangan pesan terenkripsi";
+"secure_key_backup_setup_intro_use_security_key_title" = "Gunakan sebuah Kunci Keamanan";
+"deactivate_account_informations_part2_emphasize" = "Aksi ini tidak dapat diurungkan.";
+"service_terms_modal_policy_checkbox_accessibility_hint" = "Periksa untuk menerima %@";
+"widget_integration_missing_user_id" = "Tidak ada user_id di permintaan.";
+"widget_integration_missing_room_id" = "Tidak ada room_id di permintaan.";
+"widget_integration_failed_to_send_request" = "Gagal untuk mengirim permintaan.";
+"widget_integration_unable_to_create" = "Tidak dapat membuat widget.";
+"widget_menu_revoke_permission" = "Hilangkan akses ke saya";
+"widget_creation_failure" = "Pembuatan widget gagal";
+
+// Widget
+"widget_no_integrations_server_configured" = "Tidak ada server integrasi yang diatur";
+"room_does_not_exist" = "%@ tidak ada";
+"do_not_ask_again" = "Jangan tanya lagi";
+"public_room_section_title" = "Ruangan Publik (di %@):";
+"event_formatter_jitsi_widget_removed_by_you" = "Anda menghilangkan konferensi VoIP";
+"event_formatter_jitsi_widget_added_by_you" = "Anda menambahkan konferensi VoIP";
+"event_formatter_rerequest_keys_part2" = " dari sesi Anda lainnya.";
+"directory_server_all_native_rooms" = "Semua ruangan Matrix asli";
+"room_details_unset_main_address" = "Atur Ulang sebagai Alamat Utama";
+"room_details_set_main_address" = "Atur sebagai Alamat Utama";
+"room_details_advanced_e2e_encryption_enabled_for_dm" = "Enkripsi diaktifkan di sini";
+"room_details_flair_section" = "Tampilkan bakat untuk komunitas";
+"room_details_history_section" = "Siapa saja yang dapat membaca riwayat?";
+"room_details_access_section_directory_toggle_for_dm" = "Daftarkan di direktori ruangan";
+"room_details_access_section_for_dm" = "Siapa saja yang dapat mengakses?";
+"identity_server_settings_place_holder" = "Masukkan sebuah server identitas";
+"settings_show_NSFW_public_rooms" = "Tampilkan ruangan publik NSFW";
+"settings_identity_server_no_is" = "Tidak ada server identitas yang diatur";
+"settings_discovery_three_pid_details_enter_sms_code_action" = "Masukkan kode aktivasi SMS";
+"settings_key_backup_button_create" = "Mulai menggunakan Cadangan Kunci";
+"settings_key_backup_info_progress_done" = "Semua kunci telah dicadangkan";
+"settings_key_backup_info_progress" = "Mencadangkan %@ kunci…";
+"settings_key_backup_info_version" = "Versi Cadangan Kunci: %@";
+"settings_fail_to_update_password" = "Gagal untuk memperbarui kata sandi";
+"settings_labs_enable_ringing_for_group_calls" = "Dering untuk panggilan grup";
+"settings_enable_push_notif" = "Notifikasi di perangkat ini";
+"settings_fail_to_update_profile" = "Gagal untuk memperbarui profil";
+"settings_email_address_placeholder" = "Masukkan alamat email Anda";
+"settings_flair" = "Tampilkan bakat dimana yang diizinkan";
+"settings_config_user_id" = "Masuk sebagai %@";
+"settings_config_identity_server" = "Server identitas adalah %@";
+
+// Unknown devices
+"unknown_devices_alert_title" = "Ruangan berisi sesi yang tidak dikenal";
+"room_resource_limit_exceeded_message_contact_2_link" = "hubungi administrator anda";
+"room_replacement_link" = "Obrolan ini berlanjut di sini.";
+"room_action_send_photo_or_video" = "Kirim foto atau video";
+"room_action_camera" = "Ambil foto atau video";
+"room_unsent_messages_notification" = "Pesan gagal untuk dikirim.";
+"encrypted_room_message_reply_to_placeholder" = "Kirim sebuah balasan terenkripsi…";
+"encrypted_room_message_placeholder" = "Kirim sebuah pesan terenkripsi…";
+"room_message_reply_to_placeholder" = "Kirim sebuah balasan (tidak terenkripsi)…";
+"room_message_placeholder" = "Kirim sebuah pesan (tidak terenkripsi)…";
+"room_member_power_level_custom_in" = "Kustom (%@) di %@";
+"room_participants_action_set_default_power_level" = "Atur ulang ke pengguna normal";
+"room_participants_action_ban" = "Cekal dari ruangan ini";
+"room_participants_action_remove" = "Keluarkan dari ruangan ini";
+"contacts_address_book_no_identity_server" = "Tidak ada server identitas yang diatur";
+"directory_search_fail" = "Gagal untuk mendapatkan data";
+
+// Rooms tab
+"room_directory_no_public_room" = "Tidak ada ruangan publik yang tersedia";
+"room_creation_make_public_prompt_title" = "Buat obrolan ini publik?";
+"room_creation_public_room" = "Obrolan ini publik";
+"room_creation_private_room" = "Obrolan ini privat";
+"social_login_button_title_sign_up" = "Daftar dengan %@";
+"social_login_button_title_sign_in" = "Masuk dengan %@";
+"auth_autodiscover_invalid_response" = "Respons penemuan homeserver tidak valid";
+"pin_protection_settings_section_header_with_biometrics" = "PIN & %@";
+"service_terms_modal_table_header_integration_manager" = "SYARAT PENGELOLA INTEGRASI";
+"service_terms_modal_table_header_identity_server" = "SYARAT SERVER IDENTITAS";
+"event_formatter_call_missed_video" = "Panggilan video tidak dijawab";
+"event_formatter_call_missed_voice" = "Panggilan video tidak dijawab";
+"event_formatter_call_active_video" = "Panggilan video aktif";
+"event_formatter_call_active_voice" = "Panggilan suara aktif";
+"event_formatter_call_incoming_video" = "Panggilan video masuk";
+"event_formatter_call_incoming_voice" = "Panggilan suara masuk";
+
+// Room Notification Settings
+"room_notifs_settings_notify_me_for" = "Beritahu saya untuk";
+"security_settings_secure_backup_restore" = "Pulihkan dari Cadangan";
+"settings_contacts_enable_sync" = "Cari kontak Anda";
+"settings_show_url_previews" = "Tampilkan tampilan website";
+"settings_new_keyword" = "Tambahkan Keyword baru";
+"settings_messages_containing_display_name" = "Nama tampilan saya";
+"settings_encrypted_group_messages" = "Pesan grup terenkripsi";
+"settings_encrypted_direct_messages" = "Pesan langsung terenkripsi";
+"settings_notify_me_for" = "Beritahu saya untuk";
+"settings_mentions_and_keywords" = "Sebutan dan Keyword";
+"find_your_contacts_button_title" = "Cari kontak Anda";
+"call_incoming_voice" = "Panggilan masuk…";
+"widget_picker_manage_integrations" = "Kelola integrasi…";
+"e2e_room_key_request_start_verification" = "Mulai verifikasi…";
+
+// Recover from private key
+"key_backup_recover_from_private_key_info" = "Memulihkan cadangan…";
+"version_check_modal_action_title_deprecated" = "Pelajari lebih lanjut";
+"user_avatar_view_accessibility_hint" = "Ubah avatar pengguna";
+"space_avatar_view_accessibility_hint" = "Ubah avatar space";
+"space_public_join_rule" = "Space publik";
+"space_private_join_rule" = "Space privat";
+"space_home_show_all_rooms" = "Tampilkan semua ruangan";
+"spaces_invites_coming_soon_title" = "Undangan segera datang";
+"spaces_coming_soon_title" = "Segera datang";
+"spaces_no_result_found_title" = "Tidak ada hasil";
+"spaces_explore_rooms" = "Jelajahi ruangan";
+"leave_space_title" = "Tinggalkan %@";
+"room_intro_cell_information_room_without_topic_sentence2_part1" = "Tambahkan sebuah topik";
+"room_avatar_view_accessibility_hint" = "Ubah avatar ruangan";
+"call_transfer_error_message" = "Gagal memindahkan panggilan";
+"create_room_section_header_topic" = "Topik ruangan (opsional)";
+"searchable_directory_search_placeholder" = "Nama atau ID";
+"biometrics_cant_unlocked_alert_message_login" = "Masuk kembali";
+"biometrics_cant_unlocked_alert_title" = "Tidak dapat membuka kunci aplikasi";
+"biometrics_setup_subtitle" = "Hemat waktu Anda";
+"pin_protection_mismatch_error_message" = "Mohon coba lagi";
+"pin_protection_mismatch_error_title" = "PIN tidak cocok";
+"pin_protection_forgot_pin" = "Lupa PIN";
+"pin_protection_enter_pin" = "Masukkan PIN Anda";
+"pin_protection_confirm_pin" = "Konfirmasi PIN Anda";
+
+// MARK: - Cross-signing
+
+// Banner
+
+"cross_signing_setup_banner_title" = "Siapkan enkripsi";
+"secrets_setup_recovery_key_storage_alert_title" = "Simpan dengan aman";
+"secrets_recovery_with_key_recovery_key_placeholder" = "Masukkan Kunci Keamanan";
+"secrets_recovery_with_passphrase_passphrase_placeholder" = "Masukkan Frasa Keamanan";
+"user_verification_start_waiting_partner" = "Menunggu untuk %@…";
+"key_verification_scan_confirmation_scanning_user_waiting_other" = "Menunggu untuk %@…";
+"key_verification_verify_qr_code_start_emoji_action" = "Verifikasi dengan emoji";
+"key_verification_verify_qr_code_scan_code_action" = "Pindai kodenya";
+
+// MARK: QR code
+
+"key_verification_verify_qr_code_title" = "Verifikasi dengan memindai";
+"key_verification_tile_conclusion_warning_title" = "Sign in tidak dipercayai";
+"emoji_picker_places_category" = "Tempat Wisata";
+"emoji_picker_people_category" = "Smiley & Orang";
+"emoji_picker_foods_category" = "Makanan & Minuman";
+"emoji_picker_nature_category" = "Hewan & Alam";
+"key_verification_verified_new_session_title" = "Sesi baru telah verifikasi!";
+"key_verification_verify_sas_cancel_action" = "Mereka tidak cocok";
+"device_verification_self_verify_wait_recover_secrets_without_passphrase" = "Gunakan Kunci Keamanan";
+"device_verification_self_verify_wait_new_sign_in_title" = "Verifikasi login ini";
+
+// Current session
+
+"key_verification_self_verify_current_session_alert_title" = "Verifikasi sesi ini";
+"device_verification_start_use_legacy_action" = "Gunakan Verifikasi Warisan";
+
+// Mark: Incoming
+"device_verification_incoming_title" = "Permintaan Verifikasi Masuk";
+"key_verification_this_session_title" = "Verifikasi sesi ini";
+"key_backup_recover_from_recovery_key_recovery_key_placeholder" = "Masukkan Kunci Keamanan";
+"key_backup_recover_invalid_recovery_key_title" = "Kunci Keamanan Tidak Cocok";
+"key_backup_recover_invalid_passphrase_title" = "Frasa Sandi Tidak Benar";
+"key_backup_setup_success_from_recovery_key_make_copy_action" = "Buat sebuah Salinan";
+"key_backup_setup_success_from_passphrase_save_recovery_key_action" = "Simpan Kunci Keamanan";
+"key_backup_setup_passphrase_confirm_passphrase_invalid" = "frasa tidak cocok";
+"key_backup_setup_intro_manual_export_action" = "Ekspor kunci secara manual";
+"key_backup_setup_skip_alert_title" = "Apakah Anda yakin?";
+
+
+// Cancel
+
+"secure_key_backup_setup_cancel_alert_title" = "Apakah Anda yakin?";
+"deactivate_account_informations_part3" = "\n\nMenonaktifkan akun Anda: ";
+"service_terms_modal_information_title_integration_manager" = "Pengelola Integrasi";
+
+// Alert explaining what an identity server / integration manager is.
+"service_terms_modal_information_title_identity_server" = "Server Identitas";
+"e2e_room_key_request_share_without_verifying" = "Bagikan tanpa memverifikasi";
+
+// Room key request dialog
+"e2e_room_key_request_title" = "Permintaan kunci enkripsi";
+"room_widget_permission_user_id_permission" = "ID pengguna Anda";
+"room_widget_permission_avatar_url_permission" = "URL avatar Anda";
+"room_widget_permission_display_name_permission" = "Nama tampilan Anda";
+"widget_menu_remove" = "Hapus untuk semuanya";
+"widget_menu_open_outside" = "Buka di browser";
+"widget_sticker_picker_no_stickerpacks_alert_add_now" = "Tambahkan satu sekarang?";
+"bug_report_background_mode" = "Lanjutkan di latar belakang";
+"e2e_key_backup_wrong_version_button_wasme" = "Itu adalah saya";
+
+// Key backup wrong version
+"e2e_key_backup_wrong_version_title" = "Cadangan Kunci Baru";
+"call_no_stun_server_error_use_fallback_button" = "Coba menggunakan %@";
+"call_incoming_video" = "Panggilan video masuk…";
+"event_formatter_group_call_incoming" = "%@ di %@";
+"event_formatter_rerequest_keys_part1_link" = "Minta ulang kunci enkripsi";
+
+// Events formatter
+"event_formatter_member_updates" = "%tu perubahan keanggotaan";
+"directory_server_picker_title" = "Pilih sebuah direktori";
+"image_picker_action_library" = "Pilih dari perpustakaan";
+
+// Read Receipts
+"read_receipts_list" = "Daftar Laporan Dibaca";
+
+// Group rooms
+"group_rooms_filter_rooms" = "Filter ruangan komunitas";
+"group_participants_filter_members" = "Filter anggota komunitas";
+"room_notifs_settings_account_settings" = "Pengaturan akun";
+"room_notifs_settings_all_messages" = "Semua Pesan";
+"room_details_copy_room_url" = "Salid URL Ruangan";
+"room_details_copy_room_address" = "Salin Alamat Ruangan";
+"room_details_copy_room_id" = "Salin ID Ruangan";
+"room_details_addresses_disable_main_address_prompt_title" = "Peringatan alamat utama";
+"room_details_addresses_invalid_address_prompt_title" = "Format alias tidak valid";
+"room_details_new_address" = "Tambahkan alamat baru";
+"identity_server_settings_alert_disconnect_title" = "Putuskan server identitas";
+"identity_server_settings_alert_change_title" = "Ubah server identitas";
+"manage_session_trusted" = "Dipercayai oleh Anda";
+"security_settings_export_keys_manually" = "Ekspor kunci secara manual";
+"settings_discovery_three_pid_details_cancel_email_validation_action" = "Batalkan validasi email";
+"settings_discovery_three_pid_details_title_phone_number" = "Kelola nomor telepon";
+"settings_key_backup_button_restore" = "Pulihkan dari Cadangan";
+"settings_deactivate_my_account" = "Nonaktifkan akun saya";
+"settings_add_3pid_password_title_msidsn" = "Tambahkan nomor telepon";
+"settings_add_3pid_password_title_email" = "Tambahkan alamat email";
+"settings_term_conditions" = "Syarat & Ketentuan";
+"settings_olm_version" = "Versi Olm %@";
+"settings_labs_voice_messages" = "Pesan suara";
+"settings_ui_theme_picker_title" = "Pilih sebuah tema";
+"settings_your_keywords" = "Pesan suara";
+"settings_room_upgrades" = "Tingkatan ruangan";
+"settings_call_invitations" = "Undangan panggilan";
+"settings_room_invitations" = "Undangan ruangan";
+"settings_messages_containing_user_name" = "Nama pengguna saya";
+"settings_group_messages" = "Pesan grup";
+"settings_direct_messages" = "Pesan langsung";
+"settings_default" = "Notifikasi Default";
+"settings_notifications_disabled_alert_title" = "Notifikasi dinonaktifkan";
+"settings_show_decrypted_content" = "Tampilkan konten terdekripsi";
+"settings_device_notifications" = "Notifikasi perangkat";
+"settings_add_phone_number" = "Tambahkan nomor telepon";
+"settings_add_email_address" = "Tambahkan alamat email";
+"settings_sign_out_confirmation" = "Apakah Anda yakin?";
+"settings_phone_contacts" = "KONTAK PONSEL";
+"settings_config_home_server" = "Homeserver adalah %@";
+"settings_config_no_build_info" = "Tidak ada info build";
+"account_logout_all" = "Keluar dari semua akun";
+"room_title_one_active_member" = "%@/%@ anggota aktif";
+"room_title_multiple_active_members" = "%@/%@ anggota aktif";
+"room_multiple_typing_notification" = "%@ dan lainnya";
+"external_link_confirmation_title" = "Cek ulang tautan ini";
+"room_event_failed_to_send" = "Gagal untuk mengirim";
+"room_event_action_delete_confirmation_title" = "Hapus pesan yang belum terkirim";
+"room_event_action_view_decrypted_source" = "Tampilkan Sumber Yang Terdekripsi";
+"room_delete_unsent_messages" = "Hapus pesan yang belum terkirim";
+"room_resend_unsent_messages" = "Kirim ulang pesan yang belum terkirim";
+"room_unsent_messages_cancel_title" = "Hapus pesan yang belum terkirim";
+"room_message_reply_to_short_placeholder" = "Kirim sebuah balasan…";
+"room_message_short_placeholder" = "Kirim sebuah pesan…";
+"room_message_replying_to" = "Membalas ke %@";
+"room_one_user_is_typing" = "%@ sedang mengetik…";
+"room_new_messages_notification" = "%d pesan baru";
+"room_new_message_notification" = "%d pesan baru";
+"room_accessiblity_scroll_to_bottom" = "Scroll ke bawah";
+"room_jump_to_first_unread" = "Arahkan ke belum dibaca";
+"room_member_power_level_moderator_in" = "Moderator di %@";
+"room_member_power_level_admin_in" = "Admin di %@";
+"room_participants_action_start_video_call" = "Mulai panggilan video";
+"room_participants_action_start_voice_call" = "Mulai panggilan suara";
+"room_participants_action_start_new_chat" = "Mulai obrolan baru";
+"room_participants_action_leave" = "Tinggalkan ruangan ini";
+"room_participants_filter_room_members" = "Filter anggota ruangan";
+"contacts_user_directory_offline_section" = "DIREKTORI PENGGUNA (offline)";
+"contacts_address_book_permission_denied_alert_title" = "Kontak dinonaktifkan";
+"contacts_address_book_no_contact" = "Tidak ada kontak lokal";
+"contacts_address_book_matrix_users_toggle" = "Hanya pengguna Matrix";
+"directory_search_results_title" = "Jelajahi hasil direktori";
+"room_recents_join_room_title" = "Bergabung ke sebuah ruangan";
+"room_recents_suggested_rooms_section" = "RUANGAN YANG DISARANKAN";
+"room_creation_appearance_picture" = "Gambar obrolan (opsional)";
+"social_login_button_title_continue" = "Lanjut dengan %@";
+"auth_softlogout_clear_data_sign_out_title" = "Apakah Anda yakin?";
+"auth_softlogout_clear_data_button" = "Bersihkan semua data";
+"auth_softlogout_clear_data" = "Bersihkan data personal";
+"auth_softlogout_signed_out" = "Anda telah keluar";
+"version_check_modal_action_title_supported" = "Mengerti";
+"voice_message_lock_screen_placeholder" = "Pesan suara";
+"voice_message_remaining_recording_time" = "%@s keluar";
+"side_menu_app_version" = "Versi %@";
+"side_menu_action_invite_friends" = "Undang teman";
+
+// Mark: - Side menu
+
+"side_menu_reveal_action_accessibility_label" = "Panel kiri";
+"room_intro_cell_information_room_with_topic_sentence2" = "Topik: %@";
+
+// Mark: - Room creation introduction cell
+
+"room_intro_cell_add_participants_action" = "Tambahkan orang";
+"call_transfer_dialpad" = "Tombol penyetel";
+
+// MARK: - Dial Pad
+"dialpad_title" = "Tombol penyetel";
+"room_info_list_several_members" = "%@ anggota";
+
+// MARK: - Room Info
+
+"room_info_list_one_member" = "1 anggota";
+"create_room_section_header_address" = "Alamat ruangan";
+"create_room_type_public" = "Ruangan Publik";
+"create_room_type_private" = "Ruangan Privat";
+"create_room_section_header_type" = "Tipe ruangan";
+"create_room_enable_encryption" = "Aktifkan Enkripsi";
+"create_room_section_header_encryption" = "Enkripsi ruangan";
+"create_room_section_header_name" = "Nama ruangan";
+
+// MARK: - Create Room
+
+"create_room_title" = "Ruangan Baru";
+"searchable_directory_x_network" = "Jaringan %@";
+"biometrics_desetup_disable_button_title_x" = "Nonaktifkan %@";
+"biometrics_desetup_title_x" = "Nonaktifkan %@";
+"biometrics_setup_enable_button_title_x" = "Aktifkan %@";
+"biometrics_setup_title_x" = "Aktifkan %@";
+"biometrics_settings_enable_x" = "Aktifkan %@";
+"biometrics_mode_face_id" = "Face ID";
+
+// MARK: - Biometrics Protection
+
+"biometrics_mode_touch_id" = "Touch ID";
+"pin_protection_settings_change_pin" = "Ubah PIN";
+"pin_protection_settings_enable_pin" = "Aktifkan PIN";
+"pin_protection_settings_enabled_forced" = "PIN diaktifkan";
+"pin_protection_reset_alert_title" = "Atur Ulang PIN";
+
+// MARK: - PIN Protection
+
+"pin_protection_choose_pin_welcome_after_login" = "Selamat datang kembali.";
+"major_update_done_action" = "Mengerti";
+"major_update_learn_more_action" = "Pelajari lebih lanjut";
+
+// MARK: - Secrets reset
+
+"secrets_reset_title" = "Atur ulang semuanya";
+"secrets_setup_recovery_passphrase_confirm_passphrase_placeholder" = "Konfirmasi frasa";
+"secrets_recovery_with_key_recover_action" = "Gunakan Kunci";
+
+// Recover with key
+
+"secrets_recovery_with_key_title" = "Kunci Keamanan";
+"secrets_recovery_with_passphrase_recover_action" = "Gunakan Frasa";
+
+// Recover with passphrase
+
+"secrets_recovery_with_passphrase_title" = "Frasa Keamanan";
+"secrets_recovery_reset_action_part_2" = "Atur ulang semuanya";
+"user_verification_session_details_verify_action_other_user" = "Verifikasi secara manual";
+"user_verification_session_details_verify_action_current_user" = "Verifikasi Secara Interaktif";
+"user_verification_session_details_information_trusted_other_user_part2" = " memverifikasinya:";
+"user_verification_session_details_untrusted_title" = "Tidak Dipercayai";
+"user_verification_sessions_list_session_untrusted" = "Tidak dipercayai";
+
+// MARK: - User verification
+
+// Start
+
+"user_verification_start_verify_action" = "Mulai verifikasi";
+
+// Scanned
+"key_verification_scan_confirmation_scanned_title" = "Hampir selesai!";
+"key_verification_verify_qr_code_scan_other_code_success_title" = "Kode tervalidasi!";
+"key_verification_verify_qr_code_cannot_scan_action" = "Tidak dapat memindai?";
+"key_verification_tile_request_status_accepted" = "Anda menerimanya";
+"key_verification_tile_request_status_cancelled" = "%@ membatalkannya";
+"key_verification_tile_request_status_cancelled_by_me" = "Anda membatalkannya";
+"key_verification_tile_request_status_data_loading" = "Memuat data…";
+"key_verification_tile_request_outgoing_title" = "Verifikasi terkirim";
+
+// Tiles
+
+"key_verification_tile_request_incoming_title" = "Permintaan verifikasi";
+
+// MARK: File upload
+"file_upload_error_title" = "Unggahan file";
+"device_verification_emoji_light bulb" = "Bolham Lampu";
+"device_verification_emoji_thumbs up" = "Jempol";
+"device_verification_verified_got_it_button" = "Mengerti";
+"key_verification_manually_verify_device_key_title" = "Kunci sesi";
+"key_verification_manually_verify_device_id_title" = "ID Sesi";
+"key_verification_manually_verify_device_name_title" = "Nama sesi";
+"key_verification_verify_sas_validate_action" = "Mereka cocok";
+"key_verification_verify_sas_title_number" = "Bandingkan nomor";
+
+// MARK: Verify
+
+"key_verification_verify_sas_title_emoji" = "Bandingkan emoji";
+
+// MARK: Self verification wait
+
+"device_verification_self_verify_wait_title" = "Keamanan lengkap";
+"device_verification_self_verify_start_verify_action" = "Mulai verifikasi";
+"device_verification_start_verify_button" = "Mulai Memverifikasi";
+"key_verification_user_title" = "Verifikasi mereka";
+
+// MARK: - Device Verification
+"key_verification_other_session_title" = "Verifikasi sesi";
+"sign_out_key_backup_in_progress_alert_cancel_action" = "Saya akan tunggu";
+"sign_out_non_existing_key_backup_sign_out_confirmation_alert_sign_out_action" = "Keluar";
+"sign_out_existing_key_backup_alert_sign_out_action" = "Keluar";
+
+// Success
+
+"key_backup_recover_success_info" = "Cadangan Terpulihkan!";
+"key_backup_recover_from_passphrase_recover_action" = "Buka Kunci Riwayat";
+"key_backup_recover_from_recovery_key_recover_action" = "Buka Kunci Riwayat";
+"key_backup_recover_from_passphrase_passphrase_placeholder" = "Masukkan Frasa";
+
+// MARK: Key backup recover
+
+"key_backup_recover_title" = "Pesan Aman";
+"key_backup_setup_success_from_recovery_key_recovery_key_title" = "Kunci Keamanan";
+"key_backup_setup_passphrase_set_passphrase_action" = "Atur Frasa";
+"key_backup_setup_passphrase_confirm_passphrase_placeholder" = "Konfirmasi frasa";
+"key_backup_setup_passphrase_passphrase_placeholder" = "Masukkan frasa";
+
+
+// MARK: Key backup setup
+
+"key_backup_setup_title" = "Cadangan Kunci";
+
+// Banner
+
+"secure_backup_setup_banner_title" = "Cadangan Aman";
+"secure_key_backup_setup_existing_backup_error_delete_it" = "Hapus";
+"secure_key_backup_setup_existing_backup_error_unlock_it" = "Buka kuncinya";
+
+// MARK: Secure backup setup
+
+// Intro
+
+"secure_key_backup_setup_intro_title" = "Cadangan Aman";
+
+// Re-request confirmation dialog
+"rerequest_keys_alert_title" = "Permintaan Terkirim";
+"deactivate_account_password_alert_title" = "Nonaktifkan Akun";
+"deactivate_account_validate_action" = "Nonaktifkan akun";
+
+// Deactivate account
+
+"deactivate_account_title" = "Nonaktifkan Akun";
+"gdpr_consent_not_given_alert_review_now_action" = "Lihat sekarang";
+"e2e_room_key_request_ignore_request" = "Tolak permintaan";
+"room_widget_permission_room_id_permission" = "ID Ruangan";
+"room_widget_permission_widget_id_permission" = "ID Widget";
+"room_widget_permission_theme_permission" = "Tema Anda";
+
+// Room widget permissions
+"room_widget_permission_title" = "Muat Widget";
+"bug_report_progress_uploading" = "Mengunggah laporan";
+"bug_report_progress_zipping" = "Mengumpulkan log";
+"bug_report_send_screenshot" = "Kirim tangkapan layar";
+"bug_report_send_logs" = "Kirim log";
+"bug_crash_report_title" = "Laporan Crash";
+
+// Bug report
+"bug_report_title" = "Laporan Bug";
+"deactivate_account_password_alert_message" = "Untuk melanjutkan, mohon masukkan kata sandi Anda";
+"widget_integration_must_be_in_room" = "Anda tidak berada di ruangan ini.";
+"settings_devices_description" = "Nama publik sesi dapat dilihat oleh orang yang berkomunikasi dengan Anda";
+"settings_key_backup_delete_confirmation_prompt_msg" = "Apakah Anda yakin? Anda akan kehilangan pesan terenkripsi jika kunci Anda tidak dicadangkan secara benar.";
+"settings_key_backup_info_trust_signature_invalid_device_unverified" = "Cadangan memiliki tanda tangan yang tidak valid dari %@";
+"settings_key_backup_info_trust_signature_invalid_device_verified" = "Cadangan mempunyai tanda tangan yang tidak valid dari %@";
+"settings_key_backup_info_trust_signature_valid_device_verified" = "Cadangan mempunyai tanda tangan yang valid dari %@";
+"settings_key_backup_info_trust_signature_valid" = "Cadangan mempunyai tanda tangan yang valid dari sesi ini";
+"settings_key_backup_info_trust_signature_unknown" = "Cadangan mempunyai tanda tangan dari sesi dengan ID: %@";
+"settings_key_backup_info_not_valid" = "Sesi ini tidak mencadangkan kunci Anda, tetapi Anda memiliki cadangan yang ada yang dapat Anda pulihkan dan tambahkan untuk selanjutnya.";
+"settings_key_backup_info_valid" = "Sesi ini mencadangkan kunci Anda.";
+"settings_key_backup_info_signout_warning" = "Cadangkan kunci Anda sebelum keluar untuk mencegah kehilangannya.";
+"settings_key_backup_info_none" = "Kunci Anda tidak dicadangkan dari sesi ini.";
+"settings_key_backup_info" = "Pesan terenkripsi diamankan dengan enkripsi ujung-ke-ujung. Hanya Anda dan penerima punya kuncinya untuk membaca pesannya.";
+"settings_labs_e2e_encryption_prompt_message" = "Untuk menyelesaikan enkripsi Anda harus masuk lagi.";
+"settings_contacts_enable_sync_description" = "Ini akan menggunakan server identitas Anda untuk menghubung Anda dengan kontak Anda, dan membantunya untuk menemukan Anda.";
+"settings_show_url_previews_description" = "Pratinjau akan ditampilkan di ruangan yang tidak dienkripsi.";
+"settings_ui_theme_picker_message_invert_colours" = "\"Otomatis\" menggunakan pengaturan \"Balikkan Warna\" perangkat Anda";
+"settings_ui_theme_picker_message_match_system_theme" = "\"Otomatis\" mencocokkan dengan tema sistem perangkat Anda";
+"settings_calls_stun_server_fallback_description" = "Izinkan server panggilan %@ cadangan saat server homeserver Anda tidak menawarkannya (alamat IP Anda akan dibagikan selama panggilan).";
+"settings_mentions_and_keywords_encryption_notice" = "Anda tidak akan dapat notifikasi untuk sebutan & keyword di ruangan terenkripsi di ponsel.";
+"settings_notifications_disabled_alert_message" = "Untuk mengaktifkan notifikasi, pergi ke pengaturan perangkat Anda.";
+"settings_global_settings_info" = "Pengaturan notifikasi global tersedia di klien web %@ Anda";
+"settings_confirm_media_size_description" = "Saat ini aktif, Anda akan diminta untuk mengkonfirmasi ukuran gambar dan video yang akan dikirim.";
+"settings_remove_phone_prompt_msg" = "Apakah Anda yakin untuk menghapus nomor telepon %@?";
+"settings_remove_email_prompt_msg" = "Apakah Anda yakin untuk menghapus alamat email %@?";
+"room_preview_try_join_an_unknown_room" = "Anda mencoba untuk mengakses %@. Apakah Anda ingin bergabung untuk ikut dengan obrolannya?";
+"room_preview_subtitle" = "Ini adalah pratinjau dari ruangan ini. Interaksi ruangan telah dinonaktifkan.";
+
+// Room Preview
+"room_preview_invitation_format" = "Anda telah diundang untuk bergabung ke ruangan ini oleh %@";
+"external_link_confirmation_message" = "Tautan %@ akan membawa Anda ke situs yang lain: %@\n\nApakah Anda yakin untuk melanjutkan?";
+"room_no_privileges_to_create_group_call" = "Anda harus menjadi sebuah admin atau moderator untuk memulai sebuah panggilan.";
+"room_resource_usage_limit_reached_message_2" = "beberapa pengguna tidak dapat masuk.";
+"room_resource_usage_limit_reached_message_1_monthly_active_user" = "Server rumah ini telah melampaui batas Pengguna Aktif Bulanannya, jadi ";
+"room_resource_usage_limit_reached_message_1_default" = "Homeserver ini telah melampaui salah satu batas sumber dayanya, jadi ";
+"room_predecessor_information" = "Ruangan ini adalah lanjutan dari obrolan lain.";
+"room_replacement_information" = "Ruangan ini telah diganti dan tidak aktif lagi.";
+"room_event_action_delete_confirmation_message" = "Apakah Anda yakin untuk menghapus pesan yang tidak terkirim ini?";
+"room_event_action_report_prompt_ignore_user" = "Apakah Anda ingin menyembunyikan semua pesan dari pengguna ini?";
+"room_conference_call_no_power" = "Anda membutuhkan izin untuk mengelola panggilan konferensi di ruangan ini";
+"room_ongoing_conference_call_with_close" = "Panggilan konferensi berjalan. Bergabung sebagai %@ atau %@. %@ dia.";
+"room_ongoing_conference_call" = "Panggilan konferensi berjalan. Bergabung sebagai %@ atau %@.";
+"room_unsent_messages_cancel_message" = "Apakah Anda yakin untuk menghapus semua pesan yang tidak terkirim di ruangan ini?";
+"room_unsent_messages_unknown_devices_notification" = "Pesan gagal dikirim karena sesi yang tidak dikenal yang ada.";
+"room_offline_notification" = "Koneksi ke server telah hilang.";
+"room_do_not_have_permission_to_post" = "Anda tidak memiliki izin untuk mengirim ke ruangan ini";
+
+// Chat
+"room_slide_to_end_group_call" = "Geser untuk mengakhiri panggilan untuk semuanya";
+"room_participants_security_information_room_not_encrypted" = "Pesan di ruangan ini tidak dienkripsi secara ujung-ke-ujung.";
+"room_participants_start_new_chat_error_using_user_email_without_identity_server" = "Tidak ada server identitas yang diatur, jadi Anda tidak dapat mengobrol dengan sebuah kontak menggunakan email.";
+"room_participants_invite_malformed_id" = "ID cacat. Seharusnya sebuah alamat email atau ID Matrix seperti '@pengguna:domain'";
+"room_participants_invite_another_user" = "Cari/Undang dengan ID Pengguna, Nama atau email";
+"room_participants_invite_prompt_msg" = "Apakah Anda yakin untuk mengundang %@ ke obrolan ini?";
+"room_participants_remove_third_party_invite_prompt_msg" = "Apakah Anda yakin untuk menghapus undangan ini?";
+"room_participants_remove_prompt_msg" = "Apakah Anda yakin untuk mengeluarkan %@ dari obrolan ini?";
+"room_participants_leave_prompt_msg_for_dm" = "Apakah Anda yakin Anda ingin keluar?";
+"room_participants_leave_prompt_msg" = "Apakah Anda yakin untuk meninggalkan ruangan ini?";
+"find_your_contacts_identity_service_error" = "Tidak dapat menghubung ke server identitasnya.";
+"find_your_contacts_footer" = "Ini dapat dinonaktifkan di pengaturan kapan saja.";
+"find_your_contacts_message" = "Izinkan %@ untuk menampilkan kontak Anda supaya Anda dapat mengobrol dengan orang yang Anda tahu dengan cepat.";
+"contacts_address_book_permission_denied_alert_message" = "Untuk mengaktifkan kontak, pergi ke pengaturan perangkat Anda.";
+"contacts_address_book_permission_denied" = "Anda tidak mengizinkan %@ untuk mengakses kontak lokal Anda";
+"search_people_placeholder" = "Cari dengan ID Pengguna, Nama atau email";
+"rooms_empty_view_information" = "Ruangan baik untuk obrolan grup apa saja, privat atau publik. Ketuk + untuk menambahkan ruangan yang sudah ada, atau buat yang baru.";
+"people_empty_view_information" = "Obrol dengan aman dengan siapa saja. Ketuk + untuk mulai menambahkan orang.";
+"room_recents_unknown_room_error_message" = "Tidak dapat menemukan ruangan ini. Pastikan ruangannya sudah ada";
+"room_recents_join_room_prompt" = "Masukkan ID ruangan atau alias ruangan";
+"room_creation_dm_error" = "Kami tidak dapat membuat DM Anda. Mohon cek ulang pengguna yang Anda ingin undang dan coba lagi.";
+"room_creation_error_invite_user_by_email_without_identity_server" = "Tidak ada server identitas yang diatur, jadi Anda tidak dapat menambahkan anggota dengan email.";
+"room_creation_wait_for_creation" = "Sebuah ruangan telah dibuat. Mohon tunggu.";
+"room_creation_make_public_prompt_msg" = "Apakah Anda ingin membuat obrolan ini publik? Siapa saja dapat membaca pesan Anda dan bergabung ke obrolan ini.";
+
+// Errors
+"error_user_already_logged_in" = "Sepertinya Anda mencoba untuk menghubungkan ke homeserver yang lain. Apakah Anda ingin keluar?";
+"auth_softlogout_clear_data_message_2" = "Hapuslah jika Anda selesai menggunakan perangkat ini, atau ingin masuk ke akun yang lain.";
+"auth_softlogout_clear_data_message_1" = "Peringatan: Data personal Anda (termasuk kunci enkripsi) masih disimpan di perangkat ini.";
+"auth_softlogout_reason" = "Admin homeserver (%1$@) telah mengeluarkan Anda dari akun %2$@ Anda (%3$@).";
+"auth_accept_policies" = "Harap tinjau dan setujui kebijakan homeserver ini:";
+"widget_integration_positive_power_level" = "Tingkat daya harus bilangan bulat yang positif.";
+"settings_integrations_allow_description" = "Gunakan sebuah pengelola integrasi (%@) untuk mengelola bot, jembatan, widget, dan paket stiker.\n\nPengelola integrasi mendapatkan data pengaturan, dan dapat mengubah widget, mengirim undangan ruangan dan mengatur tingkat daya dengan pengetahuan Anda.";
+"widget_integrations_server_failed_to_connect" = "Gagal untuk menghubungkan ke server integrasi";
+"call_no_stun_server_error_title" = "Panggilan gagal karena server yang salah konfigurasinya";
+"call_jitsi_error" = "Gagal untuk bergabung ke panggilan konferensi.";
+"homeserver_connection_lost" = "Tidak dapat menghubungkan ke homeservernya.";
+"room_details_save_changes_prompt" = "Apakah Anda ingin menyimpan perubahannya?";
+"room_details_fail_to_update_room_canonical_alias" = "Gagal untuk memperbarui alamat utama";
+"room_details_fail_to_update_room_communities" = "Gagal untuk memperbarui komunitas terkait";
+"room_details_fail_to_remove_room_aliases" = "Gagal untuk menghapus alamat-alamat ruangan";
+"room_details_fail_to_update_history_visibility" = "Gagal untuk memperbarui visibilitas riwayat";
+"room_details_fail_to_update_room_join_rule" = "Gagal untuk memperbarui aturan bergabung";
+"room_details_fail_to_update_room_name" = "Gagal untuk memperbarui nama ruangannya";
+"room_details_fail_to_update_avatar" = "Gagal untuk memperbarui foto ruangannya";
+"room_details_advanced_e2e_encryption_enabled" = "Enkripsi diaktifkan di ruangan ini";
+"room_details_new_flair_placeholder" = "Tambahkan ID komunitas baru (mis. +foo%@)";
+"room_details_no_local_addresses" = "Ruangan ini tidak memiliki alamat lokal";
+"room_details_history_section_members_only_since_invited" = "Anggota saja (sejak mereka diundang)";
+"room_details_access_section_directory_toggle" = "Daftarkan ruangan ini ke direkori ruangan";
+"room_details_access_section_invited_only" = "Hanya orang yang diundang";
+"identity_server_settings_alert_disconnect" = "Lepaskan hubungan dari server identitas %@?";
+"security_settings_blacklist_unverified_devices" = "Jangan kirimkan pesan ke sesi yang tidak dipercayai";
+"security_settings_crosssigning_info_not_bootstrapped" = "Penandatanganan silang belum disiapkan.";
+"settings_key_backup_button_connect" = "Hubungkan sesi ini ke Cadangan Kunci";
+"settings_key_backup_info_trust_signature_valid_device_unverified" = "Cadangan memiliki tanda tangan dari %@";
+"settings_add_3pid_password_message" = "Untuk melanjutkan, mohon masukkan kata sandi Anda";
+"settings_send_crash_report" = "Kirim crash & data penggunaan anonim";
+"secure_key_backup_setup_cancel_alert_message" = "Jika Anda membatalkan sekarang, Anda mungkin kehilangan pesan & data terenkripsi jika Anda kehilangan akses ke login Anda.\n\nAnda juga dapat mengatur Cadangan Aman & kelola kunci Anda di Pengaturan.";
+"room_participants_security_information_room_encrypted" = "Pesan di ruangan ini dienkripsi secara ujung-ke-ujung.\n\nPesan Anda diamankan dengan kunci dan hanya Anda dan penerima punya kunci uniknya untuk membukanya.";
+"settings_callkit_info" = "Terima panggilan masuk di layar kunci Anda. Lihat panggilan %@ Anda di riwayat panggilan sistem. Jika iCloud diaktifkan, riwayat panggilannya akan dibagikan dengan Apple.";
+"settings_three_pids_management_information_part1" = "Kelola alamat email dan nomor telepon apa saja Anda dapat gunakan untuk masuk atau memulihkan akun Anda di sini. Atur siapa saja yang dapat menemukan Anda di ";
+"settings_sign_out_e2e_warn" = "Anda akan kehilangan kunci enkripsi ujung-ke-ujung Anda. Ini berarti Anda tidak akan lagi dapat membaca pesan lama di ruangan terenkripsi di perangkat ini.";
+"room_participants_security_information_room_encrypted_for_dm" = "Pesan di pesan langsung ini dienkripsi secara ujung-ke-ujung.\n\nPesan Anda diamankan dengan kunci dan hanya Anda dan penerima punya kunci uniknya untuk membukanya.";
+"auth_softlogout_clear_data_sign_out_msg" = "Apakah Anda yakin ingin menghapus semua data yang saat ini tersimpan di perangkat ini? Masuk lagi untuk mengakses data dan pesan akun Anda.";
+"auth_softlogout_recover_encryption_keys" = "Masuk untuk memulihkan kunci enkripsi yang disimpan secara eksklusif di perangkat ini. Anda membutuhkannya untuk membaca semua pesan aman Anda di perangkat apa saja.";
+"version_check_modal_subtitle_deprecated" = "Kami telah berupaya meningkatkan %@ untuk pengalaman yang lebih cepat dan lebih halus. Sayangnya versi iOS Anda saat ini tidak  kompatibel dengan beberapa perbaikan tersebut dan tidak akan didukung lagi.\nKami menyarankan Anda untuk meningkatkan sistem operasi Anda untuk menggunakan %@ secara maksimal.";
+"version_check_modal_subtitle_supported" = "Kami telah berupaya meningkatkan %@ untuk pengalaman yang lebih cepat dan lebih halus. Sayangnya versi iOS Anda saat ini tidak kompatibel dengan beberapa perbaikan tersebut dan tidak akan didukung lagi.\nKami menyarankan Anda untuk meningkatkan sistem operasi Anda untuk menggunakan %@ secara maksimal.";
+"space_feature_unavailable_information" = "Space adalah cara baru untuk mengelompokkan ruangan dan pengguna.\n\nMereka akan segera datang. Untuk saat ini, jika Anda bergabung sebuah space di platform lain, Anda akan dapat mengakses ruang mana saja yang Anda ikuti di sini.";
+
+// Success from passphrase
+"key_backup_setup_success_from_passphrase_info" = "Kunci Anda sedang dicadangkan.\n\nKunci Keamanan Anda adalah jaring pengaman - Anda dapat menggunakannya untuk memulihkan akses ke pesan terenkripsi jika Anda lupa frasa sandi.\n\nSimpan Kunci Keamanan Anda di suatu tempat yang sangat aman, seperti pengelola kata sandi (atau brankas).";
+"key_backup_setup_passphrase_info" = "Kami akan menyimpan salinan terenkripsi dari kunci Anda di server kami. Lindungi cadangan Anda dengan frasa agar tetap aman.\n\nUntuk keamanan maksimum, ini harus berbeda dari kata sandi akun Anda.";
+"key_backup_setup_intro_info" = "Pesan di ruang terenkripsi diamankan dengan enkripsi ujung-ke-ujung. Hanya Anda dan penerima yang memiliki kunci untuk membaca pesan ini.\n\nCadangkan kunci Anda dengan aman untuk menghindari kehilangannya.";
+"deactivate_account_informations_part5" = "Jika Anda ingin kami melupakan pesan Anda, silakan centang kotak di bawah ini\n\nVisibilitas pesan di Matrix mirip dengan email. Kami melupakan pesan Anda berarti bahwa pesan yang telah Anda kirim tidak akan dibagikan dengan pengguna baru atau tidak terdaftar, tetapi pengguna terdaftar yang sudah memiliki akses ke pesan ini akan tetap memiliki akses ke salinannya.";
+"deactivate_account_informations_part1" = "Ini akan membuat akun Anda tidak dapat digunakan secara permanen. Anda tidak akan dapat masuk, dan tidak seorang pun dapat mendaftarkan ulang ID pengguna yang sama. Ini akan menyebabkan akun Anda meninggalkan semua ruangan yang diikutinya, dan akan menghapus detail akun Anda dari server identitas Anda. ";
+"e2e_need_log_in_again" = "Anda harus masuk kembali untuk membuat kunci enkripsi ujung-ke-ujung untuk sesi ini dan mengirimkan kunci publik ke homeserver Anda.\nIni hanya dilakukan sekali saja; maaf untuk ketidaknyamanannya.";
+"call_no_stun_server_error_message_2" = "Atau, Anda dapat mencoba menggunakan server publik di %@, tetapi ini tidak akan dapat diandalkan, dan alamat IP Anda akan dibagikan dengan server tersebut. Anda juga dapat mengelola ini di Pengaturan";
+"identity_server_settings_alert_disconnect_still_sharing_3pid" = "Anda masih membagikan data personal Anda di server identitas %@.\n\nKami mensarankan Anda untuk menghapus alamat email dan nomor telepon Anda dari server identitasnya sebelum memutuskan hubungannya.";
+"security_settings_crosssigning_info_trusted" = "Penandatanganan silang diaktifkan. Anda dapat mempercayai pengguna lain dan sesi lain Anda berbasis penandatanganan silang tetapi Anda tidak dapat menandatangani sesi ini karena tidak memiliki kunci privat penandatanganan silang. Keamanan lengkap sesi ini.";
+"settings_discovery_three_pids_management_information_part1" = "Kelola alamat email atau nomor telepon apa saja yang pengguna lain dapat menggunakan untuk menemukan Anda dan menggunakannya untuk mengundang Anda ke ruangan. Tambahkan atau hapus alamat email atau nomor telepon dari daftar ini di ";
+"room_preview_unlinked_email_warning" = "Undangan ini telah dikirim ke %@, yang tidak diasosiasikan dengan akun ini. Anda mungkin ingin masuk ke akun yang lain, atau tambahkan email ini ke akun Anda.";
+"unknown_devices_alert" = "Ruangan ini berisi sesi tidak dikenal yang belum diverifikasi.\nIni berarti tidak ada jaminan bahwa sesi tersebut adalah milik pengguna yang mereka klaim.\nKami menyarankan Anda memverifikasinya untuk setiap sesi sebelum melanjutkan, tetapi Anda dapat mengirim ulang pesan tanpa memverifikasi jika Anda mau.";
+"room_warning_about_encryption" = "Enkripsi ujung-ke-ujung masih dalam beta dan mungkin tidak dapat dihandalkan.\n\nAnda seharusnya tidak mempercayainya dulu untuk mengamankan data.\n\nPerangkat masih belum dapat mendekripsi riwayat sebelum mereka bergabung ke ruangannya.\n\nPesan terenkripsi masih belum terlihat di client yang belum mengimplementasikan enkripsi.";
+"auth_add_email_and_phone_warning" = "Pendaftaran dengan email dan nomor telepon sekaligus belum didukung sampai API-nya sudah ada. Hanya nomor telepon yang akan diperhitungkan. Anda dapat menambahkan email Anda di profil Anda di pengaturan.";
+"auth_reset_password_success_message" = "Kata sandi Anda telah diatur ulang.\n\nAnda telah dikeluarkan dari semua sesi dan tidak akan menerima lagi notifikasi push. Untuk mengaktifkan ulang notifikasi, masuk ulang di setiap perangkat.";
+"spaces_add_rooms_coming_soon_title" = "Penambahan ruangan akan segera datang";
+"leave_space_and_all_rooms_action" = "Tinggalkan semua ruangan dan space";
+"space_beta_announce_subtitle" = "Versi baru dari komunitas";
+"room_intro_cell_information_room_sentence1_part1" = "Ini adalah awal dari ";
+"create_room_section_footer_encryption" = "Enkripsi tidak dapat dinonaktifkan setelah ini.";
+"pin_protection_confirm_pin_to_change" = "Konfirmasi PIN untuk mengubah PIN";
+"pin_protection_confirm_pin_to_disable" = "Konfirmasi PIN untuk menonaktifkan PIN";
+"pin_protection_choose_pin" = "Buat sebuah PIN untuk keamanan";
+"cross_signing_setup_banner_subtitle" = "Verifikasi perangkat Anda yang lain dengan mudah";
+"secrets_setup_recovery_passphrase_additional_information" = "Jangan menggunakan kata sandi akun Anda.";
+"secrets_recovery_with_key_invalid_recovery_key_title" = "Tidak dapat mengakses penyimpanan rahasia";
+"secrets_recovery_with_passphrase_invalid_passphrase_title" = "Tidak dapat mengakses penyimpanan rahasia";
+
+// MARK: Scan confirmation
+
+// Scanning
+"key_verification_scan_confirmation_scanning_title" = "Hampir selesai! Menunggu untuk konfirmasi…";
+"key_verification_verify_qr_code_scan_code_other_device_action" = "Pindai dengan perangkat ini";
+"key_verification_verify_qr_code_emoji_information" = "Verifikasi dengan membandingkan emoji unik.";
+
+// Device
+
+"device_verification_verify_wait_partner" = "Menunggu lainnya untuk menerima…";
+"device_verification_self_verify_wait_recover_secrets_with_passphrase" = "Gunakan Frasa Sandi atau Kunci";
+
+// Unverified sessions
+
+"key_verification_self_verify_unverified_sessions_alert_title" = "Lihat dimana Anda masuk";
+
+// MARK: Self verification start
+
+// New login
+"device_verification_self_verify_alert_title" = "Pemasukan baru. Apakah ini Anda?";
+"device_verification_start_wait_partner" = "Menunggu untuk lainnya untuk menerima…";
+"room_widget_permission_creator_info_title" = "Widget ini ditambahkan oleh:";
+"widget_integration_room_not_visible" = "Ruangan %@ tidak terlihat.";
+"widget_integration_room_not_recognised" = "Ruangan ini tidak diketahui.";
+"call_incoming_video_prompt" = "Panggilan video masuk dari %@";
+
+// Call
+"call_incoming_voice_prompt" = "Panggilan suara masuk dari %@";
+"event_formatter_widget_removed_by_you" = "Anda menghapus widget ini: %@";
+
+// Events formatter with you
+"event_formatter_widget_added_by_you" = "Anda menambahkan widget ini: %@";
+"event_formatter_call_has_ended_with_time" = "Panggilan berakhir • %@";
+"event_formatter_jitsi_widget_removed" = "Konferensi VoIP dihapus oleh %@";
+"event_formatter_jitsi_widget_added" = "Konferensi VoIP ditambahkan oleh %@";
+"event_formatter_widget_removed" = "Widget %@ dihapus oleh %@";
+"event_formatter_widget_added" = "Widget %@ ditambahkan oleh %@";
+"directory_server_all_rooms" = "Semua ruangan di server %@";
+"room_notifs_settings_mentions_and_keywords" = "Sebutan dan Keyword saja";
+"room_details_fail_to_update_topic" = "Gagal untuk memperbarui topiknya";
+"room_details_advanced_e2e_encryption_blacklist_unverified_devices" = "Enkripsi ke sesi terverifikasi saja";
+"room_details_advanced_e2e_encryption_disabled_for_dm" = "Enkripsi tidak diaktifkan di sini.";
+"room_details_new_address_placeholder" = "Tambahkan alamat baru (mis. #foo%@)";
+"room_details_no_local_addresses_for_dm" = "Ini tidak ada alamat lokal";
+"room_details_history_section_members_only_since_joined" = "Anggota saja (sejak mereka bergabung)";
+"room_details_access_section" = "Siapa saja yang dapat mengakses ruangan ini?";
+"manage_session_sign_out" = "Keluar dari sesi ini";
+"security_settings_crosssigning_info_ok" = "Penandatanganan silang siap dipakai.";
+"settings_discovery_error_message" = "Sebuah kesalahan terjadi. Mohon coba lagi.";
+"settings_crypto_blacklist_unverified_devices" = "Enkripsi ke sesi terverifikasi saja";
+"settings_password_updated" = "Kata sandi Anda telah diperbarui";
+"settings_enable_rageshake" = "Rage shake untuk melaporkan bug";
+
+// No VoIP support
+"no_voip_title" = "Panggilan masuk";
+"event_formatter_group_call" = "Panggilan grup";
+"event_formatter_call_end_call" = "Akhiri panggilan";
+"event_formatter_call_back" = "Panggil balik";
+"event_formatter_call_connection_failed" = "Koneksi gagal";
+"event_formatter_call_you_declined" = "Panggilan ditolak";
+"event_formatter_call_has_ended" = "Panggilan berakhir";
+
+// Image picker
+"image_picker_action_camera" = "Ambil foto";
+
+// Media picker
+"media_picker_title" = "Perpustakaan media";
+"group_participants_invite_malformed_id_title" = "Kesalahan Undangan";
+"group_participants_leave_prompt_title" = "Tinggalkan grup";
+
+// Group participants
+"group_participants_add_participant" = "Tambahkan peserta";
+"group_home_multi_rooms_format" = "%tu ruangan";
+"group_home_one_room_format" = "1 ruangan";
+"group_home_multi_members_format" = "%tu anggota";
+
+// Group Home
+"group_home_one_member_format" = "1 anggota";
+
+// Group Details
+"group_details_title" = "Detail Komunitas";
+"room_event_action_forward" = "Teruskan";
+"poll_edit_form_add_option" = "Tambahkan opsi";
+"poll_edit_form_option_number" = "Opsi %d";
+"poll_edit_form_create_options" = "Buat opsi";
+"poll_edit_form_input_placeholder" = "Tulis sesuatu";
+"poll_edit_form_question_or_topic" = "Pertanyaan atau topik";
+"poll_edit_form_poll_question_or_topic" = "Pertanyaan atau topik poll";
+
+// Mark: - Polls
+
+"poll_edit_form_create_poll" = "Buat poll";
+"share_extension_send_now" = "Kirim sekarang";
+"share_extension_low_quality_video_message" = "Kirim dalam %@ untuk kualitas yang lebih baik, atau kirim dengan kualitas rendah di bawah.";
+"share_extension_low_quality_video_title" = "Video akan dikirim dalam kualitas rendah";
+"settings_discovery_accept_terms" = "Terima Persyaratan Server Identitas";
+"settings_about" = "TENTANG";
diff --git a/Riot/Assets/it.lproj/Vector.strings b/Riot/Assets/it.lproj/Vector.strings
index aa161e9da..ce4d6c96d 100644
--- a/Riot/Assets/it.lproj/Vector.strings
+++ b/Riot/Assets/it.lproj/Vector.strings
@@ -297,7 +297,7 @@
 "settings_ignored_users" = "UTENTI IGNORATI";
 "settings_contacts" = "CONTATTI DEL DISPOSITIVO";
 "settings_advanced" = "AVANZATE";
-"settings_other" = "ALTRO";
+"settings_other" = "Altro";
 "settings_labs" = "LABORATORIO";
 "settings_flair" = "Mostra la predisposizione quando è consentito";
 "settings_devices" = "SESSIONI";
@@ -1501,3 +1501,20 @@
 "find_your_contacts_title" = "Inizia elencando i tuoi contatti";
 "contacts_address_book_permission_denied_alert_message" = "Per attivare i contatti, vai nelle impostazioni del tuo dispositivo.";
 "contacts_address_book_permission_denied_alert_title" = "Contatti disattivati";
+"space_home_show_all_rooms" = "Mostra tutte le stanze";
+"room_event_action_forward" = "Inoltra";
+"poll_edit_form_add_option" = "Aggiungi opzione";
+"poll_edit_form_option_number" = "Opzione %d";
+"poll_edit_form_create_options" = "Crea opzioni";
+"poll_edit_form_input_placeholder" = "Scrivi qualcosa";
+"poll_edit_form_question_or_topic" = "Domanda o argomento";
+"poll_edit_form_poll_question_or_topic" = "Domanda o argomento del sondaggio";
+
+// Mark: - Polls
+
+"poll_edit_form_create_poll" = "Crea sondaggio";
+"share_extension_send_now" = "Invia adesso";
+"share_extension_low_quality_video_message" = "Invia in %@ per una migliore qualità, o invia in bassa qualità qua sotto.";
+"share_extension_low_quality_video_title" = "Il video verrà inviato in bassa qualità";
+"settings_discovery_accept_terms" = "Accetta termini del server d'identità";
+"settings_about" = "INFORMAZIONI";
diff --git a/Riot/Assets/ja.lproj/Vector.strings b/Riot/Assets/ja.lproj/Vector.strings
index bee78f6d0..6ee67bd59 100644
--- a/Riot/Assets/ja.lproj/Vector.strings
+++ b/Riot/Assets/ja.lproj/Vector.strings
@@ -873,7 +873,7 @@
 "settings_key_backup_info" = "暗号化されたメッセージはエンドツーエンドで暗号化されています。送信者と受信者だけがこのメッセージを読むための鍵を持っています。";
 "settings_labs_message_reaction" = "絵文字でメッセージに反応する";
 "settings_calls_stun_server_fallback_description" = "ホームサーバーがフォールバックコールアシストサーバーを提供していない場合は％@を許可します（IPアドレスは通話中に共有されます）。";
-"settings_security" = "セキュリティー";
+"settings_security" = "セキュリティ";
 "settings_three_pids_management_information_part3" = "";
 "settings_three_pids_management_information_part2" = "ディスカバリー";
 "store_full_description" = "Elementはまったく新しいメッセンジャーアプリです。\n\n1. あなた自身がプライバシーをコントロールすることを可能にします。\n2. Matrixネットワークにいる誰とでも通信できることはもちろん、Slackなどのアプリとの連携によって他のネットワークとも通信ができます。\n3. 広告、データ収集、バックドア、ユーザーの囲い込みから逃れることができます。\n4. エンドツーエンド暗号化とクロス署名によってあなたを保護します。\n\nElementは分散型（非中央集権型）でオープンソースであるため、他のメッセンジャーアプリと完全に異なっています。\n\nElementはあなた自身でサーバーをホストすることも、サーバーを選ぶこともできます。これによってあなたのデータと会話に関するプライバシーや所有権はあなた自身で管理できるようになります。さらに、あなたは他のElementユーザーと話せるだけでなくオープンネットワークへのアクセスも可能です。\n\nElementは、オープンな分散型通信の標準規格であるMatrixで動作するため、これらすべてを実現することができています。\n\nどのサーバーがホストするか決めることができます。さまざまな方法で選択できます。\n\n1. 開発者がホストするmatrix.orgの公開サーバーで無料のアカウントを取得します。\n2. あなた自身がサーバーを動かし、アカウントを管理します。\n3. Element Matrix Servicesのホスティングプラットフォームに登録することで、カスタムサーバー上のアカウントを取得できます。\n\nなぜElementを選ぶべきなのか？\n\nデータを所有する: 自分でデータやメッセージを保管する場所を決めることができます。あなたが所有権を持ってコントロールすることで、第三者にあなたのデータを渡したり、ビッグデータを収集する巨大テック企業に依存する必要がなくなります。\n\n開かれたネットワークと共同作業: Matrixネットワーク内の他の誰とでも、あるいはElementや他のMatrixアプリを使っているかどうかに関わらず、またSlack、IRC、XMPPのような他のメッセージングシステムを使っているかどうかに関わらず、チャットすることができます。\n\nとても安全: 本物のエンドツーエンド暗号化（会話に参加している者のみがメッセージを読める）と会話参加者の真正性を確認するためクロス署名によって。\n\n完全なるコミュニケーションの訪れ: テキスト、音声通話、ビデオ通話、ファイル共有、画面共有、連携機能、ボット、ウィジェットなどのコミュニケーションに必要な機能の全てが実装されています。ルームやコミュニティを立ち上げて連絡を取り合い、物事をスムーズに成し遂げることができます。\n\nいつでもどこにいても: すべてのデバイスとウェブでメッセージの履歴が同期されるため、どこにいても連絡を取ることができます。https://app.element.io";
@@ -1038,3 +1038,39 @@
 
 // New login
 "device_verification_self_verify_alert_title" = "ログインしましたか？";
+"room_recents_suggested_rooms_section" = "おすすめの部屋";
+"settings_show_url_previews_description" = "プレビューは暗号化されていない部屋でのみ表示されます。";
+"settings_show_url_previews" = "ウェブサイトプレビューを表示";
+"biometrics_setup_enable_button_title_x" = "%@ を有効にする";
+"biometrics_setup_title_x" = "%@ を有効にする";
+"biometrics_settings_enable_x" = "%@ を有効にする";
+"biometrics_mode_face_id" = "Face ID";
+
+// MARK: - Biometrics Protection
+
+"biometrics_mode_touch_id" = "Touch ID";
+"pin_protection_settings_enable_pin" = "PIN を有効にする";
+"pin_protection_settings_section_header_with_biometrics" = "PIN と %@";
+"pin_protection_settings_section_header" = "PIN";
+"settings_mentions_and_keywords_encryption_notice" = "モバイルでは、暗号化された部屋でのメンションとキーワードの通知は受信できません。";
+"settings_new_keyword" = "キーワードを追加";
+"settings_your_keywords" = "以下でキーワードを指定できます";
+"settings_mentions_and_keywords" = "メンションとキーワード";
+"settings_messages_containing_keywords" = "キーワード";
+"settings_messages_containing_at_room" = "@room";
+"settings_messages_containing_user_name" = "あなたのユーザー名";
+"settings_messages_containing_display_name" = "あなたの表示名";
+"settings_encrypted_group_messages" = "暗号化されたグループメッセージ";
+"settings_group_messages" = "グループメッセージ";
+"settings_encrypted_direct_messages" = "暗号化されたダイレクトメッセージ";
+"settings_direct_messages" = "ダイレクトメッセージ";
+"settings_notify_me_for" = "以下がメッセージ含まれる場合通知します";
+"settings_phone_contacts" = "端末の連絡先";
+"settings_notifications" = "通知";
+"settings_links" = "リンク";
+"side_menu_action_feedback" = "フィードバック";
+"side_menu_action_help" = "ヘルプ";
+"side_menu_action_settings" = "設定";
+"spaces_home_space_title" = "ホーム";
+"spaces_left_panel_title" = "スペース";
+"spaces_suggested_room" = "おすすめ";
diff --git a/Riot/Assets/ko.lproj/Vector.strings b/Riot/Assets/ko.lproj/Vector.strings
index 7e4ef9aac..0baff0850 100644
--- a/Riot/Assets/ko.lproj/Vector.strings
+++ b/Riot/Assets/ko.lproj/Vector.strings
@@ -122,7 +122,7 @@
 "room_creation_keep_private" = "개인으로 유지";
 "room_creation_make_private" = "개인으로 하기";
 "room_creation_wait_for_creation" = "방을 이미 만드는 중입니다. 기다려주세요.";
-"room_creation_invite_another_user" = "검색 / 사용자 ID, 이름 또는 이메일로 초대";
+"room_creation_invite_another_user" = "사용자 ID, 이름 또는 이메일";
 "room_creation_error_invite_user_by_email_without_identity_server" = "ID 서버가 설정되지 않아 이메일로 참가자를 추가할 수 없습니다.";
 // Room recents
 "room_recents_directory_section" = "방 목록";
@@ -397,7 +397,7 @@
 "settings_key_backup_info" = "암호화된 메시지는 종단간 암호화로 보호됩니다. 오직 당신과 참가자만 키를 갖고 있어서 이 메시지를 읽을 수 있습니다.";
 "settings_key_backup_info_checking" = "확인 중…";
 "settings_key_backup_info_none" = "키가 이 세션에서 백업되지 않았습니다.";
-"settings_key_backup_info_signout_warning" = "이 기기에만 있을 수 있는 키를 잃지 않도록, 로그아웃하기 전에 이 기기를 키 백업에 연결하세요.";
+"settings_key_backup_info_signout_warning" = "키를 잃어버리지 않도록 로그아웃을 하기 전에 키를 백업하세요.";
 "settings_key_backup_info_version" = "키 백업 버전: %@";
 "settings_key_backup_info_algorithm" = "알고리즘: %@";
 "settings_key_backup_info_valid" = "이 세션은 키를 백업하고 있습니다.";
@@ -564,7 +564,7 @@
 "e2e_need_log_in_again" = "이 세션에 종단간 암호화 키를 생성하고 공개 키를 홈서버에 제출하려면 다시 로그인해야 함니다.\n한 번만 하면 됩니다. 불편을 드려 죄송합니다.";
 // Key backup wrong version
 "e2e_key_backup_wrong_version_title" = "새 키 백업";
-"e2e_key_backup_wrong_version" = "새 보안 메시지 키 백업이 감지되었습니다.\n\n당신이 한 것이 아니라면 설정에서 새 암호를 설정하세요.";
+"e2e_key_backup_wrong_version" = "새 보안 메시지 키 백업이 감지되었습니다.\n\n스스로 진행한 것이 아니라면 설정에서 새 암호를 설정하세요.";
 "e2e_key_backup_wrong_version_button_settings" = "설정";
 "e2e_key_backup_wrong_version_button_wasme" = "접니다";
 // Bug report
@@ -641,7 +641,7 @@
 "key_backup_setup_intro_manual_export_info" = "(고급)";
 "key_backup_setup_intro_manual_export_action" = "수동으로 키 내보내기";
 "key_backup_setup_passphrase_title" = "백업을 암호로 보호하기";
-"key_backup_setup_passphrase_info" = "암호화된 키의 사본을 서버에 보관합니다. 암호로된 백업을 보호하며 안전하게 유지해줍니다.\n\n보안을 최대화하려면, 암호는 계정 비밀번호와 달라야 합니다.";
+"key_backup_setup_passphrase_info" = "암호화된 키의 사본을 서버에 보관합니다. 암호로 된 백업을 보호하며 안전하게 유지해줍니다.\n\n보안을 최대화하려면, 암호는 계정 비밀번호와 달라야 합니다.";
 "key_backup_setup_passphrase_passphrase_title" = "입력";
 "key_backup_setup_passphrase_passphrase_placeholder" = "암호 입력";
 "key_backup_setup_passphrase_passphrase_valid" = "좋아요!";
@@ -649,7 +649,7 @@
 "key_backup_setup_passphrase_confirm_passphrase_title" = "확인";
 "key_backup_setup_passphrase_confirm_passphrase_placeholder" = "암호 확인";
 "key_backup_setup_passphrase_confirm_passphrase_valid" = "좋아요!";
-"key_backup_setup_passphrase_confirm_passphrase_invalid" = "암호가 맞지 않습니다";
+"key_backup_setup_passphrase_confirm_passphrase_invalid" = "암호가 틀렸습니다";
 "key_backup_setup_passphrase_set_passphrase_action" = "암호 설정";
 "key_backup_setup_passphrase_setup_recovery_key_info" = "또는, 안전한 곳에 저장해 둘 복구 키로 백업을 보호합니다.";
 "key_backup_setup_passphrase_setup_recovery_key_action" = "(고급) 복구 키로 설정";
@@ -896,7 +896,7 @@
 "widget_menu_open_outside" = "브라우저에서 열기";
 "widget_menu_revoke_permission" = "액세스 취소";
 "widget_menu_remove" = "모두를 위해 제거";
-"widget_integration_manager_disabled" = "설정에서 통합 관리자를 켜야 합니다";
+"widget_integration_manager_disabled" = "설정에서 통합 관리자를 활성화 해야 합니다";
 "people_empty_view_information" = "누구든지 안전하게 대화하세요. 사람을 추가하려면 + 버튼을 누르세요.";
 "people_empty_view_title" = "사람들";
 "room_recents_unknown_room_error_message" = "이 방을 찾을 수 없습니다. 방이 존재하는지 확인하세요";
@@ -931,3 +931,140 @@
 "joined" = "참여했습니다";
 "skip" = "넘기기";
 "store_promotional_text" = "개방된 네트워크에서 프라이버시를 보장받을 수 있는 대화와 협업 앱. 분산화된 네트워크를 통해 정보를 제어할 수 있습니다. 데이터마이닝도 백도어도 다른 곳에서의 접근도 존재하지 않습니다.";
+"security_settings_blacklist_unverified_devices_description" = "모든 사용자 세션을 확인하여 신뢰할 수 있는 것으로 표시하고 메시지를 보냅니다.";
+"security_settings_blacklist_unverified_devices" = "신뢰할 수 없는 세션에 메시지를 보내지 않음";
+"security_settings_advanced" = "고급";
+"security_settings_export_keys_manually" = "수동으로 키 내보내기";
+"security_settings_cryptography" = "암호화";
+"security_settings_crosssigning_complete_security" = "완벽한 보안";
+"security_settings_crosssigning_reset" = "초기화";
+"security_settings_crosssigning_bootstrap" = "설정";
+"security_settings_crosssigning_info_ok" = "교차 서명을 사용할 준비가 되었습니다.";
+"security_settings_crosssigning_info_trusted" = "교차 검증이 활성화 되었습니다. 교차 서명을 기반으로 다른 사용자와 다른 세션을 신뢰할 수 있지만 이 세션에는 교차 서명 개인 키가 없기 때문에 이 세션에서 교차 서명할 수 없습니다. 이 세션의 보안을 완전히 하십시오.";
+"security_settings_crosssigning_info_exists" = "계정에는 교차 서명 ID가 있지만, 아직 이 세션에서 신뢰하지 않습니다. 이 세션의 보안을 완전히 하십시오.";
+"security_settings_crosssigning_info_not_bootstrapped" = "교차 서명이 아직 설정되지 않았습니다.";
+"security_settings_crosssigning" = "교차 서명";
+"security_settings_backup" = "메세지 백업";
+"security_settings_secure_backup_delete" = "백업 삭제";
+"security_settings_secure_backup_restore" = "백업에서 복구";
+"security_settings_secure_backup_reset" = "초기화";
+"security_settings_secure_backup_setup" = "설정";
+"security_settings_secure_backup_info_valid" = "이 세션은 키를 백업하고 있습니다.";
+"security_settings_secure_backup_info_checking" = "확인 중…";
+"security_settings_secure_backup_description" = "세션에 액세스할 수 없는 경우에 대비하여 계정 데이터로 암호화 키를 백업하십시오. 귀하의 키는 고유한 보안 키로 보호됩니다.";
+"security_settings_secure_backup" = "보안 백업";
+"security_settings_crypto_sessions_description_2" = "로그인을 인식 하지 못하는 경우 비밀번호를 변경하고 보안 백업을 재설정하세요.";
+"security_settings_crypto_sessions_loading" = "세션 로딩 중…";
+"security_settings_crypto_sessions" = "내 세션";
+
+// Security settings
+"security_settings_title" = "보안";
+"settings_show_NSFW_public_rooms" = "NSFW 공개방 표시";
+"settings_discovery_accept_terms" = "ID 서버 약관 동의";
+"settings_labs_voice_messages" = "음성 메시지";
+"settings_labs_enable_ringing_for_group_calls" = "그룹 통화 벨소리";
+"settings_contacts_enable_sync_description" = "이렇게 하면 ID 서버를 사용하여 연락처와 연결하고 사용자를 찾는 데 도움이 됩니다.";
+"settings_contacts_enable_sync" = "연락처에서 찾기";
+"settings_show_url_previews_description" = "미리보기는 암호화 되지 않은 방에만 표시 됩니다.";
+"settings_show_url_previews" = "웹사이트 미리보기 표시";
+"settings_ui_theme_picker_message_match_system_theme" = "\"자동\"은 기기의 시스템 테마와 일치 시킵니다";
+"settings_ui_theme_picker_message_invert_colours" = "\"자동\" 은 기기의 \"색상 반전\" 설정을 사용합니다";
+"room_multiple_typing_notification" = "%@ 및 다른 사용자가 입력 중 입니다";
+"external_link_confirmation_message" = "링크 %@이(가) 다른 사이트: %@로 연결됩니다\n\n정말로 계속 하시겠습니까?";
+"room_member_power_level_custom_in" = "사용자 정의 (%@) in %@";
+"room_participants_action_security_status_complete_security" = "완벽한 보안";
+"room_participants_filter_room_members_for_dm" = "구성원 필터";
+"key_verification_tile_request_incoming_approval_accept" = "수락";
+"key_verification_tile_request_status_accepted" = "수락됨";
+"key_verification_tile_request_status_cancelled" = "%@ 취소됨";
+"key_verification_tile_request_status_cancelled_by_me" = "취소됨";
+"key_verification_tile_request_status_expired" = "만료됨";
+"key_verification_tile_request_status_waiting" = "기다려주세요…";
+"key_verification_tile_request_status_data_loading" = "데이터 로딩…";
+
+// Tiles
+
+"key_verification_tile_request_incoming_title" = "검증 요청";
+
+// MARK: - Key Verification
+
+"key_verification_bootstrap_not_setup_title" = "오류";
+
+// Incoming key verification request
+
+"key_verification_incoming_request_incoming_alert_message" = "%@가 검증을 요청함";
+"key_verification_tile_conclusion_warning_title" = "신뢰할 수 없는 로그인";
+"key_verification_tile_conclusion_done_title" = "검증됨";
+"key_verification_tile_request_incoming_approval_decline" = "끊기";
+"settings_mentions_and_keywords_encryption_notice" = "암호화된 방에서는 멘션과 키워드에 대한 알림을 받을 수 없습니다.";
+"settings_new_keyword" = "키워드 추가";
+"settings_your_keywords" = "키워드 설정";
+"settings_room_upgrades" = "방 설정 변경";
+"settings_messages_by_a_bot" = "봇으로부터 받은 메시지";
+"settings_call_invitations" = "통화 초대";
+"settings_room_invitations" = "방 초대";
+"settings_messages_containing_keywords" = "키워드";
+"settings_messages_containing_at_room" = "@방";
+"settings_messages_containing_user_name" = "아이디";
+"settings_messages_containing_display_name" = "프로필 이름";
+"settings_direct_messages" = "다이렉트 메시지";
+"settings_notify_me_for" = "해당 메시지를 받으면 알림 받기";
+"settings_encrypted_group_messages" = "암호화된 그룹 메시지";
+"settings_group_messages" = "그룹 메시지";
+"settings_encrypted_direct_messages" = "암호화된 다이렉트 메시지";
+"settings_mentions_and_keywords" = "멘션과 키워드";
+"settings_default" = "기본 알림";
+"settings_notifications_disabled_alert_title" = "알림 비활성화";
+"settings_security" = "보안";
+"settings_confirm_media_size" = "전송 시 크기 확인";
+"settings_confirm_media_size_description" = "이 기능을 켜면 보낼 이미지나 동영상의 크기를 확인하는 메시지가 표시됩니다.";
+"settings_about" = "정보";
+"settings_phone_contacts" = "연락처";
+"settings_notifications" = "알림";
+"settings_links" = "링크";
+"settings_sending_media" = "사진 및 영상 전송";
+"external_link_confirmation_title" = "링크 확인";
+"room_no_privileges_to_create_group_call" = "통화를 시작하려면 관리자나 중재자의 권한이 필요합니다.";
+"room_join_group_call" = "입장";
+"room_open_dialpad" = "키패드";
+"room_place_voice_call" = "음성 통화";
+"room_accessibility_video_call" = "영상 통화";
+"room_event_action_delete_confirmation_message" = "전송되지 않은 메시지를 삭제하시겠습니까?";
+"room_event_action_delete_confirmation_title" = "전송되지 않은 메시지 삭제";
+"room_event_action_forward" = "전달";
+"room_unsent_messages_cancel_message" = "이 방에서 전송되지 않은 모든 메시지를 삭제하시겠습니까?";
+"room_unsent_messages_cancel_title" = "전송되지 않은 메시지 삭제";
+"room_message_replying_to" = "%@에게 답장";
+"room_message_editing" = "편집";
+
+// Chat
+"room_slide_to_end_group_call" = "모든 구성원의 통화를 종료하려면 슬라이드";
+"room_member_power_level_short_custom" = "맞춤 설정";
+"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_information_room_encrypted_for_dm" = "이 메시지는 종단간 암호화가 적용되어 있습니다.\n\n메시지는 암호화되어 보호되며, 메시지를 복호화할 수 있는 고유 키는 사용자와 수신자만 가지고 있습니다.";
+"room_participants_security_information_room_encrypted" = "이 방의 메시지는 종단간 암호화가 적용됩니다.\n\n메시지는 암호화되어 보호되며, 메시지를 복호화할 수 있는 고유 키는 사용자와 수신자만 가지고 있습니다.";
+"room_participants_security_information_room_not_encrypted_for_dm" = "이 메시지는 종단간 암호화가 적용되지 않습니다.";
+"room_participants_security_information_room_not_encrypted" = "이 방에서 보내는 메시지는 종단간 암호화가 적용되지 않습니다.";
+"room_participants_security_loading" = "로딩 중…";
+"room_participants_action_security_status_loading" = "로딩 중…";
+"room_participants_action_security_status_warning" = "주의";
+"room_participants_action_security_status_verify" = "검증";
+"room_participants_action_security_status_verified" = "검증됨";
+"room_participants_action_section_security" = "보안";
+"room_participants_leave_prompt_msg_for_dm" = "정말 떠나시겠습니까?";
+"room_participants_leave_prompt_title_for_dm" = "떠나기";
+"find_your_contacts_identity_service_error" = "ID 서버에 연결할 수 없습니다.";
+"find_your_contacts_button_title" = "연락처에서 찾기";
+"find_your_contacts_message" = "%@에서 연락처를 표시하여 잘 아는 사람과 빠르게 대화할 수 있습니다.";
+"find_your_contacts_title" = "연락처에서 시작하기";
+"poll_edit_form_add_option" = "옵션 추가";
+"settings_notifications_disabled_alert_message" = "알림을 허용하려면, 설정으로 이동하십시오.";
+"settings_device_notifications" = "장치 알림";
+"find_your_contacts_footer" = "설정에서 언제든지 비활성화 할 수 있습니다.";
+"side_menu_action_invite_friends" = "친구 초대";
+"contacts_address_book_permission_denied_alert_message" = "연락처를 사용하려면, 설정으로 이동하십시오.";
+"contacts_address_book_permission_denied_alert_title" = "연락처 사용 안 함";
+"rooms_empty_view_title" = "방";
diff --git a/Riot/Assets/nl.lproj/InfoPlist.strings b/Riot/Assets/nl.lproj/InfoPlist.strings
index ecf246480..c3c846e97 100644
--- a/Riot/Assets/nl.lproj/InfoPlist.strings
+++ b/Riot/Assets/nl.lproj/InfoPlist.strings
@@ -18,6 +18,6 @@
 "NSCameraUsageDescription" = "De camera wordt gebruikt om foto’s en video’s te maken, en voor videogesprekken.";
 "NSPhotoLibraryUsageDescription" = "De fotogalerij wordt gebruikt om foto’s en video’s te versturen.";
 "NSMicrophoneUsageDescription" = "Element heeft toegang nodig tot uw microfoon nodig voor oproepen, maken van video's en spraakberichten opnemen.";
-"NSContactsUsageDescription" = "Om u te kunnen tonen welke van uw contacten reeds Matrix gebruiken, kan Element de e-mailadressen en telefoonnummers in uw adresboek naar uw gekozen Matrix-identiteitsserver sturen. Waar mogelijk worden persoonlijke gegevens gehasht voor verzending - bekijk het privacybeleid van uw identiteitsserver voor meer informatie.";
+"NSContactsUsageDescription" = "Element zal uw contacten tonen zodat u ze kunt uitnodigen om te chatten.";
 "NSCalendarsUsageDescription" = "Bekijk uw geplande afspraken in de app.";
 "NSFaceIDUsageDescription" = "Face ID wordt gebruikt om toegang te krijgen tot uw app.";
diff --git a/Riot/Assets/nl.lproj/Vector.strings b/Riot/Assets/nl.lproj/Vector.strings
index 2389ac4af..7f4072640 100644
--- a/Riot/Assets/nl.lproj/Vector.strings
+++ b/Riot/Assets/nl.lproj/Vector.strings
@@ -64,7 +64,7 @@
 "auth_repeat_password_placeholder" = "Wachtwoord herhalen";
 "auth_repeat_new_password_placeholder" = "Bevestig uw nieuwe wachtwoord";
 "auth_invalid_login_param" = "Onjuiste gebruikersnaam en/of wachtwoord";
-"auth_invalid_user_name" = "Gebruikersnamen mogen alleen letters, cijfers, punten, koppeltekens en underscores bevatten";
+"auth_invalid_user_name" = "Inlognamen mogen alleen letters, cijfers, punten, koppeltekens en onderstrepingstekens bevatten";
 "auth_invalid_password" = "Het wachtwoord is te kort (min 6)";
 "auth_invalid_email" = "Dit ziet er niet uit als een geldig e-mailadres";
 "auth_invalid_phone" = "Dit ziet er niet uit als een geldig telefoonnummer";
@@ -77,7 +77,7 @@
 "auth_missing_phone" = "Telefoonnummer ontbreekt";
 "auth_missing_email_or_phone" = "E-mailadres of telefoonnummer ontbreekt";
 "auth_password_dont_match" = "De wachtwoorden komen niet overeen";
-"auth_username_in_use" = "De gebruikersnaam is al in gebruik";
+"auth_username_in_use" = "Inlognaam al in gebruik";
 "auth_forgot_password" = "Wachtwoord vergeten?";
 "auth_use_server_options" = "Aangepaste serverinstellingen gebruiken (geavanceerd)";
 "auth_email_validation_message" = "Bekijk uw e-mail om verder te gaan met de registratie";
@@ -109,7 +109,7 @@
 "room_creation_keep_private" = "Privé houden";
 "room_creation_make_private" = "Privé maken";
 "room_creation_wait_for_creation" = "Er wordt al een kamer aangemaakt. Even geduld.";
-"room_creation_invite_another_user" = "Zoeken/uitnodigen met gebruikers-ID, naam of e-mailadres";
+"room_creation_invite_another_user" = "Persoon-ID, naam of e-mail";
 // Room recents
 "room_recents_directory_section" = "KAMERGIDS";
 "room_recents_favourites_section" = "FAVORIETEN";
@@ -261,13 +261,13 @@
 "settings_user_settings" = "GEBRUIKERSINSTELLINGEN";
 "settings_notifications_settings" = "MELDINGSINSTELLINGEN";
 "settings_ignored_users" = "GENEGEERDE GEBRUIKERS";
-"settings_contacts" = "LOKALE CONTACTEN";
+"settings_contacts" = "APPARAAT CONTACTEN";
 "settings_advanced" = "GEAVANCEERD";
-"settings_other" = "OVERIGE";
+"settings_other" = "OVERIG";
 "settings_labs" = "EXPERIMENTEEL";
 "settings_devices" = "APPARATEN";
 "settings_cryptography" = "CRYPTOGRAFIE";
-"settings_sign_out" = "Afmelden";
+"settings_sign_out" = "Uitloggen";
 "settings_sign_out_confirmation" = "Weet u het zeker?";
 "settings_sign_out_e2e_warn" = "U zult uw sleutels voor eind-tot-eindversleuteling kwijtraken. Dat betekent dat u op dit apparaat geen oude berichten in versleutelde gesprekken meer zult kunnen lezen.";
 "settings_profile_picture" = "Profielfoto";
@@ -564,9 +564,9 @@
 "room_message_reply_to_short_placeholder" = "Stuur een antwoord…";
 // String for App Store
 "store_short_description" = "Veilig en gedecentraliseerd chatten en bellen";
-"store_full_description" = "Element is een nieuw type messenger en samenwerkings app die:\n\n1. U de controle geeft om uw privacy te behouden\n2. U laat communiceren met iedereen in het Matrix-netwerk, en zelfs daarbuiten door integratie met apps zoals Slack\n3. Beschermt u tegen reclame, datamining, achterdeurtjes en ommuurde netwerken\n4. Beveiligt u door eind-tot-eind versleuteling, met kruislings ondertekenen om anderen te verifiëren\n\nElement is compleet anders dan andere messengers en samenwerkings-apps, omdat het gedecentraliseerd en open source is.\n\nMet Element kunt u zelf hosten - of een host kiezen - zodat u privacy, eigendom en controle heeft over uw gegevens en gesprekken. Het geeft u toegang tot een open netwerk; u zit dus niet vast aan het praten met alleen andere Element-gebruikers. En het is zeer veilig.\n\nElement is hiertoe in staat omdat het werkt op basis van Matrix - de standaard voor open, gedecentraliseerde communicatie. \n\nElement geeft u de controle door u te laten kiezen wie uw gesprekken host. Vanuit de Element app kunt u kiezen om op verschillende manieren te hosten:\n\n1. Neem een gratis account op de publieke server matrix.org\n2. Host het zelf, uw account door draait op uw eigen server\n3. Laat ons het hosten, meld u aan voor een account op een aangepaste server bij het Element Matrix Services hosting platform\n\nWaarom kiest u voor Element?\n\nEIGENAAR VAN UW GEGEVENS: U bepaalt waar uw gegevens en berichten worden bewaard. U bent de eigenaar en heeft de controle, niet een of andere MEGACORP die uw gegevens mijnt of toegang geeft aan derden.\n\nOPEN MESSAGING EN SAMENWERKING: U kunt met iedereen in het Matrix-netwerk chatten, of ze nu Element of een andere Matrix-app gebruiken, en zelfs als ze een ander messaging-systeem gebruiken zoals Slack, IRC of XMPP.\n\nSUPER-VEILIG: Echte eind-tot-eind versleuteling (alleen degenen in de conversatie kunnen berichten ontsleutelen), en kruislings ondertekenen om de apparaten van gespreksdeelnemers te verifiëren.\n\nCOMPLETE COMMUNICATIE: Berichten, spraak- en videogesprekken, bestandsdeling, schermdeling en een heleboel integraties, bots en widgets. Bouw kamers, ruimtes, blijf in contact en krijg het gedaan.\n\nOVERAL WAAR U BENT: Blijf in contact waar u ook bent met volledig gesynchroniseerde berichtgeschiedenis op al uw apparaten en op het web op https://element.io/app.";
+"store_full_description" = "Element is een nieuw type messenger en samenwerkings app die:\n\n1. U de controle geeft om uw privacy te behouden\n2. U laat communiceren met iedereen in het Matrix-netwerk, en zelfs daarbuiten door integratie met apps zoals Slack\n3. Beschermt u tegen reclame, datamining, achterdeurtjes en ommuurde netwerken\n4. Beveiligt u door eind-tot-eind versleuteling, met kruislings ondertekenen om anderen te verifiëren\n\nElement is compleet anders dan andere messengers en samenwerkings-apps, omdat het gedecentraliseerd en open source is.\n\nMet Element kunt u zelf hosten - of een host kiezen - zodat u privacy, eigendom en controle heeft over uw gegevens en gesprekken. Het geeft u toegang tot een open netwerk; u zit dus niet vast aan het praten met alleen andere Element-gebruikers. En het is zeer veilig.\n\nElement is hiertoe in staat omdat het werkt op basis van Matrix - de standaard voor open, gedecentraliseerde communicatie. \n\nElement geeft u de controle door u te laten kiezen wie uw gesprekken host. Vanuit de Element app kunt u kiezen om op verschillende manieren te hosten:\n\n1. Neem een gratis account op de publieke server matrix.org\n2. Host het zelf, uw account door draait op uw eigen server\n3. Laat ons het hosten, meld u aan voor een account op een aangepaste server bij het Element Matrix Services hosting platform\n\nWaarom kiest u voor Element?\n\nEIGENAAR VAN UW GEGEVENS: U bepaalt waar uw gegevens en berichten worden bewaard. U bent de eigenaar en heeft de controle, niet een of andere MEGACORP die uw gegevens mijnt of toegang geeft aan derden.\n\nOPEN MESSAGING EN SAMENWERKING: U kunt met iedereen in het Matrix-netwerk chatten, of ze nu Element of een andere Matrix-app gebruiken, en zelfs als ze een ander messaging-systeem gebruiken zoals Slack, IRC of XMPP.\n\nSUPER-VEILIG: Echte eind-tot-eind versleuteling (alleen degenen in de conversatie kunnen berichten ontsleutelen), en kruislings ondertekenen om de apparaten van gespreksdeelnemers te verifiëren.\n\nCOMPLETE COMMUNICATIE: Berichten, spraak- en videogesprekken, bestandsdeling, schermdeling en een heleboel integraties, bots en widgets. Bouw kamers, Spaces, blijf in contact en krijg het gedaan.\n\nOVERAL WAAR U BENT: Blijf in contact waar u ook bent met volledig gesynchroniseerde berichtgeschiedenis op al uw apparaten en op het web op https://element.io/app.";
 "auth_login_single_sign_on" = "Aanmelden met enkele aanmelding";
-"auth_accept_policies" = "Gelieve het beleid van deze server te lezen en aanvaarden:";
+"auth_accept_policies" = "Lees het beleid van deze homeserver en kies om te aanvaarden:";
 "auth_autodiscover_invalid_response" = "Ongeldig server-ontdekkings-antwoord";
 "room_recents_server_notice_section" = "SYSTEEMMELDINGEN";
 "room_message_unable_open_link_error_message" = "Kan de koppeling niet openen.";
@@ -667,13 +667,13 @@
 "key_backup_setup_banner_subtitle" = "Begin sleutelback-up te gebruiken";
 "key_backup_recover_banner_title" = "Verlies nooit uw versleutelde berichten";
 "sign_out_existing_key_backup_alert_title" = "Weet u zeker dat u zich wilt afmelden?";
-"sign_out_existing_key_backup_alert_sign_out_action" = "Afmelden";
+"sign_out_existing_key_backup_alert_sign_out_action" = "Uitloggen";
 "sign_out_non_existing_key_backup_alert_title" = "Als u zich nu afmeldt, zult u de toegang tot uw versleutelde berichten verliezen";
 "sign_out_non_existing_key_backup_alert_setup_key_backup_action" = "Begin sleutelback-up te gebruiken";
 "sign_out_non_existing_key_backup_alert_discard_key_backup_action" = "Ik wil mijn versleutelde berichten niet";
 "sign_out_non_existing_key_backup_sign_out_confirmation_alert_title" = "U zult uw versleutelde berichten verliezen";
 "sign_out_non_existing_key_backup_sign_out_confirmation_alert_message" = "U zult de toegang tot uw versleutelde berichten verliezen, tenzij u een back-up van uw sleutels maakt vooraleer u zich afmeldt.";
-"sign_out_non_existing_key_backup_sign_out_confirmation_alert_sign_out_action" = "Afmelden";
+"sign_out_non_existing_key_backup_sign_out_confirmation_alert_sign_out_action" = "Uitloggen";
 "sign_out_non_existing_key_backup_sign_out_confirmation_alert_backup_action" = "Back-up";
 "sign_out_key_backup_in_progress_alert_title" = "Sleutelback-up is bezig. Als u zich nu afmeldt zult u de toegang tot uw versleutelde berichten verliezen.";
 "sign_out_key_backup_in_progress_alert_discard_key_backup_action" = "Ik wil mijn versleutelde berichten niet";
@@ -795,7 +795,7 @@
 "auth_softlogout_clear_data_button" = "Alle gegevens wissen";
 "auth_softlogout_clear_data_sign_out_title" = "Weet u het zeker?";
 "auth_softlogout_clear_data_sign_out_msg" = "Weet u zeker dat u alle gegevens die op dit moment op dit apparaat worden opgeslagen wilt wissen? Meld u opnieuw aan om toegang te verkrijgen tot uw accountgegevens en berichten.";
-"auth_softlogout_clear_data_sign_out" = "Afmelden";
+"auth_softlogout_clear_data_sign_out" = "Uitloggen";
 "room_event_action_reaction_show_all" = "Alles tonen";
 "room_event_action_reaction_show_less" = "Minder tonen";
 "room_event_action_reaction_history" = "Reactiegeschiedenis";
@@ -1371,7 +1371,7 @@
 "settings_discovery_three_pids_management_information_part3" = ".";
 "settings_discovery_three_pids_management_information_part2" = "Gebruikersinstellingen";
 "settings_discovery_three_pids_management_information_part1" = "Beheer e-mailadressen en telefoonnummers die andere personen kunnen gebruiken om u te vinden en u uit te nodigen voor kamers. E-mailadressen of telefoonnummers toevoegen of verwijderen van deze lijst kan in ";
-"settings_discovery_terms_not_signed" = "Aanvaard de gebruikersvoorwaarden van de identiteitsserver (%@) om vindbaar te zijn op e-mailadres of telefoonnummer.";
+"settings_discovery_terms_not_signed" = "Aanvaard de voorwaarden van de identiteitsserver (%@) om vindbaar te zijn op e-mailadres of telefoonnummer.";
 "settings_discovery_no_identity_server" = "U gebruikt momenteel geen identiteitsserver. Om door de u bekende contacten vindbaar te zijn, voeg er een toe.";
 "settings_devices_description" = "De publieke naam van een sessie is zichtbaar voor de personen waarmee u communiceert";
 "settings_add_3pid_invalid_password_message" = "Ongeldig wachtwoord";
@@ -1469,16 +1469,16 @@
 
 // Chat
 "room_slide_to_end_group_call" = "Schuif om voor iedereen de oproep te beëindigen";
-"space_beta_announce_information" = "Ruimtes zijn de nieuwe manier om kamers en personen te groeperen. Dit is nog niet beschikbaar op iOS, maar u kunt ze nu al gebruiken op Web en Desktop.";
-"space_feature_unavailable_information" = "Ruimtes zijn de nieuwe manier om kamers en personen te groeperen. \n\nHet is binnenkort beschikbaar. U kan aan ruimtes deelnemen via andere platformen en die kamers worden dan hier beschikbaar.";
+"space_beta_announce_information" = "Spaces zijn de nieuwe manier om kamers en personen te groeperen. Dit is nog niet beschikbaar op iOS, maar u kunt ze nu al gebruiken op Web en Desktop.";
+"space_feature_unavailable_information" = "Spaces zijn de nieuwe manier om kamers en personen te groeperen. \n\nHet is binnenkort beschikbaar. U kan aan Spaces deelnemen via andere platformen en die kamers worden dan hier beschikbaar.";
 "space_beta_announce_subtitle" = "De nieuwe versie van gemeenschappen";
-"space_beta_announce_title" = "Ruimtes komen binnenkort";
+"space_beta_announce_title" = "Spaces komen binnenkort";
 "space_beta_announce_badge" = "BETA";
-"space_feature_unavailable_subtitle" = "Ruimtes zijn nog niet beschikbaar op iOS, maar u kunt het nu al testen op Web en Desktop";
+"space_feature_unavailable_subtitle" = "Spaces zijn nog niet beschikbaar op iOS, maar u kunt het nu al testen op Web en Desktop";
 
 // Mark: - Spaces
 
-"space_feature_unavailable_title" = "Ruimtes zijn nog niet klaar";
+"space_feature_unavailable_title" = "Spaces zijn nog niet klaar";
 "side_menu_app_version" = "Versie %@";
 "side_menu_action_feedback" = "Feedback";
 "side_menu_action_help" = "Help";
@@ -1574,14 +1574,14 @@
 "settings_confirm_media_size_description" = "Wanneer dit aan staat wordt u elke keer gevraagd welk formaat afbeeldingen en video's u wilt versturen.";
 "settings_confirm_media_size" = "Bevestig afmeting bij versturen";
 "settings_sending_media" = "AFBEELDINGEN EN VIDEO'S VERSTUREN";
-"space_avatar_view_accessibility_hint" = "Ruimte-afbeelding wijzigen";
+"space_avatar_view_accessibility_hint" = "Space-afbeelding wijzigen";
 
 // Mark: Avatar
 
 "space_avatar_view_accessibility_label" = "afbeelding";
-"space_public_join_rule" = "Publieke ruimte";
-"space_private_join_rule" = "Privéruimte";
-"space_participants_action_ban" = "Uit deze ruimte verbannen";
+"space_public_join_rule" = "Publieke Space";
+"space_private_join_rule" = "Privé Space";
+"space_participants_action_ban" = "Uit deze Space verbannen";
 "space_participants_action_remove" = "Uit deze kamer verwijderen";
 "spaces_coming_soon_detail" = "Deze functies is nog niet klaar, maar er wordt aan gewerkt. Voor nu kan u dit wel doen met Element via uw computer.";
 "spaces_invites_coming_soon_title" = "Uitnodigen komt binnenkort";
@@ -1591,18 +1591,59 @@
 "spaces_no_room_found_detail" = "Sommige resultaten kunnen verborgen zijn doordat ze privé zijn. U heeft dan een uitnodiging nodig om deel te nemen.";
 "spaces_empty_space_detail" = "Sommige kamers kunnen verborgen zijn doordat ze privé zijn. U heeft dan een uitnodiging nodig om deel te nemen.";
 "spaces_no_result_found_title" = "Geen resultaten gevonden";
-"spaces_empty_space_title" = "Deze ruimte heeft (nog) geen kamers";
-"space_tag" = "ruimte";
+"spaces_empty_space_title" = "Deze Space heeft (nog) geen kamers";
+"space_tag" = "space";
 "spaces_explore_rooms" = "Kamers ontdekken";
-"leave_space_and_all_rooms_action" = "Alle kamers en ruimtes verlaten";
+"leave_space_and_all_rooms_action" = "Alle kamers en Spaces verlaten";
 "leave_space_only_action" = "Geen kamers verlaten";
-"leave_space_message_admin_warning" = "U bent beheerder van deze ruimte, controleer of u de beheerrechten heeft overgedragen aan een andere deelnemer voordat u vertrekt.";
-"leave_space_message" = "Weet u zeker dat u %@ wilt verlaten? Wilt u ook alle kamers en ruimtes in deze ruimte verlaten?";
+"leave_space_message_admin_warning" = "U bent beheerder van deze Space, controleer of u de beheerrechten heeft overgedragen aan een andere deelnemer voordat u vertrekt.";
+"leave_space_message" = "Weet u zeker dat u %@ wilt verlaten? Wilt u ook alle kamers en Spaces in deze Space verlaten?";
 "leave_space_title" = "%@ verlaten";
-"spaces_left_panel_title" = "Ruimtes";
+"spaces_left_panel_title" = "Spaces";
 "spaces_home_space_title" = "Thuis";
 "settings_links" = "LINKS";
 "room_recents_suggested_rooms_section" = "AANBEVOLEN KAMERS";
 "spaces_suggested_room" = "Aanbevolen";
 "done" = "Klaar";
 "open" = "Openen";
+"space_home_show_all_rooms" = "Alle kamers tonen";
+"service_terms_modal_information_description_integration_manager" = "Met een integratiebeheerder kunt u functies van derden toevoegen.";
+"service_terms_modal_information_description_identity_server" = "Een identiteitsserver helpt u uw contactpersonen te vinden, door hun telefoonnummer of e-mail op te zoeken, om te zien of zij al een account hebben.";
+"service_terms_modal_information_title_integration_manager" = "Integratiebeheerder";
+
+// Alert explaining what an identity server / integration manager is.
+"service_terms_modal_information_title_identity_server" = "Indentiteitsserver";
+"service_terms_modal_description_integration_manager" = "Hiermee kunt u bots, bruggen, widgets en stickerpakketten gebruiken.";
+"service_terms_modal_description_identity_server" = "Zo kan iemand u vinden als hij uw telefoonnummer of e-mail in zijn telefooncontacten heeft opgeslagen.";
+"service_terms_modal_table_header_integration_manager" = "INTEGRATIEBEHEERDER VOORWAARDEN";
+"service_terms_modal_table_header_identity_server" = "IDENTITEITSSERVER VOORWAARDEN";
+"service_terms_modal_footer" = "Dit kan elk moment worden uitgeschakeld in uw instellingen.";
+
+// Service terms
+"service_terms_modal_title_message" = "Om door te gaan, aanvaard de onderstaande voorwaarden";
+"settings_contacts_enable_sync_description" = "Dit zal uw identiteitsserver gebruiken om u te verbinden met uw contacten, en hen helpen u te vinden.";
+"settings_contacts_enable_sync" = "Vind uw contacten";
+"settings_phone_contacts" = "TELEFOON CONTACTEN";
+"room_event_action_forward" = "Doorsturen";
+"find_your_contacts_identity_service_error" = "Kan geen verbinding maken met de identiteitsserver.";
+"find_your_contacts_footer" = "Dit kan op elk moment worden uitgeschakeld via de instellingen.";
+"find_your_contacts_button_title" = "Vind uw contacten";
+"find_your_contacts_message" = "Laat %@ uw contacten zien, zodat u snel kunt beginnen te chatten met degenen die u het beste kent.";
+"find_your_contacts_title" = "Begin met een lijst van uw contacten";
+"contacts_address_book_permission_denied_alert_message" = "Om contacten in te schakelen, ga naar uw apparaatinstellingen.";
+"contacts_address_book_permission_denied_alert_title" = "Contacten uitgeschakeld";
+"poll_edit_form_add_option" = "Optie toevoegen";
+"poll_edit_form_option_number" = "Optie %d";
+"poll_edit_form_create_options" = "Opties maken";
+"poll_edit_form_input_placeholder" = "Schrijf iets";
+"poll_edit_form_question_or_topic" = "Vraag of onderwerp";
+"poll_edit_form_poll_question_or_topic" = "Poll vraag of onderwerp";
+
+// Mark: - Polls
+
+"poll_edit_form_create_poll" = "Poll maken";
+"share_extension_send_now" = "Versturen";
+"share_extension_low_quality_video_message" = "Stuur in %@ voor een betere kwaliteit of stuur in lage kwaliteit hieronder.";
+"share_extension_low_quality_video_title" = "Video zal in lage kwaliteit worden verstuurd";
+"settings_discovery_accept_terms" = "Identiteitsserver-voorwaarden aanvaarden";
+"settings_about" = "OVER";
diff --git a/Riot/Assets/pt_BR.lproj/Vector.strings b/Riot/Assets/pt_BR.lproj/Vector.strings
index 77ab52883..ba473313e 100644
--- a/Riot/Assets/pt_BR.lproj/Vector.strings
+++ b/Riot/Assets/pt_BR.lproj/Vector.strings
@@ -290,7 +290,7 @@
 "settings_ignored_users" = "USUÁRIAS(OS) IGNORADAS(OS)";
 "settings_contacts" = "CONTATOS DE DISPOSITIVO";
 "settings_advanced" = "AVANÇADAS";
-"settings_other" = "OUTRAS";
+"settings_other" = "Outras";
 "settings_labs" = "LABS";
 "settings_flair" = "Mostrar flair onde permitido";
 "settings_devices" = "SESSÕES";
@@ -1498,3 +1498,20 @@
 "find_your_contacts_title" = "Comece por listar seus contatos";
 "contacts_address_book_permission_denied_alert_message" = "Para habilitar contatos, vá para as configurações de seu dispositivo.";
 "contacts_address_book_permission_denied_alert_title" = "Contatos desabilitados";
+"space_home_show_all_rooms" = "Mostrar todas as salas";
+"room_event_action_forward" = "Encaminhar";
+"poll_edit_form_add_option" = "Adicionar opção";
+"poll_edit_form_option_number" = "Opção %d";
+"poll_edit_form_create_options" = "Criar opções";
+"poll_edit_form_input_placeholder" = "Escreva algo";
+"poll_edit_form_question_or_topic" = "Pergunta ou tópico";
+"poll_edit_form_poll_question_or_topic" = "Sondar pergunta ou tópico";
+
+// Mark: - Polls
+
+"poll_edit_form_create_poll" = "Criar sondagem";
+"share_extension_send_now" = "Enviar agora";
+"share_extension_low_quality_video_message" = "Enviar em %@ para melhor qualidade, ou enviar em baixa qualidade abaixo.";
+"share_extension_low_quality_video_title" = "Vídeo vai ser enviado em baixa qualidade";
+"settings_discovery_accept_terms" = "Aceitar Termos de Servidor de Identidade";
+"settings_about" = "SOBRE";
diff --git a/Riot/Assets/ru.lproj/Vector.strings b/Riot/Assets/ru.lproj/Vector.strings
index ad004e9e0..d91945d9f 100644
--- a/Riot/Assets/ru.lproj/Vector.strings
+++ b/Riot/Assets/ru.lproj/Vector.strings
@@ -898,7 +898,7 @@
 "room_participants_action_security_status_complete_security" = "Завершите настройку безопасности";
 "room_participants_action_security_status_loading" = "Загрузка…";
 "room_participants_security_information_room_not_encrypted" = "Сообщения в этой комнате не шифруются сквозным шифрованием.";
-"room_participants_security_information_room_encrypted" = "Сообщения в этой комнате не шифруются сквозным шифрованием. \n \nВаши сообщения защищены замками, и только у вас и получателя есть уникальные ключи, чтобы разблокировать их.";
+"room_participants_security_information_room_encrypted" = "Сообщения в этой комнате зашифрованы сквозным шифрованием. \n \nВаши сообщения защищены замками, и только у вас и получателя есть уникальные ключи, чтобы разблокировать их.";
 "room_member_power_level_admin_in" = "Администратор в %@";
 "room_member_power_level_moderator_in" = "Модератор в %@";
 "room_member_power_level_custom_in" = "Пользовательский (%@) в %@";
@@ -1511,3 +1511,5 @@
 "find_your_contacts_title" = "Начните с составления списка контактов";
 "contacts_address_book_permission_denied_alert_message" = "Для включения контактов, перейдите в настройки устройства.";
 "contacts_address_book_permission_denied_alert_title" = "Контакты отключены";
+"space_home_show_all_rooms" = "Показать все комнаты";
+"room_event_action_forward" = "Переслать";
diff --git a/Riot/Assets/sk.lproj/InfoPlist.strings b/Riot/Assets/sk.lproj/InfoPlist.strings
new file mode 100644
index 000000000..9d8892825
--- /dev/null
+++ b/Riot/Assets/sk.lproj/InfoPlist.strings
@@ -0,0 +1,9 @@
+
+
+"NSFaceIDUsageDescription" = "Face ID sa používa na prístup k aplikácii.";
+"NSCalendarsUsageDescription" = "Zobrazte svoje naplánované stretnutia v aplikácii.";
+"NSContactsUsageDescription" = "Element zobrazí vaše kontakty, aby ste ich mohli pozvať do chatu.";
+"NSMicrophoneUsageDescription" = "Element potrebuje prístup k mikrofónu, aby mohol uskutočňovať a prijímať hovory, nahrávať videá a hlasové správy.";
+"NSPhotoLibraryUsageDescription" = "Knižnica fotografií sa používa na odosielanie fotografií a videí.";
+// Permissions usage explanations
+"NSCameraUsageDescription" = "Fotoaparát sa používa na snímanie fotografií a videí, uskutočňovanie videohovorov.";
diff --git a/Riot/Assets/sk.lproj/Localizable.strings b/Riot/Assets/sk.lproj/Localizable.strings
new file mode 100644
index 000000000..950c96d36
--- /dev/null
+++ b/Riot/Assets/sk.lproj/Localizable.strings
@@ -0,0 +1,77 @@
+
+
+
+/* Multiple unread messages from three people */
+"MSGS_FROM_THREE_USERS" = "%@ nových správ od %@, %@ a %@";
+
+/* Multiple unread messages from two people */
+"MSGS_FROM_TWO_USERS" = "%@ nových správ od %@ a %@";
+
+/* Multiple unread messages from a specific person, not referencing a room */
+"MSGS_FROM_USER" = "%@ nových správ v %@";
+
+/** Coalesced messages **/
+
+/* Multiple unread messages in a room */
+"UNREAD_IN_ROOM" = "%@ nové správy v %@";
+
+/* New message with hidden content due to PIN enabled */
+"MESSAGE_PROTECTED" = "Nová správa";
+
+/* New message indicator on a room */
+"MESSAGE_IN_X" = "Správa v %@";
+
+/* New message indicator from a DM */
+"MESSAGE_FROM_X" = "Správa od %@";
+
+/** Notification messages **/
+
+/* New message indicator on unknown room */
+"MESSAGE" = "Správa";
+
+/* A single unread message */
+"SINGLE_UNREAD" = "Dostali ste správu";
+
+/* A single unread message in a room */
+"SINGLE_UNREAD_IN_ROOM" = "Dostali ste správu v %@";
+
+/* New video message from a specific person, not referencing a room. */
+"VIDEO_FROM_USER" = "%@ odoslal/a video";
+
+/* New image message from a specific person in a named room. */
+"IMAGE_FROM_USER_IN_ROOM" = "%@ zverejnil/a obrázok %@ v %@";
+
+/** Media Messages **/
+
+/* New image message from a specific person, not referencing a room. */
+"PICTURE_FROM_USER" = "%@ odoslal/a obrázok";
+
+/* New action message from a specific person in a named room. */
+"ACTION_FROM_USER_IN_ROOM" = "%@: * %@ %@";
+
+/* New action message from a specific person, not referencing a room. */
+"ACTION_FROM_USER" = "* %@ %@";
+
+/* New message from a specific person in a named room. Content included. */
+"MSG_FROM_USER_IN_ROOM_WITH_CONTENT" = "%@ v %@: %@";
+
+/** Single, unencrypted messages (where we can include the content */
+
+/* New message from a specific person, not referencing a room. Content included. */
+"MSG_FROM_USER_WITH_CONTENT" = "%@: %@";
+
+/** Single, end-to-end encrypted messages (ie. we don't know what they say) */
+
+/* New message from a specific person, not referencing a room */
+"MSG_FROM_USER" = "%@ odoslal/a správu";
+
+/* New message reply from a specific person, not referencing a room. */
+"REPLY_FROM_USER_TITLE" = "%@ odpovedal/a";
+
+/** Titles **/
+
+/* Message title for a specific person in a named room */
+"MSG_FROM_USER_IN_ROOM_TITLE" = "%@ v %@";
+/** General **/
+
+"NOTIFICATION" = "Oznámenia";
diff --git a/Riot/Assets/sk.lproj/Vector.strings b/Riot/Assets/sk.lproj/Vector.strings
new file mode 100644
index 000000000..f485f1f64
--- /dev/null
+++ b/Riot/Assets/sk.lproj/Vector.strings
@@ -0,0 +1,167 @@
+
+
+"done" = "Hotovo";
+"open" = "Otvoriť";
+"less" = "Menej";
+"more" = "Viac";
+"skip" = "Preskočiť";
+"close" = "Zavrieť";
+"collapse" = "zbaliť";
+"rename" = "Premenovať";
+"later" = "Neskôr";
+"active_call_details" = "Prebiehajúci hovor (%s)";
+"active_call" = "Aktívny hovor";
+"video" = "Video";
+"voice" = "Hlas";
+"camera" = "Kamera";
+"preview" = "Zobraziť náhľad";
+"accept" = "Prijať";
+"decline" = "Odmietnuť";
+"join" = "Vstúpiť";
+"save" = "Uložiť";
+"cancel" = "Zrušiť";
+"off" = "Vypnuté";
+"on" = "Povolené";
+"retry" = "Skúsiť znovu";
+"invite" = "Pozvať";
+"remove" = "Odstrániť";
+"leave" = "Opustiť";
+"start" = "Začať";
+"store_promotional_text" = "Aplikácia na chatovanie a spoluprácu s ochranou súkromia v otvorenej sieti. Decentralizovaná, aby ste ju mali pod kontrolou. Žiadne dolovanie údajov, žiadne zadné vrátka ani prístup tretích strán.";
+"store_full_description" = "Element je nový typ aplikácie na posielanie správ a spoluprácu, ktorá:\n\n1. vám dáva kontrolu nad zachovaním vášho súkromia\n2. Umožňuje vám komunikovať s kýmkoľvek v sieti Matrix, a dokonca aj mimo nej vďaka integrácii s aplikáciami, ako je Slack\n3. Chráni vás pred reklamou, získavaním údajov, zadnými vrátkami a uzavretým ekosystémom.\n4. Zabezpečuje vás prostredníctvom end-to-end šifrovania s krížovým podpisovaním na overenie ostatných\n\nElement sa úplne líši od ostatných aplikácií na zasielanie správ a spoluprácu, pretože je decentralizovaný a má otvorený zdrojový kód.\n\nElement vám umožňuje, aby ste sa sami hosťovali - alebo si vybrali hosting - takže máte súkromie, vlastníctvo a kontrolu nad svojimi údajmi a konverzáciami. Poskytuje vám prístup k otvorenej sieti; takže nie ste odkázaní len na rozhovory s inými používateľmi aplikácie Element. A je veľmi bezpečný.\n\nElement toto všetko dokáže, pretože funguje na Matrixe - štandarde pre otvorenú, decentralizovanú komunikáciu. \n\nElement vám dáva kontrolu tým, že vám umožňuje vybrať si, kto bude hostiť vaše konverzácie. V aplikácii Element si môžete vybrať, či chcete hosťovať rôznymi spôsobmi:\n\n1. Získajte bezplatný účet na verejnom serveri matrix.org\n2. Vlastný hosting účtu spustením servera na vlastnom hardvéri.\n3. Zaregistrujte si účet na vlastnom serveri jednoduchým predplatením hostingovej platformy Element Matrix Services.\n\nPrečo si vybrať práve Element?\n\nVLASTNÍTE SVOJE DÁTA: Vy rozhodujete o tom, kde budú vaše dáta a správy uložené. Vlastníte ich a máte nad nimi kontrolu, nie nejaká MEGAKORPORÁCIA, ktorá vaše údaje doluje alebo poskytuje prístup tretím stranám.\n\nOTVORENÁ KONVERZÁCIA A SPOLUPRÁCA: Môžete chatovať s kýmkoľvek iným v sieti Matrix, či už používa aplikáciu Element alebo inú aplikáciu Matrix, a dokonca aj vtedy, ak používa iný systém správ typu Slack, IRC alebo XMPP.\n\nSUPER-BEZPEČNÉ: Skutočné end-to-end šifrovanie (správy môžu dešifrovať len účastníci konverzácie) a krížové podpisovanie na overenie zariadení účastníkov konverzácie.\n\nKOMPLETNÁ KOMUNIKÁCIA: Správy, hlasové a videohovory, zdieľanie súborov, zdieľanie obrazovky a celý rad integrácií, botov a widgetov. Vytvárajte miestnosti, komunity, zostaňte v kontakte a vybavujte veci.\n\nKDEKOĽVEK STE: Zostaňte v kontakte, nech ste kdekoľvek, s plne synchronizovanou históriou správ vo všetkých zariadeniach a na webe na https://element.io/app.";
+"create" = "Vytvoriť";
+"continue" = "Pokračovať";
+"back" = "Späť";
+"next" = "Ďalej";
+
+// Actions
+"view" = "Zobraziť";
+"warning" = "Upozornenie";
+"title_groups" = "Komunity";
+"title_rooms" = "Miestnosti";
+"title_people" = "Ľudia";
+"title_favourites" = "Obľúbené";
+
+// Titles
+"title_home" = "Domov";
+"room_creation_make_private" = "Zmeniť na súkromnú";
+"room_creation_keep_private" = "Ponechať ako súkromnú";
+"room_creation_make_public_prompt_title" = "Zverejniť túto konverzáciu?";
+"room_creation_make_public" = "Zverejniť";
+"room_creation_appearance_name" = "Názov";
+
+// Errors
+"error_user_already_logged_in" = "Zdá sa, že sa pokúšate pripojiť k inému domovskému serveru. Chcete sa odhlásiť?";
+"social_login_button_title_sign_up" = "Prihlásiť sa s %@";
+"social_login_list_title_sign_up" = "alebo";
+"social_login_list_title_sign_in" = "alebo";
+"auth_softlogout_clear_data_sign_out" = "Odhlásiť sa";
+"auth_softlogout_clear_data_sign_out_title" = "Ste si istí?";
+"room_creation_invite_another_user" = "Používateľské ID, meno alebo emailová adresa";
+"auth_reset_password_error_not_found" = "Zdá sa, že vaša emailová adresa nie je priradená k žiadnemu Matrix ID na tomto domovskom serveri.";
+"auth_email_validation_message" = "Prosím, skontrolujte si email, aby ste mohli pokračovať v registrácii";
+"rooms_empty_view_title" = "Miestnosti";
+
+// Rooms tab
+"room_directory_no_public_room" = "Nie sú dostupné žiadne verejné miestnosti";
+"room_recents_join_room_prompt" = "Zadajte ID miestnosti alebo alias";
+"room_recents_join_room_title" = "Vstúpiť do miestnosti";
+"room_recents_join_room" = "Vstúpiť do miestnosti";
+"room_recents_create_empty_room" = "Vytvoriť miestnosť";
+"room_recents_start_chat_with" = "Začať konverzáciu";
+"room_recents_suggested_rooms_section" = "NAVRHOVANÉ MIESTNOSTI";
+"room_recents_invites_section" = "POZVANIA";
+"room_recents_server_notice_section" = "UPOZORNENIA SYSTÉMU";
+"room_recents_low_priority_section" = "NÍZKA PRIORITA";
+"room_recents_no_conversation" = "Žiadne miestnosti";
+"room_recents_conversations_section" = "MIESTNOSTI";
+"room_recents_people_section" = "ĽUDIA";
+"room_recents_favourites_section" = "OBĽÚBENÉ";
+"room_creation_public_room" = "Táto konverzácia je verejná";
+"room_creation_private_room" = "Táto konverzácia je súkromná";
+"room_creation_privacy" = "Súkromie";
+"room_creation_appearance" = "Vzhľad";
+"room_creation_account" = "Účet";
+
+// Chat creation
+"room_creation_title" = "Nová konverzácia";
+"room_participants_now" = "teraz";
+"room_participants_idle" = "Nečinný";
+"room_participants_unknown" = "Neznámy";
+"room_participants_offline" = "Nedostupný";
+"room_participants_online" = "Prítomný";
+"room_participants_invited_section" = "POZVANÍ";
+"room_participants_invite_prompt_title" = "Potvrdenie";
+"room_participants_remove_prompt_title" = "Potvrdenie";
+"room_participants_leave_prompt_title_for_dm" = "Opustiť";
+
+// Chat participants
+"room_participants_title" = "Účastníci";
+"search_default_placeholder" = "Hľadať";
+"search_files" = "Súbory";
+"search_people" = "Ľudia";
+"auth_softlogout_sign_in" = "Prihlásiť sa";
+"people_empty_view_title" = "Ľudia";
+"people_no_conversation" = "Žiadne konverzácie";
+"people_conversation_section" = "KONVERZÁCIE";
+
+// People tab
+"people_invites_section" = "POZVANIA";
+"auth_reset_password_error_unauthorized" = "Nepodarilo sa overiť emailovú adresu: Uistite sa, že ste správne klikli na odkaz v emailovej správe";
+"auth_reset_password_next_step_button" = "Overil som svoju emailovú adresu";
+"auth_reset_password_email_validation_message" = "Na adresu %s bola odoslaná správa. Po kliknutí na odkaz, ktorý obsahuje, kliknite nižšie.";
+"auth_reset_password_missing_password" = "Musíte zadať nové heslo.";
+"auth_reset_password_missing_email" = "Musíte zadať emailovú adresu prepojenú s vašim účtom.";
+"auth_reset_password_message" = "Ak chcete obnoviť vaše heslo, zadajte emailovú adresu prepojenú s vašim účtom:";
+"auth_recaptcha_message" = "Tento domovský server by sa rád uistil, že nie ste robot";
+"auth_msisdn_validation_error" = "Nie je možné overiť telefónne číslo.";
+"auth_msisdn_validation_message" = "Odoslali sme vám SMS správu, ktorá obsahuje overovací kód. Prosím, zadajte ho nižšie.";
+"auth_msisdn_validation_title" = "Čaká sa na overenie";
+"auth_use_server_options" = "Použiť vlastné možnosti servera (pre pokročilých)";
+"auth_email_not_found" = "Nepodarilo sa odoslať e-mail: Táto e-mailová adresa nebola nájdená";
+"auth_forgot_password_error_no_configured_identity_server" = "Nie je nastavený žiadny server identity: pridajte ho na obnovenie hesla.";
+"auth_forgot_password" = "Zabudli ste heslo?";
+"auth_username_in_use" = "Používateľské meno sa už používa";
+"auth_password_dont_match" = "Heslá sa nezhodujú";
+"auth_phone_in_use" = "Toto telefónne číslo sa už používa";
+"auth_email_in_use" = "Táto emailová adresa sa už používa";
+"auth_missing_email_or_phone" = "Chýba emailová adresa alebo telefónne číslo";
+"auth_missing_phone" = "Chýba telefónne číslo";
+"auth_missing_email" = "Chýba emailová adresa";
+"auth_add_phone_message_2" = "Nastavte si telefónne číslo, aby bolo neskôr možné voliteľné vyhľadanie ľuďmi, ktorí vás poznajú.";
+"auth_add_email_message_2" = "Nastavte e-mail na obnovenie účtu a neskôr na voliteľné vyhľadanie ľuďmi, ktorí vás poznajú.";
+"auth_missing_password" = "Chýba heslo";
+"auth_invalid_phone" = "Toto nevyzerá ako platné telefónne číslo";
+"auth_invalid_email" = "Toto nevyzerá ako platná e-mailová adresa";
+"auth_invalid_password" = "Heslo je veľmi krátke (minimálne 6 znakov)";
+"auth_invalid_user_name" = "Používateľské meno môže obsahovať len písmená, číslice, bodky, pomlčky a podčiarkovníky";
+"auth_invalid_login_param" = "Nesprávne používateľské meno a/alebo heslo";
+"auth_identity_server_placeholder" = "URL (napr. https://vector.im)";
+"auth_home_server_placeholder" = "URL (napr. https://matrix.org)";
+"auth_repeat_new_password_placeholder" = "Potvrďte svoje nové heslo";
+"auth_repeat_password_placeholder" = "Zopakovať heslo";
+"auth_phone_placeholder" = "Telefónne číslo";
+"auth_optional_phone_placeholder" = "Telefónne číslo (nepovinné)";
+"auth_email_placeholder" = "Emailová adresa";
+"auth_optional_email_placeholder" = "Emailová adresa (nepovinné)";
+"auth_user_name_placeholder" = "Meno používateľa";
+"auth_new_password_placeholder" = "Nové heslo";
+"auth_password_placeholder" = "Heslo";
+"auth_user_id_placeholder" = "Emailová adresa alebo používateľské meno";
+"auth_return_to_login" = "Vrátiť sa na prihlasovaciu obrazovku";
+"auth_send_reset_email" = "Poslať obnovovací email";
+"auth_login_single_sign_on" = "Prihlásiť sa";
+"auth_skip" = "Preskočiť";
+"auth_submit" = "Odoslať";
+"auth_register" = "Zaregistrovať";
+
+// Authentication
+"auth_login" = "Prihlásiť sa";
+"callbar_only_single_paused" = "Pozastavený hovor";
+"callbar_active_and_multiple_paused" = "1 aktívny hovor (%@) - %@ pozastavených hovorov";
+"callbar_active_and_single_paused" = "1 aktívny hovor (%@) - 1 pozastavený hovor";
+
+// Call Bar
+"callbar_only_single_active" = "Ťuknutím sa vrátite k hovoru (%@)";
+"switch" = "Prepnúť";
+"sending" = "Odosielanie";
diff --git a/Riot/Assets/sq.lproj/Vector.strings b/Riot/Assets/sq.lproj/Vector.strings
index 221b56ec4..75f1fc60e 100644
--- a/Riot/Assets/sq.lproj/Vector.strings
+++ b/Riot/Assets/sq.lproj/Vector.strings
@@ -1518,3 +1518,4 @@
 "find_your_contacts_title" = "Fillojani duke shfaqur kontaktet tuaja";
 "contacts_address_book_permission_denied_alert_message" = "Që të aktivizoni kontakte, kaloni te rregullimet e pajisjes tua.";
 "contacts_address_book_permission_denied_alert_title" = "Kontaktet u çaktivizuan";
+"space_home_show_all_rooms" = "Shfaqi krejt dhomat";
diff --git a/Riot/Assets/sv.lproj/Vector.strings b/Riot/Assets/sv.lproj/Vector.strings
index ccffe08ef..eacf7e0f7 100644
--- a/Riot/Assets/sv.lproj/Vector.strings
+++ b/Riot/Assets/sv.lproj/Vector.strings
@@ -29,7 +29,7 @@
 "warning" = "Varning";
 "active_call" = "Aktivt samtal";
 "active_call_details" = "Aktivt samtal (%@)";
-"rename" = "Byt namn";
+"rename" = "Döp om";
 "send_to" = "Skicka till %@";
 "sending" = "Skickar";
 "close" = "Stäng";
@@ -62,7 +62,7 @@
 "auth_email_is_required" = "Ingen identitetsserver är konfigurerad, så du kan inte lägga till en e-postadress för att återställa ditt lösenord i framtiden.";
 "auth_phone_is_required" = "Ingen identitetsserver är konfigurerad, så du kan inte lägga till ett telefonnummer för att återställa ditt lösenord i framtiden.";
 "auth_password_dont_match" = "Lösenorden matchar inte";
-"auth_username_in_use" = "Användarnamnet är upptaget";
+"auth_username_in_use" = "Användarnamn upptaget";
 "auth_forgot_password" = "Glömt lösenordet?";
 "auth_email_not_found" = "Misslyckades att skicka e-post: Den här e-postadressen hittades inte";
 "auth_use_server_options" = "Använd anpassade serveralternativ (avancerat)";
@@ -97,7 +97,7 @@
 "room_creation_keep_private" = "Behåll privat";
 "room_creation_make_private" = "Gör privat";
 "room_creation_wait_for_creation" = "Ett rum håller redan på att skapas. Vänligen vänta.";
-"room_creation_invite_another_user" = "Sök / bjud in efter användar-ID, namn eller e-postadress";
+"room_creation_invite_another_user" = "Användar-ID, namn eller e-postadress";
 "room_recents_favourites_section" = "FAVORITER";
 "room_recents_people_section" = "PERSONER";
 "room_recents_conversations_section" = "RUM";
@@ -274,7 +274,7 @@
 "settings_integrations" = "INTEGRATIONER";
 "settings_user_interface" = "ANVÄNDARGRÄNSSNITT";
 "settings_ignored_users" = "IGNORERADE ANVÄNDARE";
-"settings_contacts" = "LOKALA KONTAKTER";
+"settings_contacts" = "ENHETSKONTAKTER";
 "settings_advanced" = "AVANCERAT";
 "settings_other" = "ANNAT";
 "settings_labs" = "EXPERIMENT";
@@ -1417,3 +1417,54 @@
 "room_recents_suggested_rooms_section" = "FÖRESLAGNA RUM";
 "done" = "Klar";
 "open" = "Öppna";
+"service_terms_modal_information_description_integration_manager" = "En integrationshanterare låter dig lägga till funktioner från tredje parter.";
+"service_terms_modal_information_description_identity_server" = "En identitetsserver hjälper dig att hitta dina kontakter genom att leta upp deras telefonnummer eller e-postadress för att se om de redan har ett konto.";
+"service_terms_modal_information_title_integration_manager" = "Integrationshanterare";
+
+// Alert explaining what an identity server / integration manager is.
+"service_terms_modal_information_title_identity_server" = "Identitetsserver";
+"service_terms_modal_description_integration_manager" = "Detta kommer att låta dig använda bottar, bryggor, widgets och dekalpaket.";
+"service_terms_modal_description_identity_server" = "Detta kommer att låta personer hitta dig om de har ditt telefonnummer eller din e-postadress sparat i sina telefonkontakter.";
+"service_terms_modal_table_header_integration_manager" = "INTEGRATIONSHANTERARVILLKOR";
+"service_terms_modal_table_header_identity_server" = "IDENTITETSSERVERVILLKOR";
+"service_terms_modal_footer" = "Detta kan inaktiveras när som helst i inställningarna.";
+
+// Service terms
+"service_terms_modal_title_message" = "För att fortsätta, acceptera användarvillkoren nedan";
+"settings_contacts_enable_sync_description" = "Detta kommer att använda din identitetsserver för att koppla dig till dina kontakter, och hjälpa dem att hitta dig.";
+"settings_contacts_enable_sync" = "Hitta dina kontakter";
+"settings_phone_contacts" = "TELEFONKONTAKTER";
+"room_event_action_forward" = "Vidarebefordra";
+"find_your_contacts_identity_service_error" = "Kan inte ansluta till identitetsservern.";
+"find_your_contacts_footer" = "Detta kan inaktiveras när som helst från inställningarna.";
+"find_your_contacts_button_title" = "Hitta dina kontakter";
+"find_your_contacts_message" = "Låt %@ visa dina kontakter så att du snabbt kan börja chatta med dem du känner bäst.";
+"find_your_contacts_title" = "Börja genom att lista dina kontakter";
+"contacts_address_book_permission_denied_alert_message" = "För att aktivera kontakter, gå till dina enhetsinställningar.";
+"contacts_address_book_permission_denied_alert_title" = "Kontakter inaktiverat";
+"space_avatar_view_accessibility_hint" = "Byt utrymmesavatar";
+
+// Mark: Avatar
+
+"space_avatar_view_accessibility_label" = "avatar";
+"space_public_join_rule" = "Offentligt utrymme";
+"space_private_join_rule" = "Privat utrymme";
+"space_home_show_all_rooms" = "Visa alla rum";
+"space_participants_action_ban" = "Banna från det här utrymmet";
+"space_participants_action_remove" = "Ta bort från det här utrymmet";
+"spaces_coming_soon_detail" = "Den här funktionen har inte bjudits in än, men den är på väg. För tillfället så kan du göra det med Element på din dator.";
+"spaces_invites_coming_soon_title" = "Inbjudningar kommer snart";
+"spaces_add_rooms_coming_soon_title" = "Tilläggning av rum kommer snart";
+"spaces_coming_soon_title" = "Kommer snart";
+"spaces_no_member_found_detail" = "Söker du någon som inte är i %@? För tillfället så kan du bjuda in dem på webben eller i skrivbordsappen.";
+"spaces_no_room_found_detail" = "Vissa resultat kan vara dolda för att de är privata och du behöver en inbjudan för att gå med i dem.";
+"spaces_no_result_found_title" = "Inga resultat funna";
+"spaces_empty_space_detail" = "Vissa rum kan vara dolda för att det är privata och du behöver en inbjudan.";
+"spaces_empty_space_title" = "Det här utrymmet har inge rum (än)";
+"space_tag" = "utrymme";
+"spaces_suggested_room" = "Föreslaget";
+"spaces_explore_rooms" = "Utforska rum";
+"leave_space_and_all_rooms_action" = "Lämna alla rum och utrymmen";
+"leave_space_only_action" = "Lämna inga rum";
+"leave_space_message_admin_warning" = "Du är admin för det här utrymmet, försäkra att du har överfört adminrättigheter till en annan medlem innan du lämnar.";
+"leave_space_message" = "Är du säker på att du vill lämna %@? Vill du även lämna alla rum och utrymmen i det här utrymmet?";
diff --git a/Riot/Assets/third_party_licenses.html b/Riot/Assets/third_party_licenses.html
index fc4b54a43..ee1a8d284 100644
--- a/Riot/Assets/third_party_licenses.html
+++ b/Riot/Assets/third_party_licenses.html
@@ -15,21 +15,7 @@
 <p>
 	This application is making use of the following third party softwares:
 </p>
-<ul>
-    <li>
-        <b>MatrixKit</b> (<a
-            href="https://github.com/matrix-org/matrix-ios-kit.git">https://github.com/matrix-org/matrix-ios-kit.git</a>)
-        <br/><br/>The Matrix reusable UI library for iOS based on MatrixSDK.
-        <br/><br/>Copyright (c) 2014-2016 OpenMarket Ltd.
-        <br/>Copyright (c) 2016-2017 Vector Creations Ltd
-        <br/>Copyright (c) 2018-2019 New Vector Ltd
-        <br/>Copyright (c) 2019 The Matrix.org Foundation C.I.C
-        <br/><br/>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in compliance with the License. You may obtain a copy of the License at:
-        <br/><br/><a
-            href="https://www.apache.org/licenses/LICENSE-2.0">https://www.apache.org/licenses/LICENSE-2.0</a>
-        <br/><br/>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.
-        <br/><br/>
-    </li>
+<ul>    
     <li>
         <b>MatrixSDK</b> (<a
             href="https://github.com/matrix-org/matrix-ios-sdk.git">https://github.com/matrix-org/matrix-ios-sdk.git</a>)
@@ -1911,6 +1897,34 @@ Library.
         SOFTWARE.
         <br/><br/>
     </li>
+    <li>
+        <b>PostHog iOS</b> (<a href="https://github.com/PostHog/posthog-ios">https://github.com/PostHog/posthog-ios</a>)
+        <br/><br/>
+        The MIT License (MIT)
+        <br/><br/>
+        Copyright (c) 2020 PostHog (part of Hiberly Inc)
+        <br/><br/>
+        Copyright (c) 2016 Segment.io, Inc.
+        <br/><br/>
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        <br/><br/>
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        <br/><br/>
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+        <br/><br/>
+    </li>
 </ul>
 </body>
 </html>
diff --git a/Riot/Assets/uk.lproj/Vector.strings b/Riot/Assets/uk.lproj/Vector.strings
index a573557ce..abf77edfd 100644
--- a/Riot/Assets/uk.lproj/Vector.strings
+++ b/Riot/Assets/uk.lproj/Vector.strings
@@ -353,10 +353,10 @@
 
 // Others
 "or" = "або";
-"event_formatter_widget_removed_by_you" = "Ви вилучили розширення: %@";
+"event_formatter_widget_removed_by_you" = "Ви вилучили віджет: %@";
 
 // Events formatter with you
-"event_formatter_widget_added_by_you" = "Ви додали розширення: %@";
+"event_formatter_widget_added_by_you" = "Ви додали віджет: %@";
 "event_formatter_group_call_incoming" = "%@ у %@";
 "event_formatter_group_call_leave" = "Вийти";
 "room_join_group_call" = "Приєднатися";
@@ -429,15 +429,15 @@
 "room_multiple_typing_notification" = "%@ та інші";
 "room_place_voice_call" = "Голосовий виклик";
 "room_widget_permission_room_id_permission" = "ID кімнати";
-"room_widget_permission_widget_id_permission" = "ID розширення";
+"room_widget_permission_widget_id_permission" = "ID віджету";
 "room_widget_permission_theme_permission" = "Ваша тема";
 "room_widget_permission_user_id_permission" = "Ваш ID користувача";
 "room_widget_permission_avatar_url_permission" = "URL-адреса вашого аватара";
 "room_widget_permission_display_name_permission" = "Ваше показуване ім'я";
-"room_widget_permission_creator_info_title" = "Це розширення додано:";
+"room_widget_permission_creator_info_title" = "Цей віджет додано:";
 
 // Room widget permissions
-"room_widget_permission_title" = "Завантажити розширення";
+"room_widget_permission_title" = "Завантажити віджет";
 "widget_picker_manage_integrations" = "Керувати інтеграціями…";
 "room_accessibility_video_call" = "Відеовиклик";
 "room_accessibility_call" = "Виклик";
@@ -895,3 +895,130 @@
 "key_verification_manually_verify_device_validate_action" = "Звірити";
 "room_participants_action_security_status_verify" = "Звірити";
 "room_participants_action_security_status_verified" = "Звірений";
+"version_check_banner_title_deprecated" = "Ми більше не підтримуємо iOS %@";
+"version_check_modal_title_supported" = "Ми завершуємо підтримку iOS %@";
+
+// Mark: - Version check
+
+"version_check_banner_title_supported" = "Ми завершуємо підтримку iOS %@";
+"space_public_join_rule" = "Загальнодоступний простір";
+"space_private_join_rule" = "Приватний простір";
+"space_home_show_all_rooms" = "Показати усі кімнати";
+"spaces_add_rooms_coming_soon_title" = "Скоро можна буде додавати кімнати";
+"spaces_coming_soon_title" = "Уже незабаром";
+"spaces_no_result_found_title" = "Результатів не знайдено";
+"spaces_empty_space_title" = "У просторі відсутні кімнати (поки що)";
+"space_tag" = "простір";
+"leave_space_title" = "Вийти з %@";
+"spaces_left_panel_title" = "Простори";
+"spaces_home_space_title" = "Домівка";
+
+// Mark: - Spaces
+
+"space_feature_unavailable_title" = "Простори ще не додано";
+"room_info_list_section_other" = "Інше";
+"biometrics_cant_unlocked_alert_title" = "Не вдалося розблокувати застосунок";
+"pin_protection_settings_section_header_with_biometrics" = "PIN-код і %@";
+"pin_protection_settings_section_header" = "PIN-код";
+"major_update_learn_more_action" = "Докладніше";
+
+// MARK: - Major update
+
+"major_update_title" = "Riot тепер %@";
+"secrets_setup_recovery_passphrase_confirm_passphrase_placeholder" = "Підтвердити фразу";
+"key_backup_setup_passphrase_confirm_passphrase_placeholder" = "Підтвердити фразу";
+"secrets_setup_recovery_passphrase_confirm_passphrase_title" = "Підтвердити";
+"key_backup_setup_passphrase_confirm_passphrase_title" = "Підтвердити";
+"key_backup_setup_passphrase_passphrase_invalid" = "Спробуйте додати слово";
+"key_backup_setup_passphrase_confirm_passphrase_invalid" = "фраза не збігається";
+"key_backup_setup_passphrase_confirm_passphrase_valid" = "Чудово!";
+"key_backup_setup_passphrase_passphrase_valid" = "Чудово!";
+"key_backup_setup_passphrase_passphrase_placeholder" = "Ввести фразу";
+"secrets_recovery_with_key_recovery_key_title" = "Ввід";
+"key_backup_recover_from_passphrase_recover_action" = "Розблокувати історію";
+"key_backup_recover_from_passphrase_passphrase_placeholder" = "Ввести фразу";
+"key_backup_recover_from_passphrase_passphrase_title" = "Ввід";
+"secrets_recovery_with_passphrase_passphrase_title" = "Ввід";
+"key_backup_recover_from_recovery_key_recovery_key_title" = "Ввід";
+"key_backup_setup_passphrase_passphrase_title" = "Ввід";
+"key_backup_setup_skip_alert_title" = "Ви впевнені?";
+"room_event_action_reaction_history" = "Історія реакцій";
+"room_event_action_reaction_show_less" = "Згорнути";
+"room_event_action_reaction_show_all" = "Показати все";
+"room_action_reply" = "Відповідь";
+"room_event_action_reply" = "Відповідь";
+"room_event_action_delete_confirmation_title" = "Видалити не надіслане повідомлення";
+"room_event_action_report_prompt_ignore_user" = "Бажаєте сховати усі повідомлення від цього користувача?";
+"room_event_action_kick_prompt_reason" = "Причина вилучення користувача";
+"room_participants_action_mention" = "Згадати";
+"room_participants_action_unignore" = "Показати усі повідомлення від цього користувача";
+"room_participants_action_ignore" = "Сховати усі повідомлення від цього користувача";
+"room_participants_unknown" = "Невідомо";
+"room_participants_offline" = "Не в мережі";
+"room_participants_online" = "У мережі";
+"find_your_contacts_identity_service_error" = "Не вдалося під'єднатися до сервера ідентифікації.";
+"find_your_contacts_footer" = "Це будь-коли можна вимкнути у налаштуваннях.";
+"settings_contacts_phonebook_country" = "Країна телефонної книги";
+"settings_contacts_enable_sync" = "Пошук контактів";
+"find_your_contacts_button_title" = "Пошук контактів";
+"contacts_address_book_permission_denied_alert_message" = "Увімкніть контакти з налаштувань пристрою.";
+"contacts_address_book_permission_denied_alert_title" = "Контакти вимкнено";
+"network_offline_prompt" = "Відсутнє зʼєднання з інтернетом.";
+"room_no_privileges_to_create_group_call" = "Щоб розпочати виклик ви повинні бути адміністратором або модератором.";
+"room_event_action_delete_confirmation_message" = "Ви впевнені, що хочете видалити це не надіслане повідомлення?";
+"room_event_action_report_prompt_reason" = "Причина скарги на цей вміст";
+"room_event_action_report" = "Поскаржитися на вміст";
+"room_event_action_view_decrypted_source" = "Переглянути розшифроване джерело";
+"room_event_action_view_source" = "Переглянути джерело";
+"room_event_action_permalink" = "Постійне посилання";
+"room_event_action_forward" = "Переслати";
+"room_resend_unsent_messages" = "Повторно надіслати не надіслані повідомлення";
+"room_prompt_cancel" = "скасувати всі";
+"room_prompt_resend" = "Надіслати всі";
+"room_unsent_messages_cancel_message" = "Ви впевнені, що хочете видалити не надіслані повідомлення у цій кімнаті?";
+"room_delete_unsent_messages" = "Видалити не надіслані повідомлення";
+"room_unsent_messages_cancel_title" = "Видалити не надіслані повідомлення";
+"encrypted_room_message_reply_to_placeholder" = "Надіслати зашифровану відповідь…";
+"encrypted_room_message_placeholder" = "Надіслати зашифроване повідомлення…";
+"room_do_not_have_permission_to_post" = "Вам не дозволено дописувати у цій кімнаті";
+"room_accessiblity_scroll_to_bottom" = "Униз";
+"room_jump_to_first_unread" = "До непрочитаних";
+
+// Chat
+"room_slide_to_end_group_call" = "Проведіть пальцем, щоб завершити виклик для всіх";
+"room_participants_security_information_room_not_encrypted_for_dm" = "Повідомлення тут не захищено наскрізним шифруванням.";
+"room_participants_security_information_room_not_encrypted" = "Повідомлення у цій кімнаті не захищено наскрізним шифруванням.";
+"room_participants_action_set_default_power_level" = "Скинути до звичайного користувача";
+"share_extension_low_quality_video_title" = "Відео буде надіслано у низькій якості";
+"deactivate_account_informations_part3" = "\n\nДеактивація вашого облікового запису ";
+"service_terms_modal_footer" = "Потім це можна вимкнути у налаштуваннях.";
+"service_terms_modal_table_header_identity_server" = "УМОВИ СЕРВЕРА ІДЕНТИФІКАЦІЇ";
+"service_terms_modal_table_header_integration_manager" = "УМОВИ МЕНЕДЖЕРА ІНТЕГРАЦІЙ";
+
+// Alert explaining what an identity server / integration manager is.
+"service_terms_modal_information_title_identity_server" = "Сервер ідентифікації";
+"service_terms_modal_information_title_integration_manager" = "Менеджер інтеграцій";
+
+// Room key request dialog
+"e2e_room_key_request_title" = "Запит ключів шифрування";
+"share_extension_send_now" = "Надіслати зараз";
+"service_terms_modal_accept_button" = "Прийняти";
+"room_details_flair_invalid_id_prompt_msg" = "%@ — неправильний ідентифікатор спільноти";
+"room_details_flair_invalid_id_prompt_title" = "Неправильний формат";
+"room_details_new_flair_placeholder" = "Додати новий ID спільноти (напр., +foo%@)";
+"room_details_access_section_invited_only" = "Лише запрошені люди";
+"room_details_access_section_directory_toggle_for_dm" = "Показувати у каталозі кімнат";
+"room_details_access_section_directory_toggle" = "Додати кімнату в каталог кімнат";
+"room_details_addresses_disable_main_address_prompt_title" = "Попередження про основну адресу";
+"room_details_addresses_invalid_address_prompt_msg" = "%@ — неправильний формат псевдоніма";
+"room_details_addresses_invalid_address_prompt_title" = "Неправильний формат псевдоніма";
+"room_details_no_local_addresses_for_dm" = "Ще немає локальних адрес";
+"room_details_no_local_addresses" = "У цієї кімнати немає локальних адрес";
+"room_details_addresses_section" = "Адреси";
+"room_details_history_section_prompt_msg" = "Змінює, хто може читати історію. Застосовуватиметься лише до майбутніх повідомлень у цій кімнаті. Видимість наявної історії не зміниться.";
+"room_details_history_section_prompt_title" = "Попередження приватності";
+"room_details_history_section_members_only_since_joined" = "Лише учасники (від часу приєднання)";
+"room_details_history_section_members_only_since_invited" = "Лише учасники (від часу запрошення)";
+"room_details_history_section_members_only" = "Лише учасники (від часу вибору цієї опції)";
+"room_details_history_section_anyone" = "Будь-хто";
+"room_details_history_section" = "Хто може переглядати історію?";
diff --git a/Riot/Assets/vi.lproj/InfoPlist.strings b/Riot/Assets/vi.lproj/InfoPlist.strings
index 69b136af6..41eb2f4aa 100644
--- a/Riot/Assets/vi.lproj/InfoPlist.strings
+++ b/Riot/Assets/vi.lproj/InfoPlist.strings
@@ -1,5 +1,7 @@
 // Permissions usage explanations
-"NSCameraUsageDescription" = "Máy ảnh được sử dụng để chụp ảnh và quay phim, thực hiện các cuộc gọi video thoại.";
+"NSCameraUsageDescription" = "Máy ảnh được sử dụng để chụp ảnh và quay phim, thực hiện các cuộc gọi video.";
 "NSPhotoLibraryUsageDescription" = "Thư viện ảnh được dùng để gửi hình ảnh và videos.";
-"NSMicrophoneUsageDescription" = "Microphone được dùng để thực hiện quay video, thực hiện các cuộc gọi.";
-"NSContactsUsageDescription" = "Danh bạ được sử dụng để tìm kiếm người dùng bởi email hoặc số điện thoại trên Element.";
+"NSMicrophoneUsageDescription" = "Element cần quyền truy cập vào mi-crô của bạn để nhận và thực hiện cuộc gọi, quay video, và ghi âm các tin nhắn thoại.";
+"NSContactsUsageDescription" = "Element sẽ hiển thị danh bạ của bạn để bạn có thể mời họ trò chuyện.";
+"NSFaceIDUsageDescription" = "Face ID được sử dụng để truy cập vào ứng dụng của bạn.";
+"NSCalendarsUsageDescription" = "Xem các cuộc họp đã lên lịch trong ứng dụng.";
diff --git a/Riot/Assets/vi.lproj/Localizable.strings b/Riot/Assets/vi.lproj/Localizable.strings
index 34cbdec88..9dc169788 100644
--- a/Riot/Assets/vi.lproj/Localizable.strings
+++ b/Riot/Assets/vi.lproj/Localizable.strings
@@ -1,5 +1,5 @@
 /* New message from a specific person, not referencing a room */
-"MSG_FROM_USER" = "Tin nhắn từ %@";
+"MSG_FROM_USER" = "%@ đã gửi một tin nhắn";
 /* New message from a specific person in a named room */
 "MSG_FROM_USER_IN_ROOM" = "%@ đã đăng trong %@";
 /* New message from a specific person, not referencing a room. Content included. */
@@ -13,36 +13,122 @@
 /* New action message from a specific person, not referencing a room. */
 "IMAGE_FROM_USER" = "%@ đã gửi bạn một hình ảnh %@";
 /* New action message from a specific person in a named room. */
-"IMAGE_FROM_USER_IN_ROOM" = "%@ đã đăng một hình ảnh %@ trong %@";
+"IMAGE_FROM_USER_IN_ROOM" = "%@ đã đăng một ảnh %@ trong %@";
 /* Multiple unread messages in a room */
-"UNREAD_IN_ROOM" = "%@ có tin nhắn mới trong %@";
+"UNREAD_IN_ROOM" = "%@ tin nhắn mới trong %@";
 /* Multiple unread messages from a specific person, not referencing a room */
-"MSGS_FROM_USER" = "%@ có tin nhắn mới trong %@";
+"MSGS_FROM_USER" = "%@ tin nhắn mới trong %@";
 /* Multiple unread messages from two people */
-"MSGS_FROM_TWO_USERS" = "%@ có tin nhắn mới từ %@ và %@";
+"MSGS_FROM_TWO_USERS" = "%@ tin nhắn mới từ %@ và %@";
 /* Multiple unread messages from three people */
-"MSGS_FROM_THREE_USERS" = "%@ có tin nhắn mới từ %@, %@ và %@";
+"MSGS_FROM_THREE_USERS" = "%@ tin nhắn mới từ %@, %@ và %@";
 /* Multiple unread messages from two plus people (ie. for 4+ people: 'others' replaces the third person) */
-"MSGS_FROM_TWO_PLUS_USERS" = "%@ có tin nhắn mới từ %@, %@ và những người khác";
+"MSGS_FROM_TWO_PLUS_USERS" = "%@ tin nhắn mới từ %@, %@ và những người khác";
 /* Multiple messages in two rooms */
-"MSGS_IN_TWO_ROOMS" = "%@ có tin nhắn mới trong %@ và %@";
+"MSGS_IN_TWO_ROOMS" = "%@ tin nhắn mới trong %@ và %@";
 /* Look, stuff's happened, alright? Just open the app. */
-"MSGS_IN_TWO_PLUS_ROOMS" = "%@ có tin nhắn mới từ %@, %@ và nhiều hơn nữa";
+"MSGS_IN_TWO_PLUS_ROOMS" = "%@ tin nhắn mới từ %@, %@ và nhiều hơn nữa";
 /* A user has invited you to a chat */
-"USER_INVITE_TO_CHAT" = "%@ đã mời bạn tham gia trò chuyện";
+"USER_INVITE_TO_CHAT" = "%@ vừa mời bạn trò chuyện";
 /* A user has invited you to an (unamed) group chat */
-"USER_INVITE_TO_CHAT_GROUP_CHAT" = "%@ đã mời bạn tham gia vào một cuộc trò chuyện nhóm";
+"USER_INVITE_TO_CHAT_GROUP_CHAT" = "%@ vừa mời bạn trò chuyện nhóm";
 /* A user has invited you to a named room */
-"USER_INVITE_TO_NAMED_ROOM" = "%@ đã mời bạn tham gia vào %@";
+"USER_INVITE_TO_NAMED_ROOM" = "%@ vừa mời bạn vào %@";
 /* Incoming one-to-one voice call */
-"VOICE_CALL_FROM_USER" = "Gọi thoại từ %@";
+"VOICE_CALL_FROM_USER" = "Gọi từ %@";
 /* Incoming one-to-one video call */
 "VIDEO_CALL_FROM_USER" = "Gọi video từ %@";
 /* Incoming unnamed voice conference invite from a specific person */
-"VOICE_CONF_FROM_USER" = "Gọi thoại nhóm từ %@";
+"VOICE_CONF_FROM_USER" = "Gọi nhóm từ %@";
 /* Incoming unnamed video conference invite from a specific person */
 "VIDEO_CONF_FROM_USER" = "Gọi video nhóm từ %@";
 /* Incoming named voice conference invite from a specific person */
-"VOICE_CONF_NAMED_FROM_USER" = "Gọi thoại nhóm từ %@: '%@'";
+"VOICE_CONF_NAMED_FROM_USER" = "Gọi nhóm từ %@: '%@'";
 /* Incoming named video conference invite from a specific person */
 "VIDEO_CONF_NAMED_FROM_USER" = "Gọi video nhóm từ %@: '%@'";
+
+/** Key verification **/
+
+"KEY_VERIFICATION_REQUEST_FROM_USER" = "%@ muốn xác minh";
+
+/* Group call from user, CallKit caller name */
+"GROUP_CALL_FROM_USER" = "%@ (cuộc gọi nhóm)";
+
+/* A user added a Jitsi call to a room */
+"GROUP_CALL_STARTED" = "Cuộc gọi nhóm đã bắt đầu";
+
+/* A user's membership has updated in an unknown way */
+"USER_MEMBERSHIP_UPDATED" = "%@ đã cập nhật hồ sơ";
+
+/* A user has change their avatar */
+"USER_UPDATED_AVATAR" = "%@ đã đổi avatar";
+
+/* A user has change their name to a new name which we don't know */
+"GENERIC_USER_UPDATED_DISPLAYNAME" = "%@ đã đổi tên";
+
+/** Membership Updates **/
+
+/* A user has change their name to a new name */
+"USER_UPDATED_DISPLAYNAME" = "%@ đã đổi tên sang %@";
+
+/* A user has reacted to a message, but the reaction content is unknown */
+"GENERIC_REACTION_FROM_USER" = "%@ đã gửi một tương tác";
+
+/** Reactions **/
+
+/* A user has reacted to a message, including the reaction e.g. "Alice reacted 👍". */
+"REACTION_FROM_USER" = "%@ đã tương tác %@";
+
+/* New message with hidden content due to PIN enabled */
+"MESSAGE_PROTECTED" = "Tin nhắn mới";
+
+/* New message indicator on a room */
+"MESSAGE_IN_X" = "Tin nhắn trong %@";
+
+/* New message indicator from a DM */
+"MESSAGE_FROM_X" = "Tin nhắn từ %@";
+
+/** Notification messages **/
+
+/* New message indicator on unknown room */
+"MESSAGE" = "Tin nhắn";
+
+/* Sticker from a specific person, not referencing a room. */
+"STICKER_FROM_USER" = "%@ đã gửi một sticker";
+
+/* A single unread message */
+"SINGLE_UNREAD" = "Bạn đã nhận một tin nhắn";
+
+/* A single unread message in a room */
+"SINGLE_UNREAD_IN_ROOM" = "Bạn đã nhận một tin nhắn trong %@";
+
+/* New file message from a specific person, not referencing a room. */
+"FILE_FROM_USER" = "%@ đã gửi một tệp %@";
+
+/* New voice message from a specific person, not referencing a room. */
+"VOICE_MESSAGE_FROM_USER" = "%@ đã gửi một tin nhắn thoại";
+
+/* New audio message from a specific person, not referencing a room. */
+"AUDIO_FROM_USER" = "%@ đã gửi một tệp âm thanh %@";
+
+/* New video message from a specific person, not referencing a room. */
+"VIDEO_FROM_USER" = "%@ đã gửi video";
+
+/** Media Messages **/
+
+/* New image message from a specific person, not referencing a room. */
+"PICTURE_FROM_USER" = "%@ đã gửi ảnh";
+
+/* New message reply from a specific person in a named room. */
+"REPLY_FROM_USER_IN_ROOM_TITLE" = "%@ đã trả lời trong %@";
+
+/* New message reply from a specific person, not referencing a room. */
+"REPLY_FROM_USER_TITLE" = "%@ đã trả lời";
+
+/** Titles **/
+
+/* Message title for a specific person in a named room */
+"MSG_FROM_USER_IN_ROOM_TITLE" = "%@ trong %@";
+/** General **/
+
+"NOTIFICATION" = "Thông báo";
diff --git a/Riot/Assets/vi.lproj/Vector.strings b/Riot/Assets/vi.lproj/Vector.strings
index 0be4ee022..0b1c91386 100644
--- a/Riot/Assets/vi.lproj/Vector.strings
+++ b/Riot/Assets/vi.lproj/Vector.strings
@@ -67,7 +67,7 @@
 "auth_missing_email_or_phone" = "Thiếu địa chỉ email hoặc số điện thoại";
 "auth_email_in_use" = "Địa chỉ email này đã được sử dụng";
 "auth_phone_in_use" = "Số điện thoại này đã được sử dụng";
-"auth_untrusted_id_server" = "Máy chủ nhận dạng không được tin cậy";
+"auth_untrusted_id_server" = "Máy chủ xác thực không được tin cậy";
 "auth_password_dont_match" = "Mật khẩu không trùng khớp";
 "auth_username_in_use" = "Tên đăng nhập đang được sử dụng";
 "auth_forgot_password" = "Quên mật khẩu?";
@@ -153,12 +153,12 @@
 "room_participants_one_participant" = "1 người tham gia";
 "room_participants_multi_participants" = "%d người tham gia";
 "room_participants_leave_prompt_title" = "Rời phòng";
-"room_participants_leave_prompt_msg" = "Bạn có muốn rời phòng này?";
+"room_participants_leave_prompt_msg" = "Bạn có chắc muốn rời phòng này?";
 "room_participants_remove_prompt_title" = "Xác nhận";
 "room_participants_remove_prompt_msg" = "Bạn có muốn gỡ bỏ %@ ra khỏi cuộc trò chuyện?";
 "room_participants_remove_third_party_invite_msg" = "Gỡ bỏ lời mời của bên thứ ba chưa được hỗ trợ cho tới khi api được thực hiện";
 "room_participants_invite_prompt_title" = "Xác nhận";
-"room_participants_invite_prompt_msg" = "Bạn có muốn mời %@ vào cuộc trò chuyện này?";
+"room_participants_invite_prompt_msg" = "Bạn có chắc muốn mời %@ vào cuộc trò chuyện này?";
 "room_participants_filter_room_members" = "Lọc thành viên trong phòng";
 "room_participants_invite_another_user" = "Tìm / mời bằng ID Người dùng, Tên hoặc Email";
 "room_participants_invite_malformed_id_title" = "Lỗi mời";
@@ -199,7 +199,7 @@
 "encrypted_room_message_placeholder" = "Gửi tin nhắn đã mã hoá…";
 "room_message_short_placeholder" = "Gửi tin nhắn…";
 "room_offline_notification" = "Kết nối tới máy chủ thất bại.";
-"room_unsent_messages_notification" = "Các tin nhắn chưa được gửi.";
+"room_unsent_messages_notification" = "Các tin nhắn gửi thất bại.";
 "room_unsent_messages_unknown_devices_notification" = "Các tin nhắn chưa được gửi tới các thiết bị không xác định hiện hành.";
 "room_ongoing_conference_call" = "Cuộc gọi hội nghị đang diễn ra. Tham gia như %@ hoặc %@.";
 "room_ongoing_conference_call_with_close" = "Cuộc gọi hội nghị đang diễn ra. Tham gia như %@ hoặc %@. %@ nó.";
@@ -217,7 +217,7 @@
 "room_event_action_permalink" = "Liên kết";
 "room_event_action_view_source" = "Xem nguồn";
 "room_event_action_report" = "Báo cáo nội dung";
-"room_event_action_report_prompt_reason" = "Lí do báo cáo nội dung";
+"room_event_action_report_prompt_reason" = "Lí do báo cáo nội dung này";
 "room_event_action_report_prompt_ignore_user" = "Bạn có muốn ẩn tất cả tin nhắn từ người dùng này?";
 "room_event_action_save" = "Lưu";
 "room_event_action_resend" = "Gửi lại";
@@ -288,8 +288,8 @@
 "settings_enable_push_notif" = "Thông báo trên thiết bị";
 "settings_show_decrypted_content" = "Hiện nội dung đã giải mã";
 "settings_global_settings_info" = "Cài đặt thông báo toàn cầu khả dụng trên %@ trình duyệt khách của bạn";
-"settings_pin_rooms_with_missed_notif" = "Neo phòng có thông báo bỏ lỡ";
-"settings_pin_rooms_with_unread" = "Neo phòng có tin nhắn chưa đọc";
+"settings_pin_rooms_with_missed_notif" = "Ghim các phòng có thông báo bị bỏ lỡ";
+"settings_pin_rooms_with_unread" = "Ghim các phòng có các tin nhắn chưa đọc";
 "settings_enable_callkit" = "Cuộc gọi tích hợp";
 "settings_callkit_info" = "Nhận cuộc gọi tới trên màn hình khóa. Xem lịch sử cuộc gọi trong lịch sử cuộc gọi của hệ thống. Nếu iCloud được kích hoạt, lịch sử cuộc gọi sẽ được chia sẻ với Apple.";
 "settings_ui_language" = "Ngôn ngữ";
@@ -302,9 +302,9 @@
 "settings_unignore_user" = "Xem tất cả tin nhắn từ %@?";
 "settings_contacts_discover_matrix_users" = "Sử dụng email và số điện thoại để tìm người dùng khác";
 "settings_contacts_phonebook_country" = "Quốc gia trong danh bạ";
-"settings_labs_e2e_encryption" = "End-to-End Mã Hóa";
+"settings_labs_e2e_encryption" = "Mã hóa đầu-cuối";
 "settings_labs_e2e_encryption_prompt_message" = "Để hoàn thành cài đặt mã hóa, bạn phải đăng nhập lại.";
-"settings_labs_create_conference_with_jitsi" = "Tạo cuộc gọi hội họp bằng jitsi";
+"settings_labs_create_conference_with_jitsi" = "Tạo cuộc gọi hội thoại bằng jitsi";
 "settings_version" = "Phiên bản %@";
 "settings_olm_version" = "Phiên bản Olm %@";
 "settings_copyright" = "Bản quyền";
@@ -362,8 +362,8 @@
 "room_details_advanced_section" = "Nâng cao";
 "room_details_advanced_room_id" = "ID Phòng:";
 "room_details_advanced_enable_e2e_encryption" = "Bật mã hóa (cảnh báo: không thể tắt trở lại!)";
-"room_details_advanced_e2e_encryption_enabled" = "Mã hóa được bật cho phòng này";
-"room_details_advanced_e2e_encryption_disabled" = "Mã hóa chưa được bật cho phòng này.";
+"room_details_advanced_e2e_encryption_enabled" = "Mã hóa được kích hoạt cho phòng này";
+"room_details_advanced_e2e_encryption_disabled" = "Mã hóa chưa được kích hoạt cho phòng này.";
 "room_details_advanced_e2e_encryption_blacklist_unverified_devices" = "Chỉ mã hóa cho các thiết bị đã được xác thực";
 "room_details_advanced_e2e_encryption_prompt_message" = "End-to-end, mã hoá đang trong giai đoạn thử nghiệm và có thể không đáng tin cậy.\n\nBạn không nên tin tưởng tuyệt đối vào nó về việc bảo mật dữ liệu hoàn toàn.\n\nThiết bị sẽ không thể giải mã lịch sử từ trước khi họ tham gia vào phòng.\n\nMột khi mã hóa được kích hoạt cho một căn phòng nó không thể tắt (cho đến bây giờ).\n\nTin nhắn được mã hóa sẽ không hiển thị trên các máy khách khi chúng chưa được tích hợp mã hoá.";
 "room_details_fail_to_update_avatar" = "Cập nhật ảnh phòng thất bại";
@@ -459,3 +459,1172 @@
 "share_extension_auth_prompt" = "Đăng nhập vào ứng dụng chính để chia sẻ nội dung";
 "share_extension_failed_to_encrypt" = "Gửi thất bại. Kiểm tra cài đặt bảo mật phòng trong ứng dụng chính";
 "title_groups" = "Cộng đồng";
+"version_check_modal_action_title_deprecated" = "Tìm hiểu cách";
+"version_check_modal_subtitle_deprecated" = "Chúng tôi đã làm việc để nâng cao %@ để có trải nghiệm nhanh hơn và bóng bẩy hơn. Thật không may, phiên bản iOS hiện tại của bạn không tương thích với một số bản sửa lỗi và sẽ không còn được hỗ trợ.\nChúng tôi khuyến nghị bạn nên nâng cấp hệ điều hành của bạn để sử dụng %@ với tất cả tiềm năng của nó.";
+"version_check_modal_title_deprecated" = "Chúng tôi không còn hỗ trợ iOS%@";
+"version_check_modal_action_title_supported" = "Đã nhận";
+"version_check_modal_subtitle_supported" = "Chúng tôi đã làm việc để nâng cao %@ để có trải nghiệm nhanh hơn và bóng bẩy hơn. Thật không may, phiên bản iOS hiện tại của bạn không tương thích với một số bản sửa lỗi và sẽ không còn được hỗ trợ.\nChúng tôi khuyến nghị bạn nên nâng cấp hệ điều hành của bạn để sử dụng %@ với tất cả tiềm năng của nó.";
+"version_check_modal_title_supported" = "Chúng tôi đang chấm dứt hỗ trợ iOS %@";
+"version_check_banner_subtitle_deprecated" = "Chúng tôi không còn hỗ trợ %@ trên iOS %@. Để tiếp tục sử dụng %@ với đầy đủ tiềm năng của nó, chúng tôi khuyến nghị bạn nên nâng cấp phiên bản iOS của bạn.";
+"version_check_banner_title_deprecated" = "Chúng tôi không còn hỗ trợ iOS%@";
+"version_check_banner_subtitle_supported" = "Chúng tôi sẽ sớm chấm dứt hỗ trợ %@ trên iOS %@. Để tiếp tục sử dụng %@ với đầy đủ tiềm năng của nó, chúng tôi khuyến nghị bạn nên nâng cấp phiên bản iOS của bạn.";
+
+// Mark: - Version check
+
+"version_check_banner_title_supported" = "Chúng tôi đang chấm dứt hỗ trợ iOS %@";
+"voice_message_lock_screen_placeholder" = "Tin nhắn thoại";
+"voice_message_stop_locked_mode_recording" = "Nhấn vào bản ghi âm của bạn để dừng hoặc nghe";
+"voice_message_remaining_recording_time" = "%@s còn lại";
+
+// Mark: - Voice Messages
+
+"voice_message_release_to_send" = "Giữ để ghi âm, bỏ ra để gửi";
+"side_menu_app_version" = "Phiên bản %@";
+"side_menu_action_feedback" = "Phản hồi";
+"side_menu_action_help" = "Trợ giúp";
+"side_menu_action_settings" = "Cài đặt";
+"side_menu_action_invite_friends" = "Mời bạn bè";
+
+// Mark: - Side menu
+
+"side_menu_reveal_action_accessibility_label" = "Bảng điều khiển trái";
+"user_avatar_view_accessibility_hint" = "Thay đổi avatar người dùng";
+
+// Mark: - User avatar view
+
+"user_avatar_view_accessibility_label" = "avatar";
+"space_avatar_view_accessibility_hint" = "Thay đổi avatar space";
+
+// Mark: Avatar
+
+"space_avatar_view_accessibility_label" = "avatar";
+"space_public_join_rule" = "Space công cộng";
+"space_private_join_rule" = "Space riêng tư";
+"space_participants_action_ban" = "Cấm từ space này";
+"space_participants_action_remove" = "Loại bỏ khỏi space này";
+"spaces_coming_soon_detail" = "Tính năng này chưa được triển khai ở đây, nhưng nó đang được tiến hành. Bây giờ, bạn có thể làm với Element trên máy tính của bạn.";
+"spaces_invites_coming_soon_title" = "Mời sắp có";
+"spaces_add_rooms_coming_soon_title" = "Thêm phòng sắp có";
+"spaces_coming_soon_title" = "Sắp có";
+"spaces_no_member_found_detail" = "Tìm kiếm ai đó không có trong %@? Bây giờ, bạn có thể mời họ trên Web hoặc Desktop.";
+"spaces_no_room_found_detail" = "Vài kết quả có thể bị ẩn vì chúng riêng tư và bạn cần một lời mời để tham gia vào chúng.";
+"spaces_no_result_found_title" = "Không tìm thấy kết quả";
+"spaces_empty_space_detail" = "Vài phòng có thể bị ẩn vì chúng là phòng riêng và bạn cần một lời mời.";
+"spaces_empty_space_title" = "Space này chưa có phòng";
+"space_tag" = "space";
+"spaces_suggested_room" = "Đề nghị";
+"spaces_explore_rooms" = "Khám phá phòng";
+"leave_space_and_all_rooms_action" = "Rời tất cả phòng và spaces";
+"leave_space_only_action" = "Không rời phòng nào";
+"leave_space_message_admin_warning" = "Bạn là quản trị viên của space này, chắc chắn là bạn vừa chuyển quyền quản trị cho thành viên khác trước khi rời khỏi.";
+"leave_space_message" = "Bạn có chắc muốn rời khỏi %@? Bạn có muốn rời tất cả phòng và spaces của space này?";
+"leave_space_title" = "Rời khỏi %@";
+"spaces_left_panel_title" = "Spaces";
+"spaces_home_space_title" = "Nhà";
+"space_beta_announce_information" = "Spaces là cách mới để nhóm các phòng và người. Chúng chưa có trên iOS, nhưng bạn có thể sử dụng chúng bây giờ trên Web và Desktop.";
+"space_beta_announce_subtitle" = "Phiên bản mới của cộng đồng";
+"space_beta_announce_title" = "Spaces sắp có ở đây";
+"space_beta_announce_badge" = "BETA";
+"space_feature_unavailable_information" = "Spaces là cách mới để nhóm các phòng và người.\n\nChúng sẽ sớm có mặt. Bây giờ, nếu bạn tham gia vào một nền tảng khác, bạn sẽ có thể truy cập bất cứ phòng nào bạn tham gia ở đây.";
+"space_feature_unavailable_subtitle" = "Spaces chưa có trên iOS, nhưng bạn có thể sử dụng nó bây giờ trên Web và Desktop";
+
+// Mark: - Spaces
+
+"space_feature_unavailable_title" = "Spaces chưa có ở đây";
+"room_intro_cell_information_multiple_dm_sentence2" = "Chỉ có bạn ở trong cuộc trò chuyện này, nếu bạn không mời ai khác tham gia.";
+"room_intro_cell_information_dm_sentence2" = "Chỉ có hai người trong cuộc trò chuyện này, không ai khác có thể tham gia.";
+"room_intro_cell_information_dm_sentence1_part3" = ". ";
+"room_intro_cell_information_dm_sentence1_part1" = "Đây là khởi đầu của tin nhắn trực tiếp của bạn với ";
+"room_intro_cell_information_room_without_topic_sentence2_part2" = " để mọi người biết phòng này là gì.";
+"room_intro_cell_information_room_without_topic_sentence2_part1" = "Thêm chủ đề";
+"room_intro_cell_information_room_with_topic_sentence2" = "Chủ đề: %@";
+"room_intro_cell_information_room_sentence1_part3" = ". ";
+"room_intro_cell_information_room_sentence1_part1" = "Đây là khởi đầu của ";
+
+// Mark: - Room creation introduction cell
+
+"room_intro_cell_add_participants_action" = "Thêm người";
+"room_avatar_view_accessibility_hint" = "Thay đổi avatar phòng";
+
+// Mark: - Room avatar view
+
+"room_avatar_view_accessibility_label" = "avatar";
+"invite_friends_share_text" = "Này, nói với tôi ở %@: %@";
+
+// MARK: - Invite friends
+
+"invite_friends_action" = "Mời bạn bè vào %@";
+"favourites_empty_view_information" = "Bạn có thể yêu thích một số cách - nhanh nhất là nhấn và giữ. Nhấn vào dấu sao và chúng sẽ xuất hiện tự động ở đây để giữ an toàn.";
+
+// MARK: - Favourites
+
+"favourites_empty_view_title" = "Các phòng và danh bạ yêu thích";
+"home_empty_view_information" = "Ứng dụng trò chuyển bảo mật tất cả trong một cho các nhóm, bạn và tổ chức. Nhấn nút + bên dưới để thêm người và phòng.";
+
+// MARK: - Home
+
+"home_empty_view_title" = "Chào mừng đến %@,\n%@";
+"call_transfer_error_message" = "Chuyển tiếp cuộc gọi thất bại";
+"call_transfer_error_title" = "Lỗi";
+"call_transfer_contacts_all" = "Tất cả";
+"call_transfer_contacts_recent" = "Gần đây";
+"call_transfer_dialpad" = "Bàn phím số";
+"call_transfer_users" = "Các người dùng";
+
+// MARK: - Call Transfer
+"call_transfer_title" = "Chuyển tiếp";
+
+// MARK: - Dial Pad
+"dialpad_title" = "Bàn phím số";
+"room_info_list_section_other" = "Khác";
+"room_info_list_several_members" = "%@ thành viên";
+
+// MARK: - Room Info
+
+"room_info_list_one_member" = "1 thành viên";
+"create_room_placeholder_address" = "#testroom:matrix.org";
+"create_room_section_header_address" = "Địa chỉ phòng";
+"create_room_show_in_directory" = "Hiển thị phòng trong thư mục";
+"create_room_section_footer_type" = "Mọi người chỉ tham gia vào phòng riêng bằng lời mời";
+"create_room_type_public" = "Phòng công cộng";
+"create_room_type_private" = "Phòng riêng";
+"create_room_section_header_type" = "Loại phòng";
+"create_room_section_footer_encryption" = "Mã hóa không thể tắt sau này.";
+"create_room_enable_encryption" = "Bật mã hóa";
+"create_room_section_header_encryption" = "Mã hóa phòng";
+"create_room_placeholder_topic" = "Chủ đề";
+"create_room_section_header_topic" = "Chủ đề phòng (tùy chọn)";
+"create_room_placeholder_name" = "Tên";
+"create_room_section_header_name" = "Tên phòng";
+
+// MARK: - Create Room
+
+"create_room_title" = "Phòng mới";
+"searchable_directory_search_placeholder" = "Tên hoặc ID";
+"searchable_directory_x_network" = "%@ Mạng";
+
+// MARK: - Searchable Directory View Controller
+
+"searchable_directory_create_new_room" = "Tạo một phòng mới";
+"biometrics_cant_unlocked_alert_message_retry" = "Thử lại";
+"biometrics_cant_unlocked_alert_message_login" = "Đăng nhập lại";
+"biometrics_cant_unlocked_alert_message_x" = "Để mở, sử dụng %@ hoặc đăng nhập lại và bật lại %@";
+"biometrics_cant_unlocked_alert_title" = "Không thể mở ứng dụng";
+"biometrics_usage_reason" = "Việc xác thực là cần thiết để truy cập vào ứng dụng của bạn";
+"biometrics_desetup_disable_button_title_x" = "Tắt %@";
+"biometrics_desetup_title_x" = "Tắt %@";
+"biometrics_setup_subtitle" = "Tiết kiệm thời gian của bạn";
+"biometrics_setup_enable_button_title_x" = "Bật %@";
+"biometrics_setup_title_x" = "Bật %@";
+"biometrics_settings_enable_x" = "Bật %@";
+"biometrics_mode_face_id" = "Face ID";
+
+// MARK: - Biometrics Protection
+
+"biometrics_mode_touch_id" = "Touch ID";
+"pin_protection_kick_user_alert_message" = "Quá nhiều lỗi, bạn vừa bị đăng xuất";
+"pin_protection_explanatory" = "Thiết lập một PIN cho phép bạn bảo vệ dữ liệu, như các tin nhắn và danh bạ, vì vậy chỉ có bạn có thể truy cập vào chúng bằng cách nhập PIN khi ứng dụng bắt đầu.";
+"pin_protection_not_allowed_pin" = "Vì các lý do an toàn, PIN này không tồn tại. Vui lòng thử PIN khác";
+"pin_protection_settings_change_pin" = "Thay đổi PIN";
+"pin_protection_settings_enable_pin" = "Kích hoạt PIN";
+"pin_protection_settings_enabled_forced" = "PIN được kích hoạt";
+"pin_protection_settings_section_footer" = "Để đặt lại PIN của bạn, bạn sẽ cần đăng nhập lại và tạo một cái mới";
+"pin_protection_settings_section_header_with_biometrics" = "PIN & %@";
+"pin_protection_settings_section_header" = "PIN";
+"pin_protection_mismatch_too_many_times_error_message" = "Nếu bạn không thể nhớ PIN của bạn, nhấn vào nút quên PIN";
+"pin_protection_mismatch_error_message" = "Vui lòng thử lại";
+"pin_protection_mismatch_error_title" = "Các PIN không khớp";
+"pin_protection_reset_alert_action_reset" = "Đặt lại";
+"pin_protection_reset_alert_message" = "Để đặt lại PIN của bạn, bạn sẽ cần đăng nhập lại và tạo một cái mới";
+"pin_protection_reset_alert_title" = "Đặt lại PIN";
+"pin_protection_forgot_pin" = "Quên PIN";
+"pin_protection_enter_pin" = "Nhập PIN của bạn";
+"pin_protection_confirm_pin_to_change" = "Xác nhận PIN để thay đổi PIN";
+"pin_protection_confirm_pin_to_disable" = "Xác nhận PIN để vô hiệu hóa PIN";
+"pin_protection_confirm_pin" = "Xác nhận PIN của bạn";
+"pin_protection_choose_pin" = "Tạo một PIN để bảo mật";
+"pin_protection_choose_pin_welcome_after_register" = "Chào mừng.";
+
+// MARK: - PIN Protection
+
+"pin_protection_choose_pin_welcome_after_login" = "Chào mừng trở lại.";
+"major_update_done_action" = "Đã nhận";
+"major_update_learn_more_action" = "Tìm hiểu thêm";
+"major_update_information" = "Chúng tôi vui mừng thông báo rằng chúng tôi vừa thay đổi tên! Ứng dụng của bạn đã được cập nhật và bạn đã đăng nhập vào tài khoản của bạn.";
+
+// MARK: - Major update
+
+"major_update_title" = "Bạo loạn bây giờ là %@";
+"cross_signing_setup_banner_subtitle" = "Xác minh các thiết bị khác của bạn dễ dàng hơn";
+
+// MARK: - Cross-signing
+
+// Banner
+
+"cross_signing_setup_banner_title" = "Thiết lập mã hóa";
+"secrets_reset_authentication_message" = "Nhập mật khẩu tài khoản của bạn để xác nhận";
+"secrets_reset_reset_action" = "Đặt lại";
+"secrets_reset_warning_message" = "Bạn sẽ khởi động lại mà không có lịch sử, tin nhắn, các thiết bị tin cậy hoặc người dùng tin cậy.";
+"secrets_reset_warning_title" = "Nếu bạn đặt lại mọi thứ";
+"secrets_reset_information" = "Chỉ làm điều này nếu bạn không có thiết bị khác mà bạn có thể xác minh thiết bị này.";
+
+// MARK: - Secrets reset
+
+"secrets_reset_title" = "Đặt lại mọi thứ";
+"secrets_setup_recovery_passphrase_summary_information" = "Nhớ Chuỗi Bảo mật của bạn. Nó có thể được dùng để mở các tin nhắn và dữ liệu mã hóa của bạn.";
+"secrets_setup_recovery_passphrase_summary_title" = "Lưu Chuỗi Bảo mật của bạn";
+"secrets_setup_recovery_passphrase_confirm_passphrase_placeholder" = "Xác nhận chuỗi";
+"secrets_setup_recovery_passphrase_confirm_passphrase_title" = "Xác nhận";
+"secrets_setup_recovery_passphrase_confirm_information" = "Nhập lại Chuỗi Bảo mật của bạn để xác nhận nó.";
+"secrets_setup_recovery_passphrase_validate_action" = "Hoàn tất";
+"secrets_setup_recovery_passphrase_additional_information" = "Không sử dụng mật khẩu tài khoản của bạn.";
+"secrets_setup_recovery_passphrase_information" = "Nhập một chuỗi bảo mật chỉ bạn biết, được sử dụng để bảo mật các bí mật trên máy chủ của bạn.";
+
+// Recovery passphrase
+
+"secrets_setup_recovery_passphrase_title" = "Đặt một Chuỗi Bảo mật";
+"secrets_setup_recovery_key_storage_alert_message" = "✓ In nó và lưu trữ nó ở nơi nào đó an toàn\n✓ Lưu nó trong một USB hoặc ổ cứng dự phòng\n✓ Sao chép nó lên kho lưu trữ đám mây cá nhân của bạn";
+"secrets_setup_recovery_key_storage_alert_title" = "Giữ nó an toàn";
+"secrets_setup_recovery_key_done_action" = "Hoàn tất";
+"secrets_setup_recovery_key_export_action" = "Lưu";
+"secrets_setup_recovery_key_loading" = "Đang tải…";
+"secrets_setup_recovery_key_information" = "Lưu Khóa Bảo mật của bạn ở nơi an toàn. Nó có thể được sử dụng để mở các tin nhắn và dữ liệu bảo mật của bạn.";
+
+// MARK: - Secrets set up
+
+// Recovery Key
+
+"secrets_setup_recovery_key_title" = "Lưu Khóa Bảo mật của bạn";
+"secrets_recovery_with_key_invalid_recovery_key_message" = "Vui lòng xác minh rằng bạn đã nhập đúng Khóa Bảo mật.";
+"secrets_recovery_with_key_invalid_recovery_key_title" = "Không thể truy cập kho lưu bí mật";
+"secrets_recovery_with_key_recover_action" = "Sử dụng Khóa";
+"secrets_recovery_with_key_recovery_key_placeholder" = "Nhập Khóa Bảo mật";
+"user_verification_session_details_information_untrusted_other_user" = " đã đăng ký sử dụng một thiết bị mới:";
+"user_verification_session_details_information_untrusted_current_user" = "Xác minh thiết bị này để đánh dấu nó là tin tưởng & cấp cho nó quyền truy cập vào các tin nhắn mã hóa:";
+"user_verification_session_details_information_trusted_other_user_part2" = " đã xác minh nó:";
+"user_verification_session_details_information_trusted_other_user_part1" = "Thiết bị này được tin tưởng cho việc nhắn tin bảo mật bởi vì ";
+"user_verification_session_details_information_trusted_current_user" = "Thiết bị này được tin tưởng cho việc nhắn tin bảo mật bởi vì bạn đã xác minh nó:";
+"user_verification_session_details_untrusted_title" = "Không tin tưởng";
+
+// Session details
+
+"user_verification_session_details_trusted_title" = "Tin tưởng";
+"user_verification_sessions_list_session_untrusted" = "Không tin tưởng";
+"user_verification_sessions_list_session_trusted" = "Tin tưởng";
+"user_verification_sessions_list_table_title" = "Các thiết bị";
+"user_verification_sessions_list_information" = "Các tin nhắn với người dùng này trong phòng này được mã hóa đầu-cuối và không thể được đọc bởi các bên thứ ba.";
+"user_verification_sessions_list_user_trust_level_unknown_title" = "Không biết";
+"user_verification_sessions_list_user_trust_level_warning_title" = "Cảnh báo";
+
+// Sessions list
+
+"user_verification_sessions_list_user_trust_level_trusted_title" = "Tin tưởng";
+"user_verification_start_additional_information" = "Để bảo mật, hãy tự làm hoặc dùng một cách khác để giao tiếp.";
+"user_verification_start_waiting_partner" = "Đang chờ %@…";
+"user_verification_start_information_part2" = " bằng việc kiểm tra mã một-lần trên cả 2 thiết bị của bạn.";
+"user_verification_start_information_part1" = "Để bảo bật thêm, xác minh ";
+
+// MARK: - User verification
+
+// Start
+
+"user_verification_start_verify_action" = "Bắt đầu xác minh";
+"key_verification_scan_confirmation_scanned_device_information" = "Thiết bị khác có đang hiển thị cùng một lá chắn?";
+"key_verification_scan_confirmation_scanned_user_information" = "%@ có đang hiển thị cùng một lá chắn?";
+
+// Scanned
+"key_verification_scan_confirmation_scanned_title" = "Sắp xong!";
+"key_verification_scan_confirmation_scanning_device_waiting_other" = "Đang chờ thiết bị khác…";
+"key_verification_scan_confirmation_scanning_user_waiting_other" = "Đang chờ %@…";
+
+// MARK: Scan confirmation
+
+// Scanning
+"key_verification_scan_confirmation_scanning_title" = "Sắp xong! Đang chờ xác nhận…";
+"key_verification_verify_qr_code_scan_other_code_success_message" = "Mã QR vừa được xác minh thành công.";
+"key_verification_verify_qr_code_scan_other_code_success_title" = "Mã được xác minh!";
+"key_verification_verify_qr_code_other_scan_my_code_title" = "Người dùng khác đã quét mã QR thành công không?";
+"key_verification_verify_qr_code_start_emoji_action" = "Xác minh bằng emoji";
+"key_verification_verify_qr_code_cannot_scan_action" = "Không thể quét?";
+"key_verification_verify_qr_code_scan_code_other_device_action" = "Quét mã bằng thiết bị này";
+"key_verification_verify_qr_code_scan_code_action" = "Quét mã của họ";
+"key_verification_verify_qr_code_emoji_information" = "Xác minh bằng việc so sánh emoji duy nhất.";
+"key_verification_verify_qr_code_information_other_device" = "Quét mã bên dưới để xác minh:";
+"key_verification_verify_qr_code_information" = "Quét mã để xác minh một cách bảo mật lẫn nhau.";
+
+// MARK: QR code
+
+"key_verification_verify_qr_code_title" = "Xác minh bằng cách quét";
+
+// Incoming key verification request
+
+"key_verification_incoming_request_incoming_alert_message" = "%@ muốn xác minh";
+"key_verification_tile_conclusion_warning_title" = "Đăng nhập không tin tưởng";
+"key_verification_tile_conclusion_done_title" = "Đã xác minh";
+"key_verification_tile_request_incoming_approval_decline" = "Từ chối";
+"key_verification_tile_request_incoming_approval_accept" = "Chấp nhận";
+"key_verification_tile_request_status_accepted" = "Bạn đã chấp nhận";
+"key_verification_tile_request_status_cancelled" = "%@ đã hủy";
+"key_verification_tile_request_status_cancelled_by_me" = "Bạn đã hủy";
+"key_verification_tile_request_status_expired" = "Hết hạn";
+"key_verification_tile_request_status_waiting" = "Đang chờ…";
+"key_verification_tile_request_status_data_loading" = "Đang tải dữ liệu…";
+"key_verification_tile_request_outgoing_title" = "Xác minh được gửi";
+
+// Tiles
+
+"key_verification_tile_request_incoming_title" = "Yêu cầu xác minh";
+"key_verification_bootstrap_not_setup_message" = "Bạn cần phải khởi động xác thực chéo trước.";
+
+// MARK: - Key Verification
+
+"key_verification_bootstrap_not_setup_title" = "Lỗi mời";
+"error_not_supported_on_mobile" = "Bạn không thể làm điều này từ di động %@.";
+
+
+// Generic errors
+"error_invite_3pid_with_no_identity_server" = "Thêm một máy chủ xác thực trong cài đặt của bạn để mời bằng email.";
+
+// MARK: Reaction history
+"reaction_history_title" = "Các phản ứng";
+"emoji_picker_flags_category" = "Cờ";
+"emoji_picker_symbols_category" = "Biểu tượng";
+"emoji_picker_objects_category" = "Đối tượng";
+"emoji_picker_places_category" = "Du lịch & các địa điểm";
+"emoji_picker_activity_category" = "Các hoạt động";
+"emoji_picker_foods_category" = "Đồ ăn và đồ uống";
+"emoji_picker_nature_category" = "Các động vật & thiên nhiên";
+"emoji_picker_people_category" = "Các mặt cười & con người";
+
+// MARK: Emoji picker
+"emoji_picker_title" = "Các phản ứng";
+"file_upload_error_unsupported_file_type_message" = "Loại tệp không được hỗ trợ.";
+
+// MARK: File upload
+"file_upload_error_title" = "Tải lên tệp";
+"device_verification_emoji_pin" = "Ghim";
+"device_verification_emoji_folder" = "Thư mục";
+"device_verification_emoji_headphones" = "Tai nghe";
+"device_verification_emoji_anchor" = "Mỏ neo";
+"device_verification_emoji_bell" = "Chuông";
+"device_verification_emoji_trumpet" = "Kèn";
+"device_verification_emoji_guitar" = "Ghi-ta";
+"device_verification_emoji_ball" = "Banh";
+"device_verification_emoji_trophy" = "Cúp";
+"device_verification_emoji_rocket" = "Tên lửa";
+"device_verification_emoji_aeroplane" = "Máy bay";
+"device_verification_emoji_bicycle" = "Xe đạp";
+"device_verification_emoji_train" = "Tàu hỏa";
+"device_verification_emoji_flag" = "Cờ";
+"device_verification_emoji_telephone" = "Điện thoại";
+"device_verification_emoji_hammer" = "Búa";
+"device_verification_emoji_key" = "Chìa khóa";
+"device_verification_emoji_lock" = "Khóa";
+"device_verification_emoji_scissors" = "Kéo";
+"device_verification_emoji_paperclip" = "Kẹp giấy";
+"device_verification_emoji_pencil" = "Bút chì";
+"device_verification_emoji_book" = "Sách";
+"device_verification_emoji_light bulb" = "Bòng đèn tròn";
+"device_verification_emoji_gift" = "Quà";
+"device_verification_emoji_clock" = "Đồng hồ";
+"device_verification_emoji_hourglass" = "Đồng hồ cát";
+"device_verification_emoji_umbrella" = "Cây dù";
+"device_verification_emoji_thumbs up" = "Thích";
+"device_verification_emoji_santa" = "Santa";
+"device_verification_emoji_spanner" = "Spanner";
+"device_verification_emoji_glasses" = "Mắt kiếng";
+"device_verification_emoji_hat" = "Nón";
+"device_verification_emoji_robot" = "Rô-bô";
+"device_verification_emoji_smiley" = "Cười";
+"device_verification_emoji_heart" = "Tim";
+"device_verification_emoji_cake" = "Bánh";
+"device_verification_emoji_pizza" = "Pizza";
+"device_verification_emoji_corn" = "Bắp";
+"device_verification_emoji_strawberry" = "Dâu tây";
+"device_verification_emoji_apple" = "Táo";
+"device_verification_emoji_banana" = "Chuối";
+"device_verification_emoji_fire" = "Lửa";
+"device_verification_emoji_cloud" = "Mây";
+"device_verification_emoji_moon" = "Mặt trăng";
+"device_verification_emoji_globe" = "Địa cầu";
+"device_verification_emoji_mushroom" = "Nấm";
+"device_verification_emoji_cactus" = "Xương rồng";
+"device_verification_emoji_tree" = "Cây";
+"device_verification_emoji_flower" = "Hoa";
+"device_verification_emoji_butterfly" = "Bướm";
+"device_verification_emoji_octopus" = "Bạch tuộc";
+"device_verification_emoji_fish" = "Cá";
+"device_verification_emoji_turtle" = "Rùa";
+"device_verification_emoji_penguin" = "Chim cánh cụt";
+"device_verification_emoji_rooster" = "Gà trống";
+"device_verification_emoji_panda" = "Gấu trúc";
+"device_verification_emoji_rabbit" = "Thỏ";
+"device_verification_emoji_elephant" = "Voi";
+"device_verification_emoji_pig" = "Heo";
+"device_verification_emoji_unicorn" = "Kỳ lân";
+"device_verification_emoji_horse" = "Ngựa";
+"device_verification_emoji_lion" = "Sư tử";
+"device_verification_emoji_cat" = "Mèo";
+
+// MARK: Emoji
+"device_verification_emoji_dog" = "Chó";
+
+// User
+
+"key_verification_verified_user_information" = "Các tin nhắn với người dùng này được mã hóa đầu-cuối và không thể được đọc bởi các bên thứ ba.";
+"key_verification_verified_this_session_information" = "Bạn có thể đọc các tin nhắn bảo mật trên thiết bị này bây giờ, và các người dùng khác sẽ biết họ có thể tin tưởng nó.";
+"key_verification_verified_new_session_information" = "Bạn có thể đọc các tin nhắn bảo mật trên thiết bị mới của bạn bây giờ, và các người dùng khác sẽ biết họ có thể tin tưởng nó.";
+"key_verification_verified_other_session_information" = "Bạn có thể đọc các tin nhắn bảo mật trên thiết bị khác của bạn bây giờ, và các người dùng khác sẽ biết họ có thể tin tưởng nó.";
+"key_verification_verified_new_session_title" = "Thiết bị mới được xác minh!";
+"device_verification_verified_got_it_button" = "Đã nhận được";
+
+// MARK: Verified
+
+// Device
+
+"device_verification_verified_title" = "Đã xác minh!";
+
+// Device
+
+"device_verification_verify_wait_partner" = "Chờ đối tác chấp nhận…";
+"key_verification_manually_verify_device_validate_action" = "Xác minh";
+"key_verification_manually_verify_device_additional_information" = "Nếu chúng không khớp, sự bảo mật của giao tiếp của bạn có thể bị tổn hại.";
+"key_verification_manually_verify_device_key_title" = "Khóa thiết bị";
+"key_verification_manually_verify_device_id_title" = "ID thiết bị";
+"key_verification_manually_verify_device_name_title" = "Tên thiết bị";
+"key_verification_manually_verify_device_instruction" = "Xác nhận bằng việc so sánh điều sau đây với Cài đặt Người dùng trong thiết bị khác của bạn:";
+
+// MARK: Manually Verify Device
+
+"key_verification_manually_verify_device_title" = "Xác minh thủ công bằng văn bản";
+"key_verification_verify_sas_additional_information" = "Để bảo mật tối đa, sử dụng các phương tiện liên lạc tin cậy khác hoặc tự làm điều này.";
+"key_verification_verify_sas_validate_action" = "Chúng khớp";
+"key_verification_verify_sas_cancel_action" = "Chúng không khớp";
+"key_verification_verify_sas_title_number" = "So sánh các số";
+
+// MARK: Verify
+
+"key_verification_verify_sas_title_emoji" = "So sánh emoji";
+"device_verification_self_verify_wait_recover_secrets_checking_availability" = "Kiểm tra các khả năng xác minh khác…";
+"device_verification_self_verify_wait_recover_secrets_additional_information" = "Nếu bạn không thể truy cập vào các thiệt bị hiện có";
+"device_verification_self_verify_wait_recover_secrets_with_passphrase" = "Sử dụng Chuỗi hoặc Khóa Bảo mật";
+"device_verification_self_verify_wait_recover_secrets_without_passphrase" = "Sử dụng Khóa Bảo mật";
+"device_verification_self_verify_wait_additional_information" = "Điều này hoạt động với %@ và các thiết bị Matrix đầu cuối khác có khả năng xác thực chéo";
+"device_verification_self_verify_wait_information" = "Xác minh thiết bị này từ một trong các thiết bị của bạn, cấp cho nó quyền truy cập vào các tin nhắn mã hóa.\n\nSử dụng cái %@ mới nhất trên các thiết bị của bạn:";
+"device_verification_self_verify_wait_new_sign_in_title" = "Xác minh đăng nhập này";
+
+// MARK: Self verification wait
+
+"device_verification_self_verify_wait_title" = "Hoàn tất bảo mật";
+"key_verification_self_verify_unverified_sessions_alert_validate_action" = "Xem lại";
+"key_verification_self_verify_unverified_sessions_alert_message" = "Xác minh tất cả các thiết bị của bạn để chắc chắn các tin nhắn và tài khoản của bạn an toàn.";
+
+// Unverified sessions
+
+"key_verification_self_verify_unverified_sessions_alert_title" = "Xem lại nơi bạn được đăng nhập vào";
+"key_verification_self_verify_current_session_alert_validate_action" = "Xác minh";
+"key_verification_self_verify_current_session_alert_message" = "Các người dùng khác có thể không tin tưởng nó.";
+
+// Current session
+
+"key_verification_self_verify_current_session_alert_title" = "Xác minh thiết bị này";
+"device_verification_self_verify_start_waiting" = "Đang đợi…";
+"device_verification_self_verify_start_information" = "Sử dụng thiết bị này để xác minh thiết bị mới của bạn, cấp cho nó quyền truy cập vào các tin nhắn mã hóa.";
+"device_verification_self_verify_start_verify_action" = "Bắt đầu xác minh";
+"device_verification_self_verify_alert_validate_action" = "Xác minh";
+"device_verification_self_verify_alert_message" = "Xác minh thông tin đăng nhập mới truy cập vào tài khoản của bạn: %@";
+
+// MARK: Self verification start
+
+// New login
+"device_verification_self_verify_alert_title" = "Đăng nhập mới. Đây có phải là bạn?";
+"device_verification_start_use_legacy_action" = "Sử dụng xác minh kế thừa";
+"device_verification_start_verify_button" = "Bắt đầu xác minh";
+"device_verification_start_use_legacy" = "Không có gì xuất hiện? Không phải tất cả thiết bị đầu cuối đều hỗ trợ xác minh tương tác. Sử dụng xác minh kế thừa.";
+"device_verification_start_wait_partner" = "Chờ đối tác chấp nhận…";
+
+// MARK: Start
+"device_verification_start_title" = "Xác minh bằng việc so sánh một chuỗi văn bản ngắn";
+"device_verification_incoming_description_2" = "Xác minh thiết bị này sẽ đánh dấu nó là tin cậy, và cũng đánh dấu thiết bị của bạn là tin cậy đối với đối tác.";
+"device_verification_incoming_description_1" = "Xác minh thiết bị này để đánh dấu nó là tin cậy. Các thiết bị tin cậy của các đối tác giúp bạn yên tâm thêm khi sử dụng các tin nhắn mã hóa đầu-cuối.";
+
+// Mark: Incoming
+"device_verification_incoming_title" = "Yêu cầu xác minh đến";
+"device_verification_error_cannot_load_device" = "Không thể tải thông tin thiết bị.";
+"device_verification_cancelled_by_me" = "Việc xác minh vừa bị hủy. Lý do: %@";
+"device_verification_cancelled" = "Bên kia đã hủy việc xác minh.";
+"device_verification_security_advice_number" = "So sánh các số, đảm báo chúng xuất hiện theo cùng thứ tự.";
+"device_verification_security_advice_emoji" = "So sánh emoji duy nhất, đảm bảo chúng xuất hiện theo cùng thứ tự.";
+"key_verification_user_title" = "Xác minh chúng";
+"key_verification_this_session_title" = "Xác minh thiết bị này";
+"key_verification_new_session_title" = "Xác minh thiết bị mới của bạn";
+
+// MARK: - Device Verification
+"key_verification_other_session_title" = "Xác minh thiết bị";
+"sign_out_key_backup_in_progress_alert_cancel_action" = "Tôi sẽ đợi";
+"sign_out_key_backup_in_progress_alert_discard_key_backup_action" = "Tôi không muốn các tin nhắn mã hóa của tôi";
+"sign_out_key_backup_in_progress_alert_title" = "Sao luu khóa đang tiến hành. Nếu bạn đang xuất bây giờ bạn sẽ mất quyền truy cập vào các tin nhắn mã hóa của bạn.";
+"sign_out_non_existing_key_backup_sign_out_confirmation_alert_backup_action" = "Sao lưu";
+"sign_out_non_existing_key_backup_sign_out_confirmation_alert_sign_out_action" = "Đăng xuất";
+"sign_out_non_existing_key_backup_sign_out_confirmation_alert_message" = "Bạn sẽ mất quyền truy cập vào các tin nhắn mã hóa nếu bạn không sao lưu các khóa trước khi đăng xuất";
+"sign_out_non_existing_key_backup_sign_out_confirmation_alert_title" = "Bạn sẽ mất các tin nhắn mã hóa của bạn";
+"sign_out_non_existing_key_backup_alert_discard_key_backup_action" = "Tôi không muốn các tin nhắn mã hóa của tôi";
+"sign_out_non_existing_key_backup_alert_setup_secure_backup_action" = "Bắt đầu sử dụng Sao lưu Bảo mật";
+"sign_out_non_existing_key_backup_alert_title" = "Bạn sẽ mất quyền truy cập vào các tin nhắn bảo mật của bạn nếu bạn đăng xuất bây giờ";
+"sign_out_existing_key_backup_alert_sign_out_action" = "Đăng xuất";
+
+// MARK: Sign out warning
+
+"sign_out_existing_key_backup_alert_title" = "Bạn có chắc bạn muốn đăng xuất?";
+"key_backup_recover_done_action" = "Hoàn tất";
+
+// Success
+
+"key_backup_recover_success_info" = "Sao lưu đã khôi phục!";
+"key_backup_recover_from_recovery_key_lost_recovery_key_action" = "Mất Khóa Bảo mật, bạn có thể thiết lập một cái mới trong cài đặt.";
+"key_backup_recover_from_recovery_key_recover_action" = "Mở lịch sử";
+"key_backup_recover_from_recovery_key_recovery_key_placeholder" = "Nhập Khóa Bảo mật";
+"key_backup_recover_from_recovery_key_recovery_key_title" = "Nhập";
+
+// Recover from recovery key
+
+"key_backup_recover_from_recovery_key_info" = "Sử dụng Khóa Bảo mật để mở lịch sử tin nhắn bảo mật của bạn";
+"key_backup_recover_from_passphrase_lost_passphrase_action_part3" = ".";
+"key_backup_recover_from_passphrase_lost_passphrase_action_part2" = "dùng Khóa Bảo mật của bạn";
+"key_backup_recover_from_passphrase_lost_passphrase_action_part1" = "Không biết Chuỗi Bảo mật của bạn? Bạn có thể ";
+"key_backup_recover_from_passphrase_recover_action" = "Mở lịch sử";
+"key_backup_recover_from_passphrase_passphrase_placeholder" = "Nhập chuỗi";
+"key_backup_recover_from_passphrase_passphrase_title" = "Nhập";
+
+// Recover from passphrase
+
+"key_backup_recover_from_passphrase_info" = "Sử dụng Chuỗi Bảo mật để mở lịch sử tin nhắn bảo mật của bạn";
+
+// Recover from private key
+"key_backup_recover_from_private_key_info" = "Đang khôi phục sao lưu…";
+"key_backup_recover_invalid_recovery_key" = "Sao lưu không thể được giải mã bằng khóa này: vui lòng kiểm tra rằng bạn đã nhập Chuỗi Bảo mật chính xác.";
+"key_backup_recover_invalid_recovery_key_title" = "Khóa bảo mật không khớp";
+"key_backup_recover_invalid_passphrase" = "Sao lưu không thể được giải mã bằng chuỗi này: vui lòng kiểm tra rằng bạn đã nhập Chuỗi Bảo mật chính xác.";
+"key_backup_setup_success_from_recovery_key_make_copy_action" = "Tạo bản sao";
+"key_backup_setup_success_from_recovery_key_recovery_key_title" = "Khóa bảo mật";
+
+// Success from recovery key
+"key_backup_setup_success_from_recovery_key_info" = "Các khóa của bạn đang được sao lưu.\n\nLàm một bản sao của khóa bảo mật này và giữ nó an toàn.";
+"key_backup_setup_success_from_passphrase_done_action" = "Hoàn tất";
+"key_backup_setup_success_from_passphrase_save_recovery_key_action" = "Lưu khóa bảo mật";
+
+// Success from passphrase
+"key_backup_setup_success_from_passphrase_info" = "Các khóa của bạn đang được sao lưu.\n\nKhóa bảo mật của bạn là một mạng lưới an toàn - bạn có thể dùng nó để khôi phục quyền truy cập các tin nhắn mã hóa của bạn nếu bạn quên chuỗi mật khẩu của bạn.\n\nGiữ khóa bảo mật của bạn ở đâu đó thật an toàn, như một trình quản lý mật khẩu (hoặc một két sắt).";
+
+// Success
+
+"key_backup_setup_success_title" = "Thành công!";
+"key_backup_setup_passphrase_setup_recovery_key_action" = "(Nâng cao) Thiết lập với khóa bảo mật";
+"key_backup_setup_passphrase_setup_recovery_key_info" = "Hoặc, bảo mật sao lưu của bạn bằng một khóa bảo mật, lưu nó ở đâu đó an toàn.";
+"key_backup_setup_passphrase_set_passphrase_action" = "Đặt chuỗi";
+"key_backup_setup_passphrase_confirm_passphrase_invalid" = "Chuỗi không khớp";
+"key_backup_setup_passphrase_confirm_passphrase_valid" = "Tuyệt!";
+"key_backup_setup_passphrase_confirm_passphrase_placeholder" = "Xác nhận chuỗi";
+"key_backup_setup_passphrase_confirm_passphrase_title" = "Xác nhận";
+"key_backup_setup_passphrase_passphrase_invalid" = "Thử thêm một từ";
+"key_backup_setup_passphrase_passphrase_valid" = "Tuyệt!";
+"key_backup_setup_passphrase_passphrase_placeholder" = "Nhập chuỗi";
+"key_backup_setup_passphrase_passphrase_title" = "Nhập";
+"key_backup_setup_passphrase_info" = "Chúng tôi sẽ lưu một bản sao được mã hóa của các khóa của bạn trên máy chủ của chúng tôi. Bảo vệ sao lưu của bạn bằng một chuỗi để giữ nó an toàn.\n\nĐể bảo mật tối đa, chuỗi này nên khác với mật khẩu tài khoản của bạn.";
+
+// Passphrase
+
+"key_backup_setup_passphrase_title" = "Bảo mật sao lưu của bạn bằng một chuỗi bảo mật";
+"key_backup_setup_intro_manual_export_action" = "Xuất các khóa thủ công";
+"key_backup_setup_intro_manual_export_info" = "(Nâng cao)";
+"key_backup_setup_intro_setup_connect_action_with_existing_backup" = "Kết nối thiết bị này đến khóa sao lưu";
+"key_backup_setup_intro_setup_action_without_existing_backup" = "Bắt đầu sử dụng bản sao khóa";
+"key_backup_setup_intro_info" = "Các tin nhắn trong các phòng mã hóa được bảo mật bằng mã hóa đầu-cuối. Chỉ có bạn và (các) người nhận có các khóa để đọc các tin nhắn này.\n\nSao lưu một cách bảo mật các khóa của bạn để tránh mất chúng.";
+
+// Intro
+
+"key_backup_setup_intro_title" = "Không bao giờ mất các tin nhắn mã hóa";
+"key_backup_setup_skip_alert_skip_action" = "Bỏ qua";
+"key_backup_setup_skip_alert_message" = "Bạn có thể mất bảo mật các tin nhắn nếu bạn đăng xuất hoặc mất thiết bị của bạn.";
+"key_backup_setup_skip_alert_title" = "Bạn có chắc?";
+
+
+// MARK: Key backup setup
+
+"key_backup_setup_title" = "Sao lưu khóa";
+"secure_backup_setup_banner_subtitle" = "Bảo vệ chống lại việc mất truy cập vào các tin nhắn và dữ liệu mã hóa";
+
+// Banner
+
+"secure_backup_setup_banner_title" = "Sao lưu bảo mật";
+"secure_key_backup_setup_cancel_alert_message" = "Nếu bạn hủy bây giờ, bạn có thể mất các tin nhắn và dữ liệu mã hóa nếu bạn mất quyền truy cập vào thông tin đăng nhập của bạn.\n\nBạn vẫn có thể thiết lập Sao lưu Bảo mật và quản lý các khóa trong Cài đặt.";
+
+
+// Cancel
+
+"secure_key_backup_setup_cancel_alert_title" = "Bạn có chắc?";
+"secure_key_backup_setup_existing_backup_error_delete_it" = "Xóa nó";
+"secure_key_backup_setup_existing_backup_error_unlock_it" = "Mở khóa nó";
+"secure_key_backup_setup_existing_backup_error_info" = "Mở khóa nó để tái sử dụng nó trong bản sao bảo mật hoặc xóa nó để tao một bản sao mới các tin nhắn trong bản sao bảo mật.";
+"secure_key_backup_setup_existing_backup_error_title" = "Một bản sao cho các tin nhắn đã tồn tại";
+"secure_key_backup_setup_intro_use_security_passphrase_info" = "Nhập một chuỗi bí mật chỉ bạn biết, và tạo một khóa để sao lưu.";
+"secure_key_backup_setup_intro_use_security_passphrase_title" = "Sử dụng một chuỗi bảo mật";
+"secure_key_backup_setup_intro_use_security_key_info" = "Tạo một khóa bảo mật để lưu trữ ở đâu đó an toàn như trình quản lý mật khẩu hoặc một két sắt.";
+"secure_key_backup_setup_intro_use_security_key_title" = "Sử dụng khóa bảo mật";
+"secure_key_backup_setup_intro_info" = "Bảo vệ chống lại việc mất truy cập vào các tin nhắn và dữ liệu mã hóa bằng việc sao lưu các khóa mã hóa trên máy chủ của bạn.";
+
+// MARK: Secure backup setup
+
+// Intro
+
+"secure_key_backup_setup_intro_title" = "Sao lưu bảo mật";
+"rerequest_keys_alert_message" = "Vui lòng khởi chạy %@ trên một thiết bị khác mà có thể giải mã tin nhắn vì vậy nó có thể gửi các khóa đến thiết bị này.";
+
+// Re-request confirmation dialog
+"rerequest_keys_alert_title" = "Yêu cầu đã gửi";
+"deactivate_account_password_alert_message" = "Để tiếp tục, vui lòng nhập mật khẩu của bạn";
+"deactivate_account_password_alert_title" = "Hủy kích hoạt tài khoản";
+"deactivate_account_validate_action" = "Hủy kích hoạt tài khoản";
+"deactivate_account_forget_messages_information_part3" = ": điều này sẽ làm cho các người dùng trong tương lai thấy một khung cảnh không đầy đủ của các cuộc hội thoại)";
+"deactivate_account_forget_messages_information_part2_emphasize" = "Cảnh báo";
+"deactivate_account_forget_messages_information_part1" = "Vui lòng quên tất cả tin nhắn tôi vừa gửi khi tài khoản của tôi bị hủy kích hoạt (";
+"deactivate_account_informations_part5" = "Nếu bạn muốn chúng tôi quên các tin nhắn của bạn, vui lòng đánh dấu vào ô bên dưới\n\nKhả năng hiển thị tin nhắn trong Matrix là tương tự như email. Việc quên các tin nhắn của bạn  nghĩa là các tin nhắn bạn vừa gửi sẽ không được chia sẻ với các người dùng mới hoặc chưa được đăng ký, nhưng các người dùng đã đăng ký, người đã có quyền truy cập vào các tin nhắn này, vẫn sẽ truy cập được vào bản sao của họ.";
+"deactivate_account_informations_part4_emphasize" = "Không phải do mặc định làm cho chúng tôi quên các tin nhắn bạn vừa gửi. ";
+"deactivate_account_informations_part3" = "\n\nĐang hủy kích hoạt tài khoản của bạn. ";
+"deactivate_account_informations_part2_emphasize" = "Hành động này là không thể đảo ngược";
+"deactivate_account_informations_part1" = "Điều này sẽ làm cho tài khoản của bạn sẽ không sử dụng được vĩnh viễn. Bạn sẽ không thể đăng nhập, và không ai sẽ có thể đăng ký cùng ID người dùng. Điều này sẽ làm cho tài khoản của bạn rời khỏi tất cả phòng nó đang tham gia, và sẽ xóa chi tiết tài khoản của bạn khỏi máy chủ xác thực. ";
+
+// Deactivate account
+
+"deactivate_account_title" = "Hủy kích hoạt tài khoản";
+"service_terms_modal_policy_checkbox_accessibility_hint" = "Kiểm tra để chấp nhận %@";
+"service_terms_modal_information_description_integration_manager" = "Trình quản lý tích hợp cho phép bạn thêm các tính năng từ các bên thứ ba.";
+"service_terms_modal_information_description_identity_server" = "Một máy chủ xác thực giúp bạn tìm thấy các danh bạ của bạn, bằng cách tra cứu các số điện thoại hoặc email của họ, để thấy nếu họ đã có một tài khoản chưa.";
+"service_terms_modal_information_title_integration_manager" = "Trình quản lý tích hợp";
+
+// Alert explaining what an identity server / integration manager is.
+"service_terms_modal_information_title_identity_server" = "Máy chủ xác thực";
+"service_terms_modal_description_integration_manager" = "Điều này sẽ cho phép bạn dùng các bot, bridge, widget và gói sticker.";
+"service_terms_modal_description_identity_server" = "Điều này sẽ cho phép ai đó tìm thấy bạn nếu họ có số điện thoại hoặc email của bạn được lưu trong danh bạ điện thoại của họ.";
+"service_terms_modal_table_header_integration_manager" = "ĐIỀU KHOẢN TRÌNH QUẢN LÝ TÍCH HỢP";
+"service_terms_modal_table_header_identity_server" = "ĐIỀU KHOẢN MÁY CHỦ XÁC THỰC";
+"service_terms_modal_footer" = "Điều này có thể bị vô hiệu hóa bất cứ lúc nào từ cài đặt.";
+"service_terms_modal_decline_button" = "Từ chối";
+"service_terms_modal_accept_button" = "Đồng ý";
+
+// Service terms
+"service_terms_modal_title_message" = "Để tiếp tục, đồng ý các điều khoản và điều kiện bên dưới";
+"gdpr_consent_not_given_alert_review_now_action" = "Xem lại ngay";
+
+// GDPR
+"gdpr_consent_not_given_alert_message" = "Để tiếp tục dùng homeserver %@ bạn phải xem lại và đồng ý các điều khoản và điều kiện.";
+"e2e_room_key_request_ignore_request" = "Bỏ qua yêu cầu";
+"e2e_room_key_request_share_without_verifying" = "Chia sẻ không cần xác minh";
+"e2e_room_key_request_start_verification" = "Bắt đầu xác minh…";
+"e2e_room_key_request_message" = "Thiết bị chưa được xác minh của bạn '%@' đang yêu cầu các khóa mã hóa.";
+"e2e_room_key_request_message_new_device" = "Bạn đã thêm một thiết bị mới '%@', thứ đang yêu cầu các khóa mã hóa.";
+
+// Room key request dialog
+"e2e_room_key_request_title" = "Yêu cầu khóa mã hóa";
+"room_widget_permission_room_id_permission" = "ID Phòng";
+"room_widget_permission_widget_id_permission" = "ID Widget";
+"room_widget_permission_theme_permission" = "Chủ đề của bạn";
+"room_widget_permission_user_id_permission" = "User ID của bạn";
+"room_widget_permission_avatar_url_permission" = "URL avatar của bạn";
+"room_widget_permission_display_name_permission" = "Tên hiển thị của bạn";
+"room_widget_permission_information_title" = "Sử dụng nó có thể chia sẻ dữ liệu với %@:\n";
+"room_widget_permission_webview_information_title" = "Sử dụng nó có thể đặt cookie và chia sẻ dữ liệu với %@:\n";
+"room_widget_permission_creator_info_title" = "Widget này được thêm bởi:";
+
+// Room widget permissions
+"room_widget_permission_title" = "Tải Widget";
+"widget_picker_manage_integrations" = "Quản lý tích hợp…";
+
+// Widget Picker
+"widget_picker_title" = "Tích hợp";
+"widget_integration_manager_disabled" = "Bạn cần kích hoạt trình quản lý tích hợp trong cài đặt";
+"widget_menu_remove" = "Loại bỏ cho tất cả mọi người";
+"widget_menu_revoke_permission" = "Thu hồi quyền truy cập cho tôi";
+"widget_menu_open_outside" = "Mở trong trình duyệt";
+"widget_menu_refresh" = "Làm mới";
+"widget_sticker_picker_no_stickerpacks_alert_add_now" = "Thêm một số bây giờ?";
+"widget_sticker_picker_no_stickerpacks_alert" = "Bạn không có stickerpack nào được kích hoạt.";
+"widget_integrations_server_failed_to_connect" = "Bạn cần quyền để quản lý các widget trong phòng này";
+
+// Widget
+"widget_no_integrations_server_configured" = "Không có máy chủ tích hợp được cấu hình";
+"bug_report_background_mode" = "Tiếp tục trong nền";
+"e2e_key_backup_wrong_version_button_wasme" = "Đó là tôi";
+"e2e_key_backup_wrong_version_button_settings" = "Cài đặt";
+"e2e_key_backup_wrong_version" = "Một bản sao khóa tin nhắn bảo mật mới được phát hiện.\n\nNếu đây không phải là bạn, đặt một Chuỗi Bảo mật mới trong Cài đặt.";
+
+// Key backup wrong version
+"e2e_key_backup_wrong_version_title" = "Sao lưu khóa mới";
+"call_actions_unhold" = "Tiếp tục";
+"call_no_stun_server_error_use_fallback_button" = "Thử dùng %@";
+"call_no_stun_server_error_message_2" = "Ngoài ra, bạn có thể thử dùng máy chủ công cộng ở %@, nhưng điều này không tin cậy, và nó sẽ chia sẻ địa chỉ IP của bạn với máy chủ đó. Bạn cũng có thể quản lý việc này trong Cài đặt";
+"call_no_stun_server_error_message_1" = "Vui lòng yêu cầu quản trị viên của homeserver %@ của bạn cấu hình máy chủ TURN để cuộc gọi hoạt động tin cậy.";
+"call_no_stun_server_error_title" = "Cuộc gọi thất bại do cấu hình máy chủ sai";
+"room_does_not_exist" = "%@ không tồn tại";
+"photo_library_access_not_granted" = "%@ không có quyền để truy cập thư viện ảnh, vui lòng thay đổi cài đặt quyền riêng tư";
+"camera_unavailable" = "Camera không có trên thiết bị của bạn";
+"homeserver_connection_lost" = "Không thể kết nối đến homeserver.";
+"event_formatter_jitsi_widget_removed_by_you" = "Bạn đã xóa hội nghị VoIP";
+"event_formatter_jitsi_widget_added_by_you" = "Bạn đã thêm hội nghị VoIP";
+"event_formatter_widget_removed_by_you" = "Bạn đã xóa widget: %@";
+
+// Events formatter with you
+"event_formatter_widget_added_by_you" = "Bạn đã thêm widget: %@";
+"event_formatter_group_call_incoming" = "%@ trong %@";
+"event_formatter_group_call_leave" = "Rời khỏi";
+"event_formatter_group_call_join" = "Tham gia";
+"event_formatter_group_call" = "Gọi nhóm";
+"event_formatter_call_end_call" = "Kết thúc cuộc gọi";
+"event_formatter_call_retry" = "Thử lại";
+"event_formatter_call_answer" = "Trả lời";
+"event_formatter_call_decline" = "Từ chối";
+"event_formatter_call_back" = "Gọi lại";
+"event_formatter_call_connection_failed" = "Kết nối thất bại";
+"event_formatter_call_missed_video" = "Cuộc gọi video bị nhỡ";
+"event_formatter_call_missed_voice" = "Cuộc gọi thoại bị nhỡ";
+"event_formatter_call_you_declined" = "Cuộc gọi đã từ chối";
+"event_formatter_call_active_video" = "Cuộc gọi video đang hoạt động";
+"event_formatter_call_active_voice" = "Cuộc gọi thoại đang hoạt động";
+"event_formatter_call_incoming_video" = "Cuộc gọi video đến";
+"event_formatter_call_incoming_voice" = "Cuộc gọi thoại đến";
+"event_formatter_call_has_ended_with_time" = "Cuộc gọi đã kết thúc • %@";
+"event_formatter_call_has_ended" = "Cuộc gọi đã kết thúc";
+"event_formatter_call_ringing" = "Đang đổ chuông…";
+"event_formatter_call_connecting" = "Đang kết nối…";
+"event_formatter_message_edited_mention" = "(đã sửa)";
+"event_formatter_rerequest_keys_part2" = " từ các thiết bị khác của bạn.";
+"event_formatter_rerequest_keys_part1_link" = "Yêu cầu lại các khóa mã hóa";
+"image_picker_action_library" = "Chọn từ thư viện";
+
+// Image picker
+"image_picker_action_camera" = "Chụp ảnh";
+
+// Media picker
+"media_picker_title" = "Thư viện phương tiện";
+
+// Group rooms
+"group_rooms_filter_rooms" = "Lọc các phòng cộng đồng";
+"group_participants_invited_section" = "ĐÃ MỜI";
+"group_participants_invite_malformed_id" = "ID lạ. Nên là Matrix ID giống như '@localpart:domain'";
+"group_participants_invite_malformed_id_title" = "Lỗi mời";
+"group_participants_invite_another_user" = "Tìm / mời bằng ID người dùng hoặc tên";
+"group_participants_filter_members" = "Lọc thành viên cộng đồng";
+"group_participants_invite_prompt_msg" = "Bạn có chắc muốn mời %@ vào nhóm này?";
+"group_participants_invite_prompt_title" = "Xác nhận";
+"group_participants_remove_prompt_msg" = "Bạn có chắc muốn loại bỏ %@ khỏi nhóm này?";
+"group_participants_remove_prompt_title" = "Xác nhận";
+"group_participants_leave_prompt_msg" = "Bạn có chắc muốn rời khỏi nhóm?";
+"group_participants_leave_prompt_title" = "Rời nhóm";
+
+// Group participants
+"group_participants_add_participant" = "Thêm người tham gia";
+"group_invitation_format" = "%@ đã mời bạn tham gia vào cộng đồng này";
+"group_home_multi_rooms_format" = "%tu phòng";
+"group_home_one_room_format" = "1 phòng";
+"group_home_multi_members_format" = "%tu thành viên";
+
+// Group Home
+"group_home_one_member_format" = "1 thành viên";
+"group_details_rooms" = "Phòng";
+"group_details_people" = "Danh bạ";
+"group_details_home" = "Nhà";
+
+// Group Details
+"group_details_title" = "Chi tiết cộng đồng";
+"room_notifs_settings_encrypted_room_notice" = "Vui lòng lưu ý rằng các thông báo đề cập và từ khóa không có trong các phòng mã hóa trên di động.";
+"room_notifs_settings_account_settings" = "Cài đặt tài khoản";
+"room_notifs_settings_manage_notifications" = "Bạn có thể quản lý thông báo trong %@";
+"room_notifs_settings_cancel_action" = "Hủy";
+"room_notifs_settings_done_action" = "Xong";
+"room_notifs_settings_none" = "Không";
+"room_notifs_settings_mentions_and_keywords" = "Chỉ đề cập và từ khóa";
+"room_notifs_settings_all_messages" = "Tất cả tin nhắn";
+
+// Room Notification Settings
+"room_notifs_settings_notify_me_for" = "Thông báo tôi để";
+"room_details_fail_to_update_room_communities" = "Cập nhật các cộng đồng liên quan thất bại";
+"room_details_advanced_e2e_encryption_disabled_for_dm" = "Mã hóa chưa được kích hoạt ở đây.";
+"room_details_advanced_e2e_encryption_enabled_for_dm" = "Mã hóa được kích hoạt ở đây";
+"room_details_advanced_room_id_for_dm" = "ID:";
+"room_details_flair_invalid_id_prompt_msg" = "%@ không phải là định danh hợp lệ cho cộng đồng";
+"room_details_flair_invalid_id_prompt_title" = "Định dạng không hợp lệ";
+"room_details_new_flair_placeholder" = "Thêm ID cộng đồng mới (ví dụ: +foo%@)";
+"room_details_flair_section" = "Hiển thị sự tinh tế cho cộng đồng";
+"room_details_no_local_addresses_for_dm" = "Phòng này không có địa chỉ nội bộ";
+"room_details_access_section_directory_toggle_for_dm" = "Liệt kê trong danh mục phòng";
+"room_details_access_section_anyone_for_dm" = "Bất cứ ai biết đường dẫn, kể cả khách";
+"room_details_access_section_anyone_apart_from_guest_for_dm" = "Bất cứ ai biết đường dẫn, ngoài khách";
+"secrets_recovery_with_key_recovery_key_title" = "Nhập";
+"secrets_recovery_with_key_information_unlock_secure_backup_with_key" = "Nhập Khóa Bảo mật của bạn để tiếp tục.";
+"secrets_recovery_with_key_information_unlock_secure_backup_with_phrase" = "Nhập Chuỗi Bảo mật của bạn để tiếp tục.";
+"secrets_recovery_with_key_information_verify_device" = "Sử dụng Khóa Bảo mật của bạn để xác minh thiết bị này.";
+"secrets_recovery_with_key_information_default" = "Truy cập vào lịch sử tin nhắn bảo mật và danh tính xác thực chéo của bạn để xác minh các thiết bị khác bằng cách nhập Khóa Bảo mật của bạn.";
+
+// Recover with key
+
+"secrets_recovery_with_key_title" = "Khóa Bảo mật";
+"secrets_recovery_with_passphrase_invalid_passphrase_message" = "Vui lòng xác minh rằng bạn đã nhập đúng Chuỗi Bảo mật.";
+"secrets_recovery_with_passphrase_invalid_passphrase_title" = "Không thể truy cập kho lưu bí mật";
+"secrets_recovery_with_passphrase_lost_passphrase_action_part3" = ".";
+"secrets_recovery_with_passphrase_lost_passphrase_action_part2" = "sử dụng Khóa Bảo mật của bạn";
+"secrets_recovery_with_passphrase_lost_passphrase_action_part1" = "Không biết Chuỗi Bảo mật của bạn? Bạn có thể ";
+"secrets_recovery_with_passphrase_recover_action" = "Sử dụng Chuỗi";
+"secrets_recovery_with_passphrase_passphrase_placeholder" = "Nhập Chuỗi Bảo mật";
+"secrets_recovery_with_passphrase_passphrase_title" = "Nhập";
+"secrets_recovery_with_passphrase_information_verify_device" = "Sử dụng Chuỗi Bảo mật của bạn để xác minh thiết bị này.";
+"secrets_recovery_with_passphrase_information_default" = "Truy cập vào lịch sử tin nhắn bảo mật và danh tính xác thực chéo của bạn để xác minh các thiết bị khác bằng cách nhập Chuỗi Bảo mật của bạn.";
+
+// Recover with passphrase
+
+"secrets_recovery_with_passphrase_title" = "Chuỗi bảo mật";
+"secrets_recovery_reset_action_part_2" = "Đặt lại mọi thứ";
+
+// MARK: - Secrets recovery
+
+"secrets_recovery_reset_action_part_1" = "Quên hoặc mất các tùy chọn khôi phục? ";
+"user_verification_session_details_verify_action_other_user" = "Xác minh thủ công";
+"user_verification_session_details_verify_action_current_user_manually" = "Xác minh thủ công bằng văn bản";
+"user_verification_session_details_verify_action_current_user" = "Xác minh tương tác";
+"user_verification_session_details_additional_information_untrusted_current_user" = "Nếu bạn không đăng nhập vào thiết bị này, tài khoản của bạn có thể bị xâm phạm.";
+"user_verification_session_details_additional_information_untrusted_other_user" = "Cho đến khi người dùng này tin tưởng thiết bị này, các tin nhắn được gửi đến và đi từ nó được gán nhãn cảnh báo. Ngoài ra, bạn có thể xác minh nó một cách thủ công.";
+"room_details_access_section_for_dm" = "Ai có thể truy cập vào đây?";
+"room_details_notifs" = "Thông báo";
+"room_details_room_name_for_dm" = "Tên";
+"room_details_photo_for_dm" = "Hình ảnh";
+"room_details_integrations" = "Tích hợp";
+"room_details_search" = "Tìm phòng";
+"room_details_title_for_dm" = "Chi tiết";
+"identity_server_settings_alert_error_invalid_identity_server" = "%@ không phải là máy chủ xác thực hợp lệ.";
+"identity_server_settings_alert_error_terms_not_accepted" = "Bạn phải chấp nhận các điều khoản của %@ để thiết lập nó là máy chủ xác thực.";
+"identity_server_settings_alert_disconnect_still_sharing_3pid_button" = "Vẫn ngắt kết nối";
+"identity_server_settings_alert_disconnect_still_sharing_3pid" = "Bạn vẫn đang chia sẻ dữ liệu cá nhân của bạn trên máy chủ xác thực %@.\n\nChúng tôi đề nghị bạn xóa các địa chỉ email và số điện thoại khỏi máy chủ xác thực trước khi ngắt kết nối.";
+"identity_server_settings_alert_disconnect_button" = "Ngắt kết nối";
+"identity_server_settings_alert_disconnect" = "Ngắt kết nối từ máy chủ xác thực %@?";
+"identity_server_settings_alert_disconnect_title" = "Ngắt kết nối máy chủ xác thực";
+"identity_server_settings_alert_change" = "Ngắt kết nối từ máy chủ xác thực %1$@ và kết nối đến %2$@?";
+"identity_server_settings_alert_change_title" = "Thay đổi máy chủ xác thực";
+"identity_server_settings_alert_no_terms" = "Máy chủ xác thực bạn vừa chọn không có điều khoản dịch vụ. Chỉ tiếp tục khi bạn tin tưởng chủ sở hữu của máy chủ này.";
+"identity_server_settings_alert_no_terms_title" = "Máy chủ xác thực không có điều khoản dịch vụ";
+"identity_server_settings_disconnect" = "Ngắt kết nối";
+"identity_server_settings_disconnect_info" = "Ngắt kết nối đến máy chủ xác thực của bạn sẽ có nghĩa là bạn không thể được tìm thấy bởi những người dùng khác và không thể mời những người khác bằng email hoặc điện thoại.";
+"identity_server_settings_change" = "Thay đổi";
+"identity_server_settings_add" = "Thêm";
+"identity_server_settings_place_holder" = "Nhập một máy chủ xác thực";
+"identity_server_settings_no_is_description" = "Bạn đang không dùng máy chủ xác thực. Để tìm và được tìm bởi những liên hệ đang có, hãy thêm một vào bên trên";
+"identity_server_settings_description" = "Bạn đang dùng %@ để tìm kiếm và được tìm bởi những liên hệ bạn biết.";
+
+// Identity server settings
+"identity_server_settings_title" = "Máy chủ xác thực";
+
+// AuthenticatedSessionViewControllerFactory
+"authenticated_session_flow_not_supported" = "Ứng dụng này không hỗ trợ cơ chế xác thực trên homeserver của bạn.";
+"manage_session_sign_out" = "Đăng xuất khỏi thiết bị này";
+"manage_session_not_trusted" = "Không tin tưởng";
+"manage_session_trusted" = "Được bạn tin tưởng";
+"manage_session_name" = "Tên thiết bị";
+"manage_session_info" = "THÔNG TIN THIẾT BỊ";
+
+// Manage session
+"manage_session_title" = "Quản lý thiết bị";
+"security_settings_user_password_description" = "Xác nhận danh tính của bạn bằng cách nhập mật khẩu tài khoản của bạn";
+"security_settings_coming_soon" = "Xin lỗi. Hành động này vẫn chưa có trên %@ iOS. Vui lòng sử dụng client Matrix khác để thiết lập nó. %@ iOS sẽ sử dụng nó.";
+"security_settings_complete_security_alert_message" = "Bạn nên hoàn thành bảo mật trên thiết bị hiện tại của bạn trước.";
+"security_settings_complete_security_alert_title" = "Hoàn thành bảo mật";
+"security_settings_blacklist_unverified_devices_description" = "Xác minh tất cả các thiết bị người dùng để đánh dấu chúng là tin cậy và gửi tin nhắn đến chúng";
+"security_settings_blacklist_unverified_devices" = "Không bao giờ gửi tin nhắn đến các thiết bị không tin cậy";
+"security_settings_advanced" = "Nâng cao";
+"security_settings_export_keys_manually" = "Xuất các khóa thủ công";
+"security_settings_cryptography" = "MẬT MÃ HỌC";
+"security_settings_crosssigning_complete_security" = "Hoàn thành bảo mật";
+"security_settings_crosssigning_reset" = "Đặt lại";
+"security_settings_crosssigning_bootstrap" = "Thiết lập";
+"security_settings_crosssigning_info_ok" = "Xác thực chéo sẵn sàng để sử dụng.";
+"security_settings_crosssigning_info_trusted" = "Xác thực chéo được kích hoạt. Bạn có thể tin tưởng các người dùng khác và các thiết bị khác của bạn dựa theo xác thực chéo nhưng bạn không thể xác thực chéo từ thiết bị này vì nó không có các khóa riêng của xác thực chéo. Hoàn thành bảo mật của thiết bị này.";
+"security_settings_crosssigning_info_exists" = "Tài khoản của bạn có một danh tính xác thực chéo, nhưng nó chưa được thiết bị này tin tưởng. Hoàn thành bảo mật thiết bị này.";
+"security_settings_crosssigning_info_not_bootstrapped" = "Xác thực chéo chưa được thiết lập.";
+"security_settings_crosssigning" = "XÁC THỰC CHÉO";
+"security_settings_backup" = "SAO LƯU TIN NHẮN";
+"security_settings_secure_backup_delete" = "Xóa sao lưu";
+"security_settings_secure_backup_restore" = "Khôi phục từ sao lưu";
+"security_settings_secure_backup_reset" = "Đặt lại";
+"security_settings_secure_backup_setup" = "Thiết lập";
+"security_settings_secure_backup_info_valid" = "Thiết bị này đang sao lưu các khóa của bạn.";
+"security_settings_secure_backup_info_checking" = "Đang kiểm tra…";
+"security_settings_secure_backup_description" = "Sao lưu các khóa mã hóa với thông tin tài khoản của bạn trong trường hợp bạn mất quyền truy cập vào các thiệt bị của bạn. Các khóa của bạn sẽ được bảo mật bằng một Khóa Bảo mật duy nhất.";
+"security_settings_secure_backup" = "SAO LƯU BẢO MẬT";
+"security_settings_crypto_sessions_description_2" = "Nếu bạn không nhận ra một lượt đăng nhập, hãy thay đổi mật khẩu của bạn và đặt lại sao lưu bảo mật.";
+"security_settings_crypto_sessions_loading" = "Đang tải các thiết bị…";
+"security_settings_crypto_sessions" = "CÁC THIẾT BỊ CỦA TÔI";
+
+// Security settings
+"security_settings_title" = "Bảo mật";
+"settings_show_NSFW_public_rooms" = "Hiện các phòng công cộng NSFW";
+"settings_identity_server_no_is_description" = "Bạn đang không dùng máy chủ xác thực. Để tìm thấy hoặc được tìm thấy bời các liên hệ bạn biết, hãy thêm vào một";
+"settings_identity_server_no_is" = "Không có máy chủ xác thực được cấu hình";
+"settings_identity_server_description" = "Sử dụng máy chủ xác thực được cài đặt bên trên, bạn có thể tìm thấy và được tìm thấy bởi các liên hệ bạn biết.";
+"settings_discovery_three_pid_details_enter_sms_code_action" = "Nhập mã kích hoạt SMS";
+"settings_discovery_three_pid_details_cancel_email_validation_action" = "Hủy xác thực email";
+"settings_discovery_three_pid_details_revoke_action" = "Thu hồi";
+"settings_discovery_three_pid_details_share_action" = "Chia sẻ";
+"settings_discovery_three_pid_details_information_phone_number" = "Quản lý tùy chọn cho số điện thoại này, mà người dùng khác có thể dùng để tìm thấy bạn và sử dụng để mời bạn vào phòng. Thêm hoặc xóa các số điện thoại trong các tài khoản.";
+"settings_discovery_three_pid_details_title_phone_number" = "Quản lý số điện thoại";
+"settings_discovery_three_pid_details_information_email" = "Quản lý tùy chọn cho địa chỉ email này, mà các người dùng khác có thể dùng để tìm thấy bạn và sử dụng để mời bạn vào phòng. Thêm hoặc xóa các địa chỉ email trong các tài khoản.";
+"settings_discovery_three_pid_details_title_email" = "Quản lý email";
+"settings_discovery_error_message" = "Có lỗi xảy ra. Vui lòng thử lại.";
+"settings_discovery_three_pids_management_information_part3" = ".";
+"settings_discovery_three_pids_management_information_part2" = "Cài đặt người dùng";
+"settings_discovery_three_pids_management_information_part1" = "Quản lý các địa chỉ email hoặc số điện thoại mà người dùng khác có thể sử dụng để tìm thấy bạn và sử dụng để mời bạn vào phòng. Thêm hoặc xóa các địa chỉ email hoặc số điện thoại từ danh sách này trong ";
+"settings_discovery_terms_not_signed" = "Chấp nhận Điều khoản dịch vụ của máy chủ xác thực (%@) để cho phép bạn có thể được tìm thấy bằng địa chỉ email hoặc số điện thoại.";
+"settings_discovery_no_identity_server" = "Bạn đang không xài máy chủ xác thực. Để các liên hệ bạn biết tìm thấy bạn, hãy thêm một.";
+"settings_devices_description" = "Tên công khai của một thiết bị hiển thị cho mọi người mà bạn đang giao tiếp";
+"settings_key_backup_delete_confirmation_prompt_msg" = "Bạn có chắc không? Bạn sẽ mất các tin nhắn mã hóa nếu các khóa của bạn không được sao lưu đúng.";
+"settings_key_backup_delete_confirmation_prompt_title" = "Xóa sao lưu";
+"settings_key_backup_button_connect" = "Kết nối thiết bị này đến khóa sao lưu";
+"settings_key_backup_button_delete" = "Xóa sao lưu";
+"settings_key_backup_button_restore" = "Khôi phục từ sao lưu";
+"settings_key_backup_button_create" = "Bắt đầu sử dụng sao lưu khóa";
+"settings_key_backup_info_trust_signature_invalid_device_unverified" = "Sao lưu có một chữ ký không hợp lệ từ %@";
+"settings_key_backup_info_trust_signature_invalid_device_verified" = "Sao lưu có một chữ ký không hợp lệ từ %@";
+"settings_key_backup_info_trust_signature_valid_device_unverified" = "Sao lưu có một chữ ký từ %@";
+"settings_key_backup_info_trust_signature_valid_device_verified" = "Sao lưu có một chữ ký hợp lệ từ %@";
+"settings_key_backup_info_trust_signature_valid" = "Sao lưu có một chữ ký hợp lệ từ thiết bị này";
+"settings_key_backup_info_trust_signature_unknown" = "Sao lưu có một chữ ký từ thiết bị với ID: %@";
+"settings_key_backup_info_progress_done" = "Tất cả khóa được sao lưu";
+"settings_key_backup_info_progress" = "Đang sao lưu %@ khóa…";
+"settings_key_backup_info_not_valid" = "Thiết bị này không sao lưu các khóa của bạn, nhưng bạn có một bản sao hiện tại mà bạn có thể khôi phục và thêm vào";
+"settings_key_backup_info_valid" = "Thiết bị này đang sao lưu các khóa của bạn.";
+"settings_key_backup_info_algorithm" = "Thuật toán: %@";
+"settings_key_backup_info_version" = "Phiên bản sao lưu khóa: %@";
+"settings_key_backup_info_signout_warning" = "Sao lưu các khóa của bạn trước khi đăng xuất để tránh làm mất chúng.";
+"settings_key_backup_info_none" = "Các khóa của bạn không được sao lưu từ thiết bị này.";
+"settings_key_backup_info_checking" = "Đang kiểm tra…";
+"settings_key_backup_info" = "Các tin nhắn mã hóa được bảo mật bằng mã hóa đầu-cuối. Chỉ có bạn và (các) người nhận có các khóa để đọc những tin nhắn này.";
+"settings_deactivate_my_account" = "Hủy kích hoạt tài khoản của tôi";
+"settings_add_3pid_invalid_password_message" = "Thông tin xác thực không hợp lệ";
+"settings_add_3pid_password_message" = "Để tiếp tục, vui lòng nhập mật khẩu của bạn";
+"settings_add_3pid_password_title_msidsn" = "Thêm số điện thoại";
+"settings_add_3pid_password_title_email" = "Thêm địa chỉ email";
+"settings_labs_voice_messages" = "Các tin nhắn thoại";
+"settings_labs_enable_ringing_for_group_calls" = "Đổ chuông cho các cuộc gọi nhóm";
+"settings_labs_message_reaction" = "Phản ứng với các tin nhắn bằng emoji";
+"settings_contacts_enable_sync_description" = "Điều này sẽ dùng máy chủ xác thực của bạn để kết nối bạn với các liên hệ của bạn, và hỗ trợ họ tìm thấy bạn.";
+"settings_contacts_enable_sync" = "Tìm các liên hệ của bạn";
+"settings_show_url_previews_description" = "Các bản xem trước chỉ được hiển thị trong các phòng không mã hóa.";
+"settings_show_url_previews" = "Hiện bản xem trước trang web";
+"settings_ui_theme_picker_message_match_system_theme" = "\"Tự động\" khớp chủ đề hệ thống của thiết bị của bạn";
+"settings_ui_theme_picker_message_invert_colours" = "\"Tự động\" sử dụng cài đặt \"Các màu đảo ngược\" của thiết bị của bạn";
+"settings_ui_theme_black" = "Đen";
+"settings_integrations_allow_description" = "Sử dụng một trình quản lý tích hợp (%@) để quản lý bot, cầu nối, widget và các gói sticker.\n\nCác trình quản lý tích hợp nhận dữ liệu cấu hình, và có thể sửa đổi các widget, gửi các lời mời phòng và đặt cấp độ quản lý thay cho bạn";
+"settings_integrations_allow_button" = "Quản lý tích hợp";
+"settings_calls_stun_server_fallback_description" = "Cho phép máy chủ hỗ trợ cuộc gọi dự phòng %@ khi homeserver của bạn không cung cấp (địa chỉ IP của bạn sẽ được chia sẻ trong cuộc gọi).";
+"settings_calls_stun_server_fallback_button" = "Cho phép máy chủ hỗ trợ cuộc gọi dự phòng";
+"settings_mentions_and_keywords_encryption_notice" = "Bạn sẽ không nhận được thông báo cho các đề cập và từ khóa trong các phòng được mã hóa trên di động";
+"settings_new_keyword" = "Thêm từ khóa mới";
+"settings_your_keywords" = "Các từ khóa của bạn";
+"settings_room_upgrades" = "Các nâng cấp phòng";
+"settings_messages_by_a_bot" = "Các tin nhắn của bot";
+"settings_call_invitations" = "Các lời mời cuộc gọi";
+"settings_room_invitations" = "Các lời mời phòng";
+"settings_messages_containing_keywords" = "Các từ khóa";
+"settings_messages_containing_at_room" = "@room";
+"settings_messages_containing_user_name" = "Tên người dùng của tôi";
+"settings_messages_containing_display_name" = "Tên hiển thị của tôi";
+"settings_encrypted_group_messages" = "Các tin nhắn nhóm được mã hóa";
+"settings_group_messages" = "Các tin nhắn nhóm";
+"settings_encrypted_direct_messages" = "Các tin nhắn trực tiếp được mã hóa";
+"settings_direct_messages" = "Các tin nhắn trực tiếp";
+"settings_notify_me_for" = "Thông báo cho tôi biết";
+"settings_mentions_and_keywords" = "Các đề cập và từ khóa";
+"settings_default" = "Các thông báo mặc định";
+"settings_notifications_disabled_alert_message" = "Để bật thông báo, đi đến cài đặt thiết bị của bạn";
+"settings_notifications_disabled_alert_title" = "Thông báo bị vô hiệu hóa";
+"settings_device_notifications" = "Các thông báo thiết bị";
+"settings_security" = "BẢO MẬT";
+"settings_confirm_media_size_description" = "Khi điều này xảy ra, bạn sẽ được yêu cầu xác nhận kích thước hình ảnh và video nào sẽ được gửi";
+"settings_confirm_media_size" = "Xác nhận kích thước khi gửi";
+"settings_three_pids_management_information_part3" = ".";
+"settings_three_pids_management_information_part2" = "Tìm kiếm";
+"settings_three_pids_management_information_part1" = "Quản lý các địa chỉ email hoặc số điện thoại bạn có thể sử dụng để đăng nhập hoặc khôi phục tài khoản của bạn ở đây. Điều khiển ai có thể tìm thấy bạn ";
+"settings_deactivate_account" = "HỦY KÍCH HOẠT TÀI KHOẢN";
+"settings_key_backup" = "KHÓA DỰ PHÒNG";
+"settings_flair" = "Thể hiện sự tinh tế khi được phép";
+"settings_phone_contacts" = "DANH BẠ ĐIỆN THOẠI";
+"settings_integrations" = "TÍCH HỢP";
+"settings_identity_server_settings" = "MÁY CHỦ XÁC THỰC";
+"settings_discovery_settings" = "TÌM KIẾM";
+"settings_notifications" = "THÔNG BÁO";
+"settings_links" = "LIÊN KẾT";
+"settings_sending_media" = "GỬI HÌNH ẢNH VÀ VIDEO";
+"room_multiple_typing_notification" = "%@ và những người khác";
+"external_link_confirmation_message" = "Liên kết %@ đang đưa bạn đến mốt trang khác: %@\n\nBạn có chắc muốn tiếp tục?";
+"external_link_confirmation_title" = "Kiểm tra lại liên kết này";
+"media_type_accessibility_sticker" = "Sticker";
+"media_type_accessibility_file" = "Tệp";
+"media_type_accessibility_location" = "Địa điểm";
+"media_type_accessibility_video" = "Video";
+"media_type_accessibility_audio" = "Âm thanh";
+"media_type_accessibility_image" = "Hình ảnh";
+"room_no_privileges_to_create_group_call" = "Bạn cần phải là một quản trị viên hoặc điều hành viên để bắt đầu cuộc gọi.";
+"room_join_group_call" = "Tham gia";
+"room_open_dialpad" = "Bàn phím quay số";
+"room_place_voice_call" = "Cuộc gọi thoại";
+"room_accessibility_hangup" = "Cúp máy";
+"room_accessibility_video_call" = "Gọi video";
+"room_accessibility_call" = "Gọi";
+"room_accessibility_upload" = "Tải lên";
+"room_accessibility_integrations" = "Tích hợp";
+"room_accessibility_search" = "Tìm kiếm";
+"room_message_edits_history_title" = "Sửa tin nhắn";
+"room_resource_usage_limit_reached_message_contact_3" = " để tăng giới hạn này.";
+"room_resource_usage_limit_reached_message_2" = "một số người dùng sẽ không thể đăng nhập.";
+"room_resource_usage_limit_reached_message_1_monthly_active_user" = "Homeserver này đạt giới hạn người dùng hoạt động hàng tháng của nó do đó ";
+"room_resource_usage_limit_reached_message_1_default" = "Homeserver này đã vượt quá một trong các giới hạn tài nguyên của nó do đó ";
+"room_resource_limit_exceeded_message_contact_3" = " để tiếp tục sử dụng dịch vụ này.";
+"room_resource_limit_exceeded_message_contact_2_link" = "Liên hệ quản trị viên dịch vụ của bạn";
+"room_resource_limit_exceeded_message_contact_1" = " Vui lòng ";
+"room_predecessor_link" = "Nhấn vào đây để xem các tin nhắn cũ.";
+"room_predecessor_information" = "Phòng này là sự tiếp nối của cuộc trò chuyện khác.";
+"room_replacement_link" = "Cuộc trò chuyện tiếp tục ở đây";
+"room_replacement_information" = "Phòng này đã được thay thế và không còn hoạt động nữa";
+"room_action_reply" = "Trả lời";
+"room_action_send_file" = "Gửi tệp";
+"room_action_send_sticker" = "Gửi sticker";
+"room_action_send_photo_or_video" = "Gửi ảnh hoặc video";
+"room_action_camera" = "Chụp ảnh hoặc quay video";
+"room_event_action_reaction_history" = "Lịch sử phản ứng";
+"room_event_action_reaction_show_less" = "Hiện ít hơn";
+"room_event_action_reaction_show_all" = "Hiện tất cả";
+"room_event_action_edit" = "Chỉnh sửa";
+"room_event_action_reply" = "Trả lời";
+"room_event_action_delete_confirmation_message" = "Bạn có chắc muốn xóa tin nhắn chưa được gửi này?";
+"room_event_action_delete_confirmation_title" = "Xóa tin nhắn chưa được gửi";
+"room_event_action_ban_prompt_reason" = "Lí do cấm người dùng này";
+"room_event_action_kick_prompt_reason" = "Lí do đá người dùng này";
+"room_event_action_view_decrypted_source" = "Xem nguồn được giải mã";
+"room_unsent_messages_cancel_message" = "Bạn có chắc muốn xóa tất cả các tin nhắn chưa được gửi trong phòng này?";
+"room_unsent_messages_cancel_title" = "Xóa các tin nhắn chưa được gửi";
+"room_message_reply_to_short_placeholder" = "Gửi trả lời…";
+"encrypted_room_message_reply_to_placeholder" = "Gửi trả lời đã mã hóa…";
+"key_backup_recover_invalid_passphrase_title" = "Chuỗi bảo mật không chính xác";
+
+// MARK: Key backup recover
+
+"key_backup_recover_title" = "Các tin nhắn bảo mật";
+
+// Success from secure backup
+"key_backup_setup_success_from_secure_backup_info" = "Các khóa của bạn đang được sao lưu.";
+"key_backup_setup_success_from_recovery_key_made_copy_action" = "Tôi vừa tạo một bản sao";
+"room_do_not_have_permission_to_post" = "Bạn không có quyền đăng bài vào phòng này";
+"room_message_replying_to" = "Đang trả lời %@";
+"room_message_editing" = "Chỉnh sửa";
+"room_message_unable_open_link_error_message" = "Không thể mở liên kết";
+"room_message_reply_to_placeholder" = "Gửi trả lời (không được mã hóa)…";
+"room_accessiblity_scroll_to_bottom" = "Cuộn đến cuối";
+
+// Chat
+"room_slide_to_end_group_call" = "Trượt để kết thúc cuộc gọi cho tất cả mọi người";
+"room_member_power_level_short_custom" = "Tùy chỉnh";
+"room_member_power_level_short_moderator" = "Điều hành viên";
+"room_member_power_level_short_admin" = "Quản trị viên";
+"room_member_power_level_custom_in" = "Tùy chỉnh (%@) trong %@";
+"room_member_power_level_moderator_in" = "Điều hành viên trong %@";
+"room_member_power_level_admin_in" = "Quản trị viên trong %@";
+"room_participants_security_information_room_encrypted_for_dm" = "Các tin nhắn ở đây được mã hóa đầu-cuối.\n\nCác tin nhắn của bạn được mã hóa bằng các khóa và chỉ có bạn và người nhận có những khóa duy nhất để mở chúng.";
+"room_participants_security_information_room_encrypted" = "Các tin nhắn trong phòng này được mã hóa đầu-cuối.\n\nCác tin nhắn của bạn được bảo mật bằng các khóa và chỉ có bạn và người nhận có các khóa duy nhất để mở chúng.";
+"room_participants_security_information_room_not_encrypted_for_dm" = "Các tin nhắn ở đây không được mã hóa đầu-cuối";
+"room_participants_security_information_room_not_encrypted" = "Các tin nhắn trong phòng này không được mã hóa đầu-cuối";
+"room_participants_security_loading" = "Đang tải…";
+"room_participants_action_security_status_loading" = "Đang tải…";
+"room_participants_action_security_status_warning" = "Cảnh báo";
+"room_participants_action_security_status_complete_security" = "Hoàn thành bảo mật";
+"room_participants_action_security_status_verify" = "Xác minh";
+"room_participants_action_security_status_verified" = "Đã xác minh";
+"room_participants_action_section_security" = "An ninh";
+"room_participants_start_new_chat_error_using_user_email_without_identity_server" = "Không có máy chủ xác thực nào được cài đặt do đó bạn không thể bắt đầu trò chuyện với một liên hệ bằng email";
+"room_participants_filter_room_members_for_dm" = "Lọc thành viên";
+"room_participants_remove_third_party_invite_prompt_msg" = "Ban có chắc muốn thu hồi lời mời này?";
+"room_participants_leave_prompt_msg_for_dm" = "Bạn có chắc muốn rời?";
+"room_participants_leave_prompt_title_for_dm" = "Rời";
+"find_your_contacts_identity_service_error" = "Không thể kết nối với máy chủ xác thực";
+"find_your_contacts_footer" = "Điều này có thể bị vô hiệu hóa bất cứ lúc nào từ cài đặt";
+"find_your_contacts_button_title" = "Tìm liên hệ của bạn";
+"find_your_contacts_message" = "Hãy để %@ hiển thị danh bạ của bạn để bạn có thể nhanh chóng bắt đầu trò chuyện với những người bạn biết rõ nhất";
+"find_your_contacts_title" = "Bắt đầu bằng cách liệt kê danh bạ của bạn";
+"contacts_address_book_permission_denied_alert_message" = "Để bật danh bạ, hãy đi tới cài đặt thiết bị của bạn";
+"contacts_address_book_permission_denied_alert_title" = "Danh bạ bị vô hiệu hóa";
+"contacts_address_book_no_identity_server" = "Không có máy chủ xác thực nào được cấu hình";
+"group_section" = "CỘNG ĐỒNG";
+
+// Groups tab
+"group_invite_section" = "MỜI";
+"rooms_empty_view_information" = "Phòng là tuyệt vời cho bất kỳ trò chuyện nhóm, riêng tư hoặc công cộng. Nhấn vào + để tìm các phòng hiện có hoặc tạo phòng mới.";
+"rooms_empty_view_title" = "Phòng";
+"people_empty_view_information" = "Trò chuyện bảo mật với bất cứ ai. Nhấn vào + để bắt đầu thêm người";
+"people_empty_view_title" = "Danh bạ";
+"room_recents_unknown_room_error_message" = "Không thể tìm thấy phòng này. Hãy chắc chắn rằng nó tồn tại";
+"room_recents_suggested_rooms_section" = "PHÒNG GỢI Ý";
+"room_recents_server_notice_section" = "CẢNH BẢO HỆ THỐNG";
+"room_creation_dm_error" = "Chúng tôi không thể tạo DM của bạn. Vui lòng kiểm tra người dùng bạn muốn mời và thử lại.";
+"room_creation_error_invite_user_by_email_without_identity_server" = "Không có máy chủ xác thực nào được cấu hình vì vậy bạn không thể thêm người dự bằng email.";
+
+// Errors
+"error_user_already_logged_in" = "Có vẻ như bạn đang cố gắng kết nối với một homeserver khác. Bạn có muốn đăng xuất không?";
+"social_login_button_title_sign_up" = "Đăng ký với %@";
+"social_login_button_title_sign_in" = "Đăng nhập với %@";
+"social_login_button_title_continue" = "Tiếp tục với %@";
+"social_login_list_title_sign_up" = "Hoặc";
+"social_login_list_title_sign_in" = "Hoặc";
+
+// Social login
+
+"social_login_list_title_continue" = "Tiếp tục với";
+"auth_softlogout_clear_data_sign_out" = "Đăng xuất";
+"auth_softlogout_clear_data_sign_out_msg" = "Bạn có chắc chắn muốn xóa tất cả dữ liệu hiện đang được lưu trữ trên thiết bị này không? Đăng nhập lại để truy cập dữ liệu tài khoản và tin nhắn của bạn.";
+"auth_softlogout_clear_data_sign_out_title" = "Bạn có chắc không?";
+"auth_softlogout_clear_data_button" = "Xóa tất cả dữ liệu";
+"auth_softlogout_clear_data_message_2" = "Xóa nó nếu bạn đã hoàn tất việc sử dụng thiết bị này hoặc muốn đăng nhập vào tài khoản khác.";
+"auth_softlogout_clear_data_message_1" = "Cảnh báo: Dữ liệu cá nhân của bạn (bao gồm cả khóa mã hóa) vẫn được lưu trữ trên thiết bị này.";
+"auth_softlogout_clear_data" = "Xóa dữ liệu cá nhân";
+"auth_softlogout_recover_encryption_keys" = "Đăng nhập để khôi phục các khóa mã hóa được lưu trữ duy nhất trên thiết bị này. Bạn cần chúng để đọc tất cả các tin nhắn an toàn của bạn trên bất kỳ thiết bị nào.";
+"auth_softlogout_reason" = "Người quản trị homeserver (%1$@) của bạn đã đăng xuất bạn ra khỏi account %2$@ (%3$@).";
+"auth_softlogout_sign_in" = "Đăng nhập";
+"auth_softlogout_signed_out" = "Bạn đã đăng xuất";
+"auth_autodiscover_invalid_response" = "Phản hồi tìm kiếm homeserver không hợp lệ";
+"auth_accept_policies" = "Vui lòng xem xét và chấp nhận các chính sách của homeserver này:";
+"auth_reset_password_error_is_required" = "Không có máy chủ xác thực nào được cấu hình: thêm một trong các tùy chọn máy chủ để đặt lại mật khẩu của bạn.";
+"auth_forgot_password_error_no_configured_identity_server" = "Không có máy chủ xác thực nào được cấu hình: thêm một để đặt lại mật khẩu của bạn.";
+"auth_phone_is_required" = "Không có máy chủ xác thực nào được cấu hình để bạn không thể thêm số điện thoại để đặt lại mật khẩu của mình trong tương lai.";
+"auth_email_is_required" = "Không có máy chủ xác thực nào được cấu hình để bạn không thể thêm địa chỉ email để đặt lại mật khẩu của mình trong tương lai.";
+"auth_add_email_phone_message_2" = "Đặt email để khôi phục tài khoản. Sử dụng email hoặc điện thoại sau này để được tùy chọn phát hiện bởi những người biết bạn.";
+"auth_add_phone_message_2" = "Đặt điện thoại và sau đó có thể tùy chọn được tìm kiếm bởi những người biết bạn.";
+"auth_add_email_message_2" = "Đặt email để khôi phục tài khoản và sau đó có thể tùy chọn được tìm kiếm bởi những người biết bạn.";
+"auth_login_single_sign_on" = "Đăng nhập";
+
+// Accessibility
+"accessibility_checkbox_label" = "checkbox";
+"callbar_only_single_active_group" = "Nhấn để tham gia vào cuộc gọi nhóm (%@)";
+"callbar_return" = "Trở về";
+"callbar_only_multiple_paused" = "%@ cuộc gọi bị tạm dừng";
+"callbar_only_single_paused" = "Cuộc gọi bị tạm dừng";
+"callbar_active_and_multiple_paused" = "1 cuộc gọi đang hoạt động (%@) · %@ cuộc gọi bị tạm dừng";
+"callbar_active_and_single_paused" = "1 cuộc gọi đang hoạt động (%@) · 1 cuộc gọi đang tạm dừng";
+
+// Call Bar
+"callbar_only_single_active" = "Nhấn để quay lại cuộc gọi (%@)";
+"done" = "Hoàn thành";
+"open" = "Mở";
+"less" = "Ít hơn";
+"more" = "Nhiều hơn";
+"switch" = "Chuyển";
+"joined" = "Đã tham gia";
+"skip" = "Bỏ qua";
+"close" = "Đóng";
+"store_promotional_text" = "Ứng dụng trò chuyện và cộng tác bảo vệ quyền riêng tư, trên mạng mở. Phi tập trung để đưa bạn vào tầm kiểm soát. Không có datamining, không có backdoors và không có quyền truy cập của bên thứ ba.";
+"store_full_description" = "Element là một loại ứng dụng cộng tác và nhắn tin mới:\n\n1. Đặt bạn kiểm soát để giữ quyền riêng tư của bạn\n2. Cho phép bạn giao tiếp với bất kỳ ai trong mạng Matrix, và thậm chí hơn thế nữa bằng cách tích hợp với các ứng dụng như Slack\n3. Bảo vệ bạn khỏi quảng cáo, datamining, cửa hậu và khu vườn có tường bao quanh\n4. Bảo mật bạn thông qua mã hóa đầu cuối, với việc ký chéo để xác minh người khác\n\nElement hoàn toàn khác với các ứng dụng nhắn tin và cộng tác khác vì nó được phân cấp và nguồn mở.\n\nElement cho phép bạn tự lưu trữ - hoặc chọn máy chủ - để bạn có quyền riêng tư, quyền sở hữu và kiểm soát dữ liệu và cuộc trò chuyện của mình. Nó cho phép bạn truy cập vào một mạng mở; vì vậy, bạn không chỉ bị mắc kẹt khi nói chuyện với những người dùng Element khác. Và nó rất an toàn.\n\nElement có thể làm tất cả điều này bởi vì nó hoạt động trên Matrix - tiêu chuẩn cho giao tiếp mở, phi tập trung. \n\nElement giúp bạn kiểm soát bằng cách cho phép bạn chọn người tổ chức các cuộc trò chuyện của bạn. Từ ứng dụng Element, bạn có thể chọn lưu trữ theo nhiều cách khác nhau:\n\n1. Nhận tài khoản miễn phí trên máy chủ công cộng matrix.org\n2. Tự lưu trữ tài khoản của bạn bằng cách chạy máy chủ trên phần cứng của riêng bạn\n3. Đăng ký tài khoản trên máy chủ tùy chỉnh bằng cách đăng ký vào nền tảng lưu trữ Dịch vụ Element Matrix\n\nTại sao chọn Element?\n\nSở hữu dữ liệu của bạn: Bạn quyết định nơi để giữ dữ liệu và tin nhắn của bạn. Bạn sở hữu nó và kiểm soát nó, không phải một số MEGACORP khai thác dữ liệu của bạn hoặc cho phép truy cập vào bên thứ ba.\n\nTIN NHẮN MỞ VÀ CỘNG TÁC: Bạn có thể trò chuyện với bất kỳ ai khác trong mạng Matrix, cho dù họ đang sử dụng Element hay ứng dụng Matrix khác và ngay cả khi họ đang sử dụng một hệ thống nhắn tin khác như Slack, IRC hoặc XMPP.\n\nSUPER-SECURE: Mã hóa đầu cuối thực sự (chỉ những người trong cuộc trò chuyện mới có thể giải mã tin nhắn) và ký chéo để xác minh các thiết bị của người tham gia hội thoại.\n\nGIAO TIẾP ĐẦY ĐỦ: Nhắn tin, cuộc gọi thoại và video, chia sẻ tệp, chia sẻ màn hình và một loạt các tích hợp, bot và tiện ích. Xây dựng phòng, cộng đồng, giữ liên lạc và hoàn thành công việc.\n\nỞ mọi nơi bạn đang có: Giữ liên lạc bất cứ nơi nào bạn đang có với lịch sử tin nhắn được đồng bộ hóa hoàn toàn trên tất cả các thiết bị của bạn và trên web tại https://element.io/app.";
+// String for App Store
+"store_short_description" = "Chat/VoIP bảo mật phi tập trung";
diff --git a/Riot/Assets/zh_Hans.lproj/Vector.strings b/Riot/Assets/zh_Hans.lproj/Vector.strings
index 12ee6b01a..f54deca1f 100644
--- a/Riot/Assets/zh_Hans.lproj/Vector.strings
+++ b/Riot/Assets/zh_Hans.lproj/Vector.strings
@@ -1545,3 +1545,20 @@
 "find_your_contacts_title" = "从列出你的联系人开始";
 "contacts_address_book_permission_denied_alert_message" = "要启用联系人，请转到设备设置。";
 "contacts_address_book_permission_denied_alert_title" = "联系人被禁用";
+"space_home_show_all_rooms" = "显示所有聊天室";
+"room_event_action_forward" = "转发";
+"poll_edit_form_add_option" = "添加选项";
+"poll_edit_form_option_number" = "选项 %d";
+"poll_edit_form_create_options" = "创建选项";
+"poll_edit_form_input_placeholder" = "写些东西";
+"poll_edit_form_question_or_topic" = "问题或话题";
+"poll_edit_form_poll_question_or_topic" = "投票问题或话题";
+
+// Mark: - Polls
+
+"poll_edit_form_create_poll" = "创建投票";
+"share_extension_send_now" = "立即发送";
+"share_extension_low_quality_video_message" = "以 %@ 发送画质更好，或者用下方的低画质发送。";
+"share_extension_low_quality_video_title" = "将以低画质发送视频";
+"settings_discovery_accept_terms" = "接受身份服务器条款";
+"settings_about" = "关于";
diff --git a/Riot/Assets/zh_Hant.lproj/Vector.strings b/Riot/Assets/zh_Hant.lproj/Vector.strings
index dea57af66..327f1ae02 100644
--- a/Riot/Assets/zh_Hant.lproj/Vector.strings
+++ b/Riot/Assets/zh_Hant.lproj/Vector.strings
@@ -181,7 +181,7 @@
 "room_creation_keep_private" = "維持私人";
 "room_creation_make_private" = "設成私人";
 "room_creation_wait_for_creation" = "聊天室正在建立，請稍後。";
-"room_creation_invite_another_user" = "透過使用者ID、名稱、電子郵件地址來搜尋/邀請";
+"room_creation_invite_another_user" = "使用者 ID、名稱、或電子郵件地址";
 // Room recents
 "room_recents_directory_section" = "聊天室目錄";
 "room_recents_favourites_section" = "收藏夾";
@@ -258,7 +258,7 @@
 "room_participants_action_start_video_call" = "開始視訊通話";
 "room_event_action_view_encryption" = "加密資訊";
 // 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" = "%@ 正在輸入…";
@@ -318,7 +318,7 @@
 "settings_calls_settings" = "通話";
 "settings_user_interface" = "使用者介面";
 "settings_ignored_users" = "已忽略使用者";
-"settings_contacts" = "本地聯絡人";
+"settings_contacts" = "裝置聯絡人";
 "settings_advanced" = "進階";
 "settings_other" = "其他";
 "settings_labs" = "實驗室";
@@ -383,7 +383,7 @@
 "settings_deactivate_my_account" = "註銷我的帳號";
 // Room Details
 "room_details_title" = "聊天室詳細資料";
-"room_details_files" = "文件";
+"room_details_files" = "上傳";
 "room_details_settings" = "設定";
 "room_details_photo" = "聊天室圖片";
 "room_details_room_name" = "聊天室名稱";
@@ -615,7 +615,7 @@
 "auth_add_email_phone_message_2" = "設置一個電子郵件以便日後恢復帳戶和使以後可以由認識您的人發現你。";
 "auth_add_email_message_2" = "設置一個電子郵件以便日後恢復帳戶和使以後可以由認識您的人發現你。";
 "auth_add_phone_message_2" = "設置一個電話號碼，以後可以由認識您的人發現你。";
-"auth_login_single_sign_on" = "以單一登入方式登入";
+"auth_login_single_sign_on" = "登入";
 
 // Accessibility
 "accessibility_checkbox_label" = "複選框";
@@ -661,3 +661,249 @@
 "rooms_empty_view_title" = "聊天室";
 "people_empty_view_information" = "和任何人安全地通話。按 + 添加聯絡人。";
 "people_empty_view_title" = "聯絡人";
+
+// MARK: - Room Info
+
+"room_info_list_one_member" = "1 位成員";
+"biometrics_mode_face_id" = "Face ID";
+
+// MARK: - PIN Protection
+
+"pin_protection_choose_pin_welcome_after_login" = "歡迎回來。";
+"major_update_done_action" = "了解了";
+"major_update_learn_more_action" = "了解詳情";
+
+// Scanned
+"key_verification_scan_confirmation_scanned_title" = "就快完成了！";
+
+// MARK: File upload
+"file_upload_error_title" = "上傳檔案";
+"device_verification_emoji_light bulb" = "燈泡";
+"device_verification_emoji_thumbs up" = "讚";
+"device_verification_verified_got_it_button" = "了解了";
+"side_menu_action_feedback" = "反饋";
+"side_menu_action_help" = "協助";
+"side_menu_action_settings" = "設定";
+"room_intro_cell_information_dm_sentence1_part3" = ". ";
+"room_intro_cell_information_room_sentence1_part3" = ". ";
+"call_transfer_error_title" = "錯誤";
+"call_transfer_contacts_all" = "全部";
+"call_transfer_contacts_recent" = "最近";
+"call_transfer_users" = "使用者";
+
+// MARK: - Call Transfer
+"call_transfer_title" = "傳輸";
+"room_info_list_section_other" = "其他";
+"create_room_placeholder_topic" = "主題";
+"create_room_placeholder_name" = "名稱";
+"biometrics_cant_unlocked_alert_message_retry" = "重試";
+"pin_protection_reset_alert_action_reset" = "重設";
+"pin_protection_choose_pin_welcome_after_register" = "歡迎。";
+"secrets_reset_reset_action" = "重設";
+"secrets_setup_recovery_passphrase_confirm_passphrase_title" = "確認";
+"secrets_setup_recovery_passphrase_validate_action" = "完成";
+"room_message_editing" = "正在編輯";
+"secrets_setup_recovery_key_done_action" = "完成";
+"secrets_setup_recovery_key_export_action" = "儲存";
+"secrets_setup_recovery_key_loading" = "正在載入…";
+"secrets_recovery_with_key_recovery_key_title" = "輸入";
+"secrets_recovery_with_passphrase_lost_passphrase_action_part3" = ".";
+"secrets_recovery_with_passphrase_passphrase_title" = "輸入";
+"user_verification_sessions_list_table_title" = "工作階段";
+"user_verification_sessions_list_user_trust_level_unknown_title" = "未知";
+"user_verification_sessions_list_user_trust_level_warning_title" = "警告";
+
+// MARK: - Key Verification
+
+"key_verification_bootstrap_not_setup_title" = "錯誤";
+"key_verification_tile_request_incoming_approval_decline" = "拒絕";
+"key_verification_tile_request_incoming_approval_accept" = "接受";
+
+// MARK: Reaction history
+"reaction_history_title" = "反應";
+"emoji_picker_objects_category" = "物件";
+"emoji_picker_activity_category" = "活動";
+
+// MARK: Emoji picker
+"emoji_picker_title" = "反應";
+"device_verification_emoji_pin" = "釘選";
+"device_verification_emoji_folder" = "資料夾";
+"device_verification_emoji_headphones" = "耳機";
+"device_verification_emoji_anchor" = "錨";
+"device_verification_emoji_bell" = "鐘";
+"device_verification_emoji_trumpet" = "喇叭";
+"device_verification_emoji_guitar" = "吉他";
+"device_verification_emoji_ball" = "球";
+"device_verification_emoji_trophy" = "獎盃";
+"device_verification_emoji_rocket" = "火箭";
+"device_verification_emoji_aeroplane" = "飛機";
+"device_verification_emoji_bicycle" = "腳踏車";
+"device_verification_emoji_train" = "火車";
+"device_verification_emoji_flag" = "旗幟";
+"device_verification_emoji_telephone" = "電話";
+"device_verification_emoji_hammer" = "槌子";
+"device_verification_emoji_key" = "鑰匙";
+"device_verification_emoji_scissors" = "剪刀";
+"device_verification_emoji_paperclip" = "迴紋針";
+"device_verification_emoji_pencil" = "鉛筆";
+"device_verification_emoji_book" = "書";
+"device_verification_emoji_gift" = "禮物";
+"device_verification_emoji_clock" = "時鐘";
+"device_verification_emoji_hourglass" = "沙漏";
+"device_verification_emoji_umbrella" = "雨傘";
+"device_verification_emoji_santa" = "聖誕老人";
+"device_verification_emoji_glasses" = "眼鏡";
+"device_verification_emoji_hat" = "帽子";
+"device_verification_emoji_robot" = "機器人";
+"device_verification_emoji_smiley" = "笑臉";
+"device_verification_emoji_cloud" = "雲朵";
+"device_verification_emoji_apple" = "蘋果";
+"device_verification_emoji_heart" = "愛心";
+"device_verification_emoji_cake" = "蛋糕";
+"device_verification_emoji_pizza" = "披薩";
+"device_verification_emoji_corn" = "玉米";
+"device_verification_emoji_strawberry" = "草莓";
+"device_verification_emoji_banana" = "香蕉";
+"device_verification_emoji_fire" = "火";
+"device_verification_emoji_moon" = "月亮";
+"device_verification_emoji_mushroom" = "蘑菇";
+"device_verification_emoji_cactus" = "仙人掌";
+"device_verification_emoji_tree" = "樹";
+"device_verification_emoji_flower" = "花";
+"device_verification_emoji_butterfly" = "蝴蝶";
+"device_verification_emoji_octopus" = "章魚";
+"device_verification_emoji_fish" = "魚";
+"device_verification_emoji_turtle" = "烏龜";
+"device_verification_emoji_penguin" = "企鵝";
+"device_verification_emoji_rooster" = "公雞";
+"device_verification_emoji_panda" = "熊貓";
+"device_verification_emoji_rabbit" = "兔子";
+"device_verification_emoji_elephant" = "大象";
+"device_verification_emoji_pig" = "豬";
+"device_verification_emoji_unicorn" = "獨角獸";
+"device_verification_emoji_horse" = "馬";
+"device_verification_emoji_lion" = "獅子";
+"device_verification_emoji_cat" = "貓";
+
+// MARK: Emoji
+"device_verification_emoji_dog" = "狗";
+"sign_out_non_existing_key_backup_sign_out_confirmation_alert_backup_action" = "備份";
+"sign_out_non_existing_key_backup_sign_out_confirmation_alert_sign_out_action" = "登出";
+"sign_out_existing_key_backup_alert_sign_out_action" = "登出";
+
+// MARK: Sign out warning
+
+"sign_out_existing_key_backup_alert_title" = "您確定要登出嗎？";
+"key_backup_recover_done_action" = "完成";
+"key_backup_recover_from_recovery_key_recovery_key_title" = "輸入";
+"key_backup_recover_from_passphrase_lost_passphrase_action_part3" = ".";
+"key_backup_recover_from_passphrase_passphrase_title" = "輸入";
+"key_backup_setup_success_from_passphrase_done_action" = "完成";
+
+// Success
+
+"key_backup_setup_success_title" = "成功！";
+"key_backup_setup_passphrase_confirm_passphrase_title" = "確認";
+"key_backup_setup_passphrase_passphrase_title" = "輸入";
+"key_backup_setup_intro_manual_export_action" = "手動匯出金鑰";
+"key_backup_setup_intro_manual_export_info" = "(進階)";
+"key_backup_setup_skip_alert_skip_action" = "略過";
+"key_backup_setup_skip_alert_title" = "您確定嗎？";
+"service_terms_modal_decline_button" = "拒絕";
+"service_terms_modal_accept_button" = "接受";
+"room_widget_permission_room_id_permission" = "房間 ID";
+"room_widget_permission_widget_id_permission" = "小工具 ID";
+"room_widget_permission_theme_permission" = "您的主題";
+"room_widget_permission_user_id_permission" = "您的使用者 ID";
+"room_widget_permission_display_name_permission" = "您的顯示名稱";
+
+// Room widget permissions
+"room_widget_permission_title" = "載入小工具";
+"widget_menu_open_outside" = "在瀏覽器開啟";
+"widget_menu_refresh" = "重新整理";
+"bug_report_background_mode" = "在背景繼續";
+"e2e_key_backup_wrong_version_button_settings" = "設定";
+"call_actions_unhold" = "繼續";
+"room_does_not_exist" = "%@ 不存在";
+"event_formatter_group_call_leave" = "離開";
+"event_formatter_group_call_join" = "加入";
+"event_formatter_group_call" = "群組通話";
+"event_formatter_call_end_call" = "結束通話";
+"event_formatter_call_retry" = "重試";
+"event_formatter_call_answer" = "接聽";
+"event_formatter_call_back" = "回撥";
+"event_formatter_call_has_ended" = "通話結束";
+"event_formatter_call_connecting" = "正在連接…";
+"event_formatter_message_edited_mention" = "(已編輯)";
+"image_picker_action_library" = "從媒體庫挑選";
+
+// Image picker
+"image_picker_action_camera" = "拍照";
+
+// Media picker
+"media_picker_title" = "媒體庫";
+"room_notifs_settings_account_settings" = "帳號設定";
+"room_notifs_settings_cancel_action" = "取消";
+"room_notifs_settings_done_action" = "完成";
+"room_notifs_settings_none" = "無";
+"room_notifs_settings_all_messages" = "所有訊息";
+"room_details_notifs" = "通知";
+"room_details_room_name_for_dm" = "名稱";
+"room_details_photo_for_dm" = "照片";
+"room_details_title_for_dm" = "詳細資訊";
+"identity_server_settings_alert_disconnect_still_sharing_3pid_button" = "仍要斷開連接";
+"identity_server_settings_alert_disconnect_button" = "斷開連接";
+"identity_server_settings_disconnect" = "斷開連接";
+"identity_server_settings_change" = "修改";
+"identity_server_settings_add" = "新增";
+"manage_session_name" = "工作階段名稱";
+"manage_session_info" = "工作階段資訊";
+
+// Manage session
+"manage_session_title" = "管理工作階段";
+"security_settings_advanced" = "進階";
+"security_settings_crosssigning_reset" = "重設";
+"security_settings_secure_backup_delete" = "刪除備份";
+"security_settings_secure_backup_reset" = "重設";
+"security_settings_secure_backup_info_checking" = "正在檢查…";
+"security_settings_crypto_sessions_loading" = "正在載入工作階段…";
+
+// Security settings
+"security_settings_title" = "安全性";
+"settings_discovery_three_pid_details_share_action" = "分享";
+"settings_discovery_three_pid_details_title_phone_number" = "管理電話號碼";
+"settings_discovery_three_pid_details_title_email" = "管理電子郵件";
+"settings_discovery_error_message" = "發生錯誤。請重試。";
+"settings_discovery_three_pids_management_information_part3" = ".";
+"settings_discovery_three_pids_management_information_part2" = "使用者設定";
+"settings_key_backup_delete_confirmation_prompt_title" = "刪除備份";
+"settings_key_backup_button_delete" = "刪除備份";
+"settings_key_backup_info_algorithm" = "演算法：%@";
+"settings_key_backup_info_checking" = "正在檢查…";
+"settings_add_3pid_password_title_msidsn" = "新增電話號碼";
+"settings_add_3pid_password_title_email" = "新增電子郵件地址";
+"settings_new_keyword" = "新增關鍵字";
+"settings_your_keywords" = "您的關鍵字";
+"settings_messages_by_a_bot" = "機器人傳送的訊息";
+"settings_messages_containing_keywords" = "關鍵字";
+"settings_messages_containing_user_name" = "我的使用者名稱";
+"settings_messages_containing_display_name" = "我的顯示名稱";
+"settings_encrypted_group_messages" = "加密群組訊息";
+"settings_group_messages" = "群組訊息";
+"settings_encrypted_direct_messages" = "加密私人訊息";
+"settings_direct_messages" = "私人訊息";
+"settings_default" = "預設通知";
+"settings_notifications_disabled_alert_title" = "已停用通知";
+"settings_device_notifications" = "裝置通知";
+"settings_three_pids_management_information_part3" = ".";
+"room_join_group_call" = "加入";
+"room_place_voice_call" = "語音通話";
+"room_accessibility_video_call" = "視訊通話";
+"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" = "或";
+"callbar_return" = "返回";
+"done" = "完成";
+"open" = "開啟";
diff --git a/Riot/Categories/MXGroup+Riot.h b/Riot/Categories/MXGroup+Riot.h
index 0d1beb543..76b1e76e5 100644
--- a/Riot/Categories/MXGroup+Riot.h
+++ b/Riot/Categories/MXGroup+Riot.h
@@ -14,7 +14,8 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import <MatrixSDK/MatrixSDK.h>
+#import "MatrixKit.h"
 
 /**
  Define a `MXGroup` category at Riot level.
diff --git a/Riot/Categories/MXKRoomBubbleTableViewCell+Riot.h b/Riot/Categories/MXKRoomBubbleTableViewCell+Riot.h
index 91b69a123..24a0ff136 100644
--- a/Riot/Categories/MXKRoomBubbleTableViewCell+Riot.h
+++ b/Riot/Categories/MXKRoomBubbleTableViewCell+Riot.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @class CircleProgressView;
 
@@ -39,11 +39,6 @@ extern NSString *const kMXKRoomBubbleCellTapOnReceiptsContainer;
  */
 extern NSString *const kMXKRoomBubbleCellLongPressOnReactionView;
 
-/**
- 'userInfo' dictionary key 'kMXKRoomBubbleCellEventIdKey' is associated to a 'NSString' object representing an event id.
- */
-extern NSString *const kMXKRoomBubbleCellEventIdKey;
-
 /**
  Action identifier used when the user pressed accept button for an incoming key verification request.
  
diff --git a/Riot/Categories/MXKRoomBubbleTableViewCell+Riot.m b/Riot/Categories/MXKRoomBubbleTableViewCell+Riot.m
index 11a0fa5a1..2d2a0dbfc 100644
--- a/Riot/Categories/MXKRoomBubbleTableViewCell+Riot.m
+++ b/Riot/Categories/MXKRoomBubbleTableViewCell+Riot.m
@@ -17,20 +17,19 @@
 
 #import "MXKRoomBubbleTableViewCell+Riot.h"
 
-#import "RoomBubbleCellData.h"
-
-#import "ThemeService.h"
-#import "Riot-Swift.h"
-
 #import <objc/runtime.h>
 
+#import "RoomBubbleCellData.h"
+#import "ThemeService.h"
+
+#import "GeneratedInterface-Swift.h"
+
 #define VECTOR_ROOMBUBBLETABLEVIEWCELL_MARK_X 48
 #define VECTOR_ROOMBUBBLETABLEVIEWCELL_MARK_WIDTH 4
 
 NSString *const kMXKRoomBubbleCellRiotEditButtonPressed = @"kMXKRoomBubbleCellRiotEditButtonPressed";
 NSString *const kMXKRoomBubbleCellTapOnReceiptsContainer = @"kMXKRoomBubbleCellTapOnReceiptsContainer";
 NSString *const kMXKRoomBubbleCellLongPressOnReactionView = @"kMXKRoomBubbleCellLongPressOnReactionView";
-NSString *const kMXKRoomBubbleCellEventIdKey = @"kMXKRoomBubbleCellEventIdKey";
 NSString *const kMXKRoomBubbleCellKeyVerificationIncomingRequestAcceptPressed = @"kMXKRoomBubbleCellKeyVerificationAcceptPressed";
 NSString *const kMXKRoomBubbleCellKeyVerificationIncomingRequestDeclinePressed = @"kMXKRoomBubbleCellKeyVerificationDeclinePressed";
 
diff --git a/Riot/Categories/MXRoom+Riot.h b/Riot/Categories/MXRoom+Riot.h
index 42a6a6c01..e57cd21a2 100644
--- a/Riot/Categories/MXRoom+Riot.h
+++ b/Riot/Categories/MXRoom+Riot.h
@@ -15,9 +15,8 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
-
 #import "UserEncryptionTrustLevel.h"
+#import <MatrixSDK/MatrixSDK.h>
 
 /**
  Define a `MXRoom` category at Riot level.
diff --git a/Riot/Categories/MXRoom+Riot.m b/Riot/Categories/MXRoom+Riot.m
index 5bef645be..801221597 100644
--- a/Riot/Categories/MXRoom+Riot.m
+++ b/Riot/Categories/MXRoom+Riot.m
@@ -19,6 +19,7 @@
 #import "MXRoom+Riot.h"
 
 #import "AvatarGenerator.h"
+#import "MatrixKit.h"
 
 #import <objc/runtime.h>
 
diff --git a/Riot/Categories/MXRoomSummary+Riot.h b/Riot/Categories/MXRoomSummary+Riot.h
index 0ae7c7359..d25cdee5f 100644
--- a/Riot/Categories/MXRoomSummary+Riot.h
+++ b/Riot/Categories/MXRoomSummary+Riot.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  RoomEncryptionTrustLevel represents the trust level in an encrypted room.
diff --git a/Riot/Categories/MXRoomSummary+Riot.m b/Riot/Categories/MXRoomSummary+Riot.m
index 7a83d1d40..3ad3bef65 100644
--- a/Riot/Categories/MXRoomSummary+Riot.m
+++ b/Riot/Categories/MXRoomSummary+Riot.m
@@ -19,11 +19,7 @@
 
 #import "AvatarGenerator.h"
 
-#ifdef IS_SHARE_EXTENSION
-#import "RiotShareExtension-Swift.h"
-#else
-#import "Riot-Swift.h"
-#endif
+#import "GeneratedInterface-Swift.h"
 
 @implementation MXRoomSummary (Riot)
 
diff --git a/Riot/Categories/MXSession+Riot.m b/Riot/Categories/MXSession+Riot.m
index 901c58406..faf32bd01 100644
--- a/Riot/Categories/MXSession+Riot.m
+++ b/Riot/Categories/MXSession+Riot.m
@@ -17,7 +17,7 @@
 #import "MXSession+Riot.h"
 
 #import "MXRoom+Riot.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @implementation MXSession (Riot)
 
@@ -65,6 +65,7 @@
     }
     else
     {
+        MXLogWarning(@"[MXSession] E2EE is disabled by default on this homeserver.\nWellknown content: %@", self.homeserverWellknown.JSONDictionary);
         success(NO);
         return [MXHTTPOperation new];
     }
diff --git a/Riot/Categories/UINavigationController+Riot.h b/Riot/Categories/UINavigationController+Riot.h
index e5632e7d7..6e82c2b3e 100644
--- a/Riot/Categories/UINavigationController+Riot.h
+++ b/Riot/Categories/UINavigationController+Riot.h
@@ -15,12 +15,12 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
-
 /**
  The `UINavigationController` category overrides the default auto rotation handling.
  */
 
+#import <UIKit/UIKit.h>
+
 @interface UINavigationController (Riot)
 
 @end
diff --git a/Riot/Categories/UIViewController+RiotSearch.h b/Riot/Categories/UIViewController+RiotSearch.h
index fd077f18d..db29e0183 100644
--- a/Riot/Categories/UIViewController+RiotSearch.h
+++ b/Riot/Categories/UIViewController+RiotSearch.h
@@ -15,12 +15,12 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
-
 /**
  The `RiotSearch` category adds the management of the search bar in Riot screens.
  */
 
+#import <UIKit/UIKit.h>
+
 @interface UIViewController (RiotSearch) <UISearchBarDelegate>
 
 /**
diff --git a/Riot/Categories/UIViewController+RiotSearch.m b/Riot/Categories/UIViewController+RiotSearch.m
index 73b14b55f..09b7896b3 100644
--- a/Riot/Categories/UIViewController+RiotSearch.m
+++ b/Riot/Categories/UIViewController+RiotSearch.m
@@ -20,7 +20,7 @@
 #import <objc/runtime.h>
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 /**
  `UIViewControllerRiotSearchInternals` is the internal single point storage for the search feature.
diff --git a/Riot/Common.xcconfig b/Riot/Common.xcconfig
index 312fc83fe..b25a82689 100644
--- a/Riot/Common.xcconfig
+++ b/Riot/Common.xcconfig
@@ -30,3 +30,5 @@ CODE_SIGN_ENTITLEMENTS = Riot/SupportingFiles/Riot.entitlements
 
 SWIFT_OBJC_BRIDGING_HEADER = $(SRCROOT)/$(PRODUCT_NAME)/SupportingFiles/Riot-Bridging-Header.h
 LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks
+
+SWIFT_OBJC_INTERFACE_HEADER_NAME = GeneratedInterface-Swift.h
diff --git a/Riot/Generated/Images.swift b/Riot/Generated/Images.swift
index cd4a5b92e..70ad1b32e 100644
--- a/Riot/Generated/Images.swift
+++ b/Riot/Generated/Images.swift
@@ -20,6 +20,8 @@ internal typealias AssetImageTypeAlias = ImageAsset.Image
 // swiftlint:disable identifier_name line_length nesting type_body_length type_name
 internal enum Asset {
   internal enum Images {
+    internal static let analyticsCheckmark = ImageAsset(name: "AnalyticsCheckmark")
+    internal static let analyticsLogo = ImageAsset(name: "AnalyticsLogo")
     internal static let socialLoginButtonApple = ImageAsset(name: "social_login_button_apple")
     internal static let socialLoginButtonFacebook = ImageAsset(name: "social_login_button_facebook")
     internal static let socialLoginButtonGithub = ImageAsset(name: "social_login_button_github")
@@ -114,6 +116,7 @@ internal enum Asset {
     internal static let actionCamera = ImageAsset(name: "action_camera")
     internal static let actionFile = ImageAsset(name: "action_file")
     internal static let actionMediaLibrary = ImageAsset(name: "action_media_library")
+    internal static let actionPoll = ImageAsset(name: "action_poll")
     internal static let actionSticker = ImageAsset(name: "action_sticker")
     internal static let error = ImageAsset(name: "error")
     internal static let errorMessageTick = ImageAsset(name: "error_message_tick")
@@ -142,6 +145,13 @@ internal enum Asset {
     internal static let videoCall = ImageAsset(name: "video_call")
     internal static let voiceCallHangonIcon = ImageAsset(name: "voice_call_hangon_icon")
     internal static let voiceCallHangupIcon = ImageAsset(name: "voice_call_hangup_icon")
+    internal static let pollCheckboxDefault = ImageAsset(name: "poll_checkbox_default")
+    internal static let pollCheckboxSelected = ImageAsset(name: "poll_checkbox_selected")
+    internal static let pollDeleteIcon = ImageAsset(name: "poll_delete_icon")
+    internal static let pollDeleteOptionIcon = ImageAsset(name: "poll_delete_option_icon")
+    internal static let pollEditIcon = ImageAsset(name: "poll_edit_icon")
+    internal static let pollEndIcon = ImageAsset(name: "poll_end_icon")
+    internal static let pollWinnerIcon = ImageAsset(name: "poll_winner_icon")
     internal static let urlPreviewClose = ImageAsset(name: "url_preview_close")
     internal static let urlPreviewCloseDark = ImageAsset(name: "url_preview_close_dark")
     internal static let voiceMessageCancelGradient = ImageAsset(name: "voice_message_cancel_gradient")
diff --git a/Riot/Generated/MatrixKitStrings.swift b/Riot/Generated/MatrixKitStrings.swift
new file mode 100644
index 000000000..e5c1e7f31
--- /dev/null
+++ b/Riot/Generated/MatrixKitStrings.swift
@@ -0,0 +1,1790 @@
+// swiftlint:disable all
+// Generated using SwiftGen, by O.Halligon — https://github.com/SwiftGen/SwiftGen
+
+import Foundation
+
+// swiftlint:disable superfluous_disable_command
+// swiftlint:disable file_length
+
+// MARK: - Strings
+
+// swiftlint:disable function_parameter_count identifier_name line_length type_body_length
+@objcMembers
+public class MatrixKitL10n: NSObject {
+  /// Abort
+  public static var abort: String { 
+    return MatrixKitL10n.tr("abort") 
+  }
+  /// Unable to verify email address. Please check your email and click on the link it contains. Once this is done, click continue
+  public static var accountEmailValidationError: String { 
+    return MatrixKitL10n.tr("account_email_validation_error") 
+  }
+  /// Please check your email and click on the link it contains. Once this is done, click continue.
+  public static var accountEmailValidationMessage: String { 
+    return MatrixKitL10n.tr("account_email_validation_message") 
+  }
+  /// Verification Pending
+  public static var accountEmailValidationTitle: String { 
+    return MatrixKitL10n.tr("account_email_validation_title") 
+  }
+  /// Display name change failed
+  public static var accountErrorDisplayNameChangeFailed: String { 
+    return MatrixKitL10n.tr("account_error_display_name_change_failed") 
+  }
+  /// This doesn't appear to be a valid email address
+  public static var accountErrorEmailWrongDescription: String { 
+    return MatrixKitL10n.tr("account_error_email_wrong_description") 
+  }
+  /// Invalid Email Address
+  public static var accountErrorEmailWrongTitle: String { 
+    return MatrixKitL10n.tr("account_error_email_wrong_title") 
+  }
+  /// Matrix session is not opened
+  public static var accountErrorMatrixSessionIsNotOpened: String { 
+    return MatrixKitL10n.tr("account_error_matrix_session_is_not_opened") 
+  }
+  /// This doesn't appear to be a valid phone number
+  public static var accountErrorMsisdnWrongDescription: String { 
+    return MatrixKitL10n.tr("account_error_msisdn_wrong_description") 
+  }
+  /// Invalid Phone Number
+  public static var accountErrorMsisdnWrongTitle: String { 
+    return MatrixKitL10n.tr("account_error_msisdn_wrong_title") 
+  }
+  /// Picture change failed
+  public static var accountErrorPictureChangeFailed: String { 
+    return MatrixKitL10n.tr("account_error_picture_change_failed") 
+  }
+  /// Notifications not allowed
+  public static var accountErrorPushNotAllowed: String { 
+    return MatrixKitL10n.tr("account_error_push_not_allowed") 
+  }
+  /// Link Email
+  public static var accountLinkEmail: String { 
+    return MatrixKitL10n.tr("account_link_email") 
+  }
+  /// Linked emails
+  public static var accountLinkedEmails: String { 
+    return MatrixKitL10n.tr("account_linked_emails") 
+  }
+  /// Unable to verify phone number.
+  public static var accountMsisdnValidationError: String { 
+    return MatrixKitL10n.tr("account_msisdn_validation_error") 
+  }
+  /// We've sent an SMS with an activation code. Please enter this code below.
+  public static var accountMsisdnValidationMessage: String { 
+    return MatrixKitL10n.tr("account_msisdn_validation_message") 
+  }
+  /// Verification Pending
+  public static var accountMsisdnValidationTitle: String { 
+    return MatrixKitL10n.tr("account_msisdn_validation_title") 
+  }
+  /// Save changes
+  public static var accountSaveChanges: String { 
+    return MatrixKitL10n.tr("account_save_changes") 
+  }
+  /// Logout
+  public static var actionLogout: String { 
+    return MatrixKitL10n.tr("action_logout") 
+  }
+  /// Answer Call
+  public static var answerCall: String { 
+    return MatrixKitL10n.tr("answer_call") 
+  }
+  /// Attach Media from Library
+  public static var attachMedia: String { 
+    return MatrixKitL10n.tr("attach_media") 
+  }
+  /// Cancel the download?
+  public static var attachmentCancelDownload: String { 
+    return MatrixKitL10n.tr("attachment_cancel_download") 
+  }
+  /// Cancel the upload?
+  public static var attachmentCancelUpload: String { 
+    return MatrixKitL10n.tr("attachment_cancel_upload") 
+  }
+  /// This file contains encryption keys exported from a Matrix client.\nDo you want to view the file content or import the keys it contains?
+  public static var attachmentE2eKeysFilePrompt: String { 
+    return MatrixKitL10n.tr("attachment_e2e_keys_file_prompt") 
+  }
+  /// Import...
+  public static var attachmentE2eKeysImport: String { 
+    return MatrixKitL10n.tr("attachment_e2e_keys_import") 
+  }
+  /// Large (~%@)
+  public static func attachmentLarge(_ p1: String) -> String {
+    return MatrixKitL10n.tr("attachment_large", p1)
+  }
+  /// Large %@ (~%@)
+  public static func attachmentLargeWithResolution(_ p1: String, _ p2: String) -> String {
+    return MatrixKitL10n.tr("attachment_large_with_resolution", p1, p2)
+  }
+  /// Medium (~%@)
+  public static func attachmentMedium(_ p1: String) -> String {
+    return MatrixKitL10n.tr("attachment_medium", p1)
+  }
+  /// Medium %@ (~%@)
+  public static func attachmentMediumWithResolution(_ p1: String, _ p2: String) -> String {
+    return MatrixKitL10n.tr("attachment_medium_with_resolution", p1, p2)
+  }
+  /// Actual Size
+  public static var attachmentMultiselectionOriginal: String { 
+    return MatrixKitL10n.tr("attachment_multiselection_original") 
+  }
+  /// Do you want to send images as:
+  public static var attachmentMultiselectionSizePrompt: String { 
+    return MatrixKitL10n.tr("attachment_multiselection_size_prompt") 
+  }
+  /// Actual Size (%@)
+  public static func attachmentOriginal(_ p1: String) -> String {
+    return MatrixKitL10n.tr("attachment_original", p1)
+  }
+  /// Do you want to send as:
+  public static var attachmentSizePrompt: String { 
+    return MatrixKitL10n.tr("attachment_size_prompt") 
+  }
+  /// You can turn this off in settings.
+  public static var attachmentSizePromptMessage: String { 
+    return MatrixKitL10n.tr("attachment_size_prompt_message") 
+  }
+  /// Confirm size to send
+  public static var attachmentSizePromptTitle: String { 
+    return MatrixKitL10n.tr("attachment_size_prompt_title") 
+  }
+  /// Small (~%@)
+  public static func attachmentSmall(_ p1: String) -> String {
+    return MatrixKitL10n.tr("attachment_small", p1)
+  }
+  /// Small %@ (~%@)
+  public static func attachmentSmallWithResolution(_ p1: String, _ p2: String) -> String {
+    return MatrixKitL10n.tr("attachment_small_with_resolution", p1, p2)
+  }
+  /// This file type is not supported.
+  public static var attachmentUnsupportedPreviewMessage: String { 
+    return MatrixKitL10n.tr("attachment_unsupported_preview_message") 
+  }
+  /// Unable to preview
+  public static var attachmentUnsupportedPreviewTitle: String { 
+    return MatrixKitL10n.tr("attachment_unsupported_preview_title") 
+  }
+  /// Invalid username
+  public static var authInvalidUserName: String { 
+    return MatrixKitL10n.tr("auth_invalid_user_name") 
+  }
+  /// Not found
+  public static var authResetPasswordErrorNotFound: String { 
+    return MatrixKitL10n.tr("auth_reset_password_error_not_found") 
+  }
+  /// Unauthorized
+  public static var authResetPasswordErrorUnauthorized: String { 
+    return MatrixKitL10n.tr("auth_reset_password_error_unauthorized") 
+  }
+  /// Username in use
+  public static var authUsernameInUse: String { 
+    return MatrixKitL10n.tr("auth_username_in_use") 
+  }
+  /// Back
+  public static var back: String { 
+    return MatrixKitL10n.tr("back") 
+  }
+  /// Ban
+  public static var ban: String { 
+    return MatrixKitL10n.tr("ban") 
+  }
+  /// Connecting…
+  public static var callConnecting: String { 
+    return MatrixKitL10n.tr("call_connecting") 
+  }
+  /// Consulting with %@
+  public static func callConsultingWithUser(_ p1: String) -> String {
+    return MatrixKitL10n.tr("call_consulting_with_user", p1)
+  }
+  /// Call ended
+  public static var callEnded: String { 
+    return MatrixKitL10n.tr("call_ended") 
+  }
+  /// You held the call
+  public static var callHolded: String { 
+    return MatrixKitL10n.tr("call_holded") 
+  }
+  /// Call Invite Expired
+  public static var callInviteExpired: String { 
+    return MatrixKitL10n.tr("call_invite_expired") 
+  }
+  /// Device Speaker
+  public static var callMoreActionsAudioUseDevice: String { 
+    return MatrixKitL10n.tr("call_more_actions_audio_use_device") 
+  }
+  /// Change Audio Device
+  public static var callMoreActionsChangeAudioDevice: String { 
+    return MatrixKitL10n.tr("call_more_actions_change_audio_device") 
+  }
+  /// Dial pad
+  public static var callMoreActionsDialpad: String { 
+    return MatrixKitL10n.tr("call_more_actions_dialpad") 
+  }
+  /// Hold
+  public static var callMoreActionsHold: String { 
+    return MatrixKitL10n.tr("call_more_actions_hold") 
+  }
+  /// Transfer
+  public static var callMoreActionsTransfer: String { 
+    return MatrixKitL10n.tr("call_more_actions_transfer") 
+  }
+  /// Resume
+  public static var callMoreActionsUnhold: String { 
+    return MatrixKitL10n.tr("call_more_actions_unhold") 
+  }
+  /// %@ held the call
+  public static func callRemoteHolded(_ p1: String) -> String {
+    return MatrixKitL10n.tr("call_remote_holded", p1)
+  }
+  /// Ringing…
+  public static var callRinging: String { 
+    return MatrixKitL10n.tr("call_ringing") 
+  }
+  /// Transfer to %@
+  public static func callTransferToUser(_ p1: String) -> String {
+    return MatrixKitL10n.tr("call_transfer_to_user", p1)
+  }
+  /// Video call with %@
+  public static func callVideoWithUser(_ p1: String) -> String {
+    return MatrixKitL10n.tr("call_video_with_user", p1)
+  }
+  /// Voice call with %@
+  public static func callVoiceWithUser(_ p1: String) -> String {
+    return MatrixKitL10n.tr("call_voice_with_user", p1)
+  }
+  /// Video calls require access to the Camera but %@ doesn't have permission to use it
+  public static func cameraAccessNotGrantedForCall(_ p1: String) -> String {
+    return MatrixKitL10n.tr("camera_access_not_granted_for_call", p1)
+  }
+  /// Cancel
+  public static var cancel: String { 
+    return MatrixKitL10n.tr("cancel") 
+  }
+  /// Cancel Download
+  public static var cancelDownload: String { 
+    return MatrixKitL10n.tr("cancel_download") 
+  }
+  /// Cancel Upload
+  public static var cancelUpload: String { 
+    return MatrixKitL10n.tr("cancel_upload") 
+  }
+  /// Take Photo/Video
+  public static var captureMedia: String { 
+    return MatrixKitL10n.tr("capture_media") 
+  }
+  /// Close
+  public static var close: String { 
+    return MatrixKitL10n.tr("close") 
+  }
+  /// Local Contacts
+  public static var contactLocalContacts: String { 
+    return MatrixKitL10n.tr("contact_local_contacts") 
+  }
+  /// Matrix Users
+  public static var contactMxUsers: String { 
+    return MatrixKitL10n.tr("contact_mx_users") 
+  }
+  /// Continue
+  public static var `continue`: String { 
+    return MatrixKitL10n.tr("continue") 
+  }
+  /// Copy
+  public static var copyButtonName: String { 
+    return MatrixKitL10n.tr("copy_button_name") 
+  }
+  /// Choose a country
+  public static var countryPickerTitle: String { 
+    return MatrixKitL10n.tr("country_picker_title") 
+  }
+  /// Create Account
+  public static var createAccount: String { 
+    return MatrixKitL10n.tr("create_account") 
+  }
+  /// Create Room
+  public static var createRoom: String { 
+    return MatrixKitL10n.tr("create_room") 
+  }
+  /// default
+  public static var `default`: String { 
+    return MatrixKitL10n.tr("default") 
+  }
+  /// Delete
+  public static var delete: String { 
+    return MatrixKitL10n.tr("delete") 
+  }
+  /// This operation requires additional authentication.\nTo continue, please enter your password.
+  public static var deviceDetailsDeletePromptMessage: String { 
+    return MatrixKitL10n.tr("device_details_delete_prompt_message") 
+  }
+  /// Authentication
+  public static var deviceDetailsDeletePromptTitle: String { 
+    return MatrixKitL10n.tr("device_details_delete_prompt_title") 
+  }
+  /// ID\n
+  public static var deviceDetailsIdentifier: String { 
+    return MatrixKitL10n.tr("device_details_identifier") 
+  }
+  /// Last seen\n
+  public static var deviceDetailsLastSeen: String { 
+    return MatrixKitL10n.tr("device_details_last_seen") 
+  }
+  /// %@ @ %@\n
+  public static func deviceDetailsLastSeenFormat(_ p1: String, _ p2: String) -> String {
+    return MatrixKitL10n.tr("device_details_last_seen_format", p1, p2)
+  }
+  /// Public Name\n
+  public static var deviceDetailsName: String { 
+    return MatrixKitL10n.tr("device_details_name") 
+  }
+  /// A session's public name is visible to people you communicate with
+  public static var deviceDetailsRenamePromptMessage: String { 
+    return MatrixKitL10n.tr("device_details_rename_prompt_message") 
+  }
+  /// Session Name
+  public static var deviceDetailsRenamePromptTitle: String { 
+    return MatrixKitL10n.tr("device_details_rename_prompt_title") 
+  }
+  /// Session information\n
+  public static var deviceDetailsTitle: String { 
+    return MatrixKitL10n.tr("device_details_title") 
+  }
+  /// Discard
+  public static var discard: String { 
+    return MatrixKitL10n.tr("discard") 
+  }
+  /// Dismiss
+  public static var dismiss: String { 
+    return MatrixKitL10n.tr("dismiss") 
+  }
+  /// Export
+  public static var e2eExport: String { 
+    return MatrixKitL10n.tr("e2e_export") 
+  }
+  /// This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.\nThe exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure.
+  public static var e2eExportPrompt: String { 
+    return MatrixKitL10n.tr("e2e_export_prompt") 
+  }
+  /// Export room keys
+  public static var e2eExportRoomKeys: String { 
+    return MatrixKitL10n.tr("e2e_export_room_keys") 
+  }
+  /// Import
+  public static var e2eImport: String { 
+    return MatrixKitL10n.tr("e2e_import") 
+  }
+  /// This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.\nThe export file is protected with a passphrase. You should enter the passphrase here, to decrypt the file.
+  public static var e2eImportPrompt: String { 
+    return MatrixKitL10n.tr("e2e_import_prompt") 
+  }
+  /// Import room keys
+  public static var e2eImportRoomKeys: String { 
+    return MatrixKitL10n.tr("e2e_import_room_keys") 
+  }
+  /// Confirm passphrase
+  public static var e2ePassphraseConfirm: String { 
+    return MatrixKitL10n.tr("e2e_passphrase_confirm") 
+  }
+  /// Create passphrase
+  public static var e2ePassphraseCreate: String { 
+    return MatrixKitL10n.tr("e2e_passphrase_create") 
+  }
+  /// Passphrase must not be empty
+  public static var e2ePassphraseEmpty: String { 
+    return MatrixKitL10n.tr("e2e_passphrase_empty") 
+  }
+  /// Enter passphrase
+  public static var e2ePassphraseEnter: String { 
+    return MatrixKitL10n.tr("e2e_passphrase_enter") 
+  }
+  /// Passphrases must match
+  public static var e2ePassphraseNotMatch: String { 
+    return MatrixKitL10n.tr("e2e_passphrase_not_match") 
+  }
+  /// Passphrase too short (It must be at a minimum %d characters in length)
+  public static func e2ePassphraseTooShort(_ p1: Int) -> String {
+    return MatrixKitL10n.tr("e2e_passphrase_too_short", p1)
+  }
+  /// End Call
+  public static var endCall: String { 
+    return MatrixKitL10n.tr("end_call") 
+  }
+  /// Error
+  public static var error: String { 
+    return MatrixKitL10n.tr("error") 
+  }
+  /// An error occured. Please try again later.
+  public static var errorCommonMessage: String { 
+    return MatrixKitL10n.tr("error_common_message") 
+  }
+  /// d
+  public static var formatTimeD: String { 
+    return MatrixKitL10n.tr("format_time_d") 
+  }
+  /// h
+  public static var formatTimeH: String { 
+    return MatrixKitL10n.tr("format_time_h") 
+  }
+  /// m
+  public static var formatTimeM: String { 
+    return MatrixKitL10n.tr("format_time_m") 
+  }
+  /// s
+  public static var formatTimeS: String { 
+    return MatrixKitL10n.tr("format_time_s") 
+  }
+  /// Invites
+  public static var groupInviteSection: String { 
+    return MatrixKitL10n.tr("group_invite_section") 
+  }
+  /// Groups
+  public static var groupSection: String { 
+    return MatrixKitL10n.tr("group_section") 
+  }
+  /// Ignore
+  public static var ignore: String { 
+    return MatrixKitL10n.tr("ignore") 
+  }
+  /// Incoming Video Call
+  public static var incomingVideoCall: String { 
+    return MatrixKitL10n.tr("incoming_video_call") 
+  }
+  /// Incoming Voice Call
+  public static var incomingVoiceCall: String { 
+    return MatrixKitL10n.tr("incoming_voice_call") 
+  }
+  /// I'd like to chat with you with matrix. Please, visit the website http://matrix.org to have more information.
+  public static var invitationMessage: String { 
+    return MatrixKitL10n.tr("invitation_message") 
+  }
+  /// Invite
+  public static var invite: String { 
+    return MatrixKitL10n.tr("invite") 
+  }
+  /// Invite matrix User
+  public static var inviteUser: String { 
+    return MatrixKitL10n.tr("invite_user") 
+  }
+  /// Kick
+  public static var kick: String { 
+    return MatrixKitL10n.tr("kick") 
+  }
+  /// Default (%@)
+  public static func languagePickerDefaultLanguage(_ p1: String) -> String {
+    return MatrixKitL10n.tr("language_picker_default_language", p1)
+  }
+  /// Choose a language
+  public static var languagePickerTitle: String { 
+    return MatrixKitL10n.tr("language_picker_title") 
+  }
+  /// Leave
+  public static var leave: String { 
+    return MatrixKitL10n.tr("leave") 
+  }
+  /// To discover contacts already using Matrix, %@ can send email addresses and phone numbers in your address book to your chosen Matrix identity server. Where supported, personal data is hashed before sending - please check your identity server's privacy policy for more details.
+  public static func localContactsAccessDiscoveryWarning(_ p1: String) -> String {
+    return MatrixKitL10n.tr("local_contacts_access_discovery_warning", p1)
+  }
+  /// Users discovery
+  public static var localContactsAccessDiscoveryWarningTitle: String { 
+    return MatrixKitL10n.tr("local_contacts_access_discovery_warning_title") 
+  }
+  /// Users discovery from local contacts requires access to you contacts but %@ doesn't have permission to use it
+  public static func localContactsAccessNotGranted(_ p1: String) -> String {
+    return MatrixKitL10n.tr("local_contacts_access_not_granted", p1)
+  }
+  /// Login
+  public static var login: String { 
+    return MatrixKitL10n.tr("login") 
+  }
+  /// Create account:
+  public static var loginCreateAccount: String { 
+    return MatrixKitL10n.tr("login_create_account") 
+  }
+  /// Desktop
+  public static var loginDesktopDevice: String { 
+    return MatrixKitL10n.tr("login_desktop_device") 
+  }
+  /// Display name (e.g. Bob Obson)
+  public static var loginDisplayNamePlaceholder: String { 
+    return MatrixKitL10n.tr("login_display_name_placeholder") 
+  }
+  /// Specify an email address lets other users find you on Matrix more easily, and will give you a way to reset your password in the future.
+  public static var loginEmailInfo: String { 
+    return MatrixKitL10n.tr("login_email_info") 
+  }
+  /// Email address
+  public static var loginEmailPlaceholder: String { 
+    return MatrixKitL10n.tr("login_email_placeholder") 
+  }
+  /// Already logged in
+  public static var loginErrorAlreadyLoggedIn: String { 
+    return MatrixKitL10n.tr("login_error_already_logged_in") 
+  }
+  /// Malformed JSON
+  public static var loginErrorBadJson: String { 
+    return MatrixKitL10n.tr("login_error_bad_json") 
+  }
+  /// Currently we do not support any or all login flows defined by this homeserver
+  public static var loginErrorDoNotSupportLoginFlows: String { 
+    return MatrixKitL10n.tr("login_error_do_not_support_login_flows") 
+  }
+  /// Invalid username/password
+  public static var loginErrorForbidden: String { 
+    return MatrixKitL10n.tr("login_error_forbidden") 
+  }
+  /// Forgot password is not currently supported
+  public static var loginErrorForgotPasswordIsNotSupported: String { 
+    return MatrixKitL10n.tr("login_error_forgot_password_is_not_supported") 
+  }
+  /// Too many requests have been sent
+  public static var loginErrorLimitExceeded: String { 
+    return MatrixKitL10n.tr("login_error_limit_exceeded") 
+  }
+  /// The email link which has not been clicked yet
+  public static var loginErrorLoginEmailNotYet: String { 
+    return MatrixKitL10n.tr("login_error_login_email_not_yet") 
+  }
+  /// URL must start with http[s]://
+  public static var loginErrorMustStartHttp: String { 
+    return MatrixKitL10n.tr("login_error_must_start_http") 
+  }
+  /// We failed to retrieve authentication information from this homeserver
+  public static var loginErrorNoLoginFlow: String { 
+    return MatrixKitL10n.tr("login_error_no_login_flow") 
+  }
+  /// Did not contain valid JSON
+  public static var loginErrorNotJson: String { 
+    return MatrixKitL10n.tr("login_error_not_json") 
+  }
+  /// Registration is not currently supported
+  public static var loginErrorRegistrationIsNotSupported: String { 
+    return MatrixKitL10n.tr("login_error_registration_is_not_supported") 
+  }
+  /// Contact Administrator
+  public static var loginErrorResourceLimitExceededContactButton: String { 
+    return MatrixKitL10n.tr("login_error_resource_limit_exceeded_contact_button") 
+  }
+  /// \n\nPlease contact your service administrator to continue using this service.
+  public static var loginErrorResourceLimitExceededMessageContact: String { 
+    return MatrixKitL10n.tr("login_error_resource_limit_exceeded_message_contact") 
+  }
+  /// This homeserver has exceeded one of its resource limits.
+  public static var loginErrorResourceLimitExceededMessageDefault: String { 
+    return MatrixKitL10n.tr("login_error_resource_limit_exceeded_message_default") 
+  }
+  /// This homeserver has hit its Monthly Active User limit.
+  public static var loginErrorResourceLimitExceededMessageMonthlyActiveUser: String { 
+    return MatrixKitL10n.tr("login_error_resource_limit_exceeded_message_monthly_active_user") 
+  }
+  /// Resource Limit Exceeded
+  public static var loginErrorResourceLimitExceededTitle: String { 
+    return MatrixKitL10n.tr("login_error_resource_limit_exceeded_title") 
+  }
+  /// Login Failed
+  public static var loginErrorTitle: String { 
+    return MatrixKitL10n.tr("login_error_title") 
+  }
+  /// The access token specified was not recognised
+  public static var loginErrorUnknownToken: String { 
+    return MatrixKitL10n.tr("login_error_unknown_token") 
+  }
+  /// This user name is already used
+  public static var loginErrorUserInUse: String { 
+    return MatrixKitL10n.tr("login_error_user_in_use") 
+  }
+  /// Your homeserver stores all your conversations and account data
+  public static var loginHomeServerInfo: String { 
+    return MatrixKitL10n.tr("login_home_server_info") 
+  }
+  /// Homeserver URL:
+  public static var loginHomeServerTitle: String { 
+    return MatrixKitL10n.tr("login_home_server_title") 
+  }
+  /// Matrix provides identity servers to track which emails etc. belong to which Matrix IDs. Only https://matrix.org currently exists.
+  public static var loginIdentityServerInfo: String { 
+    return MatrixKitL10n.tr("login_identity_server_info") 
+  }
+  /// Identity server URL:
+  public static var loginIdentityServerTitle: String { 
+    return MatrixKitL10n.tr("login_identity_server_title") 
+  }
+  /// Invalid parameter
+  public static var loginInvalidParam: String { 
+    return MatrixKitL10n.tr("login_invalid_param") 
+  }
+  /// Cancel
+  public static var loginLeaveFallback: String { 
+    return MatrixKitL10n.tr("login_leave_fallback") 
+  }
+  /// Mobile
+  public static var loginMobileDevice: String { 
+    return MatrixKitL10n.tr("login_mobile_device") 
+  }
+  /// optional
+  public static var loginOptionalField: String { 
+    return MatrixKitL10n.tr("login_optional_field") 
+  }
+  /// Password
+  public static var loginPasswordPlaceholder: String { 
+    return MatrixKitL10n.tr("login_password_placeholder") 
+  }
+  /// Please enter your email validation token:
+  public static var loginPromptEmailToken: String { 
+    return MatrixKitL10n.tr("login_prompt_email_token") 
+  }
+  /// URL (e.g. https://matrix.org)
+  public static var loginServerUrlPlaceholder: String { 
+    return MatrixKitL10n.tr("login_server_url_placeholder") 
+  }
+  /// Tablet
+  public static var loginTabletDevice: String { 
+    return MatrixKitL10n.tr("login_tablet_device") 
+  }
+  /// Use fallback page
+  public static var loginUseFallback: String { 
+    return MatrixKitL10n.tr("login_use_fallback") 
+  }
+  /// Matrix ID (e.g. @bob:matrix.org or bob)
+  public static var loginUserIdPlaceholder: String { 
+    return MatrixKitL10n.tr("login_user_id_placeholder") 
+  }
+  /// Matrix
+  public static var matrix: String { 
+    return MatrixKitL10n.tr("matrix") 
+  }
+  /// Banned
+  public static var membershipBan: String { 
+    return MatrixKitL10n.tr("membership_ban") 
+  }
+  /// Invited
+  public static var membershipInvite: String { 
+    return MatrixKitL10n.tr("membership_invite") 
+  }
+  /// Left
+  public static var membershipLeave: String { 
+    return MatrixKitL10n.tr("membership_leave") 
+  }
+  /// Mention
+  public static var mention: String { 
+    return MatrixKitL10n.tr("mention") 
+  }
+  /// In reply to
+  public static var messageReplyToMessageToReplyToPrefix: String { 
+    return MatrixKitL10n.tr("message_reply_to_message_to_reply_to_prefix") 
+  }
+  /// sent a file.
+  public static var messageReplyToSenderSentAFile: String { 
+    return MatrixKitL10n.tr("message_reply_to_sender_sent_a_file") 
+  }
+  /// sent a video.
+  public static var messageReplyToSenderSentAVideo: String { 
+    return MatrixKitL10n.tr("message_reply_to_sender_sent_a_video") 
+  }
+  /// sent a voice message.
+  public static var messageReplyToSenderSentAVoiceMessage: String { 
+    return MatrixKitL10n.tr("message_reply_to_sender_sent_a_voice_message") 
+  }
+  /// sent an audio file.
+  public static var messageReplyToSenderSentAnAudioFile: String { 
+    return MatrixKitL10n.tr("message_reply_to_sender_sent_an_audio_file") 
+  }
+  /// sent an image.
+  public static var messageReplyToSenderSentAnImage: String { 
+    return MatrixKitL10n.tr("message_reply_to_sender_sent_an_image") 
+  }
+  /// There are unsaved changes. Leaving will discard them.
+  public static var messageUnsavedChanges: String { 
+    return MatrixKitL10n.tr("message_unsaved_changes") 
+  }
+  /// Calls require access to the Microphone but %@ doesn't have permission to use it
+  public static func microphoneAccessNotGrantedForCall(_ p1: String) -> String {
+    return MatrixKitL10n.tr("microphone_access_not_granted_for_call", p1)
+  }
+  /// Voice messages require access to the Microphone but %@ doesn't have permission to use it
+  public static func microphoneAccessNotGrantedForVoiceMessage(_ p1: String) -> String {
+    return MatrixKitL10n.tr("microphone_access_not_granted_for_voice_message", p1)
+  }
+  /// Please check your network connectivity
+  public static var networkErrorNotReachable: String { 
+    return MatrixKitL10n.tr("network_error_not_reachable") 
+  }
+  /// No
+  public static var no: String { 
+    return MatrixKitL10n.tr("no") 
+  }
+  /// Not supported yet
+  public static var notSupportedYet: String { 
+    return MatrixKitL10n.tr("not_supported_yet") 
+  }
+  /// %@ answered the call
+  public static func noticeAnsweredVideoCall(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_answered_video_call", p1)
+  }
+  /// You answered the call
+  public static var noticeAnsweredVideoCallByYou: String { 
+    return MatrixKitL10n.tr("notice_answered_video_call_by_you") 
+  }
+  /// audio attachment
+  public static var noticeAudioAttachment: String { 
+    return MatrixKitL10n.tr("notice_audio_attachment") 
+  }
+  /// (avatar was changed too)
+  public static var noticeAvatarChangedToo: String { 
+    return MatrixKitL10n.tr("notice_avatar_changed_too") 
+  }
+  /// %@ changed their avatar
+  public static func noticeAvatarUrlChanged(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_avatar_url_changed", p1)
+  }
+  /// You changed your avatar
+  public static var noticeAvatarUrlChangedByYou: String { 
+    return MatrixKitL10n.tr("notice_avatar_url_changed_by_you") 
+  }
+  /// VoIP conference finished
+  public static var noticeConferenceCallFinished: String { 
+    return MatrixKitL10n.tr("notice_conference_call_finished") 
+  }
+  /// %@ requested a VoIP conference
+  public static func noticeConferenceCallRequest(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_conference_call_request", p1)
+  }
+  /// You requested a VoIP conference
+  public static var noticeConferenceCallRequestByYou: String { 
+    return MatrixKitL10n.tr("notice_conference_call_request_by_you") 
+  }
+  /// VoIP conference started
+  public static var noticeConferenceCallStarted: String { 
+    return MatrixKitL10n.tr("notice_conference_call_started") 
+  }
+  /// The sender's session has not sent us the keys for this message.
+  public static var noticeCryptoErrorUnknownInboundSessionId: String { 
+    return MatrixKitL10n.tr("notice_crypto_error_unknown_inbound_session_id") 
+  }
+  /// ** Unable to decrypt: %@ **
+  public static func noticeCryptoUnableToDecrypt(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_crypto_unable_to_decrypt", p1)
+  }
+  /// %@ declined the call
+  public static func noticeDeclinedVideoCall(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_declined_video_call", p1)
+  }
+  /// You declined the call
+  public static var noticeDeclinedVideoCallByYou: String { 
+    return MatrixKitL10n.tr("notice_declined_video_call_by_you") 
+  }
+  /// %@ changed their display name from %@ to %@
+  public static func noticeDisplayNameChangedFrom(_ p1: String, _ p2: String, _ p3: String) -> String {
+    return MatrixKitL10n.tr("notice_display_name_changed_from", p1, p2, p3)
+  }
+  /// You changed your display name from %@ to %@
+  public static func noticeDisplayNameChangedFromByYou(_ p1: String, _ p2: String) -> String {
+    return MatrixKitL10n.tr("notice_display_name_changed_from_by_you", p1, p2)
+  }
+  /// %@ removed their display name
+  public static func noticeDisplayNameRemoved(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_display_name_removed", p1)
+  }
+  /// You removed your display name
+  public static var noticeDisplayNameRemovedByYou: String { 
+    return MatrixKitL10n.tr("notice_display_name_removed_by_you") 
+  }
+  /// %@ set their display name to %@
+  public static func noticeDisplayNameSet(_ p1: String, _ p2: String) -> String {
+    return MatrixKitL10n.tr("notice_display_name_set", p1, p2)
+  }
+  /// You set your display name to %@
+  public static func noticeDisplayNameSetByYou(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_display_name_set_by_you", p1)
+  }
+  /// Encrypted message
+  public static var noticeEncryptedMessage: String { 
+    return MatrixKitL10n.tr("notice_encrypted_message") 
+  }
+  /// %@ turned on end-to-end encryption.
+  public static func noticeEncryptionEnabledOk(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_encryption_enabled_ok", p1)
+  }
+  /// You turned on end-to-end encryption.
+  public static var noticeEncryptionEnabledOkByYou: String { 
+    return MatrixKitL10n.tr("notice_encryption_enabled_ok_by_you") 
+  }
+  /// %1$@ turned on end-to-end encryption (unrecognised algorithm %2$@).
+  public static func noticeEncryptionEnabledUnknownAlgorithm(_ p1: String, _ p2: String) -> String {
+    return MatrixKitL10n.tr("notice_encryption_enabled_unknown_algorithm", p1, p2)
+  }
+  /// You turned on end-to-end encryption (unrecognised algorithm %@).
+  public static func noticeEncryptionEnabledUnknownAlgorithmByYou(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_encryption_enabled_unknown_algorithm_by_you", p1)
+  }
+  /// %@ ended the call
+  public static func noticeEndedVideoCall(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_ended_video_call", p1)
+  }
+  /// You ended the call
+  public static var noticeEndedVideoCallByYou: String { 
+    return MatrixKitL10n.tr("notice_ended_video_call_by_you") 
+  }
+  /// Unexpected event
+  public static var noticeErrorUnexpectedEvent: String { 
+    return MatrixKitL10n.tr("notice_error_unexpected_event") 
+  }
+  /// Unknown event type
+  public static var noticeErrorUnknownEventType: String { 
+    return MatrixKitL10n.tr("notice_error_unknown_event_type") 
+  }
+  /// Unsupported event
+  public static var noticeErrorUnsupportedEvent: String { 
+    return MatrixKitL10n.tr("notice_error_unsupported_event") 
+  }
+  /// <redacted%@>
+  public static func noticeEventRedacted(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_event_redacted", p1)
+  }
+  ///  by %@
+  public static func noticeEventRedactedBy(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_event_redacted_by", p1)
+  }
+  ///  by you
+  public static var noticeEventRedactedByYou: String { 
+    return MatrixKitL10n.tr("notice_event_redacted_by_you") 
+  }
+  ///  [reason: %@]
+  public static func noticeEventRedactedReason(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_event_redacted_reason", p1)
+  }
+  /// Feedback event (id: %@): %@
+  public static func noticeFeedback(_ p1: String, _ p2: String) -> String {
+    return MatrixKitL10n.tr("notice_feedback", p1, p2)
+  }
+  /// file attachment
+  public static var noticeFileAttachment: String { 
+    return MatrixKitL10n.tr("notice_file_attachment") 
+  }
+  /// image attachment
+  public static var noticeImageAttachment: String { 
+    return MatrixKitL10n.tr("notice_image_attachment") 
+  }
+  /// In reply to
+  public static var noticeInReplyTo: String { 
+    return MatrixKitL10n.tr("notice_in_reply_to") 
+  }
+  /// invalid attachment
+  public static var noticeInvalidAttachment: String { 
+    return MatrixKitL10n.tr("notice_invalid_attachment") 
+  }
+  /// location attachment
+  public static var noticeLocationAttachment: String { 
+    return MatrixKitL10n.tr("notice_location_attachment") 
+  }
+  /// %@ placed a video call
+  public static func noticePlacedVideoCall(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_placed_video_call", p1)
+  }
+  /// You placed a video call
+  public static var noticePlacedVideoCallByYou: String { 
+    return MatrixKitL10n.tr("notice_placed_video_call_by_you") 
+  }
+  /// %@ placed a voice call
+  public static func noticePlacedVoiceCall(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_placed_voice_call", p1)
+  }
+  /// You placed a voice call
+  public static var noticePlacedVoiceCallByYou: String { 
+    return MatrixKitL10n.tr("notice_placed_voice_call_by_you") 
+  }
+  /// %@ updated their profile %@
+  public static func noticeProfileChangeRedacted(_ p1: String, _ p2: String) -> String {
+    return MatrixKitL10n.tr("notice_profile_change_redacted", p1, p2)
+  }
+  /// You updated your profile %@
+  public static func noticeProfileChangeRedactedByYou(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_profile_change_redacted_by_you", p1)
+  }
+  /// %@ redacted an event (id: %@)
+  public static func noticeRedaction(_ p1: String, _ p2: String) -> String {
+    return MatrixKitL10n.tr("notice_redaction", p1, p2)
+  }
+  /// You redacted an event (id: %@)
+  public static func noticeRedactionByYou(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_redaction_by_you", p1)
+  }
+  /// The room aliases are: %@
+  public static func noticeRoomAliases(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_aliases", p1)
+  }
+  /// The aliases are: %@
+  public static func noticeRoomAliasesForDm(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_aliases_for_dm", p1)
+  }
+  /// %@ banned %@
+  public static func noticeRoomBan(_ p1: String, _ p2: String) -> String {
+    return MatrixKitL10n.tr("notice_room_ban", p1, p2)
+  }
+  /// You banned %@
+  public static func noticeRoomBanByYou(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_ban_by_you", p1)
+  }
+  /// %@ created and configured the room.
+  public static func noticeRoomCreated(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_created", p1)
+  }
+  /// You created and configured the room.
+  public static var noticeRoomCreatedByYou: String { 
+    return MatrixKitL10n.tr("notice_room_created_by_you") 
+  }
+  /// You joined.
+  public static var noticeRoomCreatedByYouForDm: String { 
+    return MatrixKitL10n.tr("notice_room_created_by_you_for_dm") 
+  }
+  /// %@ joined.
+  public static func noticeRoomCreatedForDm(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_created_for_dm", p1)
+  }
+  /// %@ made future room history visible to anyone.
+  public static func noticeRoomHistoryVisibleToAnyone(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_history_visible_to_anyone", p1)
+  }
+  /// You made future room history visible to anyone.
+  public static var noticeRoomHistoryVisibleToAnyoneByYou: String { 
+    return MatrixKitL10n.tr("notice_room_history_visible_to_anyone_by_you") 
+  }
+  /// %@ made future room history visible to all room members.
+  public static func noticeRoomHistoryVisibleToMembers(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_history_visible_to_members", p1)
+  }
+  /// You made future room history visible to all room members.
+  public static var noticeRoomHistoryVisibleToMembersByYou: String { 
+    return MatrixKitL10n.tr("notice_room_history_visible_to_members_by_you") 
+  }
+  /// You made future messages visible to all room members.
+  public static var noticeRoomHistoryVisibleToMembersByYouForDm: String { 
+    return MatrixKitL10n.tr("notice_room_history_visible_to_members_by_you_for_dm") 
+  }
+  /// %@ made future messages visible to all room members.
+  public static func noticeRoomHistoryVisibleToMembersForDm(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_history_visible_to_members_for_dm", p1)
+  }
+  /// %@ made future room history visible to all room members, from the point they are invited.
+  public static func noticeRoomHistoryVisibleToMembersFromInvitedPoint(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_history_visible_to_members_from_invited_point", p1)
+  }
+  /// You made future room history visible to all room members, from the point they are invited.
+  public static var noticeRoomHistoryVisibleToMembersFromInvitedPointByYou: String { 
+    return MatrixKitL10n.tr("notice_room_history_visible_to_members_from_invited_point_by_you") 
+  }
+  /// You made future messages visible to everyone, from when they get invited.
+  public static var noticeRoomHistoryVisibleToMembersFromInvitedPointByYouForDm: String { 
+    return MatrixKitL10n.tr("notice_room_history_visible_to_members_from_invited_point_by_you_for_dm") 
+  }
+  /// %@ made future messages visible to everyone, from when they get invited.
+  public static func noticeRoomHistoryVisibleToMembersFromInvitedPointForDm(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_history_visible_to_members_from_invited_point_for_dm", p1)
+  }
+  /// %@ made future room history visible to all room members, from the point they joined.
+  public static func noticeRoomHistoryVisibleToMembersFromJoinedPoint(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_history_visible_to_members_from_joined_point", p1)
+  }
+  /// You made future room history visible to all room members, from the point they joined.
+  public static var noticeRoomHistoryVisibleToMembersFromJoinedPointByYou: String { 
+    return MatrixKitL10n.tr("notice_room_history_visible_to_members_from_joined_point_by_you") 
+  }
+  /// You made future messages visible to everyone, from when they joined.
+  public static var noticeRoomHistoryVisibleToMembersFromJoinedPointByYouForDm: String { 
+    return MatrixKitL10n.tr("notice_room_history_visible_to_members_from_joined_point_by_you_for_dm") 
+  }
+  /// %@ made future messages visible to everyone, from when they joined.
+  public static func noticeRoomHistoryVisibleToMembersFromJoinedPointForDm(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_history_visible_to_members_from_joined_point_for_dm", p1)
+  }
+  /// %@ invited %@
+  public static func noticeRoomInvite(_ p1: String, _ p2: String) -> String {
+    return MatrixKitL10n.tr("notice_room_invite", p1, p2)
+  }
+  /// You invited %@
+  public static func noticeRoomInviteByYou(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_invite_by_you", p1)
+  }
+  /// %@ invited you
+  public static func noticeRoomInviteYou(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_invite_you", p1)
+  }
+  /// %@ joined
+  public static func noticeRoomJoin(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_join", p1)
+  }
+  /// You joined
+  public static var noticeRoomJoinByYou: String { 
+    return MatrixKitL10n.tr("notice_room_join_by_you") 
+  }
+  /// The join rule is: %@
+  public static func noticeRoomJoinRule(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_join_rule", p1)
+  }
+  /// %@ made the room invite only.
+  public static func noticeRoomJoinRuleInvite(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_join_rule_invite", p1)
+  }
+  /// You made the room invite only.
+  public static var noticeRoomJoinRuleInviteByYou: String { 
+    return MatrixKitL10n.tr("notice_room_join_rule_invite_by_you") 
+  }
+  /// You made this invite only.
+  public static var noticeRoomJoinRuleInviteByYouForDm: String { 
+    return MatrixKitL10n.tr("notice_room_join_rule_invite_by_you_for_dm") 
+  }
+  /// %@ made this invite only.
+  public static func noticeRoomJoinRuleInviteForDm(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_join_rule_invite_for_dm", p1)
+  }
+  /// %@ made the room public.
+  public static func noticeRoomJoinRulePublic(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_join_rule_public", p1)
+  }
+  /// You made the room public.
+  public static var noticeRoomJoinRulePublicByYou: String { 
+    return MatrixKitL10n.tr("notice_room_join_rule_public_by_you") 
+  }
+  /// You made this public.
+  public static var noticeRoomJoinRulePublicByYouForDm: String { 
+    return MatrixKitL10n.tr("notice_room_join_rule_public_by_you_for_dm") 
+  }
+  /// %@ made this public.
+  public static func noticeRoomJoinRulePublicForDm(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_join_rule_public_for_dm", p1)
+  }
+  /// %@ kicked %@
+  public static func noticeRoomKick(_ p1: String, _ p2: String) -> String {
+    return MatrixKitL10n.tr("notice_room_kick", p1, p2)
+  }
+  /// You kicked %@
+  public static func noticeRoomKickByYou(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_kick_by_you", p1)
+  }
+  /// %@ left
+  public static func noticeRoomLeave(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_leave", p1)
+  }
+  /// You left
+  public static var noticeRoomLeaveByYou: String { 
+    return MatrixKitL10n.tr("notice_room_leave_by_you") 
+  }
+  /// %@ changed the room name to %@.
+  public static func noticeRoomNameChanged(_ p1: String, _ p2: String) -> String {
+    return MatrixKitL10n.tr("notice_room_name_changed", p1, p2)
+  }
+  /// You changed the room name to %@.
+  public static func noticeRoomNameChangedByYou(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_name_changed_by_you", p1)
+  }
+  /// You changed the name to %@.
+  public static func noticeRoomNameChangedByYouForDm(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_name_changed_by_you_for_dm", p1)
+  }
+  /// %@ changed the name to %@.
+  public static func noticeRoomNameChangedForDm(_ p1: String, _ p2: String) -> String {
+    return MatrixKitL10n.tr("notice_room_name_changed_for_dm", p1, p2)
+  }
+  /// %@ removed the room name
+  public static func noticeRoomNameRemoved(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_name_removed", p1)
+  }
+  /// You removed the room name
+  public static var noticeRoomNameRemovedByYou: String { 
+    return MatrixKitL10n.tr("notice_room_name_removed_by_you") 
+  }
+  /// You removed the name
+  public static var noticeRoomNameRemovedByYouForDm: String { 
+    return MatrixKitL10n.tr("notice_room_name_removed_by_you_for_dm") 
+  }
+  /// %@ removed the name
+  public static func noticeRoomNameRemovedForDm(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_name_removed_for_dm", p1)
+  }
+  /// The minimum power levels that a user must have before acting are:
+  public static var noticeRoomPowerLevelActingRequirement: String { 
+    return MatrixKitL10n.tr("notice_room_power_level_acting_requirement") 
+  }
+  /// The minimum power levels related to events are:
+  public static var noticeRoomPowerLevelEventRequirement: String { 
+    return MatrixKitL10n.tr("notice_room_power_level_event_requirement") 
+  }
+  /// The power level of room members are:
+  public static var noticeRoomPowerLevelIntro: String { 
+    return MatrixKitL10n.tr("notice_room_power_level_intro") 
+  }
+  /// The power level of members are:
+  public static var noticeRoomPowerLevelIntroForDm: String { 
+    return MatrixKitL10n.tr("notice_room_power_level_intro_for_dm") 
+  }
+  /// . Reason: %@
+  public static func noticeRoomReason(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_reason", p1)
+  }
+  /// %@ rejected the invitation
+  public static func noticeRoomReject(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_reject", p1)
+  }
+  /// You rejected the invitation
+  public static var noticeRoomRejectByYou: String { 
+    return MatrixKitL10n.tr("notice_room_reject_by_you") 
+  }
+  /// The groups associated with this room are: %@
+  public static func noticeRoomRelatedGroups(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_related_groups", p1)
+  }
+  /// %@ sent an invitation to %@ to join the room
+  public static func noticeRoomThirdPartyInvite(_ p1: String, _ p2: String) -> String {
+    return MatrixKitL10n.tr("notice_room_third_party_invite", p1, p2)
+  }
+  /// You sent an invitation to %@ to join the room
+  public static func noticeRoomThirdPartyInviteByYou(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_third_party_invite_by_you", p1)
+  }
+  /// You invited %@
+  public static func noticeRoomThirdPartyInviteByYouForDm(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_third_party_invite_by_you_for_dm", p1)
+  }
+  /// %@ invited %@
+  public static func noticeRoomThirdPartyInviteForDm(_ p1: String, _ p2: String) -> String {
+    return MatrixKitL10n.tr("notice_room_third_party_invite_for_dm", p1, p2)
+  }
+  /// %@ accepted the invitation for %@
+  public static func noticeRoomThirdPartyRegisteredInvite(_ p1: String, _ p2: String) -> String {
+    return MatrixKitL10n.tr("notice_room_third_party_registered_invite", p1, p2)
+  }
+  /// You accepted the invitation for %@
+  public static func noticeRoomThirdPartyRegisteredInviteByYou(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_third_party_registered_invite_by_you", p1)
+  }
+  /// %@ revoked the invitation for %@ to join the room
+  public static func noticeRoomThirdPartyRevokedInvite(_ p1: String, _ p2: String) -> String {
+    return MatrixKitL10n.tr("notice_room_third_party_revoked_invite", p1, p2)
+  }
+  /// You revoked the invitation for %@ to join the room
+  public static func noticeRoomThirdPartyRevokedInviteByYou(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_third_party_revoked_invite_by_you", p1)
+  }
+  /// You revoked %@'s invitation
+  public static func noticeRoomThirdPartyRevokedInviteByYouForDm(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_third_party_revoked_invite_by_you_for_dm", p1)
+  }
+  /// %@ revoked %@'s invitation
+  public static func noticeRoomThirdPartyRevokedInviteForDm(_ p1: String, _ p2: String) -> String {
+    return MatrixKitL10n.tr("notice_room_third_party_revoked_invite_for_dm", p1, p2)
+  }
+  /// %@ removed the topic
+  public static func noticeRoomTopicRemoved(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_topic_removed", p1)
+  }
+  /// You removed the topic
+  public static var noticeRoomTopicRemovedByYou: String { 
+    return MatrixKitL10n.tr("notice_room_topic_removed_by_you") 
+  }
+  /// %@ unbanned %@
+  public static func noticeRoomUnban(_ p1: String, _ p2: String) -> String {
+    return MatrixKitL10n.tr("notice_room_unban", p1, p2)
+  }
+  /// You unbanned %@
+  public static func noticeRoomUnbanByYou(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_unban_by_you", p1)
+  }
+  /// %@ withdrew %@'s invitation
+  public static func noticeRoomWithdraw(_ p1: String, _ p2: String) -> String {
+    return MatrixKitL10n.tr("notice_room_withdraw", p1, p2)
+  }
+  /// You withdrew %@'s invitation
+  public static func noticeRoomWithdrawByYou(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_room_withdraw_by_you", p1)
+  }
+  /// sticker
+  public static var noticeSticker: String { 
+    return MatrixKitL10n.tr("notice_sticker") 
+  }
+  /// %@ changed the topic to "%@".
+  public static func noticeTopicChanged(_ p1: String, _ p2: String) -> String {
+    return MatrixKitL10n.tr("notice_topic_changed", p1, p2)
+  }
+  /// You changed the topic to "%@".
+  public static func noticeTopicChangedByYou(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_topic_changed_by_you", p1)
+  }
+  /// Unsupported attachment: %@
+  public static func noticeUnsupportedAttachment(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notice_unsupported_attachment", p1)
+  }
+  /// video attachment
+  public static var noticeVideoAttachment: String { 
+    return MatrixKitL10n.tr("notice_video_attachment") 
+  }
+  /// Always notify
+  public static var notificationSettingsAlwaysNotify: String { 
+    return MatrixKitL10n.tr("notification_settings_always_notify") 
+  }
+  /// By default...
+  public static var notificationSettingsByDefault: String { 
+    return MatrixKitL10n.tr("notification_settings_by_default") 
+  }
+  /// Notify me with sound about messages that contain my display name
+  public static var notificationSettingsContainMyDisplayName: String { 
+    return MatrixKitL10n.tr("notification_settings_contain_my_display_name") 
+  }
+  /// Notify me with sound about messages that contain my user name
+  public static var notificationSettingsContainMyUserName: String { 
+    return MatrixKitL10n.tr("notification_settings_contain_my_user_name") 
+  }
+  /// Custom sound
+  public static var notificationSettingsCustomSound: String { 
+    return MatrixKitL10n.tr("notification_settings_custom_sound") 
+  }
+  /// Disable all notifications
+  public static var notificationSettingsDisableAll: String { 
+    return MatrixKitL10n.tr("notification_settings_disable_all") 
+  }
+  /// Enable notifications
+  public static var notificationSettingsEnableNotifications: String { 
+    return MatrixKitL10n.tr("notification_settings_enable_notifications") 
+  }
+  /// All notifications are currently disabled for all devices.
+  public static var notificationSettingsEnableNotificationsWarning: String { 
+    return MatrixKitL10n.tr("notification_settings_enable_notifications_warning") 
+  }
+  /// Notification settings are saved to your user account and are shared between all clients which support them (including desktop notifications).\n\nRules are applied in order; the first rule which matches defines the outcome for the message.\nSo: Per-word notifications are more important than per-room notifications which are more important than per-sender notifications.\nFor multiple rules of the same kind, the first one in the list that matches takes priority.
+  public static var notificationSettingsGlobalInfo: String { 
+    return MatrixKitL10n.tr("notification_settings_global_info") 
+  }
+  /// Highlight
+  public static var notificationSettingsHighlight: String { 
+    return MatrixKitL10n.tr("notification_settings_highlight") 
+  }
+  /// Notify me when I am invited to a new room
+  public static var notificationSettingsInviteToANewRoom: String { 
+    return MatrixKitL10n.tr("notification_settings_invite_to_a_new_room") 
+  }
+  /// Notify me with sound about messages sent just to me
+  public static var notificationSettingsJustSentToMe: String { 
+    return MatrixKitL10n.tr("notification_settings_just_sent_to_me") 
+  }
+  /// Never notify
+  public static var notificationSettingsNeverNotify: String { 
+    return MatrixKitL10n.tr("notification_settings_never_notify") 
+  }
+  /// Notify for all other messages/rooms
+  public static var notificationSettingsNotifyAllOther: String { 
+    return MatrixKitL10n.tr("notification_settings_notify_all_other") 
+  }
+  /// Other Alerts
+  public static var notificationSettingsOtherAlerts: String { 
+    return MatrixKitL10n.tr("notification_settings_other_alerts") 
+  }
+  /// Notify me when people join or leave rooms
+  public static var notificationSettingsPeopleJoinLeaveRooms: String { 
+    return MatrixKitL10n.tr("notification_settings_people_join_leave_rooms") 
+  }
+  /// Per-room notifications
+  public static var notificationSettingsPerRoomNotifications: String { 
+    return MatrixKitL10n.tr("notification_settings_per_room_notifications") 
+  }
+  /// Per-sender notifications
+  public static var notificationSettingsPerSenderNotifications: String { 
+    return MatrixKitL10n.tr("notification_settings_per_sender_notifications") 
+  }
+  /// Words match case insensitively, and may include a * wildcard. So:\nfoo matches the string foo surrounded by word delimiters (e.g. punctuation and whitespace or start/end of line).\nfoo* matches any such word that begins foo.\n*foo* matches any such word which includes the 3 letters foo.
+  public static var notificationSettingsPerWordInfo: String { 
+    return MatrixKitL10n.tr("notification_settings_per_word_info") 
+  }
+  /// Per-word notifications
+  public static var notificationSettingsPerWordNotifications: String { 
+    return MatrixKitL10n.tr("notification_settings_per_word_notifications") 
+  }
+  /// Notify me when I receive a call
+  public static var notificationSettingsReceiveACall: String { 
+    return MatrixKitL10n.tr("notification_settings_receive_a_call") 
+  }
+  /// Room: '%@'
+  public static func notificationSettingsRoomRuleTitle(_ p1: String) -> String {
+    return MatrixKitL10n.tr("notification_settings_room_rule_title", p1)
+  }
+  /// Select a room
+  public static var notificationSettingsSelectRoom: String { 
+    return MatrixKitL10n.tr("notification_settings_select_room") 
+  }
+  /// @user:domain.com
+  public static var notificationSettingsSenderHint: String { 
+    return MatrixKitL10n.tr("notification_settings_sender_hint") 
+  }
+  /// Suppress notifications from bots
+  public static var notificationSettingsSuppressFromBots: String { 
+    return MatrixKitL10n.tr("notification_settings_suppress_from_bots") 
+  }
+  /// word to match
+  public static var notificationSettingsWordToMatch: String { 
+    return MatrixKitL10n.tr("notification_settings_word_to_match") 
+  }
+  /// %@ user
+  public static func numMembersOne(_ p1: String) -> String {
+    return MatrixKitL10n.tr("num_members_one", p1)
+  }
+  /// %@ users
+  public static func numMembersOther(_ p1: String) -> String {
+    return MatrixKitL10n.tr("num_members_other", p1)
+  }
+  /// offline
+  public static var offline: String { 
+    return MatrixKitL10n.tr("offline") 
+  }
+  /// OK
+  public static var ok: String { 
+    return MatrixKitL10n.tr("ok") 
+  }
+  /// Power Level
+  public static var powerLevel: String { 
+    return MatrixKitL10n.tr("power_level") 
+  }
+  /// Private
+  public static var `private`: String { 
+    return MatrixKitL10n.tr("private") 
+  }
+  /// Public
+  public static var `public`: String { 
+    return MatrixKitL10n.tr("public") 
+  }
+  /// Remove
+  public static var redact: String { 
+    return MatrixKitL10n.tr("redact") 
+  }
+  /// Registration Failed
+  public static var registerErrorTitle: String { 
+    return MatrixKitL10n.tr("register_error_title") 
+  }
+  /// Reject Call
+  public static var rejectCall: String { 
+    return MatrixKitL10n.tr("reject_call") 
+  }
+  /// Rename
+  public static var rename: String { 
+    return MatrixKitL10n.tr("rename") 
+  }
+  /// Resend
+  public static var resend: String { 
+    return MatrixKitL10n.tr("resend") 
+  }
+  /// Resend the message
+  public static var resendMessage: String { 
+    return MatrixKitL10n.tr("resend_message") 
+  }
+  /// Reset to default
+  public static var resetToDefault: String { 
+    return MatrixKitL10n.tr("reset_to_default") 
+  }
+  /// Resume
+  public static var resumeCall: String { 
+    return MatrixKitL10n.tr("resume_call") 
+  }
+  /// Retry
+  public static var retry: String { 
+    return MatrixKitL10n.tr("retry") 
+  }
+  /// (e.g. #foo:example.org)
+  public static var roomCreationAliasPlaceholder: String { 
+    return MatrixKitL10n.tr("room_creation_alias_placeholder") 
+  }
+  /// (e.g. #foo%@)
+  public static func roomCreationAliasPlaceholderWithHomeserver(_ p1: String) -> String {
+    return MatrixKitL10n.tr("room_creation_alias_placeholder_with_homeserver", p1)
+  }
+  /// Room alias:
+  public static var roomCreationAliasTitle: String { 
+    return MatrixKitL10n.tr("room_creation_alias_title") 
+  }
+  /// (e.g. lunchGroup)
+  public static var roomCreationNamePlaceholder: String { 
+    return MatrixKitL10n.tr("room_creation_name_placeholder") 
+  }
+  /// Room name:
+  public static var roomCreationNameTitle: String { 
+    return MatrixKitL10n.tr("room_creation_name_title") 
+  }
+  /// (e.g. @bob:homeserver1; @john:homeserver2...)
+  public static var roomCreationParticipantsPlaceholder: String { 
+    return MatrixKitL10n.tr("room_creation_participants_placeholder") 
+  }
+  /// Participants:
+  public static var roomCreationParticipantsTitle: String { 
+    return MatrixKitL10n.tr("room_creation_participants_title") 
+  }
+  /// Room Details
+  public static var roomDetailsTitle: String { 
+    return MatrixKitL10n.tr("room_details_title") 
+  }
+  /// %@ (Left)
+  public static func roomDisplaynameAllOtherMembersLeft(_ p1: String) -> String {
+    return MatrixKitL10n.tr("room_displayname_all_other_members_left", p1)
+  }
+  /// Empty room
+  public static var roomDisplaynameEmptyRoom: String { 
+    return MatrixKitL10n.tr("room_displayname_empty_room") 
+  }
+  /// %@ and %@ others
+  public static func roomDisplaynameMoreThanTwoMembers(_ p1: String, _ p2: String) -> String {
+    return MatrixKitL10n.tr("room_displayname_more_than_two_members", p1, p2)
+  }
+  /// %@ and %@
+  public static func roomDisplaynameTwoMembers(_ p1: String, _ p2: String) -> String {
+    return MatrixKitL10n.tr("room_displayname_two_members", p1, p2)
+  }
+  /// Failed to load timeline
+  public static var roomErrorCannotLoadTimeline: String { 
+    return MatrixKitL10n.tr("room_error_cannot_load_timeline") 
+  }
+  /// It is not currently possible to join an empty room.
+  public static var roomErrorJoinFailedEmptyRoom: String { 
+    return MatrixKitL10n.tr("room_error_join_failed_empty_room") 
+  }
+  /// Failed to join room
+  public static var roomErrorJoinFailedTitle: String { 
+    return MatrixKitL10n.tr("room_error_join_failed_title") 
+  }
+  /// You are not authorized to edit this room name
+  public static var roomErrorNameEditionNotAuthorized: String { 
+    return MatrixKitL10n.tr("room_error_name_edition_not_authorized") 
+  }
+  /// The application was trying to load a specific point in this room's timeline but was unable to find it
+  public static var roomErrorTimelineEventNotFound: String { 
+    return MatrixKitL10n.tr("room_error_timeline_event_not_found") 
+  }
+  /// Failed to load timeline position
+  public static var roomErrorTimelineEventNotFoundTitle: String { 
+    return MatrixKitL10n.tr("room_error_timeline_event_not_found_title") 
+  }
+  /// You are not authorized to edit this room topic
+  public static var roomErrorTopicEditionNotAuthorized: String { 
+    return MatrixKitL10n.tr("room_error_topic_edition_not_authorized") 
+  }
+  /// Blacklist
+  public static var roomEventEncryptionInfoBlock: String { 
+    return MatrixKitL10n.tr("room_event_encryption_info_block") 
+  }
+  /// \nSender session information\n
+  public static var roomEventEncryptionInfoDevice: String { 
+    return MatrixKitL10n.tr("room_event_encryption_info_device") 
+  }
+  /// Blacklisted
+  public static var roomEventEncryptionInfoDeviceBlocked: String { 
+    return MatrixKitL10n.tr("room_event_encryption_info_device_blocked") 
+  }
+  /// Ed25519 fingerprint\n
+  public static var roomEventEncryptionInfoDeviceFingerprint: String { 
+    return MatrixKitL10n.tr("room_event_encryption_info_device_fingerprint") 
+  }
+  /// ID\n
+  public static var roomEventEncryptionInfoDeviceId: String { 
+    return MatrixKitL10n.tr("room_event_encryption_info_device_id") 
+  }
+  /// Public Name\n
+  public static var roomEventEncryptionInfoDeviceName: String { 
+    return MatrixKitL10n.tr("room_event_encryption_info_device_name") 
+  }
+  /// NOT verified
+  public static var roomEventEncryptionInfoDeviceNotVerified: String { 
+    return MatrixKitL10n.tr("room_event_encryption_info_device_not_verified") 
+  }
+  /// unknown session\n
+  public static var roomEventEncryptionInfoDeviceUnknown: String { 
+    return MatrixKitL10n.tr("room_event_encryption_info_device_unknown") 
+  }
+  /// Verification\n
+  public static var roomEventEncryptionInfoDeviceVerification: String { 
+    return MatrixKitL10n.tr("room_event_encryption_info_device_verification") 
+  }
+  /// Verified
+  public static var roomEventEncryptionInfoDeviceVerified: String { 
+    return MatrixKitL10n.tr("room_event_encryption_info_device_verified") 
+  }
+  /// Event information\n
+  public static var roomEventEncryptionInfoEvent: String { 
+    return MatrixKitL10n.tr("room_event_encryption_info_event") 
+  }
+  /// Algorithm\n
+  public static var roomEventEncryptionInfoEventAlgorithm: String { 
+    return MatrixKitL10n.tr("room_event_encryption_info_event_algorithm") 
+  }
+  /// Decryption error\n
+  public static var roomEventEncryptionInfoEventDecryptionError: String { 
+    return MatrixKitL10n.tr("room_event_encryption_info_event_decryption_error") 
+  }
+  /// Claimed Ed25519 fingerprint key\n
+  public static var roomEventEncryptionInfoEventFingerprintKey: String { 
+    return MatrixKitL10n.tr("room_event_encryption_info_event_fingerprint_key") 
+  }
+  /// Curve25519 identity key\n
+  public static var roomEventEncryptionInfoEventIdentityKey: String { 
+    return MatrixKitL10n.tr("room_event_encryption_info_event_identity_key") 
+  }
+  /// none
+  public static var roomEventEncryptionInfoEventNone: String { 
+    return MatrixKitL10n.tr("room_event_encryption_info_event_none") 
+  }
+  /// Session ID\n
+  public static var roomEventEncryptionInfoEventSessionId: String { 
+    return MatrixKitL10n.tr("room_event_encryption_info_event_session_id") 
+  }
+  /// unencrypted
+  public static var roomEventEncryptionInfoEventUnencrypted: String { 
+    return MatrixKitL10n.tr("room_event_encryption_info_event_unencrypted") 
+  }
+  /// User ID\n
+  public static var roomEventEncryptionInfoEventUserId: String { 
+    return MatrixKitL10n.tr("room_event_encryption_info_event_user_id") 
+  }
+  /// End-to-end encryption information\n\n
+  public static var roomEventEncryptionInfoTitle: String { 
+    return MatrixKitL10n.tr("room_event_encryption_info_title") 
+  }
+  /// Unblacklist
+  public static var roomEventEncryptionInfoUnblock: String { 
+    return MatrixKitL10n.tr("room_event_encryption_info_unblock") 
+  }
+  /// Unverify
+  public static var roomEventEncryptionInfoUnverify: String { 
+    return MatrixKitL10n.tr("room_event_encryption_info_unverify") 
+  }
+  /// Verify...
+  public static var roomEventEncryptionInfoVerify: String { 
+    return MatrixKitL10n.tr("room_event_encryption_info_verify") 
+  }
+  /// To verify that this session can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this session matches the key below:\n\n	Session name: %@\n	Session ID: %@\n	Session key: %@\n\nIf it matches, press the verify button below. If it doesnt, then someone else is intercepting this session and you probably want to press the blacklist button instead.\n\nIn future this verification process will be more sophisticated.
+  public static func roomEventEncryptionVerifyMessage(_ p1: String, _ p2: String, _ p3: String) -> String {
+    return MatrixKitL10n.tr("room_event_encryption_verify_message", p1, p2, p3)
+  }
+  /// Verify
+  public static var roomEventEncryptionVerifyOk: String { 
+    return MatrixKitL10n.tr("room_event_encryption_verify_ok") 
+  }
+  /// Verify session\n\n
+  public static var roomEventEncryptionVerifyTitle: String { 
+    return MatrixKitL10n.tr("room_event_encryption_verify_title") 
+  }
+  /// You left the room
+  public static var roomLeft: String { 
+    return MatrixKitL10n.tr("room_left") 
+  }
+  /// You left
+  public static var roomLeftForDm: String { 
+    return MatrixKitL10n.tr("room_left_for_dm") 
+  }
+  /// Are you sure you want to hide all messages from this user?
+  public static var roomMemberIgnorePrompt: String { 
+    return MatrixKitL10n.tr("room_member_ignore_prompt") 
+  }
+  /// You will not be able to undo this change as you are promoting the user to have the same power level as yourself.\nAre you sure?
+  public static var roomMemberPowerLevelPrompt: String { 
+    return MatrixKitL10n.tr("room_member_power_level_prompt") 
+  }
+  /// Conference calls are not supported in encrypted rooms
+  public static var roomNoConferenceCallInEncryptedRooms: String { 
+    return MatrixKitL10n.tr("room_no_conference_call_in_encrypted_rooms") 
+  }
+  /// You need permission to invite to start a conference in this room
+  public static var roomNoPowerToCreateConferenceCall: String { 
+    return MatrixKitL10n.tr("room_no_power_to_create_conference_call") 
+  }
+  /// Please select a room
+  public static var roomPleaseSelect: String { 
+    return MatrixKitL10n.tr("room_please_select") 
+  }
+  /// Save
+  public static var save: String { 
+    return MatrixKitL10n.tr("save") 
+  }
+  /// No Results
+  public static var searchNoResults: String { 
+    return MatrixKitL10n.tr("search_no_results") 
+  }
+  /// Search in progress...
+  public static var searchSearching: String { 
+    return MatrixKitL10n.tr("search_searching") 
+  }
+  /// Select an account
+  public static var selectAccount: String { 
+    return MatrixKitL10n.tr("select_account") 
+  }
+  /// Select All
+  public static var selectAll: String { 
+    return MatrixKitL10n.tr("select_all") 
+  }
+  /// Send
+  public static var send: String { 
+    return MatrixKitL10n.tr("send") 
+  }
+  /// Set Admin
+  public static var setAdmin: String { 
+    return MatrixKitL10n.tr("set_admin") 
+  }
+  /// Reset Power Level
+  public static var setDefaultPowerLevel: String { 
+    return MatrixKitL10n.tr("set_default_power_level") 
+  }
+  /// Set Moderator
+  public static var setModerator: String { 
+    return MatrixKitL10n.tr("set_moderator") 
+  }
+  /// Set Power Level
+  public static var setPowerLevel: String { 
+    return MatrixKitL10n.tr("set_power_level") 
+  }
+  /// Settings
+  public static var settings: String { 
+    return MatrixKitL10n.tr("settings") 
+  }
+  /// Homeserver: %@
+  public static func settingsConfigHomeServer(_ p1: String) -> String {
+    return MatrixKitL10n.tr("settings_config_home_server", p1)
+  }
+  /// Identity server: %@
+  public static func settingsConfigIdentityServer(_ p1: String) -> String {
+    return MatrixKitL10n.tr("settings_config_identity_server", p1)
+  }
+  /// User ID: %@
+  public static func settingsConfigUserId(_ p1: String) -> String {
+    return MatrixKitL10n.tr("settings_config_user_id", p1)
+  }
+  /// Enable In-App notifications
+  public static var settingsEnableInappNotifications: String { 
+    return MatrixKitL10n.tr("settings_enable_inapp_notifications") 
+  }
+  /// Enable push notifications
+  public static var settingsEnablePushNotifications: String { 
+    return MatrixKitL10n.tr("settings_enable_push_notifications") 
+  }
+  /// Enter validation token for %@:
+  public static func settingsEnterValidationTokenFor(_ p1: String) -> String {
+    return MatrixKitL10n.tr("settings_enter_validation_token_for", p1)
+  }
+  /// Configuration
+  public static var settingsTitleConfig: String { 
+    return MatrixKitL10n.tr("settings_title_config") 
+  }
+  /// Notifications
+  public static var settingsTitleNotifications: String { 
+    return MatrixKitL10n.tr("settings_title_notifications") 
+  }
+  /// Share
+  public static var share: String { 
+    return MatrixKitL10n.tr("share") 
+  }
+  /// Show Details
+  public static var showDetails: String { 
+    return MatrixKitL10n.tr("show_details") 
+  }
+  /// Sign up
+  public static var signUp: String { 
+    return MatrixKitL10n.tr("sign_up") 
+  }
+  /// If the server administrator has said that this is expected, ensure that the fingerprint below matches the fingerprint provided by them.
+  public static var sslCertNewAccountExpl: String { 
+    return MatrixKitL10n.tr("ssl_cert_new_account_expl") 
+  }
+  /// This could mean that someone is maliciously intercepting your traffic, or that your phone does not trust the certificate provided by the remote server.
+  public static var sslCertNotTrust: String { 
+    return MatrixKitL10n.tr("ssl_cert_not_trust") 
+  }
+  /// Could not verify identity of remote server.
+  public static var sslCouldNotVerify: String { 
+    return MatrixKitL10n.tr("ssl_could_not_verify") 
+  }
+  /// The certificate has changed from a previously trusted one to one that is not trusted. The server may have renewed its certificate. Contact the server administrator for the expected fingerprint.
+  public static var sslExpectedExistingExpl: String { 
+    return MatrixKitL10n.tr("ssl_expected_existing_expl") 
+  }
+  /// Fingerprint (%@):
+  public static func sslFingerprintHash(_ p1: String) -> String {
+    return MatrixKitL10n.tr("ssl_fingerprint_hash", p1)
+  }
+  /// Homeserver URL: %@
+  public static func sslHomeserverUrl(_ p1: String) -> String {
+    return MatrixKitL10n.tr("ssl_homeserver_url", p1)
+  }
+  /// Logout
+  public static var sslLogoutAccount: String { 
+    return MatrixKitL10n.tr("ssl_logout_account") 
+  }
+  /// ONLY accept the certificate if the server administrator has published a fingerprint that matches the one above.
+  public static var sslOnlyAccept: String { 
+    return MatrixKitL10n.tr("ssl_only_accept") 
+  }
+  /// Ignore
+  public static var sslRemainOffline: String { 
+    return MatrixKitL10n.tr("ssl_remain_offline") 
+  }
+  /// Trust
+  public static var sslTrust: String { 
+    return MatrixKitL10n.tr("ssl_trust") 
+  }
+  /// The certificate has changed from one that was trusted by your phone. This is HIGHLY UNUSUAL. It is recommended that you DO NOT ACCEPT this new certificate.
+  public static var sslUnexpectedExistingExpl: String { 
+    return MatrixKitL10n.tr("ssl_unexpected_existing_expl") 
+  }
+  /// Start Chat
+  public static var startChat: String { 
+    return MatrixKitL10n.tr("start_chat") 
+  }
+  /// Start Video Call
+  public static var startVideoCall: String { 
+    return MatrixKitL10n.tr("start_video_call") 
+  }
+  /// Start Voice Call
+  public static var startVoiceCall: String { 
+    return MatrixKitL10n.tr("start_voice_call") 
+  }
+  /// Submit
+  public static var submit: String { 
+    return MatrixKitL10n.tr("submit") 
+  }
+  /// Submit code
+  public static var submitCode: String { 
+    return MatrixKitL10n.tr("submit_code") 
+  }
+  /// Un-ban
+  public static var unban: String { 
+    return MatrixKitL10n.tr("unban") 
+  }
+  /// Unignore
+  public static var unignore: String { 
+    return MatrixKitL10n.tr("unignore") 
+  }
+  /// Unsent
+  public static var unsent: String { 
+    return MatrixKitL10n.tr("unsent") 
+  }
+  /// ex: @bob:homeserver
+  public static var userIdPlaceholder: String { 
+    return MatrixKitL10n.tr("user_id_placeholder") 
+  }
+  /// User ID:
+  public static var userIdTitle: String { 
+    return MatrixKitL10n.tr("user_id_title") 
+  }
+  /// View
+  public static var view: String { 
+    return MatrixKitL10n.tr("view") 
+  }
+  /// Yes
+  public static var yes: String { 
+    return MatrixKitL10n.tr("yes") 
+  }
+}
+// swiftlint:enable function_parameter_count identifier_name line_length type_body_length
+
+// MARK: - Implementation Details
+
+extension MatrixKitL10n {
+  static func tr(_ key: String, _ args: CVarArg...) -> String {
+      let format = Bundle.mxk_localizedString(forKey: key)!
+      return String(format: format, arguments: args)
+    }
+}
+
+private final class BundleToken {}
diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift
index f3622c608..af25f0458 100644
--- a/Riot/Generated/Strings.swift
+++ b/Riot/Generated/Strings.swift
@@ -15,6 +15,10 @@ public class VectorL10n: NSObject {
   public static var accept: String { 
     return VectorL10n.tr("Vector", "accept") 
   }
+  /// button
+  public static var accessibilityButtonLabel: String { 
+    return VectorL10n.tr("Vector", "accessibility_button_label") 
+  }
   /// checkbox
   public static var accessibilityCheckboxLabel: String { 
     return VectorL10n.tr("Vector", "accessibility_checkbox_label") 
@@ -31,6 +35,58 @@ public class VectorL10n: NSObject {
   public static func activeCallDetails(_ p1: String) -> String {
     return VectorL10n.tr("Vector", "active_call_details", p1)
   }
+  /// Help us identify issues and improve Element by sharing anonymous usage data. To understand how people use multiple devices, we’ll generate a random identifier, shared by your devices.
+  public static var analyticsPromptMessageNewUser: String { 
+    return VectorL10n.tr("Vector", "analytics_prompt_message_new_user") 
+  }
+  /// You previously consented to share anonymous usage data with us. Now, to help understand how people use multiple devices, we’ll generate a random identifier, shared by your devices.
+  public static var analyticsPromptMessageUpgrade: String { 
+    return VectorL10n.tr("Vector", "analytics_prompt_message_upgrade") 
+  }
+  /// Not now
+  public static var analyticsPromptNotNow: String { 
+    return VectorL10n.tr("Vector", "analytics_prompt_not_now") 
+  }
+  /// We <b>don't</b> record or profile any account data
+  public static var analyticsPromptPoint1: String { 
+    return VectorL10n.tr("Vector", "analytics_prompt_point_1") 
+  }
+  /// We <b>don't</b> share information with third parties
+  public static var analyticsPromptPoint2: String { 
+    return VectorL10n.tr("Vector", "analytics_prompt_point_2") 
+  }
+  /// You can turn this off anytime in settings
+  public static var analyticsPromptPoint3: String { 
+    return VectorL10n.tr("Vector", "analytics_prompt_point_3") 
+  }
+  /// Stop sharing
+  public static var analyticsPromptStop: String { 
+    return VectorL10n.tr("Vector", "analytics_prompt_stop") 
+  }
+  /// here
+  public static var analyticsPromptTermsLinkNewUser: String { 
+    return VectorL10n.tr("Vector", "analytics_prompt_terms_link_new_user") 
+  }
+  /// here
+  public static var analyticsPromptTermsLinkUpgrade: String { 
+    return VectorL10n.tr("Vector", "analytics_prompt_terms_link_upgrade") 
+  }
+  /// You can read all our terms %@.
+  public static func analyticsPromptTermsNewUser(_ p1: String) -> String {
+    return VectorL10n.tr("Vector", "analytics_prompt_terms_new_user", p1)
+  }
+  /// Read all our terms %@. Is that OK?
+  public static func analyticsPromptTermsUpgrade(_ p1: String) -> String {
+    return VectorL10n.tr("Vector", "analytics_prompt_terms_upgrade", p1)
+  }
+  /// Help improve %@
+  public static func analyticsPromptTitle(_ p1: String) -> String {
+    return VectorL10n.tr("Vector", "analytics_prompt_title", p1)
+  }
+  /// Yes, that's fine
+  public static var analyticsPromptYes: String { 
+    return VectorL10n.tr("Vector", "analytics_prompt_yes") 
+  }
   /// Please review and accept the policies of this homeserver:
   public static var authAcceptPolicies: String { 
     return VectorL10n.tr("Vector", "auth_accept_policies") 
@@ -1235,6 +1291,10 @@ public class VectorL10n: NSObject {
   public static var emojiPickerTitle: String { 
     return VectorL10n.tr("Vector", "emoji_picker_title") 
   }
+  /// Enable
+  public static var enable: String { 
+    return VectorL10n.tr("Vector", "enable") 
+  }
   /// Send an encrypted message…
   public static var encryptedRoomMessagePlaceholder: String { 
     return VectorL10n.tr("Vector", "encrypted_room_message_placeholder") 
@@ -1439,10 +1499,6 @@ public class VectorL10n: NSObject {
   public static var gdprConsentNotGivenAlertReviewNowAction: String { 
     return VectorL10n.tr("Vector", "gdpr_consent_not_given_alert_review_now_action") 
   }
-  /// Would you like to help improve %@ by automatically reporting anonymous crash reports and usage data?
-  public static func googleAnalyticsUsePrompt(_ p1: String) -> String {
-    return VectorL10n.tr("Vector", "google_analytics_use_prompt", p1)
-  }
   /// Home
   public static var groupDetailsHome: String { 
     return VectorL10n.tr("Vector", "group_details_home") 
@@ -2363,6 +2419,106 @@ public class VectorL10n: NSObject {
   public static func pinProtectionSettingsSectionHeaderWithBiometrics(_ p1: String) -> String {
     return VectorL10n.tr("Vector", "pin_protection_settings_section_header_with_biometrics", p1)
   }
+  /// Add option
+  public static var pollEditFormAddOption: String { 
+    return VectorL10n.tr("Vector", "poll_edit_form_add_option") 
+  }
+  /// Create options
+  public static var pollEditFormCreateOptions: String { 
+    return VectorL10n.tr("Vector", "poll_edit_form_create_options") 
+  }
+  /// Create poll
+  public static var pollEditFormCreatePoll: String { 
+    return VectorL10n.tr("Vector", "poll_edit_form_create_poll") 
+  }
+  /// Write something
+  public static var pollEditFormInputPlaceholder: String { 
+    return VectorL10n.tr("Vector", "poll_edit_form_input_placeholder") 
+  }
+  /// Option %lu
+  public static func pollEditFormOptionNumber(_ p1: Int) -> String {
+    return VectorL10n.tr("Vector", "poll_edit_form_option_number", p1)
+  }
+  /// Poll question or topic
+  public static var pollEditFormPollQuestionOrTopic: String { 
+    return VectorL10n.tr("Vector", "poll_edit_form_poll_question_or_topic") 
+  }
+  /// OK
+  public static var pollEditFormPostFailureAction: String { 
+    return VectorL10n.tr("Vector", "poll_edit_form_post_failure_action") 
+  }
+  /// Please try again
+  public static var pollEditFormPostFailureSubtitle: String { 
+    return VectorL10n.tr("Vector", "poll_edit_form_post_failure_subtitle") 
+  }
+  /// Failed to post poll
+  public static var pollEditFormPostFailureTitle: String { 
+    return VectorL10n.tr("Vector", "poll_edit_form_post_failure_title") 
+  }
+  /// Question or topic
+  public static var pollEditFormQuestionOrTopic: String { 
+    return VectorL10n.tr("Vector", "poll_edit_form_question_or_topic") 
+  }
+  /// OK
+  public static var pollTimelineNotClosedAction: String { 
+    return VectorL10n.tr("Vector", "poll_timeline_not_closed_action") 
+  }
+  /// Please try again
+  public static var pollTimelineNotClosedSubtitle: String { 
+    return VectorL10n.tr("Vector", "poll_timeline_not_closed_subtitle") 
+  }
+  /// Failed to end poll
+  public static var pollTimelineNotClosedTitle: String { 
+    return VectorL10n.tr("Vector", "poll_timeline_not_closed_title") 
+  }
+  /// 1 vote
+  public static var pollTimelineOneVote: String { 
+    return VectorL10n.tr("Vector", "poll_timeline_one_vote") 
+  }
+  /// Final results based on %lu votes
+  public static func pollTimelineTotalFinalResults(_ p1: Int) -> String {
+    return VectorL10n.tr("Vector", "poll_timeline_total_final_results", p1)
+  }
+  /// Final results based on 1 vote
+  public static var pollTimelineTotalFinalResultsOneVote: String { 
+    return VectorL10n.tr("Vector", "poll_timeline_total_final_results_one_vote") 
+  }
+  /// No votes cast
+  public static var pollTimelineTotalNoVotes: String { 
+    return VectorL10n.tr("Vector", "poll_timeline_total_no_votes") 
+  }
+  /// 1 vote cast
+  public static var pollTimelineTotalOneVote: String { 
+    return VectorL10n.tr("Vector", "poll_timeline_total_one_vote") 
+  }
+  /// 1 vote cast. Vote to the see the results
+  public static var pollTimelineTotalOneVoteNotVoted: String { 
+    return VectorL10n.tr("Vector", "poll_timeline_total_one_vote_not_voted") 
+  }
+  /// %lu votes cast
+  public static func pollTimelineTotalVotes(_ p1: Int) -> String {
+    return VectorL10n.tr("Vector", "poll_timeline_total_votes", p1)
+  }
+  /// %lu votes cast. Vote to the see the results
+  public static func pollTimelineTotalVotesNotVoted(_ p1: Int) -> String {
+    return VectorL10n.tr("Vector", "poll_timeline_total_votes_not_voted", p1)
+  }
+  /// OK
+  public static var pollTimelineVoteNotRegisteredAction: String { 
+    return VectorL10n.tr("Vector", "poll_timeline_vote_not_registered_action") 
+  }
+  /// Sorry, your vote was not registered, please try again
+  public static var pollTimelineVoteNotRegisteredSubtitle: String { 
+    return VectorL10n.tr("Vector", "poll_timeline_vote_not_registered_subtitle") 
+  }
+  /// Vote not registered
+  public static var pollTimelineVoteNotRegisteredTitle: String { 
+    return VectorL10n.tr("Vector", "poll_timeline_vote_not_registered_title") 
+  }
+  /// %lu votes
+  public static func pollTimelineVotesCount(_ p1: Int) -> String {
+    return VectorL10n.tr("Vector", "poll_timeline_votes_count", p1)
+  }
   /// Preview
   public static var preview: String { 
     return VectorL10n.tr("Vector", "preview") 
@@ -2887,6 +3043,10 @@ public class VectorL10n: NSObject {
   public static var roomEventActionEdit: String { 
     return VectorL10n.tr("Vector", "room_event_action_edit") 
   }
+  /// End poll
+  public static var roomEventActionEndPoll: String { 
+    return VectorL10n.tr("Vector", "room_event_action_end_poll") 
+  }
   /// Forward
   public static var roomEventActionForward: String { 
     return VectorL10n.tr("Vector", "room_event_action_forward") 
@@ -2923,6 +3083,10 @@ public class VectorL10n: NSObject {
   public static var roomEventActionRedact: String { 
     return VectorL10n.tr("Vector", "room_event_action_redact") 
   }
+  /// Remove poll
+  public static var roomEventActionRemovePoll: String { 
+    return VectorL10n.tr("Vector", "room_event_action_remove_poll") 
+  }
   /// Reply
   public static var roomEventActionReply: String { 
     return VectorL10n.tr("Vector", "room_event_action_reply") 
@@ -4119,6 +4283,10 @@ public class VectorL10n: NSObject {
   public static var settingsAdvanced: String { 
     return VectorL10n.tr("Vector", "settings_advanced") 
   }
+  /// Send crash and analytics data
+  public static var settingsAnalyticsAndCrashData: String { 
+    return VectorL10n.tr("Vector", "settings_analytics_and_crash_data") 
+  }
   /// Call invitations
   public static var settingsCallInvitations: String { 
     return VectorL10n.tr("Vector", "settings_call_invitations") 
@@ -4507,14 +4675,14 @@ public class VectorL10n: NSObject {
   public static var settingsLabsEnableRingingForGroupCalls: String { 
     return VectorL10n.tr("Vector", "settings_labs_enable_ringing_for_group_calls") 
   }
+  /// Polls
+  public static var settingsLabsEnabledPolls: String { 
+    return VectorL10n.tr("Vector", "settings_labs_enabled_polls") 
+  }
   /// React to messages with emoji
   public static var settingsLabsMessageReaction: String { 
     return VectorL10n.tr("Vector", "settings_labs_message_reaction") 
   }
-  /// Voice messages
-  public static var settingsLabsVoiceMessages: String { 
-    return VectorL10n.tr("Vector", "settings_labs_voice_messages") 
-  }
   /// LINKS
   public static var settingsLinks: String { 
     return VectorL10n.tr("Vector", "settings_links") 
@@ -4647,10 +4815,6 @@ public class VectorL10n: NSObject {
   public static var settingsSecurity: String { 
     return VectorL10n.tr("Vector", "settings_security") 
   }
-  /// Send anon crash & usage data
-  public static var settingsSendCrashReport: String { 
-    return VectorL10n.tr("Vector", "settings_send_crash_report") 
-  }
   /// SENDING IMAGES AND VIDEOS
   public static var settingsSendingMedia: String { 
     return VectorL10n.tr("Vector", "settings_sending_media") 
diff --git a/Riot/Managers/Analytics/Analytics.h b/Riot/Managers/Analytics/Analytics.h
deleted file mode 100644
index 5ad851929..000000000
--- a/Riot/Managers/Analytics/Analytics.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- Copyright 2018 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/Foundation.h>
-
-#import <MatrixSDK/MatrixSDK.h>
-
-
-// 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;
-
-
-/**
- `Analytics` sends analytics to an analytics tool.
- */
-@interface Analytics : NSObject <MXAnalyticsDelegate>
-
-/**
- Returns the shared Analytics manager.
-
- @return the shared Analytics manager.
- */
-+ (instancetype)sharedInstance;
-
-/**
- Start doing analytics if the settings `enableCrashReport` is enabled.
- */
-- (void)start;
-
-/**
- Stop doing analytics.
- */
-- (void)stop;
-
-/**
- Track a screen display.
-
- @param screenName the name of the displayed screen.
- */
-- (void)trackScreen:(NSString*)screenName;
-
-/**
- Flush analytics data.
- */
-- (void)dispatch;
-
-@end
diff --git a/Riot/Managers/Analytics/Analytics.m b/Riot/Managers/Analytics/Analytics.m
deleted file mode 100644
index cb7062932..000000000
--- a/Riot/Managers/Analytics/Analytics.m
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- Copyright 2018 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 "Analytics.h"
-
-#import "Riot-Swift.h"
-
-
-NSString *const AnalyticsNoficationsCategory = @"notifications";
-NSString *const AnalyticsNoficationsTimeToDisplayContent = @"timelineDisplay";
-NSString *const AnalyticsContactsIdentityServerAccepted = @"identityServerAccepted";
-
-
-// Duration data will be visible under the Piwik category called "Performance".
-// Other values will be visible in "Metrics".
-// Some Matomo screenshots are available at https://github.com/vector-im/element-ios/pull/3789.
-NSString *const kAnalyticsPerformanceCategory = @"Performance";
-NSString *const kAnalyticsMetricsCategory = @"Metrics";
-
-
-@import MatomoTracker;
-
-@interface Analytics ()
-{
-    MatomoTracker *matomoTracker;
-}
-
-@end
-
-@implementation Analytics
-
-+ (instancetype)sharedInstance
-{
-    static Analytics *sharedInstance = nil;
-    static dispatch_once_t onceToken;
-
-    dispatch_once(&onceToken, ^{
-        sharedInstance = [[Analytics alloc] init];
-    });
-
-    return sharedInstance;
-}
-
-- (instancetype)init
-{
-    self = [super init];
-    if (self)
-    {
-        matomoTracker = [[MatomoTracker alloc] initWithSiteId:BuildSettings.analyticsAppId
-                                                      baseURL:BuildSettings.analyticsServerUrl
-                                                    userAgent:@"iOSMatomoTracker"];
-        [self migrateFromFourPointFourSharedInstance];
-    }
-    return self;
-}
-
-- (void)migrateFromFourPointFourSharedInstance
-{
-    if ([[NSUserDefaults standardUserDefaults] boolForKey:@"migratedFromFourPointFourSharedInstance"]) return;
-    [matomoTracker copyFromOldSharedInstance];
-    [[NSUserDefaults standardUserDefaults] setBool:true forKey:@"migratedFromFourPointFourSharedInstance"];
-}
-
-- (void)start
-{
-    // Check whether the user has enabled the sending of crash reports.
-    if (RiotSettings.shared.enableCrashReport)
-    {
-        matomoTracker.isOptedOut = NO;
-
-        [matomoTracker setCustomVariableWithIndex:1 name:@"App Platform" value:@"iOS Platform"];
-        [matomoTracker setCustomVariableWithIndex:2 name:@"App Version" value:[AppDelegate theDelegate].appVersion];
-
-        // The language is either the one selected by the user within the app
-        // or, else, the one configured by the OS
-        NSString *language = [NSBundle mxk_language] ? [NSBundle mxk_language] : [[NSBundle mainBundle] preferredLocalizations][0];
-        [matomoTracker setCustomVariableWithIndex:4 name:@"Chosen Language" value:language];
-
-        MXKAccount* account = [MXKAccountManager sharedManager].activeAccounts.firstObject;
-        if (account)
-        {
-            [matomoTracker setCustomVariableWithIndex:7 name:@"Homeserver URL" value:account.mxCredentials.homeServer];
-            [matomoTracker setCustomVariableWithIndex:8 name:@"Identity Server URL" value:account.identityServerURL];
-        }
-
-        // TODO: We should also track device and os version
-        // But that needs to be decided for all platforms
-
-        // Catch and log crashes
-        [MXLogger logCrashes:YES];
-        [MXLogger setBuildVersion:[AppDelegate theDelegate].build];
-
-#ifdef DEBUG
-        // Disable analytics in debug as it pollutes stats
-        matomoTracker.isOptedOut = YES;
-#endif
-    }
-    else
-    {
-        MXLogDebug(@"[AppDelegate] The user decided to not send analytics");
-        matomoTracker.isOptedOut = YES;
-        [MXLogger logCrashes:NO];
-    }
-}
-
-- (void)stop
-{
-    matomoTracker.isOptedOut = YES;
-    [MXLogger logCrashes:NO];
-}
-
-- (void)trackScreen:(NSString *)screenName
-{
-    // Use the same pattern as Android
-    NSString *appName = [[NSBundle mainBundle] infoDictionary][@"CFBundleDisplayName"];
-    NSString *appVersion = [AppDelegate theDelegate].appVersion;
-
-    [matomoTracker trackWithView:@[@"ios", appName, appVersion, screenName]
-                                     url:nil];
-}
-
-- (void)dispatch
-{
-    [matomoTracker dispatch];
-}
-
-#pragma mark - MXAnalyticsDelegate
-
-- (void)trackDuration:(NSTimeInterval)seconds category:(NSString*)category name:(NSString*)name
-{
-    // Report time in ms to make figures look better in Matomo
-    NSNumber *value = @(seconds * 1000);
-    [matomoTracker trackWithEventWithCategory:kAnalyticsPerformanceCategory
-                                       action:category
-                                         name:name
-                                       number:value
-                                          url:nil];
-}
-
-- (void)trackValue:(NSNumber*)value category:(NSString*)category name:(NSString*)name
-{
-    [matomoTracker trackWithEventWithCategory:kAnalyticsMetricsCategory
-                                       action:category
-                                         name:name
-                                       number:value
-                                          url:nil];
-}
-
-@end
diff --git a/Riot/Managers/Analytics/DecryptionFailure.h b/Riot/Managers/Analytics/DecryptionFailure.h
deleted file mode 100644
index 7ea43962c..000000000
--- a/Riot/Managers/Analytics/DecryptionFailure.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- Copyright 2018 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/Foundation.h>
-
-/**
- Failure reasons as defined in https://docs.google.com/document/d/1es7cTCeJEXXfRCTRgZerAM2Wg5ZerHjvlpfTW-gsOfI.
- */
-struct DecryptionFailureReasonStruct
-{
-    __unsafe_unretained NSString * const unspecified;
-    __unsafe_unretained NSString * const olmKeysNotSent;
-    __unsafe_unretained NSString * const olmIndexError;
-    __unsafe_unretained NSString * const unexpected;
-};
-extern const struct DecryptionFailureReasonStruct DecryptionFailureReason;
-
-/**
- `DecryptionFailure` represents a decryption failure.
- */
-@interface DecryptionFailure : NSObject
-
-/**
- The id of the event that was unabled to decrypt.
- */
-@property (nonatomic) NSString *failedEventId;
-
-/**
- The time the failure has been reported.
- */
-@property (nonatomic, readonly) NSTimeInterval ts;
-
-/**
- Decryption failure reason.
- */
-@property (nonatomic) NSString *reason;
-
-@end
diff --git a/Riot/Managers/AppInfo/BuildInfo.m b/Riot/Managers/AppInfo/BuildInfo.m
index a1dbffe14..525088caa 100644
--- a/Riot/Managers/AppInfo/BuildInfo.m
+++ b/Riot/Managers/AppInfo/BuildInfo.m
@@ -16,11 +16,7 @@
 
 #import "BuildInfo.h"
 
-#ifdef IS_SHARE_EXTENSION
-#import "RiotShareExtension-Swift.h"
-#else
-#import "Riot-Swift.h"
-#endif
+#import "GeneratedInterface-Swift.h"
 
 #define MAKE_STRING(x) #x
 #define MAKE_NS_STRING(x) @MAKE_STRING(x)
diff --git a/Riot/Managers/BugReport/RageShakeManager.h b/Riot/Managers/BugReport/RageShakeManager.h
index a220800b7..2caff3e88 100644
--- a/Riot/Managers/BugReport/RageShakeManager.h
+++ b/Riot/Managers/BugReport/RageShakeManager.h
@@ -17,7 +17,7 @@
 #import <UIKit/UIKit.h>
 #import <MessageUI/MessageUI.h>
 
-#import <MatrixKit/MXKResponderRageShaking.h>
+#import "MatrixKit.h"
 
 @interface RageShakeManager : NSObject <MXKResponderRageShaking>
 
diff --git a/Riot/Managers/BugReport/RageShakeManager.m b/Riot/Managers/BugReport/RageShakeManager.m
index 13bd5c985..4ce848240 100644
--- a/Riot/Managers/BugReport/RageShakeManager.m
+++ b/Riot/Managers/BugReport/RageShakeManager.m
@@ -21,9 +21,7 @@
 
 #import "BugReportViewController.h"
 
-#import <MatrixKit/MatrixKit.h>
-
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 static RageShakeManager* sharedInstance = nil;
 
diff --git a/Riot/Managers/Call/CallPresenter.swift b/Riot/Managers/Call/CallPresenter.swift
index c0d286ab9..4a08f0e45 100644
--- a/Riot/Managers/Call/CallPresenter.swift
+++ b/Riot/Managers/Call/CallPresenter.swift
@@ -15,7 +15,6 @@
 //
 
 import Foundation
-import MatrixKit
 
 // swiftlint:disable file_length
 
diff --git a/Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift b/Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
index 3203fdf11..5085e9efb 100644
--- a/Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
+++ b/Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
@@ -16,8 +16,8 @@
 
 import UIKit
 import KeychainAccess
-import MatrixKit
 import CommonCrypto
+import MatrixSDK
 
 @objcMembers
 class EncryptionKeyManager: NSObject, MXKeyProviderDelegate {
diff --git a/Riot/Managers/LocalAuthentication/LocalAuthenticationService.swift b/Riot/Managers/LocalAuthentication/LocalAuthenticationService.swift
index 14e97094b..83b9ec265 100644
--- a/Riot/Managers/LocalAuthentication/LocalAuthenticationService.swift
+++ b/Riot/Managers/LocalAuthentication/LocalAuthenticationService.swift
@@ -15,7 +15,6 @@
 //
 
 import Foundation
-import MatrixKit
 
 @objcMembers
 class LocalAuthenticationService: NSObject {
diff --git a/Riot/Managers/PushNotification/PushNotificationService.m b/Riot/Managers/PushNotification/PushNotificationService.m
index 24ab4246d..59fb9604a 100644
--- a/Riot/Managers/PushNotification/PushNotificationService.m
+++ b/Riot/Managers/PushNotification/PushNotificationService.m
@@ -17,10 +17,8 @@
 
 #import "PushNotificationService.h"
 
-#import <MatrixKit/MatrixKit.h>
-
 #import <PushKit/PushKit.h>
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface PushNotificationService()<PKPushRegistryDelegate>
 
@@ -266,6 +264,15 @@ Matrix session observer used to detect new opened sessions.
 - (void)configurePushKit
 {
     MXLogDebug(@"[PushNotificationService] configurePushKit")
+    NSData* token = [_pushRegistry pushTokenForType:PKPushTypeVoIP];
+    if (token) {
+        // If the token is available, store it. This can happen if you sign out and back in.
+        // i.e We are registered, but we have cleared it from the the store on logout and the
+        // _pushRegistry lives through signin/signout as PushNotificationService is a singleton
+        // on app delegate.
+        _pushNotificationStore.pushKitToken = token;
+        MXLogDebug(@"[PushNotificationService] configurePushKit: Restored pushKit token")
+    }
     
     _pushRegistry.delegate = self;
     _pushRegistry.desiredPushTypes = [NSSet setWithObject:PKPushTypeVoIP];
diff --git a/Riot/Managers/Settings/RiotSettings.swift b/Riot/Managers/Settings/RiotSettings.swift
index 9e1ccd05b..3aa22a842 100644
--- a/Riot/Managers/Settings/RiotSettings.swift
+++ b/Riot/Managers/Settings/RiotSettings.swift
@@ -23,7 +23,8 @@ final class RiotSettings: NSObject {
     // MARK: - Constants
     
     public enum UserDefaultsKeys {
-        static let enableCrashReport = "enableCrashReport"
+        static let enableAnalytics = "enableAnalytics"
+        static let matomoAnalytics = "enableCrashReport"
         static let notificationsShowDecryptedContent = "showDecryptedContent"
         static let allowStunServerFallback = "allowStunServerFallback"
         static let pinRoomsWithMissedNotificationsOnHome = "pinRoomsWithMissedNotif"
@@ -100,13 +101,31 @@ final class RiotSettings: NSObject {
     
     // MARK: Other
     
-    /// Indicate if `enableCrashReport` settings has been set once.
-    var isEnableCrashReportHasBeenSetOnce: Bool {
-        return RiotSettings.defaults.object(forKey: UserDefaultsKeys.enableCrashReport) != nil
+    /// Whether the user was previously shown the Matomo analytics prompt.
+    var hasSeenAnalyticsPrompt: Bool {
+        RiotSettings.defaults.object(forKey: UserDefaultsKeys.enableAnalytics) != nil
     }
     
-    @UserDefault(key: UserDefaultsKeys.enableCrashReport, defaultValue: false, storage: defaults)
-    var enableCrashReport
+    /// Whether the user has both seen the Matomo analytics prompt and declined it.
+    var hasDeclinedMatomoAnalytics: Bool {
+        RiotSettings.defaults.object(forKey: UserDefaultsKeys.matomoAnalytics) != nil && !RiotSettings.defaults.bool(forKey: UserDefaultsKeys.matomoAnalytics)
+    }
+    
+    /// Whether the user previously accepted the Matomo analytics prompt.
+    /// This allows these users to be shown a different prompt to explain the changes.
+    var hasAcceptedMatomoAnalytics: Bool {
+        RiotSettings.defaults.bool(forKey: UserDefaultsKeys.matomoAnalytics)
+    }
+    
+    /// `true` when the user has opted in to send analytics.
+    @UserDefault(key: UserDefaultsKeys.enableAnalytics, defaultValue: false, storage: defaults)
+    var enableAnalytics
+    
+    /// Indicates if the device has already called identify for this session to PostHog.
+    /// This is separate to `enableAnalytics` as logging out will leave analytics
+    /// enabled but reset identification.
+    @UserDefault(key: "isIdentifiedForAnalytics", defaultValue: false, storage: defaults)
+    var isIdentifiedForAnalytics
     
     @UserDefault(key: "enableRageShake", defaultValue: false, storage: defaults)
     var enableRageShake
@@ -143,7 +162,7 @@ final class RiotSettings: NSObject {
     @UserDefault(key: "roomsAllowToJoinPublicRooms", defaultValue: BuildSettings.roomsAllowToJoinPublicRooms, storage: defaults)
     var roomsAllowToJoinPublicRooms
     
-    @UserDefault(key: UserDefaultsKeys.showAllRoomsInHomeSpace, defaultValue: false, storage: defaults)
+    @UserDefault(key: UserDefaultsKeys.showAllRoomsInHomeSpace, defaultValue: true, storage: defaults)
     var showAllRoomsInHomeSpace
     
     // MARK: - Room Screen
@@ -166,6 +185,9 @@ final class RiotSettings: NSObject {
     @UserDefault(key: "roomScreenAllowFilesAction", defaultValue: BuildSettings.roomScreenAllowFilesAction, storage: defaults)
     var roomScreenAllowFilesAction
     
+    @UserDefault(key: "roomScreenAllowPollsAction", defaultValue: false, storage: defaults)
+    var roomScreenAllowPollsAction
+        
     @UserDefault(key: "roomScreenShowsURLPreviews", defaultValue: true, storage: defaults)
     var roomScreenShowsURLPreviews
     
diff --git a/Riot/Managers/Theme/ThemeService.h b/Riot/Managers/Theme/ThemeService.h
index 7fcaff121..24e01f82f 100644
--- a/Riot/Managers/Theme/ThemeService.h
+++ b/Riot/Managers/Theme/ThemeService.h
@@ -16,7 +16,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import <UIKit/UIKit.h>
 
 @protocol Theme;
 
diff --git a/Riot/Managers/Theme/ThemeService.m b/Riot/Managers/Theme/ThemeService.m
index 175ab5f64..b205bbb6d 100644
--- a/Riot/Managers/Theme/ThemeService.m
+++ b/Riot/Managers/Theme/ThemeService.m
@@ -18,11 +18,7 @@
 
 #import "ThemeService.h"
 
-#ifdef IS_SHARE_EXTENSION
-#import "RiotShareExtension-Swift.h"
-#else
-#import "Riot-Swift.h"
-#endif
+#import "GeneratedInterface-Swift.h"
 
 NSString *const kThemeServiceDidChangeThemeNotification = @"kThemeServiceDidChangeThemeNotification";
 
diff --git a/Riot/Managers/Widgets/WidgetManager.m b/Riot/Managers/Widgets/WidgetManager.m
index 416d5f4f6..2b25d2e13 100644
--- a/Riot/Managers/Widgets/WidgetManager.m
+++ b/Riot/Managers/Widgets/WidgetManager.m
@@ -17,12 +17,10 @@
 
 #import "WidgetManager.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 #import "JitsiWidgetData.h"
 #import "MXSession+Riot.h"
 
-#import <MatrixKit/MatrixKit.h>
-
 #pragma mark - Contants
 
 NSString *const kWidgetManagerDidUpdateWidgetNotification = @"kWidgetManagerDidUpdateWidgetNotification";
diff --git a/Riot/Model/Contact/Contact.h b/Riot/Model/Contact/Contact.h
index 31036dedd..93a243609 100644
--- a/Riot/Model/Contact/Contact.h
+++ b/Riot/Model/Contact/Contact.h
@@ -14,7 +14,8 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
+#import <MatrixSDK/MatrixSDK.h>
 
 @interface Contact : MXKContact
 
diff --git a/Riot/Model/Room/RoomPreviewData.h b/Riot/Model/Room/RoomPreviewData.h
index f6f51bdca..f67712ccc 100644
--- a/Riot/Model/Room/RoomPreviewData.h
+++ b/Riot/Model/Room/RoomPreviewData.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 #import "RoomEmailInvitation.h"
 #import "RoomDataSource.h"
 
diff --git a/Riot/Model/Room/RoomPreviewData.m b/Riot/Model/Room/RoomPreviewData.m
index 07ece4510..f619344ed 100644
--- a/Riot/Model/Room/RoomPreviewData.m
+++ b/Riot/Model/Room/RoomPreviewData.m
@@ -16,7 +16,8 @@
  */
 
 #import "RoomPreviewData.h"
-#import <MatrixSDK-Swift.h>
+
+#import "GeneratedInterface-Swift.h"
 
 @implementation RoomPreviewData
 
diff --git a/Riot/Modules/Analytics/Analytics.swift b/Riot/Modules/Analytics/Analytics.swift
new file mode 100644
index 000000000..535ca7b2a
--- /dev/null
+++ b/Riot/Modules/Analytics/Analytics.swift
@@ -0,0 +1,259 @@
+// 
+// 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 PostHog
+import AnalyticsEvents
+
+/// A class responsible for managing an analytics client
+/// and sending events through this client.
+@objcMembers class Analytics: NSObject {
+    
+    // MARK: - Properties
+    
+    /// The singleton instance to be used within the Riot target.
+    static let shared = Analytics()
+    
+    /// The analytics client to send events with.
+    private var client: AnalyticsClientProtocol = PostHogAnalyticsClient()
+    
+    /// The service used to interact with account data settings.
+    private var service: AnalyticsService?
+    
+    /// Whether or not the object is enabled and sending events to the server.
+    var isRunning: Bool { client.isRunning }
+    
+    /// Whether to show the user the analytics opt in prompt.
+    var shouldShowAnalyticsPrompt: Bool {
+        // Only show the prompt once, and when analytics are configured in BuildSettings.
+        !RiotSettings.shared.hasSeenAnalyticsPrompt && PHGPostHogConfiguration.standard != nil
+    }
+    
+    /// Indicates whether the user previously accepted Matomo analytics and should be shown the upgrade prompt.
+    var promptShouldDisplayUpgradeMessage: Bool {
+        RiotSettings.shared.hasAcceptedMatomoAnalytics
+    }
+    
+    // MARK: - Public
+    
+    /// Opts in to analytics tracking with the supplied session.
+    /// - Parameter session: An optional session to use to when reading/generating the analytics ID.
+    ///  The session will be ignored if not running.
+    func optIn(with session: MXSession?) {
+        RiotSettings.shared.enableAnalytics = true
+        startIfEnabled()
+        
+        guard let session = session else { return }
+        useAnalyticsSettings(from: session)
+    }
+    
+    /// Stops analytics tracking and calls `reset` to clear any IDs and event queues.
+    func optOut() {
+        RiotSettings.shared.enableAnalytics = false
+        
+        // The order is important here. PostHog ignores the reset if stopped.
+        reset()
+        client.stop()
+        
+        MXLog.debug("[Analytics] Stopped.")
+    }
+    
+    /// Starts the analytics client if the user has opted in, otherwise does nothing.
+    func startIfEnabled() {
+        guard RiotSettings.shared.enableAnalytics, !isRunning else { return }
+        
+        client.start()
+        
+        // Sanity check in case something went wrong.
+        guard client.isRunning else { return }
+        
+        MXLog.debug("[Analytics] Started.")
+        
+        // Catch and log crashes
+        MXLogger.logCrashes(true)
+        MXLogger.setBuildVersion(AppDelegate.theDelegate().build)
+    }
+    
+    /// Use the analytics settings from the supplied session to configure analytics.
+    /// For now this is only used for (pseudonymous) identification.
+    /// - Parameter session: The session to read analytics settings from.
+    func useAnalyticsSettings(from session: MXSession) {
+        guard
+            RiotSettings.shared.enableAnalytics,
+            !RiotSettings.shared.isIdentifiedForAnalytics
+        else { return }
+        
+        let service = AnalyticsService(session: session)
+        self.service = service
+        
+        service.settings { [weak self] result in
+            guard let self = self else { return }
+            
+            switch result {
+            case .success(let settings):
+                self.identify(with: settings)
+                self.service = nil
+            case .failure:
+                MXLog.error("[Analytics] Failed to use analytics settings. Will continue to run without analytics ID.")
+                self.service = nil
+            }
+        }
+    }
+    
+    /// Resets the any IDs and event queues in the analytics client. This method should
+    /// be called on sign-out to maintain opt-in status, whilst ensuring the next
+    /// account used isn't associated with the previous one.
+    /// Note: **MUST** be called before stopping PostHog or the reset is ignored.
+    func reset() {
+        client.reset()
+        MXLog.debug("[Analytics] Reset.")
+        RiotSettings.shared.isIdentifiedForAnalytics = false
+        
+        // Stop collecting crash logs
+        MXLogger.logCrashes(false)
+    }
+    
+    /// Flushes the event queue in the analytics client, uploading all pending events.
+    /// Normally events are sent in batches. Call this method when you need an event
+    /// to be sent immediately.
+    func forceUpload() {
+        client.flush()
+    }
+    
+    // MARK: - Private
+    
+    /// Identify (pseudonymously) any future events with the ID from the analytics account data settings.
+    /// - Parameter settings: The settings to use for identification. The ID must be set *before* calling this method.
+    private func identify(with settings: AnalyticsSettings) {
+        guard let id = settings.id else {
+            MXLog.error("[Analytics] identify(with:) called before an ID has been generated.")
+            return
+        }
+        
+        client.identify(id: id)
+        MXLog.debug("[Analytics] Identified.")
+        RiotSettings.shared.isIdentifiedForAnalytics = true
+    }
+    
+    /// Capture an event in the `client`.
+    /// - Parameter event: The event to capture.
+    private func capture(event: AnalyticsEventProtocol) {
+        client.capture(event)
+    }
+}
+
+// MARK: - Public tracking methods
+// The following methods are exposed for compatibility with Objective-C as
+// the `capture` method and the generated events cannot be bridged from Swift.
+extension Analytics {
+    /// Track the presentation of a screen
+    /// - Parameters:
+    ///   - screen: The screen that was shown.
+    ///   - milliseconds: An optional value representing how long the screen was shown for in milliseconds.
+    func trackScreen(_ screen: AnalyticsScreen, duration milliseconds: Int?) {
+        let event = AnalyticsEvent.Screen(durationMs: milliseconds, screenName: screen.screenName)
+        client.screen(event)
+    }
+    
+    /// The the presentation of a screen without including a duration
+    /// - Parameter screen: The screen that was shown
+    func trackScreen(_ screen: AnalyticsScreen) {
+        trackScreen(screen, duration: nil)
+    }
+    
+    /// Track an element that has been tapped
+    /// - Parameters:
+    ///   - tap: The element that was tapped
+    ///   - index: The index of the element, if it's in a list of elements
+    func trackTap(_ tap: AnalyticsUIElement, index: Int?) {
+        let event = AnalyticsEvent.Click(index: index, name: tap.elementName)
+        client.capture(event)
+    }
+    
+    /// Track an element that has been tapped without including an index
+    /// - Parameters:
+    ///   - tap: The element that was tapped
+    func trackTap(_ tap: AnalyticsUIElement) {
+        trackTap(tap, index: nil)
+    }
+    
+    /// Track an E2EE error that occurred
+    /// - Parameters:
+    ///   - reason: The error that occurred.
+    ///   - count: The number of times that error occurred.
+    func trackE2EEError(_ reason: DecryptionFailureReason, count: Int) {
+        for _ in 0..<count {
+            let event = AnalyticsEvent.Error(context: nil, domain: .E2EE, name: reason.errorName)
+            capture(event: event)
+        }
+    }
+    
+    /// Track whether the user accepted or declined the terms to an identity server.
+    /// **Note** This method isn't currently implemented.
+    /// - Parameter accepted: Whether the terms were accepted.
+    func trackIdentityServerAccepted(_ accepted: Bool) {
+        // Do we still want to track this?
+    }
+}
+
+// MARK: - MXAnalyticsDelegate
+extension Analytics: MXAnalyticsDelegate {
+    func trackDuration(_ milliseconds: Int, name: MXTaskProfileName, units: UInt) {
+        guard let analyticsName = name.analyticsName else {
+            MXLog.warning("[Analytics] Attempt to capture unknown profile task: \(name.rawValue)")
+            return
+        }
+        
+        let event = AnalyticsEvent.PerformanceTimer(context: nil, itemCount: Int(units), name: analyticsName, timeMs: milliseconds)
+        capture(event: event)
+    }
+    
+    func trackCallStarted(withVideo isVideo: Bool, numberOfParticipants: Int, incoming isIncoming: Bool) {
+        let event = AnalyticsEvent.CallStarted(isVideo: isVideo, numParticipants: numberOfParticipants, placed: !isIncoming)
+        capture(event: event)
+    }
+    
+    func trackCallEnded(withDuration duration: Int, video isVideo: Bool, numberOfParticipants: Int, incoming isIncoming: Bool) {
+        let event = AnalyticsEvent.CallEnded(durationMs: duration, isVideo: isVideo, numParticipants: numberOfParticipants, placed: !isIncoming)
+        capture(event: event)
+    }
+    
+    func trackCallError(with reason: __MXCallHangupReason, video isVideo: Bool, numberOfParticipants: Int, incoming isIncoming: Bool) {
+        let callEvent = AnalyticsEvent.CallError(isVideo: isVideo, numParticipants: numberOfParticipants, placed: !isIncoming)
+        let event = AnalyticsEvent.Error(context: nil, domain: .VOIP, name: reason.errorName)
+        capture(event: callEvent)
+        capture(event: event)
+    }
+    
+    func trackCreatedRoom(asDM isDM: Bool) {
+        let event = AnalyticsEvent.CreatedRoom(isDM: isDM)
+        capture(event: event)
+    }
+    
+    func trackJoinedRoom(asDM isDM: Bool, memberCount: UInt) {
+        guard let roomSize = AnalyticsEvent.JoinedRoom.RoomSize(memberCount: memberCount) else {
+            MXLog.warning("[Analytics] Attempt to capture joined room with invalid member count: \(memberCount)")
+            return
+        }
+        
+        let event = AnalyticsEvent.JoinedRoom(isDM: isDM, roomSize: roomSize)
+        capture(event: event)
+    }
+    
+    /// **Note** This method isn't currently implemented.
+    func trackContactsAccessGranted(_ granted: Bool) {
+        // Do we still want to track this?
+    }
+}
diff --git a/Riot/Modules/Analytics/AnalyticsClientProtocol.swift b/Riot/Modules/Analytics/AnalyticsClientProtocol.swift
new file mode 100644
index 000000000..af07a58fb
--- /dev/null
+++ b/Riot/Modules/Analytics/AnalyticsClientProtocol.swift
@@ -0,0 +1,48 @@
+// 
+// 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 AnalyticsEvents
+
+/// A protocol representing an analytics client.
+protocol AnalyticsClientProtocol {
+    /// Whether the analytics client is currently reporting data or ignoring it.
+    var isRunning: Bool { get }
+    
+    /// Starts the analytics client reporting data.
+    func start()
+    
+    /// Associate the client with an ID. This is persisted until `reset` is called.
+    /// - Parameter id: The ID to associate with the user.
+    func identify(id: String)
+    
+    /// Reset all stored properties and any event queues on the client. Note that
+    /// the client will remain active, but in a fresh unidentified state.
+    func reset()
+    
+    /// Stop the analytics client reporting data.
+    func stop()
+    
+    /// Send any queued events immediately.
+    func flush()
+    
+    /// Capture the supplied analytics event.
+    /// - Parameter event: The event to capture.
+    func capture(_ event: AnalyticsEventProtocol)
+    
+    /// Capture the supplied analytics screen event.
+    /// - Parameter event: The screen event to capture.
+    func screen(_ event: AnalyticsScreenProtocol)
+}
diff --git a/Riot/Modules/Analytics/AnalyticsScreen.swift b/Riot/Modules/Analytics/AnalyticsScreen.swift
new file mode 100644
index 000000000..86f567acd
--- /dev/null
+++ b/Riot/Modules/Analytics/AnalyticsScreen.swift
@@ -0,0 +1,114 @@
+// 
+// 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 AnalyticsEvents
+
+@objc enum AnalyticsScreen: Int {
+    case sidebar
+    case home
+    case favourites
+    case people
+    case rooms
+    case searchRooms
+    case searchMessages
+    case searchPeople
+    case searchFiles
+    case room
+    case roomDetails
+    case roomMembers
+    case user
+    case roomSearch
+    case roomUploads
+    case roomSettings
+    case roomNotifications
+    case roomDirectory
+    case switchDirectory
+    case startChat
+    case createRoom
+    case settings
+    case settingsSecurity
+    case settingsDefaultNotifications
+    case settingsMentionsAndKeywords
+    case deactivateAccount
+    case group
+    case myGroups
+    case inviteFriends
+    
+    /// The screen name reported to the AnalyticsEvent.
+    var screenName: AnalyticsEvent.Screen.ScreenName {
+        switch self {
+        case .sidebar:
+            return .MobileSidebar
+        case .home:
+            return .Home
+        case .favourites:
+            return .MobileFavourites
+        case .people:
+            return .MobilePeople
+        case .rooms:
+            return .MobileRooms
+        case .searchRooms:
+            return .MobileSearchRooms
+        case .searchMessages:
+            return .MobileSearchMessages
+        case .searchPeople:
+            return .MobileSearchPeople
+        case .searchFiles:
+            return .MobileSearchFiles
+        case .room:
+            return .Room
+        case .roomDetails:
+            return .RoomDetails
+        case .roomMembers:
+            return .RoomMembers
+        case .user:
+            return .User
+        case .roomSearch:
+            return .RoomSearch
+        case .roomUploads:
+            return .RoomUploads
+        case .roomSettings:
+            return .RoomSettings
+        case .roomNotifications:
+            return .RoomNotifications
+        case .roomDirectory:
+            return .RoomDirectory
+        case .switchDirectory:
+            return .MobileSwitchDirectory
+        case .startChat:
+            return .StartChat
+        case .createRoom:
+            return .CreateRoom
+        case .settings:
+            return .Settings
+        case .settingsSecurity:
+            return .SettingsSecurity
+        case .settingsDefaultNotifications:
+            return .SettingsDefaultNotifications
+        case .settingsMentionsAndKeywords:
+            return .SettingsMentionsAndKeywords
+        case .deactivateAccount:
+            return .DeactivateAccount
+        case .group:
+            return .Group
+        case .myGroups:
+            return .MyGroups
+        case .inviteFriends:
+            return .MobileInviteFriends
+        }
+    }
+}
diff --git a/Riot/Modules/Analytics/AnalyticsScreenTimer.swift b/Riot/Modules/Analytics/AnalyticsScreenTimer.swift
new file mode 100644
index 000000000..5c704f8d8
--- /dev/null
+++ b/Riot/Modules/Analytics/AnalyticsScreenTimer.swift
@@ -0,0 +1,82 @@
+// 
+// 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 object to record how long a screen has been presented for and
+/// report the screen's display to the `Analytics` object.
+@objcMembers class AnalyticsScreenTimer: NSObject {
+    
+    // MARK: - Properties
+    
+    /// The screen being tracked.
+    private let screen: AnalyticsScreen
+    
+    /// The date that the screen was presented to the user.
+    private var startDate: Date?
+    /// Whether the app was backgrounded whilst the screen was being presented.
+    private var didPause = false
+    
+    /// The duration in milliseconds that the screen has been shown for. The value will
+    /// be reported as `nil` if the timer isn't running, or if the app was backgrounded
+    /// during the screen's display.
+    private var duration: Int? {
+        guard let startDate = startDate else {
+            MXLog.warning("[AnalyticsScreenTimer] Duration requested on a stopped timer!")
+            return nil
+        }
+        
+        // Consider the duration invalid if the app has been backgrounded
+        guard !didPause else { return nil }
+        
+        let timeInterval = Date().timeIntervalSince(startDate)
+        return Int(timeInterval * 1000)
+    }
+    
+    // MARK: - Setup
+    
+    /// Create a new screen timer for the specified screen.
+    /// - Parameter screen: The screen that should be timed.
+    init(screen: AnalyticsScreen) {
+        self.screen = screen
+        
+        super.init()
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(pause), name: UIApplication.willResignActiveNotification, object: nil)
+    }
+    
+    // MARK: - Public
+    
+    /// Start the timer.
+    func start() {
+        startDate = Date()
+    }
+    
+    /// Stop the timer and report the screen to `Analytics`.
+    func stop() {
+        guard let duration = duration else { return }
+        
+        Analytics.shared.trackScreen(screen, duration: duration)
+        self.startDate = nil
+    }
+    
+    // MARK: - Private
+    
+    /// Record that the timer has been interrupted by the app moving to the background.
+    @objc private func pause() {
+        didPause = true
+    }
+}
diff --git a/Riot/Modules/Analytics/AnalyticsService.swift b/Riot/Modules/Analytics/AnalyticsService.swift
new file mode 100644
index 000000000..bf24edfd1
--- /dev/null
+++ b/Riot/Modules/Analytics/AnalyticsService.swift
@@ -0,0 +1,77 @@
+// 
+// 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 AnalyticsServiceError: Error {
+    /// The session supplied to the service does not have a state of `MXSessionStateRunning`.
+    case sessionIsNotRunning
+    /// An error occurred but the session did not report what it was.
+    case unknown
+}
+
+/// A service responsible for handling the `im.vector.analytics` event from the user's account data.
+class AnalyticsService {
+    let session: MXSession
+    
+    /// Creates an analytics service with the supplied session.
+    /// - Parameter session: The session to use when reading analytics settings from account data.
+    init(session: MXSession) {
+        self.session = session
+    }
+    
+    /// The analytics settings for the current user. Calling this method will check whether the settings already
+    /// contain an `id` property and if not, will add one to the account data before calling the completion.
+    /// - Parameter completion: A completion handler that will be called when the request completes.
+    ///
+    /// The request will fail if the service's session does not have the `MXSessionStateRunning` state.
+    func settings(completion: @escaping (Result<AnalyticsSettings, Error>) -> Void) {
+        // Only use the session if it is running otherwise we could wipe out an existing analytics ID.
+        guard session.state == .running else {
+            MXLog.warning("[AnalyticsService] Aborting attempt to read analytics settings. The session may not be up-to-date.")
+            completion(.failure(AnalyticsServiceError.sessionIsNotRunning))
+            return
+        }
+    
+        let settings = AnalyticsSettings(accountData: session.accountData)
+        
+        // The id has already be set so we are done here.
+        if settings.id != nil {
+            completion(.success(settings))
+            return
+        }
+        
+        // Create a new ID and modify the event dictionary.
+        let id = UUID().uuidString
+        
+        var eventDictionary = settings.dictionary
+        eventDictionary[AnalyticsSettings.Constants.idKey] = id
+        
+        session.setAccountData(eventDictionary, forType: AnalyticsSettings.eventType) { [weak self] in
+            guard let self = self else {
+                completion(.failure(AnalyticsServiceError.unknown))
+                return
+            }
+            
+            MXLog.debug("[AnalyticsService] Successfully updated analytics settings in account data.")
+            let settings = AnalyticsSettings(accountData: self.session.accountData)
+            completion(.success(settings))
+        } failure: { error in
+            MXLog.warning("[AnalyticsService] Failed to update analytics settings.")
+            completion(.failure(error ?? AnalyticsServiceError.unknown))
+        }
+    }
+}
diff --git a/Riot/Modules/Analytics/AnalyticsSettings.swift b/Riot/Modules/Analytics/AnalyticsSettings.swift
new file mode 100644
index 000000000..e847f0668
--- /dev/null
+++ b/Riot/Modules/Analytics/AnalyticsSettings.swift
@@ -0,0 +1,65 @@
+// 
+// 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
+
+/// An analytics settings event from the user's account data.
+struct AnalyticsSettings {
+    static let eventType = "im.vector.analytics"
+    
+    enum Constants {
+        static let idKey = "id"
+        static let webOptInKey = "pseudonymousAnalyticsOptIn"
+    }
+    
+    /// A randomly generated analytics token for this user.
+    /// This is suggested to be a UUID string.
+    let id: String?
+    
+    /// Whether the user has opted in on web or not. This is unused on iOS but necessary
+    /// to store here so that it's value is preserved when updating the account data if we
+    /// generated an ID on iOS.
+    ///
+    /// `true` if opted in on web, `false` if opted out on web and `nil` if the web prompt is not yet seen.
+    private let webOptIn: Bool?
+}
+
+extension AnalyticsSettings {
+    // Private as AnalyticsSettings should only be created from an MXSession
+    private init(dictionary: Dictionary<AnyHashable, Any>?) {
+        self.id = dictionary?[Constants.idKey] as? String
+        self.webOptIn = dictionary?[Constants.webOptInKey] as? Bool
+    }
+    
+    /// A dictionary representation of the settings.
+    var dictionary: Dictionary<AnyHashable, Any> {
+        var dictionary = [AnyHashable: Any]()
+        dictionary[Constants.idKey] = id
+        dictionary[Constants.webOptInKey] = webOptIn
+        
+        return dictionary
+    }
+}
+
+// MARK: - Public initializer
+
+extension AnalyticsSettings {
+    /// Create the analytics settings from account data.
+    /// - Parameter accountData: The account data to read the event from.
+    init(accountData: MXAccountData) {
+        self.init(dictionary: accountData.accountData(forEventType: AnalyticsSettings.eventType))
+    }
+}
diff --git a/Riot/Modules/Analytics/AnalyticsUIElement.swift b/Riot/Modules/Analytics/AnalyticsUIElement.swift
new file mode 100644
index 000000000..93a08e7e2
--- /dev/null
+++ b/Riot/Modules/Analytics/AnalyticsUIElement.swift
@@ -0,0 +1,32 @@
+// 
+// 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 AnalyticsEvents
+
+/// A tappable UI element that can be track in Analytics.
+@objc enum AnalyticsUIElement: Int {
+    case sendMessageButton
+    
+    /// The element name reported to the AnalyticsEvent.
+    var elementName: AnalyticsEvent.Click.Name {
+        switch self {
+        // Note: This is a test element that doesn't need to be captured.
+        // It will likely be removed when the AnalyticsEvent.Click is updated.
+        case .sendMessageButton:
+            return .SendMessageButton
+        }
+    }
+}
diff --git a/Riot/Modules/Analytics/DecryptionFailure.swift b/Riot/Modules/Analytics/DecryptionFailure.swift
new file mode 100644
index 000000000..d011a0413
--- /dev/null
+++ b/Riot/Modules/Analytics/DecryptionFailure.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 AnalyticsEvents
+
+/// Failure reasons as defined in https://docs.google.com/document/d/1es7cTCeJEXXfRCTRgZerAM2Wg5ZerHjvlpfTW-gsOfI.
+@objc enum DecryptionFailureReason: Int {
+    case unspecified
+    case olmKeysNotSent
+    case olmIndexError
+    case unexpected
+    
+    var errorName: AnalyticsEvent.Error.Name {
+        switch self {
+        case .unspecified:
+            return .OlmUnspecifiedError
+        case .olmKeysNotSent:
+            return .OlmKeysNotSentError
+        case .olmIndexError:
+            return .OlmIndexError
+        case .unexpected:
+            return .UnknownError
+        }
+    }
+}
+
+/// `DecryptionFailure` represents a decryption failure.
+@objcMembers class DecryptionFailure: NSObject {
+    /// The id of the event that was unabled to decrypt.
+    let failedEventId: String
+    /// The time the failure has been reported.
+    let ts: TimeInterval = Date().timeIntervalSince1970
+    /// Decryption failure reason.
+    let reason: DecryptionFailureReason
+    
+    init(failedEventId: String, reason: DecryptionFailureReason) {
+        self.failedEventId = failedEventId
+        self.reason = reason
+    }
+}
diff --git a/Riot/Managers/Analytics/DecryptionFailureTracker.h b/Riot/Modules/Analytics/DecryptionFailureTracker.h
similarity index 92%
rename from Riot/Managers/Analytics/DecryptionFailureTracker.h
rename to Riot/Modules/Analytics/DecryptionFailureTracker.h
index b2dbbfc77..b8f9ca467 100644
--- a/Riot/Managers/Analytics/DecryptionFailureTracker.h
+++ b/Riot/Modules/Analytics/DecryptionFailureTracker.h
@@ -16,8 +16,9 @@
 
 #import <Foundation/Foundation.h>
 
-#import "DecryptionFailure.h"
+@class DecryptionFailureTracker;
 
+@class Analytics;
 @import MatrixSDK;
 
 @interface DecryptionFailureTracker : NSObject
@@ -32,7 +33,7 @@
 /**
  The delegate object to receive analytics events.
  */
-@property (nonatomic, weak) id<MXAnalyticsDelegate> delegate;
+@property (nonatomic, weak) Analytics *delegate;
 
 /**
  Report an event unable to decrypt.
diff --git a/Riot/Managers/Analytics/DecryptionFailureTracker.m b/Riot/Modules/Analytics/DecryptionFailureTracker.m
similarity index 83%
rename from Riot/Managers/Analytics/DecryptionFailureTracker.m
rename to Riot/Modules/Analytics/DecryptionFailureTracker.m
index 56521eb58..0f2b2ff81 100644
--- a/Riot/Managers/Analytics/DecryptionFailureTracker.m
+++ b/Riot/Modules/Analytics/DecryptionFailureTracker.m
@@ -15,6 +15,7 @@
  */
 
 #import "DecryptionFailureTracker.h"
+#import "GeneratedInterface-Swift.h"
 
 
 // Call `checkFailures` every `CHECK_INTERVAL`
@@ -90,31 +91,32 @@ NSString *const kDecryptionFailureTrackerAnalyticsCategory = @"e2e.failure";
         return;
     }
 
-    DecryptionFailure *decryptionFailure = [[DecryptionFailure alloc] init];
-    decryptionFailure.failedEventId = event.eventId;
+    NSString *failedEventId = event.eventId;
+    DecryptionFailureReason reason;
 
     // Categorise the error
     switch (event.decryptionError.code)
     {
         case MXDecryptingErrorUnknownInboundSessionIdCode:
-            decryptionFailure.reason = DecryptionFailureReason.olmKeysNotSent;
+            reason = DecryptionFailureReasonOlmKeysNotSent;
             break;
 
         case MXDecryptingErrorOlmCode:
-            decryptionFailure.reason = DecryptionFailureReason.olmIndexError;
+            reason = DecryptionFailureReasonOlmIndexError;
             break;
 
         case MXDecryptingErrorEncryptionNotEnabledCode:
         case MXDecryptingErrorUnableToDecryptCode:
-            decryptionFailure.reason = DecryptionFailureReason.unexpected;
+            reason = DecryptionFailureReasonUnexpected;
             break;
 
         default:
-            decryptionFailure.reason = DecryptionFailureReason.unspecified;
+            reason = DecryptionFailureReasonUnspecified;
             break;
     }
 
-    reportedFailures[event.eventId] = decryptionFailure;
+    reportedFailures[event.eventId] = [[DecryptionFailure alloc] initWithFailedEventId:failedEventId
+                                                                                reason:reason];
 }
 
 - (void)dispatch
@@ -152,17 +154,17 @@ NSString *const kDecryptionFailureTrackerAnalyticsCategory = @"e2e.failure";
     if (failuresToTrack.count)
     {
         // Sort failures by error reason
-        NSMutableDictionary<NSString*, NSNumber*> *failuresCounts = [NSMutableDictionary dictionary];
+        NSMutableDictionary<NSNumber*, NSNumber*> *failuresCounts = [NSMutableDictionary dictionary];
         for (DecryptionFailure *failure in failuresToTrack)
         {
-            failuresCounts[failure.reason] = @(failuresCounts[failure.reason].unsignedIntegerValue + 1);
+            failuresCounts[@(failure.reason)] = @(failuresCounts[@(failure.reason)].unsignedIntegerValue + 1);
         }
 
         MXLogDebug(@"[DecryptionFailureTracker] trackFailures: %@", failuresCounts);
         
-        for (NSString *reason in failuresCounts)
+        for (NSNumber *reason in failuresCounts)
         {
-            [_delegate trackValue:failuresCounts[reason] category:kDecryptionFailureTrackerAnalyticsCategory name:reason];
+            [self.delegate trackE2EEError:reason.integerValue count:failuresCounts[reason].integerValue];
         }
     }
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewState.swift b/Riot/Modules/Analytics/Helpers/JoinedRoomSize+MemberCount.swift
similarity index 56%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewState.swift
rename to Riot/Modules/Analytics/Helpers/JoinedRoomSize+MemberCount.swift
index c296d6d38..d5473d5f9 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewState.swift
+++ b/Riot/Modules/Analytics/Helpers/JoinedRoomSize+MemberCount.swift
@@ -14,19 +14,23 @@
 // limitations under the License.
 //
 
-import Foundation
+import AnalyticsEvents
 
-/// State managed by the `ViewModel` delivered to the `View`.
-struct TemplateRoomChatViewState: BindableState {
-    var roomInitializationStatus: TemplateRoomChatRoomInitializationStatus
-    let roomName: String?
-    var bubbles: [TemplateRoomChatBubble]
-    var bindings: TemplateRoomChatViewModelBindings
-}
-
-extension TemplateRoomChatViewState {
-    var sendButtonEnabled: Bool {
-        !bindings.messageInput.isEmpty
+extension AnalyticsEvent.JoinedRoom.RoomSize {
+    init?(memberCount: UInt) {
+        switch memberCount {
+        case 2:
+            self = .Two
+        case 3...10:
+            self = .ThreeToTen
+        case 11...100:
+            self = .ElevenToOneHundred
+        case 101...1000:
+            self = .OneHundredAndOneToAThousand
+        case 1001...:
+            self = .MoreThanAThousand
+        default:
+            return nil
+        }
     }
 }
-
diff --git a/Riot/Modules/Analytics/Helpers/MXCallHangupReason+Analytics.swift b/Riot/Modules/Analytics/Helpers/MXCallHangupReason+Analytics.swift
new file mode 100644
index 000000000..4b8911ce8
--- /dev/null
+++ b/Riot/Modules/Analytics/Helpers/MXCallHangupReason+Analytics.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 AnalyticsEvents
+
+extension __MXCallHangupReason {
+    var errorName: AnalyticsEvent.Error.Name {
+        switch self {
+        case .userHangup:
+            return .VoipUserHangup
+        case .inviteTimeout:
+            return .VoipInviteTimeout
+        case .iceFailed:
+            return .VoipIceFailed
+        case .iceTimeout:
+            return .VoipIceTimeout
+        case .userMediaFailed:
+            return .VoipUserMediaFailed
+        case .unknownError:
+            return .UnknownError
+        default:
+            return .UnknownError
+        }
+    }
+}
diff --git a/Riot/Modules/Analytics/Helpers/MXTaskProfileName+Analytics.swift b/Riot/Modules/Analytics/Helpers/MXTaskProfileName+Analytics.swift
new file mode 100644
index 000000000..99f89174e
--- /dev/null
+++ b/Riot/Modules/Analytics/Helpers/MXTaskProfileName+Analytics.swift
@@ -0,0 +1,42 @@
+// 
+// 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 AnalyticsEvents
+
+extension MXTaskProfileName {
+    var analyticsName: AnalyticsEvent.PerformanceTimer.Name? {
+        switch self {
+        case .startupIncrementalSync:
+            return .StartupIncrementalSync
+        case .startupInitialSync:
+            return .StartupInitialSync
+        case .startupLaunchScreen:
+            return .StartupLaunchScreen
+        case .startupStorePreload:
+            return .StartupStorePreload
+        case .startupMountData:
+            return .StartupStoreReady
+        case .initialSyncRequest:
+            return .InitialSyncRequest
+        case .initialSyncParsing:
+            return .InitialSyncParsing
+        case .notificationsOpenEvent:
+            return .NotificationsOpenEvent
+        default:
+            return nil
+        }
+    }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMember.swift b/Riot/Modules/Analytics/PHGPostHogConfiguration.swift
similarity index 60%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMember.swift
rename to Riot/Modules/Analytics/PHGPostHogConfiguration.swift
index 54f6121c1..c02b85c30 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMember.swift
+++ b/Riot/Modules/Analytics/PHGPostHogConfiguration.swift
@@ -14,23 +14,15 @@
 // limitations under the License.
 //
 
-import Foundation
+import PostHog
 
-/// A user who is a member of the room.
-struct TemplateRoomChatMember {
-    let id: String
-    let avatarUrl: String?
-    let displayName: String?
-}
-
-extension TemplateRoomChatMember: Avatarable {
-    var mxContentUri: String? {
-        avatarUrl
-    }
-    
-    var matrixItemId: String {
-        id
+extension PHGPostHogConfiguration {
+    static var standard: PHGPostHogConfiguration? {
+        guard let apiKey = BuildSettings.analyticsKey, let host = BuildSettings.analyticsHost else { return nil }
+        
+        let configuration = PHGPostHogConfiguration(apiKey: apiKey, host: host)
+        configuration.shouldSendDeviceID = false
+        
+        return configuration
     }
 }
-
-extension TemplateRoomChatMember: Identifiable, Equatable {}
diff --git a/Riot/Modules/Analytics/PostHogAnalyticsClient.swift b/Riot/Modules/Analytics/PostHogAnalyticsClient.swift
new file mode 100644
index 000000000..1c7172112
--- /dev/null
+++ b/Riot/Modules/Analytics/PostHogAnalyticsClient.swift
@@ -0,0 +1,65 @@
+// 
+// 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 PostHog
+import AnalyticsEvents
+
+/// An analytics client that reports events to a PostHog server.
+class PostHogAnalyticsClient: AnalyticsClientProtocol {
+    /// The PHGPostHog object used to report events.
+    private var postHog: PHGPostHog?
+    
+    var isRunning: Bool { postHog?.enabled ?? false }
+    
+    func start() {
+        // Only start if analytics have been configured in BuildSettings
+        guard let configuration = PHGPostHogConfiguration.standard else { return }
+        
+        if postHog == nil {
+            postHog = PHGPostHog(configuration: configuration)
+        }
+        
+        postHog?.enable()
+    }
+    
+    func identify(id: String) {
+        postHog?.identify(id)
+    }
+    
+    func reset() {
+        postHog?.reset()
+    }
+    
+    func stop() {
+        postHog?.disable()
+        
+        // As of PostHog 1.4.4, setting the client to nil here doesn't release
+        // it. Keep it around to avoid having multiple instances if the user re-enables
+    }
+    
+    func flush() {
+        postHog?.flush()
+    }
+    
+    func capture(_ event: AnalyticsEventProtocol) {
+        postHog?.capture(event.eventName, properties: event.properties)
+    }
+    
+    func screen(_ event: AnalyticsScreenProtocol) {
+        postHog?.screen(event.screenName.rawValue, properties: event.properties)
+    }
+    
+}
diff --git a/Riot/Modules/Application/AppCoordinator.swift b/Riot/Modules/Application/AppCoordinator.swift
index 32121a0f6..d60faf924 100755
--- a/Riot/Modules/Application/AppCoordinator.swift
+++ b/Riot/Modules/Application/AppCoordinator.swift
@@ -228,7 +228,7 @@ extension AppCoordinator: LegacyAppDelegateDelegate {
     }
     
     func legacyAppDelegateRestoreEmptyDetailsViewController(_ legacyAppDelegate: LegacyAppDelegate!) {
-        self.splitViewCoordinator?.restorePlaceholderDetails()
+        self.splitViewCoordinator?.resetDetails(animated: false)
     }
     
     func legacyAppDelegate(_ legacyAppDelegate: LegacyAppDelegate!, didAddMatrixSession session: MXSession!) {
diff --git a/Riot/Modules/Application/LegacyAppDelegate.h b/Riot/Modules/Application/LegacyAppDelegate.h
index 6a3e2c3be..40e3c2377 100644
--- a/Riot/Modules/Application/LegacyAppDelegate.h
+++ b/Riot/Modules/Application/LegacyAppDelegate.h
@@ -16,13 +16,12 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 #import "MasterTabBarController.h"
 #import "JitsiViewController.h"
 
 #import "RageShakeManager.h"
-#import "Analytics.h"
 
 #import "ThemeService.h"
 #import "UniversalLink.h"
diff --git a/Riot/Modules/Application/LegacyAppDelegate.m b/Riot/Modules/Application/LegacyAppDelegate.m
index 6b9816643..fd6354ad3 100644
--- a/Riot/Modules/Application/LegacyAppDelegate.m
+++ b/Riot/Modules/Application/LegacyAppDelegate.m
@@ -36,8 +36,6 @@
 #import "RoomKeyRequestViewController.h"
 #import "DecryptionFailureTracker.h"
 
-#import <MatrixKit/MatrixKit.h>
-
 #import "Tools.h"
 #import "WidgetManager.h"
 
@@ -55,7 +53,7 @@
 #import "MXSession+Riot.h"
 #import "MXRoom+Riot.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 #import "PushNotificationService.h"
 
 //#define MX_CALL_STACK_OPENWEBRTC
@@ -393,7 +391,6 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
     MXLogDebug(@"------------------------------");
     MXLogDebug(@"Application info:");
     MXLogDebug(@"%@ version: %@", appDisplayName, appVersion);
-    MXLogDebug(@"MatrixKit version: %@", MatrixKitVersion);
     MXLogDebug(@"MatrixSDK version: %@", MatrixSDKVersion);
     MXLogDebug(@"Build: %@\n", build);
     MXLogDebug(@"------------------------------\n");
@@ -436,16 +433,16 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
     _isAppForeground = NO;
     _handleSelfVerificationRequest = YES;
     
-    // Configure our analytics. It will indeed start if the option is enabled
-    Analytics *analytics = [Analytics sharedInstance];
+    // Configure our analytics. It will start if the option is enabled
+    Analytics *analytics = Analytics.shared;
     [MXSDKOptions sharedInstance].analyticsDelegate = analytics;
-    [DecryptionFailureTracker sharedInstance].delegate = [Analytics sharedInstance];
+    [DecryptionFailureTracker sharedInstance].delegate = analytics;
     
     MXBaseProfiler *profiler = [MXBaseProfiler new];
     profiler.analytics = analytics;
     [MXSDKOptions sharedInstance].profiler = profiler;
     
-    [analytics start];
+    [analytics startIfEnabled];
 
     self.localAuthenticationService = [[LocalAuthenticationService alloc] initWithPinCodePreferences:[PinCodePreferences shared]];
     
@@ -590,7 +587,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
     
     // Analytics: Force to send the pending actions
     [[DecryptionFailureTracker sharedInstance] dispatch];
-    [[Analytics sharedInstance] dispatch];
+    [Analytics.shared forceUpload];
 }
 
 - (void)applicationWillEnterForeground:(UIApplication *)application
@@ -651,9 +648,13 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
     MXLogDebug(@"[AppDelegate] afterAppUnlockedByPin");
     
     // Check if there is crash log to send
-    if (RiotSettings.shared.enableCrashReport)
+    if (RiotSettings.shared.enableAnalytics)
     {
+        #if DEBUG
+        // Don't show alerts for crashes during development.
+        #else
         [self checkExceptionToReport];
+        #endif
     }
     
     // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
@@ -1883,6 +1884,11 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
             
             [self.pushNotificationService checkPushKitPushersInSession:mxSession];
         }
+        else if (mxSession.state == MXSessionStateRunning)
+        {
+            // Configure analytics from the session if necessary
+            [Analytics.shared useAnalyticsSettingsFrom:mxSession];
+        }
         else if (mxSession.state == MXSessionStateClosed)
         {
             [self removeMatrixSession:mxSession];
@@ -2228,6 +2234,9 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
     //  Reset push notification store
     [self.pushNotificationStore reset];
     
+    // Reset analytics
+    [Analytics.shared reset];
+    
 #ifdef MX_CALL_STACK_ENDPOINT
     // Erase all created certificates and private keys by MXEndpointCallStack
     for (MXKAccount *account in MXKAccountManager.sharedManager.accounts)
@@ -2393,8 +2402,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
         
         launchAnimationContainerView = launchLoadingView;
         
-        [MXSDKOptions.sharedInstance.profiler startMeasuringTaskWithName:kMXAnalyticsStartupLaunchScreen
-                                                        category:kMXAnalyticsStartupCategory];
+        [MXSDKOptions.sharedInstance.profiler startMeasuringTaskWithName:MXTaskProfileNameStartupLaunchScreen];
     }
 }
 
@@ -2403,7 +2411,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
     if (launchAnimationContainerView)
     {
         id<MXProfiler> profiler = MXSDKOptions.sharedInstance.profiler;
-        MXTaskProfile *launchTaskProfile = [profiler taskProfileWithName:kMXAnalyticsStartupLaunchScreen category:kMXAnalyticsStartupCategory];
+        MXTaskProfile *launchTaskProfile = [profiler taskProfileWithName:MXTaskProfileNameStartupLaunchScreen];
         if (launchTaskProfile)
         {
             [profiler stopMeasuringTaskWithProfile:launchTaskProfile];
@@ -2500,17 +2508,17 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
 
 - (void)checkLocalPrivateKeysInSession:(MXSession*)mxSession
 {
-    id<MXCryptoStore> cryptoStore = mxSession.crypto.store;
+    MXRecoveryService *recoveryService = mxSession.crypto.recoveryService;
     NSUInteger keysCount = 0;
-    if ([cryptoStore secretWithSecretId:MXSecretId.keyBackup])
+    if ([recoveryService hasSecretWithSecretId:MXSecretId.keyBackup])
     {
         keysCount++;
     }
-    if ([cryptoStore secretWithSecretId:MXSecretId.crossSigningUserSigning])
+    if ([recoveryService hasSecretWithSecretId:MXSecretId.crossSigningUserSigning])
     {
         keysCount++;
     }
-    if ([cryptoStore secretWithSecretId:MXSecretId.crossSigningSelfSigning])
+    if ([recoveryService hasSecretWithSecretId:MXSecretId.crossSigningSelfSigning])
     {
         keysCount++;
     }
diff --git a/Riot/Modules/Authentication/AuthenticationViewController.h b/Riot/Modules/Authentication/AuthenticationViewController.h
index a689fd5ae..133f0a867 100644
--- a/Riot/Modules/Authentication/AuthenticationViewController.h
+++ b/Riot/Modules/Authentication/AuthenticationViewController.h
@@ -16,7 +16,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @protocol AuthenticationViewControllerDelegate;
 
diff --git a/Riot/Modules/Authentication/AuthenticationViewController.m b/Riot/Modules/Authentication/AuthenticationViewController.m
index d40090c3d..67b2a9e8b 100644
--- a/Riot/Modules/Authentication/AuthenticationViewController.m
+++ b/Riot/Modules/Authentication/AuthenticationViewController.m
@@ -18,14 +18,13 @@
 
 #import "AuthenticationViewController.h"
 
-#import "Riot-Swift.h"
 #import "MXSession+Riot.h"
 
 #import "AuthInputsView.h"
 #import "ForgotPasswordInputsView.h"
 #import "AuthFallBackViewController.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
 
@@ -310,9 +309,6 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"Authentication"];
     
     [_keyboardAvoider startAvoiding];
 }
@@ -331,7 +327,7 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
         return;
     }        
 
-    // Verify that the app does not show the authentification screean whereas
+    // Verify that the app does not show the authentication screen whereas
     // the user has already logged in.
     // This bug rarely happens (https://github.com/vector-im/riot-ios/issues/1643)
     // but it invites the user to log in again. They will then lose all their
diff --git a/Riot/Modules/Authentication/Views/AuthInputsView.h b/Riot/Modules/Authentication/Views/AuthInputsView.h
index 4f857c682..c0090f517 100644
--- a/Riot/Modules/Authentication/Views/AuthInputsView.h
+++ b/Riot/Modules/Authentication/Views/AuthInputsView.h
@@ -15,12 +15,11 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
-#import "Riot-Swift.h"
-
-@interface AuthInputsView : MXKAuthInputsView <MXKCountryPickerViewControllerDelegate>
+@class TermsView;
 
+@interface AuthInputsView : MXKAuthInputsView
 @property (weak, nonatomic) IBOutlet UITextField *userLoginTextField;
 @property (weak, nonatomic) IBOutlet UITextField *passWordTextField;
 @property (weak, nonatomic) IBOutlet UITextField *repeatPasswordTextField;
diff --git a/Riot/Modules/Authentication/Views/AuthInputsView.m b/Riot/Modules/Authentication/Views/AuthInputsView.m
index 68a79c202..43efbce8b 100644
--- a/Riot/Modules/Authentication/Views/AuthInputsView.m
+++ b/Riot/Modules/Authentication/Views/AuthInputsView.m
@@ -26,7 +26,9 @@
 
 #import "RiotNavigationController.h"
 
-@interface AuthInputsView ()
+#import "GeneratedInterface-Swift.h"
+
+@interface AuthInputsView () <MXKCountryPickerViewControllerDelegate>
 {
     /**
      The current email validation
diff --git a/Riot/Modules/Authentication/Views/ForgotPasswordInputsView.h b/Riot/Modules/Authentication/Views/ForgotPasswordInputsView.h
index c5f088545..7aead4034 100644
--- a/Riot/Modules/Authentication/Views/ForgotPasswordInputsView.h
+++ b/Riot/Modules/Authentication/Views/ForgotPasswordInputsView.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @interface ForgotPasswordInputsView : MXKAuthInputsView
 
diff --git a/Riot/Modules/Authentication/Views/ForgotPasswordInputsView.m b/Riot/Modules/Authentication/Views/ForgotPasswordInputsView.m
index 01fa1f500..9173043f7 100644
--- a/Riot/Modules/Authentication/Views/ForgotPasswordInputsView.m
+++ b/Riot/Modules/Authentication/Views/ForgotPasswordInputsView.m
@@ -19,7 +19,7 @@
 
 #import "MXHTTPOperation.h"
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface ForgotPasswordInputsView ()
 
diff --git a/Riot/Modules/BugReport/BugReportViewController.h b/Riot/Modules/BugReport/BugReportViewController.h
index 972e02d24..715639661 100644
--- a/Riot/Modules/BugReport/BugReportViewController.h
+++ b/Riot/Modules/BugReport/BugReportViewController.h
@@ -16,7 +16,7 @@
 
 #import <UIKit/UIKit.h>
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @interface BugReportViewController : MXKViewController <UITextViewDelegate>
 
diff --git a/Riot/Modules/BugReport/BugReportViewController.m b/Riot/Modules/BugReport/BugReportViewController.m
index 01b04e110..e43ec06d7 100644
--- a/Riot/Modules/BugReport/BugReportViewController.m
+++ b/Riot/Modules/BugReport/BugReportViewController.m
@@ -16,7 +16,7 @@
 
 #import "BugReportViewController.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "GBDeviceInfo_iOS.h"
 
diff --git a/Riot/Modules/Call/CallViewController.h b/Riot/Modules/Call/CallViewController.h
index 98bedce60..1fe7837da 100644
--- a/Riot/Modules/Call/CallViewController.h
+++ b/Riot/Modules/Call/CallViewController.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  'CallViewController' instance displays a call. Only one matrix session is supported by this view controller.
diff --git a/Riot/Modules/Call/CallViewController.m b/Riot/Modules/Call/CallViewController.m
index 3a448e0b0..bb702ad15 100644
--- a/Riot/Modules/Call/CallViewController.m
+++ b/Riot/Modules/Call/CallViewController.m
@@ -18,7 +18,7 @@
 
 #import "CallViewController.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "AvatarGenerator.h"
 
diff --git a/Riot/Modules/Call/Views/IncomingCallView.m b/Riot/Modules/Call/Views/IncomingCallView.m
index e56e2f513..35500cf4e 100644
--- a/Riot/Modules/Call/Views/IncomingCallView.m
+++ b/Riot/Modules/Call/Views/IncomingCallView.m
@@ -17,12 +17,12 @@
 
 #import "IncomingCallView.h"
 
-#import <MatrixKit/MXKImageView.h>
+#import "MatrixKit.h"
 #import <MatrixSDK/MXMediaManager.h>
 
 #import "CircleButton.h"
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 static const CGFloat kAvatarSize = 100.0;
 static const CGFloat kButtonSize = 80.0;
diff --git a/Riot/Modules/CallTransfer/SelectContact/MatrixContactsDataSource.m b/Riot/Modules/CallTransfer/SelectContact/MatrixContactsDataSource.m
index b86ecf711..1fb9e8d29 100644
--- a/Riot/Modules/CallTransfer/SelectContact/MatrixContactsDataSource.m
+++ b/Riot/Modules/CallTransfer/SelectContact/MatrixContactsDataSource.m
@@ -16,7 +16,7 @@
 
 #import "MatrixContactsDataSource.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @implementation MatrixContactsDataSource
 
diff --git a/Riot/Modules/Common/Cells/TableViewCellWithButton.h b/Riot/Modules/Common/Cells/TableViewCellWithButton.h
index 78c703ba1..3a8a172a6 100644
--- a/Riot/Modules/Common/Cells/TableViewCellWithButton.h
+++ b/Riot/Modules/Common/Cells/TableViewCellWithButton.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @interface TableViewCellWithButton : MXKTableViewCellWithButton
 
diff --git a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.h b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.h
index 585453317..2dbf20bc5 100644
--- a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.h
+++ b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.h
@@ -15,7 +15,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 #import "PublicRoomsDirectoryDataSource.h"
 
diff --git a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
index 9942f883f..82b5823b2 100644
--- a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
+++ b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
@@ -26,7 +26,7 @@
 #import "MXSession+Riot.h"
 #import "NSArray+Element.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #define RECENTSDATASOURCE_SECTION_DIRECTORY     0x01
 #define RECENTSDATASOURCE_SECTION_INVITES       0x02
diff --git a/Riot/Modules/Common/Recents/Model/RecentCellData.h b/Riot/Modules/Common/Recents/Model/RecentCellData.h
index 53bc182bd..43efda4ef 100644
--- a/Riot/Modules/Common/Recents/Model/RecentCellData.h
+++ b/Riot/Modules/Common/Recents/Model/RecentCellData.h
@@ -17,7 +17,7 @@
 #import <Foundation/Foundation.h>
 #import <MatrixSDK/MatrixSDK.h>
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `RecentCellData` is Vector cuustomized MXKRecentCellData` cell.
diff --git a/Riot/Modules/Common/Recents/Model/RecentCellData.m b/Riot/Modules/Common/Recents/Model/RecentCellData.m
index be2d88d47..01800996f 100644
--- a/Riot/Modules/Common/Recents/Model/RecentCellData.m
+++ b/Riot/Modules/Common/Recents/Model/RecentCellData.m
@@ -18,13 +18,8 @@
 #import "RecentCellData.h"
 
 #import "MXRoom+Riot.h"
-#import "MatrixSDK-Swift.h"
 
-#ifdef IS_SHARE_EXTENSION
-#import "RiotShareExtension-Swift.h"
-#else
-#import "Riot-Swift.h"
-#endif
+#import "GeneratedInterface-Swift.h"
 
 @implementation RecentCellData
 
diff --git a/Riot/Modules/Common/Recents/RecentsViewController.h b/Riot/Modules/Common/Recents/RecentsViewController.h
index 6a475073a..9e9e357a7 100644
--- a/Riot/Modules/Common/Recents/RecentsViewController.h
+++ b/Riot/Modules/Common/Recents/RecentsViewController.h
@@ -15,9 +15,10 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @class RootTabEmptyView;
+@class AnalyticsScreenTimer;
 
 /**
  Notification to be posted when recents data is ready. Notification object will be the RecentsViewController instance.
@@ -85,16 +86,16 @@ FOUNDATION_EXPORT NSString *const RecentsViewControllerDataReadyNotification;
  */
 @property (nonatomic) CGFloat stickyHeaderHeight;
 
-/**
- The analytics instance screen name (Default is "RecentsScreen").
- */
-@property (nonatomic) NSString *screenName;
-
 /**
  Empty view to display when there is no item to show on the screen.
  */
 @property (nonatomic, weak) RootTabEmptyView *emptyView;
 
+/**
+ The screen timer used for analytics if they've been enabled. The default value is nil.
+ */
+@property (nonatomic) AnalyticsScreenTimer *screenTimer;
+
 /**
  Return the sticky header for the specified section of the table view
  
diff --git a/Riot/Modules/Common/Recents/RecentsViewController.m b/Riot/Modules/Common/Recents/RecentsViewController.m
index 585f79c5f..0bcceb09a 100644
--- a/Riot/Modules/Common/Recents/RecentsViewController.m
+++ b/Riot/Modules/Common/Recents/RecentsViewController.m
@@ -24,15 +24,13 @@
 
 #import "MXRoom+Riot.h"
 
-#import <MatrixKit/MatrixKit.h>
-
 #import "RoomViewController.h"
 
 #import "InviteRecentTableViewCell.h"
 #import "DirectoryRecentTableViewCell.h"
 #import "RoomIdOrAliasTableViewCell.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewControllerDataReadyNotification";
 
@@ -108,9 +106,6 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
     self.enableBarTintColorStatusChange = NO;
     self.rageShakeManager = [RageShakeManager sharedManager];
     
-    // Set default screen name
-    _screenName = @"RecentsScreen";
-    
     // Enable the search bar in the recents table, and remove the search option from the navigation bar.
     _enableSearchBar = YES;
     self.enableBarButtonSearch = NO;
@@ -261,9 +256,6 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
 {
     [super viewWillAppear:animated];
 
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:_screenName];
-
     // Reset back user interactions
     self.userInteractionEnabled = YES;
     
@@ -331,11 +323,14 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
         // the selected room (if any) is highlighted.
         [self refreshCurrentSelectedCell:YES];
     }
+    
+    [self.screenTimer start];
 }
 
 - (void)viewDidDisappear:(BOOL)animated
 {
     [super viewDidDisappear:animated];
+    [self.screenTimer stop];
 }
 
 - (void)viewDidLayoutSubviews
@@ -539,11 +534,13 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
     
     [self->currentAlert dismissViewControllerAnimated:NO completion:nil];
     
-    self->currentAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n roomErrorJoinFailedTitle] message:msg preferredStyle:UIAlertControllerStyleAlert];
+    UIAlertController *errorAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n roomErrorJoinFailedTitle]
+                                                                        message:msg
+                                                                 preferredStyle:UIAlertControllerStyleAlert];
     
-    [self->currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
-                                                     style:UIAlertActionStyleDefault
-                                                         handler:^(UIAlertAction * action) {
+    [errorAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
+                                                   style:UIAlertActionStyleDefault
+                                                 handler:^(UIAlertAction * action) {
         MXStrongifyAndReturnIfNil(self);
         self->currentAlert = nil;
         
@@ -553,7 +550,8 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
         }
     }]];
     
-    [self presentViewController:self->currentAlert animated:YES completion:nil];
+    [self presentViewController:errorAlert animated:YES completion:nil];
+    currentAlert = errorAlert;
 }
 
 #pragma mark - Sticky Headers
@@ -1202,13 +1200,13 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
         }
         
         // confirm leave
-        currentAlert = [UIAlertController alertControllerWithTitle:title
-                                                           message:message
-                                                    preferredStyle:UIAlertControllerStyleAlert];
+        UIAlertController *leavePrompt = [UIAlertController alertControllerWithTitle:title
+                                                                             message:message
+                                                                      preferredStyle:UIAlertControllerStyleAlert];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
-                                                         style:UIAlertActionStyleCancel
-                                                       handler:^(UIAlertAction * action) {
+        [leavePrompt addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+                                                        style:UIAlertActionStyleCancel
+                                                      handler:^(UIAlertAction * action) {
                                                            
                                                            if (weakSelf)
                                                            {
@@ -1218,8 +1216,8 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
                                                            
                                                        }]];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n leave]
-                                                         style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+        [leavePrompt addAction:[UIAlertAction actionWithTitle:[VectorL10n leave]
+                                                        style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
                                                              
                                                              if (weakSelf)
                                                              {
@@ -1280,8 +1278,9 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
                                                              
                                                          }]];
         
-        [currentAlert mxk_setAccessibilityIdentifier:@"LeaveEditedRoomAlert"];
-        [self presentViewController:currentAlert animated:YES completion:nil];
+        [leavePrompt mxk_setAccessibilityIdentifier:@"LeaveEditedRoomAlert"];
+        [self presentViewController:leavePrompt animated:YES completion:nil];
+        currentAlert = leavePrompt;
     }
 }
 
@@ -1836,11 +1835,11 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
     
     [currentAlert dismissViewControllerAnimated:NO completion:nil];
     
-    currentAlert = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+    UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomRecentsStartChatWith]
-                                                     style:UIAlertActionStyleDefault
-                                                   handler:^(UIAlertAction * action) {
+    [actionSheet addAction:[UIAlertAction actionWithTitle:[VectorL10n roomRecentsStartChatWith]
+                                                    style:UIAlertActionStyleDefault
+                                                  handler:^(UIAlertAction * action) {
                                                        
                                                        if (weakSelf)
                                                        {
@@ -1852,9 +1851,9 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
                                                        
                                                    }]];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomRecentsCreateEmptyRoom]
-                                                     style:UIAlertActionStyleDefault
-                                                   handler:^(UIAlertAction * action) {
+    [actionSheet addAction:[UIAlertAction actionWithTitle:[VectorL10n roomRecentsCreateEmptyRoom]
+                                                    style:UIAlertActionStyleDefault
+                                                  handler:^(UIAlertAction * action) {
                                                        
                                                        if (weakSelf)
                                                        {
@@ -1866,9 +1865,9 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
                                                        
                                                    }]];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomRecentsJoinRoom]
-                                                     style:UIAlertActionStyleDefault
-                                                   handler:^(UIAlertAction * action) {
+    [actionSheet addAction:[UIAlertAction actionWithTitle:[VectorL10n roomRecentsJoinRoom]
+                                                    style:UIAlertActionStyleDefault
+                                                  handler:^(UIAlertAction * action) {
                                                        
                                                        if (weakSelf)
                                                        {
@@ -1882,10 +1881,9 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
     
     if (self.mainSession.callManager.supportsPSTN)
     {
-        [currentAlert addAction:[UIAlertAction
-            actionWithTitle:[VectorL10n roomOpenDialpad]
-                                                     style:UIAlertActionStyleDefault
-                                                   handler:^(UIAlertAction * action) {
+        [actionSheet addAction:[UIAlertAction actionWithTitle:[VectorL10n roomOpenDialpad]
+                                                        style:UIAlertActionStyleDefault
+                                                      handler:^(UIAlertAction * action) {
         
                                                        if (weakSelf)
                                                        {
@@ -1898,9 +1896,9 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
                                                    }]];
     }
 
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
-                                                     style:UIAlertActionStyleCancel
-                                                   handler:^(UIAlertAction * action) {
+    [actionSheet addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+                                                    style:UIAlertActionStyleCancel
+                                                  handler:^(UIAlertAction * action) {
                                                        
                                                        if (weakSelf)
                                                        {
@@ -1910,11 +1908,12 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
                                                        
                                                    }]];
     
-    [currentAlert popoverPresentationController].sourceView = plusButtonImageView;
-    [currentAlert popoverPresentationController].sourceRect = plusButtonImageView.bounds;
+    [actionSheet popoverPresentationController].sourceView = plusButtonImageView;
+    [actionSheet popoverPresentationController].sourceRect = plusButtonImageView.bounds;
     
-    [currentAlert mxk_setAccessibilityIdentifier:@"RecentsVCCreateRoomAlert"];
-    [self presentViewController:currentAlert animated:YES completion:nil];
+    [actionSheet mxk_setAccessibilityIdentifier:@"RecentsVCCreateRoomAlert"];
+    [self presentViewController:actionSheet animated:YES completion:nil];
+    currentAlert = actionSheet;
 }
 
 - (void)openDialpad
@@ -2008,7 +2007,7 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
     }
     
     // Check whether the user has already joined the selected public room
-    if ([self.recentsDataSource.publicRoomsDirectoryDataSource.mxSession roomWithRoomId:publicRoom.roomId])
+    if ([self.recentsDataSource.publicRoomsDirectoryDataSource.mxSession isJoinedOnRoom:publicRoom.roomId])
     {
         // Open the public room
         [self showRoomWithRoomId:publicRoom.roomId
@@ -2048,6 +2047,11 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
 
 - (void)scrollToTheTopTheNextRoomWithMissedNotificationsInSection:(NSInteger)section
 {
+    if (section < 0)
+    {
+        return;
+    }
+    
     UITableViewCell *firstVisibleCell;
     NSIndexPath *firstVisibleCellIndexPath;
     
diff --git a/Riot/Modules/Common/Recents/Service/MatrixSDK/RecentsListService.swift b/Riot/Modules/Common/Recents/Service/MatrixSDK/RecentsListService.swift
index 7d4d7f252..ae95b12d0 100644
--- a/Riot/Modules/Common/Recents/Service/MatrixSDK/RecentsListService.swift
+++ b/Riot/Modules/Common/Recents/Service/MatrixSDK/RecentsListService.swift
@@ -20,7 +20,12 @@ import Foundation
 public class RecentsListService: NSObject, RecentsListServiceProtocol {
     
     private weak var session: MXSession?
-    public private(set) var mode: RecentsDataSourceMode
+    public private(set) var mode: RecentsDataSourceMode {
+        didSet {
+            refresh()
+        }
+    }
+    
     public private(set) var query: String?
     public private(set) var space: MXSpace?
     
@@ -406,15 +411,18 @@ public class RecentsListService: NSObject, RecentsListServiceProtocol {
     }
     
     private func updateDirectFetcher(_ fetcher: MXRoomListDataFetcher, for mode: RecentsDataSourceMode) {
-        switch mode {
-        case .home:
-            fetcher.fetchOptions.filterOptions.notDataTypes = [.invited, .lowPriority]
-        case .people:
-            fetcher.fetchOptions.filterOptions.notDataTypes = [.lowPriority]
-        default:
-            break
+            var notDataTypes: MXRoomSummaryDataTypes = [.hidden, .conferenceUser, .space]
+            switch mode {
+            case .home:
+                notDataTypes.insert([.invited, .favorited, .lowPriority])
+                fetcher.fetchOptions.filterOptions.notDataTypes = notDataTypes
+            case .people:
+                notDataTypes.insert([.lowPriority])
+                fetcher.fetchOptions.filterOptions.notDataTypes = notDataTypes
+            default:
+                break
+            }
         }
-    }
     
     private func updateFavoritedFetcher(_ fetcher: MXRoomListDataFetcher, for mode: RecentsDataSourceMode) {
         switch mode {
diff --git a/Riot/Modules/Common/Recents/Service/Mock/MockRoomSummary.swift b/Riot/Modules/Common/Recents/Service/Mock/MockRoomSummary.swift
index 713932423..c211db025 100644
--- a/Riot/Modules/Common/Recents/Service/Mock/MockRoomSummary.swift
+++ b/Riot/Modules/Common/Recents/Service/Mock/MockRoomSummary.swift
@@ -60,6 +60,18 @@ public class MockRoomSummary: NSObject, MXRoomSummaryProtocol {
     
     public var highlightCount: UInt = 0
     
+    public var hasAnyUnread: Bool {
+        return localUnreadEventCount > 0
+    }
+    
+    public var hasAnyNotification: Bool {
+        return notificationCount > 0
+    }
+    
+    public var hasAnyHighlight: Bool {
+        return highlightCount > 0
+    }
+    
     public var isDirect: Bool {
         return isTyped(.direct)
     }
diff --git a/Riot/Modules/Common/Recents/Views/RecentTableViewCell.h b/Riot/Modules/Common/Recents/Views/RecentTableViewCell.h
index e3feee4e4..347a92f76 100644
--- a/Riot/Modules/Common/Recents/Views/RecentTableViewCell.h
+++ b/Riot/Modules/Common/Recents/Views/RecentTableViewCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `RecentTableViewCell` instances display a room in the context of the recents list.
diff --git a/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m b/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m
index 0d540399b..6b2df4055 100644
--- a/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m
+++ b/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m
@@ -23,7 +23,7 @@
 #import "MXRoom+Riot.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "MXRoomSummary+Riot.h"
 
diff --git a/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.h b/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.h
index f68d498ae..fb0c3b583 100644
--- a/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.h
+++ b/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.h
@@ -18,6 +18,7 @@ limitations under the License.
 #import <MatrixSDK/MatrixSDK.h>
 
 #import "UIViewController+RiotSearch.h"
+#import "MatrixKit.h"
 
 /**
  This view controller manages several uiviewcontrollers like UISegmentedController manages uiTableView
diff --git a/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m b/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m
index 56b3caf91..60547f8c5 100644
--- a/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m
+++ b/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m
@@ -19,11 +19,7 @@
 
 #import "ThemeService.h"
 
-#ifdef IS_SHARE_EXTENSION
-#import "RiotShareExtension-Swift.h"
-#else
-#import "Riot-Swift.h"
-#endif
+#import "GeneratedInterface-Swift.h"
 
 @interface SegmentedViewController ()
 {
diff --git a/Riot/Modules/Common/Views/CopyableLabel.swift b/Riot/Modules/Common/Views/CopyableLabel.swift
new file mode 100644
index 000000000..56a735695
--- /dev/null
+++ b/Riot/Modules/Common/Views/CopyableLabel.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 UIKit
+
+/// Enables to copy text content of the label
+/// https://stackoverflow.com/a/62978837
+class CopyableLabel: UILabel {
+
+    // MARK: - Setup
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.sharedInit()
+    }
+
+    required init?(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+        self.sharedInit()
+    }
+
+    func sharedInit() {
+        self.isUserInteractionEnabled = true
+        self.addGestureRecognizer(UILongPressGestureRecognizer(target: self, action: #selector(self.showMenu)))
+    }
+    
+    // MARK: - Public
+    
+    @objc func showMenu(sender: AnyObject?) {
+        self.becomeFirstResponder()
+
+        let menu = UIMenuController.shared
+
+        if !menu.isMenuVisible {
+            if #available(iOS 13.0, *) {
+                menu.showMenu(from: self, rect: self.bounds)
+            } 
+        }
+    }
+    
+    // MARK: - Overrides
+
+    override func copy(_ sender: Any?) {
+        let board = UIPasteboard.general
+
+        board.string = self.text
+        
+        // Note that the UIMenuController will be dismissed by itself after copying the text
+    }
+
+    override var canBecomeFirstResponder: Bool {
+        return true
+    }
+
+    override func canPerformAction(_ action: Selector, withSender sender: Any?) -> Bool {
+        return action == #selector(UIResponderStandardEditActions.copy)
+    }        
+}
diff --git a/Riot/Modules/Common/WebViewController/WebViewViewController.h b/Riot/Modules/Common/WebViewController/WebViewViewController.h
index 8426ae613..24c95c42c 100644
--- a/Riot/Modules/Common/WebViewController/WebViewViewController.h
+++ b/Riot/Modules/Common/WebViewController/WebViewViewController.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  WebViewViewController extends MXKWebViewViewController to handle customization.
diff --git a/Riot/Modules/Common/WebViewController/WebViewViewController.m b/Riot/Modules/Common/WebViewController/WebViewViewController.m
index afb11bc6f..4826219ec 100644
--- a/Riot/Modules/Common/WebViewController/WebViewViewController.m
+++ b/Riot/Modules/Common/WebViewController/WebViewViewController.m
@@ -15,7 +15,7 @@
  */
 
 #import "WebViewViewController.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface WebViewViewController ()
 {
diff --git a/Riot/Modules/Communities/DataSources/GroupsDataSource.h b/Riot/Modules/Communities/DataSources/GroupsDataSource.h
index 7a8a4f9d6..836f6fdaa 100644
--- a/Riot/Modules/Communities/DataSources/GroupsDataSource.h
+++ b/Riot/Modules/Communities/DataSources/GroupsDataSource.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  'GroupsDataSource' class inherits from 'MXKSessionGroupsDataSource' to define the Riot groups source.
diff --git a/Riot/Modules/Communities/DataSources/GroupsDataSource.m b/Riot/Modules/Communities/DataSources/GroupsDataSource.m
index 68aa32588..69b0100f5 100644
--- a/Riot/Modules/Communities/DataSources/GroupsDataSource.m
+++ b/Riot/Modules/Communities/DataSources/GroupsDataSource.m
@@ -15,7 +15,7 @@
  */
 
 #import "GroupsDataSource.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface GroupsDataSource() <BetaAnnounceCellDelegate>
 
diff --git a/Riot/Modules/Communities/GroupsViewController.h b/Riot/Modules/Communities/GroupsViewController.h
index 08ab81101..ef2a4c486 100644
--- a/Riot/Modules/Communities/GroupsViewController.h
+++ b/Riot/Modules/Communities/GroupsViewController.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  The `GroupsViewController` screen is the view controller displayed when `Groups` tab is selected.
diff --git a/Riot/Modules/Communities/GroupsViewController.m b/Riot/Modules/Communities/GroupsViewController.m
index d58d78c2f..306a4e55c 100644
--- a/Riot/Modules/Communities/GroupsViewController.m
+++ b/Riot/Modules/Communities/GroupsViewController.m
@@ -19,7 +19,7 @@
 #import "GroupTableViewCell.h"
 #import "GroupInviteTableViewCell.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface GroupsViewController ()
 {
@@ -42,6 +42,8 @@
     __weak id kThemeServiceDidChangeThemeNotificationObserver;
 }
 
+@property (nonatomic) AnalyticsScreenTimer *screenTimer;
+
 @end
 
 @implementation GroupsViewController
@@ -74,6 +76,8 @@
     
     // Set itself as delegate by default.
     self.delegate = self;
+    
+    self.screenTimer = [[AnalyticsScreenTimer alloc] initWithScreen:AnalyticsScreenMyGroups];
 }
 
 - (void)viewDidLoad
@@ -203,9 +207,6 @@
 {
     [super viewWillAppear:animated];
     
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"Groups"];
-    
     // Deselect the current selected row, it will be restored on viewDidAppear (if any)
     NSIndexPath *indexPath = [self.groupsTableView indexPathForSelectedRow];
     if (indexPath)
@@ -258,11 +259,14 @@
         // the selected group (if any) is highlighted.
         [self refreshCurrentSelectedCell:YES];
     }
+    
+    [self.screenTimer start];
 }
 
 - (void)viewDidDisappear:(BOOL)animated
 {
     [super viewDidDisappear:animated];
+    [self.screenTimer stop];
 }
 
 #pragma mark - Override MXKGroupListViewController
diff --git a/Riot/Modules/Communities/Home/GroupHomeViewController.h b/Riot/Modules/Communities/Home/GroupHomeViewController.h
index d07b59471..69b2300da 100644
--- a/Riot/Modules/Communities/Home/GroupHomeViewController.h
+++ b/Riot/Modules/Communities/Home/GroupHomeViewController.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @interface GroupHomeViewController : MXKViewController <UIGestureRecognizerDelegate, UITextViewDelegate>
 
diff --git a/Riot/Modules/Communities/Home/GroupHomeViewController.m b/Riot/Modules/Communities/Home/GroupHomeViewController.m
index 5fbfbf82e..6e5d5d3b5 100644
--- a/Riot/Modules/Communities/Home/GroupHomeViewController.m
+++ b/Riot/Modules/Communities/Home/GroupHomeViewController.m
@@ -17,7 +17,7 @@
 
 #import "GroupHomeViewController.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "ThemeService.h"
 #import "Tools.h"
@@ -40,11 +40,16 @@
     
     // The options used to load long description html content.
     NSDictionary *options;
-    NSString *sanitisedGroupLongDescription;
+    NSString *groupLongDescription;
     
     // The current pushed view controller
     UIViewController *pushedViewController;
 }
+
+@property (nonatomic, readonly) DTHTMLAttributedStringBuilderWillFlushCallback longDescriptionSanitizationCallback;
+
+@property (nonatomic) AnalyticsScreenTimer *screenTimer;
+
 @end
 
 @implementation GroupHomeViewController
@@ -75,6 +80,25 @@
     
     // Keep visible the status bar by default.
     isStatusBarHidden = NO;
+    
+    // Set up sanitization for the long description
+    NSArray<NSString *> *allowedHTMLTags = @[
+        @"font", // custom to matrix for IRC-style font coloring
+        @"del", // for markdown
+        @"body", // added internally by DTCoreText
+        @"h1", @"h2", @"h3", @"h4", @"h5", @"h6", @"blockquote", @"p", @"a", @"ul", @"ol",
+        @"nl", @"li", @"b", @"i", @"u", @"strong", @"em", @"strike", @"code", @"hr", @"br", @"div",
+        @"table", @"thead", @"caption", @"tbody", @"tr", @"th", @"td", @"pre",
+        @"img"
+    ];
+    
+    MXWeakify(self);
+    _longDescriptionSanitizationCallback = ^(DTHTMLElement *element) {
+        MXStrongifyAndReturnIfNil(self);
+        [element sanitizeWith:allowedHTMLTags bodyFont:self->_groupLongDescription.font imageHandler:[self groupLongDescriptionImageHandler]];
+    };
+    
+    self.screenTimer = [[AnalyticsScreenTimer alloc] initWithScreen:AnalyticsScreenGroup];
 }
 
 - (void)viewDidLoad
@@ -154,7 +178,7 @@
                       font-size: small; \
                       }", (unsigned long)bgColor];
         
-        // Apply the css style
+        // Apply the css style with some sanitisation.
         options = @{
                     DTUseiOS6Attributes: @(YES),              // Enable it to be able to display the attributed string in a UITextView
                     DTDefaultFontFamily: _groupLongDescription.font.familyName,
@@ -162,7 +186,8 @@
                     DTDefaultFontSize: @(_groupLongDescription.font.pointSize),
                     DTDefaultTextColor: _groupLongDescription.textColor,
                     DTDefaultLinkDecoration: @(NO),
-                    DTDefaultStyleSheet: [[DTCSSStylesheet alloc] initWithStyleBlock:defaultCSS]
+                    DTDefaultStyleSheet: [[DTCSSStylesheet alloc] initWithStyleBlock:defaultCSS],
+                    DTWillFlushBlockCallBack: self.longDescriptionSanitizationCallback
                     };
     }
 
@@ -184,9 +209,6 @@
 {
     [super viewWillAppear:animated];
     
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"GroupDetailsHome"];
-    
     // Release the potential pushed view controller
     [self releasePushedViewController];
     
@@ -238,6 +260,18 @@
     [self cancelRegistrationOnGroupChangeNotifications];
 }
 
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    [self.screenTimer start];
+}
+
+- (void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear:animated];
+    [self.screenTimer stop];
+}
+
 - (void)viewDidLayoutSubviews
 {
     [super viewDidLayoutSubviews];
@@ -489,94 +523,11 @@
 {
     if (_group.summary.profile.longDescription.length)
     {
-        // Render this html content in a text view.
-        NSArray <NSString*>* allowedHTMLTags = @[
-                                                 @"font", // custom to matrix for IRC-style font coloring
-                                                 @"del", // for markdown
-                                                 @"h1", @"h2", @"h3", @"h4", @"h5", @"h6", @"blockquote", @"p", @"a", @"ul", @"ol",
-                                                 @"nl", @"li", @"b", @"i", @"u", @"strong", @"em", @"strike", @"code", @"hr", @"br", @"div",
-                                                 @"table", @"thead", @"caption", @"tbody", @"tr", @"th", @"td", @"pre",
-                                                 @"img"
-                                                 ];
-        
-        // Do some sanitisation by handling the potential image
-        MXWeakify(self);
-        sanitisedGroupLongDescription = [MXKTools sanitiseHTML:_group.summary.profile.longDescription withAllowedHTMLTags:allowedHTMLTags imageHandler:^NSString *(NSString *sourceURL, CGFloat width, CGFloat height) {
-            
-            MXStrongifyAndReturnValueIfNil(self, nil);
-            NSString *localSourcePath;
-            
-            if (width != -1 && height != -1)
-            {
-                CGSize size = CGSizeMake(width, height);
-                // Build the cache path for the a thumbnail of this image.
-                NSString *cacheFilePath = [MXMediaManager thumbnailCachePathForMatrixContentURI:sourceURL
-                                                                              andType:nil
-                                                                             inFolder:kMXMediaManagerDefaultCacheFolder
-                                                                        toFitViewSize:size
-                                                                           withMethod:MXThumbnailingMethodScale];
-                // Check whether the provided URL is a valid Matrix Content URI.
-                if (cacheFilePath)
-                {
-                    // Download the thumbnail if it is not already stored in the cache.
-                    if (![[NSFileManager defaultManager] fileExistsAtPath:cacheFilePath])
-                    {
-                        MXWeakify(self);
-                        [self.mxSession.mediaManager downloadThumbnailFromMatrixContentURI:sourceURL
-                                                                                  withType:nil
-                                                                                  inFolder:kMXMediaManagerDefaultCacheFolder
-                                                                             toFitViewSize:size
-                                                                                withMethod:MXThumbnailingMethodScale
-                                                                                   success:^(NSString *outputFilePath) {
-                                                                                       MXStrongifyAndReturnIfNil(self);
-                                                                                       [self refreshGroupLongDescription];
-                                                                                   }
-                                                                                   failure:nil];
-                    }
-                    else
-                    {
-                        // Update the local path
-                        localSourcePath = [NSString stringWithFormat:@"file://%@", cacheFilePath];
-                    }
-                }
-            }
-            else
-            {
-                // Build the cache path for this image.
-                NSString* cacheFilePath = [MXMediaManager cachePathForMatrixContentURI:sourceURL
-                                                                 andType:nil
-                                                                inFolder:kMXMediaManagerDefaultCacheFolder];
-                
-                // Check whether the provided URL is a valid Matrix Content URI.
-                if (cacheFilePath)
-                {
-                    // Download the image if it is not already stored in the cache.
-                    if (![[NSFileManager defaultManager] fileExistsAtPath:cacheFilePath])
-                    {
-                        MXWeakify(self);
-                        [self.mxSession.mediaManager downloadMediaFromMatrixContentURI:sourceURL
-                                                                              withType:nil
-                                                                              inFolder:kMXMediaManagerDefaultCacheFolder
-                                                                               success:^(NSString *outputFilePath) {
-                                                                                   MXStrongifyAndReturnIfNil(self);
-                                                                                   [self refreshGroupLongDescription];
-                                                                               }
-                                                                               failure:nil];
-                    }
-                    else
-                    {
-                        // Update the local path
-                        localSourcePath = [NSString stringWithFormat:@"file://%@", cacheFilePath];
-                    }
-                }
-            }
-            return localSourcePath;
-            
-        }];
+        groupLongDescription = _group.summary.profile.longDescription;
     }
     else
     {
-        sanitisedGroupLongDescription = nil;
+        groupLongDescription = nil;
     }
     
     [self renderGroupLongDescription];
@@ -584,12 +535,13 @@
 
 - (void)renderGroupLongDescription
 {
-    if (sanitisedGroupLongDescription)
+    if (groupLongDescription)
     {
         // Using DTCoreText, which renders static string, helps to avoid code injection attacks
         // that could happen with the default HTML renderer of NSAttributedString which is a
         // webview.
-        NSAttributedString *attributedString = [[NSAttributedString alloc] initWithHTMLData:[sanitisedGroupLongDescription dataUsingEncoding:NSUTF8StringEncoding] options:options documentAttributes:NULL];
+        // The supplied options include a callback to sanitize html tags and load image data.
+        NSAttributedString *attributedString = [[NSAttributedString alloc] initWithHTMLData:[groupLongDescription dataUsingEncoding:NSUTF8StringEncoding] options:options documentAttributes:NULL];
         
         // Apply additional treatments
         NSInteger mxIdsBitMask = (MXKTOOLS_USER_IDENTIFIER_BITWISE | MXKTOOLS_ROOM_IDENTIFIER_BITWISE | MXKTOOLS_ROOM_ALIAS_BITWISE | MXKTOOLS_EVENT_IDENTIFIER_BITWISE | MXKTOOLS_GROUP_IDENTIFIER_BITWISE);
@@ -605,6 +557,83 @@
     }
 }
 
+- (NSURL *(^)(NSString *sourceURL, CGFloat width, CGFloat height))groupLongDescriptionImageHandler
+{
+    MXWeakify(self);
+    return ^NSURL *(NSString *sourceURL, CGFloat width, CGFloat height) {
+        
+        MXStrongifyAndReturnValueIfNil(self, nil);
+        NSURL *localSourceURL;
+        
+        if (width != -1 && height != -1)
+        {
+            CGSize size = CGSizeMake(width, height);
+            // Build the cache path for the a thumbnail of this image.
+            NSString *cacheFilePath = [MXMediaManager thumbnailCachePathForMatrixContentURI:sourceURL
+                                                                          andType:nil
+                                                                         inFolder:kMXMediaManagerDefaultCacheFolder
+                                                                    toFitViewSize:size
+                                                                       withMethod:MXThumbnailingMethodScale];
+            // Check whether the provided URL is a valid Matrix Content URI.
+            if (cacheFilePath)
+            {
+                // Download the thumbnail if it is not already stored in the cache.
+                if (![[NSFileManager defaultManager] fileExistsAtPath:cacheFilePath])
+                {
+                    MXWeakify(self);
+                    [self.mxSession.mediaManager downloadThumbnailFromMatrixContentURI:sourceURL
+                                                                              withType:nil
+                                                                              inFolder:kMXMediaManagerDefaultCacheFolder
+                                                                         toFitViewSize:size
+                                                                            withMethod:MXThumbnailingMethodScale
+                                                                               success:^(NSString *outputFilePath) {
+                                                                                   MXStrongifyAndReturnIfNil(self);
+                                                                                   [self refreshGroupLongDescription];
+                                                                               }
+                                                                               failure:nil];
+                }
+                else
+                {
+                    // Update the local url
+                    localSourceURL = [NSURL fileURLWithPath:cacheFilePath];
+                }
+            }
+        }
+        else
+        {
+            // Build the cache path for this image.
+            NSString* cacheFilePath = [MXMediaManager cachePathForMatrixContentURI:sourceURL
+                                                             andType:nil
+                                                            inFolder:kMXMediaManagerDefaultCacheFolder];
+            
+            // Check whether the provided URL is a valid Matrix Content URI.
+            if (cacheFilePath)
+            {
+                // Download the image if it is not already stored in the cache.
+                if (![[NSFileManager defaultManager] fileExistsAtPath:cacheFilePath])
+                {
+                    MXWeakify(self);
+                    [self.mxSession.mediaManager downloadMediaFromMatrixContentURI:sourceURL
+                                                                          withType:nil
+                                                                          inFolder:kMXMediaManagerDefaultCacheFolder
+                                                                           success:^(NSString *outputFilePath) {
+                                                                               MXStrongifyAndReturnIfNil(self);
+                                                                               [self refreshGroupLongDescription];
+                                                                           }
+                                                                           failure:nil];
+                }
+                else
+                {
+                    // Update the local path
+                    localSourceURL = [NSURL fileURLWithPath:cacheFilePath];
+                }
+            }
+        }
+        return localSourceURL;
+        
+    };
+}
+
 - (void)didSelectRoomId:(NSString*)roomId
 {
     // Check first if the user already joined this room.
diff --git a/Riot/Modules/Communities/Members/GroupParticipantsViewController.h b/Riot/Modules/Communities/Members/GroupParticipantsViewController.h
index 012b148c1..83b862664 100644
--- a/Riot/Modules/Communities/Members/GroupParticipantsViewController.h
+++ b/Riot/Modules/Communities/Members/GroupParticipantsViewController.h
@@ -15,6 +15,7 @@
  */
 
 #import "ContactsTableViewController.h"
+#import "MatrixKit.h"
 
 @class Contact;
 
diff --git a/Riot/Modules/Communities/Members/GroupParticipantsViewController.m b/Riot/Modules/Communities/Members/GroupParticipantsViewController.m
index f46a9cf72..9a87f6562 100644
--- a/Riot/Modules/Communities/Members/GroupParticipantsViewController.m
+++ b/Riot/Modules/Communities/Members/GroupParticipantsViewController.m
@@ -16,7 +16,7 @@
 
 #import "GroupParticipantsViewController.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "Contact.h"
 #import "ContactTableViewCell.h"
@@ -219,9 +219,6 @@
 {
     [super viewWillAppear:animated];
     
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"GroupDetailsPeople"];
-    
     // Release the potential pushed view controller
     [self releasePushedViewController];
     
diff --git a/Riot/Modules/Communities/Rooms/GroupRoomsViewController.h b/Riot/Modules/Communities/Rooms/GroupRoomsViewController.h
index 34e0bbe9a..792865b96 100644
--- a/Riot/Modules/Communities/Rooms/GroupRoomsViewController.h
+++ b/Riot/Modules/Communities/Rooms/GroupRoomsViewController.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  'GroupRoomsViewController' instance is used to list the rooms of the group defined by the property 'mxGroup'.
diff --git a/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m b/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m
index 019d34c6d..855c46580 100644
--- a/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m
+++ b/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m
@@ -16,7 +16,7 @@
 
 #import "GroupRoomsViewController.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "GroupRoomTableViewCell.h"
 
@@ -183,9 +183,6 @@
 {
     [super viewWillAppear:animated];
     
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"GroupDetailsRooms"];
-    
     // Release the potential pushed view controller
     [self releasePushedViewController];
     
diff --git a/Riot/Modules/Communities/Rooms/Views/GroupRoomTableViewCell.h b/Riot/Modules/Communities/Rooms/Views/GroupRoomTableViewCell.h
index be8dd1ef9..e140b3585 100644
--- a/Riot/Modules/Communities/Rooms/Views/GroupRoomTableViewCell.h
+++ b/Riot/Modules/Communities/Rooms/Views/GroupRoomTableViewCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @interface GroupRoomTableViewCell : MXKTableViewCell
 
diff --git a/Riot/Modules/Communities/Rooms/Views/GroupRoomTableViewCell.m b/Riot/Modules/Communities/Rooms/Views/GroupRoomTableViewCell.m
index 0f11758c8..80d84a128 100644
--- a/Riot/Modules/Communities/Rooms/Views/GroupRoomTableViewCell.m
+++ b/Riot/Modules/Communities/Rooms/Views/GroupRoomTableViewCell.m
@@ -20,7 +20,7 @@
 #import "AvatarGenerator.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @implementation GroupRoomTableViewCell
 
diff --git a/Riot/Modules/Communities/TabDetail/GroupDetailsViewController.m b/Riot/Modules/Communities/TabDetail/GroupDetailsViewController.m
index c36120cc4..339af8584 100644
--- a/Riot/Modules/Communities/TabDetail/GroupDetailsViewController.m
+++ b/Riot/Modules/Communities/TabDetail/GroupDetailsViewController.m
@@ -20,7 +20,7 @@
 #import "GroupParticipantsViewController.h"
 #import "GroupRoomsViewController.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface GroupDetailsViewController ()
 {
@@ -136,9 +136,6 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-    
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"GroupDetails"];
 }
 
 - (void)viewWillDisappear:(BOOL)animated
diff --git a/Riot/Modules/Communities/Views/GroupInviteTableViewCell.h b/Riot/Modules/Communities/Views/GroupInviteTableViewCell.h
index c640d95f9..b746d6ba1 100644
--- a/Riot/Modules/Communities/Views/GroupInviteTableViewCell.h
+++ b/Riot/Modules/Communities/Views/GroupInviteTableViewCell.h
@@ -14,8 +14,6 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
-
 #import "GroupTableViewCell.h"
 
 /**
diff --git a/Riot/Modules/Communities/Views/GroupInviteTableViewCell.m b/Riot/Modules/Communities/Views/GroupInviteTableViewCell.m
index cd3c635cc..87b965266 100644
--- a/Riot/Modules/Communities/Views/GroupInviteTableViewCell.m
+++ b/Riot/Modules/Communities/Views/GroupInviteTableViewCell.m
@@ -17,7 +17,7 @@
 #import "GroupInviteTableViewCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #pragma mark - Constant definitions
 
diff --git a/Riot/Modules/Communities/Views/GroupTableViewCell.h b/Riot/Modules/Communities/Views/GroupTableViewCell.h
index 867ee5183..61f8f6849 100644
--- a/Riot/Modules/Communities/Views/GroupTableViewCell.h
+++ b/Riot/Modules/Communities/Views/GroupTableViewCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `GroupTableViewCell` instances display a group in the context of the groups list.
diff --git a/Riot/Modules/Communities/Views/GroupTableViewCell.m b/Riot/Modules/Communities/Views/GroupTableViewCell.m
index 313b01ac2..029a8cb0e 100644
--- a/Riot/Modules/Communities/Views/GroupTableViewCell.m
+++ b/Riot/Modules/Communities/Views/GroupTableViewCell.m
@@ -17,7 +17,7 @@
 #import "GroupTableViewCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "MXGroup+Riot.h"
 
diff --git a/Riot/Modules/Contacts/ContactsTableViewController.h b/Riot/Modules/Contacts/ContactsTableViewController.h
index f1b3effaf..97c02515b 100644
--- a/Riot/Modules/Contacts/ContactsTableViewController.h
+++ b/Riot/Modules/Contacts/ContactsTableViewController.h
@@ -19,6 +19,7 @@
 #import "ContactTableViewCell.h"
 
 @class ContactsTableViewController;
+@class AnalyticsScreenTimer;
 
 /**
  `ContactsTableViewController` delegate.
@@ -85,11 +86,6 @@
  */
 @property (nonatomic) BOOL shouldScrollToTopOnRefresh;
 
-/**
- The analytics instance screen name (Default is "ContactsTable").
- */
-@property (nonatomic) NSString *screenName;
-
 /**
  Callback used to take into account the change of the user interface theme.
  */
@@ -124,5 +120,10 @@
  */
 @property (nonatomic, weak) id<ContactsTableViewControllerDelegate> contactsTableViewControllerDelegate;
 
+/**
+ The screen timer used for analytics if they've been enabled. The default value is nil.
+ */
+@property (nonatomic) AnalyticsScreenTimer *screenTimer;
+
 @end
 
diff --git a/Riot/Modules/Contacts/ContactsTableViewController.m b/Riot/Modules/Contacts/ContactsTableViewController.m
index f208f6f67..bf83b6372 100644
--- a/Riot/Modules/Contacts/ContactsTableViewController.m
+++ b/Riot/Modules/Contacts/ContactsTableViewController.m
@@ -20,7 +20,7 @@
 
 #import "UIViewController+RiotSearch.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #define CONTACTS_TABLEVC_LOCALCONTACTS_BITWISE 0x01
 #define CONTACTS_TABLEVC_USERDIRECTORY_BITWISE 0x02
@@ -76,8 +76,6 @@
     // Setup `MXKViewControllerHandling` properties
     self.enableBarTintColorStatusChange = NO;
     self.rageShakeManager = [RageShakeManager sharedManager];
-    
-    _screenName = @"ContactsTable";
 }
 
 - (void)viewDidLoad
@@ -159,9 +157,6 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:_screenName];
     
     MXWeakify(self);
 
@@ -182,6 +177,12 @@
     [self updateFooterViewVisibility];
 }
 
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    [self.screenTimer start];
+}
+
 - (void)viewDidLayoutSubviews
 {
     [super viewDidLayoutSubviews];
@@ -206,6 +207,12 @@
     }
 }
 
+- (void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear:animated];
+    [self.screenTimer stop];
+}
+
 #pragma mark -
 
 /**
diff --git a/Riot/Modules/Contacts/DataSources/ContactsDataSource.h b/Riot/Modules/Contacts/DataSources/ContactsDataSource.h
index ea6db9c2e..5b665377e 100644
--- a/Riot/Modules/Contacts/DataSources/ContactsDataSource.h
+++ b/Riot/Modules/Contacts/DataSources/ContactsDataSource.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  The state of the users search from the homeserver user directory.
diff --git a/Riot/Modules/Contacts/DataSources/ContactsDataSource.m b/Riot/Modules/Contacts/DataSources/ContactsDataSource.m
index 15d0b6238..c7d1692bd 100644
--- a/Riot/Modules/Contacts/DataSources/ContactsDataSource.m
+++ b/Riot/Modules/Contacts/DataSources/ContactsDataSource.m
@@ -21,7 +21,7 @@
 #import "LocalContactsSectionHeaderContainerView.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #define CONTACTSDATASOURCE_LOCALCONTACTS_BITWISE 0x01
 #define CONTACTSDATASOURCE_USERDIRECTORY_BITWISE 0x02
diff --git a/Riot/Modules/Contacts/Details/ContactDetailsViewController.h b/Riot/Modules/Contacts/Details/ContactDetailsViewController.h
index a41a8df84..737dd6532 100644
--- a/Riot/Modules/Contacts/Details/ContactDetailsViewController.h
+++ b/Riot/Modules/Contacts/Details/ContactDetailsViewController.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  Available actions on contact
diff --git a/Riot/Modules/Contacts/Details/ContactDetailsViewController.m b/Riot/Modules/Contacts/Details/ContactDetailsViewController.m
index dda2d7fa2..be2fe5596 100644
--- a/Riot/Modules/Contacts/Details/ContactDetailsViewController.m
+++ b/Riot/Modules/Contacts/Details/ContactDetailsViewController.m
@@ -18,7 +18,7 @@
 
 #import "ContactDetailsViewController.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 #import "MXSession+Riot.h"
 
 #import "RoomMemberTitleView.h"
@@ -232,9 +232,6 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"ContactDetails"];
     
     // Hide the bottom border of the navigation bar to display the expander header
     [self hideNavigationBarBorder:YES];
diff --git a/Riot/Modules/Contacts/Details/Views/RoomTableViewCell.h b/Riot/Modules/Contacts/Details/Views/RoomTableViewCell.h
index db8a7590c..a99bd2df5 100644
--- a/Riot/Modules/Contacts/Details/Views/RoomTableViewCell.h
+++ b/Riot/Modules/Contacts/Details/Views/RoomTableViewCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  The `RoomTableViewCell` cell displays a room (avatar and displayname).
diff --git a/Riot/Modules/Contacts/Details/Views/RoomTableViewCell.m b/Riot/Modules/Contacts/Details/Views/RoomTableViewCell.m
index cf6fcaee2..22036093c 100644
--- a/Riot/Modules/Contacts/Details/Views/RoomTableViewCell.m
+++ b/Riot/Modules/Contacts/Details/Views/RoomTableViewCell.m
@@ -18,7 +18,7 @@
 #import "RoomTableViewCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "MXRoomSummary+Riot.h"
 
diff --git a/Riot/Modules/Contacts/Views/ContactTableViewCell.h b/Riot/Modules/Contacts/Views/ContactTableViewCell.h
index eadf78150..acb9e0097 100644
--- a/Riot/Modules/Contacts/Views/ContactTableViewCell.h
+++ b/Riot/Modules/Contacts/Views/ContactTableViewCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  'ContactTableCell' extends MXKTableViewCell.
diff --git a/Riot/Modules/Contacts/Views/ContactTableViewCell.m b/Riot/Modules/Contacts/Views/ContactTableViewCell.m
index 0a79aba0d..a1c3b12a2 100644
--- a/Riot/Modules/Contacts/Views/ContactTableViewCell.m
+++ b/Riot/Modules/Contacts/Views/ContactTableViewCell.m
@@ -17,10 +17,8 @@
 
 #import "ContactTableViewCell.h"
 
-#import <MatrixKit/MatrixKit.h>
-
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "AvatarGenerator.h"
 #import "Tools.h"
diff --git a/Riot/Modules/CreateRoom/EnterNewRoomDetails/EnterNewRoomDetailsViewController.swift b/Riot/Modules/CreateRoom/EnterNewRoomDetails/EnterNewRoomDetailsViewController.swift
index d89e60635..63fe65197 100644
--- a/Riot/Modules/CreateRoom/EnterNewRoomDetails/EnterNewRoomDetailsViewController.swift
+++ b/Riot/Modules/CreateRoom/EnterNewRoomDetails/EnterNewRoomDetailsViewController.swift
@@ -53,6 +53,7 @@ final class EnterNewRoomDetailsViewController: UIViewController {
         item.isEnabled = false
         return item
     }()
+    private var screenTimer = AnalyticsScreenTimer(screen: .createRoom)
     
     private enum RowType {
         case `default`
@@ -215,10 +216,17 @@ final class EnterNewRoomDetailsViewController: UIViewController {
         self.keyboardAvoider?.startAvoiding()
     }
     
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        screenTimer.start()
+    }
+    
     override func viewDidDisappear(_ animated: Bool) {
         super.viewDidDisappear(animated)
         
         self.keyboardAvoider?.stopAvoiding()
+        
+        screenTimer.stop()
     }
     
     override var preferredStatusBarStyle: UIStatusBarStyle {
diff --git a/Riot/Modules/EncryptionInfo/EncryptionInfoView.h b/Riot/Modules/EncryptionInfo/EncryptionInfoView.h
index 3c772b423..ce61e04c4 100644
--- a/Riot/Modules/EncryptionInfo/EncryptionInfoView.h
+++ b/Riot/Modules/EncryptionInfo/EncryptionInfoView.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  TODO: This view as it is implemented in this class must disappear.
diff --git a/Riot/Modules/EncryptionInfo/EncryptionInfoView.m b/Riot/Modules/EncryptionInfo/EncryptionInfoView.m
index a8a91125f..da56f1b66 100644
--- a/Riot/Modules/EncryptionInfo/EncryptionInfoView.m
+++ b/Riot/Modules/EncryptionInfo/EncryptionInfoView.m
@@ -18,7 +18,7 @@
 #import "EncryptionInfoView.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface EncryptionInfoView() <KeyVerificationCoordinatorBridgePresenterDelegate>
 {
diff --git a/Riot/Modules/Favorites/FavouritesViewController.m b/Riot/Modules/Favorites/FavouritesViewController.m
index 2d2eca941..c3c10933b 100644
--- a/Riot/Modules/Favorites/FavouritesViewController.m
+++ b/Riot/Modules/Favorites/FavouritesViewController.m
@@ -17,7 +17,7 @@
 #import "FavouritesViewController.h"
 
 #import "RecentsDataSource.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface FavouritesViewController ()
 {    
@@ -39,9 +39,9 @@
 {
     [super finalizeInit];
     
-    self.screenName = @"Favourites";
-    
     self.enableDragging = YES;
+    
+    self.screenTimer = [[AnalyticsScreenTimer alloc] initWithScreen:AnalyticsScreenFavourites];
 }
 
 - (void)viewDidLoad
diff --git a/Riot/Modules/GlobalSearch/DataSources/UnifiedSearchRecentsDataSource.h b/Riot/Modules/GlobalSearch/DataSources/UnifiedSearchRecentsDataSource.h
index 6102584de..7c89ea8b1 100644
--- a/Riot/Modules/GlobalSearch/DataSources/UnifiedSearchRecentsDataSource.h
+++ b/Riot/Modules/GlobalSearch/DataSources/UnifiedSearchRecentsDataSource.h
@@ -14,8 +14,6 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
-
 #import "RecentsDataSource.h"
 
 /**
diff --git a/Riot/Modules/GlobalSearch/DataSources/UnifiedSearchRecentsDataSource.m b/Riot/Modules/GlobalSearch/DataSources/UnifiedSearchRecentsDataSource.m
index 1a4605ba6..59d169d7f 100644
--- a/Riot/Modules/GlobalSearch/DataSources/UnifiedSearchRecentsDataSource.m
+++ b/Riot/Modules/GlobalSearch/DataSources/UnifiedSearchRecentsDataSource.m
@@ -22,7 +22,7 @@
 #import "DirectoryRecentTableViewCell.h"
 
 #import "MXRoom+Riot.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface UnifiedSearchRecentsDataSource()
 {
diff --git a/Riot/Modules/GlobalSearch/Files/CellData/FilesSearchCellData.h b/Riot/Modules/GlobalSearch/Files/CellData/FilesSearchCellData.h
index b8f6d3955..15832ca55 100644
--- a/Riot/Modules/GlobalSearch/Files/CellData/FilesSearchCellData.h
+++ b/Riot/Modules/GlobalSearch/Files/CellData/FilesSearchCellData.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `FilesSearchCellData` prepares the data for the Vector cell used to display the files search result.
diff --git a/Riot/Modules/GlobalSearch/Files/CellData/FilesSearchCellData.m b/Riot/Modules/GlobalSearch/Files/CellData/FilesSearchCellData.m
index d7af35024..f9dcf9ea2 100644
--- a/Riot/Modules/GlobalSearch/Files/CellData/FilesSearchCellData.m
+++ b/Riot/Modules/GlobalSearch/Files/CellData/FilesSearchCellData.m
@@ -18,6 +18,8 @@
 
 #import "FilesSearchCellData.h"
 
+#import "GeneratedInterface-Swift.h"
+
 @implementation FilesSearchCellData
 @synthesize roomId, senderDisplayName;
 @synthesize searchResult, title, message, date, shouldShowRoomDisplayName, roomDisplayName, attachment, isAttachmentWithThumbnail, attachmentIcon;
diff --git a/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.h b/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.h
index bf64d5bf2..71db0b6bc 100644
--- a/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.h
+++ b/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.h
@@ -15,7 +15,9 @@
  */
 
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
+
+@class AnalyticsScreenTimer;
 
 /**
  `HomeFilesSearchViewController` displays the files search in user's rooms under a `HomeViewController` segment.
@@ -27,4 +29,9 @@
  */
 @property (nonatomic, readonly) MXEvent *selectedEvent;
 
+/**
+ The screen timer used for analytics if they've been enabled. The default value is nil.
+ */
+@property (nonatomic) AnalyticsScreenTimer *screenTimer;
+
 @end
diff --git a/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m b/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m
index 05043e47b..67ad65ab8 100644
--- a/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m
+++ b/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m
@@ -17,7 +17,7 @@
 
 #import "HomeFilesSearchViewController.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "HomeViewController.h"
 
@@ -109,9 +109,6 @@
 {
     [super viewWillAppear:animated];
 
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"FilesGlobalSearch"];
-
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshSearchResult:) name:kMXSessionDidLeaveRoomNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshSearchResult:) name:kMXSessionNewRoomNotification object:nil];
 }
@@ -124,6 +121,18 @@
     [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionNewRoomNotification object:nil];
 }
 
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    [self.screenTimer start];
+}
+
+- (void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear:animated];
+    [self.screenTimer stop];
+}
+
 #pragma mark -
 
 - (void)refreshSearchResult:(NSNotification *)notif
diff --git a/Riot/Modules/GlobalSearch/Files/Views/FilesSearchTableViewCell.h b/Riot/Modules/GlobalSearch/Files/Views/FilesSearchTableViewCell.h
index 46f6e97e0..01ebbbd03 100644
--- a/Riot/Modules/GlobalSearch/Files/Views/FilesSearchTableViewCell.h
+++ b/Riot/Modules/GlobalSearch/Files/Views/FilesSearchTableViewCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  Each `FilesSearchTableViewCell` instance displays a files search result.
diff --git a/Riot/Modules/GlobalSearch/Files/Views/FilesSearchTableViewCell.m b/Riot/Modules/GlobalSearch/Files/Views/FilesSearchTableViewCell.m
index 4dfbe686f..e2633d41c 100644
--- a/Riot/Modules/GlobalSearch/Files/Views/FilesSearchTableViewCell.m
+++ b/Riot/Modules/GlobalSearch/Files/Views/FilesSearchTableViewCell.m
@@ -19,7 +19,7 @@
 #import "FilesSearchTableViewCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @implementation FilesSearchTableViewCell
 @synthesize delegate, mxkCellData;
diff --git a/Riot/Modules/GlobalSearch/Messages/DataSources/HomeMessagesSearchDataSource.h b/Riot/Modules/GlobalSearch/Messages/DataSources/HomeMessagesSearchDataSource.h
index 511d9e540..1f1136942 100644
--- a/Riot/Modules/GlobalSearch/Messages/DataSources/HomeMessagesSearchDataSource.h
+++ b/Riot/Modules/GlobalSearch/Messages/DataSources/HomeMessagesSearchDataSource.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `HomeMessagesSearchDataSource` overrides `MXKSearchDataSource` to render search results
diff --git a/Riot/Modules/GlobalSearch/Messages/DataSources/HomeMessagesSearchDataSource.m b/Riot/Modules/GlobalSearch/Messages/DataSources/HomeMessagesSearchDataSource.m
index 4c69eab0f..950715c17 100644
--- a/Riot/Modules/GlobalSearch/Messages/DataSources/HomeMessagesSearchDataSource.m
+++ b/Riot/Modules/GlobalSearch/Messages/DataSources/HomeMessagesSearchDataSource.m
@@ -16,14 +16,14 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 #import "HomeMessagesSearchDataSource.h"
 
 #import "RoomBubbleCellData.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "MXKRoomBubbleTableViewCell+Riot.h"
 
diff --git a/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.h b/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.h
index 1c4468201..9fdb9880a 100644
--- a/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.h
+++ b/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.h
@@ -15,7 +15,9 @@
  */
 
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
+
+@class AnalyticsScreenTimer;
 
 /**
  `HomeMessagesSearchViewController` displays messages search in user's rooms under a `HomeViewController` segment.
@@ -27,4 +29,9 @@
  */
 @property (nonatomic, readonly) MXEvent *selectedEvent;
 
+/**
+ The screen timer used for analytics if they've been enabled. The default value is nil.
+ */
+@property (nonatomic) AnalyticsScreenTimer *screenTimer;
+
 @end
diff --git a/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m b/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m
index 1050bbd1b..9fc1d5ac8 100644
--- a/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m
+++ b/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m
@@ -17,7 +17,7 @@
 
 #import "HomeMessagesSearchViewController.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "HomeViewController.h"
 
@@ -115,9 +115,6 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"MessagesGlobalSearch"];
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshSearchResult:) name:kMXSessionDidLeaveRoomNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshSearchResult:) name:kMXSessionNewRoomNotification object:nil];
@@ -131,6 +128,18 @@
     [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionNewRoomNotification object:nil];
 }
 
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    [self.screenTimer start];
+}
+
+- (void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear:animated];
+    [self.screenTimer stop];
+}
+
 #pragma mark -
 
 - (void)refreshSearchResult:(NSNotification *)notif
diff --git a/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultAttachmentBubbleCell.h b/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultAttachmentBubbleCell.h
index 7c01be438..709b25cfd 100644
--- a/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultAttachmentBubbleCell.h
+++ b/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultAttachmentBubbleCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `MessagesSearchResultAttachmentBubbleCell` displays an attachment with the information of the room and the sender.
diff --git a/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultAttachmentBubbleCell.m b/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultAttachmentBubbleCell.m
index 1e1fc3e4b..074013b5b 100644
--- a/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultAttachmentBubbleCell.m
+++ b/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultAttachmentBubbleCell.m
@@ -18,7 +18,7 @@
 #import "MessagesSearchResultAttachmentBubbleCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 #import "MXKRoomBubbleTableViewCell+Riot.h"
 
 @implementation MessagesSearchResultAttachmentBubbleCell
diff --git a/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultTextMsgBubbleCell.h b/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultTextMsgBubbleCell.h
index 04228a453..4c12d1d17 100644
--- a/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultTextMsgBubbleCell.h
+++ b/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultTextMsgBubbleCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `MessagesSearchResultTextMsgBubbleCell` displays a message text with the information of the room and the sender.
diff --git a/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultTextMsgBubbleCell.m b/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultTextMsgBubbleCell.m
index 3a29ef6b1..40818f8a0 100644
--- a/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultTextMsgBubbleCell.m
+++ b/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultTextMsgBubbleCell.m
@@ -18,7 +18,7 @@
 #import "MessagesSearchResultTextMsgBubbleCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 #import "MXKRoomBubbleTableViewCell+Riot.h"
 
 @implementation MessagesSearchResultTextMsgBubbleCell
diff --git a/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.h b/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.h
index ada83aca8..c4cf2dc9a 100644
--- a/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.h
+++ b/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @class PublicRoomsDirectoryDataSource;
 
diff --git a/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m b/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m
index 2f6e791d7..66d724005 100644
--- a/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m
+++ b/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m
@@ -19,7 +19,7 @@
 
 #import "PublicRoomsDirectoryDataSource.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface DirectoryViewController ()
 {
@@ -35,6 +35,8 @@
     id kThemeServiceDidChangeThemeNotificationObserver;
 }
 
+@property (nonatomic) AnalyticsScreenTimer *screenTimer;
+
 @end
 
 @implementation DirectoryViewController
@@ -46,6 +48,8 @@
     // Setup `MXKViewControllerHandling` properties
     self.enableBarTintColorStatusChange = NO;
     self.rageShakeManager = [RageShakeManager sharedManager];
+    
+    self.screenTimer = [[AnalyticsScreenTimer alloc] initWithScreen:AnalyticsScreenRoomDirectory];
 }
 
 - (void)viewDidLoad
@@ -106,9 +110,6 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"Directory"];
     
     // Observe kAppDelegateDidTapStatusBarNotificationObserver.
     kAppDelegateDidTapStatusBarNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kAppDelegateDidTapStatusBarNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
@@ -135,6 +136,8 @@
         // the selected room (if any) is highlighted.
         [self refreshCurrentSelectedCell:YES];
     }
+    
+    [self.screenTimer start];
 }
 
 - (void)viewWillDisappear:(BOOL)animated
@@ -148,6 +151,12 @@
     [super viewWillDisappear:animated];
 }
 
+- (void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear:animated];
+    [self.screenTimer stop];
+}
+
 - (void)displayWitDataSource:(PublicRoomsDirectoryDataSource *)dataSource2
 {
     // Let the data source provide cells
@@ -190,7 +199,7 @@
     MXPublicRoom *publicRoom = [dataSource roomAtIndexPath:indexPath];
 
     // Check whether the user has already joined the selected public room
-    if ([dataSource.mxSession roomWithRoomId:publicRoom.roomId])
+    if ([dataSource.mxSession isJoinedOnRoom:publicRoom.roomId])
     {
         // Open the public room.
         [self showRoomWithId:publicRoom.roomId inMatrixSession:dataSource.mxSession];
diff --git a/Riot/Modules/GlobalSearch/UnifiedSearchViewController.h b/Riot/Modules/GlobalSearch/UnifiedSearchViewController.h
index 3a22f76e4..72fddaef6 100644
--- a/Riot/Modules/GlobalSearch/UnifiedSearchViewController.h
+++ b/Riot/Modules/GlobalSearch/UnifiedSearchViewController.h
@@ -14,8 +14,6 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
-
 #import "SegmentedViewController.h"
 
 #import "ContactsTableViewController.h"
diff --git a/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m b/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
index 03375e8b9..8c1956330 100644
--- a/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
+++ b/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
@@ -31,7 +31,7 @@
 #import "HomeFilesSearchViewController.h"
 #import "FilesSearchCellData.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "GBDeviceInfo_iOS.h"
 
@@ -79,12 +79,13 @@
 
     [titles addObject:[VectorL10n searchRooms]];
     recentsViewController = [RecentsViewController recentListViewController];
+    recentsViewController.screenTimer = [[AnalyticsScreenTimer alloc] initWithScreen:AnalyticsScreenSearchRooms];
     recentsViewController.enableSearchBar = NO;
-    recentsViewController.screenName = @"UnifiedSearchRooms";
     [viewControllers addObject:recentsViewController];
 
     [titles addObject:[VectorL10n searchMessages]];
     messagesSearchViewController = [HomeMessagesSearchViewController searchViewController];
+    messagesSearchViewController.screenTimer = [[AnalyticsScreenTimer alloc] initWithScreen:AnalyticsScreenSearchMessages];
     [viewControllers addObject:messagesSearchViewController];
 
     // Add search People tab
@@ -92,11 +93,13 @@
     peopleSearchViewController = [ContactsTableViewController contactsTableViewController];
     peopleSearchViewController.contactsTableViewControllerDelegate = self;
     peopleSearchViewController.disableFindYourContactsFooter = YES;
+    peopleSearchViewController.screenTimer = [[AnalyticsScreenTimer alloc] initWithScreen:AnalyticsScreenSearchPeople];
     [viewControllers addObject:peopleSearchViewController];
     
     // add Files tab
     [titles addObject:[VectorL10n searchFiles]];
     filesSearchViewController = [HomeFilesSearchViewController searchViewController];
+    filesSearchViewController.screenTimer = [[AnalyticsScreenTimer alloc] initWithScreen:AnalyticsScreenSearchFiles];
     [viewControllers addObject:filesSearchViewController];
 
     [self initWithTitles:titles viewControllers:viewControllers defaultSelected:0];
@@ -144,9 +147,6 @@
 {
     [super viewWillAppear:animated];
 
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"UnifiedSearch"];
-
     // Let's child display the loading not the home view controller
     if (self.activityIndicator)
     {
diff --git a/Riot/Modules/GlobalSearch/Views/DirectoryRecentTableViewCell.h b/Riot/Modules/GlobalSearch/Views/DirectoryRecentTableViewCell.h
index 15be3d4dd..04266edb6 100644
--- a/Riot/Modules/GlobalSearch/Views/DirectoryRecentTableViewCell.h
+++ b/Riot/Modules/GlobalSearch/Views/DirectoryRecentTableViewCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @class PublicRoomsDirectoryDataSource;
 
diff --git a/Riot/Modules/GlobalSearch/Views/DirectoryRecentTableViewCell.m b/Riot/Modules/GlobalSearch/Views/DirectoryRecentTableViewCell.m
index 9a168d3f7..1042d8265 100644
--- a/Riot/Modules/GlobalSearch/Views/DirectoryRecentTableViewCell.m
+++ b/Riot/Modules/GlobalSearch/Views/DirectoryRecentTableViewCell.m
@@ -20,7 +20,7 @@
 #import "PublicRoomsDirectoryDataSource.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @implementation DirectoryRecentTableViewCell
 
diff --git a/Riot/Modules/GlobalSearch/Views/RoomIdOrAliasTableViewCell.h b/Riot/Modules/GlobalSearch/Views/RoomIdOrAliasTableViewCell.h
index 1f3ab2398..36d082255 100644
--- a/Riot/Modules/GlobalSearch/Views/RoomIdOrAliasTableViewCell.h
+++ b/Riot/Modules/GlobalSearch/Views/RoomIdOrAliasTableViewCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  The `RoomIdOrAliasTableViewCell` cell displays a room identifier or a room alias.
diff --git a/Riot/Modules/GlobalSearch/Views/RoomIdOrAliasTableViewCell.m b/Riot/Modules/GlobalSearch/Views/RoomIdOrAliasTableViewCell.m
index 44f788e91..0a798aefc 100644
--- a/Riot/Modules/GlobalSearch/Views/RoomIdOrAliasTableViewCell.m
+++ b/Riot/Modules/GlobalSearch/Views/RoomIdOrAliasTableViewCell.m
@@ -19,7 +19,7 @@
 
 #import "AvatarGenerator.h"
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @implementation RoomIdOrAliasTableViewCell
 
diff --git a/Riot/Modules/Home/Fallback/AuthFallBackViewController.m b/Riot/Modules/Home/Fallback/AuthFallBackViewController.m
index 65084f110..93a770610 100644
--- a/Riot/Modules/Home/Fallback/AuthFallBackViewController.m
+++ b/Riot/Modules/Home/Fallback/AuthFallBackViewController.m
@@ -15,7 +15,7 @@
  */
 
 #import "AuthFallBackViewController.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 // Generic method to make a bridge between JS and the WKWebView
 NSString *FallBackViewControllerJavascriptSendObjectMessage = @"window.sendObjectMessage = function(parameters) {   \
diff --git a/Riot/Modules/Home/HomeViewController.m b/Riot/Modules/Home/HomeViewController.m
index 411add2bb..2c2f702d7 100644
--- a/Riot/Modules/Home/HomeViewController.m
+++ b/Riot/Modules/Home/HomeViewController.m
@@ -17,7 +17,7 @@
 
 #import "HomeViewController.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "RecentsDataSource.h"
 
@@ -69,7 +69,7 @@
     selectedRoomId = nil;
     selectedCollectionViewContentOffset = -1;
     
-    self.screenName = @"Home";
+    self.screenTimer = [[AnalyticsScreenTimer alloc] initWithScreen:AnalyticsScreenHome];
 }
 
 - (void)viewDidLoad
diff --git a/Riot/Modules/Home/Views/RoomCollectionViewCell.h b/Riot/Modules/Home/Views/RoomCollectionViewCell.h
index 439cf0527..f08116c11 100644
--- a/Riot/Modules/Home/Views/RoomCollectionViewCell.h
+++ b/Riot/Modules/Home/Views/RoomCollectionViewCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @class BadgeLabel;
 
diff --git a/Riot/Modules/Home/Views/RoomCollectionViewCell.m b/Riot/Modules/Home/Views/RoomCollectionViewCell.m
index a030b9a6f..f13d7bc3b 100644
--- a/Riot/Modules/Home/Views/RoomCollectionViewCell.m
+++ b/Riot/Modules/Home/Views/RoomCollectionViewCell.m
@@ -19,7 +19,7 @@
 #import "AvatarGenerator.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "MXRoomSummary+Riot.h"
 #import "MXRoom+Riot.h"
diff --git a/Riot/Modules/Home/Views/TableViewCellWithCollectionView.h b/Riot/Modules/Home/Views/TableViewCellWithCollectionView.h
index aa71ab9d4..832037a88 100644
--- a/Riot/Modules/Home/Views/TableViewCellWithCollectionView.h
+++ b/Riot/Modules/Home/Views/TableViewCellWithCollectionView.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @interface TableViewCellWithCollectionView : MXKTableViewCell
 
diff --git a/Riot/Modules/Home/Views/TableViewCellWithCollectionView.m b/Riot/Modules/Home/Views/TableViewCellWithCollectionView.m
index cae76808a..4da67b857 100644
--- a/Riot/Modules/Home/Views/TableViewCellWithCollectionView.m
+++ b/Riot/Modules/Home/Views/TableViewCellWithCollectionView.m
@@ -16,7 +16,7 @@
 
 #import "TableViewCellWithCollectionView.h"
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 static CGFloat const kEditionViewCornerRadius = 10.0;
 
diff --git a/Riot/Modules/Integrations/IntegrationManagerViewController.m b/Riot/Modules/Integrations/IntegrationManagerViewController.m
index 7ba021062..56dead207 100644
--- a/Riot/Modules/Integrations/IntegrationManagerViewController.m
+++ b/Riot/Modules/Integrations/IntegrationManagerViewController.m
@@ -19,7 +19,7 @@
 
 #import "WidgetManager.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 NSString *const kIntegrationManagerMainScreen = nil;
 NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
diff --git a/Riot/Modules/Integrations/WidgetPicker/WidgetPickerViewController.h b/Riot/Modules/Integrations/WidgetPicker/WidgetPickerViewController.h
index 8293c1029..0396a55f0 100644
--- a/Riot/Modules/Integrations/WidgetPicker/WidgetPickerViewController.h
+++ b/Riot/Modules/Integrations/WidgetPicker/WidgetPickerViewController.h
@@ -17,7 +17,7 @@
 #import <UIKit/UIKit.h>
 
 #import <MatrixSDK/MatrixSDK.h>
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `WidgetPickerViewController` displays the list of widgets within a room plus a
diff --git a/Riot/Modules/Integrations/WidgetPicker/WidgetPickerViewController.m b/Riot/Modules/Integrations/WidgetPicker/WidgetPickerViewController.m
index d3cb31902..74e8f2f22 100644
--- a/Riot/Modules/Integrations/WidgetPicker/WidgetPickerViewController.m
+++ b/Riot/Modules/Integrations/WidgetPicker/WidgetPickerViewController.m
@@ -19,7 +19,7 @@
 #import "WidgetManager.h"
 #import "WidgetViewController.h"
 #import "IntegrationManagerViewController.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface WidgetPickerViewController () <ServiceTermsModalCoordinatorBridgePresenterDelegate>
 {
diff --git a/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.h b/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.h
index 2fb2b368f..c79a07b2a 100644
--- a/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.h
+++ b/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 #import "WidgetManager.h"
 
diff --git a/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m b/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m
index cbaceeed8..c8fa03fdd 100644
--- a/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m
+++ b/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m
@@ -16,7 +16,7 @@
 
 #import "JitsiViewController.h"
 #import "JitsiWidgetData.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #if __has_include(<MatrixSDK/MXJingleCallStack.h>)
 @import JitsiMeetSDK;
diff --git a/Riot/Modules/Integrations/Widgets/StickerPicker/StickerPickerViewController.m b/Riot/Modules/Integrations/Widgets/StickerPicker/StickerPickerViewController.m
index d56aeef6d..d665a06d0 100644
--- a/Riot/Modules/Integrations/Widgets/StickerPicker/StickerPickerViewController.m
+++ b/Riot/Modules/Integrations/Widgets/StickerPicker/StickerPickerViewController.m
@@ -18,7 +18,7 @@
 
 #import "IntegrationManagerViewController.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface StickerPickerViewController ()
 
diff --git a/Riot/Modules/Integrations/Widgets/WidgetViewController.h b/Riot/Modules/Integrations/Widgets/WidgetViewController.h
index 49b6a6ac2..895f229c5 100644
--- a/Riot/Modules/Integrations/Widgets/WidgetViewController.h
+++ b/Riot/Modules/Integrations/Widgets/WidgetViewController.h
@@ -17,7 +17,7 @@
 #import "WebViewViewController.h"
 
 #import "WidgetManager.h"
-#import "MatrixKit/MatrixKit.h"
+#import "MatrixKit.h"
 
 /**
  `WidgetViewController` displays widget within a webview.
diff --git a/Riot/Modules/Integrations/Widgets/WidgetViewController.m b/Riot/Modules/Integrations/Widgets/WidgetViewController.m
index 6d04db4c0..a5e93b152 100644
--- a/Riot/Modules/Integrations/Widgets/WidgetViewController.m
+++ b/Riot/Modules/Integrations/Widgets/WidgetViewController.m
@@ -18,7 +18,7 @@
 #import "WidgetViewController.h"
 
 #import "IntegrationManagerViewController.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 NSString *const kJavascriptSendResponseToPostMessageAPI = @"riotIOS.sendResponse('%@', %@);";
 
diff --git a/Riot/Modules/MatrixKit/Animators/MXKAttachmentAnimator.h b/Riot/Modules/MatrixKit/Animators/MXKAttachmentAnimator.h
new file mode 100644
index 000000000..31588cfad
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Animators/MXKAttachmentAnimator.h
@@ -0,0 +1,45 @@
+/*
+ Copyright 2017 Aram Sargsyan
+ 
+ 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/Foundation.h>
+#import <UIKit/UIKit.h>
+
+typedef NS_ENUM(NSInteger, PhotoBrowserAnimationType) {
+    PhotoBrowserZoomInAnimation,
+    PhotoBrowserZoomOutAnimation
+};
+
+@protocol MXKSourceAttachmentAnimatorDelegate <NSObject>
+
+- (UIImageView *)originalImageView;
+
+- (CGRect)convertedFrameForOriginalImageView;
+
+@end
+
+@protocol MXKDestinationAttachmentAnimatorDelegate <NSObject>
+
+- (UIImageView *)finalImageView;
+
+@end
+
+@interface MXKAttachmentAnimator : NSObject <UIViewControllerAnimatedTransitioning>
+
+- (instancetype)initWithAnimationType:(PhotoBrowserAnimationType)animationType sourceViewController:(UIViewController <MXKSourceAttachmentAnimatorDelegate> *)viewController;
+
++ (CGRect)aspectFitImage:(UIImage *)image inFrame:(CGRect)targetFrame;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Animators/MXKAttachmentAnimator.m b/Riot/Modules/MatrixKit/Animators/MXKAttachmentAnimator.m
new file mode 100644
index 000000000..d4ca8393f
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Animators/MXKAttachmentAnimator.m
@@ -0,0 +1,161 @@
+/*
+ Copyright 2017 Aram Sargsyan
+ 
+ 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 "MXKAttachmentAnimator.h"
+#import "MXLog.h"
+
+@interface MXKAttachmentAnimator ()
+
+@property (nonatomic) PhotoBrowserAnimationType animationType;
+@property (nonatomic, weak) UIViewController <MXKSourceAttachmentAnimatorDelegate> *sourceViewController;
+
+@end
+
+@implementation MXKAttachmentAnimator
+
+#pragma mark - Lifecycle
+
+- (instancetype)initWithAnimationType:(PhotoBrowserAnimationType)animationType sourceViewController:(UIViewController <MXKSourceAttachmentAnimatorDelegate> *)viewController
+{
+    self = [self init];
+    if (self) {
+        self.animationType = animationType;
+        self.sourceViewController = viewController;
+    }
+    return self;
+}
+
+#pragma mark - Public
+
++ (CGRect)aspectFitImage:(UIImage *)image inFrame:(CGRect)targetFrame
+{
+    // Sanity check
+    if (!image)
+    {
+        MXLogDebug(@"[MXKAttachmentAnimator] aspectFitImage failed: image is nil");
+        return CGRectZero;
+    }
+    
+    if (CGSizeEqualToSize(image.size, targetFrame.size))
+    {
+        return targetFrame;
+    }
+    
+    CGFloat targetWidth = CGRectGetWidth(targetFrame);
+    CGFloat targetHeight = CGRectGetHeight(targetFrame);
+    CGFloat imageWidth = image.size.width;
+    CGFloat imageHeight = image.size.height;
+    
+    CGFloat factor = MIN(targetWidth/imageWidth, targetHeight/imageHeight);
+    
+    CGSize finalSize = CGSizeMake(imageWidth * factor, imageHeight * factor);
+    CGRect finalFrame = CGRectMake((targetWidth - finalSize.width)/2 + targetFrame.origin.x, (targetHeight - finalSize.height)/2 + targetFrame.origin.y, finalSize.width, finalSize.height);
+    
+    return finalFrame;
+}
+
+#pragma mark - Animations
+
+- (void)animateZoomInAnimation:(id<UIViewControllerContextTransitioning>)transitionContext
+{
+    //originalImageView
+    UIImageView *originalImageView = [self.sourceViewController originalImageView];
+    originalImageView.hidden = YES;
+    CGRect convertedFrame = [self.sourceViewController convertedFrameForOriginalImageView];
+    
+    //toViewController
+    UIViewController<MXKDestinationAttachmentAnimatorDelegate> *toViewController = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
+    toViewController.view.frame = [transitionContext finalFrameForViewController:toViewController];
+    [[transitionContext containerView] addSubview:toViewController.view];
+    toViewController.view.alpha = 0.0;
+    
+    //destinationImageView
+    UIImageView *destinationImageView = [toViewController finalImageView];
+    destinationImageView.hidden = YES;
+    
+    //transitioningImageView
+    UIImageView *transitioningImageView = [[UIImageView alloc] initWithImage:originalImageView.image];
+    transitioningImageView.frame = convertedFrame;
+    [[transitionContext containerView] addSubview:transitioningImageView];
+    CGRect finalFrameForTransitioningView = [[self class] aspectFitImage:originalImageView.image inFrame:toViewController.view.frame];
+    
+    
+    //animation
+    [UIView animateWithDuration:[self transitionDuration:transitionContext] animations:^{
+        toViewController.view.alpha = 1.0;
+        transitioningImageView.frame = finalFrameForTransitioningView;
+    } completion:^(BOOL finished) {
+        [transitioningImageView removeFromSuperview];
+        destinationImageView.hidden = NO;
+        originalImageView.hidden = NO;
+        [transitionContext completeTransition:![transitionContext transitionWasCancelled]];
+    }];
+}
+
+- (void)animateZoomOutAnimation:(id<UIViewControllerContextTransitioning>)transitionContext
+{
+    //fromViewController
+    UIViewController<MXKDestinationAttachmentAnimatorDelegate> *fromViewController = [transitionContext viewControllerForKey:UITransitionContextFromViewControllerKey];
+    UIImageView *destinationImageView = [fromViewController finalImageView];
+    destinationImageView.hidden = YES;
+    
+    //toViewController
+    UIViewController *toViewController = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
+    toViewController.view.frame = [transitionContext finalFrameForViewController:toViewController];
+    [[transitionContext containerView] insertSubview:toViewController.view belowSubview:fromViewController.view];
+    UIImageView *originalImageView = [self.sourceViewController originalImageView];
+    originalImageView.hidden = YES;
+    CGRect convertedFrame = [self.sourceViewController convertedFrameForOriginalImageView];
+    
+    //transitioningImageView
+    UIImageView *transitioningImageView = [[UIImageView alloc] initWithImage:destinationImageView.image];
+    transitioningImageView.frame = [[self class] aspectFitImage:destinationImageView.image inFrame:destinationImageView.frame];
+    [[transitionContext containerView] addSubview:transitioningImageView];
+    
+    //animation
+    [UIView animateWithDuration:[self transitionDuration:transitionContext] animations:^{
+        fromViewController.view.alpha = 0.0;
+        transitioningImageView.frame = convertedFrame;
+    } completion:^(BOOL finished) {
+        [transitioningImageView removeFromSuperview];
+        destinationImageView.hidden = NO;
+        originalImageView.hidden = NO;
+        [transitionContext completeTransition:![transitionContext transitionWasCancelled]];
+    }];
+}
+
+#pragma mark - UIViewControllerAnimatedTransitioning
+
+- (NSTimeInterval)transitionDuration:(id<UIViewControllerContextTransitioning>)transitionContext
+{
+    return 0.3;
+}
+
+- (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionContext
+{
+    switch (self.animationType) {
+        case PhotoBrowserZoomInAnimation:
+            [self animateZoomInAnimation:transitionContext];
+            break;
+            
+        case PhotoBrowserZoomOutAnimation:
+            [self animateZoomOutAnimation:transitionContext];
+            break;
+    }
+}
+
+
+@end
diff --git a/Riot/Modules/MatrixKit/Animators/MXKAttachmentInteractionController.h b/Riot/Modules/MatrixKit/Animators/MXKAttachmentInteractionController.h
new file mode 100644
index 000000000..64b55cc22
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Animators/MXKAttachmentInteractionController.h
@@ -0,0 +1,26 @@
+/*
+ Copyright 2017 Aram Sargsyan
+ 
+ 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/UIKit.h>
+#import "MXKAttachmentAnimator.h"
+
+@interface MXKAttachmentInteractionController : UIPercentDrivenInteractiveTransition
+
+@property (nonatomic) BOOL interactionInProgress;
+
+- (instancetype)initWithDestinationViewController:(UIViewController <MXKDestinationAttachmentAnimatorDelegate> *)viewController sourceViewController:(UIViewController <MXKSourceAttachmentAnimatorDelegate> *)sourceViewController;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Animators/MXKAttachmentInteractionController.m b/Riot/Modules/MatrixKit/Animators/MXKAttachmentInteractionController.m
new file mode 100644
index 000000000..ba3d952fc
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Animators/MXKAttachmentInteractionController.m
@@ -0,0 +1,204 @@
+/*
+ Copyright 2017 Aram Sargsyan
+ 
+ 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 "MXKAttachmentInteractionController.h"
+#import "MXLog.h"
+
+@interface MXKAttachmentInteractionController ()
+
+@property (nonatomic, weak) UIViewController <MXKDestinationAttachmentAnimatorDelegate> *destinationViewController;
+@property (nonatomic, weak) UIViewController <MXKSourceAttachmentAnimatorDelegate> *sourceViewController;
+
+@property (nonatomic) UIImageView *transitioningImageView;
+@property (nonatomic, weak) id <UIViewControllerContextTransitioning> transitionContext;
+
+@property (nonatomic) CGPoint translation;
+@property (nonatomic) CGPoint delta;
+
+@end
+
+@implementation MXKAttachmentInteractionController
+
+#pragma mark - Lifecycle
+
+- (instancetype)initWithDestinationViewController:(UIViewController <MXKDestinationAttachmentAnimatorDelegate> *)viewController sourceViewController:(UIViewController <MXKSourceAttachmentAnimatorDelegate> *)sourceViewController
+{
+    self = [super init];
+    if (self) {
+        self.destinationViewController = viewController;
+        self.sourceViewController = sourceViewController;
+        self.interactionInProgress = NO;
+        
+        [self preparePanGestureRecognizerInView:viewController.view];
+    }
+    return self;
+}
+
+#pragma mark - Gesture recognizer
+
+- (void)preparePanGestureRecognizerInView:(UIView *)view
+{
+    UIPanGestureRecognizer *recognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(handleGesture:)];
+    recognizer.minimumNumberOfTouches = 1;
+    recognizer.maximumNumberOfTouches = 3;
+    [view addGestureRecognizer:recognizer];
+}
+
+- (void)handleGesture:(UIPanGestureRecognizer *)recognizer
+{
+    CGPoint translation = [recognizer translationInView:self.destinationViewController.view];
+    self.delta = CGPointMake(translation.x - self.translation.x, translation.y - self.translation.y);
+    self.translation = translation;
+    
+    switch (recognizer.state) {
+        case UIGestureRecognizerStateBegan:
+            
+            self.interactionInProgress = YES;
+            
+            if (self.destinationViewController.navigationController) {
+                [self.destinationViewController.navigationController popViewControllerAnimated:YES];
+            } else {
+                [self.destinationViewController dismissViewControllerAnimated:YES completion:nil];
+            }
+            
+            break;
+            
+        case UIGestureRecognizerStateChanged:
+            
+            [self updateInteractiveTransition:(ABS(translation.y) / (CGRectGetHeight(self.destinationViewController.view.frame) / 2))];
+            
+            break;
+            
+        case UIGestureRecognizerStateCancelled:
+            
+            self.interactionInProgress = NO;
+            [self cancelInteractiveTransition];
+            
+            break;
+            
+        case UIGestureRecognizerStateEnded:
+            
+            self.interactionInProgress = NO;
+            if (ABS(self.translation.y) < CGRectGetHeight(self.destinationViewController.view.frame)/6) {
+                [self cancelInteractiveTransition];
+            } else {
+                [self finishInteractiveTransition];
+            }
+            
+            break;
+            
+        default:
+            MXLogDebug(@"UIGestureRecognizerState not handled");
+            break;
+    }
+}
+
+#pragma mark - UIPercentDrivenInteractiveTransition
+
+- (void)startInteractiveTransition:(id <UIViewControllerContextTransitioning>)transitionContext
+{
+    self.transitionContext = transitionContext;
+    
+    UIViewController *fromViewController = [transitionContext viewControllerForKey:UITransitionContextFromViewControllerKey];
+    UIImageView *destinationImageView = [self.destinationViewController finalImageView];
+    destinationImageView.hidden = YES;
+
+    UIViewController *toViewController = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
+    toViewController.view.frame = [transitionContext finalFrameForViewController:toViewController];
+    [[transitionContext containerView] insertSubview:toViewController.view belowSubview:fromViewController.view];
+    UIImageView *originalImageView = [self.sourceViewController originalImageView];
+    originalImageView.hidden = YES;
+    
+    self.transitioningImageView = [[UIImageView alloc] initWithImage:destinationImageView.image];
+    self.transitioningImageView.frame = [MXKAttachmentAnimator aspectFitImage:destinationImageView.image inFrame:destinationImageView.frame];
+    [[transitionContext containerView] addSubview:self.transitioningImageView];
+}
+
+- (void)updateInteractiveTransition:(CGFloat)percentComplete {
+    self.destinationViewController.view.alpha = MAX(0, (1 - percentComplete));
+    
+    CGRect newFrame = CGRectMake(self.transitioningImageView.frame.origin.x, self.transitioningImageView.frame.origin.y + self.delta.y, CGRectGetWidth(self.transitioningImageView.frame), CGRectGetHeight(self.transitioningImageView.frame));
+    self.transitioningImageView.frame = newFrame;
+}
+
+- (void)cancelInteractiveTransition {
+    UIViewController *fromViewController = [self.transitionContext viewControllerForKey:UITransitionContextFromViewControllerKey];
+    UIImageView *destinationImageView = [self.destinationViewController finalImageView];
+    UIImageView *originalImageView = [self.sourceViewController originalImageView];
+
+    __weak typeof(self) weakSelf = self;
+
+    [UIView animateWithDuration:([self transitionDuration:self.transitionContext]/2) animations:^{
+        if (weakSelf)
+        {
+            typeof(self) self = weakSelf;
+            fromViewController.view.alpha = 1;
+            self.transitioningImageView.frame = [MXKAttachmentAnimator aspectFitImage:destinationImageView.image inFrame:destinationImageView.frame];
+        }
+    } completion:^(BOOL finished) {
+        if (weakSelf)
+        {
+            typeof(self) self = weakSelf;
+            destinationImageView.hidden = NO;
+            originalImageView.hidden = NO;
+            [self.transitioningImageView removeFromSuperview];
+
+            [self.transitionContext cancelInteractiveTransition];
+            [self.transitionContext completeTransition:NO];
+        }
+    }];
+}
+
+- (void)finishInteractiveTransition
+{
+    UIViewController *fromViewController = [self.transitionContext viewControllerForKey:UITransitionContextFromViewControllerKey];
+    UIImageView *destinationImageView = [self.destinationViewController finalImageView];
+    
+    UIImageView *originalImageView = [self.sourceViewController originalImageView];
+    CGRect originalImageViewFrame = [self.sourceViewController convertedFrameForOriginalImageView];
+
+    __weak typeof(self) weakSelf = self;
+    
+    [UIView animateWithDuration:[self transitionDuration:self.transitionContext] animations:^{
+        if (weakSelf)
+        {
+            typeof(self) self = weakSelf;
+            fromViewController.view.alpha = 0.0;
+            self.transitioningImageView.frame = originalImageViewFrame;
+        }
+    } completion:^(BOOL finished) {
+        if (weakSelf)
+        {
+            typeof(self) self = weakSelf;
+            [self.transitioningImageView removeFromSuperview];
+            destinationImageView.hidden = NO;
+            originalImageView.hidden = NO;
+
+            [self.transitionContext finishInteractiveTransition];
+            [self.transitionContext completeTransition:YES];
+        }
+    }];
+}
+
+#pragma mark - UIViewControllerAnimatedTransitioning
+
+- (NSTimeInterval)transitionDuration:(id<UIViewControllerContextTransitioning>)transitionContext
+{
+    return 0.3;
+}
+
+
+@end
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/back_icon.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/back_icon.png
new file mode 100644
index 000000000..dfef9b68d
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/back_icon.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/back_icon@2x.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/back_icon@2x.png
new file mode 100644
index 000000000..96d24fa95
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/back_icon@2x.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/back_icon@3x.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/back_icon@3x.png
new file mode 100644
index 000000000..c5186c770
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/back_icon@3x.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/back_icon@4x.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/back_icon@4x.png
new file mode 100644
index 000000000..c6e227a11
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/back_icon@4x.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/bubble_ios_messages_right.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/bubble_ios_messages_right.png
new file mode 100644
index 000000000..50d90254c
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/bubble_ios_messages_right.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/bubble_ios_messages_right@2x.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/bubble_ios_messages_right@2x.png
new file mode 100644
index 000000000..d0bec7c32
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/bubble_ios_messages_right@2x.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/default-profile.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/default-profile.png
new file mode 100644
index 000000000..b48dd4098
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/default-profile.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/default-profile@2x.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/default-profile@2x.png
new file mode 100644
index 000000000..6f81a3c41
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/default-profile@2x.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/disclosure.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/disclosure.png
new file mode 100755
index 000000000..501026d49
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/disclosure.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/disclosure@2x.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/disclosure@2x.png
new file mode 100644
index 000000000..3920aba23
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/disclosure@2x.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/filetype-gif.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/filetype-gif.png
new file mode 100644
index 000000000..a4f048f7b
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/filetype-gif.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/filetype-gif@2x.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/filetype-gif@2x.png
new file mode 100644
index 000000000..415769083
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/filetype-gif@2x.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_audio_mute.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_audio_mute.png
new file mode 100755
index 000000000..020c67583
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_audio_mute.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_audio_mute@2x.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_audio_mute@2x.png
new file mode 100755
index 000000000..2804524e1
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_audio_mute@2x.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_audio_unmute.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_audio_unmute.png
new file mode 100755
index 000000000..1eb9a831b
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_audio_unmute.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_audio_unmute@2x.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_audio_unmute@2x.png
new file mode 100644
index 000000000..87095ec67
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_audio_unmute@2x.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_backtoapp.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_backtoapp.png
new file mode 100644
index 000000000..0c0db3a59
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_backtoapp.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_backtoapp@2x.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_backtoapp@2x.png
new file mode 100644
index 000000000..ece39112e
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_backtoapp@2x.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_keyboard.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_keyboard.png
new file mode 100644
index 000000000..8fbefd852
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_keyboard.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_keyboard@2x.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_keyboard@2x.png
new file mode 100644
index 000000000..f6a01a8f6
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_keyboard@2x.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_minus.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_minus.png
new file mode 100644
index 000000000..93e8cc466
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_minus.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_minus@2x.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_minus@2x.png
new file mode 100644
index 000000000..4239229fc
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_minus@2x.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_pause.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_pause.png
new file mode 100644
index 000000000..4120c3c32
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_pause.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_pause@2x.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_pause@2x.png
new file mode 100644
index 000000000..93e8d149b
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_pause@2x.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_play.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_play.png
new file mode 100644
index 000000000..82f93f7e5
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_play.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_play@2x.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_play@2x.png
new file mode 100644
index 000000000..a7151e5e8
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_play@2x.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_speaker_off.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_speaker_off.png
new file mode 100755
index 000000000..dbfdc83cc
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_speaker_off.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_speaker_off@2x.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_speaker_off@2x.png
new file mode 100644
index 000000000..acc6eba4d
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_speaker_off@2x.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_speaker_on.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_speaker_on.png
new file mode 100755
index 000000000..1022e8d98
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_speaker_on.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_speaker_on@2x.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_speaker_on@2x.png
new file mode 100755
index 000000000..198c12d90
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_speaker_on@2x.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_video.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_video.png
new file mode 100755
index 000000000..8ee589aaa
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_video.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_video@2x.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_video@2x.png
new file mode 100755
index 000000000..7b68c34c4
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_video@2x.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_video_mute.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_video_mute.png
new file mode 100755
index 000000000..efdb97478
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_video_mute.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_video_mute@2x.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_video_mute@2x.png
new file mode 100755
index 000000000..1c041f16a
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_video_mute@2x.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_video_unmute.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_video_unmute.png
new file mode 100755
index 000000000..ff47d6256
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_video_unmute.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_video_unmute@2x.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_video_unmute@2x.png
new file mode 100755
index 000000000..b196c5052
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/icon_video_unmute@2x.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/logoHighRes.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/logoHighRes.png
new file mode 100644
index 000000000..7187eada0
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/logoHighRes.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/logoHighRes@2x.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/logoHighRes@2x.png
new file mode 100644
index 000000000..c4b53a848
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/logoHighRes@2x.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/matrixUser.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/matrixUser.png
new file mode 100755
index 000000000..09496113e
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/matrixUser.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/matrixUser@2x.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/matrixUser@2x.png
new file mode 100755
index 000000000..9282f3d60
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/matrixUser@2x.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/network_matrix.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/network_matrix.png
new file mode 100644
index 000000000..cf21452bc
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/network_matrix.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/network_matrix@2x.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/network_matrix@2x.png
new file mode 100644
index 000000000..64d6f4891
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/network_matrix@2x.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/play.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/play.png
new file mode 100755
index 000000000..e4da01208
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/play.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/play@2x.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/play@2x.png
new file mode 100755
index 000000000..50e34bc24
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/play@2x.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/shrink.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/shrink.png
new file mode 100755
index 000000000..ab04eedc0
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/shrink.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/shrink@2x.png b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/shrink@2x.png
new file mode 100644
index 000000000..43021be82
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Images/shrink@2x.png differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Sounds/busy.mp3 b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Sounds/busy.mp3
new file mode 100644
index 000000000..fec27ba4c
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Sounds/busy.mp3 differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Sounds/callend.mp3 b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Sounds/callend.mp3
new file mode 100644
index 000000000..50c34e564
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Sounds/callend.mp3 differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Sounds/message.mp3 b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Sounds/message.mp3
new file mode 100644
index 000000000..942adbe85
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Sounds/message.mp3 differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Sounds/ring.mp3 b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Sounds/ring.mp3
new file mode 100644
index 000000000..3c3cdde3f
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Sounds/ring.mp3 differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Sounds/ringback.mp3 b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Sounds/ringback.mp3
new file mode 100644
index 000000000..6ee34bf39
Binary files /dev/null and b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/Sounds/ringback.mp3 differ
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/ar.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/ar.lproj/MatrixKit.strings
new file mode 100644
index 000000000..fd6b76f33
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/ar.lproj/MatrixKit.strings
@@ -0,0 +1,549 @@
+
+
+"show_details" = "إظهَارُ التَّفاصيل";
+"cancel_download" = "إلغَاءُ التَّنزيل";
+"cancel_upload" = "إلغَاءُ الرَّفع";
+"select_all" = "تَحدِيدُ الكُل";
+"resend_message" = "إعادَةُ إرسَالِ الرِّسالَة";
+"reset_to_default" = "إعادَةُ الضَّبط إلى الاِفتِراضي";
+"invite_user" = "دَعوَة مُستَخدِمِ matrix";
+"capture_media" = "اِلتِقَاطُ صُّورة/مَقطَعَ مَرئيّ";
+"attach_media" = "إرفاقُ وسائطٍ مِنَ المَكتَبَة";
+"select_account" = "حَدِّد حِسَابًا";
+"mention" = "الذِّكْر";
+"start_video_call" = "بَدءُ مُكالَمَةٍ مَرئيَّة";
+"start_voice_call" = "بَدءُ مُكالَمَةٍ صَوتيَّة";
+"start_chat" = "بَدءُ مُحادَثَة";
+"login_error_resource_limit_exceeded_contact_button" = "التَّواصُل مع المُدير";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nيُرجَى التَّواصُل مَعَ مُدير خِدمَتك لِمُواصَلَة اِستِخدام هَذِهِ الخِدمَة.";
+"set_admin" = "تَعيِينُ مُدير";
+"set_moderator" = "تَعيِينُ مُشرِف";
+"set_default_power_level" = "إعادَة ضَبط مُستَوى القُوَّة";
+"set_power_level" = "ضَبط مُستَوى القُوَّة";
+"submit_code" = "تَسلِيم الرَّمز";
+"submit" = "التَّسلِيم";
+"sign_up" = "الاِشتِراك";
+"retry" = "إعادَةُ المُحاوَلة";
+"dismiss" = "إبعَاد";
+"discard" = "اِستِبعاد";
+"continue" = "الاِستِمرار";
+"close" = "إغلاق";
+"back" = "الرُّجُوع";
+"abort" = "إِجهَاض";
+"yes" = "نَعَم";
+
+// Action
+"no" = "لَا";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "هَذَا الخادِم الرَّئيس قَد وَصَلَ إلى حَدّه الشَّهري للمُستخدِم النَّشِط.";
+"login_error_resource_limit_exceeded_message_default" = "هَذَا الخادِم الرَّئيس قَد تَجاوزَ أحَد حُدُود مَوارِده.";
+"login_error_resource_limit_exceeded_title" = "تَمَّ تَجاوُز حَدّ المَورِد";
+"login_email_placeholder" = "عُنوان بَريد إلِكتُرونيّ";
+"login_email_info" = "إنَّ تَعيِين عُنوان بَريد إلِكتُرونيّ يُتيحُ لِلمُستَخدِمين الآخَرين العُثُور عَلَيك في Matrix بِشَكل أسهَل، وَيَمنَحُكَ طَريقَة لِإعادَة تَعيِين كَلِمة المُرُور الخاصَّة بِك في المُستَقبَل.";
+"login_desktop_device" = "سَطح مَكتَب";
+"login_tablet_device" = "لَوحي";
+"login_mobile_device" = "هَاتِف";
+"login_error_forgot_password_is_not_supported" = "نِسيان كَلِمَة المُرُور غَير مَدعُوم حاليًا";
+"register_error_title" = "فَشَلَ التَّسجِيل";
+"login_invalid_param" = "مُعامِل غَير صَالِح";
+"login_leave_fallback" = "إلغَاء";
+"login_use_fallback" = "اِستِخدام صَفحَة اِحتياطيَّة بَديلَة";
+"login_error_user_in_use" = "إنَّ اِسم المُستَخدِم هَذَا مُستخدَمٌ بِالفِعل";
+"login_error_limit_exceeded" = "لَقَد أُرسِلَت العَديد مِنَ الطَّلَبات";
+"login_error_not_json" = "لَم يَحتَوي عَلَى JSON صالِح";
+"login_error_bad_json" = "إنَّ JSON مُشَوَّه";
+"login_error_unknown_token" = "لَم يَتِمّ التَّعرُّف عَلَى رَمز الوُصُول المَذكُور";
+"login_error_forbidden" = "اِسم مُستَخدِم/كَلِمَةُ مُرُور غَير صالِحَة";
+"login_error_registration_is_not_supported" = "إنَّ التَّسجِيل غَير مَدعوم حاليًا";
+"login_error_do_not_support_login_flows" = "حاليًا، نَحنُ لا نَدعَم أيًا مِن تَدَفُقات تَسجيل الدُّخُول المُعَرَّفة بِواسِطَة هَذَا الخادِم الرَّئيس";
+"login_error_no_login_flow" = "لَقَد فَشلنَا في اِستِرداد بَيَانات المُصادَقَة مِن هَذَا الخادِم الرَّئيس";
+"login_error_title" = "فَشَلَ تَسجيلُ الدُّخُول";
+"login_prompt_email_token" = "يُرجى إدخال رَمز التَّحقُّق مِنَ البَريد الإلِكتُرونيّ الخاص بِك:";
+"login_user_id_placeholder" = "مُعَرِّف Matrix (مِثل bob:matrix.org@ أو bob)";
+"login_display_name_placeholder" = "الاِسم الظّاهِر (مِثل. محمد عبدالله)";
+"login_optional_field" = "اِختياري";
+"login_password_placeholder" = "كَلِمَةُ المُرُور";
+"login_identity_server_info" = "تُوَفِّرُ Matrix خَوادِم هُويَّة لتَتَبُع عَناوين البَريد الإلِكتُرونيّ وَما إلى ذَلِكَ مِنَ الَّتي تَنتَمي إلى مُعَرِّفات Matrix. فَقَط https://matrix.org مُتَوَفِّر حاليًا.";
+"login_identity_server_title" = "عُنوان URL لِخادِم الهُويَّة:";
+"login_home_server_info" = "الخادِم الرَّئيس الخاصّ بِك يُخَزِّنُ جَميع مُحادَثاتك وَمَعلُومات حِسابك";
+"login_home_server_title" = "عُنوان URL لِلخادِم الرَّئيس:";
+"login_server_url_placeholder" = "عُنوان URL (مِثل https://matrix.org)";
+
+// Login Screen
+"login_create_account" = "إنشاءُ حِساب:";
+/* *********************** */
+/*      iOS specific       */
+/* *********************** */
+
+"matrix" = "Matrix";
+"notice_encrypted_message" = "رِسَالَةٌ مُعمّاة";
+"notice_room_related_groups" = "المَجمُوعاتُ المُرتَبِطَةُ بِهَذِهِ الغُرفَةِ هِيَ: %@";
+"notice_room_aliases_for_dm" = "الاَسماءُ البَديلَة هِيَ: %@";
+"notice_room_aliases" = "الاَسماءُ البَديلَة لِلغُرفَة هِيَ: %@";
+"notice_room_power_level_event_requirement" = "مُستَوى القُوَّة الأدنَى المُتَعلِّقُ بِالأحداث هُوَ:";
+"notice_room_power_level_acting_requirement" = "مُستَوى القُوَّة الأدنَى الَّذي يَجِبُ عَلَى المُستَخدِم اِمتِلاكُه قَبلَ التَّفاعُل هُوَ:";
+"notice_room_power_level_intro_for_dm" = "مُستَوى القُوَّة لِلأعضاءِ هُوَ:";
+"notice_room_power_level_intro" = "مُستَوى القُوَّة لِأعضاءِ الغُرفَة هُوَ:";
+"notice_room_join_rule_public_by_you_for_dm" = "أنتَ قَد جَعلتَ هَذِهِ عَامَّة.";
+"notice_room_join_rule_public_by_you" = "أنتَ قَد جَعلتَ الغُرفَةَ عَامَّة.";
+"notice_room_join_rule_public_for_dm" = "لَقَد جَعَلَ %@ هَذِهِ عَامَّة.";
+"notice_room_join_rule_public" = "لَقَد جَعَلَ %@ الغُرفَةَ عَامَّة.";
+"notice_room_join_rule_invite_by_you_for_dm" = "أنتَ قَد جَعلتَ هَذِهِ بالدَّعوَةِ فَقَط.";
+"notice_room_join_rule_invite_by_you" = "أنتَ قَد جَعلتَ الغُرفَةَ بالدَّعوَةِ فَقَط.";
+"notice_room_join_rule_invite_for_dm" = "لَقَد جَعَلَ %@ هَذِهِ بِالدَّعوَةِ فَقَط.";
+//  New
+"notice_room_join_rule_invite" = "لَقَد جَعَلَ %@ الغُرفَةَ بِالدَّعوَةِ فَقَط.";
+//  Old
+"notice_room_join_rule" = "قاعِدَة الاِنضِمام هِيَ: %@";
+"notice_room_created_for_dm" = "لَقَد اِنضَمَّ %@.";
+"notice_room_created" = "لَقَد أنشأ %@ الغُرفَة وَهَيَّأَها.";
+"notice_profile_change_redacted" = "لَقَد حدَّثَ %@ مَلفَّهُ الشَّخصي %@";
+"notice_event_redacted_reason" = " [السَّبَب: %@]";
+"notice_event_redacted_by" = " بِواسِطَة %@";
+"notice_event_redacted" = "<مُنَقَّح%@>";
+"notice_room_topic_removed" = "لَقَد أزالَ %@ المَوضُوع";
+"notice_room_name_removed_for_dm" = "لَقَد أزالَ %@ الاِسم";
+"notice_room_name_removed" = "لَقَد أزالَ %@ اِسمَ الغُرفَة";
+
+// Events formatter
+"notice_avatar_changed_too" = "(غُيِّرَت الصُّورَة الرَّمزية أيضًا)";
+"unignore" = "إلغَاءُ التَّجاهُل";
+"ignore" = "تَجاهُل";
+"end_call" = "إنهَاءُ المُكالَمَة";
+"reject_call" = "رَفضُ المُكالَمَة";
+"answer_call" = "الإجابَةُ عَلَى المُكالَمَة";
+"attachment_multiselection_original" = "الحَجمُ الفِعلي";
+"attachment_multiselection_size_prompt" = "هَل تُريدُ إِرسَالَ الصُّوَرِ كَـ :";
+"attachment_cancel_upload" = "إلغَاء الرَّفع؟";
+"attachment_cancel_download" = "إلغَاء التَّنزيل؟";
+"attachment_large" = "كَبير: %@";
+"attachment_medium" = "مُتَوَسِّط: %@";
+"attachment_small" = "صَغير: %@";
+"attachment_original" = "الحَجمُ الفِعلي: %@";
+
+// Attachment
+"attachment_size_prompt" = "هَل تُريدُ الإِرسَالَ كَـ :";
+"room_member_power_level_prompt" = "لَن تَكُونَ قَادِرًا عَلَى التَّراجُع عَن هَذا التَّغيِير فَأنتَ تُرَقِّي المُستَخدِم لِيَكُونَ لَهُ نَفس مُستَوى القُوَّة الَّذِي لدَيك.\nهَل أَنتَ مُتَأكِّد؟";
+
+// Room members
+"room_member_ignore_prompt" = "هَل أنتَ مُتَأكِّدٌ مِن رَغبَتِكَ فِي إخفَاءِ جَميعِ الرَّسَائِل عَن هَذَا المُستَخدِم؟";
+"message_reply_to_message_to_reply_to_prefix" = "رَدًّا عَلَى";
+"message_reply_to_sender_sent_a_file" = "أرسَلَ مَلَفّ.";
+"message_reply_to_sender_sent_a_video" = "أرسَلَ مَقطَعًا مَرئيًا.";
+"message_reply_to_sender_sent_an_audio_file" = "أرسَلَ مَلَفًّا صَوتيًا.";
+
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "أرسَلَ صُورَةَ.";
+"room_no_conference_call_in_encrypted_rooms" = "إنَّ مُكالَمَاتُ الاِجتِمَاع غَيرُ مَدعُومَةٍ فِي الغُرَفِ المُعمّاة";
+"room_no_power_to_create_conference_call" = "أنتَ بِحاجَةٍ إلَى إذن لِلدَّعوَة حَتَّى تَبدَأَ اِجتِمَاع فِي هَذِهِ الغُرفَة";
+"room_left_for_dm" = "أنتَ قَد غادَرت";
+"room_left" = "أنتَ قَد غادَرتَ الغُرفَة";
+"room_error_timeline_event_not_found" = "التَّطبيقُ كَانَ يُحاوِلُ تَحميلَ نُقطَةٍ مُعَيَّنَةٍ مِنَ الخَطِّ الزَّمَنيِ لِهَذِهِ الغُرفَة لَكِن تَعَذَّرَ عَليهِ العُثُور عَلَيهَا";
+"room_error_cannot_load_timeline" = "فَشَلَ تَحمِيلُ الخَطِّ الزَّمَنِي";
+"room_error_timeline_event_not_found_title" = "فَشَلَ تَحمِيلُ مَوضِعِ الخَطِّ الزَّمَنِي";
+"room_error_topic_edition_not_authorized" = "أنتَ غَيرُ مُخَوَّلٍ لِتَحرِيرِ مَوضُوعِ هَذِهِ الغُرفَة";
+"room_error_name_edition_not_authorized" = "أنتَ غَيرُ مُخَوَّلٍ لِتَحرِيرِ اِسمِ هَذِهِ الغُرفَة";
+"room_error_join_failed_empty_room" = "حاليًّا مِن غَيرِ المُمكِنِ إعادَةُ الاِنضِمامِ إلى غُرفَةٍ فارِغَة.";
+"room_error_join_failed_title" = "فَشَلَ الاِنضِمام إلى الغُرفَة";
+
+// Room
+"room_please_select" = "يُرجَى تَحديدُ غُرفَة";
+"room_creation_participants_placeholder" = "(مِثل. ‭(@bob:homeserver1; @john:homeserver2...";
+"room_creation_participants_title" = "المُشَارِكُون:";
+"room_creation_alias_placeholder_with_homeserver" = "(مِثل. %@foo#)";
+"room_creation_alias_placeholder" = "(مِثل. foo:example.org#)";
+"room_creation_alias_title" = "اِسمُ الغُرفَةِ البَديل:";
+"room_creation_name_placeholder" = "(مِثل. مجموعة الغداء)";
+
+// Room creation
+"room_creation_name_title" = "اِسمُ الغُرفَة:";
+"account_error_push_not_allowed" = "الإِشعَاراتُ غَيرُ مَسمُوحَة";
+"account_error_msisdn_wrong_description" = "يَبدو أنَّ هَذَا لَيسَ رَقمُ هَاتِفٍ صَالِح";
+"account_error_msisdn_wrong_title" = "رَقمُ هَاتِفٍ غَيرُ صَالِح";
+"account_error_email_wrong_description" = "يَبدو أنَّ هَذَا لَيسَ عُنوان بَريد إلِكتُرونيّ صَالِح";
+"account_error_email_wrong_title" = "عُنوانُ بَريدٍ إلِكتُرونيّ غَيرَ صَالِح";
+"account_error_matrix_session_is_not_opened" = "جَلسَةُ Matrix غَيرَ مَفتُوحَة";
+"account_error_display_name_change_failed" = "فَشَلَ تَغيِيرُ الاِسم الظّاهِر";
+"account_error_picture_change_failed" = "فَشَلَ تَغيِيرُ الصُّورَة";
+"account_msisdn_validation_error" = "يَتَعَذَّرُ التَّحَقُّق مِن رَقمِ الهَاتِف.";
+"account_msisdn_validation_message" = "لَقَد أرسَلنا رِسَالَة SMS تَحوِي رَمزًا لِلتَفعِيل. يُرجَى إدخَالُ هَذَا الرَّمز أَدناه.";
+"account_msisdn_validation_title" = "قَيدُ التَّحَقُّق";
+"account_email_validation_title" = "قَيدُ التَّحَقُّق";
+"account_email_validation_error" = "يَتَعَذَّر التَّحَقُّق مِن عُنوان البَريد إلِكتُرونيّ. يُرجَى الاِطِّلاع عَلَى البَريد إلِكتُرونيّ الخاصّ بِك ثُمَّ النَّقر عَلَى الرَّابِط الّذي يَحوِيه. بِمُجَرَّد الاِنتِهاء مِن ذَلِك، اُنقُر عَلَى الاِستِمرار";
+"account_email_validation_message" = "يُرجَى الاِطِّلاعُ عَلَى البَريدِ إلِكتُرونيّ الخاصِّ بِك ثُمَّ النَّقرَ عَلَى الرَّابِط الَّذي يَحوِيه. بِمُجَرَّدِ الاِنتِهاءُ مِن ذَلِك، اُنقُر عَلَى الاِستِمرار.";
+"account_linked_emails" = "عَناوينُ البَريدِ الإلِكتُرونيّ المُرتَبِطَة";
+"account_link_email" = "رَبطُ بَريدٍ إلِكتُرونيّ";
+
+// Account
+"account_save_changes" = "حِفظُ التَّغَيُّرات";
+"room_event_encryption_verify_ok" = "تَأكِيدُ التَّحَقُّق";
+"room_event_encryption_verify_message" = "لِلتَحَقُّق مِن إِمكانيَّة الوُثُوق بِهَذِه الجَلسَة، يُرجَى التَّوَاصُل مَعَ المَالِك بِاِستِخدام بَعض الوَسَائِل الأُخرَى (عَلَى سَبِيلِ المِثَال شَخصيًّا أَو عَن طَرِيق مُكَالَمَة هَاتِفيَّة) وَاِسأَلهُ عَمَّا إِذَا كَانَ المِفتَاح الَّذِي يَرَاه فِي إعدادَات المُستَخدِم لِهَذِهِ الجَلسَة يَتَطَابَقُ مَعَ المِفتَاح أَدناه:\n\nاِسم الجَلسَة: %@\nمُعَرِّف الجَلسَة: %@\nمِفتَاح الجَلسَة: %@\n\nإِذَا تَطَابق، اِضغَط عَلَى زِرِّ التَّحَقُّق أَدناه. إِذَا لَم يَحدُث ذَلِك، فَهَذَا يَعنِي أَنَّ شَخصًا آخَر يَعتَرَضُ هَذِهِ الجَلسَة وَرُبَّما تُوَدُّ الضَّغطَ عَلَى زِرُّ الإضافَةِ لِلقَائِمَة السَّوداء بَدَلَا مِن ذَلِك.\n\n سَوفَ تَكُونُ عَمَلِيَّةُ التَّحَقُّقِ هَذِهِ أَكثَرُ تَطَوُّرًا في المُستَقبَل.";
+"room_event_encryption_verify_title" = "التَّحَقُّقُ مِنَ الجَلسَة\n\n";
+"room_event_encryption_info_unblock" = "الإزالَة مِنَ القائِمَةِ السَّوداء";
+"room_event_encryption_info_block" = "الإضافَةُ إلى القائِمَةِ السَّوداء";
+"room_event_encryption_info_unverify" = "إلغَاءُ التَّحَقُّق";
+"room_event_encryption_info_verify" = "يَجري التَّحَقُّق...";
+"room_event_encryption_info_device_blocked" = "ضِمنُ القائِمَةِ السَّوداء";
+"room_event_encryption_info_device_not_verified" = "غَيرُ مُتَحَقَّقٍ مِنه";
+"room_event_encryption_info_device_verified" = "مُتَحَقَّقٌ مِنه";
+"room_event_encryption_info_device_fingerprint" = "بَصمَة Ed25519\n";
+"room_event_encryption_info_device_verification" = "التَّحَقُّق\n";
+"room_event_encryption_info_device_id" = "المُعَرِّف\n";
+"room_event_encryption_info_device_name" = "الاِسمُ العَامّ\n";
+"room_event_encryption_info_device_unknown" = "جَلسَةٌ غَيرَ مَعرُوفة\n";
+"room_event_encryption_info_device" = "\nمَعلُومَاتُ جَلسَةِ المُرسِل\n";
+"room_event_encryption_info_event_none" = "لَا شَيء";
+"room_event_encryption_info_event_unencrypted" = "غَيرُ مُعَمَى";
+"room_event_encryption_info_event_decryption_error" = "خَطَأٌ فِي فَكِّ التَّعميَة\n";
+"room_event_encryption_info_event_session_id" = "مُعَرِّفُ الجَلسَة\n";
+"room_event_encryption_info_event_algorithm" = "خَوارِزميَّة\n";
+"room_event_encryption_info_event_fingerprint_key" = "مُطَالَبَةُ مِفتَاحِ بَصمَة Ed25519\n";
+"room_event_encryption_info_event_identity_key" = "مِفتَاحُ هُويَّة Curve25519\n";
+"room_event_encryption_info_event_user_id" = "مُعَرِّفُ المُستَخدِم\n";
+"room_event_encryption_info_event" = "مَعلُومَاتُ الحَدَث\n";
+
+// Encryption information
+"room_event_encryption_info_title" = "مَعلُومَاتُ تَعمِيَةِ النِّهايَة-إلى-النِّهايَة\n\n";
+"device_details_delete_prompt_message" = "هَذِهِ العَمَلِيَّة تَتَطَلَّبُ مُصادَقةً إضافيَة.\nللاِستِمرار، يُرجَى إدخَالُ كَلِمَةُ المُرُورِ الخاصَّةِ بِك.";
+"device_details_delete_prompt_title" = "المُصادَقَة";
+"device_details_rename_prompt_message" = "إنَّ اِسمَ الجَلسَةِ العَامّ مَرئيٌّ لِلأشخَاصِ الَّذِينَ تَتَواصَلُ مَعَهُم";
+"device_details_rename_prompt_title" = "اِسمُ الجَلسَة";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_last_seen" = "آخِرُ ظُهور\n";
+"device_details_identifier" = "المُعَرِّف\n";
+"device_details_name" = "الاِسمُ العَامّ\n";
+
+// Devices
+"device_details_title" = "مَعلُومَاتُ الجَلسَة\n";
+"notification_settings_room_rule_title" = "الغُرفَة: '%@'";
+"settings_enter_validation_token_for" = "أدخِل رَمزَ المُصادَقَة لِـ %@:";
+"settings_enable_push_notifications" = "تَفعِيلُ دَفعِ الإِشعَارات";
+"settings_enable_inapp_notifications" = "تَفعِيلُ الإِشعَاراتِ دَاخِلَ التَّطبِيق";
+
+// Settings
+"settings" = "الإعدَادَات";
+"room_displayname_more_than_two_members" = "العُضو %@ وَعَدَد %@ آخَرُون";
+"room_displayname_two_members" = "العُضو %@ وَ %@";
+
+// room display name
+"room_displayname_empty_room" = "غُرفَةٌ فَارِغَة";
+"notice_in_reply_to" = "رَدًّا عَلَى";
+"notice_sticker" = "مُلصَق";
+"notice_crypto_error_unknown_inbound_session_id" = "إنَّ جَلسَةَ المُرسِل لَم تُرسِل إلَينا المَفاتيح لِهَذِهِ الرِّسَالَة.";
+"notice_crypto_unable_to_decrypt" = "** يَتَعَذَّرُ فَكَّ التَّعميَة: %@ **";
+"notice_room_history_visible_to_members_from_joined_point_for_dm" = "لَقَد جَعَلَ %@ الرَّسائِلَ المُستَقبَليَّة مَرئيَّةٌ لِلجَميع، مُنذُ أنِ اِنضَمُّوا.";
+"notice_room_history_visible_to_members_from_joined_point" = "لَقَد جَعَلَ %@ تَأريخَ الغُرفَةِ المُستَقبَليّ مَرئيٌّ لِجَميعِ أعضاءِ الغُرفَة، مِنَ النُّقطَةِ الَّتي اِنضَمُّوا فِيهَا.";
+"notice_room_history_visible_to_members_from_invited_point_for_dm" = "لَقَد جَعَلَ %@ الرَّسائِلَ المُستَقبَليَّة مَرئيَّةٌ لِلجَميع، مُنذُ أن تَمَّت دَعوَتُهُم.";
+"notice_room_history_visible_to_members_from_invited_point" = "لَقَد جَعَلَ %@ تَأريخَ الغُرفَةِ المُستَقبَليّ مَرئيٌّ لِجَميعِ أعضاءِ الغُرفَة، مِنَ النُّقطَةِ الَّتي تَمَّت دَعوَتُهُم فِيهَا.";
+"notice_room_history_visible_to_members_for_dm" = "لَقَد جَعَلَ %@ الرَّسائِلَ المُستَقبَليَّة مَرئيَّةٌ لِجَميعِ أعضاءِ الغُرفَة.";
+"notice_room_history_visible_to_members" = "لَقَد جَعَلَ %@ تَأريخَ الغُرفَةِ المُستَقبَليّ مَرئيٌّ لِجَميعِ أعضاءِ الغُرفَة.";
+"notice_room_history_visible_to_anyone" = "لَقَد جَعَلَ %@ تَأريخَ الغُرفَةِ المُستَقبَليّ مَرئيٌّ لِأَيّ شَخص.";
+"notice_error_unknown_event_type" = "حَدثٌ غَيرُ مَعرُوفِ النَّوع";
+"notice_error_unexpected_event" = "حَدَثٌ غَيرُ مُتَوَقَّع";
+"notice_error_unsupported_event" = "حَدَثٌ غَيرُ مَدعُوم";
+"notice_redaction" = "لَقَد نَقَّحَ %@ حَدَث (المُعَرِّف: %@)";
+"notice_feedback" = "حَدَثُ اِنطِباع (المُعَرِّف: %@): %@";
+"notice_unsupported_attachment" = "مُرفَقٌ غَيرُ مَدعُوم: %@";
+"notice_invalid_attachment" = "مُرفَقٌ غَيرُ صَالِح";
+"notice_file_attachment" = "مُرفَقُ مَلَفّ";
+"notice_location_attachment" = "مُرفَقُ مَوقِعٍ جُغرَافِيّ";
+"notice_video_attachment" = "مُرفَق مَقطَع مَرئي";
+"notice_audio_attachment" = "مُرفَق صَوت";
+"notice_image_attachment" = "مُرفَق صُّورَة";
+"notice_encryption_enabled_unknown_algorithm" = "لَقَد شَغَّلَ %1$@ تَعميَة النِّهايَة-إلى-النِّهايَة (خَوارِزميَّة غَير مُتَعَرَّف عَليها %2$@).";
+"notice_encryption_enabled_ok" = "لَقَد شَغَّلَ %@ تَعميَة النِّهايَة-إلى-النِّهايَة.";
+"power_level" = "مُستَوى القُوَّة";
+"public" = "عَامّ";
+"private" = "خاصّ";
+"default" = "الاِفتراضي";
+"not_supported_yet" = "غَيرُ مَدعُومَةٍ حَتَّى الآن";
+"error_common_message" = "لَقَد حَدَثَ خَطَأ. يُرجَى المُحاوَلَة مَرَّةً أُخرَى.";
+"error" = "خَطَأ";
+"unsent" = "غَيرُ مُرسَلَة";
+"offline" = "غَيرُ مُتَّصِل";
+
+// Others
+"user_id_title" = "مُعَرِّف المُستَخدِم:";
+"e2e_passphrase_not_match" = "عِبارَاتُ المُرُورِ يَجِبُ أن تَكُونَ مُتَطابَقة";
+"e2e_passphrase_create" = "إنشاءُ عِبارَةِ مُرُور";
+"e2e_passphrase_empty" = "عِبارَةُ المُرُورِ يَجِبُ ألَا تَكونَ خَالِيَة";
+"e2e_passphrase_confirm" = "تَأكيدُ عِبارَةِ المُرُور";
+"e2e_export_prompt" = "تُتيحُ لَكَ هَذِهِ العَمَلِيَّة تَصدير مَفاتيح الرَّسائِل الَّتي قَد تَلَقَّيتَها فِي الغُرَف المُعَمّاة إلى مَلَفّ مَحَلِّيّ. يُمكِنُكَ بَعدَ ذَلِكَ أن تَستَورِدَ المَلَفّ إلى عَميل Matrix آخر في المُستَقبَل، لِكَي يَتَمَكَّن هَذَا العَميل أيضًا مِن فَكّ تَعمِيَة هَذِهِ الرَّسائِل.\nالمَلَفّ الَّذِي قَد تَمَّ تَصديرُه سَيَسمَحُ لِأيّ شَخص يُمكِنَهُ قِرَاءته أن يَفُكّ تَعمِيَة أيّ رَسائِل مُعمّاة يُمكِنُكَ رُؤيَتها، لِذَلِك يَجِبُ أن تَكُونَ حَريصًا عَلَى إبقائه آمِن.";
+"e2e_export" = "تَصدير";
+
+// E2E export
+"e2e_export_room_keys" = "تَصديرُ مَفاتيحِ الغُرفَة";
+"e2e_passphrase_enter" = "أدخِل عِبارَةَ المُرُور";
+"e2e_import" = "اِستيراد";
+"e2e_import_prompt" = "تُتِيحُ لَكَ هَذِهِ العَمَلِيَّة اِستيراد المَفاتيح الَّتي قَد صَدَّرتَهَا مُسبقًا مِن عَميل Matrix آخر. أنتَ سَتَتَمَكَّن بَعدَ ذَلِك مِن فَكّ تَّعميَة جَميع رَسائِل الَّتي يُمكِن لِلعَميل الآخر فَكّ تَعمِيَتها.\nإنَّ المَلَفّ الْمُصَدَّر مَحميّ بِعِبارَة مُرُور. يَجِبُ إدخال عِبارَة المُرُور هُنا لِفَكّ تَعمِيَة المَلَفّ.";
+
+// E2E import
+"e2e_import_room_keys" = "اِستيرادُ مَفاتيحِ الغُرفَة";
+"format_time_d" = "ي";
+"format_time_h" = "س";
+"format_time_m" = "د";
+
+// Time
+"format_time_s" = "ث";
+"search_searching" = "يَجري البَحث...";
+
+// Search
+"search_no_results" = "لَا تُوجَدُ نَتائِج";
+"group_section" = "المَجمُوعات";
+
+// Groups
+"group_invite_section" = "الدَّعَوات";
+"contact_local_contacts" = "جِهاتُ الاِتِّصالِ المَحَلِّيَّة";
+
+// Contacts
+"contact_mx_users" = "مُستَخدِمُو Matrix";
+"attachment_e2e_keys_import" = "يَجري الاِستيراد...";
+"attachment_e2e_keys_file_prompt" = "يَحتَوي هَذَا المَلَفّ عَلَى مَفاتيح تَعمِيَة قَد تمَّ تَصديرُها مِن عَميلِ Matrix.\nهَل تُريدُ عَرضَ مُحتَوى المَلفّ أمِ اِستيرادُ المَفاتيحِ الَّتي يَحويها؟";
+
+// Settings screen 
+"settings_title_config" = "الإعداد";
+"notice_room_third_party_registered_invite_by_you" = "أنتَ قَد قَبلتَ دَعوَة %@";
+"notice_room_third_party_revoked_invite" = "لَقَد ألغَى %@ دَعوَة %@ لِلاِنضِمام إلى الغُرفَة";
+"notice_room_third_party_registered_invite" = "لَقَد قَبَلَ %@ دَعوَةَ %@‏";
+"ssl_only_accept" = "فَقَطّ اِقبَل الشَّهادَة إذا نَشَرَ مُدير الخادِم بَصمَة تُطابِق البَصمَة أعلَاه.";
+"ssl_expected_existing_expl" = "لَقَد تَغَيَّرَت الشَّهادَة الَّتي قَد كانَت مَوثُوقَة مُسبَقًا إلى أُخرَى غَير مَوثُوقَة. مِنَ المُمكِن أنَّ الخادِم قَد جَدَّدَ شَهادَته. تَواصَل مَعَ المُدير لِلحُصُول عَلَى البَصمَة المُتَوَقَّعَة.";
+"ssl_unexpected_existing_expl" = "تَمَّ تَغيِير الشَّهادَة الَّتي قَد كانَت مَوثُوقة مِن قِبَل هاتِفك. هَذَا غَيرُ طَبِيعِيّ لِلغَايَة. يُوصَى بِعَدَم قُبُول هَذِهِ الشَّهادَة الجَديدَة.";
+"ssl_cert_new_account_expl" = "إذَا قَالَ مُديرُ الخادِم أنَّ هَذَا مُتَوَقَّع، فَتَأكَّد مِن تَطابُق البَصمَة أدناه مَعَ البَصمَة الَّتي قَد قَدَّمَها.";
+"ssl_cert_not_trust" = "هَذَا قَد يَعني أنَّ شَخصًا ما يَعتَرِضُ حَرَكَة المُرُور الخَاصَّةِ بِك بِخُبث، أو أنَّ هَاتِفَكَ لا يَثِقُ في الشَّهادَة المُقَدَّمَة مِنَ الخادِمِ البَعيد.";
+"notification_settings_per_word_info" = "تُطابَق الكَلِمات مَعَ حالَة الأحرُف بِشَكل غَير حَساس، وَقَد تَتَضَمَّن حَرف البَدَل *. وَبِالتَّالي:\nإنَّ foo تَتَطابَق مَعَ السِّلسِلَة foo المُحاطَة بِمُحَدِّدِات الكَلِمَة (مِثل عَلامات التَّرقيم وَالمَسافَة البَيضاء أو بِدايَة/نِهايَة السَّطر).\nإنَّ *foo تَتَطابَق مَعَ أي كَلِمَة تَبدَأُ بِـ foo.\nإنَّ *foo* تَتَطابَق مع أي كَلِمَة مِن هَذَا القَبيل وَتَتَضَمَّن الثَّلاث أحرُف foo.";
+"notification_settings_global_info" = "تَُحفَظُ إعدادات الإشعَارات في حِسابِ المُستَخدِم الخاصِّ بِك وَتَتِمُّ مُشارَكَتَها بَينَ جَمِيعِ العُمَلاء الَّذينَ يَدعَمُونَها (بِما في ذَلِكَ إشعَاراتُ سَطحِ المَكتَب).\n\nيَتِمُّ تَطبيق القَواعِد بِالتَرتيب؛ أوَّل قاعِدَة تَتَطَابَق تُحَدِّد النَّتيجَة لِلرِسالَة.\nإذًا: الإِشعَارات وَفقًا لِلكَلِمَة أكثَرُ أولَويَّة مِنَ الإِشعَارات وَفقًا لِلغُرفَة الَّتِي أيضًا أكثَرُ أولَويَّة مِنَ الإِشعَارات وَفقًا لِلمُرسِل.\nبِالنِّسبَةِ لِلقَواعِد المُتَعَدِّدَة مِن نَفسِ النَّوع، تَكُونُ الأَولَويَّة لِأوَّل قاعِدَة تَتَطابَق في القائِمَة.";
+"login_error_login_email_not_yet" = "لَم يُنقَر عَلَى الرَّابِط الَّذي في البَريد الإلِكتُرونيّ حَتَّى الآن";
+"ssl_could_not_verify" = "تَعَذَّرَ التَّحَقُّق مِن هُوِيَّة الخَادِم البَعيد.";
+"ssl_fingerprint_hash" = "بَصمَة (%@):";
+"ssl_remain_offline" = "تَجاهُل";
+"ssl_logout_account" = "تَسجِيلُ الخُرُوج";
+
+// unrecognized SSL certificate
+"ssl_trust" = "الوُثُوق";
+"call_invite_expired" = "لَقَد اِنتَهَت صَلاحيَّةُ دَعوَة المُكالَمَة";
+"incoming_voice_call" = "مُكالَمَةٌ صَوتيَّةٌ وَارِدَة";
+"incoming_video_call" = "مُكالَمَةٌ مَرئيَّةٌ وَارِدَة";
+"call_ring" = "تَجري المُكالَمَة…";
+"call_ended" = "اِنتَهَت المُكالَمَة";
+"call_connecting" = "الاِتِّصالُ جارٍ…";
+
+// Settings keys 
+
+// call string
+"call_waiting" = "يَجري الاِنتِظار…";
+"settings_config_user_id" = "مُعَرِّفُ المُستَخدِم: %@";
+"settings_config_identity_server" = "خادِم الهُويَّة: %@";
+
+// gcm section 
+"settings_config_home_server" = "الخادِم الرَّئيس: %@";
+"notification_settings_notify_all_other" = "أخطِرني لِكَافَّةِ الرَّسائِل/الغُرَف الأُخرَى";
+"notification_settings_by_default" = "بِشَكلٍ اِفتِراضي...";
+"notification_settings_suppress_from_bots" = "كَتْمُ الإشعَارات مِنَ الرُّوبُوتَات";
+"notification_settings_receive_a_call" = "أخطِرني عِندَما أَتَلَقَّى مُكالَمَة";
+"notification_settings_people_join_leave_rooms" = "أخطِرني عِندَما يَنضَمّ الأشخاص أو يُغادِرُوا الغُرَف";
+"notification_settings_invite_to_a_new_room" = "أخطِرني عِندَما أُدعَى إلى غُرفَة جَديدَة";
+"notification_settings_just_sent_to_me" = "أخطِرني بِالصَّوت حَولَ الرَّسَائِل الَّتي أُرسِلَت إليَّ فَقَط";
+"notification_settings_contain_my_display_name" = "أخطِرني بِالصَّوت حَولَ الرَّسَائِل الَّتي تَحتَوي عَلَى الاِسم الظّاهِر الخاصّ بِي";
+"notification_settings_contain_my_user_name" = "أخطِرني بِالصَّوت حَولَ الرَّسَائِل الَّتي تَحتَوي عَلَى اِسم المُستَخدِم الخاصّ بِي";
+"notification_settings_other_alerts" = "تَنبيهاتٌ أُخرَى";
+"notification_settings_select_room" = "حَّدِد غُرفَة";
+"notification_settings_sender_hint" = "user:domain.com@";
+"notification_settings_per_sender_notifications" = "الإِشعَاراتٌ وَفقًا لِلمُرسِل";
+"notification_settings_per_room_notifications" = "الإِشعَاراتُ وَفقًا لِلغُرفَة";
+"notification_settings_custom_sound" = "صَوتٌ مُخَصَّص";
+"notification_settings_highlight" = "إبرَاز";
+"notification_settings_word_to_match" = "كَلِمَةٌ لِلمُطابَقَة";
+"notification_settings_never_notify" = "لا تُخطِرني أبَدًا";
+"notification_settings_always_notify" = "أخطِرني دَومًا";
+"notification_settings_per_word_notifications" = "الإِشعَاراتُ وَفقًا لِلكَلِمَة";
+"notification_settings_enable_notifications_warning" = "جَميعُ الإِشعَاراتِ مُعَطَّلَةٌ حالِيًّا لِكُلِ الأجهِزَة.";
+"notification_settings_enable_notifications" = "تَفعِيلُ الإِشعَارات";
+
+// Notification settings screen 
+"notification_settings_disable_all" = "تَعطيلُ كَافَّةِ الإِشعَارات";
+"settings_title_notifications" = "الإِشعَارات";
+
+// contacts list screen 
+"invitation_message" = "أوَدُّ أن أتَحَدَّثَ مَعكَ بِاستِخدامِ matrix. يرُجَى زيارَةُ المَوقِع https://matrix.org لِلحُصُولِ عَلَى مَزيدٍ مِنَ المَعلُومات.";
+
+// members list Screen 
+
+// accounts list Screen 
+
+// image size selection 
+
+// invitation members list Screen 
+
+// room creation dialog Screen 
+
+// room info dialog Screen
+
+// room details dialog screen
+"room_details_title" = "تَفاصيلُ الغُرفَة";
+"login_error_must_start_http" = "عُنوانُ URL يَجِبُ أن يَبدَأ بِـ //:[s]http";
+
+// Login Screen 
+"login_error_already_logged_in" = "مُسَجِّل الدُّخُولِ بِالفِعل";
+"message_unsaved_changes" = "تُوجَدُ تَغيِيرات غَير مَحفُوظَة. المُغادَرَة سَوفَ تَستَبعِدَها.";
+"unban" = "رَفع-الحَظْر";
+"ban" = "حَظْر";
+"kick" = "طَرد";
+"invite" = "اُدعُ";
+"num_members_other" = "عَدَد %@ مُستَخدِم";
+"num_members_one" = "عَدَد %@ مُستَخدِم";
+"membership_ban" = "حَظْر";
+"membership_leave" = "غادَر";
+"membership_invite" = "مَدعُوّ";
+"create_account" = "إنشاءُ حِساب";
+"login" = "تَسجيلُ الدُّخُول";
+"create_room" = "إنشاءُ غُرفَة";
+
+// actions 
+"action_logout" = "تَسجِيلُ الخُرُوج";
+"view" = "الاِطِّلاع";
+"delete" = "حَذف";
+"share" = "مُشارَكَة";
+"redact" = "إزالَة";
+"resend" = "إعادَة الإرسَال";
+"copy_button_name" = "نَسخ";
+"send" = "إرسَال";
+"leave" = "المُغادَرَة";
+"save" = "حِفظ";
+"cancel" = "إلغَاء";
+
+// Room Screen 
+
+// general errors 
+
+// Home Screen 
+
+// Last seen time 
+
+// call events 
+
+/* -*- 
+   Automatic localization for en
+
+   The following key/value pairs were extracted from the android i18n file:
+    /console/src/main/res/values/strings.xml.
+*/
+
+
+// titles 
+
+// button names 
+"ok" = "حَسَنًا";
+"notice_room_history_visible_to_members_from_joined_point_by_you_for_dm" = "أنتَ قَد جَعَلتَ الرَّسائِلَ المُستَقبَليَّة مَرئيَّة لِلجَميع، مُنذُ أنِ اِنضَمُّوا.";
+"notice_room_history_visible_to_members_from_joined_point_by_you" = "أنتَ قَد جَعَلتَ تَأريخَ الغُرفَةِ المُستَقبَليّ مَرئيٌّ لِجَميعِ أعضاءِ الغُرفَة، مِن النُّقطَة الَّتي اِنضَمُّوا فِيهَا.";
+"notice_room_history_visible_to_members_from_invited_point_by_you_for_dm" = "أنتَ قَد جَعَلتَ الرَّسائِلَ المُستَقبَليَّة مَرئيَّة لِلجَميع، مُنذُ أن تَمَّت دَعوَتُهُم.";
+"notice_room_history_visible_to_members_from_invited_point_by_you" = "أنتَ قَد جَعَلتَ تَأريخ الغُرفَة المُستَقبَليّ مَرئيٌّ لِجَميعِ أعضاءِ الغُرفَة، مِنَ النُّقطَةِ الَّتي تَمَّت دَعوَتُهُم فِيهَا.";
+"notice_room_history_visible_to_members_by_you_for_dm" = "أنتَ قَد جَعَلتَ الرَّسائِل المُستَقبَليَّة مَرئيَّة لِجَميع أعضاء الغُرفَة.";
+"notice_room_history_visible_to_members_by_you" = "أنتَ قَد جَعَلتَ تَأريخَ الغُرفَةِ المُستَقبَليّ مَرئيٌّ لِجَميعِ أعضاءِ الغُرفَة.";
+"notice_room_history_visible_to_anyone_by_you" = "أنتَ قَد جَعَلتَ تَأريخ الغُرفَة المُستَقبَليّ مَرئي لِأَيّ شَخص.";
+"notice_redaction_by_you" = "أنتَ قَد نَقَّحتَ حَدَث (المُعَرِّف: %@))";
+"notice_encryption_enabled_unknown_algorithm_by_you" = "أنتَ قَد شَغَّلتَ تَعمِيَة النِّهايَة-إلى-النِّهايَة. (خَوارِزميَّة غَير مُتَعَرَّف عَليها %@).";
+"notice_encryption_enabled_ok_by_you" = "أنتَ قَد فعَّلتَ تَعمِيَة النِّهايَة-إلى-النِّهايَة.";
+"notice_room_created_by_you_for_dm" = "أنتَ قَد اِنضَمَمت.";
+"notice_room_created_by_you" = "أنتَ قَد أنشأتَ الغُرفَة وَهَيَّأَتَها.";
+"notice_profile_change_redacted_by_you" = "أنتَ قَد حدَّثتَ مَلفَّكَ الشَّخصي %@";
+"notice_event_redacted_by_you" = " بِواسِطَتِك";
+"notice_room_topic_removed_by_you" = "أنتَ قَد أزلتَ المَوضُوع";
+"notice_room_name_removed_by_you_for_dm" = "أنتَ قَد أزَلتَ الاِسم";
+"notice_room_name_removed_by_you" = "أنتَ قَد أزَلتَ اِسم الغُرفَة";
+"notice_conference_call_request_by_you" = "أنتَ قَد طَلبتَ عَقد اِجتِمَاع VoIP";
+"notice_ended_video_call_by_you" = "أنتَ قَد أنهيتَ المُكالَمَة";
+"notice_answered_video_call_by_you" = "أنتَ قَد أجَبتَ عَلَى المُكالَمَة";
+"notice_placed_video_call_by_you" = "أنتَ قَد أجرَيتَ مُكالَمَةً مَرئيَّة";
+"notice_placed_voice_call_by_you" = "أنتَ قَد أجرَيتَ مُكالَمَةً صَوتيَّة";
+"notice_room_name_changed_by_you_for_dm" = "أنتَ قَد غيَّرتَ الاِسم إلى %@.";
+"notice_room_name_changed_by_you" = "أنتَ قَد غيَّرتَ اِسمَ الغُرفَةِ إلى %@.";
+"notice_topic_changed_by_you" = "أنتَ قَد غيَّرتَ المَوضُوع إلى \"%@\".";
+"notice_display_name_removed_by_you" = "أنتَ قَد أزَلتَ اِسمكَ الظّاهِر";
+"notice_display_name_changed_from_by_you" = "أنتَ قَد غيَّرتَ اِسمكَ الظّاهِر مِن %@ إلى %@";
+"notice_display_name_set_by_you" = "أنتَ قَد عيَّنتَ اِسمكَ الظّاهِر إلى %@";
+"notice_avatar_url_changed_by_you" = "أنتَ قَد غيَّرتَ صُّورَتكَ الرَّمزية";
+"notice_room_withdraw_by_you" = "أنتَ قَد سَحبتَ دَعوَة %@";
+"notice_room_ban_by_you" = "أنتَ قَد حَظرتَ %@";
+"notice_room_unban_by_you" = "أنتَ قَد رَفعتَ الحَظرَ عَن %@";
+"notice_room_kick_by_you" = "أنتَ قَد طَردتَ %@";
+"notice_room_reject_by_you" = "أنتَ قَد رَفضتَ الدَعوَة";
+"notice_room_join_by_you" = "أنتَ قَد اِنضَمَمت";
+"notice_room_leave_by_you" = "أنتَ قَد غادَرت";
+"notice_room_third_party_revoked_invite_by_you_for_dm" = "أنتَ قد ألغيتَ دَعوَة %@";
+"notice_room_third_party_revoked_invite_by_you" = "أنتَ قَد ألغيتَ دَعوَة %@ لِلاِنضِمام إلى الغُرفَة";
+"notice_room_third_party_invite_by_you_for_dm" = "أنتَ قَد دَعوتَ %@";
+"notice_room_third_party_invite_by_you" = "أنتَ قَد أرسَلتَ دَعوَةً إلى %@ لِلاِنضِمامِ إلى الغُرفَة";
+"notice_room_invite_you" = "لَقَد دَعاكَ %@";
+
+// Notice Events with "You"
+"notice_room_invite_by_you" = "أنتَ قد دَعوتَ %@";
+"notice_conference_call_finished" = "لَقَد اِنتَهَى اِجتِمَاع VoIP";
+"notice_conference_call_started" = "لَقَد بَدأ اِجتِمَاع VoIP";
+"notice_conference_call_request" = "لَقَد طَلَبَ %@ عَقد اِجتِمَاع VoIP";
+"notice_ended_video_call" = "لَقَد أنهَى %@ المُكالَمَة";
+"notice_answered_video_call" = "لَقَد أجابَ %@ عَلَى المُكالَمَة";
+"notice_placed_video_call" = "لَقَد أجرَى %@ مُكالَمَة مَرئيَّة";
+"notice_placed_voice_call" = "لَقَد أجرَى %@ مُكالَمَة صَوتيَّة";
+"notice_room_name_changed_for_dm" = "لَقَد غيَّرَ %@ الاِسم إلى %@.";
+"notice_room_name_changed" = "لَقَد غيَّرَ %@ اِسم الغُرفَة إلى %@.";
+"notice_topic_changed" = "لَقَد غيَّرَ %@ المَوضُوع إلى \"%@\".";
+"notice_display_name_removed" = "لَقَد أزالَ %@ اِسمهُ الظّاهِر";
+"notice_display_name_changed_from" = "لَقَد غيَّرَ %@ اِسمُهُ الظّاهِر مِن %@ إلى %@";
+"notice_display_name_set" = "لَقَد عيَّنَ %@ اِسمُهُ الظّاهِر إلى %@";
+"notice_avatar_url_changed" = "لَقَد غيَّرَ %@ صُّورَتَهُ الرَّمزية";
+"notice_room_reason" = ". السَّبَب: %@";
+"notice_room_withdraw" = "لَقَد سَحَبَ %@ دَعوَة %@";
+"notice_room_ban" = "إنَّ %@ قَد حَظَرَ %@";
+"notice_room_unban" = "لَقَد رَفَعَ %@ الحَظرَ عَن %@";
+"notice_room_kick" = "إنَّ %@ قَد طَرَدَ %@";
+"notice_room_reject" = "لَقَد رَفَضَ %@ الدَّعوَة";
+"notice_room_leave" = "لَقَد غَادَرَ %@";
+"notice_room_third_party_invite" = "لَقَد أرسَلَ %@ دَعوَةً إلى %@ لِلاِنضِمامِ إلى الغُرفَة";
+"notice_room_join" = "لَقَد اِنضَمَّ %@";
+"notice_room_third_party_revoked_invite_for_dm" = "لَقَد ألغَى %@ دَعوَة %@";
+"notice_room_third_party_invite_for_dm" = "إنَّ %@ قَد أضافَ %@";
+
+/* -*- 
+   Automatic localization for en
+
+   The following key/value pairs were extracted from the android i18n file:
+    /matrix-sdk/src/main/res/values/strings.xml.
+*/
+
+"notice_room_invite" = "إنَّ %@ قَد أضافَ %@";
+"language_picker_default_language" = "الاِفتراضي (%@)";
+
+// Language picker
+"language_picker_title" = "اِختَر لُغَةً";
+
+// Country picker
+"country_picker_title" = "اِختَر بَلَدًا";
+"local_contacts_access_discovery_warning" = "لاِكتِشاف جِهات الاِتِّصال الَّتي تَستَخدِمُ Matrix بِالفِعل، يُمكِنُ لِـ%@ إرسَال عَناوين البَريد الإلِكتُرونيّ وأرقام الهَواتِف الَّتي في دَفتَرِ العَناوين الخاصِّ بِك إلى خادِمِ هُويَّة Matrix المُختار. يَتِّمُ تَجزِئة البَياناتِ الشَّخصيَّة قَبلَ إرسالِها حَيثُما كانَت مَدعُومَة - يُرجى مُراجَعَة سياسَة الخُصُوصيَّة الخاصَّة بِخادِم الهُويَّة لِلحُصُولِ عَلَى المَزيدِ مِنَ التَّفاصيل.";
+"local_contacts_access_discovery_warning_title" = "اِكتِشافُ المُستَخدِمين";
+"local_contacts_access_not_granted" = "اِكتِشافُ المُستَخدِمين مِن جِهاتِ الاِتِّصالِ المَحَلِّيَّة يَتَطَلَّب الوُصُول إلَى جِهاتِ الاِتِّصالِ الخاصّةِ بِك لَكِنّ %@ لَيسَ لَدَيهِ الاِذن لاِستِخدامَها";
+"microphone_access_not_granted_for_call" = "المُكالَمَاتُ المَرئيَّة تَتَطَلَّب الوُصُول إلَى المِيكرُوفُون لَكِنّ %@ لَيسَ لَدَيهِ الاِذن لاِستِخدامه";
+
+// Permissions
+"camera_access_not_granted_for_call" = "المُكالَمَاتُ المَرئيَّة تَتَطَلَّب الوُصُول إلَى الكاميرة لَكِنّ %@ لَيسَ لَدَيهِ الاِذن لاِستِخدامها";
+"ssl_homeserver_url" = "عُنوانُ URL لِلخادِم الرَّئيس: %@";
+"user_id_placeholder" = "مِثال: bob:homeserver@";
+"network_error_not_reachable" = "يُرجَى التَّحَقُّق مِن اِتِّصالَكَ بِالشَبَكَة";
+"call_more_actions_dialpad" = "لَوحَةُ الاِتِّصَال";
+"call_more_actions_transfer" = "النَّقل";
+"call_more_actions_audio_use_device" = "مُكَبِّر صَوت الجِّهَاز";
+"call_more_actions_audio_use_headset" = "اِستِخدامُ صَوتَ سمَّاعَةِ الرَّأس";
+"call_more_actions_change_audio_device" = "تَغيِيرُ جِهَازِ الصَوت";
+"call_more_actions_unhold" = "الاِستِئنَاف";
+"call_more_actions_hold" = "التَّمَسُّك";
+"call_remote_holded" = "لقد عَلَّقَ %@ المكالمة";
+"call_holded" = "أنتَ قَد عَلَّقتَ المُكالَمَة";
+"notice_declined_video_call_by_you" = "أنتَ قَد رَفَضتَ المُكالَمَة";
+"notice_declined_video_call" = "لَقَد رَفضَ %@ المُكالَمَة";
+"resume_call" = "اِستِئنَاف";
+"call_transfer_to_user" = "التَّحويلُ إلَى %@";
+"call_consulting_with_user" = "اِستِشارَة مَعَ %@";
+"call_video_with_user" = "مُكالَمَةٌ مَرئيَّةٌ مَع %@";
+"call_voice_with_user" = "مُكالَمَةٌ صَوتيَّةٌ مَع %@";
+"call_ringing" = "الرَّنِينُ جَارٍ…";
+"e2e_passphrase_too_short" = "عِبارَة المُرُور قَصِيرَةٌ جِدًا (يَجِبُ ألَّا يَقِلَّ طُولهَا عَن %d أحرف)";
+"microphone_access_not_granted_for_voice_message" = "الرَسائِلُ الصَوتيَّةُ تتطَلَبُ الوصُولَ إلَى المِيكرُوفُون لَكِنَ %@ ليسَ لَديهِ إذنٌ لِاستِخدَامِه";
+"message_reply_to_sender_sent_a_voice_message" = "أرسَلَ رِسَالَةً صَوتيَّة.";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/bg.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/bg.lproj/MatrixKit.strings
new file mode 100644
index 000000000..0cb86edfd
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/bg.lproj/MatrixKit.strings
@@ -0,0 +1,466 @@
+"view" = "Виж";
+"back" = "Назад";
+"continue" = "Продължи";
+"leave" = "Напусни";
+"invite" = "Покани";
+"retry" = "Опитай отново";
+"cancel" = "Отказ";
+"save" = "Запази";
+// room details dialog screen
+"room_details_title" = "Информация";
+"matrix" = "Matrix";
+// Login Screen
+"login_create_account" = "Регистрация:";
+"login_server_url_placeholder" = "URL (напр. https://matrix.org)";
+"login_home_server_title" = "Home сървър адрес:";
+"login_home_server_info" = "Сървърът Ви съхранява цялата кореспонденция и профилни данни";
+"login_identity_server_title" = "Адрес на сървър за самоличност:";
+"login_identity_server_info" = "Matrix предоставя сървъри за самоличност, които проследяват кои имейли и т.н. на кои Matrix идентификатори принадлежат. В момента съществува само https://matrix.org.";
+"login_user_id_placeholder" = "Matrix ID (напр. @ivan:matrix.org или ivan)";
+"login_password_placeholder" = "Парола";
+"login_optional_field" = "по избор";
+"login_display_name_placeholder" = "Име (напр. Иван Георгиев)";
+"login_email_info" = "Задайте имейл адрес, за да позволите на другите потребители да Ви намерят по-лесно в Matrix и да можете да възстановите Вашата парола в бъдеще.";
+"login_email_placeholder" = "Имейл адрес";
+"login_prompt_email_token" = "Моля, въведете кода за потвърждение от имейл адреса:";
+"login_error_title" = "Неуспешно влизане в профила";
+"login_error_no_login_flow" = "Не успяхме да извлечем информация за автентикация от този Home сървър";
+"login_error_do_not_support_login_flows" = "В момента не поддържаме методите за влизане, определени от този Home сървър";
+"login_error_registration_is_not_supported" = "В момента не се поддържа регистрация";
+"login_error_forbidden" = "Невалидно потребителско име или парола";
+"login_error_unknown_token" = "Не е разпознат указаният тоукън за достъп";
+"login_error_bad_json" = "Грешно формиран JSON";
+"login_error_not_json" = "Не съдържаше валиден JSON";
+"login_error_limit_exceeded" = "Бяха изпратени твърде много заявки";
+"login_error_user_in_use" = "Това потребителско име е вече заето";
+"login_error_login_email_not_yet" = "Все още не сте кликнали върху връзката в имейла";
+"login_use_fallback" = "Използване на страница заместител";
+"login_leave_fallback" = "Откажи";
+"login_invalid_param" = "Невалиден параметър";
+"register_error_title" = "Неуспешна регистрация";
+"login_error_forgot_password_is_not_supported" = "В момента не се поддържа \"Забравена парола\"";
+"login_mobile_device" = "Мобилно устройство";
+"login_tablet_device" = "Таблет";
+"login_desktop_device" = "Работен плот";
+// Action
+"no" = "Не";
+"yes" = "Да";
+"abort" = "Прекрати";
+"close" = "Затвори";
+"discard" = "Откажи";
+"dismiss" = "Затвори";
+"sign_up" = "Регистрация";
+"submit" = "Изпрати";
+"submit_code" = "Изпрати код";
+"set_default_power_level" = "Възвръщане нивото на достъп";
+"set_moderator" = "Направи модератор";
+"set_admin" = "Направи администратор";
+"start_chat" = "Започни чат";
+"start_voice_call" = "Започни гласов разговор";
+"start_video_call" = "Започни видео разговор";
+"mention" = "Спомени";
+"select_account" = "Изберете профил";
+"attach_media" = "Прикачи файл от галерията";
+"capture_media" = "Направи снимка/видео";
+"invite_user" = "Покани matrix потребител";
+"resend_message" = "Изпрати съобщението отново";
+"reset_to_default" = "Връщане към ниво по подразбиране";
+"select_all" = "Избери всички";
+"cancel_upload" = "Откажи качването";
+"cancel_download" = "Откажи свалянето";
+"show_details" = "Покажи детайлите";
+"answer_call" = "Отговори на повикването";
+"reject_call" = "Откажи повикването";
+"ignore" = "Игнорирай";
+"unignore" = "Премахни игнорирането";
+// Events formatter
+"notice_avatar_changed_too" = "(аватарът също беше променен)";
+"notice_room_name_removed" = "%@ премахна името на стаята";
+"notice_room_topic_removed" = "%@ премахна темата";
+"notice_event_redacted" = "<изтрито%@>";
+"notice_event_redacted_by" = " от %@";
+"notice_event_redacted_reason" = " [причина: %@]";
+"notice_profile_change_redacted" = "%@ обнови своя профил %@";
+"notice_room_created" = "%@ създаде и конфигурира стаята.";
+"notice_room_join_rule" = "Правилото за присъединяване е: %@";
+"notice_room_power_level_intro" = "Нивата на достъп на членовете в стаята са:";
+"end_call" = "Прекрати разговора";
+"notice_room_power_level_acting_requirement" = "Минималните нива на достъп, които потребител трябва да има за следните действия са:";
+"notice_room_power_level_event_requirement" = "Минималните нива на достъп отнасящи се към събития са:";
+"notice_room_aliases" = "Адресите на стаята са: %@";
+"notice_room_related_groups" = "Групите, асоциирани с тази стая, са: %@";
+"notice_encrypted_message" = "Шифровано съобщение";
+"notice_encryption_enabled" = "%@ включи шифроването от край до край (алгоритъм %@)";
+"notice_image_attachment" = "прикачена снимка";
+"notice_audio_attachment" = "прикачено аудио";
+"notice_video_attachment" = "прикачено видео";
+"notice_location_attachment" = "прикачено местоположение";
+"notice_file_attachment" = "прикачен файл";
+"notice_invalid_attachment" = "невалидно прикачване";
+"notice_unsupported_attachment" = "Прикачен файл, който не се поддържа: %@";
+"notice_feedback" = "Събитие за обратна връзка (id: %@): %@";
+"notice_redaction" = "%@ изтри събитие (id: %@)";
+"notice_error_unsupported_event" = "Събитие, което не се поддържа";
+"notice_error_unexpected_event" = "Неочаквано събитие";
+"notice_error_unknown_event_type" = "Непознат вид на събитието";
+"notice_room_history_visible_to_anyone" = "%@ направи бъдещата история на стаята видима за всеки.";
+"notice_room_history_visible_to_members" = "%@ направи бъдещата история на стаята видима за всички членове.";
+"notice_room_history_visible_to_members_from_invited_point" = "%@ направи бъдещата история на стаята видима за всички членове, от момента на поканването им в нея.";
+"notice_room_history_visible_to_members_from_joined_point" = "%@ направи бъдещата история на стаята видима за всички членове, от момента на присъединяването им в нея.";
+"notice_crypto_unable_to_decrypt" = "** Неуспешно разшифроване: %@ **";
+"notice_crypto_error_unknown_inbound_session_id" = "Сесията на подателя не изпрати ключовете за това съобщение.";
+// room display name
+"room_displayname_empty_room" = "Празна стая";
+"room_displayname_two_members" = "%@ и %@";
+"room_displayname_more_than_two_members" = "%@ и %u други";
+// Settings
+"settings" = "Настройки";
+"settings_enable_inapp_notifications" = "Включване на известия в приложението";
+"settings_enable_push_notifications" = "Включване на известия";
+"settings_enter_validation_token_for" = "Въведете код за потвърждение за %@:";
+"notification_settings_room_rule_title" = "Стая: '%@'";
+// Devices
+"device_details_title" = "Информация за сесията\n";
+"device_details_name" = "Публично име\n";
+"device_details_identifier" = "ID\n";
+"device_details_last_seen" = "Последно видян\n";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_rename_prompt_message" = "Публичното име на сесията е видимо за всеки, с който комуникирате";
+"device_details_delete_prompt_title" = "Автентикация";
+"device_details_delete_prompt_message" = "Тази операция изискра допълнителна автентикация.\nЗа да продължите, моля, въведете Вашата парола.";
+// Encryption information
+"room_event_encryption_info_title" = "Информация за шифроване от край до край\n\n";
+"room_event_encryption_info_event" = "Информация за събитие\n";
+"room_event_encryption_info_event_user_id" = "ID на потребител\n";
+"room_event_encryption_info_event_identity_key" = "Curve25519 ключ за самоличност\n";
+"room_event_encryption_info_event_fingerprint_key" = "Заявен ключов отпечатък Ed25519\n";
+"room_event_encryption_info_event_algorithm" = "Алгоритъм\n";
+"room_event_encryption_info_event_session_id" = "ID на сесия\n";
+"room_event_encryption_info_event_decryption_error" = "Грешка при разшифроване\n";
+"room_event_encryption_info_event_unencrypted" = "нешифрован";
+"room_event_encryption_info_event_none" = "няма";
+"room_event_encryption_info_device" = "\nИнформация за сесията на подателя\n";
+"room_event_encryption_info_device_unknown" = "неизвестна сесия\n";
+"room_event_encryption_info_device_name" = "Публично име\n";
+"room_event_encryption_info_device_id" = "ID\n";
+"room_event_encryption_info_device_verification" = "Потвърждение\n";
+"room_event_encryption_info_device_fingerprint" = "Ed25519 отпечатък\n";
+"room_event_encryption_info_device_verified" = "Потвърдено";
+"room_event_encryption_info_device_not_verified" = "НЕ е потвърдено";
+"room_event_encryption_info_device_blocked" = "В черния списък";
+"room_event_encryption_info_unblock" = "Отблокирай";
+"room_event_encryption_info_block" = "Блокирай";
+"room_event_encryption_info_verify" = "Потвърди...";
+"room_event_encryption_info_unverify" = "Махни потвържд.";
+"room_event_encryption_verify_title" = "Потвърди сесията\n\n";
+"room_event_encryption_verify_ok" = "Потвърди";
+// Account
+"account_save_changes" = "Запази промените";
+"account_link_email" = "Свържи имейл";
+"account_linked_emails" = "Свързани имейли";
+"account_email_validation_title" = "Очакване на потвърждение";
+"account_email_validation_message" = "Моля, проверете своя имейл адрес и натиснете връзката, която той съдържа. След като направите това, натиснете продължи.";
+"account_email_validation_error" = "Неуспешно потвърждение на имейл адрес. Моля, проверете своя имейл адрес и натиснете връзката, която той съдържа. След като направите това, натиснете продължи";
+"account_msisdn_validation_title" = "Очакване на потвърждение";
+"account_msisdn_validation_message" = "Изпратихме Ви SMS с код за активиране. Моля, въведете този код по-долу.";
+"account_msisdn_validation_error" = "Неуспешно потвърждение на телефонен номер.";
+"account_error_display_name_change_failed" = "Неуспешна смяна на име";
+"account_error_picture_change_failed" = "Неуспешна смяна на профилната снимка";
+"account_error_matrix_session_is_not_opened" = "Matrix сесията не е отворена";
+"account_error_email_wrong_title" = "Невалиден имейл адрес";
+"account_error_email_wrong_description" = "Това не изглежда да е валиден имейл адрес";
+"account_error_msisdn_wrong_title" = "Невалиден телефонен номер";
+"account_error_msisdn_wrong_description" = "Това не изглежда да е валиден телефонен номер";
+// Room creation
+"room_creation_name_title" = "Име на стая:";
+"room_creation_name_placeholder" = "(напр. lunchGroup)";
+"room_creation_alias_title" = "Псевдоним на стая:";
+"room_creation_alias_placeholder" = "(напр. #foo:example.org)";
+"room_creation_alias_placeholder_with_homeserver" = "(напр. #foo%@)";
+"room_creation_participants_title" = "Участници:";
+"room_creation_participants_placeholder" = "(напр. @ivan:homeserver1; @georgi:homeserver2...)";
+// Room
+"room_please_select" = "Моля, изберете стая";
+"room_error_join_failed_title" = "Неуспешно присъединяване към стаята";
+"room_error_join_failed_empty_room" = "В момента не е възможно да се присъедините отново към празна стая.";
+"room_error_name_edition_not_authorized" = "Нямате право да редактирате името на тази стая";
+"room_error_topic_edition_not_authorized" = "Нямате право да редактирате темата на тази стая";
+"room_error_cannot_load_timeline" = "Неуспешно зареждане на хронологията";
+"room_error_timeline_event_not_found_title" = "Неуспешно зареждане на позицията в хронологията";
+"room_error_timeline_event_not_found" = "Беше направен опит да се зареди конкретна точка в хронологията на тази стая, но не я намери";
+"room_left" = "Вие напуснахте стаята";
+"room_no_power_to_create_conference_call" = "Трябва да имате разрешение за изпращане на покани, за да може да започнете групов разговор в тази стая";
+"room_no_conference_call_in_encrypted_rooms" = "Не се поддържат групови разговори в шифровани стаи";
+// Room members
+"room_member_ignore_prompt" = "Сигурни ли сте, че искате да скриете всички съобщения от този потребител?";
+"room_member_power_level_prompt" = "Няма да можете да възвърнете тази промяна, тъй като повишавате този потребител до същото ниво на достъп като Вашето.\nСигурни ли сте?";
+// Attachment
+"attachment_size_prompt" = "Изпратете с размер:";
+"attachment_original" = "Оригинален: %@";
+"attachment_small" = "Малък: %@";
+"attachment_medium" = "Среден: %@";
+"attachment_large" = "Голям: %@";
+"attachment_cancel_download" = "Отказване на свалянето?";
+"attachment_cancel_upload" = "Отказване на качването?";
+"attachment_multiselection_size_prompt" = "Изпратете снимките с размер:";
+"attachment_multiselection_original" = "Оригинален";
+"attachment_e2e_keys_file_prompt" = "Файлът съдържа ключове за шифроване, експортирани от Matrix клиент.\nИскате ли да видите съдържанието на файла или да импортирате ключовете, които съдържа?";
+"attachment_e2e_keys_import" = "Импортиране...";
+// Contacts
+"contact_mx_users" = "Matrix потребители";
+"contact_local_contacts" = "Локални контакти";
+// Groups
+"group_invite_section" = "Покани";
+"group_section" = "Групи";
+// Search
+"search_no_results" = "Няма резултати";
+"search_searching" = "В процес на търсене...";
+// Time
+"format_time_s" = "сек";
+"format_time_m" = "мин";
+"format_time_h" = "ч";
+"format_time_d" = "д";
+// E2E import
+"e2e_import_room_keys" = "Импортиране на ключове за стая";
+"e2e_import_prompt" = "Този процес позволява да импортирате ключове за шифроване, които преди сте експортирали от друг Matrix клиент. Тогава ще можете да разшифровате всяко съобщение, което другият клиент може да разшифрова. Експортираният файл може да бъде предпазен с парола. Трябва да въведете парола тук, за да разшифровате файла.";
+"e2e_import" = "Импортирай";
+"e2e_passphrase_enter" = "Въведи парола";
+// E2E export
+"e2e_export_room_keys" = "Експортиране на ключове за стая";
+"e2e_export_prompt" = "Този процес Ви позволява да експортирате във файл ключовете за съобщения в шифровани стаи. Така ще можете да импортирате файла в друг Matrix клиент, така че той също да може да разшифрова такива съобщения.\nЕкспортираният файл ще позволи на всеки, който може да го прочете, да разшифрова всяко шифровано съобщение, което можете да видите. Трябва да го държите на сигурно място.";
+"e2e_export" = "Експортирай";
+"e2e_passphrase_confirm" = "Потвърди парола";
+"e2e_passphrase_empty" = "Паролата не трябва да е празна";
+"e2e_passphrase_not_match" = "Паролите трябва да съвпадат";
+// Others
+"user_id_title" = "ID на потребител:";
+"settings_config_user_id" = "ID на потребител: %@";
+"offline" = "офлайн";
+"unsent" = "Неизпратено";
+"error" = "Грешка";
+"not_supported_yet" = "Все още не се поддържа";
+"default" = "по подразбиране";
+"private" = "Лична";
+"public" = "Публична";
+"power_level" = "Ниво на достъп";
+"network_error_not_reachable" = "Моля, проверете интернет връзката си";
+"user_id_placeholder" = "напр.: @ivan:homeserver";
+"ssl_homeserver_url" = "Адрес на Home сървър: %@";
+// Permissions
+"camera_access_not_granted_for_call" = "Видео разговорите изискват достъп до камерата, но %@ няма разрешение да я използва";
+"microphone_access_not_granted_for_call" = "Разговорите изискват достъп до микрофона, но %@ няма разрешение да го използва";
+"local_contacts_access_not_granted" = "Откриване на потребители от локални контакти изисква достъп до контактите Ви, но %@ няма разрешение да ги използва";
+"local_contacts_access_discovery_warning_title" = "Откриване на потребители";
+"local_contacts_access_discovery_warning" = "За да открие контакти използващи Matrix, %@ може да изпрати имейл адресите и телефонните номера от телефонния указател към избрания от вас Matrix сървър за самоличност. Ако се поддържа, личните данни могат да бъдат хеширани преди изпращане - вижте политиката за поверителност на сървъра за самоличност за повече информация.";
+// Country picker
+"country_picker_title" = "Избор на държава";
+// Language picker
+"language_picker_title" = "Избор на език";
+"language_picker_default_language" = "По подразбиране (%@)";
+"notice_room_invite" = "%@ покани %@";
+"notice_room_third_party_invite" = "%@ изпрати покана на %@ да се присъедини към стаята";
+"notice_room_third_party_registered_invite" = "%@ прие поканата за %@";
+"notice_room_join" = "%@ се присъедини";
+"notice_room_leave" = "%@ напусна";
+"notice_room_reject" = "%@ отхвърли поканата";
+"notice_room_kick" = "%@ изгони %@";
+"notice_room_unban" = "%@ отблокира %@";
+"notice_room_ban" = "%@ блокира %@";
+"notice_room_withdraw" = "%@ оттегли поканата си за %@";
+"notice_room_reason" = ". Причина: %@";
+"notice_avatar_url_changed" = "%@ смени своята профилна снимка";
+"notice_display_name_set" = "%@ си сложи име %@";
+"notice_display_name_changed_from" = "%@ смени своето име от %@ на %@";
+"notice_display_name_removed" = "%@ премахна своето име";
+"notice_topic_changed" = "%@ промени темата на \"%@\".";
+"notice_room_name_changed" = "%@ промени името на стаята на %@.";
+"notice_placed_voice_call" = "%@ започна гласов разговор";
+"notice_placed_video_call" = "%@ започна видео разговор";
+"notice_answered_video_call" = "%@ отговори на повикването";
+"notice_ended_video_call" = "%@ прекрати разговора";
+"notice_conference_call_request" = "%@ заяви VoIP групов разговор";
+"notice_conference_call_started" = "Започна VoIP конференция";
+"notice_conference_call_finished" = "VoIP конференцията приключи";
+// button names 
+"ok" = "ОК";
+"send" = "Изпрати";
+"copy_button_name" = "Копирай";
+"resend" = "Изпрати отново";
+"redact" = "Премахни";
+"share" = "Сподели";
+"set_power_level" = "Ниво на достъп";
+"delete" = "Изтрий";
+// actions 
+"action_logout" = "Излез";
+"create_room" = "Създай стая";
+"login" = "Влез";
+"create_account" = "Създай профил";
+"membership_invite" = "Поканен";
+"membership_leave" = "Напуснал";
+"membership_ban" = "Блокиран";
+"num_members_one" = "%@ потребител";
+"num_members_other" = "%@ потребители";
+"kick" = "Изгони";
+"ban" = "Блокирай";
+"unban" = "Отблокирай";
+"message_unsaved_changes" = "Има незапазени промени. При напускане ще се загубят.";
+// Login Screen 
+"login_error_already_logged_in" = "Вече сте в профила си";
+"login_error_must_start_http" = "URL адресът трябва да започва с http[s]://";
+// contacts list screen 
+"invitation_message" = "Бих искал да си пиша с Вас в matrix. За повече информация, моля, посетете уебсайта http://matrix.org.";
+// Settings screen 
+"settings_title_config" = "Конфигурация";
+"settings_title_notifications" = "Известия";
+// Notification settings screen 
+"notification_settings_disable_all" = "Изключване на всички известия";
+"notification_settings_enable_notifications" = "Включване на известия";
+"notification_settings_enable_notifications_warning" = "В момента всички известия към всички устройства са изключени.";
+"notification_settings_always_notify" = "Известяване винаги";
+"notification_settings_never_notify" = "Известяване никога";
+"notification_settings_word_to_match" = "дума, която да потърсим";
+"notification_settings_highlight" = "Подчертаване";
+"notification_settings_custom_sound" = "Индивидуален звук";
+"notification_settings_per_room_notifications" = "Известия за конкретна стая";
+"notification_settings_per_sender_notifications" = "Известия за конкретен подател";
+"notification_settings_sender_hint" = "@потребител:domain.com";
+"notification_settings_select_room" = "Избиране на стая";
+"notification_settings_other_alerts" = "Други известия";
+"notification_settings_contain_my_user_name" = "Известявай ме със звук за съобщения, съдържащи потребителското ми име";
+"notification_settings_contain_my_display_name" = "Известявай ме със звук за съобщения, съдържащи името ми";
+"notification_settings_just_sent_to_me" = "Известявай ме със звук за съобщения изпратени само до мен";
+"notification_settings_invite_to_a_new_room" = "Известявай ме, когато съм поканен в нова стая";
+"notification_settings_people_join_leave_rooms" = "Известявай ме, когато хората се присъединяват или напускат стаи";
+"notification_settings_receive_a_call" = "Известявай ме, когато получавам обаждане";
+"notification_settings_suppress_from_bots" = "Блокирай известията от ботове";
+"notification_settings_by_default" = "По подразбиране...";
+"notification_settings_notify_all_other" = "Известявай ме за всички други съобщения/стаи";
+"notification_settings_per_word_notifications" = "Известия за конкретна дума";
+// gcm section 
+"settings_config_home_server" = "Home сървър: %@";
+"settings_config_identity_server" = "Сървър за самоличност: %@";
+// call string
+"call_waiting" = "Изчакване...";
+"call_connecting" = "Свързване…";
+"call_ended" = "Разговорът приключи";
+"call_ring" = "Позвъняване...";
+"incoming_video_call" = "Входящо видео повикване";
+"incoming_voice_call" = "Входящо гласово повикване";
+"call_invite_expired" = "Поканата за разговор изтече";
+// unrecognized SSL certificate
+"ssl_trust" = "Довери се";
+"ssl_logout_account" = "Излез";
+"ssl_remain_offline" = "Игнорирай";
+"ssl_fingerprint_hash" = "Отпечатък (%@):";
+"ssl_could_not_verify" = "Неуспешно потвърждаване на самоличността на отдалечения сървър.";
+"ssl_cert_not_trust" = "Това може да означава, че някой злонамерено прихваща Вашата връзка, или че телефонът Ви не се доверява на сертификата, предоставен от отдалечения сървър.";
+"ssl_cert_new_account_expl" = "Ако администраторът на сървъра е обявил, че това е нормално, уверете се, че отпечатъкът по-долу съвпада с този, предоставен от него.";
+"ssl_unexpected_existing_expl" = "Сертификатът е различен от този, на който телефонът Ви се доверява. Това е МНОГО НЕОБИЧАЙНО. Препоръчваме да НЕ ПРИЕМАТЕ този нов серфитикат.";
+"ssl_expected_existing_expl" = "Сертификатът се промени от такъв, който е бил доверен, на такъв който вече не е. Сървърът може да е подновил своя сертификат. Свържете се с администратора за правилния отпечатък.";
+"ssl_only_accept" = "Приемайте сертификата САМО ако администратора на сървъра е публикувал отпечатък, който съвпада с този по-горе.";
+"room_event_encryption_verify_message" = "За да потвърдите, че на това устройство може да се вярва, моля свържете се със собственика му по друг начин (напр. на живо или чрез телефонен разговор) и го попитайте дали ключът, който той вижда в неговите настройки на потребителя за това устройство, съвпада с ключа по-долу:\n\n\tИме на сесията: %@\n\tID на сесията: %@\n\tКлюч на сесията: %@\n\nАко съвпада, моля натиснете бутона за потвърждение по-долу. Ако не, то тогава някой друг имитира тази сесия и вероятно искате вместо това да натиснете бутона за черен списък.\n\nВ бъдеще този процес на потвърждение ще бъде по-лесен.";
+"notification_settings_global_info" = "Настройки на известията се пазят в потребителския Ви профил и се споделят измежду всички клиенти, които ги поддържат (включително и известия на работния плот).\n\nПравилата се проверяват по ред; първото съвпадащо правило дефинира резултата за съобщението.\nТака че: Известията за конкретна дума са по-важни от известията за конкретна стая, които пък са по-важни от известията за конкретен потребител.\nАко има няколко еднотипни правила, с приоритет е първото съвпадащо.";
+"notification_settings_per_word_info" = "Съвпаденията за думите се правят без взимане под внимание на малка/главна буква. Могат да съдържат и * wildcard символ. Така че:\nfoo намира съвпадения за низа foo, ограден от разделители за дума (напр. пунктуация и празно място или начало/край на ред).\nfoo* намира съвпадения във всяка дума започваща с foo.\n*foo* намира съвпадения във всяка дума включваща някъде в себе си низа foo.";
+"notice_sticker" = "стикер";
+"notice_in_reply_to" = "В отговор на";
+"error_common_message" = "Възникна грешка. Моля опитайте пак по-късно.";
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "изпрати снимка.";
+"message_reply_to_sender_sent_a_video" = "изпрати видео.";
+"message_reply_to_sender_sent_an_audio_file" = "изпрати аудио файл.";
+"message_reply_to_sender_sent_a_file" = "изпрати файл.";
+"message_reply_to_message_to_reply_to_prefix" = "В отговор на";
+"login_error_resource_limit_exceeded_title" = "Надхвърлен лимит за ресурс";
+"login_error_resource_limit_exceeded_message_default" = "Този сървър е надхвърлил някой свой лимит.";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "Този сървър е достигнал своя лимит за потребители на месец.";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nМоля, свържете се с администратора на услугата за да продължите да я използвате.";
+"login_error_resource_limit_exceeded_contact_button" = "Свържи се с администратора";
+"e2e_passphrase_create" = "Създай парола";
+"account_error_push_not_allowed" = "Уведомленията не са разрешени";
+"notice_room_third_party_revoked_invite" = "%@ оттегли поканата за присъединяването на %@ към стаята";
+"device_details_rename_prompt_title" = "Име на сесията";
+"notice_encryption_enabled_ok" = "%@ включи шифроване от-край-до-край.";
+"notice_encryption_enabled_unknown_algorithm" = "%1$@ включи шифроване от-край-до-край (неразпознат алгоритъм %2$@).";
+"notice_room_history_visible_to_members_from_joined_point_by_you_for_dm" = "Направихте бъдещите съобщения видими за всички, от момента на присъединяването им.";
+"notice_room_history_visible_to_members_from_joined_point_by_you" = "Направихте бъдещата история на стаята видима за всички нейни членове, от момента на присъединяването им.";
+"notice_room_history_visible_to_members_from_invited_point_by_you_for_dm" = "Направихте бъдещите съобщения видими за всички, от момента на поканването им.";
+"notice_room_history_visible_to_members_from_invited_point_by_you" = "Направихте бъдещата история на стаята видима за всички нейни членове, от момента на поканването им.";
+"notice_room_history_visible_to_members_by_you_for_dm" = "Направихте бъдещите съобщения видими за всички членове на стаята.";
+"notice_room_history_visible_to_members_by_you" = "Направихте бъдещата история на стаята видима за всички нейни членове.";
+"notice_room_history_visible_to_anyone_by_you" = "Направихте бъдещата история на стаята видима за всички.";
+"notice_redaction_by_you" = "Редактирахте събитие (идентификатор: %@)";
+"notice_encryption_enabled_unknown_algorithm_by_you" = "Включихте шифроване от-край-до-край (непознат алгоритъм %@).";
+"notice_encryption_enabled_ok_by_you" = "Включихте шифроване от-край-до-край.";
+"notice_room_created_by_you_for_dm" = "Присъединихте се.";
+"notice_room_created_by_you" = "Създадохте и конфигурирахте стаята.";
+"notice_profile_change_redacted_by_you" = "Обновихте %@ профила си";
+"notice_event_redacted_by_you" = " от вас";
+"notice_room_topic_removed_by_you" = "Премахнахте темата";
+"notice_room_name_removed_by_you_for_dm" = "Премахнахте името";
+"notice_room_name_removed_by_you" = "Премахнахте името на стаята";
+"notice_conference_call_request_by_you" = "Направихте заявка за VoIP конференция";
+"notice_ended_video_call_by_you" = "Прекратихте разговора";
+"notice_answered_video_call_by_you" = "Отговорихте на разговора";
+"notice_placed_video_call_by_you" = "Започнахте видео разговор";
+"notice_placed_voice_call_by_you" = "Започнахте гласов разговор";
+"notice_room_name_changed_by_you_for_dm" = "Променихте името на %@.";
+"notice_room_name_changed_by_you" = "Променихте името на стаята на %@.";
+"notice_topic_changed_by_you" = "Променихте темата на \"%@\".";
+"notice_display_name_removed_by_you" = "Премахнахте името си";
+"notice_display_name_changed_from_by_you" = "Променихте името си от %@ на %@";
+"notice_display_name_set_by_you" = "Променихте името си на %@";
+"notice_avatar_url_changed_by_you" = "Променихте снимката си";
+"notice_room_withdraw_by_you" = "Оттеглихте поканата на %@";
+"notice_room_ban_by_you" = "Блокирахте %@";
+"notice_room_unban_by_you" = "Отблокирахте %@";
+"notice_room_kick_by_you" = "Изгонихте %@";
+"notice_room_reject_by_you" = "Отхвърлихте поканата";
+"notice_room_leave_by_you" = "Напуснахте";
+"notice_room_join_by_you" = "Присъединихте се";
+"notice_room_third_party_revoked_invite_by_you_for_dm" = "Оттеглихте поканата на %@";
+"notice_room_third_party_revoked_invite_by_you" = "Оттеглихте поканата от %@ за присъединяване към стаята";
+"notice_room_third_party_registered_invite_by_you" = "Приехте поканата за %@";
+"notice_room_third_party_invite_by_you_for_dm" = "Поканихте %@";
+"notice_room_third_party_invite_by_you" = "Изпратихте покана към %@ за присъединяване в стаята";
+"notice_room_invite_you" = "%@ ви покани";
+
+// Notice Events with "You"
+"notice_room_invite_by_you" = "Поканихте %@";
+"notice_room_name_changed_for_dm" = "%@ промени името на %@.";
+"notice_room_third_party_revoked_invite_for_dm" = "%@ оттегли поканата от %@";
+"notice_room_third_party_invite_for_dm" = "%@ покани %@";
+"room_left_for_dm" = "Напуснахте";
+"notice_room_history_visible_to_members_from_joined_point_for_dm" = "%@ направи бъдещите съобщения видими за всички, от момента на присъединяването им в стаята.";
+"notice_room_history_visible_to_members_from_invited_point_for_dm" = "%@ направи бъдещите съобщения видими за всички, от момента на поканването им в стаята.";
+"notice_room_history_visible_to_members_for_dm" = "%@ направи бъдещите съобщения видими за всички членове в стаята.";
+"notice_room_aliases_for_dm" = "Псевдонимите са: %@";
+"notice_room_power_level_intro_for_dm" = "Нивата на достъп на членовете са:";
+"notice_room_join_rule_public_by_you_for_dm" = "Направихте стаята публична.";
+"notice_room_join_rule_public_by_you" = "Направихте тази стая публична.";
+"notice_room_join_rule_public_for_dm" = "%@ направи стаята публична.";
+"notice_room_join_rule_public" = "%@ направи стаята публична.";
+"notice_room_join_rule_invite_by_you_for_dm" = "Направихте достъпа да е само за поканени.";
+"notice_room_join_rule_invite_by_you" = "Направихте тази стая достъпна само за поканени.";
+"notice_room_join_rule_invite_for_dm" = "%@ направи достъпа да е само за поканени.";
+//  New
+"notice_room_join_rule_invite" = "%@ направи стаята достъпна само за поканени.";
+"notice_room_created_for_dm" = "%@ се присъедини.";
+"notice_room_name_removed_for_dm" = "%@ премахна името";
+"call_transfer_to_user" = "Прехвърли към %@";
+"call_consulting_with_user" = "Консултация с %@";
+"call_video_with_user" = "Видео разговор с %@";
+"call_voice_with_user" = "Гласов разговор с %@";
+"call_more_actions_dialpad" = "Панел за набиране";
+"call_more_actions_transfer" = "Прехвърляне";
+"call_more_actions_audio_use_headset" = "Използвай звук от слушалките";
+"call_more_actions_audio_use_device" = "Използвай звук от устройството";
+"call_more_actions_change_audio_device" = "Смени аудио устройството";
+"call_more_actions_unhold" = "Възобнови";
+"call_more_actions_hold" = "Задръж";
+"call_holded" = "Задържахте разговора";
+"call_remote_holded" = "%@ задържа разговора";
+"call_ringing" = "Звънене…";
+"notice_declined_video_call_by_you" = "Отказахте разговора";
+"notice_declined_video_call" = "%@ отказа разговора";
+"e2e_passphrase_too_short" = "Паролата е прекалено кратка (трябва да е дълга поне %d символа)";
+"resume_call" = "Възобнови";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/ca.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/ca.lproj/MatrixKit.strings
new file mode 100644
index 000000000..7c376a636
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/ca.lproj/MatrixKit.strings
@@ -0,0 +1,363 @@
+"matrix" = "Matrix";
+"login_password_placeholder" = "Contrasenya";
+"login_optional_field" = "opcional";
+"login_email_placeholder" = "Adreça de correu electrònic";
+"view" = "Veure";
+"back" = "Torna";
+"continue" = "Continua";
+"leave" = "Sortir";
+"invite" = "Convida";
+"retry" = "Torna a provar";
+"cancel" = "Cancel·lar";
+"save" = "Desar";
+// Login Screen
+"login_create_account" = "Crear compte:";
+"login_server_url_placeholder" = "URL (ex. https://matrix.org)";
+"login_home_server_title" = "Servidor hoste:";
+"login_home_server_info" = "El teu servidor hoste desa totes les teves converses i dades del compte";
+"login_identity_server_title" = "Servidor d'identitat:";
+"login_identity_server_info" = "Matrix proporciona servidors d'identitat per fer un seguiment dels correus electrònics etc. que pertanyen als identificadors Matrix. Actualment només existeix https://matrix.org.";
+"login_user_id_placeholder" = "ID a Matrix (ex @bob:matrix.org o bob)";
+"login_display_name_placeholder" = "Mostra nom (ex. Bob Obson)";
+// room details dialog screen
+"room_details_title" = "Detalls de la sala";
+"login_email_info" = "Especificar una adreça de correu electrònic permet que altres usuaris et trobin més fàcilment a Matrix i et proporcionarà una manera de restablir la teva contrasenya en el futur.";
+"login_prompt_email_token" = "Introduïu el teu codi de validació de correu electrònic:";
+"login_error_title" = "Error d'inici de sessió";
+"login_error_no_login_flow" = "No hem pogut recuperar la informació d'autenticació d'aquest servidor hoste";
+"login_error_do_not_support_login_flows" = "Actualment no admetem cap o tots els fluxos d'inici de sessió definits per aquest servidor hoste";
+"login_error_registration_is_not_supported" = "El registre no és suportat per ara";
+"login_error_forbidden" = "Nom d'usuari/contrasenya invàlid";
+"login_error_unknown_token" = "No s'ha reconegut el token d'accés especificat";
+"login_error_bad_json" = "JSON incorrecte";
+"login_error_not_json" = "No contenia JSON vàlid";
+"login_error_limit_exceeded" = "S'han enviat massa sol·licituds";
+"login_error_user_in_use" = "Aquest nom d'usuari ja està en ús";
+"login_error_login_email_not_yet" = "L'enllaç del correu electrònic que encara no heu fet clic";
+"login_use_fallback" = "Usa la pàgina de devolució";
+"login_leave_fallback" = "Cancel·lar";
+"login_invalid_param" = "Paràmetre invàlid";
+"register_error_title" = "Error de registre";
+"login_error_forgot_password_is_not_supported" = "Contrasenya oblidada encara no es suportat";
+"login_mobile_device" = "Mòbil";
+"login_tablet_device" = "Tableta";
+"login_desktop_device" = "Escriptori";
+// Action
+"no" = "No";
+"yes" = "Sí";
+"abort" = "Avortar";
+"close" = "Tanca";
+"discard" = "Descarta";
+"dismiss" = "Omet";
+"sign_up" = "Registre";
+"submit" = "Presentar";
+"submit_code" = "Presentar codi";
+"set_default_power_level" = "Restablir el nivell de potència";
+"set_moderator" = "Establir el Moderador";
+"set_admin" = "Establir l'Administrador";
+"start_chat" = "Iniciar xat";
+"start_voice_call" = "Iniciar trucada de veu";
+"start_video_call" = "Iniciar vídeo trucada";
+"mention" = "Mencionar";
+"select_account" = "Selecciona un compte";
+"attach_media" = "Adjunta mitjans de la biblioteca";
+"capture_media" = "Fes una foto o un vídeo";
+"invite_user" = "Convida usuari Matrix";
+"reset_to_default" = "Estableix per defecte";
+"resend_message" = "Reenvia el missatge";
+"select_all" = "Selecciona-ho tot";
+"cancel_upload" = "Cancel·la la pujada";
+"cancel_download" = "Cancel·la la descàrrega";
+"show_details" = "Mostra els detalls";
+"answer_call" = "Respon la trucada";
+"reject_call" = "Rebutja la trucada";
+"end_call" = "Penja";
+"ignore" = "Ignora";
+"unignore" = "Deixa de ignorar";
+// Events formatter
+"notice_avatar_changed_too" = "(també s'ha canviat l'avatar)";
+"notice_room_name_removed" = "%@ ha eliminat el nom de la sala";
+"notice_room_topic_removed" = "%@ ha eliminat el tema";
+"notice_event_redacted" = "<redactat%@>";
+"notice_event_redacted_by" = " per %@";
+"notice_event_redacted_reason" = " [motiu: %@]";
+"notice_profile_change_redacted" = "%@ ha actualitzat el seu perfil %@";
+"notice_room_created" = "%@ ha creat la sala";
+"notice_room_join_rule" = "La norma per entrar és: %@";
+"notice_room_power_level_intro" = "El nivell de potència dels participants és:";
+"notice_room_power_level_acting_requirement" = "Els nivells de potència mínims que un usuari ha de tenir abans d'actuar són:";
+"notice_room_power_level_event_requirement" = "Els nivells mínims de potència relacionats als esdeveniments són:";
+"notice_room_aliases" = "Els àlies de la sala són: %@";
+"notice_room_related_groups" = "Els grups associats amb aquesta sala són: %@";
+"notice_encrypted_message" = "Missatge xifrat";
+"notice_encryption_enabled" = "%@ ha activat el xifrat punt a punt (algoritme %@)";
+"notice_image_attachment" = "adjunt d'imatge";
+"notice_audio_attachment" = "adjunt d'àudio";
+"notice_video_attachment" = "adjunt de vídeo";
+"notice_location_attachment" = "adjunt de localització";
+"notice_file_attachment" = "adjunt de fitxer";
+"notice_invalid_attachment" = "adjunt invàlid";
+"notice_unsupported_attachment" = "Adjunt no suportat: %@";
+"notice_feedback" = "Esdeveniment de resposta (id: %@): %@";
+"notice_redaction" = "%@ ha redactat un esdeveniment (id: %@)";
+"notice_error_unsupported_event" = "Esdeveniment no suportat";
+"notice_error_unexpected_event" = "Esdeveniment inesperat";
+"notice_error_unknown_event_type" = "Tipus desconegut d'esdeveniment";
+"notice_room_history_visible_to_anyone" = "%@ ha fet visible per qualsevol l'històric futur de la sala.";
+"notice_room_history_visible_to_members" = "%@ ha fet visible per tots els participants l'històric futur de la sala.";
+"notice_room_history_visible_to_members_from_invited_point" = "%@ ha fet visible l'històric futur de la sala per a tots els membres, a partir de que hi són convidats.";
+"notice_room_history_visible_to_members_from_joined_point" = "%@ ha fet visible l'històric futur de la sala a tots els membres, des de que entren a la sala.";
+"notice_crypto_unable_to_decrypt" = "** No es pot desxifrar: %@ **";
+"notice_crypto_error_unknown_inbound_session_id" = "El dispositiu del remitent no ha enviat les claus per aquest missatge.";
+// room display name
+"room_displayname_empty_room" = "Sala buida";
+"room_displayname_two_members" = "%@ i %@";
+"room_displayname_more_than_two_members" = "%@ i %u més";
+// Settings
+"settings" = "Configuració";
+"settings_enable_inapp_notifications" = "Habilitar les notificacions de les App integrades";
+"settings_enable_push_notifications" = "Activar notificacions push";
+"settings_enter_validation_token_for" = "Introduir el codi de validació per %@:";
+"notification_settings_room_rule_title" = "Sala: '%@'";
+// Devices
+"device_details_title" = "Informació del dispositiu\n";
+"device_details_name" = "Nom\n";
+"device_details_identifier" = "ID del dispositiu\n";
+"device_details_last_seen" = "Vist per últim cop\n";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_rename_prompt_message" = "Nom del dispositiu:";
+"device_details_delete_prompt_title" = "Autenticació";
+"device_details_delete_prompt_message" = "Aquesta operació necessita que t'autentiquis.\nPer continuar, introdueix la teva contrasenya.";
+// Encryption information
+"room_event_encryption_info_title" = "Informació del xifrat punt a punt\n\n";
+"room_event_encryption_info_event" = "Informació del esdeveniment\n";
+"room_event_encryption_info_event_user_id" = "ID d'usuari\n";
+"room_event_encryption_info_event_identity_key" = "Clau de la identitat Curve25519\n";
+"room_event_encryption_info_event_fingerprint_key" = "Empremta digital Ed25519 reclamada\n";
+"room_event_encryption_info_event_algorithm" = "Algoritme\n";
+"room_event_encryption_info_event_session_id" = "ID de la sessió\n";
+"room_event_encryption_info_event_decryption_error" = "Error de desxifrat\n";
+"room_event_encryption_info_event_unencrypted" = "no xifrat";
+"room_event_encryption_info_event_none" = "cap";
+"room_event_encryption_info_device" = "\nInformació del dispositiu del remitent\n";
+"room_event_encryption_info_device_unknown" = "dispositiu desconegut\n";
+"room_event_encryption_info_device_name" = "Nom\n";
+"room_event_encryption_info_device_id" = "ID del dispositiu\n";
+"room_event_encryption_info_device_verification" = "Verificació\n";
+"room_event_encryption_info_device_fingerprint" = "Empremta digital Ed25519\n";
+"room_event_encryption_info_device_verified" = "Verificat";
+"room_event_encryption_info_device_not_verified" = "NO verificat";
+"room_event_encryption_info_device_blocked" = "Bloquejat";
+"room_event_encryption_info_verify" = "Verifica...";
+"room_event_encryption_info_unverify" = "No verificar";
+"room_event_encryption_info_block" = "Llista negre";
+"room_event_encryption_info_unblock" = "Desbloquejar";
+"room_event_encryption_verify_title" = "Verifica el dispositiu\n\n";
+"room_event_encryption_verify_message" = "Per a verificar que aquest dispositiu pot ser confiable si us plau contacta el seu propietari per altres mijans (ex. trucant-lo al telèfon) i pregunta-li si la clau que veu a la configuració d'usuari d'aquest dispositiu coincideix amb la clau següent:\n\n\tNom del dispositiu: %@\n\tID del dispositiu: %@\n\tClau del dispositiu: %@\n\nSi coincideix, prem el botó verificar de sota. Si no coincideix es que algú altre està interceptant aquest dispositiu i probablement vols prema el botó de bloquejar a canvi.\n\nEn el futur aquest procés de verificació serà més sofisticat.";
+"room_event_encryption_verify_ok" = "Verifica";
+// Account
+"account_save_changes" = "Desar canvis";
+"account_link_email" = "Vincular correu electrònic";
+"account_linked_emails" = "Correus electrònics vinculats";
+"account_email_validation_title" = "Verificació pendent";
+"account_email_validation_message" = "Revisa el teu correu electrònic i fes clic a l'enllaç que conté. Un cop fet això, fes clic a continua.";
+"account_email_validation_error" = "No ha estat possible verificar l'adreça de correu electrònic. Mira el correu electrònic i fes clic en l'enllaç que conté. Un cop fet això, fes clic per continuar";
+"account_msisdn_validation_title" = "Verificació pendent";
+"account_msisdn_validation_message" = "Hem enviat un SMS amb un codi d'activació. Introdueix aquest codi a continuació.";
+"account_msisdn_validation_error" = "No es pot verificar el número de telèfon.";
+"account_error_display_name_change_failed" = "Ha fallat el canvi del nom a mostrar";
+"account_error_picture_change_failed" = "Ha fallat el canvi de foto";
+"account_error_matrix_session_is_not_opened" = "No està oberta la sessió Matrix";
+"account_error_email_wrong_title" = "Adreça de correu electrònic no valida";
+"account_error_email_wrong_description" = "Aquest no sembla ser un correu electrònic vàlid";
+"account_error_msisdn_wrong_title" = "Número de telèfon invalid";
+"account_error_msisdn_wrong_description" = "Aquest no sembla ser un número de telèfon vàlid";
+// Room creation
+"room_creation_name_title" = "Nom de la sala:";
+"room_creation_name_placeholder" = "(ex. collaesmorzar)";
+"room_creation_alias_title" = "Àlies de sala:";
+"room_creation_alias_placeholder" = "(ex. #foo:exemple.org)";
+"room_creation_alias_placeholder_with_homeserver" = "(ex. #foo%@)";
+"room_creation_participants_title" = "Participants:";
+"room_creation_participants_placeholder" = "(ex. @jordi:servidorhoste1; @juan:servidorhoste2...)";
+// Room
+"room_please_select" = "Si us plau tria una sala";
+"room_error_join_failed_title" = "No s'ha pogut entrar a la sala";
+"room_error_join_failed_empty_room" = "Actualment no es pot tornar a entrar a una sala buida.";
+"room_error_name_edition_not_authorized" = "No tens permís per editar el nom d'aquesta sala";
+"room_error_topic_edition_not_authorized" = "No tens permís per editar el tema d'aquesta sala";
+"room_error_cannot_load_timeline" = "No s'ha pogut carregar la línia de temps";
+"room_error_timeline_event_not_found_title" = "No s'ha pogut carregar la posició de la línia de temps";
+"room_error_timeline_event_not_found" = "Aquesta aplicació estava intentant carregar un punt especific en la línia de temps d'aquesta sala però no l'ha trobat";
+"room_left" = "Has sortit de la sala";
+"room_no_power_to_create_conference_call" = "Necessites permís per a convidar a iniciar una conferència en aquesta sala";
+"room_no_conference_call_in_encrypted_rooms" = "No es poden fer conferències en sales xifrades";
+// Room members
+"room_member_ignore_prompt" = "Estàs segur que vols amagar tots els missatges d'aquest usuari?";
+"room_member_power_level_prompt" = "Si puges aquest usuari al mateix nivell de poder que el teu després no podràs desfer el canvi.\nEstàs segur?";
+// Attachment
+"attachment_size_prompt" = "Ho vols enviar com a:";
+"attachment_original" = "Mida actual: %@";
+"attachment_small" = "Petit: %@";
+"attachment_medium" = "Mitjà: %@";
+"attachment_large" = "Gran: %@";
+"attachment_cancel_download" = "Cancel·lar la descàrrega?";
+"attachment_cancel_upload" = "Cancel·lar la pujada?";
+"attachment_multiselection_size_prompt" = "Vols enviar imatges com a:";
+"attachment_multiselection_original" = "Mida actual";
+"attachment_e2e_keys_file_prompt" = "Aquest fitxer conté claus xifrades exportades des d'un client Matrix.\nVols veure el contingut del fitxer o importar les claus que conté?";
+"attachment_e2e_keys_import" = "Importa...";
+// Contacts
+"contact_mx_users" = "Usuaris de Matrix";
+"contact_local_contacts" = "Contactes locals";
+// Groups
+"group_invite_section" = "Convits";
+"group_section" = "Grups";
+// Search
+"search_no_results" = "Sense resultats";
+"search_searching" = "Cercant...";
+// Time
+"format_time_s" = "s";
+"format_time_m" = "m";
+"format_time_h" = "h";
+"format_time_d" = "d";
+// E2E import
+"e2e_import_room_keys" = "Importa les claus de la sala";
+"e2e_import_prompt" = "Aquest procés et pemet importar les claus de xifratge que previament has exportat des de un altre client Matrix. Després podràs desxifrar qualsevol missatge que l'altre client pugui xifrar.\nEl fitxer exportat està protegit amb una contrasenya. Hauries de introduir la contrasenya aquí per desxifrar-l'ho.";
+"e2e_import" = "Importa";
+"e2e_passphrase_enter" = "Introduir contrasenya";
+// E2E export
+"e2e_export_room_keys" = "Exporta les claus E2E de la sala";
+"e2e_export_prompt" = "Aquest procés et permet exportar a un fitxer local les claus dels missatges que has rebut de sales xifrades. A continuació, podràs importar el fitxer a un altre client Matrix en el futur, de manera que aquest client també podrà desxifrar aquests missatges.\nEl fitxer exportat permetrà que qualsevol que pugui llegir-lo per desxifrar qualsevol dels missatges xifrats que tu pots veure, així que has de tenir cura de mantenir-lo segur.";
+"e2e_export" = "Exporta les claus E2E";
+"e2e_passphrase_confirm" = "Confirma la contrasenya";
+"e2e_passphrase_empty" = "La contrasenya no ha de estar buida";
+"e2e_passphrase_not_match" = "Les contrasenyes han de coincidir";
+// Others
+"user_id_title" = "ID d'usuari:";
+"offline" = "fora de línia";
+"unsent" = "No enviats";
+"error" = "Error";
+"not_supported_yet" = "Encara no suportat";
+"default" = "per defecte";
+"private" = "Privat";
+"public" = "Públic";
+"power_level" = "Nivell de potència";
+"network_error_not_reachable" = "Si us plau verifica la teva connexió de xarxa";
+"user_id_placeholder" = "ex: @jordi:servidorhoste";
+"ssl_homeserver_url" = "URL del Servidor Hoste:  %@";
+// Permissions
+"camera_access_not_granted_for_call" = "Les vídeo trucades necessiten permís per accedir a la Càmera però %@ no té permís per utilitzar-la";
+"microphone_access_not_granted_for_call" = "Les trucades necessiten accedir al Micròfon però %@ no té permís per utilitzar-lo";
+"local_contacts_access_not_granted" = "El descobriment dels usuaris en els contactes locals requereix l'accés als vostres contactes, però %@ no té permís per utilitzar-lo";
+"local_contacts_access_discovery_warning_title" = "Descobriment d'usuaris";
+"local_contacts_access_discovery_warning" = "%@ vol pujar les adreces de correu i els números de telèfon dels teus Contactes per a poder descobrir usuaris";
+// Country picker
+"country_picker_title" = "Escull un país";
+// Language picker
+"language_picker_title" = "Escull l'idioma";
+"language_picker_default_language" = "Per defecte (%@)";
+"notice_room_invite" = "%@ ha convidat a %@";
+"notice_room_third_party_invite" = "%@ ha enviat una invitació  %@ per entrar a la sala";
+"notice_room_third_party_registered_invite" = "%@ ha acceptat la invitació per a %@";
+"notice_room_join" = "%@ s'ha unit a la sala";
+"notice_room_leave" = "%@ ha marxat";
+"notice_room_reject" = "%@ ha rebutjat la invitació";
+"notice_room_kick" = "%@ ha fet fora a %@";
+"notice_room_unban" = "%@ ha readmès a %@";
+"notice_room_ban" = "%@ ha expulsat a %@";
+"notice_room_withdraw" = "%@ ha anul·lat la invitació de %@";
+"notice_room_reason" = ". Motiu: %@";
+"notice_avatar_url_changed" = "%@ ha canviat el seu avatar";
+"notice_display_name_set" = "%@ ha canviat el seu nom a %@";
+"notice_display_name_changed_from" = "%@ ha canviat el seu nom de %@ a %@";
+"notice_display_name_removed" = "%@ ha eliminat el seu nom visible";
+"notice_topic_changed" = "%@ ha canviat el tema a: %@";
+"notice_room_name_changed" = "%@ ha canviat el nom de la sala a: %@";
+"notice_placed_voice_call" = "%@ ha iniciat una trucada de veu";
+"notice_placed_video_call" = "%@ ha iniciat una vídeo conferència";
+"notice_answered_video_call" = "%@ ha contestat la trucada";
+"notice_ended_video_call" = "%@ ha finalitzat la trucada";
+"notice_conference_call_request" = "%@ ha sol·licitat una conferència VoIP";
+"notice_conference_call_started" = "Conferència VoIP iniciada";
+"notice_conference_call_finished" = "Conferència VoIP finalitzada";
+// button names 
+"ok" = "D'acord";
+"send" = "Envia";
+"copy_button_name" = "Copia";
+"resend" = "Reenvia";
+"redact" = "Elimina";
+"share" = "Comparteix";
+"set_power_level" = "Nivell de potència";
+"delete" = "Esborra";
+// actions 
+"action_logout" = "Tancar sessió";
+"create_room" = "Crear sala";
+"login" = "Iniciar sessió";
+"create_account" = "Crear compte";
+"membership_invite" = "Convidat";
+"membership_leave" = "Ha sortit";
+"membership_ban" = "Expulsat";
+"num_members_one" = "usuari %@";
+"num_members_other" = "Usuaris de %@";
+"kick" = "Fer fora";
+"ban" = "Expulsa";
+"unban" = "Readmetre";
+"message_unsaved_changes" = "Hi ha canvis no desats. Si ho deixes es perdran.";
+// Login Screen 
+"login_error_already_logged_in" = "Ja autenticat";
+"login_error_must_start_http" = "La URL ha de començar per http[s]://";
+// contacts list screen 
+"invitation_message" = "M'agradaría xatejar amb tu amb matrix. Si us plau visita el lloc http://matrix.org per a més informació.";
+// Settings screen 
+"settings_title_config" = "Configuració";
+"settings_title_notifications" = "Notificacions";
+// Notification settings screen 
+"notification_settings_disable_all" = "Desactiva totes les notificacions";
+"notification_settings_enable_notifications" = "Activa les notificacions";
+"notification_settings_enable_notifications_warning" = "Totes les notificacions de tots els dispositius estan actualment desactivades.";
+"notification_settings_global_info" = "Els ajustos de les notificacions son desades en el teu compte i compartides amb tots els clients que les suporten (incloent les notificacions d'escriptori).\n\nLes normes son aplicades en ordre; la primera norma que coincideix defineix el resultat del missatge.\nPer tant: es notificacions per paraula són més importants que les notificacions per sales i aquestes són més importants que les notificacions per remitents.\nPer a diverses normes del mateix tipus, la primera de la llista que coincideix té prioritat.";
+"notification_settings_per_word_notifications" = "Notificacions per paraula";
+"notification_settings_per_word_info" = "Les paraules coincideixen amb el cas de forma insensible i poden incloure un comodí *. Per tant:\nfoo coincideix amb la cadena foo rodejada de delimitadors de paraules (p. ex. puntuació i espai en blanc o inici/final de línia).\nfoo* coincideix amb qualsevol paraula que començi per foo.\n* foo* coincideix amb qualsevol paraula que inclogui les 3 lletres foo.";
+"notification_settings_always_notify" = "Notifica sempre";
+"notification_settings_never_notify" = "Mai notifica";
+"notification_settings_word_to_match" = "paraula coincident";
+"notification_settings_highlight" = "Ressaltat";
+"notification_settings_custom_sound" = "So personaltizat";
+"notification_settings_per_room_notifications" = "Notificacions per sala";
+"notification_settings_per_sender_notifications" = "Notificacions per remitent";
+"notification_settings_sender_hint" = "@usuari:domini.com";
+"notification_settings_select_room" = "Escull una sala";
+"notification_settings_other_alerts" = "Altres avisos";
+"notification_settings_contain_my_user_name" = "Notificar-me amb un so els missatges que continguin el meu nom d'usuari";
+"notification_settings_contain_my_display_name" = "Notificar-me amb un so els missatges que continguin el meu nom visible";
+"notification_settings_just_sent_to_me" = "Notificar-me amb un so els missatges enviats per mi";
+"notification_settings_invite_to_a_new_room" = "Notificar-me quan sigui convidat a una nova sala";
+"notification_settings_people_join_leave_rooms" = "Notificar-me quan algú entri o marxi de les sales";
+"notification_settings_receive_a_call" = "Notificar-me quan rebi una trucada";
+"notification_settings_suppress_from_bots" = "Suprimir les notificacions de robots";
+"notification_settings_by_default" = "Per defecte...";
+"notification_settings_notify_all_other" = "Notifica tots els altres missatges/sales";
+// gcm section 
+"settings_config_home_server" = "Servidor hoste: %@";
+"settings_config_identity_server" = "Servidor d'identitat: %@";
+"settings_config_user_id" = "ID d'usuari: %@";
+// call string
+"call_waiting" = "Esperant...";
+"call_connecting" = "Establint la trucada...";
+"call_ended" = "Trucada finalitzada";
+"call_ring" = "Trucant...";
+"incoming_video_call" = "Vídeo trucada entrant";
+"incoming_voice_call" = "Trucada de veu entrant";
+"call_invite_expired" = "Invitació de trucada ha caducat";
+// unrecognized SSL certificate
+"ssl_trust" = "Confia";
+"ssl_logout_account" = "Tancar sessió";
+"ssl_remain_offline" = "Ignora";
+"ssl_fingerprint_hash" = "Empremta digital (%@):";
+"ssl_could_not_verify" = "No s'ha pogut verificar la identitat del servidor remot.";
+"ssl_cert_not_trust" = "Això pot voler dir que algú està maliciosament interceptant el tràfic o que el teu telèfon no confia en el certificat proporcionat pel servidor remot.";
+"ssl_cert_new_account_expl" = "Si l'administrador del servidor ha dit que això és correcte, assegura't que la següent empremta digital coincideix amb la que t'ha donat.";
+"ssl_unexpected_existing_expl" = "El certificat ha canviat respecte al que el teu telèfon hi havia confiat. Això es MOLT INUSUAL. Es recomana que NO ACCEPTIS aquest nou certificat.";
+"ssl_expected_existing_expl" = "El certificat ha canviat del prèviament confiat a un que no es confiable. El servidor pot haver renovat el certificat. Posa't en contacte amb l'administrador del servidor per obtenir l'empremta digital desitjada.";
+"ssl_only_accept" = "NOMÉS accepteu el certificat si l'administrador del servidor ha publicat una empremta digital que coincideixi amb l'anterior.";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/cy.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/cy.lproj/MatrixKit.strings
new file mode 100644
index 000000000..6bed7d575
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/cy.lproj/MatrixKit.strings
@@ -0,0 +1,383 @@
+"matrix" = "Matrix";
+// Login Screen
+"login_create_account" = "Creu cyfrif:";
+"login_server_url_placeholder" = "URL (e.e. https://matrix.org)";
+"login_home_server_title" = "URL Hafanweinydd:";
+"login_home_server_info" = "Mae'ch hafanweinydd yn cadw'ch holl sgyrsiau a gwybodaeth cyfrif";
+"login_identity_server_title" = "URL Gweinydd Adnabod:";
+"login_identity_server_info" = "Mae Matrix yn darparu gweinyddwyr adnabod i olrhain pa e-byst ac ati sy'n perthyn i IDau Matrix. Dim ond https://matrix.org sy'n bodoli ar hyn o bryd.";
+"login_user_id_placeholder" = "ID Matrix (e.g. @bob:matrix.org neu bob)";
+"login_password_placeholder" = "Cyfrinair";
+"login_optional_field" = "dewisol";
+"login_display_name_placeholder" = "Enw arddangos (e.e. Jac y Jwc)";
+"login_email_info" = "Mae nodi cyfeiriad e-bost yn caniatáu i ddefnyddwyr eraill ddod o hyd i chi ar Matrix yn haws, a bydd yn rhoi ffordd i chi ailosod eich cyfrinair yn y dyfodol.";
+"login_email_placeholder" = "Cyfeiriad E-bost";
+"login_prompt_email_token" = "Rhowch eich tocyn gwirio e-bost:";
+"login_error_title" = "Methwyd Mewngofnodi";
+"login_error_no_login_flow" = "Methom ni â chasglu gwybodaeth gwirio gan y Hafanweinydd hwn";
+"login_error_do_not_support_login_flows" = "Ar hyn o bryd nid ydym yn cefnogi unrhyw lif mewngofnodi, neu'rrhan ohono, a ddiffinnir gan y Hafanweinydd hwn";
+"login_error_registration_is_not_supported" = "Ni chefnogir cofrestru ar hyn o bryd";
+"login_error_forbidden" = "Enw defnyddiwr/cyfrinair annilys";
+"login_error_unknown_token" = "Ni chydnabuwyd y tocyn mynediad a nodwyd";
+"login_error_bad_json" = "JSON camffurfiedig";
+"login_error_not_json" = "Nid oedd yn cynnwys JSON dilys";
+"login_error_limit_exceeded" = "Mae gormod o geisiadau wedi'u hanfon";
+"login_error_user_in_use" = "Defnyddir yr enw defnyddiwr hwn eisoes";
+"login_error_login_email_not_yet" = "Nid yw'r ddolen e-bost wedi'i chlicio eto";
+"login_use_fallback" = "Defnyddiwch dudalen wrth gefn";
+"login_leave_fallback" = "Canslo";
+"login_invalid_param" = "Paramadr Annilys";
+"register_error_title" = "Methwyd Cofrestri";
+"login_error_forgot_password_is_not_supported" = "Ni chefnogir cyfrinair anghofedig ar hyn o bryd";
+"login_mobile_device" = "Ffôn Symudol";
+"login_tablet_device" = "Llechen";
+"login_desktop_device" = "Cyfrifiadur";
+"login_error_resource_limit_exceeded_title" = "Ty hwnt i'r Terfyn Adnoddau";
+"login_error_resource_limit_exceeded_message_default" = "Mae'r hafanweinydd hwn wedi rhagori ar un o'i derfynau adnoddau.";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "Mae'r hafanweinydd hwn wedi cyrraedd ei derfyn Defnyddiwr Gweithredol Misol.";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nCysylltwch â'ch gweinyddwr gwasanaeth i barhau i ddefnyddio'r gwasanaeth hwn.";
+"login_error_resource_limit_exceeded_contact_button" = "Cysylltu â Gweinyddwr";
+// Action
+"no" = "Na";
+"yes" = "Ie";
+"abort" = "Cefnu";
+"back" = "Yn ôl";
+"close" = "Cau";
+"continue" = "Parhau";
+"discard" = "Taflu";
+"dismiss" = "Wfftio";
+"retry" = "Ailgynnig";
+"sign_up" = "Cofrestri";
+"submit" = "Anfon";
+"submit_code" = "Anfon côd";
+"set_power_level" = "Gosod Lefel Pŵer";
+"set_default_power_level" = "Ail-osod Lefel Pŵer";
+"set_moderator" = "Gosod Cymredolwr";
+"set_admin" = "Gosod Gweinyddwr";
+"start_chat" = "Dechrau Sgwrs";
+"start_voice_call" = "Dechrau Galwad Llais";
+"start_video_call" = "Dechrau Galwad Fideo";
+"mention" = "Crybwyll";
+"select_account" = "Dewis cyfrif";
+"attach_media" = "Ategu Cyfryngau o'r Llyfrgell";
+"capture_media" = "Tynnu Llun/Fideo";
+"invite_user" = "Gwahodd Defnyddiwr Matrix";
+"reset_to_default" = "Ailosod i'r diofyn";
+"resend_message" = "Ail-anfon y neges";
+"select_all" = "Dewis y cyfan";
+"cancel_upload" = "Canslo Uwchlwytho";
+"cancel_download" = "Canslo Lawrlwytho";
+"show_details" = "Dangos Manylion";
+"answer_call" = "Ateb Galwad";
+"reject_call" = "Gwrthod Galwad";
+"end_call" = "Gorffen Galwad";
+"ignore" = "Anwybyddu";
+"unignore" = "Dad-anwybyddu";
+// Events formatter
+"notice_avatar_changed_too" = "(newidiwyd rhithffurf hefyd)";
+"notice_room_name_removed" = "Tynnodd %@ enw'r ystafell";
+"notice_room_topic_removed" = "Fe wnaeth %@ ddileu'r pwnc";
+"notice_event_redacted" = "<golygwyd%@>";
+"notice_event_redacted_by" = " gan %@";
+"notice_event_redacted_reason" = " [rheswm: %@]";
+"notice_profile_change_redacted" = "Diweddarodd %@ eu proffil %@";
+"notice_room_created" = "Creodd %@ yr ystafell";
+"notice_room_join_rule" = "Y rheol ymuno yw: %@";
+"notice_room_power_level_intro" = "Lefel pŵer aelodau'r ystafell yw:";
+"notice_room_power_level_acting_requirement" = "Y lefelau pŵer lleiaf y mae'n rhaid i ddefnyddiwr eu cael cyn gweithredu yw:";
+"notice_room_power_level_event_requirement" = "Isafswm y lefelau pŵer sy'n gysylltiedig â digwyddiadau yw:";
+"notice_room_aliases" = "Arallenwau'r ystafell yw: %@";
+"notice_room_related_groups" = "Y grwpiau sy'n gysylltiedig â'r ystafell hon yw: %@";
+"notice_encrypted_message" = "Neges amgryptiedig";
+"notice_encryption_enabled" = "Trodd %@ ar amgryptio o'r dechrau i'r diwedd (algorithm %@)";
+"notice_image_attachment" = "atodiad llun";
+"notice_audio_attachment" = "atodiad sain";
+"notice_video_attachment" = "atodiad fideo";
+"notice_location_attachment" = "atodiad lleoliad";
+"notice_file_attachment" = "atodiad ffeil";
+"notice_invalid_attachment" = "atodiad annilys";
+"notice_unsupported_attachment" = "Atodiad heb gefnogaeth: %@";
+"notice_feedback" = "Digwyddiad adborth (id: %@): %@";
+"notice_redaction" = "Golygodd %@ ddigwyddiad (id: %@)";
+"notice_error_unsupported_event" = "Digwyddiad heb gefnogaeth";
+"notice_error_unexpected_event" = "Digwyddiad annisgwyl";
+"notice_error_unknown_event_type" = "Math digwyddiad anhysbys";
+"notice_room_history_visible_to_anyone" = "Gwnaeth %@ hanes ystafell y dyfodol yn weladwy i unrhyw un.";
+"notice_room_history_visible_to_members" = "Gwnaeth %@ hanes ystafell y dyfodol yn weladwy i holl aelodau'r ystafell.";
+"notice_room_history_visible_to_members_from_invited_point" = "Gwnaeth %@ hanes ystafell y dyfodol yn weladwy i holl aelodau'r ystafell, o'r pwynt y cawsant eu gwahodd.";
+"notice_room_history_visible_to_members_from_joined_point" = "Gwnaeth %@ hanes ystafell y dyfodol yn weladwy i holl aelodau'r ystafell, o'r pwynt yr ymunon nhw ag ef.";
+"notice_crypto_unable_to_decrypt" = "** Methu dadgryptio: %@ **";
+"notice_crypto_error_unknown_inbound_session_id" = "Nid yw sesiwn yr anfonwr wedi anfon yr allweddi ar gyfer y neges hon atom.";
+"notice_sticker" = "sticer";
+"notice_in_reply_to" = "Mewn ateb i";
+// room display name
+"room_displayname_empty_room" = "Ystafell gwag";
+"room_displayname_two_members" = "%@ a %@";
+"room_displayname_more_than_two_members" = "%@ a %@ eraill";
+// Settings
+"settings" = "Gosodiadau";
+"settings_enable_inapp_notifications" = "Galluogi hysbysiadau Mewn-App";
+"settings_enable_push_notifications" = "Galluogi gwth-hysbysiadau";
+"settings_enter_validation_token_for" = "Rhowch docyn dilysu ar gyfer %@:";
+"notification_settings_room_rule_title" = "Ystafell: '%@'";
+// Devices
+"device_details_title" = "Gwybodaeth sesiwn\n";
+"device_details_name" = "Enw Cyhoeddus\n";
+"device_details_identifier" = "ID\n";
+"device_details_last_seen" = "Gwelwyd ddiweddaf\n";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_rename_prompt_title" = "Enw Sesiwn";
+"device_details_rename_prompt_message" = "Mae enw cyhoeddus sessiwn yn weladwy i'r bobl rydych chi'n cyfathrebu â nhw";
+"device_details_delete_prompt_title" = "Dilysu";
+"device_details_delete_prompt_message" = "Mae angen dilysu ychwanegol ar gyfer y gweithgaredd hon.\nI barhau, nodwch eich cyfrinair.";
+// Encryption information
+"room_event_encryption_info_title" = "Gwybodaeth amgryptio dechrau i'r diwedd\n\n";
+"room_event_encryption_info_event" = "Gwybodaeth digwyddiad\n";
+"room_event_encryption_info_event_user_id" = "ID Defnyddiwr\n";
+"room_event_encryption_info_event_identity_key" = "Allwedd adnabod Curve25519\n";
+"room_event_encryption_info_event_fingerprint_key" = "Allwedd llofnod Ed25519 â hawliedig\n";
+"room_event_encryption_info_event_algorithm" = "Algorithm\n";
+"room_event_encryption_info_event_session_id" = "ID Sesiwn\n";
+"room_event_encryption_info_event_decryption_error" = "Gwall Dadgryptio\n";
+"room_event_encryption_info_event_unencrypted" = "digryptiedig";
+"room_event_encryption_info_event_none" = "dim";
+"room_event_encryption_info_device" = "\nGwybodaeth am sesiwn yr anfonwr\n";
+"room_event_encryption_info_device_unknown" = "sesiwn anhysbys\n";
+"room_event_encryption_info_device_name" = "Enw Cyhoeddus\n";
+"room_event_encryption_info_device_id" = "ID\n";
+"room_event_encryption_info_device_verification" = "Gwirio\n";
+"room_event_encryption_info_device_fingerprint" = "Llofnod Ed25519\n";
+"room_event_encryption_info_device_verified" = "Wedi Gwirio";
+"room_event_encryption_info_device_not_verified" = "HEB ei wirio";
+"room_event_encryption_info_device_blocked" = "Gwaharddiedig";
+"room_event_encryption_info_verify" = "Gwirio…";
+"room_event_encryption_info_unverify" = "Dad-wirio";
+"room_event_encryption_info_block" = "Gwahardd";
+"room_event_encryption_info_unblock" = "Dad-wahardd";
+"room_event_encryption_verify_title" = "Gwirio sesiwn\n\n";
+"room_event_encryption_verify_message" = "I wirio y gellir ymddiried yn y sesiwn hon, cysylltwch â'i pherchennog gan ddefnyddio rhyw fodd arall (e.e. yn bersonol neu alwad ffôn) a gofynnwch iddynt a yw'r allwedd a welant yn eu Gosodiadau Defnyddiwr ar gyfer y sesiwn hon yn cyfateb i'r allwedd isod:\n\nEnw'r sesiwn: %@\nID y sesiwn: %@\nAllwedd y sesiwn: %@\n\nOs yw'n cyd-fynd, pwyswch y botwm gwirio isod. Os nad yw'n gwneud hynny, yna mae rhywun arall yn rhyng-gipio'r sesiwn hon ac mae'n debyg eich y dylech wasgu'r botwm gwahardd yn lle.\n\nYn y dyfodol bydd y broses gwirio hon yn fwy soffistigedig.";
+"room_event_encryption_verify_ok" = "Gwirio";
+// Account
+"account_save_changes" = "Cadw newidiadau";
+"account_link_email" = "Dolen E-bost";
+"account_linked_emails" = "E-byst cysylltiedig";
+"account_email_validation_title" = "Aros am wirio";
+"account_email_validation_message" = "Gwiriwch eich e-bost a chliciwch ar y ddolen sydd ynddo. Ar ôl gwneud hyn, cliciwch parhau.";
+"account_email_validation_error" = "Methu gwirio cyfeiriad e-bost. Gwiriwch eich e-bost a chliciwch ar y ddolen sydd ynddo. Ar ôl gwneud hyn, cliciwch parhau";
+"account_msisdn_validation_title" = "Aros am wirio";
+"account_msisdn_validation_message" = "Rydyn ni wedi anfon neges testyn gyda chod actifadu. Rhowch y cod hwn isod.";
+"account_msisdn_validation_error" = "Methu gwirio rhif ffôn.";
+"account_error_display_name_change_failed" = "Methwyd newid enw arddangos";
+"account_error_picture_change_failed" = "Methwyd newid llun";
+"account_error_matrix_session_is_not_opened" = "Nid yw 'r sesiwn Matrix yn agored";
+"account_error_email_wrong_title" = "Cyfeiriad E-bost Annilys";
+"account_error_email_wrong_description" = "Nid yw hwn yn edrych fel cyfeiriad e-bost dilys";
+"account_error_msisdn_wrong_title" = "Rhif Ffôn Annilys";
+"account_error_msisdn_wrong_description" = "Nid yw hwn yn edrych fel rhif ffôn dilys";
+"account_error_push_not_allowed" = "Ni chaniateir hysbysiadau";
+// Room creation
+"room_creation_name_title" = "Enw ystafell:";
+"room_creation_name_placeholder" = "(e.e. criwCinio)";
+"room_creation_alias_title" = "Arallenw ystafell:";
+"room_creation_alias_placeholder" = "(e.e. #foo:example.org)";
+"room_creation_alias_placeholder_with_homeserver" = "(e.e. #foo%@)";
+"room_creation_participants_title" = "Cyfranogwyr:";
+"room_creation_participants_placeholder" = "(e.e. @daf:hafanweinydd1; @gwil:hafanweinydd2...)";
+// Room
+"room_please_select" = "Dewisiwch ystafell";
+"room_error_join_failed_title" = "Methwyd ymuno â'r ystafell";
+"room_error_join_failed_empty_room" = "Ar hyn o bryd nid yw'n bosibl ail-ymuno ag ystafell wag.";
+"room_error_name_edition_not_authorized" = "Nid oes gennych awdurdod i olygu enw'r ystafell hon";
+"room_error_topic_edition_not_authorized" = "Nid oes gennych awdurdod i olygu pwnc yr ystafell hon";
+"room_error_cannot_load_timeline" = "Methwyd llwytho llinell amser";
+"room_error_timeline_event_not_found_title" = "Methwyd llwytho safle llinell amser";
+"room_error_timeline_event_not_found" = "Roedd y rhaglen yn ceisio llwytho pwynt penodol yn llinell amser yr ystafell hon ond nid oedd yn gallu dod o hyd iddo";
+"room_left" = "Gadawsoch yr ystafell";
+"room_no_power_to_create_conference_call" = "Mae angen caniatâd arnoch i wahodd i ddechrau cynhadledd yn yr ystafell hon";
+"room_no_conference_call_in_encrypted_rooms" = "Ni chefnogir galwadau cynhadledd mewn ystafelloedd wedi'u hamgryptio";
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "anfonwyd llun.";
+"message_reply_to_sender_sent_a_video" = "anfonwyd fideo.";
+"message_reply_to_sender_sent_an_audio_file" = "anfonwyd ffeil sain.";
+"message_reply_to_sender_sent_a_file" = "anfonwyd ffeil.";
+"message_reply_to_message_to_reply_to_prefix" = "Mewn ateb i";
+// Room members
+"room_member_ignore_prompt" = "Ydych chi'n siŵr eich bod chi eisiau cuddio pob neges oddi wrth y defnyddiwr hwn?";
+"room_member_power_level_prompt" = "Ni fyddwch yn gallu dadwneud y newid hwn gan eich bod yn hyrwyddo'r defnyddiwr i gael yr un lefel pŵer â chi'ch hun.\nYdych chi'n siwr?";
+// Attachment
+"attachment_size_prompt" = "Ydych chi am anfon fel:";
+"attachment_original" = "Maint Gwirioneddol: %@";
+"attachment_small" = "Bach: %@";
+"attachment_medium" = "Canolig: %@";
+"attachment_large" = "Mawr: %@";
+"attachment_cancel_download" = "Canslo y lawrlwythiad?";
+"attachment_cancel_upload" = "Canslo yr uwchlwythiad?";
+"attachment_multiselection_size_prompt" = "Hoffech chi anfon llun fel:";
+"attachment_multiselection_original" = "Maint Gwirioneddol";
+"attachment_e2e_keys_file_prompt" = "Mae'r ffeil hon yn cynnwys allweddi amgryptio a allfudwyd o gleient Matrix.\nYdych chi eisiau gweld cynnwys y ffeil neu fewnfudo'r allweddi sydd ynddo?";
+"attachment_e2e_keys_import" = "Mewnfudo...";
+// Contacts
+"contact_mx_users" = "Defnyddwyr Matrix";
+"contact_local_contacts" = "Cysylltiadau Lleol";
+// Groups
+"group_invite_section" = "Gwahoddiadau";
+"group_section" = "Grwpiau";
+// Search
+"search_no_results" = "Dum Canluniadau";
+"search_searching" = "Chwilio ar y gweill...";
+// Time
+"format_time_s" = "e";
+"format_time_m" = "m";
+"format_time_h" = "a";
+"format_time_d" = "d";
+// E2E import
+"e2e_import_room_keys" = "Mewnfudo allweddi ystafell";
+"e2e_import_prompt" = "Mae'r broses hon yn caniatáu ichi fewnfudo allweddi amgryptio yr oeddech wedi'u hallfudo o'r blaen o gleient Matrix arall. Yna byddwch yn gallu dadgryptio unrhyw negeseuon y gallai'r cleient arall eu dadgryptio.\nMae'r ffeil allfudo wedi'i gwarchod gyda chyfrinair. Dylech nodi'r cyfrinair yma, i ddadgryptio'r ffeil.";
+"e2e_import" = "Mewnfudo";
+"e2e_passphrase_enter" = "Rhowch cyfrinair";
+// E2E export
+"e2e_export_room_keys" = "Allfudo allweddi ystafell";
+"e2e_export_prompt" = "Mae'r broses hon yn caniatáu ichi allfudo  i ffeil leol yr allweddi ar gyfer negeseuon rydych wedi'u derbyn mewn ystafelloedd amgryptiedig. Yna byddwch chi'n gallu mewnfudo'r ffeil i gleient Matrix arall yn y dyfodol, fel y bydd y cleient hwnnw hefyd yn gallu dadgryptio'r negeseuon hyn.\nBydd y ffeil a allfudir yn caniatáu i unrhyw un sy'n gallu ei darllen ddadgryptio unrhyw negeseuon amgryptiedig y gallwch eu gweld, felly dylech fod yn ofalus i'w cadw'n ddiogel.";
+"e2e_export" = "Allfudo";
+"e2e_passphrase_confirm" = "Cadarnhau cyfrinair";
+"e2e_passphrase_empty" = "Ni chaniateir cyfrinair gwag";
+"e2e_passphrase_not_match" = "Rhaid i'r cyfrineiriau gyfateb";
+"e2e_passphrase_create" = "Creu cyfrinair";
+// Others
+"user_id_title" = "ID Defnyddiwr:";
+"offline" = "all-lein";
+"unsent" = "Heb eu danfon";
+"error" = "Gwall";
+"error_common_message" = "Digwyddodd gwall. Rhowch gynning eto nes ymlaen.";
+"not_supported_yet" = "Heb ei gefnogi eto";
+"default" = "diofyn";
+"private" = "Preifat";
+"public" = "Cyhoeddus";
+"power_level" = "Lefel Pŵer";
+"network_error_not_reachable" = "Gwiriwch eich cysylltedd rhwydwaith";
+"user_id_placeholder" = "eng: @gwil:hafanweinydd";
+"ssl_homeserver_url" = "URL Hafanweinydd: %@";
+// Permissions
+"camera_access_not_granted_for_call" = "Mae galwadau fideo angen mynediad i'r Camera ond nid oes gan %@ ganiatâd i'w ddefnyddio";
+"microphone_access_not_granted_for_call" = "Mae galwadau fideo angen mynediad i'r Meicroffon ond nid oes gan %@ ganiatâd i'w ddefnyddio";
+"local_contacts_access_not_granted" = "Mae darganfyddiad defnyddwyr o gysylltiadau lleol angen mynediad i'ch cysylltiadau ond nid oes gan %@ ganiatâd i'w ddefnyddio";
+"local_contacts_access_discovery_warning_title" = "Darganfod defnyddwyr";
+"local_contacts_access_discovery_warning" = "I ddarganfod cysylltiadau sydd eisoes yn defnyddio Matrix, gall %@ anfon cyfeiriadau e-bost a rhifau ffôn yn eich llyfr cyfeiriadau at y gweinydd adnabod Matrix o'ch dewis. Pan gânt eu cefnogi, mae data personol yn cael ei amgodio cyn ei anfon - gwiriwch bolisi preifatrwydd eich gweinydd adnabod i gael mwy o fanylion.";
+// Country picker
+"country_picker_title" = "Dewiswch wlad";
+// Language picker
+"language_picker_title" = "Dewiswch iaith";
+"language_picker_default_language" = "Diofyn (%@)";
+"notice_room_invite" = "Mae %@ wedi gwahodd %@";
+"notice_room_third_party_invite" = "Anfonodd %@ wahoddiad i %@ i ymuno â'r ystafell";
+"notice_room_third_party_registered_invite" = "Derbyniodd %@ y gwahoddiad am %@";
+"notice_room_third_party_revoked_invite" = "Tynnodd %@ y gwahoddiad i %@ ymuno â'r ystafell";
+"notice_room_join" = "Ymunodd %@";
+"notice_room_leave" = "Gadawodd %@";
+"notice_room_reject" = "Gwrthododd %@ y gwahoddiad";
+"notice_room_kick" = "Ciciodd %@ %@";
+"notice_room_unban" = "Dad-waharddodd %@ %@";
+"notice_room_ban" = "Gwaharddod %@ %@";
+"notice_room_withdraw" = "Tynnodd %@ wahoddiad %@ yn ôl";
+"notice_room_reason" = ". Rheswm: %@";
+"notice_avatar_url_changed" = "Newidiodd %@ eu rhithffurf";
+"notice_display_name_set" = "Gosododd %@ eu henw arddangos i %@";
+"notice_display_name_changed_from" = "Newidiodd %@ eu henw arddangos o %@ i %@";
+"notice_display_name_removed" = "Tynnodd %@ eu henw arddangos";
+"notice_topic_changed" = "Newidiodd %@ y pwnc i: %@";
+"notice_room_name_changed" = "Newidiodd %@ enw'r ystafell i: %@";
+"notice_placed_voice_call" = "Gosododd %@ alwad llais";
+"notice_placed_video_call" = "Gosododd %@ alwad fideo";
+"notice_answered_video_call" = "Atebodd %@ y galwad";
+"notice_ended_video_call" = "Gorffenodd %@ y galwad";
+"notice_conference_call_request" = "Gofynnodd %@ am gynhadledd VoIP";
+"notice_conference_call_started" = "Dechreuwyd cynhadledd VoIP";
+"notice_conference_call_finished" = "Gorffenwyd cynhadledd VoIP";
+// button names 
+"ok" = "Iawn";
+"cancel" = "Canslo";
+"save" = "Cadw";
+"leave" = "Gadael";
+"send" = "Anfon";
+"copy_button_name" = "Copi";
+"resend" = "Ail-anfon";
+"redact" = "Tynnu";
+"share" = "Rhannu";
+"delete" = "Dileu";
+"view" = "Gweld";
+// actions 
+"action_logout" = "Allgofnodi";
+"create_room" = "Creu Ystafell";
+"login" = "Mewngofnodi";
+"create_account" = "Creu Cyfrif";
+"membership_invite" = "Gwahoddwyd";
+"membership_leave" = "Gadawodd";
+"membership_ban" = "Gwaharddedig";
+"num_members_one" = "%@ defnyddiwr";
+"num_members_other" = "%@ defnyddiwr";
+"invite" = "Gwahodd";
+"kick" = "Cic";
+"ban" = "Gwahardd";
+"unban" = "Dad-wahardd";
+"message_unsaved_changes" = "Mae yna newidiadau heb eu cadw. Bydd gadael yn golygu eu colli.";
+// Login Screen 
+"login_error_already_logged_in" = "Wedi mewngofnodi eisoes";
+"login_error_must_start_http" = "Rhaid i URL ddechrau â http[s]://";
+// room details dialog screen
+"room_details_title" = "Manylion Ystafell";
+// contacts list screen 
+"invitation_message" = "Hoffwn sgwrsio â chi gyda Matrix. Os gwelwch yn dda, ewch i'r wefan https://matrix.org i gael mwy o wybodaeth.";
+// Settings screen 
+"settings_title_config" = "Gosodiadau";
+"settings_title_notifications" = "Hysbysebiadau";
+// Notification settings screen 
+"notification_settings_disable_all" = "Analluogi pob hysbysiad";
+"notification_settings_enable_notifications" = "Galluogi hysbysiadau";
+"notification_settings_enable_notifications_warning" = "Ar hyn o bryd mae pob hysbysiad wedi eu hanalluogi ar gyfer pob dyfais.";
+"notification_settings_global_info" = "Mae gosodiadau hysbysiadau yn cael eu cadw i'ch cyfrif defnyddiwr ac yn cael eu rhannu rhwng yr holl gleientiaid sy'n eu cefnogi (gan gynnwys hysbysiadau cyfrifiadur).\n\nCymhwysir rheolau mewn trefn; mae'r rheol gyntaf sy'n cyfateb yn diffinio canlyniad y neges.\nFelly: Mae hysbysiadau fesul gair yn bwysicach na hysbysiadau fesul ystafell sy'n bwysicach na hysbysiadau fesul anfonwr.\nAr gyfer rheolau lluosog o'r un math, mae'r un gyntaf yn y rhestr sy'n cyfateb yn cael blaenoriaeth.";
+"notification_settings_per_word_notifications" = "Hysbysiadau fesul gair";
+"notification_settings_per_word_info" = "Mae geiriau'n cyfateb priflythrennau a rhai bach, a gallant gynnwys * cerdyn gwyllt. Felly:\nmae foo yn cyd-fynd â'r testyn foo wedi'i amgylchynu gan amffinyddion geiriau (e.e. atalnodi a gofod gwyn neu ddechrau / diwedd llinell).\nmae foo* yn cyfateb i unrhyw air o'r fath sy'n dechrau foo.\nmae *foo* yn cyfateb i unrhyw air o'r fath sy'n cynnwys y 3 llythyren foo.";
+"notification_settings_always_notify" = "Rhowch wybod bob amser";
+"notification_settings_never_notify" = "Peidiwch byth â hysbysu";
+"notification_settings_word_to_match" = "gair yw gyfateb";
+"notification_settings_highlight" = "Amlygiad";
+"notification_settings_custom_sound" = "Sain addasol";
+"notification_settings_per_room_notifications" = "Hysbysiadau fesul ystafell";
+"notification_settings_per_sender_notifications" = "Hysbysiadau fesul anfonwr";
+"notification_settings_sender_hint" = "@defnyddiwr:parth.com";
+"notification_settings_select_room" = "Dewisiwch ystafell";
+"notification_settings_other_alerts" = "Rhybuddion Eraill";
+"notification_settings_contain_my_user_name" = "Rhowch wybod i mi gyda sain am negeseuon sy'n cynnwys fy enw defnyddiwr";
+"notification_settings_contain_my_display_name" = "Rhowch wybod i mi gyda sain am negeseuon sy'n cynnwys fy enw arddangos";
+"notification_settings_just_sent_to_me" = "Rhowch wybod i mi gyda sain am negeseuon â anfonwyd ataf yn unig";
+"notification_settings_invite_to_a_new_room" = "Rhowch wybod i mi pan gaf wahoddiad i ystafell newydd";
+"notification_settings_people_join_leave_rooms" = "Rhowch wybod i mi pan fydd pobl yn ymuno neu'n gadael ystafelloedd";
+"notification_settings_receive_a_call" = "Rhowch wybod i mi pan fyddaf yn derbyn galwad";
+"notification_settings_suppress_from_bots" = "Atal hysbysiadau o botiau";
+"notification_settings_by_default" = "Yn ddiofyn...";
+"notification_settings_notify_all_other" = "Hysbysu am yr holl negeseuon / ystafelloedd eraill";
+// gcm section 
+"settings_config_home_server" = "Hafanweinydd: %@";
+"settings_config_identity_server" = "Gweinydd adnabod: %@";
+"settings_config_user_id" = "ID Defnyddiwr: %@";
+// call string
+"call_waiting" = "Aros...";
+"call_connecting" = "Cysylltu galwad...";
+"call_ended" = "Gorffenwyd y galwad";
+"call_ring" = "Yn galw...";
+"incoming_video_call" = "Galwad Fideo sy'n dod i mewn";
+"incoming_voice_call" = "Galwad Llais sy'n dod i mewn";
+"call_invite_expired" = "Gwahoddiad Galwad wedi dod i ben";
+// unrecognized SSL certificate
+"ssl_trust" = "Ymddiried";
+"ssl_logout_account" = "Allgofnodi";
+"ssl_remain_offline" = "Anwybyddu";
+"ssl_fingerprint_hash" = "Llofnod (%@):";
+"ssl_could_not_verify" = "Methwyd gwirio gweinyddwr adnabod pell.";
+"ssl_cert_not_trust" = "Gallai hyn olygu bod rhywun yn rhyng-gipio eich traffig yn faleisus, neu nad yw'ch ffôn yn ymddiried yn y dystysgrif a ddarperir gan y gweinydd pell.";
+"ssl_cert_new_account_expl" = "Os yw gweinyddwr y gweinydd wedi dweud bod disgwyl hyn, sicrhewch fod yr llofnod isod yn cyfateb i'r llofnod a ddarperir ganddynt.";
+"ssl_unexpected_existing_expl" = "Mae'r dystysgrif wedi newid o un yr oedd eich ffôn yn ymddiried ynddo. Mae hyn yn ANNISGWYL IAWN. Argymhellir i chi BEIDIO Â DERBYN y dystysgrif newydd hon.";
+"ssl_expected_existing_expl" = "Mae'r dystysgrif wedi newid o un yr ymddiriedwyd ynddo o'r blaen i un nad oes ymddiried ynddo. Efallai bod y gweinydd wedi adnewyddu ei dystysgrif. Cysylltwch â gweinyddwr y gweinydd i gael y llofnod disgwyliedig.";
+"ssl_only_accept" = "Peidiwch a derbyn y dystysgrif ONIBAI bod gweinyddwr y gweinydd wedi cyhoeddi llofnod sy'n cyfateb i'r un uchod.";
+"notice_encryption_enabled_ok" = "Trodd %@ amgryptio o'r dechrau i'r diwedd ymlaen.";
+"notice_encryption_enabled_unknown_algorithm" = "Trodd %@ amgryptio o'r dechrau i'r diwedd ymlaen (algorithm anghydnabyddedig %2$@).";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/da.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/da.lproj/MatrixKit.strings
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/da.lproj/MatrixKit.strings
@@ -0,0 +1 @@
+
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/de.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/de.lproj/MatrixKit.strings
new file mode 100644
index 000000000..fd15a50c4
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/de.lproj/MatrixKit.strings
@@ -0,0 +1,499 @@
+"matrix" = "Matrix";
+// Login Screen
+"login_create_account" = "Konto erstellen:";
+"login_server_url_placeholder" = "URL (z.B. https://matrix.org)";
+"login_home_server_title" = "Heimserver-URL:";
+"login_home_server_info" = "Dein Heimserver speichert alle deine Gespräche und Benutzerkontodaten";
+"login_identity_server_title" = "Identitätsserver-URL:";
+"login_identity_server_info" = "Matrix stellt Identitätsserver bereit, um feststellen zu können, welche E-Mail-Adressen, etc. zu welchen Matrix-IDs gehören. Momentan existiert nur https://vector.im.";
+"login_user_id_placeholder" = "Matrix-ID (z.B. @bob:matrix.org oder bob)";
+"login_password_placeholder" = "Passwort";
+"login_optional_field" = "optional";
+"login_display_name_placeholder" = "Anzeigename (z.B. Peter Pan)";
+"login_email_placeholder" = "E-Mail-Adresse";
+"login_error_title" = "Anmeldung fehlgeschlagen";
+"login_email_info" = "Die Eingabe einer E-Mail-Adresse erleichtert es anderen Benutzern, dich auf Matrix zu finden. Außerdem kannst du mit der hinterlegten E-Mail-Adresse dein Passwort zurücksetzen.";
+"login_prompt_email_token" = "Gib das E-Mail-Validierungstoken ein:";
+"login_error_no_login_flow" = "Die Authentifizierungsinformation von diesem Heimserver konnte nicht abgerufen werden";
+"login_error_do_not_support_login_flows" = "Momentan werden einige oder alle der von diesem Heimserver definierten Authentifizierungspfade nicht unterstützt";
+"login_error_registration_is_not_supported" = "Registrierung wird momentan nicht unterstützt";
+"login_error_forbidden" = "Benutzername oder Passwort ungültig";
+"login_error_unknown_token" = "Das angegebene Zugriffstoken wurde nicht erkannt";
+"login_error_bad_json" = "Deformiertes JSON";
+"login_error_not_json" = "Enthielt kein valides JSON";
+"login_error_limit_exceeded" = "Zu viele Anfragen wurden gesendet";
+"login_error_user_in_use" = "Dieser Benutzername wird bereits verwendet";
+"login_error_login_email_not_yet" = "Der Email-Link wurde noch nicht angeklickt";
+"login_use_fallback" = "Benutze die Ersatzseite";
+"login_leave_fallback" = "Abbrechen";
+"login_invalid_param" = "Ungültiger Parameter";
+"register_error_title" = "Registrierung fehlgeschlagen";
+"login_error_forgot_password_is_not_supported" = "\"Passwort vergessen\" wird momentan nicht unterstützt";
+"login_mobile_device" = "Mobilgerät";
+"login_tablet_device" = "Tablet";
+"login_desktop_device" = "Desktop";
+"login_error_resource_limit_exceeded_title" = "Ressourcengrenzwert überschritten";
+"login_error_resource_limit_exceeded_message_default" = "Dieser Heimserver hat eine seiner Ressourcengrenzwerte überschritten.";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "Dieser Heimserver hat sein Grenzwert an monatlich aktiven Nutzern erreicht.";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nBitte kontaktiere deinen Dienstadministrator um mit der Nutzung dieses Dienstes fortzufahren.";
+"login_error_resource_limit_exceeded_contact_button" = "Kontaktiere Administrator";
+// Action
+"no" = "Nein";
+"yes" = "Ja";
+"abort" = "Abbrechen";
+"back" = "Zurück";
+"close" = "Schließen";
+"continue" = "Fortsetzen";
+"discard" = "Verwerfen";
+"dismiss" = "Ablehnen";
+"retry" = "Wiederholen";
+"sign_up" = "Registrieren";
+"submit" = "Absenden";
+"submit_code" = "Code übermitteln";
+"set_power_level" = "Berechtigungsstufe setzen";
+"set_default_power_level" = "Berechtigungsstufe zurücksetzen";
+"set_moderator" = "Moderator setzen";
+"set_admin" = "Administrator setzen";
+"start_chat" = "Chat starten";
+"start_voice_call" = "Sprachanruf starten";
+"start_video_call" = "Videoanruf starten";
+"mention" = "Erwähnung";
+"select_account" = "Wähle ein Konto";
+"attach_media" = "Medien aus der Bibliothek anhängen";
+"capture_media" = "Foto/Video aufnehmen";
+"invite_user" = "Matrixbenutzer einladen";
+"reset_to_default" = "Auf Standardeinstellungen zurücksetzen";
+"resend_message" = "Nachricht erneut senden";
+"select_all" = "Alles auswählen";
+"cancel_upload" = "Hochladen abbrechen";
+"cancel_download" = "Herunterladen abbrechen";
+"show_details" = "Zeige Details";
+"answer_call" = "Anruf annehmen";
+"reject_call" = "Anruf abweisen";
+"end_call" = "Anruf beenden";
+"ignore" = "Ignorieren";
+"unignore" = "Ignorieren aufheben";
+// Events formatter
+"notice_avatar_changed_too" = "(Avatar wurde auch geändert)";
+"notice_room_name_removed" = "%@ hat den Raumnamen gelöscht";
+"notice_room_name_removed_for_dm" = "%@ hat den Namen gelöscht";
+"notice_room_topic_removed" = "%@ hat das Raumthema gelöscht";
+"notice_event_redacted" = "<Geschwärzt%@>";
+"notice_event_redacted_by" = " durch %@";
+"notice_event_redacted_reason" = " [Grund: %@]";
+"notice_profile_change_redacted" = "%@ aktualisierte sein Profil %@";
+"notice_room_created" = "%@ hat den Raum erstellt und konfiguriert.";
+"notice_room_created_for_dm" = "%@ ist beigetreten.";
+//  Old
+"notice_room_join_rule" = "Die Beitrittsregel ist: %@";
+//  New
+"notice_room_join_rule_invite" = "%@ hat den Raum auf \"nur-einladen\" gestellt.";
+"notice_room_join_rule_invite_for_dm" = "%@ hat auf Einladungen beschränkt.";
+"notice_room_join_rule_invite_by_you" = "Du hast den Raumbeitritt auf Einladungen beschränkt.";
+"notice_room_join_rule_invite_by_you_for_dm" = "Du hast dies auf Einladungen beschränkt.";
+"notice_room_join_rule_public" = "%@ hat den Raum öffentlich gemacht.";
+"notice_room_join_rule_public_for_dm" = "%@ hat es öffentlich gemacht.";
+"notice_room_join_rule_public_by_you" = "Du hast den Raum öffentlich gemacht.";
+"notice_room_join_rule_public_by_you_for_dm" = "Du hast es öffentlich gemacht.";
+"notice_room_power_level_intro" = "Die Berechtigungsstufe der Teilnehmer ist:";
+"notice_room_power_level_intro_for_dm" = "Die Berechtigungsstufe der Teilnehmer ist:";
+"notice_room_power_level_acting_requirement" = "Die minimale Berechtigungsstufe, die ein Benutzer zum Handeln benötigt:";
+"notice_room_power_level_event_requirement" = "Die minimalen Berechtigungsstufen bezogen auf Ereignisse:";
+"notice_room_aliases" = "Die Raumnamenaliase sind: %@";
+"notice_room_aliases_for_dm" = "Die Namenaliase sind: %@";
+"notice_room_related_groups" = "Die Gruppen, die mit diesem Raum verknüpft sind: %@";
+"notice_encrypted_message" = "Verschlüsselte Nachricht";
+"notice_encryption_enabled_ok" = "%@ hat die Ende-zu-Ende-Verschlüsselung aktiviert.";
+"notice_encryption_enabled_unknown_algorithm" = "%1$@ hat die Ende-zu-Ende-Verschlüsselung aktiviert (unbekannter Algorithmus %2$@).";
+"notice_image_attachment" = "angehängtes Bild";
+"notice_audio_attachment" = "Audioanhang";
+"notice_video_attachment" = "Videoanhang";
+"notice_location_attachment" = "Standortanhang";
+"notice_file_attachment" = "Dateianhang";
+"notice_invalid_attachment" = "Ungültige Anhang";
+"notice_unsupported_attachment" = "Nicht unterstützter Anhang: %@";
+"notice_feedback" = "Rückmeldeereignis (id: %@): %@";
+"notice_redaction" = "%@ hat Ereignis geschwärzt (id: %@)";
+"notice_error_unsupported_event" = "Nicht unterstütztes Ereignis";
+"notice_error_unexpected_event" = "Unerwartetes Ereignis";
+"notice_error_unknown_event_type" = "Unbekannter Ereignistyp";
+"notice_room_history_visible_to_anyone" = "%@ hat den zukünftigen Raumverlauf für alle sichtbar gemacht.";
+"notice_room_history_visible_to_members" = "%@ hat den zukünftigen Raumverlauf für alle Raumteilnehmer sichtbar gemacht.";
+"notice_room_history_visible_to_members_for_dm" = "%@ hat die folgenden Nachrichten für alle Teilnehmer des Raumes sichtbar gemacht.";
+"notice_room_history_visible_to_members_from_invited_point" = "%@ hat den zukünftigen Raumverlauf für alle Raumteilnehmer ab deren Einladung sichtbar gemacht.";
+"notice_room_history_visible_to_members_from_invited_point_for_dm" = "%@ hat den zukünftigen Verlauf für alle Raumteilnehmer ab deren Einladung sichtbar gemacht.";
+"notice_room_history_visible_to_members_from_joined_point" = "%@ hat den zukünftigen Raumverlauf für alle Raumteilnehmer ab deren Einladung sichtbar gemacht.";
+"notice_room_history_visible_to_members_from_joined_point_for_dm" = "%@ hat den zukünftigen Verlauf für alle Raumteilnehmer ab deren Einladung sichtbar gemacht.";
+"notice_crypto_unable_to_decrypt" = "** Entschlüsselung nicht möglich: %@ **";
+"notice_crypto_error_unknown_inbound_session_id" = "Die Sitzung des Absenders hat uns keine Schlüssel für diese Nachricht gesendet.";
+"notice_sticker" = "Aufkleber";
+"notice_in_reply_to" = "Als Antwort auf";
+// room display name
+"room_displayname_empty_room" = "Leerer Raum";
+"room_displayname_two_members" = "%@ und %@";
+"room_displayname_more_than_two_members" = "%@ und %u andere";
+// Settings
+"settings" = "Einstellungen";
+"settings_enable_inapp_notifications" = "Benachrichtigungen innerhalb der App aktivieren";
+"settings_enable_push_notifications" = "Puschbenachrichtigungen aktivieren";
+"settings_enter_validation_token_for" = "Eingabe Validierungstoken für %@:";
+"notification_settings_room_rule_title" = "Raum: '%@'";
+// Devices
+"device_details_title" = "Sitzungsinformation\n";
+"device_details_name" = "Öffentlicher Name\n";
+"device_details_identifier" = "ID\n";
+"device_details_last_seen" = "Zuletzt gesehen:\n";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_rename_prompt_title" = "Sitzungsname";
+"device_details_rename_prompt_message" = "Der öffentliche Name einer Sitzung ist für Personen sichtbar, mit denen Sie kommunizieren";
+"device_details_delete_prompt_title" = "Authentifizierung";
+"device_details_delete_prompt_message" = "Diese Aktion erfordert zusätzliche Authentifizierung.\nBitte gib dein Passwort ein.";
+// Encryption information
+"room_event_encryption_info_title" = "Ende-zu-Ende Verschlüsselungsinformation\n\n";
+"room_event_encryption_info_event" = "Ereignis Information\n";
+"room_event_encryption_info_event_user_id" = "Benutzer-ID\n";
+"room_event_encryption_info_event_identity_key" = "Curve25519 Identitätsschlüssel\n";
+"room_event_encryption_info_event_fingerprint_key" = "Verlangter Ed25519-Fingerabdruck\n";
+"room_event_encryption_info_event_algorithm" = "Algorithmus\n";
+"room_event_encryption_info_event_session_id" = "Sitzungs-ID\n";
+"room_event_encryption_info_event_decryption_error" = "Entschlüsselungsfehler\n";
+"room_event_encryption_info_event_unencrypted" = "nicht verschlüsselt";
+"room_event_encryption_info_event_none" = "keine";
+"room_event_encryption_info_device" = "\nAbsendersitzungsinformation\n";
+"room_event_encryption_info_device_unknown" = "Unbekannte Sitzung\n";
+"room_event_encryption_info_device_name" = "Öffentlicher Name\n";
+"room_event_encryption_info_device_id" = "ID\n";
+"room_event_encryption_info_device_verification" = "Überprüfung\n";
+"room_event_encryption_info_device_fingerprint" = "Ed25519-Fingerabdruck\n";
+"room_event_encryption_info_device_verified" = "Überprüft";
+"room_event_encryption_info_device_not_verified" = "NICHT verifiziert";
+"room_event_encryption_info_device_blocked" = "auf schwarzer Liste";
+"room_event_encryption_info_verify" = "Überprüfe...";
+"room_event_encryption_info_unverify" = "Verifizierung widerrufen";
+"room_event_encryption_info_block" = "Blockieren";
+"room_event_encryption_info_unblock" = "Blockierung aufheben";
+"room_event_encryption_verify_title" = "Überprüfe Sitzung\n\n";
+"room_event_encryption_verify_message" = "Um zu prüfen, dass dieser Sitzung vertraut werden kann, kontaktiere bitte den Eigentümer über einen anderen Weg (z.B. in Person oder mit einem Telefonanruf) und frage ihn, ob der Schlüssel, den er in seinen Benutzereinstellungen für diese Sitzung sieht, dem folgenden Schlüssel entspricht:\n\n\tSitzungs-Name: %@\n\tSitzungs-ID: %@\n\tSitzungsschlüssel: %@\n\nWenn es übereinstimmt, die \"Überprüfe\" Schaltfläche drücken. Wenn nicht, dann hört jemand anderes diese Sitzung ab und du willst stattdessen vermutlich die Schaltfläche \"Blockieren\" drücken.\n\nIn Zukunft wird dieser Überprüfungsprozess ausgefeilter sein.";
+"room_event_encryption_verify_ok" = "Überprüfe";
+// Account
+"account_save_changes" = "Änderungen speichern";
+"account_link_email" = "Verbinde E-Mail-Adresse";
+"account_linked_emails" = "Verbundene E-Mail-Adressen";
+"account_email_validation_title" = "Verifizierung ausstehend";
+"account_email_validation_message" = "Bitte prüfe deine E-Mails und klicke auf den enthaltenen Link. Wenn dies erledigt ist, klicke auf \"Fortsetzen\".";
+"account_email_validation_error" = "Kann E-Mail-Adresse nicht verifizieren. Bitte prüfe deine E-Mails und klicke auf den enthaltenen Link. Wenn das erledigt ist, Schaltfläche \"Fortfahren\" drücken";
+"account_msisdn_validation_title" = "Verifizierung ausstehend";
+"account_msisdn_validation_message" = "Wir haben eine SMS mit einem Aktivierungscode gesendet. Bitte den Code unten eingeben.";
+"account_msisdn_validation_error" = "Kann Telefonnummer nicht verifizieren.";
+"account_error_display_name_change_failed" = "Änderung des Anzeigenamens fehlgeschlagen";
+"account_error_picture_change_failed" = "Änderung des Bildes fehlgeschlagen";
+"account_error_matrix_session_is_not_opened" = "Matrixsitzung ist nicht geöffnet";
+"account_error_email_wrong_title" = "Ungültige E-Mail-Adresse";
+"account_error_email_wrong_description" = "Sieht nicht aus wie eine gültige E-Mail-Adresse";
+"account_error_msisdn_wrong_title" = "Ungültige Telefonnummer";
+"account_error_msisdn_wrong_description" = "Sieht nicht wie eine valide Telefonnummer aus";
+"account_error_push_not_allowed" = "Benachrichtigungen nicht erlaubt";
+// Room creation
+"room_creation_name_title" = "Raumname:";
+"room_creation_name_placeholder" = "(z.B. MittagessenGruppe)";
+"room_creation_alias_title" = "Raumalias:";
+"room_creation_alias_placeholder" = "(z.B. #foo:example.org)";
+"room_creation_alias_placeholder_with_homeserver" = "(z.B. #foo%@)";
+"room_creation_participants_title" = "Teilnehmer:";
+"room_creation_participants_placeholder" = "(z.B. @laura:heimserver1; @thomas:heimserver2...)";
+// Room
+"room_please_select" = "Bitte wähle einen Raum";
+"room_error_join_failed_title" = "Konnte Raum nicht betreten";
+"room_error_join_failed_empty_room" = "Es ist aktuell nicht möglich einen leeren Raum zu betreten.";
+"room_error_name_edition_not_authorized" = "Du bist nicht authorisiert den Raumnamen zu ändern";
+"room_error_topic_edition_not_authorized" = "Du bist nicht authorisiert das Raumthema zu ändern";
+"room_error_cannot_load_timeline" = "Konnte Verlauf nicht laden";
+"room_error_timeline_event_not_found_title" = "Konnte Position im Verlauf nicht laden";
+"room_error_timeline_event_not_found" = "Konnte spezifischen Punkt im Verlauf dieses Raumes nicht finden";
+"room_left" = "Du hast den Raum verlassen";
+"room_left_for_dm" = "Du hast die Unterhaltung verlassen";
+"room_no_power_to_create_conference_call" = "Einladungsberechtigung benötigt, um Konferenz in diesem Raum zu starten";
+"room_no_conference_call_in_encrypted_rooms" = "Konferenzgespräche sind in verschlüsselten Räumen nicht unterstützt";
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "sandte ein Bild.";
+"message_reply_to_sender_sent_a_video" = "sandte ein Video.";
+"message_reply_to_sender_sent_an_audio_file" = "sandte eine Audiodatei.";
+"message_reply_to_sender_sent_a_file" = "sandte eine Datei.";
+"message_reply_to_message_to_reply_to_prefix" = "Als Antwort auf";
+// Room members
+"room_member_ignore_prompt" = "Sicher, dass alle Nachrichten von diesem Benutzer versteckt werden sollen?";
+"room_member_power_level_prompt" = "Du kannst diese Änderung nicht rückgangig machen, weil du dem Benutzer die gleiche Berechtigungsstufe gibst, die du selbst hast.\nBist du sicher?";
+// Attachment
+"attachment_size_prompt" = "Möchtest du senden als:";
+"attachment_original" = "Originalgröße (%@)";
+"attachment_small" = "Klein (~%@)";
+"attachment_medium" = "Mittel (~%@)";
+"attachment_large" = "Groß (~%@)";
+"attachment_cancel_download" = "Herunterladen abbrechen?";
+"attachment_cancel_upload" = "Hochladen abbrechen?";
+"attachment_multiselection_size_prompt" = "Bilder senden als:";
+"attachment_multiselection_original" = "Originalgröße";
+"attachment_e2e_keys_file_prompt" = "Diese Datei enthält von einem Matrixclient exportierte Schlüssel.\nMöchtest du den Dateiinhalt sehen oder die Schlüssel importieren?";
+"attachment_e2e_keys_import" = "Importiere...";
+// Contacts
+"contact_mx_users" = "Matrixbenutzer";
+"contact_local_contacts" = "Lokale Kontakte";
+// Groups
+"group_invite_section" = "Einladungen";
+"group_section" = "Gruppen";
+// Search
+"search_no_results" = "Nichts gefunden";
+"search_searching" = "Suche wird durchgeführt...";
+// Time
+"format_time_s" = "s";
+"format_time_m" = "m";
+"format_time_h" = "h";
+"format_time_d" = "t";
+// E2E import
+"e2e_import_room_keys" = "Importiere Raumschlüssel";
+"e2e_import_prompt" = "Dieser Prozess erlaubt es dir, Schlüssel zu importieren, die du vorher von einem anderen Matrixclient exportiert hast. Du kannst anschließend alle Nachrichten entschlüsseln, die auch bereits der andere Client entschlüsseln konnte.\nDie Exportdatei ist mit einer Passphrase geschützt. Gib die Passphrase hier ein, um die Datei zu importieren.";
+"e2e_import" = "Importieren";
+"e2e_passphrase_enter" = "Passphrase eingeben";
+// E2E export
+"e2e_export_room_keys" = "Exportiere Raumschlüssel";
+"e2e_export_prompt" = "Dieser Prozeß erlaubt den Export von Schlüsseln, die du in verschlüsselten Räumen empfangen hast, in eine lokale Datei. Du kannst dann die Datei in einem anderen Matrixclient in Zukunft importieren, so dass dieser Client die Nachrichten auch entschlüsseln kann.\nDie exportierte Datei wird jedem der sie lesen kann erlauben, alle verschlüsselten Nachrichten sehen können, also verwahre die Datei sicher.";
+"e2e_export" = "Exportiere";
+"e2e_passphrase_confirm" = "Passphrase bestätigen";
+"e2e_passphrase_empty" = "Die Passphrase darf nicht leer sein";
+"e2e_passphrase_not_match" = "Passphrasen stimmen nicht überein";
+"e2e_passphrase_create" = "Passphrase erzeugen";
+// Others
+"user_id_title" = "Benutzer-ID:";
+"offline" = "offline";
+"unsent" = "Nicht gesendet";
+"error" = "Fehler";
+"error_common_message" = "Ein Fehler trat auf. Bitte später erneut probieren.";
+"not_supported_yet" = "Noch nicht unterstützt";
+"default" = "Standard";
+"private" = "Privat";
+"public" = "Öffentlich";
+"power_level" = "Berechtigungsstufe";
+"network_error_not_reachable" = "Bitte Netzwerkverbindung prüfen";
+"user_id_placeholder" = "z. B.: @thomas:heimserver";
+"ssl_homeserver_url" = "Heimserver URL: %@";
+// Permissions
+"camera_access_not_granted_for_call" = "Video-Anrufe benötigen Zugriff auf die Kamera, aber %@ hat keine Berechtigung";
+"microphone_access_not_granted_for_call" = "Anrufe benötigen Zugriff auf das Mikrofon, aber %@ hat keine Berechtigung";
+"local_contacts_access_not_granted" = "Finden von Benutzern in lokalen Kontakten benötigt Zugriff auf die Kontakte, aber %@ hat keine Berechtigung";
+"local_contacts_access_discovery_warning_title" = "Benutzer finden";
+"local_contacts_access_discovery_warning" = "Um Kontakte zu erkennen, die Matrix bereits verwenden, kann %@ E-Mail-Adressen und Telefonnummern in Ihrem Adressbuch an den von Ihnen ausgewählten Matrix-Identitätsserver senden. Sofern dies unterstützt wird, werden personenbezogene Daten vor dem Senden gehasht. Weitere Informationen finden Sie in den Datenschutzrichtlinien Ihres Identitätsservers.";
+// Country picker
+"country_picker_title" = "Wähle ein Land";
+// Language picker
+"language_picker_title" = "Wähle eine Sprache";
+"language_picker_default_language" = "Standard (%@)";
+"notice_room_invite" = "%@ hat %@ eingeladen";
+"notice_room_third_party_invite" = "%@ sendete eine Einladung an %@ den Raum zu betreten";
+"notice_room_third_party_invite_for_dm" = "%@ hat %@ eingeladen";
+"notice_room_third_party_registered_invite" = "%@ akzeptierte die Einladung für %@";
+"notice_room_third_party_revoked_invite" = "%@ hat die Einladung für %@, dem Raum beizutreten, zurückgezogen";
+"notice_room_third_party_revoked_invite_for_dm" = "%@ hat %@'s Einladung zurückgezogen";
+"notice_room_join" = "%@ betrat den Raum";
+"notice_room_leave" = "%@ hat den Raum verlassen";
+"notice_room_reject" = "%@ lehnte die Einladung ab";
+"notice_room_kick" = "%@ hat %@ entfernt";
+"notice_room_unban" = "%@ entsperrte %@";
+"notice_room_ban" = "%@ sperrte %@";
+"notice_room_withdraw" = "%@ hat %@s Einladung zurückgezogen";
+"notice_room_reason" = ". Grund: %@";
+"notice_avatar_url_changed" = "%@ hat den eigenen Avatar geändert";
+"notice_display_name_set" = "%@ setzte den Anzeigenamen auf %@";
+"notice_display_name_changed_from" = "%@ änderte den Anzeigenamen von %@ auf %@";
+"notice_display_name_removed" = "%@ hat den Anzeigenamen entfernt";
+"notice_topic_changed" = "%@ wechselte das Thema zu %@.";
+"notice_room_name_changed" = "%@ änderte den Raumnamen zu %@.";
+"notice_room_name_changed_for_dm" = "%@ änderte den Raumnamen zu %@.";
+"notice_placed_voice_call" = "%@ tätigte einen Sprachanruf";
+"notice_placed_video_call" = "%@ tätigte einen Videoanruf";
+"notice_answered_video_call" = "%@ hat den Anruf angenommen";
+"notice_ended_video_call" = "%@ hat den Anruf beendet";
+"notice_conference_call_request" = "%@ hat eine VoIP-Konferenz angefragt";
+"notice_conference_call_started" = "VoIP-Konferenz gestartet";
+"notice_conference_call_finished" = "VoIP-Konferenz beendet";
+// Notice Events with "You"
+"notice_room_invite_by_you" = "Du hast %@ eingeladen";
+"notice_room_invite_you" = "%@ hat Dich eingeladen";
+"notice_room_third_party_invite_by_you" = "Du hast an %@ eine Einladung gesendet dem Raum beizutreten";
+"notice_room_third_party_invite_by_you_for_dm" = "Du hast %@ eingeladen";
+"notice_room_third_party_registered_invite_by_you" = "Du hast die Einladung für %@ angenommen";
+"notice_room_third_party_revoked_invite_by_you" = "Du hast die Einladung dem Raum %@ beizutreten abgelehnt";
+"notice_room_third_party_revoked_invite_by_you_for_dm" = "Du hast die Einladung %@'s zurückgezogen";
+"notice_room_join_by_you" = "Du bist beigetreten";
+"notice_room_leave_by_you" = "Du bist ausgetreten";
+"notice_room_reject_by_you" = "Du hast die Einladung abgelehnt";
+"notice_room_kick_by_you" = "Du hast %@ entfernt";
+"notice_room_unban_by_you" = "Du hast %@ entbannt";
+"notice_room_ban_by_you" = "Du hast %@ gebannt";
+"notice_room_withdraw_by_you" = "Du hast die Einladung von %@ zurückgenommen";
+"notice_avatar_url_changed_by_you" = "Du hast dein Profilbild geändert";
+"notice_display_name_set_by_you" = "Du hast deinen Anzeigenamen auf %@ geändert";
+"notice_display_name_changed_from_by_you" = "Du hast deinen Anzeigenamen von %@ zu %@ geändert";
+"notice_display_name_removed_by_you" = "Du hast deinen Anzeigenamen entfernt";
+"notice_topic_changed_by_you" = "Du hast Das Thema zu %@ geändert.";
+"notice_room_name_changed_by_you" = "Du hast den Raumnamen zu %@ geändert.";
+"notice_room_name_changed_by_you_for_dm" = "Du hast den Namen zu %@ geändert.";
+"notice_placed_voice_call_by_you" = "Du hast einen Audioanruf gestartet";
+"notice_placed_video_call_by_you" = "Du hast einen Videoanruf gestartet";
+"notice_answered_video_call_by_you" = "Du hast den Anruf angenommen";
+"notice_ended_video_call_by_you" = "Du hast den Anruf beendet";
+"notice_conference_call_request_by_you" = "Du hast eine VoIP-Konferenz angefordert";
+"notice_room_name_removed_by_you" = "Du hast den Raumnamen entfernt";
+"notice_room_name_removed_by_you_for_dm" = "Du hast den Namen entfernt";
+"notice_room_topic_removed_by_you" = "Du hast das Raumthema entfernt";
+"notice_event_redacted_by_you" = " von dir";
+"notice_profile_change_redacted_by_you" = "Du hast dein Profil %@ aktualisiert";
+"notice_room_created_by_you" = "Du hast den Raum erstellt und konfiguriert.";
+"notice_room_created_by_you_for_dm" = "Du bist beigetreten.";
+"notice_encryption_enabled_ok_by_you" = "Du hast Ende-zu-Ende-Verschlüsselung aktiviert.";
+"notice_encryption_enabled_unknown_algorithm_by_you" = "Du hast Ende-zu-Ende-Verschlüsselung aktiviert (unbekannter Algorithmus %@).";
+"notice_redaction_by_you" = "Du hast ein Ereignis geschwärzt (ID: %@)";
+"notice_room_history_visible_to_anyone_by_you" = "Du hast den zukünftigen Nachrichtenverlauf für jeden sichtbar gemacht.";
+"notice_room_history_visible_to_members_by_you" = "Du hast den zukünftigen Nachrichtenverlauf für alle Mitglieder des Raums sichtbar gemacht.";
+"notice_room_history_visible_to_members_by_you_for_dm" = "Du hast den zukünftigen Nachrichtenverlauf für alle Mitglieder des Raums sichtbar gemacht.";
+"notice_room_history_visible_to_members_from_invited_point_by_you" = "Du hast den zukünftigen Nachrichtenverlauf für alle Mitglieder des Raums ab deren Teilnahme sichtbar gemacht.";
+"notice_room_history_visible_to_members_from_invited_point_by_you_for_dm" = "Du hast den zukünftigen Nachrichtenverlauf für alle sichtbar gemacht, sobald sie eingeladen werden.";
+"notice_room_history_visible_to_members_from_joined_point_by_you" = "Du hast den zukünftigen Nachrichtenverlauf für alle Mitglieder des Raums ab deren Teilnahme sichtbar gemacht.";
+"notice_room_history_visible_to_members_from_joined_point_by_you_for_dm" = "Du hast den zukünftigen Nachrichtenverlauf für alle Mitglieder des Raums sichtbar gemacht, ab deren Teilnahme.";
+// Room Screen
+
+// general errors
+
+// Home Screen
+
+// Last seen time
+
+// call events
+
+// titles
+
+// button names
+"ok" = "OK";
+"cancel" = "Abbruch";
+"save" = "Speichern";
+"leave" = "Verlassen";
+"send" = "Senden";
+"copy_button_name" = "Kopieren";
+"resend" = "Erneut senden";
+"redact" = "Entfernen";
+"share" = "Teilen";
+"set_power_level" = "Berechtigungslevel";
+"delete" = "Löschen";
+"view" = "Ansehen";
+// actions
+"action_logout" = "Abmelden";
+"create_room" = "Erstelle Raum";
+"login" = "Anmelden";
+"create_account" = "Erstelle Konto";
+"membership_invite" = "Eingeladen";
+"membership_leave" = "Verlassen";
+"membership_ban" = "Gesperrt";
+"num_members_one" = "%@ Benutzer";
+"num_members_other" = "%@ Benutzer";
+"invite" = "Einladen";
+"kick" = "Entfernen";
+"ban" = "Sperren";
+"unban" = "Entsperren";
+"message_unsaved_changes" = "Es gibt nicht gespeicherte Änderungen. Verlassen wird diese verwerfen.";
+// Login Screen
+"login_error_already_logged_in" = "Bereits angemeldet";
+"login_error_must_start_http" = "URL muss mit http[s]:// anfangen";
+// members list Screen
+
+// accounts list Screen
+
+// image size selection
+
+// invitation members list Screen
+
+// room creation dialog Screen
+
+// room info dialog Screen
+
+// room details dialog screen
+"room_details_title" = "Raumdetails";
+// contacts list screen
+"invitation_message" = "Ich würde gerne über Matrix mit dir chatten. Du kannst dich auf https://matrix.org darüber informieren.";
+// Settings screen
+"settings_title_config" = "Konfiguration";
+"settings_title_notifications" = "Benachrichtigungen";
+// Notification settings screen
+"notification_settings_disable_all" = "Alle Benachrichtigungen ausschalten";
+"notification_settings_enable_notifications" = "Benachrichtigungen einschalten";
+"notification_settings_enable_notifications_warning" = "Alle Benachrichtigungen sind momentan für alle Geräte ausgeschaltet.";
+"notification_settings_global_info" = "Benachrichtigungseinstellungen werden in deinem Benutzerkonto gespeichert und zwischen allen Clients die das unterstützen geteilt (inklusive Desktop Benachrichtigungen). \n\nRegeln werden der Reihe nach angewandt; die erste Regel, die zutrifft, bestimmt das Resultat für die Nachricht.\nPro-Wort-Benachrichtigungen sind wichtiger als Pro-Raum-Benachrichtigungen, die wichtiger sind wie Pro-Absender-Benachrichtigungen.\nBei mehrfachen Regeln des gleichen Typs wird die erste in der Liste die zutrifft angewendet.";
+"notification_settings_per_word_notifications" = "Pro-Wort-Benachrichtigungen";
+"notification_settings_per_word_info" = "Suchwörter ignorieren Groß-/Kleinschreibung und können ein *-Platzhalter enthalten. Beispiele:\nfoo findet den String foo umgeben durch Trennzeichen (Satzzeichen, Leerzeichen, Zeilenanfang/ende).\nfoo* findet Worte die mit foo beginnen.\n*foo* findet jedes Wort das foo an beliebiger Stelle enthält.";
+"notification_settings_always_notify" = "Immer benachrichtigen";
+"notification_settings_never_notify" = "Nie benachrichtigen";
+"notification_settings_word_to_match" = "übereinstimmende Wörter";
+"notification_settings_highlight" = "Hervorheben";
+"notification_settings_custom_sound" = "Individueller Klang";
+"notification_settings_per_room_notifications" = "Pro-Raum-Benachrichtigungen";
+"notification_settings_per_sender_notifications" = "Pro-Absender-Benachrichtigungen";
+"notification_settings_sender_hint" = "@benutzer:domaene.com";
+"notification_settings_select_room" = "Wähle einen Raum";
+"notification_settings_other_alerts" = "Andere Alarme";
+"notification_settings_contain_my_user_name" = "Klänge bei Nachrichten die meinen Benutzernamen enthalten";
+"notification_settings_contain_my_display_name" = "Klänge bei Nachrichten die meinen Anzeigenamen enthalten";
+"notification_settings_just_sent_to_me" = "Mich über gerade empfangene Nachrichten mit einem Klang informieren";
+"notification_settings_invite_to_a_new_room" = "Benachrichtige, wenn ich zu einem neuen Raum eingeladen werde";
+"notification_settings_people_join_leave_rooms" = "Benachrichtige, wenn Benutzer einen Raum betreten oder verlassen";
+"notification_settings_receive_a_call" = "Benachrichtige, wenn ich einen Anruf erhalte";
+"notification_settings_suppress_from_bots" = "Unterdrücke Benachrichtigungen von Bots";
+"notification_settings_by_default" = "Als Standard...";
+"notification_settings_notify_all_other" = "Benachrichtige für alle andereren Nachrichten/Räume";
+// gcm section
+"settings_config_home_server" = "Heimserver: %@";
+"settings_config_identity_server" = "Identitätsserver: %@";
+"settings_config_user_id" = "Benutzer-ID: %@";
+// Settings keys
+
+// call string
+"call_waiting" = "Warte...";
+"call_connecting" = "Verbinden…";
+"call_ended" = "Anruf beendet";
+"call_ring" = "Rufe an...";
+"incoming_video_call" = "Eingehender Videoanruf";
+"incoming_voice_call" = "Eingehender Sprachanruf";
+"call_invite_expired" = "Anrufeinladung abgelaufen";
+// unrecognized SSL certificate
+"ssl_trust" = "Vertrauensstellung";
+"ssl_logout_account" = "Abmelden";
+"ssl_remain_offline" = "Ignorieren";
+"ssl_fingerprint_hash" = "Fingerabdruck (%@):";
+"ssl_could_not_verify" = "Konnte die Identität des Servers nicht verifizieren.";
+"ssl_cert_not_trust" = "Das kann bedeuten, dass jemand den Datenverkehr mitliest, oder dass dein Gerät dem Zertifikat des Servers nicht vertraut.";
+"ssl_cert_new_account_expl" = "Wenn der Server Administrator gesagt hat, dass dies erwartet wird, stelle sicher, dass der Fingerabdruck unten dem vom Administrator mitgeteilten Fingerabdruck entspricht.";
+"ssl_unexpected_existing_expl" = "Das Zertifikat des Servers hat sich geändert, es ist nicht mehr das vertraute Zertifikat. Das ist SEHR UNGEWÖHNLICH! Es wird empfohlen das neue Zertifikat NICHT ZU AKZEPTIEREN.";
+"ssl_expected_existing_expl" = "Das Zertifikat des Servers hat sich geändert, es ist nicht mehr das vertraute Zertifikat. Der Server könnte sein Zertifikat erneuert haben. Kontaktiere den Serveradministrator um den Fingerabdruck zu überprüfen.";
+"ssl_only_accept" = "Akzeptiere AUSSCHLIESSLICH Zertifikate für die der Serveradministrator einen Fingerprint veröffentlicht hat.";
+"call_more_actions_transfer" = "Übertragung";
+"call_more_actions_audio_use_headset" = "Kopfhörer verwenden";
+"call_more_actions_change_audio_device" = "Audiogerät ändern";
+"call_more_actions_unhold" = "Fortsetzen";
+"call_more_actions_hold" = "Halten";
+"call_holded" = "Du hast den Anurf pausiert";
+"call_remote_holded" = "%@ hat den Anruf pausiert";
+"notice_declined_video_call_by_you" = "Du hast den Anruf abgelehnt";
+"notice_declined_video_call" = "%@ hat den Anruf abgelehnt";
+"resume_call" = "Fortsetzen";
+"call_more_actions_dialpad" = "Ziffernblatt";
+"call_more_actions_audio_use_device" = "Lautsprecher";
+"call_transfer_to_user" = "Durchstellen zu %@";
+"call_video_with_user" = "Videoanruf mit %@";
+"call_voice_with_user" = "Sprachanruf mit %@";
+"call_ringing" = "Läuten…";
+"e2e_passphrase_too_short" = "Passphrase zu kurz (Minimum sind %d Zeichen)";
+"call_consulting_with_user" = "Bei %@ anfragen";
+"microphone_access_not_granted_for_voice_message" = "%@ fehlt die Berechtigung, für Sprachnachrichten auf das Mikrofon zuzugreifen";
+"message_reply_to_sender_sent_a_voice_message" = "hat eine Sprachnachricht gesendet.";
+"attachment_size_prompt_title" = "Größe zum Senden";
+"attachment_large_with_resolution" = "Groß %@ (~%@)";
+"attachment_medium_with_resolution" = "Mittel %@ (~%@)";
+"attachment_small_with_resolution" = "Klein %@ (~%@)";
+"attachment_size_prompt_message" = "Du kannst dies in den Einstellungen ausschalten.";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/en.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/en.lproj/MatrixKit.strings
new file mode 100644
index 000000000..f9e40406a
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/en.lproj/MatrixKit.strings
@@ -0,0 +1,581 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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.
+ */
+
+/* *********************** */
+/*      iOS specific       */
+/* *********************** */
+
+"matrix" = "Matrix";
+
+// Login Screen
+"login_create_account" = "Create account:";
+"login_server_url_placeholder" = "URL (e.g. https://matrix.org)";
+"login_home_server_title" = "Homeserver URL:";
+"login_home_server_info" = "Your homeserver stores all your conversations and account data";
+"login_identity_server_title" = "Identity server URL:";
+"login_identity_server_info" = "Matrix provides identity servers to track which emails etc. belong to which Matrix IDs. Only https://matrix.org currently exists.";
+"login_user_id_placeholder" = "Matrix ID (e.g. @bob:matrix.org or bob)";
+"login_password_placeholder" = "Password";
+"login_optional_field" = "optional";
+"login_display_name_placeholder" = "Display name (e.g. Bob Obson)";
+"login_email_info" = "Specify an email address lets other users find you on Matrix more easily, and will give you a way to reset your password in the future.";
+"login_email_placeholder" = "Email address";
+"login_prompt_email_token" = "Please enter your email validation token:";
+"login_error_title" = "Login Failed";
+"login_error_no_login_flow" = "We failed to retrieve authentication information from this homeserver";
+"login_error_do_not_support_login_flows" = "Currently we do not support any or all login flows defined by this homeserver";
+"login_error_registration_is_not_supported" = "Registration is not currently supported";
+"login_error_forbidden" = "Invalid username/password";
+"login_error_unknown_token" = "The access token specified was not recognised";
+"login_error_bad_json" = "Malformed JSON";
+"login_error_not_json" = "Did not contain valid JSON";
+"login_error_limit_exceeded" = "Too many requests have been sent";
+"login_error_user_in_use" = "This user name is already used";
+"login_error_login_email_not_yet" = "The email link which has not been clicked yet";
+"login_use_fallback" = "Use fallback page";
+"login_leave_fallback" = "Cancel";
+"login_invalid_param" = "Invalid parameter";
+"register_error_title" = "Registration Failed";
+"login_error_forgot_password_is_not_supported" = "Forgot password is not currently supported";
+"login_mobile_device"="Mobile";
+"login_tablet_device"="Tablet";
+"login_desktop_device"="Desktop";
+"login_error_resource_limit_exceeded_title" = "Resource Limit Exceeded";
+"login_error_resource_limit_exceeded_message_default" = "This homeserver has exceeded one of its resource limits.";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "This homeserver has hit its Monthly Active User limit.";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nPlease contact your service administrator to continue using this service.";
+"login_error_resource_limit_exceeded_contact_button" = "Contact Administrator";
+
+// Action
+"no" = "No";
+"yes" = "Yes";
+"abort" = "Abort";
+"back" = "Back";
+"close" = "Close";
+"continue" = "Continue";
+"discard" = "Discard";
+"dismiss" = "Dismiss";
+"retry" = "Retry";
+"sign_up" = "Sign up";
+"submit" = "Submit";
+"submit_code" = "Submit code";
+"set_power_level" = "Set Power Level";
+"set_default_power_level" = "Reset Power Level";
+"set_moderator" = "Set Moderator";
+"set_admin" = "Set Admin";
+"start_chat" = "Start Chat";
+"start_voice_call" = "Start Voice Call";
+"start_video_call" = "Start Video Call";
+"mention" = "Mention";
+"select_account" = "Select an account";
+"attach_media" = "Attach Media from Library";
+"capture_media" = "Take Photo/Video";
+"invite_user" = "Invite matrix User";
+"reset_to_default" = "Reset to default";
+"resend_message" = "Resend the message";
+"select_all" = "Select All";
+"cancel_upload" = "Cancel Upload";
+"cancel_download" = "Cancel Download";
+"show_details" = "Show Details";
+"answer_call" = "Answer Call";
+"reject_call" = "Reject Call";
+"end_call" = "End Call";
+"resume_call" = "Resume";
+"ignore" = "Ignore";
+"unignore" = "Unignore";
+
+// Events formatter
+"notice_avatar_changed_too" = "(avatar was changed too)";
+"notice_room_name_removed" = "%@ removed the room name";
+"notice_room_name_removed_for_dm" = "%@ removed the name";
+"notice_room_topic_removed" = "%@ removed the topic";
+"notice_event_redacted" = "<redacted%@>";
+"notice_event_redacted_by" = " by %@";
+"notice_event_redacted_reason" = " [reason: %@]";
+"notice_profile_change_redacted" = "%@ updated their profile %@";
+"notice_room_created" = "%@ created and configured the room.";
+"notice_room_created_for_dm" = "%@ joined.";
+//  Old
+"notice_room_join_rule" = "The join rule is: %@";
+//  New
+"notice_room_join_rule_invite" = "%@ made the room invite only.";
+"notice_room_join_rule_invite_for_dm" = "%@ made this invite only.";
+"notice_room_join_rule_invite_by_you" = "You made the room invite only.";
+"notice_room_join_rule_invite_by_you_for_dm" = "You made this invite only.";
+"notice_room_join_rule_public" = "%@ made the room public.";
+"notice_room_join_rule_public_for_dm" = "%@ made this public.";
+"notice_room_join_rule_public_by_you" = "You made the room public.";
+"notice_room_join_rule_public_by_you_for_dm" = "You made this public.";
+"notice_room_power_level_intro" = "The power level of room members are:";
+"notice_room_power_level_intro_for_dm" = "The power level of members are:";
+"notice_room_power_level_acting_requirement" = "The minimum power levels that a user must have before acting are:";
+"notice_room_power_level_event_requirement" = "The minimum power levels related to events are:";
+"notice_room_aliases" = "The room aliases are: %@";
+"notice_room_aliases_for_dm" = "The aliases are: %@";
+"notice_room_related_groups" = "The groups associated with this room are: %@";
+"notice_encrypted_message" = "Encrypted message";
+"notice_encryption_enabled_ok" = "%@ turned on end-to-end encryption.";
+"notice_encryption_enabled_unknown_algorithm" = "%1$@ turned on end-to-end encryption (unrecognised algorithm %2$@).";
+"notice_image_attachment" = "image attachment";
+"notice_audio_attachment" = "audio attachment";
+"notice_video_attachment" = "video attachment";
+"notice_location_attachment" = "location attachment";
+"notice_file_attachment" = "file attachment";
+"notice_invalid_attachment" = "invalid attachment";
+"notice_unsupported_attachment" = "Unsupported attachment: %@";
+"notice_feedback" = "Feedback event (id: %@): %@";
+"notice_redaction" = "%@ redacted an event (id: %@)";
+"notice_error_unsupported_event" = "Unsupported event";
+"notice_error_unexpected_event" = "Unexpected event";
+"notice_error_unknown_event_type" = "Unknown event type";
+"notice_room_history_visible_to_anyone" = "%@ made future room history visible to anyone.";
+"notice_room_history_visible_to_members" = "%@ made future room history visible to all room members.";
+"notice_room_history_visible_to_members_for_dm" = "%@ made future messages visible to all room members.";
+"notice_room_history_visible_to_members_from_invited_point" = "%@ made future room history visible to all room members, from the point they are invited.";
+"notice_room_history_visible_to_members_from_invited_point_for_dm" = "%@ made future messages visible to everyone, from when they get invited.";
+"notice_room_history_visible_to_members_from_joined_point" = "%@ made future room history visible to all room members, from the point they joined.";
+"notice_room_history_visible_to_members_from_joined_point_for_dm" = "%@ made future messages visible to everyone, from when they joined.";
+"notice_crypto_unable_to_decrypt" = "** Unable to decrypt: %@ **";
+"notice_crypto_error_unknown_inbound_session_id" = "The sender's session has not sent us the keys for this message.";
+"notice_sticker" = "sticker";
+"notice_in_reply_to" = "In reply to";
+
+// room display name
+"room_displayname_empty_room" = "Empty room";
+"room_displayname_two_members" = "%@ and %@";
+"room_displayname_more_than_two_members" = "%@ and %@ others";
+"room_displayname_all_other_members_left" = "%@ (Left)";
+
+// Settings
+"settings" = "Settings";
+"settings_enable_inapp_notifications" = "Enable In-App notifications";
+"settings_enable_push_notifications" = "Enable push notifications";
+"settings_enter_validation_token_for" = "Enter validation token for %@:";
+
+"notification_settings_room_rule_title" = "Room: '%@'";
+
+// Devices
+"device_details_title" = "Session information\n";
+"device_details_name" = "Public Name\n";
+"device_details_identifier" = "ID\n";
+"device_details_last_seen" = "Last seen\n";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_rename_prompt_title" = "Session Name";
+"device_details_rename_prompt_message" = "A session's public name is visible to people you communicate with";
+"device_details_delete_prompt_title" = "Authentication";
+"device_details_delete_prompt_message" = "This operation requires additional authentication.\nTo continue, please enter your password.";
+
+// Encryption information
+"room_event_encryption_info_title" = "End-to-end encryption information\n\n";
+"room_event_encryption_info_event" = "Event information\n";
+"room_event_encryption_info_event_user_id" = "User ID\n";
+"room_event_encryption_info_event_identity_key" = "Curve25519 identity key\n";
+"room_event_encryption_info_event_fingerprint_key" = "Claimed Ed25519 fingerprint key\n";
+"room_event_encryption_info_event_algorithm" = "Algorithm\n";
+"room_event_encryption_info_event_session_id" = "Session ID\n";
+"room_event_encryption_info_event_decryption_error" = "Decryption error\n";
+"room_event_encryption_info_event_unencrypted" = "unencrypted";
+"room_event_encryption_info_event_none" = "none";
+"room_event_encryption_info_device" = "\nSender session information\n";
+"room_event_encryption_info_device_unknown" = "unknown session\n";
+"room_event_encryption_info_device_name" = "Public Name\n";
+"room_event_encryption_info_device_id" = "ID\n";
+"room_event_encryption_info_device_verification" = "Verification\n";
+"room_event_encryption_info_device_fingerprint" = "Ed25519 fingerprint\n";
+"room_event_encryption_info_device_verified" = "Verified";
+"room_event_encryption_info_device_not_verified" = "NOT verified";
+"room_event_encryption_info_device_blocked" = "Blacklisted";
+"room_event_encryption_info_verify" = "Verify...";
+"room_event_encryption_info_unverify" = "Unverify";
+"room_event_encryption_info_block" = "Blacklist";
+"room_event_encryption_info_unblock" = "Unblacklist";
+"room_event_encryption_verify_title" = "Verify session\n\n";
+"room_event_encryption_verify_message" = "To verify that this session can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this session matches the key below:\n\n\tSession name: %@\n\tSession ID: %@\n\tSession key: %@\n\nIf it matches, press the verify button below. If it doesnt, then someone else is intercepting this session and you probably want to press the blacklist button instead.\n\nIn future this verification process will be more sophisticated.";
+"room_event_encryption_verify_ok" = "Verify";
+
+// Account
+"account_save_changes" = "Save changes";
+"account_link_email" = "Link Email";
+"account_linked_emails" = "Linked emails";
+
+"account_email_validation_title" = "Verification Pending";
+"account_email_validation_message" = "Please check your email and click on the link it contains. Once this is done, click continue.";
+"account_email_validation_error" = "Unable to verify email address. Please check your email and click on the link it contains. Once this is done, click continue";
+
+"account_msisdn_validation_title" = "Verification Pending";
+"account_msisdn_validation_message" = "We\'ve sent an SMS with an activation code. Please enter this code below.";
+"account_msisdn_validation_error" = "Unable to verify phone number.";
+
+"account_error_display_name_change_failed" = "Display name change failed";
+"account_error_picture_change_failed" = "Picture change failed";
+"account_error_matrix_session_is_not_opened" = "Matrix session is not opened";
+"account_error_email_wrong_title" = "Invalid Email Address";
+"account_error_email_wrong_description" = "This doesn't appear to be a valid email address";
+"account_error_msisdn_wrong_title" = "Invalid Phone Number";
+"account_error_msisdn_wrong_description" = "This doesn't appear to be a valid phone number";
+"account_error_push_not_allowed" = "Notifications not allowed";
+
+// Room creation
+"room_creation_name_title" = "Room name:";
+"room_creation_name_placeholder" = "(e.g. lunchGroup)";
+"room_creation_alias_title" = "Room alias:";
+"room_creation_alias_placeholder" = "(e.g. #foo:example.org)";
+"room_creation_alias_placeholder_with_homeserver" = "(e.g. #foo%@)";
+"room_creation_participants_title" = "Participants:";
+"room_creation_participants_placeholder" = "(e.g. @bob:homeserver1; @john:homeserver2...)";
+
+// Room
+"room_please_select" = "Please select a room";
+"room_error_join_failed_title" = "Failed to join room";
+"room_error_join_failed_empty_room" = "It is not currently possible to join an empty room.";
+"room_error_name_edition_not_authorized" = "You are not authorized to edit this room name";
+"room_error_topic_edition_not_authorized" = "You are not authorized to edit this room topic";
+"room_error_cannot_load_timeline" = "Failed to load timeline";
+"room_error_timeline_event_not_found_title" = "Failed to load timeline position";
+"room_error_timeline_event_not_found" = "The application was trying to load a specific point in this room's timeline but was unable to find it";
+"room_left" = "You left the room";
+"room_left_for_dm" = "You left";
+"room_no_power_to_create_conference_call" = "You need permission to invite to start a conference in this room";
+"room_no_conference_call_in_encrypted_rooms" = "Conference calls are not supported in encrypted rooms";
+
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "sent an image.";
+"message_reply_to_sender_sent_a_video" = "sent a video.";
+"message_reply_to_sender_sent_an_audio_file" = "sent an audio file.";
+"message_reply_to_sender_sent_a_voice_message" = "sent a voice message.";
+"message_reply_to_sender_sent_a_file" = "sent a file.";
+"message_reply_to_message_to_reply_to_prefix" = "In reply to";
+
+// Room members
+"room_member_ignore_prompt" = "Are you sure you want to hide all messages from this user?";
+"room_member_power_level_prompt" = "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.\nAre you sure?";
+
+// Attachment
+"attachment_size_prompt" = "Do you want to send as:";
+"attachment_size_prompt_title" = "Confirm size to send";
+"attachment_size_prompt_message" = "You can turn this off in settings.";
+"attachment_original" = "Actual Size (%@)";
+"attachment_small" = "Small (~%@)";
+"attachment_medium" = "Medium (~%@)";
+"attachment_large" = "Large (~%@)";
+"attachment_small_with_resolution" = "Small %@ (~%@)";
+"attachment_medium_with_resolution" = "Medium %@ (~%@)";
+"attachment_large_with_resolution" = "Large %@ (~%@)";
+"attachment_cancel_download" = "Cancel the download?";
+"attachment_cancel_upload" = "Cancel the upload?";
+"attachment_multiselection_size_prompt" = "Do you want to send images as:";
+"attachment_multiselection_original" = "Actual Size";
+"attachment_e2e_keys_file_prompt" = "This file contains encryption keys exported from a Matrix client.\nDo you want to view the file content or import the keys it contains?";
+"attachment_e2e_keys_import" = "Import...";
+"attachment_unsupported_preview_title" = "Unable to preview";
+"attachment_unsupported_preview_message" = "This file type is not supported.";
+
+// Contacts
+"contact_mx_users" = "Matrix Users";
+"contact_local_contacts" = "Local Contacts";
+
+// Groups
+"group_invite_section" = "Invites";
+"group_section" = "Groups";
+
+// Search
+"search_no_results" = "No Results";
+"search_searching" = "Search in progress...";
+
+// Time
+"format_time_s" = "s";
+"format_time_m" = "m";
+"format_time_h" = "h";
+"format_time_d" = "d";
+
+// E2E import
+"e2e_import_room_keys" = "Import room keys";
+"e2e_import_prompt" = "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.\nThe export file is protected with a passphrase. You should enter the passphrase here, to decrypt the file.";
+"e2e_import" = "Import";
+"e2e_passphrase_enter" = "Enter passphrase";
+
+// E2E export
+"e2e_export_room_keys" = "Export room keys";
+"e2e_export_prompt" = "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.\nThe exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure.";
+"e2e_export" = "Export";
+"e2e_passphrase_confirm" = "Confirm passphrase";
+"e2e_passphrase_empty" = "Passphrase must not be empty";
+"e2e_passphrase_too_short" = "Passphrase too short (It must be at a minimum %d characters in length)";
+"e2e_passphrase_not_match" = "Passphrases must match";
+"e2e_passphrase_create" = "Create passphrase";
+
+// Others
+"user_id_title" = "User ID:";
+"offline" = "offline";
+"unsent" = "Unsent";
+"error" = "Error";
+"error_common_message" = "An error occured. Please try again later.";
+"not_supported_yet" = "Not supported yet";
+"default" = "default";
+"private" = "Private";
+"public" = "Public";
+"power_level" = "Power Level";
+"network_error_not_reachable" = "Please check your network connectivity";
+"user_id_placeholder" = "ex: @bob:homeserver";
+"ssl_homeserver_url" = "Homeserver URL: %@";
+
+// Permissions
+"camera_access_not_granted_for_call" = "Video calls require access to the Camera but %@ doesn't have permission to use it";
+"microphone_access_not_granted_for_call" = "Calls require access to the Microphone but %@ doesn't have permission to use it";
+"local_contacts_access_not_granted" = "Users discovery from local contacts requires access to you contacts but %@ doesn't have permission to use it";
+
+"local_contacts_access_discovery_warning_title" = "Users discovery";
+"local_contacts_access_discovery_warning" = "To discover contacts already using Matrix, %@ can send email addresses and phone numbers in your address book to your chosen Matrix identity server. Where supported, personal data is hashed before sending - please check your identity server's privacy policy for more details.";
+
+"microphone_access_not_granted_for_voice_message" = "Voice messages require access to the Microphone but %@ doesn't have permission to use it";
+
+// Country picker
+"country_picker_title" = "Choose a country";
+
+// Language picker
+"language_picker_title" = "Choose a language";
+"language_picker_default_language" = "Default (%@)";
+
+/* -*- 
+   Automatic localization for en
+
+   The following key/value pairs were extracted from the android i18n file:
+    /matrix-sdk/src/main/res/values/strings.xml.
+*/
+
+"notice_room_invite" = "%@ invited %@";
+"notice_room_third_party_invite" = "%@ sent an invitation to %@ to join the room";
+"notice_room_third_party_invite_for_dm" = "%@ invited %@";
+"notice_room_third_party_registered_invite" = "%@ accepted the invitation for %@";
+"notice_room_third_party_revoked_invite" = "%@ revoked the invitation for %@ to join the room";
+"notice_room_third_party_revoked_invite_for_dm" = "%@ revoked %@'s invitation";
+"notice_room_join" = "%@ joined";
+"notice_room_leave" = "%@ left";
+"notice_room_reject" = "%@ rejected the invitation";
+"notice_room_kick" = "%@ kicked %@";
+"notice_room_unban" = "%@ unbanned %@";
+"notice_room_ban" = "%@ banned %@";
+"notice_room_withdraw" = "%@ withdrew %@'s invitation";
+"notice_room_reason" = ". Reason: %@";
+"notice_avatar_url_changed" = "%@ changed their avatar";
+"notice_display_name_set" = "%@ set their display name to %@";
+"notice_display_name_changed_from" = "%@ changed their display name from %@ to %@";
+"notice_display_name_removed" = "%@ removed their display name";
+"notice_topic_changed" = "%@ changed the topic to \"%@\".";
+"notice_room_name_changed" = "%@ changed the room name to %@.";
+"notice_room_name_changed_for_dm" = "%@ changed the name to %@.";
+"notice_placed_voice_call" = "%@ placed a voice call";
+"notice_placed_video_call" = "%@ placed a video call";
+"notice_answered_video_call" = "%@ answered the call";
+"notice_ended_video_call" = "%@ ended the call";
+"notice_declined_video_call" = "%@ declined the call";
+"notice_conference_call_request" = "%@ requested a VoIP conference";
+"notice_conference_call_started" = "VoIP conference started";
+"notice_conference_call_finished" = "VoIP conference finished";
+
+// Notice Events with "You"
+"notice_room_invite_by_you" = "You invited %@";
+"notice_room_invite_you" = "%@ invited you";
+"notice_room_third_party_invite_by_you" = "You sent an invitation to %@ to join the room";
+"notice_room_third_party_invite_by_you_for_dm" = "You invited %@";
+"notice_room_third_party_registered_invite_by_you" = "You accepted the invitation for %@";
+"notice_room_third_party_revoked_invite_by_you" = "You revoked the invitation for %@ to join the room";
+"notice_room_third_party_revoked_invite_by_you_for_dm" = "You revoked %@'s invitation";
+"notice_room_join_by_you" = "You joined";
+"notice_room_leave_by_you" = "You left";
+"notice_room_reject_by_you" = "You rejected the invitation";
+"notice_room_kick_by_you" = "You kicked %@";
+"notice_room_unban_by_you" = "You unbanned %@";
+"notice_room_ban_by_you" = "You banned %@";
+"notice_room_withdraw_by_you" = "You withdrew %@'s invitation";
+"notice_avatar_url_changed_by_you" = "You changed your avatar";
+"notice_display_name_set_by_you" = "You set your display name to %@";
+"notice_display_name_changed_from_by_you" = "You changed your display name from %@ to %@";
+"notice_display_name_removed_by_you" = "You removed your display name";
+"notice_topic_changed_by_you" = "You changed the topic to \"%@\".";
+"notice_room_name_changed_by_you" = "You changed the room name to %@.";
+"notice_room_name_changed_by_you_for_dm" = "You changed the name to %@.";
+"notice_placed_voice_call_by_you" = "You placed a voice call";
+"notice_placed_video_call_by_you" = "You placed a video call";
+"notice_answered_video_call_by_you" = "You answered the call";
+"notice_ended_video_call_by_you" = "You ended the call";
+"notice_declined_video_call_by_you" = "You declined the call";
+"notice_conference_call_request_by_you" = "You requested a VoIP conference";
+"notice_room_name_removed_by_you" = "You removed the room name";
+"notice_room_name_removed_by_you_for_dm" = "You removed the name";
+"notice_room_topic_removed_by_you" = "You removed the topic";
+"notice_event_redacted_by_you" = " by you";
+"notice_profile_change_redacted_by_you" = "You updated your profile %@";
+"notice_room_created_by_you" = "You created and configured the room.";
+"notice_room_created_by_you_for_dm" = "You joined.";
+"notice_encryption_enabled_ok_by_you" = "You turned on end-to-end encryption.";
+"notice_encryption_enabled_unknown_algorithm_by_you" = "You turned on end-to-end encryption (unrecognised algorithm %@).";
+"notice_redaction_by_you" = "You redacted an event (id: %@)";
+"notice_room_history_visible_to_anyone_by_you" = "You made future room history visible to anyone.";
+"notice_room_history_visible_to_members_by_you" = "You made future room history visible to all room members.";
+"notice_room_history_visible_to_members_by_you_for_dm" = "You made future messages visible to all room members.";
+"notice_room_history_visible_to_members_from_invited_point_by_you" = "You made future room history visible to all room members, from the point they are invited.";
+"notice_room_history_visible_to_members_from_invited_point_by_you_for_dm" = "You made future messages visible to everyone, from when they get invited.";
+"notice_room_history_visible_to_members_from_joined_point_by_you" = "You made future room history visible to all room members, from the point they joined.";
+"notice_room_history_visible_to_members_from_joined_point_by_you_for_dm" = "You made future messages visible to everyone, from when they joined.";
+
+// Room Screen 
+
+// general errors 
+
+// Home Screen 
+
+// Last seen time 
+
+// call events 
+
+/* -*- 
+   Automatic localization for en
+
+   The following key/value pairs were extracted from the android i18n file:
+    /console/src/main/res/values/strings.xml.
+*/
+
+
+// titles 
+
+// button names 
+"ok" = "OK";
+"cancel" = "Cancel";
+"save" = "Save";
+"leave" = "Leave";
+"send" = "Send";
+"copy_button_name" = "Copy";
+"resend" = "Resend";
+"redact" = "Remove";
+"share" = "Share";
+"delete" = "Delete";
+"view" = "View";
+"rename" = "Rename";
+
+// actions 
+"action_logout" = "Logout";
+"create_room" = "Create Room";
+"login" = "Login";
+"create_account" = "Create Account";
+"membership_invite" = "Invited";
+"membership_leave" = "Left";
+"membership_ban" = "Banned";
+"num_members_one" = "%@ user";
+"num_members_other" = "%@ users";
+"invite" = "Invite";
+"kick" = "Kick";
+"ban" = "Ban";
+"unban" = "Un-ban";
+"message_unsaved_changes" = "There are unsaved changes. Leaving will discard them.";
+
+// Login Screen 
+"login_error_already_logged_in" = "Already logged in";
+"login_error_must_start_http" = "URL must start with http[s]://";
+
+// members list Screen 
+
+// accounts list Screen 
+
+// image size selection 
+
+// invitation members list Screen 
+
+// room creation dialog Screen 
+
+// room info dialog Screen
+
+// room details dialog screen
+"room_details_title" = "Room Details";
+
+// contacts list screen 
+"invitation_message" = "I\'d like to chat with you with matrix. Please, visit the website http://matrix.org to have more information.";
+
+// Settings screen 
+"settings_title_config" = "Configuration";
+"settings_title_notifications" = "Notifications";
+
+// Notification settings screen 
+"notification_settings_disable_all" = "Disable all notifications";
+"notification_settings_enable_notifications" = "Enable notifications";
+"notification_settings_enable_notifications_warning" = "All notifications are currently disabled for all devices.";
+"notification_settings_global_info" = "Notification settings are saved to your user account and are shared between all clients which support them (including desktop notifications).\n\nRules are applied in order; the first rule which matches defines the outcome for the message.\nSo: Per-word notifications are more important than per-room notifications which are more important than per-sender notifications.\nFor multiple rules of the same kind, the first one in the list that matches takes priority.";
+"notification_settings_per_word_notifications" = "Per-word notifications";
+"notification_settings_per_word_info" = "Words match case insensitively, and may include a * wildcard. So:\nfoo matches the string foo surrounded by word delimiters (e.g. punctuation and whitespace or start/end of line).\nfoo* matches any such word that begins foo.\n*foo* matches any such word which includes the 3 letters foo.";
+"notification_settings_always_notify" = "Always notify";
+"notification_settings_never_notify" = "Never notify";
+"notification_settings_word_to_match" = "word to match";
+"notification_settings_highlight" = "Highlight";
+"notification_settings_custom_sound" = "Custom sound";
+"notification_settings_per_room_notifications" = "Per-room notifications";
+"notification_settings_per_sender_notifications" = "Per-sender notifications";
+"notification_settings_sender_hint" = "\@user:domain.com";
+"notification_settings_select_room" = "Select a room";
+"notification_settings_other_alerts" = "Other Alerts";
+"notification_settings_contain_my_user_name" = "Notify me with sound about messages that contain my user name";
+"notification_settings_contain_my_display_name" = "Notify me with sound about messages that contain my display name";
+"notification_settings_just_sent_to_me" = "Notify me with sound about messages sent just to me";
+"notification_settings_invite_to_a_new_room" = "Notify me when I am invited to a new room";
+"notification_settings_people_join_leave_rooms" = "Notify me when people join or leave rooms";
+"notification_settings_receive_a_call" = "Notify me when I receive a call";
+"notification_settings_suppress_from_bots" = "Suppress notifications from bots";
+"notification_settings_by_default" = "By default...";
+"notification_settings_notify_all_other" = "Notify for all other messages/rooms";
+
+// gcm section 
+"settings_config_home_server" = "Homeserver: %@";
+"settings_config_identity_server" = "Identity server: %@";
+"settings_config_user_id" = "User ID: %@";
+
+// Settings keys 
+
+// call string
+"call_connecting" = "Connecting…";
+"call_ringing" = "Ringing…";
+"call_ended" = "Call ended";
+"incoming_video_call" = "Incoming Video Call";
+"incoming_voice_call" = "Incoming Voice Call";
+"call_invite_expired" = "Call Invite Expired";
+"call_remote_holded" = "%@ held the call";
+"call_holded" = "You held the call";
+"call_more_actions_hold" = "Hold";
+"call_more_actions_unhold" = "Resume";
+"call_more_actions_change_audio_device" = "Change Audio Device";
+"call_more_actions_audio_use_device" = "Device Speaker";
+"call_more_actions_transfer" = "Transfer";
+"call_more_actions_dialpad" = "Dial pad";
+"call_voice_with_user" = "Voice call with %@";
+"call_video_with_user" = "Video call with %@";
+"call_consulting_with_user" = "Consulting with %@";
+"call_transfer_to_user" = "Transfer to %@";
+
+// unrecognized SSL certificate
+"ssl_trust" = "Trust";
+"ssl_logout_account" = "Logout";
+"ssl_remain_offline" = "Ignore";
+"ssl_fingerprint_hash" = "Fingerprint (%@):";
+"ssl_could_not_verify" = "Could not verify identity of remote server.";
+"ssl_cert_not_trust" = "This could mean that someone is maliciously intercepting your traffic, or that your phone does not trust the certificate provided by the remote server.";
+"ssl_cert_new_account_expl" = "If the server administrator has said that this is expected, ensure that the fingerprint below matches the fingerprint provided by them.";
+"ssl_unexpected_existing_expl" = "The certificate has changed from one that was trusted by your phone. This is HIGHLY UNUSUAL. It is recommended that you DO NOT ACCEPT this new certificate.";
+"ssl_expected_existing_expl" = "The certificate has changed from a previously trusted one to one that is not trusted. The server may have renewed its certificate. Contact the server administrator for the expected fingerprint.";
+"ssl_only_accept" = "ONLY accept the certificate if the server administrator has published a fingerprint that matches the one above.";
+
+"auth_invalid_user_name" = "Invalid username";
+"auth_username_in_use" = "Username in use";
+"auth_reset_password_error_unauthorized" = "Unauthorized";
+"auth_reset_password_error_not_found" = "Not found";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/eo.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/eo.lproj/MatrixKit.strings
new file mode 100644
index 000000000..675f3b483
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/eo.lproj/MatrixKit.strings
@@ -0,0 +1,533 @@
+"notice_crypto_unable_to_decrypt" = "** Ne eblas malĉifri: %@ **";
+"notice_crypto_error_unknown_inbound_session_id" = "La salutaĵo de la sendanto ne sendis al ni la ŝlosilojn por tiu mesaĝo.";
+"notice_in_reply_to" = "Respondanta al";
+// room display name
+"room_displayname_empty_room" = "Malplena babilejo";
+"room_displayname_two_members" = "%@ kaj %@";
+"room_displayname_more_than_two_members" = "%@ kaj %@ aliaj";
+// Settings
+"settings" = "Agordoj";
+"message_reply_to_message_to_reply_to_prefix" = "Respondanta al";
+"room_event_encryption_verify_title" = "Kontroli salutaĵon\n\n";
+"back" = "Reiri";
+"close" = "Fermi";
+"continue" = "Daŭrigi";
+"retry" = "Reprovi";
+"cancel" = "Nuligi";
+"save" = "Konservi";
+"leave" = "Forlasi";
+"view" = "Vidi";
+"invite" = "Inviti";
+
+// members list Screen 
+
+// accounts list Screen 
+
+// image size selection 
+
+// invitation members list Screen 
+
+// room creation dialog Screen 
+
+// room info dialog Screen
+
+// room details dialog screen
+"room_details_title" = "Detaloj pri ĉambro";
+"register_error_title" = "Registriĝo malsukcesis";
+"login_invalid_param" = "Nevalida parametro";
+"login_leave_fallback" = "Nuligi";
+"login_error_login_email_not_yet" = "La retpoŝta ligilo, kiun vi ankoraŭ ne klakis";
+"login_error_user_in_use" = "Tiu ĉi uzantonomo jam estas uzata";
+"login_error_limit_exceeded" = "Tro multaj petoj sendiĝis";
+"login_error_not_json" = "Ne enhavis validajn JSON-datumojn";
+"login_error_bad_json" = "Misformitaj JSON-datumoj";
+"login_error_unknown_token" = "La donita ĵetono de aliro ne rekoniĝis";
+"login_error_forbidden" = "Nevalidaj uzantonomo aŭ pasvorto";
+"login_error_registration_is_not_supported" = "Registriĝo ne estas nun subtenata";
+"login_error_do_not_support_login_flows" = "Nuntempe ni subtenas neniujn manierojn de salutado difinitajn de tiu ĉi hejmservilo";
+"login_error_no_login_flow" = "Ni malsukcesis akiri informojn pri aŭtentikigo de ĉi tiu hejmservilo";
+"login_error_title" = "Malsukcesis saluto";
+"login_prompt_email_token" = "Bonvolu enigi vian ĵetonon de retpoŝta validigo:";
+"login_email_placeholder" = "Retpoŝtadreso";
+"login_email_info" = "Specifu retpoŝtadresojn por ebligi vian pli facilan troviĝon de aliaj uzantoj, kaj ankaŭ por restarigi vian pasvorton okaze de perdo.";
+"login_display_name_placeholder" = "Prezenta nomo (ekz. Ivano Ĥlestakov)";
+"login_optional_field" = "malnepra";
+"login_password_placeholder" = "Pasvorto";
+"login_user_id_placeholder" = "Identigilo de Matrix (ekz. @ivano:matrix.org aŭ ivano)";
+"login_identity_server_info" = "Matrix havas identigajn servilojn por scii, kiuj retleteroj ktp. bezonas al kiuj identigiloj de Matrix. Nur https://matrix.org ekzistas nuntempe.";
+"login_identity_server_title" = "URL de identiga servilo:";
+"login_home_server_info" = "Via hejmservilo konservas ĉiujn viajn interparolojn kaj datumojn de konto";
+"login_home_server_title" = "URL de hejmservilo:";
+"login_server_url_placeholder" = "URL (ekz. https://matrix.org)";
+
+// Login Screen
+"login_create_account" = "Krei konton:";
+/* *********************** */
+/*      iOS specific       */
+/* *********************** */
+
+"matrix" = "Matrix";
+"login_desktop_device" = "Tabla komputilo";
+"login_tablet_device" = "Tabulkomputilo";
+"login_mobile_device" = "Telefono";
+"room_event_encryption_verify_message" = "Por certigi, ke ĉi tiu salutaĵo povas esti fidata, bonvolu kontakti ĝian posedanton per alia maniero (ekz. persone aŭ per telefona voko) kaj demandu, ĉu la ŝlosilo, kiun ĝi vidas en siaj agordoj de uzanto por ĉi tiu salutaĵo, akordas kun la ĉi-suba:\n\n\tNomo de salutaĵo: %@\n\tIdentigilo de salutaĵo: %@\n\tŜlosilo de salutaĵo: %@\n\nSe la ŝlosilo akordas, premu la kontrolan butonon ĉi-sube. Se ne, iu alia subaŭskultas la salutaĵon, kaj vi probable volas anstataŭe malpermesi ĝin.\n\nĈi tiu kontrola procedo plifaciliĝos estontece.";
+"room_event_encryption_info_device_fingerprint" = "Fingrospuro je Ed25519\n";
+"room_event_encryption_info_event_fingerprint_key" = "Asertita ŝlosilo de fingrospuro je Ed25519\n";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"notice_feedback" = "Responda okazo (identigilo: %@): %@";
+"discard" = "Forĵeti";
+"abort" = "Ĉesigi";
+"login_use_fallback" = "Uzi repaŝan paĝon";
+"ssl_only_accept" = "Akceptu la atestilon NUR SE administranto de la servilo publikigis fingrospuron, kiu akordas kun la ĉi-supra.";
+"ssl_expected_existing_expl" = "La atestilo ŝanĝiĝis de atestilo antaŭe fidata al alia, kiu ne estas fidata. Eble la servilo renovigis sian atestilon. Kontaktu la administranton de la servilo por ricevi la atendindan fingrospuron.";
+"ssl_unexpected_existing_expl" = "La atestilo ŝanĝiĝis de tiu, kiun fidis via telefono. Tio estas TRE STRANGA. Oni rekomendas, ke vi NE AKCEPTU ĉi tiun novan atestilon.";
+"ssl_cert_new_account_expl" = "Se la administranto de la servilo diris, ke tio atendindas, certigu, ke la ĉi-suba fingrospuro akordas kun la fingrospuro donita de la administranto.";
+"ssl_cert_not_trust" = "Tio povus signifi, ke iu malice subaŭskultas vian rettrafikon, aŭ ke via telefono ne fidas la atestilon donitan de la fora servilo.";
+"ssl_could_not_verify" = "Ne povis kontroli identecon de fora servilo.";
+"ssl_fingerprint_hash" = "Fingrospuro (%@):";
+"ssl_remain_offline" = "Malatenti";
+"ssl_logout_account" = "Adiaŭi";
+
+// unrecognized SSL certificate
+"ssl_trust" = "Fidi";
+"call_transfer_to_user" = "Transdoni al %@";
+"call_consulting_with_user" = "Konsultante kun %@";
+"call_video_with_user" = "Vidvoko kun %@";
+"call_voice_with_user" = "Voĉvoko kun %@";
+"call_more_actions_dialpad" = "Ciferplato";
+"call_more_actions_transfer" = "Transdoni";
+"call_more_actions_audio_use_device" = "Soni aparate";
+"call_more_actions_audio_use_headset" = "Soni kapaŭskultile";
+"call_more_actions_change_audio_device" = "Ŝanĝi sonaparaton";
+"call_more_actions_unhold" = "Daŭrigi";
+"call_more_actions_hold" = "Paŭzigi";
+"call_holded" = "Vi paŭzigis la vokon";
+"call_remote_holded" = "%@ paŭzigis la vokon";
+"call_invite_expired" = "Inviti al voko atingis tempolimon";
+"incoming_voice_call" = "Envena voĉvoko";
+"incoming_video_call" = "Envena vidvoko";
+"call_ended" = "Voko finiĝis";
+"call_ringing" = "Sonorante…";
+
+// Settings keys 
+
+// call string
+"call_connecting" = "Konektante…";
+"settings_config_user_id" = "Identigilo de uzanto: %@";
+"settings_config_identity_server" = "Identiga servilo: %@";
+
+// gcm section 
+"settings_config_home_server" = "Hejmservilo: %@";
+"notification_settings_notify_all_other" = "Sciigi por ĉiuj aliaj mesaĝoj/ĉambroj";
+"notification_settings_by_default" = "Implicite…";
+"notification_settings_suppress_from_bots" = "Forteni sciigojn de robotoj";
+"notification_settings_receive_a_call" = "Sciigu min pri ricevitaj vokoj";
+"notification_settings_people_join_leave_rooms" = "Sciigu min pri aliĝoj al aŭ foriroj de ĉambroj";
+"notification_settings_invite_to_a_new_room" = "Sciigu min pri invitoj al novaj ĉambroj";
+"notification_settings_just_sent_to_me" = "Sciigu min per sono pri mesaĝoj, kiuj sendiĝis al mi individue";
+"notification_settings_contain_my_display_name" = "Sciigu min per sono pri mesaĝoj, kiuj enhavas mian prezentan nomon";
+"notification_settings_contain_my_user_name" = "Sciigu min per sono pri mesaĝoj, kiuj enhavas mian uzantonomon";
+"notification_settings_other_alerts" = "Aliaj atentigoj";
+"notification_settings_select_room" = "Elekti ĉambron";
+"notification_settings_sender_hint" = "@uzanto:retnomo.net";
+"notification_settings_per_sender_notifications" = "Sendintulaj sciigoj";
+"notification_settings_per_room_notifications" = "Ĉambraj sciigoj";
+"notification_settings_custom_sound" = "Propra sono";
+"notification_settings_highlight" = "Emfazo";
+"notification_settings_word_to_match" = "akordaj vortoj";
+"notification_settings_never_notify" = "Neniam sciigi";
+"notification_settings_always_notify" = "Ĉiam sciigi";
+"notification_settings_per_word_info" = "Vortoj akordas sendepende de grandeco, kaj povas enhavi la ĵokeron *. Sekve:\nekzemplo akordas kun la tekstoĉeno «ekzemplo» ĉirkaŭita de vortlimiloj (ekz. interpunkcio kaj spaco aŭ komenco/fino de linio).\nekzemplo* akordas kun ĉiu tia vorto, kiu komenciĝas per «ekzemplo».\n*ekzemplo* akordas kun ĉiu tia vorto, kiu enhavas la sinsekvon de literoj «ekzemplo».";
+"notification_settings_per_word_notifications" = "Vortaj sciigoj";
+"notification_settings_global_info" = "Agordoj pri sciigoj estas konservitaj en via konto de uzanto kaj havigitaj al ĉiuj klientoj, kiuj ilin subtenas (inkluzive sciigojn labortablajn).\n\nReguloj aplikiĝas laŭorde; la unua regulo, kiu akordas, difinas la rezulton por la mesaĝo.\nSekve: vortaj sciigoj estas pli gravaj ol ĉambraj sciigoj, kiuj estas pli gravaj ol sendintulaj sciigoj.\nPor pluraj reguloj samspecaj, la unua akorda en la listo estas prioritata.";
+"notification_settings_enable_notifications_warning" = "Ĉiuj sciigoj nun estas malŝaltitaj por ĉiuj aparatoj.";
+"notification_settings_enable_notifications" = "Ŝalti sciigojn";
+
+// Notification settings screen 
+"notification_settings_disable_all" = "Malŝalti ĉiujn sciigojn";
+"settings_title_notifications" = "Sciigoj";
+
+// Settings screen 
+"settings_title_config" = "Agordaro";
+
+// contacts list screen 
+"invitation_message" = "Mi volus babili kun vi per Matrix. Bonvolu viziti la retpaĝon http://matrix.org por pliaj informoj.";
+"login_error_must_start_http" = "URL devas komenciĝi per http[s]://";
+
+// Login Screen 
+"login_error_already_logged_in" = "Jam salutinta";
+"message_unsaved_changes" = "Restas nekonservitaj ŝanĝoj. Forlaso ilin forĵetos.";
+"unban" = "Malforbari";
+"ban" = "Forbari";
+"kick" = "Forpeli";
+"num_members_other" = "%@ uzantoj";
+"num_members_one" = "%@ uzanto";
+"membership_ban" = "Forbarita";
+"membership_leave" = "Foririnta";
+"membership_invite" = "Invitita";
+"create_account" = "Krei konton";
+"login" = "Saluti";
+"create_room" = "Krei ĉambron";
+
+// actions 
+"action_logout" = "Adiaŭi";
+"delete" = "Forigi";
+"share" = "Havigi";
+"redact" = "Forigi";
+"resend" = "Resendi";
+"copy_button_name" = "Kopii";
+"send" = "Sendi";
+
+// Room Screen 
+
+// general errors 
+
+// Home Screen 
+
+// Last seen time 
+
+// call events 
+
+/* -*- 
+   Automatic localization for en
+
+   The following key/value pairs were extracted from the android i18n file:
+    /console/src/main/res/values/strings.xml.
+*/
+
+
+// titles 
+
+// button names 
+"ok" = "Bone";
+"notice_room_history_visible_to_members_from_joined_point_by_you" = "Vi videbligis estontan historion de la ĉambro al ĉiuj ĉambranoj, ekde ties aliĝo.";
+"notice_room_history_visible_to_members_from_invited_point_by_you_for_dm" = "Vi videbligis estontajn mesaĝojn al ĉiuj ĉambranoj, ekde ties invito.";
+"notice_room_history_visible_to_members_from_invited_point_by_you" = "Vi videbligis estontan historion de la ĉambro al ĉiuj ĉambranoj, ekde ties invito.";
+"notice_room_history_visible_to_members_by_you_for_dm" = "Vi videbligis estontajn mesaĝojn al ĉiuj ĉambranoj.";
+"notice_room_history_visible_to_members_from_joined_point_by_you_for_dm" = "Vi videbligis estontajn mesaĝojn al ĉiuj ĉambranoj, ekde ties aliĝo.";
+"notice_room_history_visible_to_members_by_you" = "Vi videbligis estontan historion de ĉambro al ĉiuj ĉambranoj.";
+"notice_room_history_visible_to_anyone_by_you" = "Vi videbligis estontan historion de ĉambro al ĉiu ajn.";
+"notice_encryption_enabled_unknown_algorithm_by_you" = "Vi ŝaltis tutvojan ĉifradon (nerekonita algoritmo %@).";
+"notice_encryption_enabled_ok_by_you" = "Vi ŝaltis tutvojan ĉifradon.";
+"notice_room_created_by_you_for_dm" = "Vi aliĝis.";
+"notice_room_created_by_you" = "Vi kreis kaj agordis la ĉambron.";
+"notice_profile_change_redacted_by_you" = "Vi ĝisdatigis vian profilon %@";
+"notice_event_redacted_by_you" = " de vi";
+"notice_room_topic_removed_by_you" = "Vi forigis la temon";
+"notice_room_name_removed_by_you_for_dm" = "Vi forigis la nomon";
+"notice_room_name_removed_by_you" = "Vi forigis nomon de la ĉambro";
+"notice_conference_call_request_by_you" = "Vi petis grupan vokon";
+"notice_declined_video_call_by_you" = "Vi rifuzis la vokon";
+"notice_ended_video_call_by_you" = "Vi finis la vokon";
+"notice_answered_video_call_by_you" = "Vi respondis la vokon";
+"notice_placed_video_call_by_you" = "Vi ekigis vidvokon";
+"notice_placed_voice_call_by_you" = "Vi ekigis voĉvokon";
+"notice_room_name_changed_by_you_for_dm" = "Vi ŝanĝis la nomon al %@.";
+"notice_room_name_changed_by_you" = "Vi ŝanĝis nomon de la ĉambro al %@.";
+"notice_topic_changed_by_you" = "Vi ŝanĝis la temon al «%@».";
+"notice_display_name_removed_by_you" = "Vi forigis vian prezentan nomon";
+"notice_display_name_changed_from_by_you" = "Vi ŝanĝis vian prezentan nomon de %@ al %@";
+"notice_display_name_set_by_you" = "Vi agordis vian prezentan nomon al %@";
+"notice_avatar_url_changed_by_you" = "Vi ŝanĝis vian profilbildon";
+"notice_room_withdraw_by_you" = "Vi nuligis la inviton por %@";
+"notice_room_ban_by_you" = "Vi forbaris uzanton %@";
+"notice_room_unban_by_you" = "Vi malforbaris uzanton %@";
+"notice_room_kick_by_you" = "Vi forpelis uzanton %@";
+"notice_room_reject_by_you" = "Vi rifuzis la inviton";
+"notice_room_leave_by_you" = "Vi foriris";
+"notice_room_join_by_you" = "Vi aliĝis";
+"notice_room_third_party_revoked_invite_by_you_for_dm" = "Vi nuligis la inviton por %@";
+"notice_room_third_party_revoked_invite_by_you" = "Vi nuligis la inviton al la ĉambro por %@";
+"notice_room_third_party_registered_invite_by_you" = "Vi akceptis la inviton por %@";
+"notice_room_third_party_invite_by_you_for_dm" = "Vi invitis uzanton %@";
+"notice_room_third_party_invite_by_you" = "Vi sendis inviton al la ĉambro al %@";
+"notice_room_invite_you" = "%@ invitis vin";
+
+// Notice Events with "You"
+"notice_room_invite_by_you" = "Vi invitis uzanton %@";
+"notice_conference_call_finished" = "Grupa voko finiĝis";
+"notice_conference_call_started" = "Grupa voko komenciĝis";
+"notice_conference_call_request" = "%@ petis grupan vokon";
+"notice_declined_video_call" = "%@ rifuzis la vokon";
+"notice_ended_video_call" = "%@ finis la vokon";
+"notice_answered_video_call" = "%@ respondis la vokon";
+"notice_placed_video_call" = "%@ ekigis vidvokon";
+"notice_placed_voice_call" = "%@ ekigis voĉvokon";
+"notice_room_name_changed_for_dm" = "%@ ŝanĝis la nomon al %@.";
+"notice_room_name_changed" = "%@ ŝanĝis nomon de la ĉambro al %@.";
+"notice_topic_changed" = "%@ ŝanĝis la temon al «%@».";
+"notice_display_name_removed" = "%@ forigis sian prezentan nomon";
+"notice_display_name_changed_from" = "%@ ŝanĝis sian prezentan nomon de %@ al %@";
+"notice_display_name_set" = "%@ ŝanĝis sian prezentan nomon al %@";
+"notice_avatar_url_changed" = "%@ ŝanĝis sian profilbildon";
+"notice_room_reason" = ". Kialo: %@";
+"notice_room_withdraw" = "%@ nuligis inviton por %@";
+"notice_room_ban" = "%@ forbaris uzanton %@";
+"notice_room_unban" = "%@ malforbaris uzanton %@";
+"notice_room_kick" = "%@ forpelis uzanton %@";
+"notice_room_reject" = "%@ rifuzis la inviton";
+"notice_room_leave" = "%@ foriris";
+"notice_room_join" = "%@ aliĝis";
+"notice_room_third_party_revoked_invite_for_dm" = "%@ nuligis la inviton por %@";
+"notice_room_third_party_revoked_invite" = "%@ nuligis la inviton al la ĉambro por %@";
+"notice_room_third_party_registered_invite" = "%@ akceptis la inviton por %@";
+"notice_room_third_party_invite_for_dm" = "%@ invitis uzanton %@";
+"notice_room_third_party_invite" = "%@ sendis inviton al la ĉambro al %@";
+
+/* -*- 
+   Automatic localization for en
+
+   The following key/value pairs were extracted from the android i18n file:
+    /matrix-sdk/src/main/res/values/strings.xml.
+*/
+
+"notice_room_invite" = "%@ invitis uzanton %@";
+"language_picker_default_language" = "Implicita (%@)";
+
+// Language picker
+"language_picker_title" = "Elektu lingvon";
+
+// Country picker
+"country_picker_title" = "Elektu landon";
+"local_contacts_access_discovery_warning" = "Por trovi kontaktojn, kiuj jam uzas Matrix-on, %@ povas sendi retpoŝtadresojn kaj telefonnumerojn de via adresaro al via elektita identiga servilo de Matrix. Kiam eblas, personaj datumoj estas haketitaj antaŭ sendo – bonvolu kontroli la privatecan politikon de via identiga servilo por pliaj detaloj.";
+"local_contacts_access_discovery_warning_title" = "Trovado de uzantoj";
+"local_contacts_access_not_granted" = "Trovado de uzantoj per lokaj kontaktoj postulas aliron al viaj kontaktoj, sed %@ nun ne rajtas ilin uzi";
+"microphone_access_not_granted_for_call" = "Vokoj postulas aliron al la mikrofono, sed %@ nun ne rajtas ĝin uzi";
+
+// Permissions
+"camera_access_not_granted_for_call" = "Vidvokoj postulas aliron al la filmilo, sed %@ nun ne rajtas ĝin uzi";
+"ssl_homeserver_url" = "URL de hejmservilo: %@";
+"user_id_placeholder" = "ekz. @kjara:hejmservilo";
+"network_error_not_reachable" = "Bonvolu kontroli vian retkonekton";
+"power_level" = "Povnivelo";
+"public" = "Publika";
+"private" = "Privata";
+"default" = "implicita";
+"not_supported_yet" = "Ankoraŭ ne subtenata";
+"error_common_message" = "Io eraris. Bonvolu reprovi poste.";
+"error" = "Eraro";
+"unsent" = "Nesendita";
+"offline" = "eksterrete";
+
+// Others
+"user_id_title" = "Identigilo de uzanto:";
+"e2e_passphrase_create" = "Krei pasfrazon";
+"e2e_passphrase_not_match" = "Pasfrazoj devas akordi";
+"e2e_passphrase_empty" = "Pasfrazo maldevas esti malplena";
+"e2e_passphrase_confirm" = "Konfirmi pasfrazon";
+"e2e_export" = "Elporti";
+"e2e_export_prompt" = "Ĉi tiu procedo ebligas elporton de ŝlosiloj por mesaĝoj, kiujn vi ricevis en ĉifritaj ĉambroj, al loka dosiero. Poste vi povos enporti tiun dosieron en alian klienton de Matrix, por ke ankaŭ tiu kliento povu malĉifri la mesaĝojn.\nLa elportita dosiero ebligos legadon de videblaj ĉifritaj mesaĝoj al ĉiu, kiu povos ĝin legi; vi do provu ĝin teni en sekura loko.";
+
+// E2E export
+"e2e_export_room_keys" = "Elporti ĉambrajn ŝlosilojn";
+"e2e_passphrase_enter" = "Enigi pasfrazon";
+"e2e_import" = "Enporti";
+"e2e_import_prompt" = "Ĉi tiu procedo ebligas enporti ĉifrajn ŝlosilojn, kiujn vi antaŭe elportis el alia kliento de Matrix. Poste vi povos malĉifri ĉiujn mesaĝojn, kiujn ankaŭ la alia kliento povis malĉifri.\nLa elportitan dosieron protektas pasfrazo. Vi enigu la pasfrazon ĉi tien, por malĉifri la dosieron.";
+
+// E2E import
+"e2e_import_room_keys" = "Enporti ŝlosilojn de ĉambro";
+"format_time_d" = "j";
+"format_time_h" = "h";
+"format_time_m" = "m";
+
+// Time
+"format_time_s" = "s";
+"search_searching" = "Serĉo progresas…";
+
+// Search
+"search_no_results" = "Neniuj rezultoj";
+"group_section" = "Grupoj";
+
+// Groups
+"group_invite_section" = "Invitoj";
+"contact_local_contacts" = "Lokaj kontaktoj";
+
+// Contacts
+"contact_mx_users" = "Uzantoj de Matrix";
+"attachment_e2e_keys_import" = "Enporti…";
+"attachment_e2e_keys_file_prompt" = "Ĉi tiu dosiero enhavas ĉifrajn ŝlosilojn elportitajn el kliento de Matrix.\nĈu vi volas vidi enhavojn de la dosiero aŭ enporti la enhavatajn ŝlosilojn?";
+"attachment_multiselection_original" = "Originala grando";
+"attachment_multiselection_size_prompt" = "Ĉu vi volas sendi bildojn kiel:";
+"attachment_cancel_upload" = "Ĉu nuligi la alŝuton?";
+"attachment_cancel_download" = "Ĉu nuligi la elŝuton?";
+"attachment_large" = "Granda: %@";
+"attachment_medium" = "Meza: %@";
+"attachment_small" = "Malgranda: %@";
+"attachment_original" = "Originala: %@";
+
+// Attachment
+"attachment_size_prompt" = "Ĉu vi volas sendi en grando:";
+"room_member_power_level_prompt" = "Vi ne povos malfari ĉi tiun ŝanĝon, ĉar vi povigas la uzanton al la sama nivelo, kiun vi havas.\nĈu vi certas?";
+
+// Room members
+"room_member_ignore_prompt" = "Ĉu vi certe volas kaŝi ĉiujn mesaĝojn de tiu ĉi uzanto?";
+"message_reply_to_sender_sent_a_file" = "sendis dosieron.";
+"message_reply_to_sender_sent_an_audio_file" = "sendis sondosieron.";
+"message_reply_to_sender_sent_a_video" = "sendis filmon.";
+
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "sendis bildon.";
+"room_no_conference_call_in_encrypted_rooms" = "Grupaj vokoj ne estas subtenataj en ĉifritaj ĉambroj";
+"room_no_power_to_create_conference_call" = "Vi bezonas permeson komenci grupan vokon en ĉi tiu ĉambro";
+"room_left_for_dm" = "Vi foriris";
+"room_left" = "Vi foriris de la ĉambro";
+"room_error_timeline_event_not_found" = "La aplikaĵo provis enlegi precizan punkton en la historio de ĉi tiu ĉambro, sed ne povis ĝin trovi";
+"room_error_timeline_event_not_found_title" = "Malsukcesis enlegi pozicion en historio";
+"room_error_cannot_load_timeline" = "Malsukcesis enlegi historion";
+"room_error_topic_edition_not_authorized" = "Vi ne rajtas redakti temon de ĉi tiu ĉambro";
+"room_error_name_edition_not_authorized" = "Vi ne rajtas redakti nomon de ĉi tiu ĉambro";
+"room_error_join_failed_empty_room" = "ANkoraŭ ne eblas ree aliĝi al malplena ĉambro.";
+"room_error_join_failed_title" = "Malsukcesis aliĝi al ĉambro";
+
+// Room
+"room_please_select" = "Bonvolu elekti ĉambron";
+"room_creation_participants_placeholder" = "(ekz. @kjara:hejmservilo1; @megumi:hejmservilo2…)";
+"room_creation_participants_title" = "Anoj:";
+"room_creation_alias_placeholder_with_homeserver" = "(ekz. #io%@)";
+"room_creation_alias_placeholder" = "(ekz. #io:ekzemplo.net)";
+"room_creation_alias_title" = "Kromnomo de ĉambro:";
+"room_creation_name_placeholder" = "(ekz. tagmanghGrupo)";
+
+// Room creation
+"room_creation_name_title" = "Nomo de ĉambro:";
+"account_error_push_not_allowed" = "Sciigoj ne estas permesitaj";
+"account_error_msisdn_wrong_description" = "Ĉi tio ne ŝajnas esti valida telefonnumero";
+"account_error_msisdn_wrong_title" = "Nevalida telefonnumero";
+"account_error_email_wrong_description" = "Ĉi tio ne ŝajnas esti valida retpoŝtadreso";
+"account_error_email_wrong_title" = "Nevalida retpoŝtadreso";
+"account_error_matrix_session_is_not_opened" = "Salutaĵo de Matrix ne estas malfermita";
+"account_error_picture_change_failed" = "Malsukcesis ŝanĝo de bildo";
+"account_error_display_name_change_failed" = "Malsukcesis ŝanĝo de prezenta nomo";
+"account_msisdn_validation_error" = "Ne povas kontroli vian telefonnumeron.";
+"account_msisdn_validation_message" = "Ni sendis telefonan mesaĝon kun aktiviga kodo. Bonvolu enigi la kodon ĉi-suben.";
+"account_msisdn_validation_title" = "Atendanta kontrolo";
+"account_email_validation_error" = "Ne povas kontroli retpoŝtadreson. Bonvolu kontroli vian retpoŝton kaj klaki al la enhavata ligilo. Tion farinte, klaku al «daŭrigi»";
+"account_email_validation_message" = "Bonvolu kontroli vian retpoŝton kaj trovi la enhavatan ligilon. Farinte tion, klaku al «daŭrigi».";
+"account_email_validation_title" = "Atendanta kontrolo";
+"account_linked_emails" = "Alligitaj retpoŝtadresoj";
+"account_link_email" = "Ligi al retpoŝtadreso";
+
+// Account
+"account_save_changes" = "Konservi ŝanĝojn";
+"room_event_encryption_verify_ok" = "Kontroli";
+"room_event_encryption_info_unverify" = "Malkontroli";
+"room_event_encryption_info_verify" = "Kontroli…";
+"room_event_encryption_info_device_not_verified" = "NE kontrolita";
+"room_event_encryption_info_device_verified" = "Kontrolita";
+"room_event_encryption_info_device_verification" = "Kontrolo\n";
+"room_event_encryption_info_device_id" = "Identigilo\n";
+"room_event_encryption_info_device_name" = "Publika nomo\n";
+"room_event_encryption_info_device_unknown" = "nekonata salutaĵo\n";
+"room_event_encryption_info_device" = "\nInformoj pri salutaĵo de sendinto\n";
+"room_event_encryption_info_event_none" = "neniu";
+"room_event_encryption_info_event_unencrypted" = "neĉifrita";
+"room_event_encryption_info_event_decryption_error" = "Malĉifra eraro\n";
+"room_event_encryption_info_event_session_id" = "Identigilo de salutaĵo\n";
+"room_event_encryption_info_event_algorithm" = "Algoritmo\n";
+"room_event_encryption_info_event_identity_key" = "Identiga ŝlosilo je Curve25519\n";
+"room_event_encryption_info_event_user_id" = "Identigilo de uzanto\n";
+"room_event_encryption_info_event" = "Informoj pri okazo\n";
+
+// Encryption information
+"room_event_encryption_info_title" = "Informoj pri tutvoja ĉifrado\n\n";
+"device_details_delete_prompt_message" = "Ĉi tio postulas plian aŭtentikigon.\nPor daŭrigi, bonvolu enigi vian pasvorton.";
+"device_details_delete_prompt_title" = "Aŭtentikigo";
+"device_details_rename_prompt_message" = "Publika nomo de salutaĵo estas videbla al ĉiu, kun kiu vi komunikas";
+"device_details_rename_prompt_title" = "Nomo de salutaĵo";
+"device_details_last_seen" = "Lastafoje vidita\n";
+"device_details_identifier" = "Identigilo\n";
+"device_details_name" = "Publika nomo\n";
+
+// Devices
+"device_details_title" = "Informoj pri salutaĵo\n";
+"notification_settings_room_rule_title" = "Ĉambro: «%@»";
+"settings_enter_validation_token_for" = "Enigi validigan pecon por %@:";
+"settings_enable_push_notifications" = "Ŝalti pasivajn sciigojn";
+"settings_enable_inapp_notifications" = "Ŝalti sciigojn en la aplikaĵo";
+"notice_sticker" = "glumarko";
+"notice_room_history_visible_to_members_from_joined_point_for_dm" = "%@ videbligis estontajn mesaĝojn al ĉiuj, ekde ties aliĝo.";
+"notice_room_history_visible_to_members_from_joined_point" = "%@ videbligis estontan historion de ĉambro al ĉiuj ĉambranoj, ekde ties aliĝo.";
+"notice_room_history_visible_to_members_from_invited_point_for_dm" = "%@ videbligis estontajn mesaĝojn al ĉiuj, ekde ties invito.";
+"notice_room_history_visible_to_members_from_invited_point" = "%@ videbligis estontan historion de ĉambro al ĉiuj ĉambranoj, ekde ties invito.";
+"notice_room_history_visible_to_members_for_dm" = "%@ videbligis estontajn mesaĝojn al ĉiuj ĉambranoj.";
+"notice_room_history_visible_to_members" = "%@ videbligis estontan historion de ĉambro al ĉiuj ĉambranoj.";
+"notice_room_history_visible_to_anyone" = "%@ videbligis estontan historion de la ĉambro al ĉiu ajn.";
+"notice_error_unknown_event_type" = "Nekonata speco de okazo";
+"notice_error_unexpected_event" = "Neatendita okazo";
+"notice_error_unsupported_event" = "Nesubtenata okazo";
+"notice_unsupported_attachment" = "Nesubtenata kunsendaĵo: %@";
+"notice_invalid_attachment" = "nevalida kunsendaĵo";
+"notice_file_attachment" = "dosiero kunsendita";
+"notice_location_attachment" = "loko kunsendita";
+"notice_video_attachment" = "filmo kunsendita";
+"notice_audio_attachment" = "sono kunsendita";
+"notice_image_attachment" = "bildo kunsendita";
+"notice_encryption_enabled_unknown_algorithm" = "%1$@ ŝaltis tutvojan ĉifradon (nerekonita algoritmo %2$@).";
+"notice_encryption_enabled_ok" = "%@ ŝaltis tutvojan ĉifradon.";
+"notice_encrypted_message" = "Ĉifrita mesaĝo";
+"notice_room_related_groups" = "Grupoj rilataj al ĉi tiu ĉambro estas: %@";
+"notice_room_aliases_for_dm" = "La kromnomoj estas: %@";
+"notice_room_aliases" = "Kromnomoj de la ĉamrbo estas: %@";
+"notice_room_power_level_event_requirement" = "La minimumaj povniveloj rilataj al okazoj estas:";
+"notice_room_power_level_acting_requirement" = "La minimuma povnivelo, kiun uzanto bezonas antaŭ agi, estas:";
+"notice_room_power_level_intro_for_dm" = "La povniveloj de ĉambranoj estas:";
+"notice_room_power_level_intro" = "La povniveloj de ĉambranoj estas:";
+"notice_room_join_rule_public_by_you_for_dm" = "Vi publikigis la individuan ĉambron.";
+"notice_room_join_rule_public_by_you" = "Vi publikigis la ĉambron.";
+"notice_room_join_rule_public_for_dm" = "%@ publikigis la individuan ĉambron.";
+"notice_room_join_rule_public" = "%@ publikigis la ĉambron.";
+"notice_room_join_rule_invite_by_you_for_dm" = "Vi ekpostulis inviton por aliĝoj.";
+"notice_room_join_rule_invite_by_you" = "Vi ekpostulis inviton por aliĝoj.";
+"notice_room_join_rule_invite_for_dm" = "%@ ekpostulis inviton por aliĝoj.";
+//  New
+"notice_room_join_rule_invite" = "%@ ekpostulis inviton por aliĝoj.";
+//  Old
+"notice_room_join_rule" = "La regulo de aliĝo estas: %@";
+"notice_room_created_for_dm" = "%@ aliĝis.";
+"notice_room_created" = "%@ kreis kaj agordis la ĉambron.";
+"notice_profile_change_redacted" = "%@ ĝisdatigis sian profilon %@";
+"notice_event_redacted_reason" = " [kialo: %@]";
+"notice_event_redacted_by" = " de %@";
+"notice_room_topic_removed" = "%@ forigis la temon";
+"notice_room_name_removed_for_dm" = "%@ forigis la nomon";
+"notice_room_name_removed" = "%@ forigis nomon de la ĉambro";
+
+// Events formatter
+"notice_avatar_changed_too" = "(ankaŭ profilbildo ŝanĝiĝis)";
+"unignore" = "Reatenti";
+"ignore" = "Malatenti";
+"resume_call" = "Daŭrigi";
+"end_call" = "Fini vokon";
+"reject_call" = "Rifuzi vokon";
+"answer_call" = "Respondi vokon";
+"show_details" = "Montri detalojn";
+"cancel_download" = "Nuligi elŝuton";
+"cancel_upload" = "Nuligi alŝuton";
+"select_all" = "Elekti ĉion";
+"resend_message" = "Resendi la mesaĝon";
+"reset_to_default" = "Restarigi implicitan";
+"invite_user" = "Inviton uzanton de Matrix";
+"capture_media" = "Foti/Filmi";
+"attach_media" = "Kunsendi vidaŭdaĵon el vidaŭdaĵujo";
+"select_account" = "Elekti konton";
+"mention" = "Mencii";
+"start_video_call" = "Komenci vidvokon";
+"start_voice_call" = "Komenci voĉvokon";
+"start_chat" = "Komenci babilon";
+"set_admin" = "Igi administranto";
+"set_moderator" = "Igi reguligisto";
+"set_default_power_level" = "Restarigi povnivelon";
+"set_power_level" = "Agordi povnivelon";
+"submit_code" = "Sendi kodon";
+"submit" = "Sendi";
+"sign_up" = "Registriĝi";
+"yes" = "Jes";
+
+// Action
+"no" = "Ne";
+"login_error_resource_limit_exceeded_contact_button" = "Kontakti administranton";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nBonvolu kontakti la administranton de via servo por plu ĝin uzi.";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "Ĉi tiu hejmservilo atingis sian monatan limon de aktivaj uzantoj.";
+"login_error_resource_limit_exceeded_message_default" = "Ĉi tiu hejmservilo atingis unu el siaj rimedaj limoj.";
+"login_error_resource_limit_exceeded_title" = "Rimeda limo estas atingita";
+"login_error_forgot_password_is_not_supported" = "Forgesado de pasvorto nun ne estas subtenata";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/es.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/es.lproj/MatrixKit.strings
new file mode 100644
index 000000000..b8d1695da
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/es.lproj/MatrixKit.strings
@@ -0,0 +1,399 @@
+"matrix" = "Matrix";
+// Login Screen
+"login_create_account" = "Crear cuenta:";
+"login_server_url_placeholder" = "URL (p.ej. https://matrix.org)";
+"login_home_server_title" = "Servidor Local:";
+"login_home_server_info" = "Tu servidor local almacena todas tus conversaciones y los datos de tu cuenta";
+"login_identity_server_title" = "URL de servidor de identidad:";
+"login_identity_server_info" = "Matrix proporciona servidores de identidades para rastrear qué correos electrónicos, etc. pertenecen a qué IDs de Matrix. Actualmente solo existe https://matrix.org.";
+"login_user_id_placeholder" = "ID de Matrix (p.ej. @juan:matrix.org o juan)";
+"login_password_placeholder" = "Contraseña";
+"login_optional_field" = "opcional";
+"login_display_name_placeholder" = "Nombre público (p.ej. Juan Pérez)";
+"room_creation_participants_placeholder" = "(ej. @juan:servidordomestico1; @juan:servidordomestico2...)";
+"user_id_placeholder" = "ej: @juan:servidordomestico";
+"login_email_info" = "Especificar una dirección de correo electrónico permite que otros usuarios te encuentren en Matrix más fácilmente, y te dará una manera de restablecer tu contraseña en el futuro.";
+"login_email_placeholder" = "Dirección de correo electrónico";
+"login_prompt_email_token" = "Por favor ingresa tu código de validación de correo electrónico:";
+"login_error_title" = "No se pudo iniciar sesión";
+"login_error_no_login_flow" = "No pudimos recuperar la información de autenticación de este Servidor Local";
+"login_error_do_not_support_login_flows" = "Actualmente no admitimos cualquiera o todos los flujos de inicio de sesión definidos por este Servidor Local";
+"login_error_registration_is_not_supported" = "Actualmente no es posible registrarse";
+"login_error_forbidden" = "Nombre de usuario/contraseña inválidos";
+"login_error_unknown_token" = "No se reconoció el código de acceso especificado";
+"login_error_bad_json" = "JSON invalido";
+"login_error_not_json" = "No contenía un JSON válido";
+"login_error_limit_exceeded" = "Se enviaron demasiadas solicitudes";
+"login_error_user_in_use" = "Este nombre de usuario ya está en uso";
+"login_error_login_email_not_yet" = "Aún no se ha abierto el enlace del correo electrónico";
+"login_use_fallback" = "Utilizar la página de respaldo";
+"login_leave_fallback" = "Cancelar";
+"login_invalid_param" = "Parámetro inválido";
+"register_error_title" = "Falló el Registro";
+"login_error_forgot_password_is_not_supported" = "Actualmente no es posible restablecer la contraseña";
+"login_mobile_device" = "Móvil";
+"login_tablet_device" = "Tableta";
+"login_desktop_device" = "Escritorio";
+"login_error_resource_limit_exceeded_title" = "Límite de Recursos Excedido";
+"login_error_resource_limit_exceeded_message_default" = "Este servidor local ha excedido uno de sus límites de recursos.";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "Este servidor local ha alcanzado su límite Mensual de Usuarios Activos.";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nPor favor, contacta al administrador de tu proveedor de servicio para continuar utilizando este servicio.";
+"login_error_resource_limit_exceeded_contact_button" = "Contacta al Administrador";
+// Action
+"no" = "No";
+"yes" = "Sí";
+"abort" = "Anular";
+"back" = "Atrás";
+"close" = "Cerrar";
+"continue" = "Continuar";
+"discard" = "Descartar";
+"dismiss" = "Ignorar";
+"retry" = "Re-intentar";
+"sign_up" = "Registrarse";
+"submit" = "Enviar";
+"submit_code" = "Enviar código";
+"set_default_power_level" = "Restablecer Nivel de Permisos";
+"set_moderator" = "Establecer Moderador";
+"set_admin" = "Establecer como Administrador";
+"start_chat" = "Iniciar Conversación";
+"start_voice_call" = "Iniciar Llamada de Voz";
+"start_video_call" = "Iniciar Llamada de Vídeo";
+"mention" = "Mencionar";
+"select_account" = "Seleccionar una cuenta";
+"attach_media" = "Adjuntar Medios desde Biblioteca";
+"capture_media" = "Tomar Foto/Vídeo";
+"invite_user" = "Invitar Usuario de Matrix";
+"reset_to_default" = "Restablecer valores por defecto";
+"resend_message" = "Reenviar el mensaje";
+"select_all" = "Seleccionar Todo";
+"cancel_upload" = "Cancelar Subida";
+"cancel_download" = "Cancelar Descarga";
+"show_details" = "Mostrar Detalles";
+"answer_call" = "Contestar Llamada";
+"reject_call" = "Rechazar Llamada";
+"end_call" = "Finalizar Llamada";
+"ignore" = "Ignorar";
+"unignore" = "Dejar de Ignorar";
+// Events formatter
+"notice_avatar_changed_too" = "(el avatar también se cambió)";
+"notice_room_name_removed" = "%@ eliminó el nombre de la sala";
+"notice_room_topic_removed" = "%@ eliminó el tema";
+"notice_event_redacted" = "<redactado%@>";
+"notice_event_redacted_by" = " por %@";
+"notice_event_redacted_reason" = " [motivo: %@]";
+"notice_profile_change_redacted" = "%@ actualizó su perfil %@";
+"notice_room_created" = "%@ ha creado y configurado la sala.";
+"notice_room_join_rule" = "La regla para unirse es: %@";
+"notice_room_power_level_intro" = "El nivel de permisos de los miembros de la sala es:";
+"notice_room_power_level_acting_requirement" = "Los niveles de permisos mínimos que un usuario debe tener antes de actuar son:";
+"notice_room_power_level_event_requirement" = "Los niveles de permisos mínimos relacionados con eventos son:";
+"notice_room_aliases" = "Los aliases de la sala son: %@";
+"notice_room_related_groups" = "Los grupos asociados a esta sala son: %@";
+"notice_encrypted_message" = "Mensaje cifrado";
+"notice_encryption_enabled" = "%@ activó el cifrado de extremo a extremo (algoritmo %@)";
+"notice_image_attachment" = "imagen adjunta";
+"notice_audio_attachment" = "audio adjunto";
+"notice_video_attachment" = "vídeo adjunto";
+"notice_location_attachment" = "ubicación adjunta";
+"notice_file_attachment" = "archivo adjunto";
+"notice_invalid_attachment" = "archivo adjunto inválido";
+"notice_unsupported_attachment" = "No se admite el archivo adjunto: %@";
+"notice_feedback" = "Evento de retroalimentación (id: %@): %@";
+"notice_redaction" = "%@ redactó un evento (id: %@)";
+"notice_error_unsupported_event" = "No se admite el evento";
+"notice_error_unexpected_event" = "Evento inesperado";
+"notice_error_unknown_event_type" = "Tipo de evento desconocido";
+"notice_room_history_visible_to_anyone" = "%@ hizo visible el historial futuro de la sala para cualquier persona.";
+"notice_room_history_visible_to_members" = "%@ hizo visible el historial futuro de la sala para todos los miembros de la sala.";
+"notice_room_history_visible_to_members_from_invited_point" = "%@ hizo visible el historial futuro de la sala para todos los miembros de la sala, desde el momento en que son invitados.";
+"notice_room_history_visible_to_members_from_joined_point" = "%@ hizo visible el historial futuro de la sala para todos los miembros de la sala, desde el momento en que se unieron.";
+"notice_crypto_unable_to_decrypt" = "** No es posible descifrar: %@ **";
+"notice_crypto_error_unknown_inbound_session_id" = "La sesión emisor no nos ha enviado las claves para este mensaje.";
+"notice_sticker" = "pegatina";
+"notice_in_reply_to" = "En respuesta a";
+// room display name
+"room_displayname_empty_room" = "Sala vacía";
+"room_displayname_two_members" = "%@ y %@";
+"room_displayname_more_than_two_members" = "%@ y otros %u";
+// Settings
+"settings" = "Ajustes";
+"settings_enable_inapp_notifications" = "Habilitar notificaciones de la aplicación";
+"settings_enable_push_notifications" = "Habilitar notificaciones push";
+"settings_enter_validation_token_for" = "Ingresar el código de validación para %@:";
+"notification_settings_room_rule_title" = "Sala: '%@'";
+// Devices
+"device_details_title" = "Información de sesión\n";
+"device_details_name" = "Nombre público\n";
+"device_details_identifier" = "ID\n";
+"device_details_last_seen" = "Visto por última vez\n";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_rename_prompt_message" = "Un nombre público de una sesión es invisible para personas con que Ud. se comunica";
+"device_details_delete_prompt_title" = "Autenticación";
+"device_details_delete_prompt_message" = "Esta operación requiere autenticación adicional.\nPara continuar, ingresa tu contraseña por favor.";
+// Encryption information
+"room_event_encryption_info_title" = "Información de cifrado de extremo a extremo\n\n";
+"room_event_encryption_info_event" = "Información de evento\n";
+"room_event_encryption_info_event_user_id" = "ID de Usuario\n";
+"room_event_encryption_info_event_identity_key" = "Clave de identidad Curve25519\n";
+"room_event_encryption_info_event_fingerprint_key" = "Clave de huella digital Ed25519 reclamada\n";
+"room_event_encryption_info_event_algorithm" = "Algoritmo\n";
+"room_event_encryption_info_event_session_id" = "ID de Sesión\n";
+"room_event_encryption_info_event_decryption_error" = "Error de descifrado\n";
+"room_event_encryption_info_event_unencrypted" = "sin cifrar";
+"room_event_encryption_info_event_none" = "ninguno";
+"room_event_encryption_info_device" = "\nInformación de la sesión emisora\n";
+"room_event_encryption_info_device_unknown" = "sesión desconocida\n";
+"room_event_encryption_info_device_name" = "Nombre público\n";
+"room_event_encryption_info_device_id" = "ID\n";
+"room_event_encryption_info_device_verification" = "Verificación\n";
+"room_event_encryption_info_device_fingerprint" = "huella digital Ed25519\n";
+"room_event_encryption_info_device_verified" = "Verificado";
+"room_event_encryption_info_device_not_verified" = "SIN verificar";
+"room_event_encryption_info_device_blocked" = "Prohibido";
+"room_event_encryption_info_verify" = "Verificar...";
+"room_event_encryption_info_unverify" = "Anular Verificación";
+"room_event_encryption_info_block" = "Prohibir";
+"room_event_encryption_info_unblock" = "Dejar de Prohibir";
+"room_event_encryption_verify_title" = "Verificar sesión\n\n";
+"room_event_encryption_verify_message" = "Para verificar que este sesión es confiable, por favor contactar a su propietario por algún otro medio (ej. cara a cara o por teléfono) y pregúntale si la clave que ve en sus Ajustes de Usuario para este dispositivo coincide con la clave a continuación:\n\n\tNombre de sesión: %@\n\tID de sesión: %@\n\tClave de sesión: %@\n\nSi coincide, oprime el botón de verificar a continuación. Si no coincide, entonces alguien está interceptando este sesión y probablemente prefieras oprimir el botón de prohibir.\n\nEn el futuro, este proceso de verificación será más sofisticado.";
+"room_event_encryption_verify_ok" = "Verificar";
+// Account
+"account_save_changes" = "Guardar cambios";
+"account_link_email" = "Añadir Correo Electrónico";
+"account_linked_emails" = "Correos electrónicos añadidos";
+"account_email_validation_title" = "Verificación Pendiente";
+"account_email_validation_message" = "Por favor, consulta tu correo electrónico y haz clic en el enlace que contiene. Una vez hecho esto, haz clic en continuar.";
+"account_email_validation_error" = "No es posible verificar la dirección de correo electrónico. Por favor, consulta tu correo electrónico y haz clic en el enlace que contiene. Una vez hecho esto, haz clic en continuar";
+"account_msisdn_validation_title" = "Verificación Pendiente";
+"account_msisdn_validation_message" = "Hemos enviado un SMS con un código de activación. Por favor, ingresa este código a continuación.";
+"account_msisdn_validation_error" = "No es posible verificar el número telefónico.";
+"account_error_display_name_change_failed" = "El cambio de nombre público falló";
+"account_error_picture_change_failed" = "El cambio de imagen falló";
+"account_error_matrix_session_is_not_opened" = "La sesión de Matrix no está abierta";
+"account_error_email_wrong_title" = "Dirección de Correo Electrónico Inválida";
+"account_error_email_wrong_description" = "Esto no parece ser una dirección de correo electrónico válida";
+"account_error_msisdn_wrong_title" = "Número Telefónico Inválido";
+"account_error_msisdn_wrong_description" = "Esto no parece ser un número telefónico válido";
+// Room creation
+"room_creation_name_title" = "Nombre de sala:";
+"room_creation_name_placeholder" = "(ej. grupoDeAlmuerzo)";
+"room_creation_alias_title" = "Alias de sala:";
+"room_creation_alias_placeholder" = "(ej. #foo:ejemplo.org)";
+"room_creation_alias_placeholder_with_homeserver" = "(ej. #foo%@)";
+"room_creation_participants_title" = "Participantes:";
+// Room
+"room_please_select" = "Por favor selecciona una sala";
+"room_error_join_failed_title" = "No se pudo unir a la sala";
+"room_error_join_failed_empty_room" = "Ahora mismo no es posible volver a unirse a una sala vacía.";
+"room_error_name_edition_not_authorized" = "No estás autorizado a editar el nombre de esta sala";
+"room_error_topic_edition_not_authorized" = "No estás autorizado a editar el tema de esta sala";
+"room_error_cannot_load_timeline" = "No se pudo cargar la línea de tiempo";
+"room_error_timeline_event_not_found_title" = "No se pudo cargar la posición en la línea de tiempo";
+"room_error_timeline_event_not_found" = "La aplicación estaba intentando cargar un momento específico en la línea de tiempo de esta sala pero pudo encontrarlo";
+"room_left" = "Saliste de la sala";
+"room_no_power_to_create_conference_call" = "Necesitas permiso para invitar a iniciar una conferencia en esta sala";
+"room_no_conference_call_in_encrypted_rooms" = "No se admiten llamadas de conferencia en salas cifradas";
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "envió una imagen.";
+"message_reply_to_sender_sent_a_video" = "envió un vídeo.";
+"message_reply_to_sender_sent_an_audio_file" = "envió un archivo de audio.";
+"message_reply_to_sender_sent_a_file" = "envió un archivo.";
+"message_reply_to_message_to_reply_to_prefix" = "En respuesta a";
+// Room members
+"room_member_ignore_prompt" = "¿Seguro que quieres ocultar todos los mensajes de este usuario?";
+"room_member_power_level_prompt" = "No podrás deshacer este cambio porque estás promoviendo al usuario para tener el mismo nivel de autoridad que tú.\n¿Estás seguro?";
+// Attachment
+"attachment_size_prompt" = "Quieres enviar como:";
+"attachment_original" = "Tamaño real: %@";
+"attachment_small" = "Pequeño (~%@)";
+"attachment_medium" = "Mediano (~%@)";
+"attachment_large" = "Grande (~%@)";
+"attachment_cancel_download" = "¿Cancelar la descarga?";
+"attachment_cancel_upload" = "¿Cancelar la subida?";
+"attachment_multiselection_size_prompt" = "Quieres enviar imágenes como:";
+"attachment_multiselection_original" = "Tamaño Real";
+"attachment_e2e_keys_file_prompt" = "Este archivo contiene claves de cifrado exportadas de un cliente de Matrix.\n¿Quieres ver el contenido del archivo o importar las claves que contiene?";
+"attachment_e2e_keys_import" = "Importar...";
+// Contacts
+"contact_mx_users" = "Usuarios de Matrix";
+"contact_local_contacts" = "Contactos Locales";
+// Groups
+"group_invite_section" = "Invitaciones";
+"group_section" = "Grupos";
+// Search
+"search_no_results" = "No Hay Resultados";
+"search_searching" = "Búsqueda en curso...";
+// Time
+"format_time_s" = "s";
+"format_time_m" = "m";
+"format_time_h" = "h";
+"format_time_d" = "d";
+// E2E import
+"e2e_import_room_keys" = "Importar claves de sala";
+"e2e_import_prompt" = "Este proceso permite que importes claves de cifrado que hayas exportado previamente desde otro cliente de Matrix. Luego, podrás descifrar todos los mensajes que el otro cliente podía descifrar.\nEl archivo de exportación está protegido con una frase de contraseña. Debes ingresar la frase de contraseña aquí para descifrar el archivo.";
+"e2e_import" = "Importar";
+"e2e_passphrase_enter" = "Ingresar frase de contraseña";
+// E2E export
+"e2e_export_room_keys" = "Exportar claves de sala";
+"e2e_export_prompt" = "Este proceso te permite exportar las claves de los mensajes que hayas recibido en salas cifradas a un archivo local. Luego, podrás importar el archivo a otro cliente de Matrix, para que ese cliente también pueda descifrar estos mensajes.\nEl archivo exportado permitirá que cualquier persona que pueda leerlo descifre todos los mensajes cifrados que tú puedas ver, así que debes tener cuidado de mantenerlo seguro.";
+"e2e_export" = "Exportar";
+"e2e_passphrase_confirm" = "Confirmar frase de contraseña";
+"e2e_passphrase_empty" = "La frase de contraseña no debe estar vacía";
+"e2e_passphrase_not_match" = "Las frases de contraseña deben coincidir";
+// Others
+"user_id_title" = "ID de Usuario:";
+"offline" = "desconectado";
+"unsent" = "No enviado";
+"error" = "Error";
+"error_common_message" = "Ocurrió un error. Por favor inténtalo de nuevo más tarde.";
+"not_supported_yet" = "Aún no es posible";
+"default" = "por defecto";
+"private" = "Privado";
+"public" = "Público";
+"power_level" = "Nivel de Autoridad";
+"network_error_not_reachable" = "Por favor comprueba la conectividad de tu red";
+"ssl_homeserver_url" = "URL del Servidor Local: %@";
+// Permissions
+"camera_access_not_granted_for_call" = "Las llamadas de vídeo requieren acceso a la Cámara pero %@ no tiene permiso para utilizarla";
+"microphone_access_not_granted_for_call" = "Las llamadas requieren acceso al Micrófono pero %@ no tiene permiso para utilizarlo";
+"local_contacts_access_not_granted" = "El descubrimiento de usuarios desde los contactos locales requiere acceso a tus contactos pero %@ no tiene permiso para utilizarlo";
+"local_contacts_access_discovery_warning_title" = "Descubrimiento de usuarios";
+"local_contacts_access_discovery_warning" = "Para descubrir contactos que ya usan Matrix,  %@ puede enviar correos electrónicos y números telefónicos desde tus Contactos hacia el Servidor de Identidades de Matrix. Cuando es posible, los datos personales se procesan antes de enviarlos. Por favor, compruebe la política de privacidad de su servidor de identidad para más detalles.";
+// Country picker
+"country_picker_title" = "Elige un país";
+// Language picker
+"language_picker_title" = "Elige un idioma";
+"language_picker_default_language" = "Por Defecto (%@)";
+"notice_room_invite" = "%@ invitó a %@";
+"notice_room_third_party_invite" = "%@ invitó a %@ a unirse a la sala";
+"notice_room_third_party_registered_invite" = "%@ aceptó la invitación para %@";
+"notice_room_join" = "%@ se unió";
+"notice_room_leave" = "%@ salió";
+"notice_room_reject" = "%@ rechazó la invitación";
+"notice_room_kick" = "%@ expulsó a %@";
+"notice_room_unban" = "%@ le quitó el veto a %@";
+"notice_room_ban" = "%@ vetó a %@";
+"notice_room_withdraw" = "%@ retiró la invitación de %@";
+"notice_room_reason" = ". Motivo: %@";
+"notice_avatar_url_changed" = "%@ cambió su avatar";
+"notice_display_name_set" = "%@ estableció %@ como su nombre público";
+"notice_display_name_changed_from" = "%@ cambió su nombre público de %@ a %@";
+"notice_display_name_removed" = "%@ eliminó su nombre público";
+"notice_topic_changed" = "%@ cambió el tema a: %@";
+"notice_room_name_changed" = "%@ cambió el nombre de la sala a: %@";
+"notice_placed_voice_call" = "%@ realizó una llamada de voz";
+"notice_answered_video_call" = "%@ contestó la llamada";
+"notice_ended_video_call" = "%@ finalizó la llamada";
+"notice_conference_call_request" = "%@ solicitó una conferencia de vozIP";
+"notice_conference_call_started" = "conferencia de vozIP iniciada";
+"notice_conference_call_finished" = "conferencia de vozIP finalizada";
+// button names 
+"ok" = "Correcto";
+"cancel" = "Cancelar";
+"save" = "Guardar";
+"leave" = "Salir";
+"send" = "Enviar";
+"copy_button_name" = "Copiar";
+"resend" = "Reenviar";
+"redact" = "Eliminar";
+"share" = "Compartir";
+"set_power_level" = "Establecer nivel de permisos";
+"delete" = "Eliminar";
+"view" = "Ver";
+// actions 
+"action_logout" = "Cerrar Sesión";
+"create_room" = "Crear Sala";
+"login" = "Iniciar Sesión";
+"create_account" = "Crear Cuenta";
+"membership_invite" = "Invitado";
+"membership_leave" = "Salió";
+"membership_ban" = "Vetado";
+"num_members_one" = "%@ usuario";
+"num_members_other" = "%@ usuarios";
+"invite" = "Invitar";
+"kick" = "Echar";
+"ban" = "Vetar";
+"unban" = "Quitar Veto";
+"message_unsaved_changes" = "Hay cambios sin guardar. Salir los descartará.";
+// Login Screen 
+"login_error_already_logged_in" = "Ya ha iniciado sesión";
+"login_error_must_start_http" = "La URL debe comenzar con http[s]://";
+// room details dialog screen
+"room_details_title" = "Detalles de Sala";
+// contacts list screen 
+"invitation_message" = "Me gustaría chatear contigo vía Matrix. Por favor, visita la página http://matrix.org para obtener más información.";
+// Settings screen 
+"settings_title_config" = "Ajustes";
+"settings_title_notifications" = "Notificaciones";
+// Notification settings screen 
+"notification_settings_disable_all" = "Deshabilitar todas las notificaciones";
+"notification_settings_enable_notifications" = "Habilitar notificaciones";
+"notification_settings_enable_notifications_warning" = "Actualmente, todas las notificaciones están deshabilitadas para todos los dispositivos.";
+"notification_settings_global_info" = "Los ajustes de notificaciones se guardan en tu cuenta de usuario y se comparten entre todos los clientes que las admiten (incluyendo las notificaciones de escritorio).\n\nLas reglas se aplican en órden; la primer regla que coincide define el resultado del mensaje.\nEntonces: las notificaciones por palabra son más importantes que las notificaciones por sala, que son más importantes que las notificaciones por emisor.\nPara múltiples reglas del mismo tipo, la primera en la lista que coincide tiene prioridad.";
+"notification_settings_per_word_notifications" = "Notificaciones por palabra";
+"notification_settings_per_word_info" = "Las palabras coinciden con mayúsculas y minúsculas, y pueden incluir un * comodín. Entonces:\nfoo coincide con la cadena de caracteres foo rodeada de delimitadores de palabras (ej. puntuación y espacios en blanco o inicios/finales de línea).\nfoo* coincide con cualquier palabra que comience con foo.\n*foo* coincide con cualquier palabra que incluya las 3 letras foo.";
+"notification_settings_always_notify" = "Siempre notificar";
+"notification_settings_never_notify" = "Nunca notificar";
+"notification_settings_word_to_match" = "palabra que coincida";
+"notification_settings_highlight" = "Destacar";
+"notification_settings_custom_sound" = "Sonido personalizado";
+"notification_settings_per_room_notifications" = "Notificaciones por sala";
+"notification_settings_per_sender_notifications" = "Notificaciones por emisor";
+"notification_settings_sender_hint" = "@usuario:dominio.com";
+"notification_settings_select_room" = "Selecciona una sala";
+"notification_settings_other_alerts" = "Otras Alertas";
+"notification_settings_contain_my_user_name" = "Notificarme con sonido por mensajes que contienen mi nombre de usuario";
+"notification_settings_contain_my_display_name" = "Notificarme con sonido por mensajes que contienen mi nombre público";
+"notification_settings_just_sent_to_me" = "Notificarme con sonido por mensajes enviados solo a mí";
+"notification_settings_invite_to_a_new_room" = "Notificarme cuando soy invitado a una nueva sala";
+"notification_settings_people_join_leave_rooms" = "Notificarme cuando las personas se unen o salen de las salas";
+"notification_settings_receive_a_call" = "Notificarme cuando reciba una llamada";
+"notification_settings_suppress_from_bots" = "Suprimir notificaciones de bots";
+"notification_settings_by_default" = "Por defecto...";
+"notification_settings_notify_all_other" = "Notificar por todos los demás mensajes/salas";
+// gcm section 
+"settings_config_home_server" = "Servidor local: %@";
+"settings_config_identity_server" = "Servidor de identidad: %@";
+"settings_config_user_id" = "ID de Usuario: %@";
+// call string
+"call_waiting" = "Esperando...";
+"call_connecting" = "Conectando llamada...";
+"call_ended" = "Llamada finalizada";
+"call_ring" = "Llamando...";
+"incoming_video_call" = "Llamada de Vídeo Entrante";
+"incoming_voice_call" = "Llamada de Voz Entrante";
+"call_invite_expired" = "Expiró la Invitación a Llamada";
+// unrecognized SSL certificate
+"ssl_trust" = "Confiar";
+"ssl_logout_account" = "Cerrar Sesión";
+"ssl_remain_offline" = "Ignorar";
+"ssl_fingerprint_hash" = "Huella Digital (%@):";
+"ssl_could_not_verify" = "No se pudo verificar la identidad del servidor remoto.";
+"ssl_cert_not_trust" = "Esto podría significar que alguien está interceptando tu tráfico maliciosamente, o que tu teléfono no confía en el certificado proporcionado por el servidor remoto.";
+"ssl_cert_new_account_expl" = "Si el administrador del servidor dijo que esto es de esperarse, asegúrate que la huella digital que se muestra a continuación coincide con la huella digital proporcionada por el administrador.";
+"ssl_unexpected_existing_expl" = "El certificado cambió de uno que era confiable para tu teléfono. Esto es MUY INUSUAL. Se recomienda NO ACEPTAR este nuevo certificado.";
+"ssl_expected_existing_expl" = "El certificado cambió de uno que era confiable a uno que no es confiable. El servidor puede haber renovado su certificado. Contacta al administrador del servidor para obtener la huella digital.";
+"ssl_only_accept" = "SOLO acepta el certificado si el administrador del servidor ha publicado una huella digital que coincide con la indicada arriba.";
+"notice_placed_video_call" = "%@ realizó una llamada de vídeo";
+"e2e_passphrase_create" = "Crear contraseña";
+"notice_encryption_enabled_ok" = "%@ activó encriptación de extremo a extremo";
+"notice_encryption_enabled_unknown_algorithm" = "%1$@ activó encriptación de extremo a extremo (algoritmo %2$@ desconocido).";
+"device_details_rename_prompt_title" = "Nombre de Sesión";
+"account_error_push_not_allowed" = "No se permite notificaciones";
+"notice_room_third_party_revoked_invite" = "%@ revocó la invitación para %@ de unirse a la sala";
+"attachment_size_prompt_message" = "Puedes desactivar esto en ajustes.";
+"attachment_size_prompt_title" = "Confirma el tamaño para enviar";
+"message_reply_to_sender_sent_a_voice_message" = "ha enviado un mensaje de voz.";
+"room_left_for_dm" = "Te has salido";
+"room_displayname_all_other_members_left" = "%@ (ha salido)";
+"notice_room_join_rule_public_by_you_for_dm" = "Has hecho esta conversación pública.";
+"notice_room_join_rule_public_by_you" = "Has hecho la sala pública.";
+"notice_room_join_rule_public_for_dm" = "%@ ha hecho esta conversación pública.";
+"notice_room_join_rule_public" = "%@ ha hecho pública la sala.";
+"notice_room_join_rule_invite_by_you" = "Has hecho que solo se pueda unir a la sala por invitación.";
+"notice_room_name_removed_for_dm" = "%@ ha quitado el nombre";
+"notice_room_created_for_dm" = "%@ se ha unido.";
+"notice_room_join_rule_invite_for_dm" = "%@ ha hecho que solo sea posible unirse por invitación.";
+//  New
+"notice_room_join_rule_invite" = "%@ ha hecho que la sala solo sea accesible por invitación.";
+"resume_call" = "Volver a la llamada";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/et.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/et.lproj/MatrixKit.strings
new file mode 100644
index 000000000..997cb7964
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/et.lproj/MatrixKit.strings
@@ -0,0 +1,480 @@
+"matrix" = "Matrix";
+// Login Screen
+"login_create_account" = "Loo kasutajakonto:";
+"login_server_url_placeholder" = "URL (näiteks https://matrix.org)";
+"login_home_server_title" = "Koduserveri aadress:";
+"login_home_server_info" = "Sinu koduserver salvestab kõik vestlused ning kogu sinu kontoteabe";
+"login_identity_server_title" = "Isikutuvastusserveri aadress:";
+"login_password_placeholder" = "Salasõna";
+"login_optional_field" = "kui soovid";
+"login_display_name_placeholder" = "Kuvatav nimi (näiteks Kadri Maasikas)";
+"login_email_placeholder" = "E-posti aadress";
+"back" = "Tagasi";
+"close" = "Sulge";
+"continue" = "Jätka";
+"retry" = "Proovi uuesti";
+// Settings
+"settings" = "Seadistused";
+"settings_enable_inapp_notifications" = "Võta kasutusele rakenduse-sisesed teavitused";
+"settings_enable_push_notifications" = "Võta kasutusele tõuketeavitused";
+"notification_settings_room_rule_title" = "Jututuba: '%@'";
+// Devices
+"device_details_title" = "Sessiooniteave\n";
+"device_details_name" = "Avalik nimi\n";
+"device_details_identifier" = "Tunnus\n";
+"device_details_last_seen" = "Viimati nähtud\n";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_rename_prompt_title" = "Sessiooni nimi";
+"device_details_rename_prompt_message" = "Sessiooni avalik nimi on nähtav neile, kellega sa suhtled";
+"device_details_delete_prompt_title" = "Autentimine";
+"account_error_email_wrong_title" = "Vigane e-posti aadress";
+"account_error_email_wrong_description" = "See ei tundu olema e-posti aadressi moodi";
+"account_error_msisdn_wrong_title" = "Vigane telefoninumber";
+"account_error_msisdn_wrong_description" = "See ei tundu olema telefoninumbri moodi";
+"account_error_push_not_allowed" = "Teavitused ei ole lubatud";
+// Room creation
+"room_creation_name_title" = "Jututoa nimi:";
+"room_member_power_level_prompt" = "Sa ei saa seda muudatust hiljem tagasi pöörata, sest annad teisele kasutajale samad õigused, mis sinul on.\nKas sa oled ikka kindel?";
+// Attachment
+"attachment_size_prompt" = "Kas sa soovid faili saata:";
+"attachment_original" = "Tegelikus suuruses (%@)";
+"attachment_small" = "Väiksena (%@)";
+"attachment_medium" = "Keskmisena (%@)";
+"attachment_large" = "Suurena (%@)";
+"attachment_cancel_download" = "Kas katkestame allalaadimise?";
+"attachment_cancel_upload" = "Kas katkestame üleslaadimise?";
+"attachment_multiselection_size_prompt" = "Kas sa soovid pilte saata:";
+"attachment_multiselection_original" = "Tegelikus suuruses";
+"attachment_e2e_keys_file_prompt" = "Selles failis leiduvad ühest Matrix'i kliendist eksporditud krüptovõtmed.\nKas sa soovid vaadata faili sisu või importida seal leiduvad võtmeid?";
+"attachment_e2e_keys_import" = "Impordi...";
+// Contacts
+"contact_mx_users" = "Matrix'i kasutajad";
+"contact_local_contacts" = "Kohalikud kasutajad";
+// Groups
+"group_invite_section" = "Kutsed";
+"group_section" = "Grupid";
+// Search
+"search_no_results" = "Tulemusi ei ole";
+"search_searching" = "Otsing on pooleli...";
+// Time
+"format_time_s" = "s";
+"format_time_m" = "m";
+"format_time_h" = "t";
+"format_time_d" = "p";
+// E2E import
+"e2e_import_room_keys" = "Impordi jututoa krüptovõtmed";
+"error_common_message" = "Ilmnes viga. Palun proovi hiljem uuesti.";
+"not_supported_yet" = "Pole veel toetatud";
+"default" = "vaikimisi";
+"public" = "Avalik";
+"cancel" = "Loobu";
+"save" = "Salvesta";
+"leave" = "Lahku";
+"resend" = "Saada uuesti";
+"redact" = "Eemalda";
+"share" = "Jaga";
+"delete" = "Kustuta";
+"view" = "Näita";
+// actions 
+"action_logout" = "Logi välja";
+"create_room" = "Loo jututuba";
+"login" = "Logi sisse";
+"create_account" = "Loo konto";
+"membership_invite" = "Kutsutud";
+"num_members_one" = "%@ kasutaja";
+"num_members_other" = "%@ kasutajat";
+"invite" = "Kutsu";
+"kick" = "Müksa välja";
+"unban" = "Eemalda suhtluskeeld";
+"login_error_must_start_http" = "Serveri aadressi alguses peab olema http[s]://";
+// room details dialog screen
+"room_details_title" = "Jututoa üksikasjad";
+"settings_title_notifications" = "Teavitused";
+// Notification settings screen 
+"notification_settings_disable_all" = "Lülita kõik teavitused välja";
+"notification_settings_enable_notifications" = "Võta teavitused kasutusele";
+"notification_settings_enable_notifications_warning" = "Kõik teavituste liigid on hetkel kõikidel seadmetel välja lülitatud.";
+"login_identity_server_info" = "Matrix'i spetsifikatsioon näeb ette isikutuvastusserverite kasutamist selleks, et tuvastada mis e-posti aadress kuulub mis Matrix'i kasutajale. Hetkel pakub sellist teenust vaid https://matrix.org .";
+"login_user_id_placeholder" = "Matrixi kasutajatunnus (näiteks @kadri:toredomeen.ee või kadri)";
+"login_error_title" = "Sisselogimine ei õnnestunud";
+"login_error_no_login_flow" = "Autentimisteabe laadimine sellest koduserverist ei õnnestunud";
+"login_error_do_not_support_login_flows" = "Hetkel me ei toeta ühtegi sisselogimisloogikat, mida see koduserver kasutab";
+"login_error_registration_is_not_supported" = "Registreerimine ei ole hetkel toetatud";
+"login_error_forbidden" = "Vigane kasutajanimi või salasõna";
+"login_error_bad_json" = "Vigane JSON";
+"login_error_not_json" = "Ei sisaldanud korrektset JSON'it";
+"login_error_limit_exceeded" = "Liiga palju samaaegseid sisselogimispäringuid";
+"login_error_user_in_use" = "See kasutajanimi on juba kasutusel";
+"login_use_fallback" = "Kasuta tagavaralehte";
+"login_leave_fallback" = "Loobu";
+"login_invalid_param" = "Vigane parameeter";
+"register_error_title" = "Registreerimine ei õnnestunud";
+"login_error_forgot_password_is_not_supported" = "Unustatud salasõna funktsionaalsus ei ole hetkel toetatud";
+"login_mobile_device" = "Mobiiltelefon";
+"login_tablet_device" = "Tahvelarvuti";
+"login_desktop_device" = "Töölaud";
+"login_error_resource_limit_exceeded_title" = "Ressursipiir on ületatud";
+"login_error_resource_limit_exceeded_message_default" = "See koduserver ületanud ühe oma ressursipiirangutest.";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "See koduserver on saavutanud igakuise aktiivsete kasutajate piiri.";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nJätkamaks selle teenuse kasutamist palun võta ühendust oma teenuse haldajaga.";
+"login_error_resource_limit_exceeded_contact_button" = "Võta ühendust teenuse haldajaga";
+// Action
+"no" = "Ei";
+"yes" = "Jah";
+"abort" = "Katkesta";
+"discard" = "Loobu";
+"dismiss" = "Loobu";
+"sign_up" = "Registreeru";
+"submit" = "Saada";
+"submit_code" = "Saada kood";
+"set_power_level" = "Määra õigused";
+"set_default_power_level" = "Lähtesta õigused";
+"set_moderator" = "Määra moderaatoriks";
+"set_admin" = "Määra peakasutajaks";
+"start_chat" = "Alusta vestlust";
+"start_voice_call" = "Algata häälkõne";
+"start_video_call" = "Algata videokõne";
+"mention" = "Maini";
+"select_account" = "Vali kasutajakonto";
+"attach_media" = "Manusta meediafail galeriist";
+"capture_media" = "Tee foto või video";
+"invite_user" = "Saada kutse Matrix'i kasutajale";
+"reset_to_default" = "Lähtesta vaikeseadeteks";
+"resend_message" = "Saada sõnum uuesti";
+"select_all" = "Vali kõik";
+"cancel_upload" = "Katkesta üleslaadimine";
+"cancel_download" = "Katkesta allalaadimine";
+"show_details" = "Näita üksikasju";
+"answer_call" = "Vasta kõnele";
+"reject_call" = "Ära võta kõnet vastu";
+"end_call" = "Lõpeta kõne";
+"ignore" = "Eira";
+"unignore" = "Lõpeta eiramine";
+// Events formatter
+"notice_avatar_changed_too" = "(samuti sai avatar muudetud)";
+"notice_room_name_removed" = "%@ eemaldas jututoa nime";
+"notice_room_topic_removed" = "%@ eemaldas jututoa teema";
+"notice_event_redacted" = "<muudetud%@>";
+"notice_event_redacted_by" = " %@ poolt";
+"notice_event_redacted_reason" = " [põhjus: %@]";
+"notice_profile_change_redacted" = "%@ uuendas oma profiili %@";
+"notice_room_created" = "Kasutaja %@ lõi ja seadistas jututoa.";
+"notice_room_join_rule" = "Liitumise tingimused on: %@";
+"notice_room_power_level_intro" = "Jututoa liikmete õigused on:";
+"notice_room_power_level_acting_requirement" = "Minimaalselt vajalikud õigused enne neid tegevusi on:";
+"notice_room_power_level_event_requirement" = "Sündmustega seotud minimaalselt vajalikud õigused on:";
+"notice_room_aliases" = "Jututoa aliased on: %@";
+"notice_room_related_groups" = "Selle jututoaga seotud grupid on: %@";
+"notice_encrypted_message" = "Krüptitud sõnum";
+"notice_encryption_enabled_ok" = "%@ lülitas sisse läbiva krüptimise.";
+"notice_encryption_enabled_unknown_algorithm" = "%1$@ lülitas sisse läbiva krüptimise (tundmatu algoritm %2$@).";
+"notice_image_attachment" = "manustatud pilt";
+"notice_audio_attachment" = "manustatud helifail";
+"notice_video_attachment" = "manustatud videofail";
+"notice_location_attachment" = "manustatud asukohafail";
+"notice_file_attachment" = "manustatud fail";
+"notice_invalid_attachment" = "vigane manus";
+"notice_unsupported_attachment" = "Manus ei ole toetatud: %@";
+"notice_feedback" = "Tagasiside (id: %@): %@";
+"notice_redaction" = "%@ muutis sündmust (id: %@)";
+"notice_error_unsupported_event" = "Sündmuse tüüp ei ole toetatud";
+"notice_error_unexpected_event" = "Ootamatu sündmus";
+"notice_error_unknown_event_type" = "Tundmatu sündmuse tüüp";
+"notice_room_history_visible_to_anyone" = "%@muutis jututoa tulevase ajaloo loetavaks kõigile.";
+"notice_room_history_visible_to_members" = "%@ määras, et jututoa tulevane ajalugu on nähtav kõikidele selle liikmetele.";
+"notice_room_history_visible_to_members_from_invited_point" = "%@ määras, et jututoa tulevane ajalugu on nähtav kõikidele selle liikmetele nende kutsumise hetkest.";
+"notice_room_history_visible_to_members_from_joined_point" = "%@ määras, et jututoa tulevane ajalugu on nähtav kõikidele selle liikmetele nende liitumise hetkest.";
+"notice_crypto_unable_to_decrypt" = "** Ei õnnestu dekrüptida: %@ **";
+"notice_crypto_error_unknown_inbound_session_id" = "Sõnumi saatja sessioon ei ole selle sõnumi jaoks saatnud dekrüptimisvõtmeid.";
+"notice_sticker" = "kleeps";
+"notice_in_reply_to" = "Vastuseks kasutajale";
+// room display name
+"room_displayname_empty_room" = "Tühi jututuba";
+"room_displayname_two_members" = "%@ ja %@";
+"room_displayname_more_than_two_members" = "%@ ja %@ muud";
+"device_details_delete_prompt_message" = "See tegevus vajab täiendavat autentimist.\nJätkamaks palun sisesta oma salasõna.";
+// Encryption information
+"room_event_encryption_info_title" = "Läbiva krüptimise teave\n\n";
+"room_event_encryption_info_event" = "Sündmuse teave\n";
+"room_event_encryption_info_event_user_id" = "Kasutajatunnus\n";
+"room_event_encryption_info_event_fingerprint_key" = "Väidetav Ed25519 allkirja sõrmejälje võti\n";
+"room_event_encryption_info_event_algorithm" = "Algoritm\n";
+"room_event_encryption_info_event_session_id" = "Sessiooni tunnus\n";
+"room_event_encryption_info_event_decryption_error" = "Dekrüptimise viga\n";
+"room_event_encryption_info_event_unencrypted" = "krüptimata";
+"room_event_encryption_info_event_none" = "ei midagi";
+"room_event_encryption_info_device" = "\nSaatja sessiooni teave\n";
+"room_event_encryption_info_device_unknown" = "tundmatu sessioon\n";
+"room_event_encryption_info_device_name" = "Avalik nimi\n";
+"room_event_encryption_info_device_id" = "Tunnus\n";
+"room_event_encryption_info_device_verification" = "Verifikatsioon\n";
+"room_event_encryption_info_device_fingerprint" = "Ed25519 sõrmejälg\n";
+"room_event_encryption_info_device_verified" = "Verifitseeritud";
+"room_event_encryption_info_device_not_verified" = "EI OLE verifitseeritud";
+"room_event_encryption_info_unverify" = "Eemalda verifitseerimine";
+"room_event_encryption_verify_title" = "Verifitseeri sessioon\n\n";
+"room_event_encryption_verify_ok" = "Verifitseeri";
+// Account
+"account_save_changes" = "Salvesta muutused";
+"account_error_picture_change_failed" = "Pildi muutmine ei õnnestunud";
+"account_error_matrix_session_is_not_opened" = "Matrix'i sessioon pole avatud";
+"room_creation_name_placeholder" = "(näiteks HeadLõunasöögikohad)";
+"room_creation_alias_title" = "Jututoa alias:";
+"room_creation_alias_placeholder" = "(e.g. #midagi:domeen.ee)";
+"room_creation_alias_placeholder_with_homeserver" = "(näiteks #midagi%@)";
+"room_creation_participants_title" = "Osalejad:";
+"room_creation_participants_placeholder" = "(näiteks @kadri:koduserver1; @peeter:koduserver2...)";
+// Room
+"room_please_select" = "Palun vali jututuba";
+"room_error_join_failed_title" = "Jututoaga liitumine ei õnnestunud";
+"room_error_join_failed_empty_room" = "Hetkel ei ole võimalik liituda tühja jututoaga.";
+"room_error_timeline_event_not_found_title" = "Asukoha laadimine ajajoonel ei õnnestunud";
+"room_error_timeline_event_not_found" = "Rakendus üritas laadida teatud hetke selle jututoa ajajoonelt, kuid ei suutnud seda leida";
+"room_left" = "Sa lahkusid jututoast";
+"room_no_power_to_create_conference_call" = "Konverentsikõne alustamiseks selles jututoas on sul vaja õigusi";
+"room_no_conference_call_in_encrypted_rooms" = "Konverentsikõned ei ole krüptitud jututubades toetatud";
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "saatis pildi.";
+"message_reply_to_sender_sent_a_video" = "saatis video.";
+"message_reply_to_sender_sent_an_audio_file" = "saatis helifaili.";
+"message_reply_to_sender_sent_a_file" = "saatis faili.";
+"message_reply_to_message_to_reply_to_prefix" = "Vastuseks kasutajale";
+// Room members
+"room_member_ignore_prompt" = "Kas sa oled kindel, et soovid peita kõik sõnumid selle kasutaja eest?";
+"e2e_import" = "Impordi";
+"e2e_passphrase_enter" = "Sisesta paroolifraas";
+// E2E export
+"e2e_export_room_keys" = "Ekspordi jututoa võtmed";
+"e2e_export_prompt" = "Selle toiminguga on sul võimalik saabunud krüptitud sõnumite võtmed eksportida sinu kontrollitavasse kohalikku faili. Seetõttu on sul tulevikus võimalik importida need võtmed mõnda teise Matrix'i klienti ning seeläbi muuta saabunud krüptitud sõnumid ka seal loetavaks.\nKes iganes saab kätte selle võtmefaili, saab ka dekrüptida kõiki sinu krüptitud sõnumeid, seega palun hoia teda turvaliselt.";
+"e2e_export" = "Ekspordi";
+"e2e_passphrase_confirm" = "Sisesta paroolifraas veel üks kord";
+"e2e_passphrase_empty" = "Paroolifraas ei tohi olla tühi";
+"e2e_passphrase_not_match" = "Paroolifraasid ei klapi omavahel";
+"e2e_passphrase_create" = "Loo paroolifraas";
+// Others
+"user_id_title" = "Kasutajatunnus:";
+"offline" = "võrgust väljas";
+"unsent" = "Saatmata";
+"error" = "Viga";
+"private" = "Privaatne";
+"power_level" = "Õiguste tase";
+"network_error_not_reachable" = "Palun kontrolli oma võrguühendust";
+"user_id_placeholder" = "näiteks @kati:mingidomeen.com";
+"ssl_homeserver_url" = "Koduserveri aadress: %@";
+// Permissions
+"camera_access_not_granted_for_call" = "Videokõned vajavad ligipääsu kaamerale, kuid %@'l pole selleks õigusi";
+"microphone_access_not_granted_for_call" = "Kõned vajavad ligipääsu mikrofonile, kuid %@'l pole selleks õigusi";
+"local_contacts_access_discovery_warning_title" = "Kasutajate leidmine";
+// Country picker
+"country_picker_title" = "Vali riik";
+// Language picker
+"language_picker_title" = "Vali keel";
+"language_picker_default_language" = "Vaikimisi (%@)";
+"notice_room_invite" = "%@ kutsus kasutajat %@";
+"notice_room_third_party_invite" = "%@ saatis kasutajale %@ kutse jututoaga liitumiseks";
+"notice_room_third_party_registered_invite" = "%@ võttis vastu kutse %@ nimel";
+"notice_room_third_party_revoked_invite" = "%@ võttis tagasi jututoaga liitumise kutse kasutajalt %@";
+"notice_room_join" = "%@ liitus";
+"notice_room_leave" = "%@ lahkus";
+"notice_room_reject" = "%@ lükkas tagasi kutse";
+"notice_room_kick" = "%@ müksas kasutajat %@";
+"notice_room_unban" = "%@ taastas %@ ligipääsu";
+"notice_room_ban" = "%@ keelas %@ ligipääsu";
+"notice_room_withdraw" = "%@ võttis tagasi kutse kasutajale %@";
+"notice_room_reason" = ". Põhjus: %@";
+"notice_avatar_url_changed" = "%@ muutis oma tunnuspilti";
+"notice_display_name_set" = "%@ määras oma kuvatavaks nimeks %@";
+"notice_display_name_changed_from" = "%@ muutis senise kuvatava nime %@ uueks nimeks %@";
+"notice_display_name_removed" = "%@ eemaldas oma kuvatava nime";
+"notice_topic_changed" = "%@ muutis uueks teemaks „%@“.";
+"notice_room_name_changed" = "%@ muutis jututoa uueks nimeks %@.";
+"notice_placed_voice_call" = "%@ alustas häälkõnet";
+"notice_placed_video_call" = "%@ alustas videokõnet";
+"notice_answered_video_call" = "%@ vastas kõnele";
+"notice_ended_video_call" = "%@ lõpetas kõne";
+"notice_conference_call_request" = "%@ saatis VoIP rühmakõne kutse";
+"notice_conference_call_started" = "VoIP rühmakõne algas";
+"notice_conference_call_finished" = "VoIP rühmakõne lõppes";
+// Notice Events with "You"
+"notice_room_invite_by_you" = "Sina kutsusid kasutajat %@";
+"notice_room_invite_you" = "%@ kutsus sind";
+"notice_room_third_party_invite_by_you" = "Sina saatsid kasutajale %@ kutse jututoaga liitumiseks";
+"notice_room_third_party_registered_invite_by_you" = "Sina võtsid vastu kutse %@ nimel";
+"notice_room_third_party_revoked_invite_by_you" = "Sina võtsid tagasi jututoaga liitumise kutse kasutajalt %@";
+"notice_room_join_by_you" = "Sina liitusid";
+"notice_room_leave_by_you" = "Sina lahkusid";
+"notice_room_reject_by_you" = "Sa lükkasid kutse tagasi";
+"notice_room_kick_by_you" = "Sina müksasid %@ välja";
+"notice_room_unban_by_you" = "Sina taastasid %@ ligipääsu";
+"notice_room_ban_by_you" = "Sina keelasid %@ ligipääsu";
+"notice_room_withdraw_by_you" = "Sina võtsid tagasi %@ kutse";
+"notice_avatar_url_changed_by_you" = "Sa muutsid oma tunnuspilti";
+"notice_display_name_set_by_you" = "Sina määrasid oma kuvatavaks nimeks %@";
+"notice_display_name_changed_from_by_you" = "Sina muutsid senise kuvatava nime %@ uueks nimeks %@";
+"notice_display_name_removed_by_you" = "Sa eemaldasid oma kuvatava nime";
+"notice_topic_changed_by_you" = "Sa muutsid uueks teemaks „%@“.";
+"notice_room_name_changed_by_you" = "Sa muutsid jututoa uueks nimeks %@.";
+"notice_placed_voice_call_by_you" = "Sa alustasid häälkõnet";
+"notice_placed_video_call_by_you" = "Sa alustasid videokõnet";
+"notice_answered_video_call_by_you" = "Sa vastasid kõnele";
+"notice_ended_video_call_by_you" = "Sa lõpetasid kõne";
+"notice_conference_call_request_by_you" = "Sa algatasid VoIP rühmakõne";
+"notice_room_name_removed_by_you" = "Sa eemaldasid jututoa nime";
+"notice_room_topic_removed_by_you" = "Sa eemaldasid teema";
+"notice_event_redacted_by_you" = " sinu poolt";
+"notice_profile_change_redacted_by_you" = "Sa uuendasid oma profiili %@";
+"notice_room_created_by_you" = "Sa lõid ja seadistasid jututoa.";
+"notice_encryption_enabled_ok_by_you" = "Sa lülitasid sisse läbiva krüptimise.";
+"notice_encryption_enabled_unknown_algorithm_by_you" = "Sa lülitasid sisse läbiva krüptimise (kasutusel on tundmatu algoritm %@).";
+"notice_redaction_by_you" = "Sa muutsid sündmust: (id: %@)";
+"notice_room_history_visible_to_anyone_by_you" = "Sa muutsid jututoa tulevase ajaloo loetavaks kõigile.";
+"notice_room_history_visible_to_members_by_you" = "Sina tegid jututoa tulevase ajaloo loetavaks kõikidele jututoa liikmetele.";
+"notice_room_history_visible_to_members_from_invited_point_by_you" = "Sina muutsid jututoa tulevase ajaloo loetavaks kõikidele jututoa liikmetele sellest hetkest, kui nad on kutse saanud.";
+"notice_room_history_visible_to_members_from_joined_point_by_you" = "Sina muutsid jututoa tulevase ajaloo loetavaks kõikidele jututoa liikmetele sellest hetkest, kui nad liitusid jututoaga.";
+// button names 
+"ok" = "Sobib";
+"send" = "Saada";
+"copy_button_name" = "Kopeeri";
+"membership_leave" = "Lahkus";
+"ban" = "Keela ligipääs";
+"message_unsaved_changes" = "Osa muudatusi on salvestamata. Lahkudes need kaovad.";
+// Login Screen 
+"login_error_already_logged_in" = "Sa oled juba sisse loginud";
+// contacts list screen 
+"invitation_message" = "Ma soovin sinuga vestelda Matrix'i võrgu vahendusel. Lisateavet leiad veebisaidist https://matrix.org/ .";
+// Settings screen 
+"settings_title_config" = "Seadistused";
+"notification_settings_always_notify" = "Teavita alati";
+"notification_settings_never_notify" = "Ära teavita iialgi";
+"notification_settings_word_to_match" = "vastendatav sõna";
+"notification_settings_highlight" = "Tõsta esile";
+"notification_settings_custom_sound" = "Kohandatud heli";
+"notification_settings_per_room_notifications" = "Jututoa-kohased teavitused";
+"notification_settings_per_sender_notifications" = "Saatjakohased teavitused";
+"notification_settings_sender_hint" = "@kasutaja:domeen.ee";
+"notification_settings_select_room" = "Vali jututuba";
+"notification_settings_other_alerts" = "Muud hoiatused";
+"notification_settings_contain_my_user_name" = "Teavita mind helimärguandega sõnumitest, mis sisaldavad minu kasutajanime";
+"notification_settings_contain_my_display_name" = "Teavita mind helimärguandega sõnumitest, mis sisaldavad minu kuvatavat nime";
+"notification_settings_just_sent_to_me" = "Teavita mind helimärguandega sõnumitest, mis on saadetud vaid mulle";
+"notification_settings_invite_to_a_new_room" = "Teavita mind, kui ma olen saanud kutse uude jututuppa";
+"notification_settings_people_join_leave_rooms" = "Teavita mind, kui teised kasutajad liituvad jututoaga või lahkuvad sealt";
+"notification_settings_receive_a_call" = "Teavita mind, kui mulle tuleb kõne";
+"notification_settings_suppress_from_bots" = "Ära luba teavitusi robototelt";
+"notification_settings_by_default" = "Vaikimisi...";
+"notification_settings_notify_all_other" = "Teavita mind kõikide muude sõnumite ja jututubade puhul";
+// gcm section 
+"settings_config_home_server" = "Koduserver: %@";
+"settings_config_identity_server" = "Isikutuvastusserver: %@";
+"settings_config_user_id" = "Kasutajatunnus: %@";
+// call string
+"call_waiting" = "Ootan...";
+"call_connecting" = "Kõne on ühendamisel…";
+"call_ended" = "Kõne lõppes";
+"call_ring" = "Helistan...";
+"incoming_video_call" = "Saabuv videokõne";
+"incoming_voice_call" = "Saabuv häälkõne";
+"call_invite_expired" = "Kõnekutse aegus";
+// unrecognized SSL certificate
+"ssl_trust" = "Usalda";
+"ssl_logout_account" = "Logi välja";
+"ssl_remain_offline" = "Eira";
+"ssl_fingerprint_hash" = "Sõrmejälg (%@):";
+"login_email_info" = "Lisades oma e-posti aadressi saad võimaldada teistel Matrix'i kasutajatel sind lihtsamini leida ning annad endale lisavõimaluse salasõna muutmiseks, kui seda tulevikus vaja peaks olema.";
+"login_prompt_email_token" = "Palun sisesta oma e-posti aadressi registeerimiskirjas näidatud tunnusluba:";
+"login_error_unknown_token" = "Sisestatud tunnusluba ei ole õige";
+"login_error_login_email_not_yet" = "E-posti teel saadetud linki pole veel klõpsitud";
+"settings_enter_validation_token_for" = "Sisesta %@ tuvastamise tunnusluba:";
+"room_event_encryption_info_verify" = "Verifitseeri...";
+"account_link_email" = "Seotud e-posti aadress";
+"account_linked_emails" = "Seotud e-posti aadressid";
+"account_email_validation_title" = "Verifikatsioon on ootel";
+"account_email_validation_message" = "Palun vaata oma e-kirju ning klõpsi meie saadetud kirjas leiduvat linki. Kui see on tehtud, siis vajuta Jätka-nuppu.";
+"account_email_validation_error" = "E-posti aadressi õigsust pole veel õnnestunud kontrollida. Palun vaata oma e-kirju ning klõpsi meie saadetud kirjas leiduvat linki. Kui see on tehtud, siis vajuta Jätka-nuppu";
+"account_msisdn_validation_title" = "Verifikatsioon on ootel";
+"account_msisdn_validation_message" = "Me oleme SMS'iga saatnud aktiveerimiskoodi. Palun sisesta see kood siia.";
+"account_msisdn_validation_error" = "Telefoninumbri verifitseerimine ei õnnestunud.";
+"account_error_display_name_change_failed" = "Kuvatava nime muutmine ei õnnestunud";
+"room_error_name_edition_not_authorized" = "Sinul pole õigusi selle jututoa nime muutmiseks";
+"room_error_topic_edition_not_authorized" = "Sinul pole õigusi selle jututoa teema muutmiseks";
+"room_error_cannot_load_timeline" = "Ajajoone laadimine ei õnnestunud";
+"e2e_import_prompt" = "Selle toiminguga saad importida krüptimisvõtmed, mis sa viimati olid teisest Matrix'i kliendist eksportinud. Seejärel on võimalik dekrüptida ka siin kõik need samad sõnumid, mida see teine klient suutis dekrüptida.\nSee ekspordifail on krüptitud paroolifraasiga. Faili dekrüptimiseks sisesta siia paroolifraas.";
+"local_contacts_access_discovery_warning" = "Selleks, et leida Matrixi võrgu kasutajaid, võib %@ saata sinu aadressiraamatus leiduvad e-posti aadressid ja telefoninumbrid sinu valitud Matrixi isikutuvastusserverile. Kui server seda toetab, siis andmed muudetakse enne saatmist räsideks - täpsema teabe leiad oma isikutuvastusserveri privaatsuspoliitikast.";
+"membership_ban" = "Suhtluskeeld";
+"notification_settings_per_word_notifications" = "Sõnadega seotud teavitused";
+"ssl_could_not_verify" = "Serveri õigsust ei olnud võimalik kontrollida.";
+"room_event_encryption_info_event_identity_key" = "Curve25519 identiteedi võti\n";
+"room_event_encryption_info_device_blocked" = "Mustas nimekirjas";
+"room_event_encryption_info_block" = "Lisa musta nimekirja";
+"room_event_encryption_info_unblock" = "Eemalda mustast nimekirjast";
+"room_event_encryption_verify_message" = "Tegemaks kindlaks, et seda sessiooni võid usaldada, palun kohtu tema omanikuga mõnel muul viisil (näiteks isiklikult või telefonikõne vahendusel) ning küsi, kas võtmed, mida ta näeb oma kasutajaseadistustes kattuvad alljärgnevaga:\n\n\tSessioni nimi: %@\n\tSessioni tunnus: %@\n\tSessioni võti: %@\n\nKui andmed kattuvad, siis vajuta järgnevat verifitseerimise nuppu. Kui ei kattu, siis tõenäoliselt keegi võõras suudab seda teist sessiooni kontrollida ning sa ilmselt eelistaks lisada teda musta nimekirja.\n\nTulevikus see verifitseerimise toiming võib minna veelgi nutikamaks.";
+"local_contacts_access_not_granted" = "Kasutajate leidmine sinu kohaliku aadressiraamatu alusel eeldab talle ligipääsu, kuid %@'l puuduvad selleks õigused";
+"notification_settings_global_info" = "Teavituste seadistused salvestatakse serverisse koos sinu konto muude andmetega ning neid jagatakse kõikide klientrakendustega, kes sellist võimalust toetavad (sh töölauateavitused).\n\nReegleid rakendatakse järjekorras ning esimene vastavus määrab ka tulemuse.\nSeega: sõnakohased teavitused on olulisemad, kui jututoa-kohased teavitused ning need omakorda olulisemad kui saatjakohased teavitused.\nMitme sarnase reegli puhul kehtib põhimõte, et esimene loendi alusel leitud vaste on määrav.";
+"notification_settings_per_word_info" = "Sõnade otsing ei ole tõstutundlik ning võib kasutada asendusteks * metamärki. Näiteks:\n- midagi alusel otsitakse kõiki sõnu „midagi“ (eraldajaks kirjavahemärgi, tühikud või rea algus ja lõpp);\n- midagi* alusel otsitakse kõiki sõnu mille alguses on „midagi“;\n- *midagi* otsib mis iganes sõnu, kus leidub järjest 6 tähte „midagi“.";
+"ssl_cert_not_trust" = "See võib tähendada, et keegi on suuteline pahatahtlikult sinu veebiliiklust pealtkuulama või sinu telefon ei usalda serveri kasutatavat sertifikaati.";
+"ssl_cert_new_account_expl" = "Kui serveri haldaja on sind teavitanud, et nii võib juhtuda, siis kontrolli, et sertifikaadi sõrmejälg vastab sellele, mille haldaja sulle on andnud.";
+"ssl_unexpected_existing_expl" = "Võrreldes selle sertifikaadiga, mida sinu nutiseade seni usaldas, on praegune sertifikaat muutunud. See on VÄGA EBATAVALINE. Me soovitame, et ÄRA NÕUSTU selle uue sertifikaadiga.";
+"ssl_expected_existing_expl" = "Senise usaldusväärse sertifikaadi asemel kasutab server nüüd mitteusaldusväärset sertifikaati. See võib tähendada et haldaja on seda serveris muutnud. Et võrrelda viimase kehtiva sertifikaadi sõrmejälge, palun võta haldajaga ühendust.";
+"ssl_only_accept" = "NÕUSTU sertifikaadiga vaid siis, kui serveri haldaja antud sõrmejälg klapib sellega, mida sa hetkel siin näed.";
+//  New
+"notice_room_join_rule_invite" = "%@ määras, et jututuppa pääseb vaid kutsega.";
+"notice_room_join_rule_invite_by_you" = "Sina määrasid, et jututuppa pääseb vaid kutsega.";
+"notice_room_join_rule_public" = "%@ muutis jututoa avalikuks.";
+"notice_room_join_rule_public_by_you" = "Sa muutsid jututoa avalikuks.";
+"notice_room_name_removed_for_dm" = "%@ eemaldas jututoa nime";
+"notice_room_created_for_dm" = "%@ liitus.";
+"notice_room_join_rule_invite_for_dm" = "%@ määras, et jututuppa pääseb vaid kutsega.";
+"notice_room_join_rule_invite_by_you_for_dm" = "Sina määrasid, et jututuppa pääseb vaid kutsega.";
+"notice_room_join_rule_public_for_dm" = "%@ muutis jututoa avalikuks.";
+"notice_room_join_rule_public_by_you_for_dm" = "Sa muutsid jututoa avalikuks.";
+"notice_room_power_level_intro_for_dm" = "Jututoa liikmete õigused on:";
+"notice_room_aliases_for_dm" = "Jututoa aliased on: %@";
+"notice_room_history_visible_to_members_for_dm" = "%@ määras, et jututoa tulevane ajalugu on nähtav kõikidele selle liikmetele.";
+"notice_room_history_visible_to_members_from_invited_point_for_dm" = "%@ määras, et jututoa tulevane ajalugu on nähtav kõikidele selle liikmetele liitumiskutse saatmise hetkest.";
+"notice_room_history_visible_to_members_from_joined_point_for_dm" = "%@ määras, et jututoa tulevane ajalugu on nähtav kõikidele selle liikmetele nende liitumise hetkest.";
+"room_left_for_dm" = "Sina lahkusid";
+"notice_room_third_party_invite_for_dm" = "%@ kutsus kasutajat %@";
+"notice_room_third_party_revoked_invite_for_dm" = "%@ võttis tagasi kasutaja %@ kutse";
+"notice_room_name_changed_for_dm" = "%@ muutis jututoa uueks nimeks %@.";
+"notice_room_third_party_invite_by_you_for_dm" = "Sina kutsusid kasutajat %@";
+"notice_room_third_party_revoked_invite_by_you_for_dm" = "Sina võtsid tagasi kasutaja %@ kutse";
+"notice_room_name_changed_by_you_for_dm" = "Sa muutsid jututoa uueks nimeks %@.";
+"notice_room_name_removed_by_you_for_dm" = "Sa eemaldasid jututoa nime";
+"notice_room_created_by_you_for_dm" = "Sina liitusid.";
+"notice_room_history_visible_to_members_by_you_for_dm" = "Sina tegid jututoa tulevase ajaloo loetavaks kõikidele jututoa liikmetele.";
+"notice_room_history_visible_to_members_from_invited_point_by_you_for_dm" = "Sina määrasid, et jututoa tulevane ajalugu on nähtav kõikidele selle liikmetele liitumiskutse saatmise hetkest.";
+"notice_room_history_visible_to_members_from_joined_point_by_you_for_dm" = "Sina määrasid, et jututoa tulevane ajalugu on nähtav kõikidele selle liikmetele nende liitumise hetkest.";
+"call_more_actions_dialpad" = "Numbriklahvistik";
+"call_more_actions_transfer" = "Suuna kõne edasi";
+"call_more_actions_audio_use_device" = "Kasuta seadme kõlarit";
+"call_more_actions_audio_use_headset" = "Kasuta kõrvaklappe";
+"call_more_actions_change_audio_device" = "Muuda heliseadet";
+"call_more_actions_unhold" = "Jätka";
+"call_more_actions_hold" = "Pane ootele";
+"call_holded" = "Sina panid kõne ootele";
+"call_remote_holded" = "%@ pani kõne ootele";
+"notice_declined_video_call_by_you" = "Sina keeldusid kõnest";
+"notice_declined_video_call" = "%@ keeldus kõnest";
+"resume_call" = "Jätka";
+"call_consulting_with_user" = "Pean nõu kasutajaga %@";
+"call_transfer_to_user" = "Suunan kõne kasutajale %@";
+"call_video_with_user" = "Videokõne kasutajaga %@";
+"call_voice_with_user" = "Häälkõne kasutajaga %@";
+"call_ringing" = "Helistan…";
+"e2e_passphrase_too_short" = "Salafraas on liiga lühike (pikkus peaks olema vähemalt %d tähemärki)";
+"microphone_access_not_granted_for_voice_message" = "Häälsõnumite salvestamiseks on vajalik ligipääs mikrofonile, kuid %@'l pole selleks õigusi";
+"message_reply_to_sender_sent_a_voice_message" = "saatis häälsõnumi.";
+"attachment_large_with_resolution" = "Suurena %@ (~%@)";
+"attachment_medium_with_resolution" = "Keskmisena %@ (~%@)";
+"attachment_small_with_resolution" = "Väiksena %@ (~%@)";
+"attachment_size_prompt_message" = "Seadistustest saad määrata, et see funktsionaalsus pole kasutusel.";
+"attachment_size_prompt_title" = "Saatmiseks kinnita meedia suurus";
+"room_displayname_all_other_participants_left" = "%@ (lahkus(id))";
+"auth_reset_password_error_not_found" = "Pole leitav";
+"auth_reset_password_error_unauthorized" = "Tegevus pole lubatud";
+"auth_username_in_use" = "Selline kasutajanimi on juba olemas";
+"auth_invalid_user_name" = "Vigane kasutajanimi";
+"rename" = "Muuda nime";
+"room_displayname_all_other_members_left" = "%@ (lahkus(id))";
+"attachment_unsupported_preview_message" = "See failitüüp ei ole toetatud.";
+"attachment_unsupported_preview_title" = "Eelvaate kuvamine ei õnnestu";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/eu.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/eu.lproj/MatrixKit.strings
new file mode 100644
index 000000000..6a119cc14
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/eu.lproj/MatrixKit.strings
@@ -0,0 +1,383 @@
+"notice_conference_call_started" = "VoIP konferentzia hasita";
+"notice_conference_call_finished" = "VoIP konferentzia amaituta";
+// Events formatter
+"notice_avatar_changed_too" = "(abatarra ere aldatu da)";
+"notice_crypto_error_unknown_inbound_session_id" = "Igorlearen saioak ez dizkigu mezu honetarako gakoak bidali.";
+"room_error_join_failed_empty_room" = "Ezin da oraingoz hutsik dagoen gela batetara berriro sartu.";
+"notice_encrypted_message" = "Zifratutako mezua";
+"login_email_placeholder" = "E-mail helbidea";
+// room display name
+"room_displayname_empty_room" = "Gela hutsa";
+"room_displayname_two_members" = "%@ eta %@";
+"room_displayname_more_than_two_members" = "%@ eta beste %u";
+// Settings
+"settings" = "Ezarpenak";
+// button names 
+"ok" = "Ados";
+"cancel" = "Utzi";
+"save" = "Gorde";
+"leave" = "Atera";
+"send" = "Bidali";
+"copy_button_name" = "Kopiatu";
+"resend" = "Birbidali";
+"redact" = "Kendu";
+"share" = "Partekatu";
+"delete" = "Ezabatu";
+"room_no_power_to_create_conference_call" = "Gonbidatzeko baimena behar duzu gela honetan konferentzia bat hasteko";
+"room_no_conference_call_in_encrypted_rooms" = "Konferentzia deiak ez daude onartuta zifratutako geletan";
+"invite" = "Gonbidatu";
+"close" = "Itxi";
+"start_voice_call" = "Hasi ahots deia";
+"start_video_call" = "Hasi bideo deia";
+"submit" = "Bidali";
+"login_password_placeholder" = "Pasahitza";
+"login_home_server_title" = "Hasiera-zerbitzariaren URLa:";
+"login_identity_server_title" = "Identitate-zerbitzariaren URL-a:";
+"login_error_must_start_http" = "http[s]:// gisa hasi behar da URLa";
+"login_error_forbidden" = "Erabiltzaile-izen / pasahitz baliogabea";
+"login_error_unknown_token" = "Ez da ezagutzen zehaztutako sarbide katea";
+"login_error_bad_json" = "Gaizki osatutako JSON";
+"login_error_not_json" = "Ez zuen baliozko JSON-ik";
+"login_error_limit_exceeded" = "Eskaera gehiegi bidali dira";
+"login_error_user_in_use" = "Erabiltzaile-izen hau hartuta dago";
+"login_error_login_email_not_yet" = "Oraindik erabili ez den e-maileko esteka";
+"attachment_cancel_download" = "Utzi deskarga?";
+"attachment_cancel_upload" = "Utzi deskarga?";
+"call_ended" = "Deia amaitu da";
+"incoming_video_call" = "Bideo-deia jasotzen";
+"incoming_voice_call" = "Ahots-deia jasotzen";
+"continue" = "Jarraitu";
+// Time
+"format_time_s" = "s";
+"format_time_m" = "m";
+"format_time_h" = "h";
+"format_time_d" = "e";
+"ban" = "Debekatu";
+"mention" = "Aipamena";
+"room_member_power_level_prompt" = "Ezin izango duzu aldaketa hau desegin kidea zure botere maila berera ekartzen ari zarelako.\nZiur zaude?";
+// unrecognized SSL certificate
+"ssl_trust" = "Fidatu";
+"ssl_logout_account" = "Amaitu saioa";
+"ssl_remain_offline" = "Ezikusi";
+"ssl_could_not_verify" = "Ezin izan da urruneko zerbitzariaren identitatea egiaztatu.";
+"ssl_cert_not_trust" = "Honek esan lezake inor zure trafikoa antzematen dabilela asmo txarrez, edo zure telefonoa ez dela fidatzen urruneko zerbitzariaren ziurtagiriaz.";
+"ssl_cert_new_account_expl" = "Zerbitzariaren kudeatzaileak hau gerta daitekeela esaten badu, ziurtatu beheko hatz-marka beraiek emandako hatz-markarekin bat datorrela.";
+"ssl_unexpected_existing_expl" = "Ziurtagiria aldatu da eta ez da zure telefonoak onartzen zuena. Hau OSO ARRAROA da. Ziurtagiri berri hau EZ ONARTZEA aholkatzen da.";
+"ssl_expected_existing_expl" = "Ziurtagiria aldatu da, onartutako batetik onartu gabeko batera. Agian Zerbitzariak ziurtagiria berriztu du. Jarri kontaktuan zerbitzariaren kudeatzailearekin hatz-marka eskatzeko.";
+"ssl_only_accept" = "SOILIK onartu ziurtagiria zerbitzariaren kudeatzaileak goikoarekin bat datorren hatz-marka bat argitaratu badu.";
+// room details dialog screen
+"room_details_title" = "Gelaren xehetasunak";
+"cancel_upload" = "Utzi igoera";
+"cancel_download" = "Utzi deskarga";
+"settings_title_notifications" = "Jakinarazpenak";
+"device_details_delete_prompt_message" = "Eragiketa honek autentifikazio gehigarria behar du.\nJarraitzeko, idatzi zure pasahitza.";
+"device_details_delete_prompt_title" = "Autentifikazioa";
+// Language picker
+"language_picker_title" = "Hautatu hizkuntza";
+"account_email_validation_title" = "Egiaztaketa egiteke";
+"account_email_validation_message" = "Irakurri zure e-maila eta egin klik dakarren estekan. Behin eginda, egin klik Jarraitu botoian.";
+"account_email_validation_error" = "Ezin izan da e-mail helbidea egiaztatu. Irakurrri zure e-maila eta egin klik dakarren estekan. Behin eginda, egin klik Jarraitu botoian";
+// Country picker
+"country_picker_title" = "Hautatu herrialde bat";
+"account_msisdn_validation_message" = "Aktibazio kodea duen SMS mezu bat bidali dizugu. Idatzi kode hori hemen azpian.";
+"room_event_encryption_info_event_none" = "bat ere ez";
+// E2E export
+"e2e_export_room_keys" = "Esportatu gelako gakoak";
+"e2e_export" = "Esportatu";
+"e2e_passphrase_enter" = "Idatzi pasaesaldia";
+"e2e_passphrase_confirm" = "Berretsi pasaesaldia";
+// E2E import
+"e2e_import_room_keys" = "Inportatu gelako gakoak";
+"e2e_import" = "Inportatu";
+"room_event_encryption_info_device_verified" = "Egiaztatuta";
+"room_event_encryption_info_device_blocked" = "Blokeatuta";
+"room_event_encryption_verify_ok" = "Egiaztatu";
+"room_event_encryption_info_unverify" = "Kendu egiaztaketa";
+"room_event_encryption_info_block" = "Blokeatu";
+"room_event_encryption_info_unblock" = "Desblokeatu";
+"view" = "Ikusi";
+"back" = "Atzera";
+"retry" = "Saiatu berriro";
+"dismiss" = "Baztertu";
+"start_chat" = "Hasi txata";
+"room_event_encryption_info_event_unencrypted" = "zifratu gabe";
+"room_event_encryption_info_device_not_verified" = "EZ egiaztatuta";
+"room_event_encryption_info_verify" = "Egiaztatu…";
+"account_error_email_wrong_title" = "E-mail helbide baliogabea";
+"account_error_email_wrong_description" = "Honek ez du baliozko e-mail baten antzik";
+"room_error_join_failed_title" = "Huts egin du gelara elkartzean";
+"room_error_timeline_event_not_found_title" = "Huts egin du denbora-lerroko puntua kargatzean";
+"e2e_passphrase_empty" = "Pasaesaldia ezin da hutsik egon";
+"e2e_passphrase_not_match" = "Pasaesaldiak bat etorri behar dira";
+"error" = "Errorea";
+"create_room" = "Sortu gela";
+"membership_invite" = "Gonbidatuta";
+"kick" = "Kanporatu";
+"matrix" = "Matrix";
+// Login Screen
+"login_create_account" = "Sortu kontua:";
+"login_server_url_placeholder" = "URL-a (adib. https://matrix.org)";
+"login_home_server_info" = "Zure hasiera-zerbitzariak gordetzen ditu zure elkarrizketa guztiak eta kontuaren datuak";
+"login_identity_server_info" = "Matrixek identitate zerbitzariak hornitzen ditu e-mailak eta abar zein Matrix ID-ri dagokien jakiteko, Orain https://matrix.org da dagoen bakarra.";
+"login_user_id_placeholder" = "Matrix ID-a (adib. @urko:matrix.org edo urko)";
+"login_optional_field" = "aukerakoa";
+"login_display_name_placeholder" = "Pantaila-izena (adib. Urko Etxeberria)";
+"login_error_title" = "Saio hasierak huts egin du";
+"login_email_info" = "Zehaztu e-mail helbide bat beste Matrix erabiltzaileek zu errazago aurkitzeko, e-mail helbidea izateak ere etorkizunean pasahitza aldatzea ahalbidetuko dizu.";
+"login_prompt_email_token" = "Sartu zure e-mail egiaztaketa tokena:";
+"login_error_no_login_flow" = "Huts egin du autentifikazio informazioa hasiera zerbitzari honetatik jasotzean";
+"login_leave_fallback" = "Utzi";
+"login_invalid_param" = "Parametro baliogabea";
+"register_error_title" = "Erregistratzeak huts egin du";
+// Action
+"no" = "Ez";
+"yes" = "Bai";
+"abort" = "Abortatu";
+"discard" = "Baztertu";
+"sign_up" = "Erregistratu";
+"submit_code" = "Bidali kodea";
+"login_error_do_not_support_login_flows" = "Orain ez ditugu onartzen hasiera zerbitzari honek zehaztutako saio hasiera metodo guztiak, edo batere";
+"login_error_registration_is_not_supported" = "Oraindik ezin da aplikazioarekin erregistratu";
+"login_use_fallback" = "Erabili ordezko orria";
+"login_error_forgot_password_is_not_supported" = "Oraindik ezin da aplikazioarekin pasahitza berreskuratu";
+"set_default_power_level" = "Leheneratu botere maila";
+"set_moderator" = "Ezarri moderatzailea";
+"set_admin" = "Ezarri kudeatzailea";
+"select_account" = "Hautatu kontu bat";
+"attach_media" = "Erantsi media liburutegitik";
+"capture_media" = "Atera argazkia / bideoa";
+"invite_user" = "Gonbidatu matrix erabiltzailea";
+"reset_to_default" = "Leheneratu lehenetsitakora";
+"resend_message" = "Birbidali mezua";
+"select_all" = "Hautatu guztia";
+"show_details" = "Erakutsi xehetasunak";
+"answer_call" = "Erantzun deia";
+"reject_call" = "Ukatu deia";
+"end_call" = "Amaitu deia";
+"ignore" = "Ezikusi";
+"unignore" = "Berriro aintzat hartu";
+"notice_room_name_removed" = "%@ erabiltzaileak gelaren izena kendu du";
+"notice_room_topic_removed" = "%@ erabiltzaileak gelaren mintzagaia kendu du";
+"notice_event_redacted" = "<kenduta %1$s>";
+"notice_event_redacted_by" = " nork: %@";
+"notice_event_redacted_reason" = " [arrazoia: %@]";
+"notice_room_created" = "%@ erabiltzaileak gela sortu du";
+"notice_room_join_rule" = "Elkartzeko baldintza: %@";
+"notice_room_power_level_intro" = "Gelako kideen botere maila:";
+// Others
+"user_id_title" = "Erabiltzaile ID-a:";
+"offline" = "deskonektatuta";
+"unsent" = "Bidali gabe";
+"not_supported_yet" = "Oraindik ez da onartzen";
+"default" = "lehenetsia";
+"private" = "Pribatua";
+"public" = "Publikoa";
+"power_level" = "Botere maila";
+"network_error_not_reachable" = "Egiaztatu zure sare konexioa";
+"user_id_placeholder" = "adib: @urko:hasierazerbitzaria";
+"ssl_homeserver_url" = "Hasiera-zerbitzariaren URL-a: %@";
+"language_picker_default_language" = "Lehenetsia (%@)";
+"notice_room_invite" = "%@ erabiltzaileak %@ gonbidatu du";
+"notice_room_third_party_invite" = "%@ erabiltzaileak gelara elkartzeko gonbidapen bat bidali dio %@ erabiltzaileari";
+"notice_room_third_party_registered_invite" = "%@ erabiltzaileak %@ gelarako gonbidapena onartu du";
+"notice_room_join" = "%@ elkartu da";
+"notice_room_leave" = "%@ atera da";
+"notice_room_reject" = "%@ erabiltzaileak gonbidapena baztertu du";
+"notice_room_kick" = "%@ erabiltzaileak %@ kanporatu du";
+"notice_room_unban" = "%@ erabiltzaileak debekua kendu dio %@ erabiltzaileari";
+"notice_room_ban" = "%@ erabiltzaileak %@ debekatu du";
+"notice_profile_change_redacted" = "%@ erabiltzaileak bere %@ profila eguneratu du";
+"notice_room_power_level_acting_requirement" = "Hemen aritu ahal izateko erabiltzaileak behar duen botere maila:";
+"notice_image_attachment" = "irudi-eranskina";
+"notice_audio_attachment" = "audio-eranskina";
+"notice_video_attachment" = "bideo-eranskina";
+"notice_location_attachment" = "kokaleku-eranskina";
+"notice_file_attachment" = "fitxategi-eranskina";
+"notice_invalid_attachment" = "eranskin baliogabea";
+"notice_unsupported_attachment" = "Onartu gabeko eranskina: %@";
+"notice_crypto_unable_to_decrypt" = "** Ezin izan da deszifratu: %@ **";
+"settings_enable_inapp_notifications" = "Gaitu aplikazio barneko jakinarazpenak";
+"notification_settings_room_rule_title" = "Gela: '%@'";
+// Devices
+"device_details_title" = "Saioaren informazioa\n";
+"device_details_name" = "Izen publikoa\n";
+"device_details_identifier" = "ID-a\n";
+"device_details_last_seen" = "Azkenekoz ikusia\n";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_rename_prompt_message" = "Saio baten izen publikoa zurekin komunikatzen den jendeak ikusi dezake";
+// Encryption information
+"room_event_encryption_info_title" = "Muturretik muturrerako zifratzearen informazioa\n\n";
+"room_event_encryption_info_event_user_id" = "Erabiltzailearen ID-a\n";
+"room_event_encryption_info_event_identity_key" = "Curve25519 identitate-gakoa\n";
+"room_event_encryption_info_event_algorithm" = "Algoritmoa\n";
+"room_event_encryption_info_event_session_id" = "Saioaren ID-a\n";
+"room_event_encryption_info_event_decryption_error" = "Deszifratze errorea\n";
+"room_event_encryption_info_device" = "\nIgorlearen saioaren informazioa\n";
+"room_event_encryption_info_device_unknown" = "saio ezezaguna\n";
+"room_event_encryption_info_device_name" = "Izen publikoa\n";
+"room_event_encryption_info_device_id" = "ID-a\n";
+"room_event_encryption_info_device_fingerprint" = "Ed25519 hatz-marka\n";
+// Account
+"account_save_changes" = "Gorde aldaketak";
+"account_msisdn_validation_error" = "Ezin izan da telefono zenbakia egiaztatu.";
+"account_msisdn_validation_title" = "Egiaztaketa egiteke";
+"login_mobile_device" = "Mugikorra";
+"login_tablet_device" = "Tableta";
+"login_desktop_device" = "Mahaigainekoa";
+"notification_settings_people_join_leave_rooms" = "Jakinarazi niri jendea gelera elkartu edo gelatik ateratzean";
+"notice_room_power_level_event_requirement" = "Gertaerekin lotutako gutxieneko botere maila:";
+"notice_room_aliases" = "Gelaren ezizenak: %@";
+"notice_encryption_enabled" = "%@ erabiltzaileak muturretik muturrera zifratzea gaitu du (%@ algoritmoa)";
+"notice_redaction" = "%@ erabiltzaileak gertaera bat kendu du (id: %@)";
+"notice_error_unsupported_event" = "Onartu gabeko gertaera";
+"notice_error_unexpected_event" = "Ustekabeko gertaera";
+"notice_error_unknown_event_type" = "Gertaera mota ezezaguna";
+"notice_room_history_visible_to_anyone" = "%@ erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du edonorentzat.";
+"notice_room_history_visible_to_members" = "%@ erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat, gonbidapena egiten zaienetik.";
+"notice_room_history_visible_to_members_from_invited_point" = "%@ erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat, gonbidapena egiten zaienetik.";
+"notice_room_history_visible_to_members_from_joined_point" = "%@ erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat, elkartzen direnetik.";
+"room_event_encryption_info_event" = "Gertaeraren informazioa\n";
+"room_event_encryption_info_device_verification" = "Egiaztaketa\n";
+"room_event_encryption_verify_title" = "Egiaztatu saioa\n\n";
+"account_link_email" = "Lotu e-maila";
+"account_linked_emails" = "Lotutako e-mailak";
+"account_error_display_name_change_failed" = "Huts egin du pantaila-izenaren aldaketak";
+"account_error_picture_change_failed" = "Huts egin du irudiaren aldaketak";
+"account_error_matrix_session_is_not_opened" = "Matrix saioa ez dago irekita";
+"account_error_msisdn_wrong_title" = "Telefono zenbaki baliogabea";
+"account_error_msisdn_wrong_description" = "Honek ez du baliozko telefono zenbaki baten antzik";
+// Room creation
+"room_creation_name_title" = "Gelaren izena:";
+"room_creation_name_placeholder" = "(adib. lagunKuadrilla)";
+"room_creation_alias_title" = "Gelaren ezizena:";
+"room_creation_alias_placeholder" = "(adib. #gela:adibidea.org)";
+"room_creation_alias_placeholder_with_homeserver" = "(adib. #gela%@)";
+"room_creation_participants_title" = "Parte hartzaileak:";
+"room_creation_participants_placeholder" = "(adib. @miren:1zerbitzaria; @peio:2zerbitzaria…)";
+// Room
+"room_please_select" = "Hautatu gela bat";
+"room_error_name_edition_not_authorized" = "Ez duzu gela honen izena aldatzeko baimenik";
+"room_error_topic_edition_not_authorized" = "Ez duzu gela honen mintzagaia aldatzeko baimenik";
+"notice_topic_changed" = "%@ erabiltzaileak mintzagaia honetara aldatu du: %@";
+"notice_room_name_changed" = "%@ erabiltzaileak gelaren izena honetara aldatu du: %@";
+"settings_enable_push_notifications" = "Gaitu jakinarazpenak";
+"settings_enter_validation_token_for" = "Sartu %@ balidazio tokena:";
+"room_event_encryption_info_event_fingerprint_key" = "Aldarrikatutako Ed25519 hatz-marka gakoa\n";
+"room_error_cannot_load_timeline" = "Huts egin du denbora lerroa kargatzean";
+"room_left" = "Gelatik atera zara";
+// Room members
+"room_member_ignore_prompt" = "Ziur erabiltzaile honen mezu guztiak ezkutatu nahi dituzula?";
+// Attachment
+"attachment_size_prompt" = "Nola bidali nahi duzu:";
+"attachment_original" = "Jatorrizko tamaina: %@";
+"attachment_small" = "Txikia: %@";
+"attachment_medium" = "Ertaina: %@";
+"attachment_large" = "Handia: %@";
+"attachment_multiselection_size_prompt" = "Irudiak nola bidali nahi dituzu:";
+"attachment_multiselection_original" = "Jatorrizko tamaina";
+"attachment_e2e_keys_file_prompt" = "Fitxategi honek Matrix bezero batetik esportatutako zifratze gakoak ditu.\nFitxategiaren edukia ikusi nahi duzu edo dauzkan gakoak inportatu?";
+"attachment_e2e_keys_import" = "Inportatu…";
+// Contacts
+"contact_mx_users" = "Matrix erabiltzaileak";
+"contact_local_contacts" = "Kontaktu lokalak";
+// Search
+"search_no_results" = "Emaitzarik ez";
+"search_searching" = "Bilaketa abian…";
+// Permissions
+"camera_access_not_granted_for_call" = "Bideo deiek kamera atzitzeko baimena behar dute baina %@ aplikazioak ez du baimenik";
+"microphone_access_not_granted_for_call" = "Deiek mikrofonoa atzitzeko baimena behar dute baina %@ aplikazioak ez du baimenik";
+"local_contacts_access_discovery_warning_title" = "Erabiltzaileak aurkitzea";
+"local_contacts_access_discovery_warning" = "Matrix darabilten kontaktuak aukitzeko, %@ aplikazioak zure helbide-liburuko kontaktuen e-mail eta telefono zenbakiak igo ahal ditu zuk hautatutako Matrix identitate-zerbitzarira. AHal denean, datu pertsonalak hasheatu egingo dira bidali aurretik, egiaztatu zure identitate-zerbitzariaren pribatutasun politika xehetasun gehiagorako.";
+"notice_room_withdraw" = "%@ erabiltzaileak %@ erabiltzailearen gonbidapena atzera bota du";
+"notice_room_reason" = ".Arrazoia: %@";
+"notice_avatar_url_changed" = "%@ erabiltzaileak abatarra aldatu du";
+"notice_display_name_set" = "%@ erabiltzaileak bere pantaila-izena aldatu du beste honetara: %@";
+"notice_display_name_changed_from" = "%@ erabiltzaileak bere pantaila-izena aldatu du, honetatik: %@ honetara: %@";
+"notice_display_name_removed" = "%@ erabiltzaileak bere pantaila-izena kendu du";
+"notice_placed_voice_call" = "%@ erabiltzaileak ahots deia hasi du";
+"notice_placed_video_call" = "%@ erabiltzaileak bideo deia hasi du";
+"notice_answered_video_call" = "%@ erabiltzaileak deia erantzun du";
+"notice_ended_video_call" = "%@ erabiltzaileak deia amaitu du";
+"notice_conference_call_request" = "%@ erabiltzaileak VoIP konferentzia bat eskatu du";
+"set_power_level" = "Ezarri botere-maila";
+// actions 
+"action_logout" = "Amaitu saioa";
+"login" = "Hasi saioa";
+"create_account" = "Sortu kontua";
+"membership_leave" = "Atera da";
+"membership_ban" = "Debekatua";
+"num_members_one" = "erabiltzaile %@";
+"num_members_other" = "%@ erabiltzaile";
+"unban" = "Kendu debekua";
+"message_unsaved_changes" = "Gorde gabeko aldaketak daude. Irtenez gero baztertuko dira.";
+// Login Screen 
+"login_error_already_logged_in" = "Saioa hasita zegoen jada";
+// contacts list screen 
+"invitation_message" = "Zurekin hitz egin nahiko nuke matrix erabilita, zoaz http://matrix.org webgunera informazio gehiagorako.";
+// Settings screen 
+"settings_title_config" = "Konfigurazioa";
+// Notification settings screen 
+"notification_settings_disable_all" = "Desgaitu jakinarazpen guztiak";
+"notification_settings_enable_notifications" = "Gaitu jakinarazpenak";
+"notification_settings_enable_notifications_warning" = "Jakinarazpen guztiak desgaituta daude gailu guztientzat.";
+"notification_settings_per_word_notifications" = "Hitzen jakinarazpenak";
+"notification_settings_always_notify" = "Jakinarazi beti";
+"notification_settings_never_notify" = "Ez jakinarazi inoiz";
+"notification_settings_word_to_match" = "behatu beharreko hitza";
+"notification_settings_highlight" = "Nabarmendu";
+"notification_settings_custom_sound" = "Soinu pertsonalizatua";
+"notification_settings_per_room_notifications" = "Gelen jakinarazpenak";
+"notification_settings_per_sender_notifications" = "Igorleen jakinarazpenak";
+"notification_settings_sender_hint" = "@erabiltzailea:domeinua.eus";
+"notification_settings_select_room" = "Hautatu gela bat";
+"notification_settings_other_alerts" = "Beste alertak";
+"notification_settings_contain_my_user_name" = "Jakinarazi niri soinuarekin nire erabiltzaile izena duten mezuak daudenean";
+"notification_settings_contain_my_display_name" = "Jakinarazi niri soinuarekin nire pantaila-izena duten mezuak daudenean";
+"notification_settings_just_sent_to_me" = "Jakinarazi niri soinuarekin niri bakarrik bidalitako mezuak daudenean";
+"notification_settings_invite_to_a_new_room" = "Jakinarazi niri gela batera gonbidatzen nautenean";
+"notification_settings_receive_a_call" = "Jakinarazi niri dei bat jasotzen dudanean";
+"notification_settings_suppress_from_bots" = "Kendu boten jakinarazpenak";
+"notification_settings_by_default" = "Lehenetsita…";
+"notification_settings_notify_all_other" = "Jakinarazi beste mezu/gela guztietarako";
+// gcm section 
+"settings_config_home_server" = "Hasiera-zerbitzaria: %@";
+"settings_config_identity_server" = "Identitate zerbitzaria: %@";
+"settings_config_user_id" = "Erabiltzaile ID-a: %@";
+// call string
+"call_waiting" = "Itxaroten…";
+"call_connecting" = "Deia konektatzen…";
+"call_ring" = "Deitzen…";
+"call_invite_expired" = "Dei-gonbidapena iraungi da";
+"ssl_fingerprint_hash" = "Hatz-marka (%@):";
+"notice_feedback" = "Informazio gertaera (id: %@): %@";
+"room_event_encryption_verify_message" = "Saio hau fidagarria dela egiaztatzeko, jarri kontaktuan jabearekin beste medio batzuk erabilita (adib. aurrez-aurre edo telefonoz deituz) eta galdetu bere erabiltzaile-ezarpenetan ikusten duten gakoa honekin bat datorren:\n\n\tSaioaren izena: %@\n\tSaioaren ID-a: %@\n\tSaioaren gakoa: %@\n\nBat badatoz, sakatu beheko egiaztatu botoia. Ez badatoz bat, beste norbait egon daiteke saioa atzematen eta ziur aski zerrenda beltzaren botoia zapaldu nahiko duzu.\n\nEtorkizunean egiaztaketa prozesu hau sofistikatuagoa izango da.";
+"room_error_timeline_event_not_found" = "Aplikazioa gela honen denbora lerroko puntu zehatz bat kargatzen saiatu da baina ezin izan du aurkitu";
+"e2e_import_prompt" = "Prozesu honek aurretik beste Matrix bezero batetik esportatutako zifratze gakoak inportatzea ahalbidetzen du. Beste bezeroak dezifratu zitekeen mezuak deszifratu ahal izango duzu.\nEsportazio fitxategia pasaesaldi batez babestuta dago. Pasaesaldi hori hemen jarri behar duzu fitxategia deszifratzeko.";
+"e2e_export_prompt" = "Prozesu honek zifratutako geletan jaso dituzun mezuen gakoak fitxategi lokal batera esportatzea ahalbidetzen dizu. Gero beste Matrix bezero batera inportatu ditzakezu, bezero horrek ere mezu hauek dezifratu ahal izateko.\nEsportatutako fitxategiak berau irakurri dezakeen edonori zuk ikusi ditzakezun mezuak deszifratzea ahalbidetuko dio, beraz kontuz non gordetzen duzun.";
+"local_contacts_access_not_granted" = "Kontaktu lokaletatik erabiltzaileak aurkitzeko zure kontaktua atzitzeko baimena behar da baina %@ aplikazioak ez du baimenik";
+"notification_settings_global_info" = "Jakinarazpen ezarpenak zure erabiltzaile kontuan gordetzen dira eta onartutako bezeroen artean partekatzen dira (mahaigaineko jakinarazpenak barne).\n\nArauak ordenan aplikatzen dira;  bat datorren lehen arauak zehazten du zer gertatzen den mezuarekin.\nBeraz: Hitzen jakinarazpenak gelen jakinarazpenak baino garrantzitsuagoak dira, eta hauek igorleen jakinarazpenak baino garrantzitsuagoak.\nMota bereko arauentzat, zerrendan bat datorren lehenak lehentasuna hartzen du.";
+"notification_settings_per_word_info" = "Hitzak ez dituzte bereizten maiuskula eta minuskulak, eta * komodina izan dezakete. Beraz:\nmar bat dator mar katearekin hitz mugatzaileez inguratuta dagoenean (adib. puntuazioa, zuriunea, lerro hasiera edo bukaera).\nmar* bat dator mar-ez hasten den edozein hitzekin.\n*mar* bat dator edozein posiziotan mar duten hitzekin.";
+"notice_room_related_groups" = "Gela honekin lotura duten taldeak hauek dira: %@";
+// Groups
+"group_invite_section" = "Gonbidapenak";
+"group_section" = "Taldeak";
+"notice_sticker" = "eranskailua";
+"notice_in_reply_to" = "Honi erantzunez";
+"error_common_message" = "Errore bat gertatu da. Saiatu berriro geroago.";
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "irudi bat bidali du.";
+"message_reply_to_sender_sent_a_video" = "bideo bat bidali du.";
+"message_reply_to_sender_sent_an_audio_file" = "audio fitxategi bat bidali du.";
+"message_reply_to_sender_sent_a_file" = "fitxategi bat bidali du.";
+"message_reply_to_message_to_reply_to_prefix" = "Honi erantzunez";
+"login_error_resource_limit_exceeded_title" = "Baliabide muga gaindituta";
+"login_error_resource_limit_exceeded_message_default" = "Hasiera zerbitzari honek bere baliabide mugetako bat gainditu du.";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "Hasiera zerbitzari honek bere hilabeteko erabiltzaile aktiboen muga gainditu du.";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nJarri kontaktuan zerbitzuaren administratzailearekin zerbitzu hau erabiltzen jarraitzeko.";
+"login_error_resource_limit_exceeded_contact_button" = "Kontaktatu administratzailea";
+"e2e_passphrase_create" = "Sortu pasaesaldia";
+"account_error_push_not_allowed" = "Jakinarazpenak ez dira onartzen";
+"device_details_rename_prompt_title" = "Saioaren izena";
+"notice_room_third_party_revoked_invite" = "%@ erabiltzaileak %@ gelara elkartzeko gonbidapena indargabetu du";
+"notice_encryption_enabled_ok" = "%@ erabiltzaileak zifratzea gaitu du.";
+"notice_encryption_enabled_unknown_algorithm" = "%1$@ erabiltzaileak zifratzea gaitu du. (%2$@ algoritmo ezezaguna).";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/fa.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/fa.lproj/MatrixKit.strings
new file mode 100644
index 000000000..d2b523506
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/fa.lproj/MatrixKit.strings
@@ -0,0 +1,549 @@
+
+
+"e2e_import_prompt" = "این فرآیند به شما امکان می دهد کلیدهای رمزگذاری را که قبلاً از کلاینت دیگری صادر کرده اید، وارد کنید. سپس می توانید هر پیامی را که کلاینت دیگر رمزگشایی می کند رمزگشایی کنید.\nپرونده با عبارت عبور محافظت می شود. برای رمزگشایی پرونده باید عبارت عبور را در اینجا وارد کنید.";
+"room_member_power_level_prompt" = "شما نمی توانید این تغییر را لغو کنید زیرا در حال ارتقا سطح کاربر به همان سطح خودتان هستید.\nآیا مطمئن هستید؟";
+"notification_settings_per_word_info" = "کلمات به صورت غیر حساس(case insensitive)تطابق می‌کنند و ممکن است شامل یک wildcard * باشد. بنابراین:\nfoo با رشته foo که توسط جداکننده‌های کلمه احاطه شده تطابق می‌کند (به عنوان مثال علائم نگارشی و فضای خالی یا شروع و پایان خط).\nfoo* با هر کلمه ای که با foo شروع شود مطابقت دارد.\n*foo* با هر کلمه‌ای که حداقل سه حرف foo را داشته باشد تطابق می‌کند.";
+"ssl_only_accept" = "فقط در صورتی که ادمین سرور اثر انگشت متناسب با مورد بالا را منتشر کرده باشد، گواهی را بپذیرید.";
+"ssl_expected_existing_expl" = "این گواهی از یک گواهینامه مورد اعتماد قبلی به یک گواهینامه مورد اعتماد دیگر تبدیل شده است. سرور ممکن است گواهینامه خود را تمدید کرده باشد. برای اطمینان از اثر انگشت با ادمین سرور تماس بگیرید.";
+"ssl_unexpected_existing_expl" = "این گواهینامه از گواهی مورد اعتماد تلفن شما تغییر کرده است. این بسیار غیر معمول است. توصیه می شود این گواهینامه جدید را قبول نکنید.";
+"ssl_cert_new_account_expl" = "درصورتی که ادمین سرور بگوید مشکلی وجود ندارد، اطمینان حاصل کنید که اثر انگشت زیر با اثر انگشت ارائه شده توسط او مطابقت دارد.";
+"ssl_cert_not_trust" = "این می تواند به این معنی باشد که شخصی ثالثی ترافیک شما را رهگیری می کند یا اینکه تلفن شما به گواهی ارائه شده توسط سرور اعتماد ندارد.";
+"ssl_could_not_verify" = "هویت سرور تأیید نشد.";
+"ssl_fingerprint_hash" = "اثر انگشت (%@):";
+"ssl_remain_offline" = "نادیده‌گیری";
+"ssl_logout_account" = "خروج";
+
+// unrecognized SSL certificate
+"ssl_trust" = "اعتماد کردن";
+"call_more_actions_dialpad" = "پد شماره گیری";
+"call_more_actions_transfer" = "انتقال";
+"call_more_actions_audio_use_device" = "بلندگوی دستگاه";
+"call_more_actions_audio_use_headset" = "استفاده از هدست صوتی";
+"call_more_actions_change_audio_device" = "تغییر خروجی صدا";
+"call_more_actions_unhold" = "از سرگیری";
+"call_more_actions_hold" = "قرار دادن در حالت انتظار";
+"call_holded" = "شما تماس را در حالت انتظار قرار داده‌اید";
+"call_remote_holded" = "%@ تماس را در حالت انتظار قرار داده است";
+"call_invite_expired" = "تماس منقضی شده است";
+"incoming_video_call" = "تماس ویدیویی ورودی";
+"incoming_voice_call" = "تماس صوتی ورودی";
+"call_ring" = "در حال تماس...";
+"call_ended" = "مکالمه تلفنی تمام شد";
+"call_connecting" = "در حال اتصال …";
+
+// Settings keys 
+
+// call string
+"call_waiting" = "در انتظار...";
+"settings_config_user_id" = "شناسه کاربری: %@";
+"settings_config_identity_server" = "سرور هویت‌سنجی: %@";
+
+// gcm section 
+"settings_config_home_server" = "سرور: %@";
+"notification_settings_notify_all_other" = "برای سایر پیام ها / اتاق ها اطلاع بده";
+"notification_settings_by_default" = "به صورت پیش فرض...";
+"notification_settings_suppress_from_bots" = "اعلان‌های ربات‌ها را سرکوب کن";
+"notification_settings_receive_a_call" = "هنگام دریافت تماس به من اطلاع بده";
+"notification_settings_people_join_leave_rooms" = "وقتی افراد به اتاق می‌پیوندند یا از اتاق خارج می شوند، به من اطلاع بده";
+"notification_settings_invite_to_a_new_room" = "وقتی به اتاق جدیدی دعوت شدم به من اطلاع بده";
+"notification_settings_just_sent_to_me" = "در مورد پیام‌هایی که فقط برای من ارسال شده است با صوت به من اطلاع بده";
+"notification_settings_contain_my_display_name" = "در مورد پیام‌هایی که حاوی نام من هستند با صدا به من اطلاع بده";
+"notification_settings_contain_my_user_name" = "در مورد پیام هایی که حاوی نام کاربری من است با صوت به من اطلاع بده";
+"notification_settings_other_alerts" = "هشدارهای دیگر";
+"notification_settings_select_room" = "اتاقی را انتخاب کنید";
+"notification_settings_sender_hint" = "@user:domain.com";
+"notification_settings_per_sender_notifications" = "اعلان‌های ارسال کننده محور";
+"notification_settings_per_room_notifications" = "اعلان‌های اتاق‌محور";
+"notification_settings_custom_sound" = "صدای سفارشی";
+"notification_settings_highlight" = "هایلایت";
+"notification_settings_word_to_match" = "کلمه مطابقت";
+"notification_settings_never_notify" = "هرگز اطلاع نده";
+"notification_settings_always_notify" = "همیشه اطلاع بده";
+"notification_settings_per_word_notifications" = "اعلان‌های کلمه‌محور";
+"notification_settings_global_info" = "تنظیمات اعلان در حساب کاربری شما ذخیره می شود و بین همه کلاینت‌هایی که از آنها پشتیبانی می کنند به اشتراک گذاشته می شود (از جمله اعلان های دسکتاپ).\n\nقوانین به ترتیب اعمال می شود. اولین قانونی که مطابقت دارد نتیجه پیام را مشخص می کند.\nبنابراین: اعلان‌های کلمه‌محور از اعلان‌های اتاق‌محور مهم‌تر و اعلان‌های اتاق‌محور از اعلان‌های ارسال‌کننده‌محور مهم‌تر هستند.\nبرای چندین قانون از یک نوع، اولین قانونی که در لیست مطابقت دارد در اولویت است.";
+"notification_settings_enable_notifications_warning" = "همه اعلان‌ها در حال حاضر برای همه دستگاه‌ها غیرفعال هستند.";
+
+// room display name
+"room_displayname_empty_room" = "اتاق خالی";
+"notice_in_reply_to" = "در پاسخ به";
+"notice_sticker" = "استیکر";
+"notice_crypto_error_unknown_inbound_session_id" = "نشست فرستنده کلیدهای این پیام را برای ما ارسال نکرده است.";
+"notice_room_history_visible_to_members_from_joined_point" = "%@ تاریخچه آینده‌ی اتاق را از همان زمانی که افراد به اتاق پیوستند برای آنان قابل مشاهده کرد.";
+"notice_room_history_visible_to_members_from_invited_point" = "%@ تاریخچه آینده‌ی اتاق را از همان زمانی که افراد دعوت شده اند برای آنان قابل مشاهده کرد.";
+"login_email_info" = "یک ایمیل مشخص کنید تا سایر کاربران بتوانند شما را در ماتریکس با سهولت بیشتری پیدا کنند و به شما راهی برای تنظیم مجدد رمز عبور خود در آینده بدهد.";
+"login_identity_server_info" = "ماتریکس سرورهای هویت‌سنجی را برای ردیابی اینکه کدام ایمیل‌ها و غیره متعلق به کدام شناسه‌های ماتریکس هستند فراهم می کند. در حال حاضر فقط https://matrix.org وجود دارد.";
+"notice_video_attachment" = "پیوست ویدیویی";
+"notice_audio_attachment" = "پیوست صوتی";
+"notice_image_attachment" = "پیوست تصویر";
+"notice_encryption_enabled_unknown_algorithm" = "%1$@ رمزگذاری سرتاسری را فعال کرد (الگوریتم ناشناخته %2$@).";
+"notice_encryption_enabled_ok" = "%@ رمزگذاری سرتاسری را فعال کرد.";
+"notice_encrypted_message" = "پیام رمزگذاری شده";
+"notice_room_related_groups" = "گروه های مرتبط با این اتاق عبارتند از: %@";
+"notice_room_aliases_for_dm" = "نام های مستعار عبارتند از: %@";
+"notice_room_aliases" = "نام مستعار اتاق: %@";
+"notice_room_power_level_event_requirement" = "حداقل سطح قدرت مربوط به رویدادها عبارت است از:";
+"notice_room_power_level_acting_requirement" = "حداقل سطح قدرت که کاربر باید قبل از اقدام داشته باشد:";
+"notice_room_power_level_intro_for_dm" = "سطح قدرت اعضا عبارت است از:";
+"notice_room_power_level_intro" = "سطح قدرت اعضای اتاق عبارت است از:";
+"notice_room_join_rule_public_by_you_for_dm" = "شما اینجا را عمومی کردید.";
+"notice_room_join_rule_public_by_you" = "شما اتاق را عمومی کردید.";
+"notice_room_join_rule_public_for_dm" = "%@ اینجا را عمومی کرد.";
+"notice_room_join_rule_public" = "%@ اتاق را عمومی کرد.";
+"notice_room_join_rule_invite_by_you_for_dm" = "شما گفتگو را به حالت \"فقط با دعوت\" تنظیم کردید.";
+"notice_room_join_rule_invite_by_you" = "شما اتاق را به حالت \"فقط با دعوت\" تنظیم کردید.";
+"notice_room_join_rule_invite_for_dm" = "%@ گفتگو را به حالت \"فقط با دعوت\" تنظیم کرد.";
+//  New
+"notice_room_join_rule_invite" = "%@ اتاق را به حالت \"فقط با دعوت\" تنظیم کرد.";
+//  Old
+"notice_room_join_rule" = "قانون پیوستن: %@";
+"notice_room_created_for_dm" = "%@ پیوست.";
+"notice_room_created" = "%@ اتاق را ایجاد و پیکربندی کرد.";
+"notice_profile_change_redacted" = "%@ پروفایل خود را بروز کرد %@";
+"notice_event_redacted_reason" = " [علت: %@]";
+"notice_event_redacted_by" = " توسط %@";
+"notice_event_redacted" = "<%@ واکنش نشان داد>";
+"notice_room_topic_removed" = "%@ موضوع را حذف کرد";
+"notice_room_name_removed_for_dm" = "%@ نام را حذف کرد";
+"notice_room_name_removed" = "%@ نام اتاق را حذف کرد";
+
+// Events formatter
+"notice_avatar_changed_too" = "(آواتار هم تغییر کرد)";
+"unignore" = "عدم نادیده‌گیری";
+"ignore" = "چشم پوشی";
+"resume_call" = "از سرگیری";
+"end_call" = "پایان تماس";
+"reject_call" = "رد تماس";
+"answer_call" = "پاسخ دادن به تماس";
+"show_details" = "نمایش جزئیات";
+"cancel_download" = "لغو بارگیری";
+"cancel_upload" = "لغو بارگذاری";
+"select_all" = "انتخاب همه";
+"resend_message" = "ارسال مجدد پیام";
+"reset_to_default" = "تنظیم به حالت پیش فرض";
+"invite_user" = "دعوت کاربر ماتریکس";
+"capture_media" = "گرفتن عکس/فیلم";
+"attach_media" = "پیوست رسانه از کتابخانه";
+"select_account" = "یک حساب انتخاب کنید";
+"mention" = "اشاره";
+"start_video_call" = "شروع تماس ویدیویی";
+"start_voice_call" = "شروع تماس صوتی";
+"start_chat" = "شروع گفتگو";
+"set_admin" = "تنظیم مدیر";
+"set_moderator" = "تنظیم معاون";
+"set_default_power_level" = "تنظیم مجدد سطح قدرت";
+"set_power_level" = "تنظیم سطح قدرت";
+"submit_code" = "ارسال کد";
+"submit" = "ارسال";
+"sign_up" = "ثبت نام";
+"retry" = "تلاش مجدد";
+"dismiss" = "رد";
+"discard" = "رها کردن";
+"continue" = "ادامه";
+"close" = "بستن";
+"back" = "بازگشت";
+"abort" = "لغو";
+"yes" = "بله";
+
+// Action
+"no" = "خیر";
+"login_error_resource_limit_exceeded_contact_button" = "تماس با ادمین";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nلطفاً برای ادامه استفاده از این سرویس با سرپرست سرویس خود تماس بگیرید.";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "این سرور به محدودیت کاربر فعال ماهانه خود رسیده است.";
+"login_error_resource_limit_exceeded_message_default" = "این سرور از یکی از محدودیت های منابع خود فراتر رفته است.";
+"login_error_resource_limit_exceeded_title" = "از محدودیت منابع فراتر رفت";
+"login_desktop_device" = "دسکتاپ";
+"login_tablet_device" = "تبلت";
+"login_mobile_device" = "تلفن همراه";
+"login_error_forgot_password_is_not_supported" = "گذرواژه فراموش شده در حال حاضر پشتیبانی نمی شود";
+"register_error_title" = "ثبت نام انجام نشد";
+"login_invalid_param" = "پارامتر نامعتبر است";
+"login_leave_fallback" = "لغو";
+"login_use_fallback" = "استفاده از صفحه بازگشت";
+"login_error_login_email_not_yet" = "لینک ایمیل هنوز کلیک نشده است";
+"login_error_user_in_use" = "این نام کاربری قبلاً استفاده شده است";
+"login_error_limit_exceeded" = "درخواست‌های زیادی ارسال شده است";
+"login_error_not_json" = "حاوی JSON معتبر نبود";
+"login_error_bad_json" = "JSON بد شکل";
+"login_error_unknown_token" = "توکن دسترسی وارد شده معتبر نیست";
+"login_error_forbidden" = "نام کاربری / گذرواژه نامعتبر است";
+"login_error_registration_is_not_supported" = "ثبت نام در حال حاضر پشتیبانی نمی شود";
+"login_error_do_not_support_login_flows" = "در حال حاضر ما از روش ورود به سیستم تعریف شده توسط سرور پشتیبانی نمی کنیم";
+"login_error_no_login_flow" = "ما موفق به بازیابی اطلاعات احراز هویت از این سرور نشدیم";
+"login_error_title" = "ورود ناموفق بود";
+"login_prompt_email_token" = "لطفا کد اعتبارسنجی ایمیل خود را وارد کنید:";
+"login_email_placeholder" = "آدرس ایمیل";
+"login_display_name_placeholder" = "نام (به عنوان مثال محمد حسینی)";
+"login_optional_field" = "اختیاری";
+"login_password_placeholder" = "گذرواژه";
+"login_user_id_placeholder" = "شناسه ماترکیس (به عنوان مثال @bob:matrix.org یا Bob)";
+"login_identity_server_title" = "آدرس سرور هویت‌سنجی:";
+"login_home_server_info" = "سرور تمام مکالمات و داده‌های حساب شما را ذخیره می کند";
+"login_home_server_title" = "آدرس سرور:";
+"login_server_url_placeholder" = "URL (به عنوان مثال https://matrix.org)";
+
+// Login Screen
+"login_create_account" = "ایجاد حساب:";
+/* *********************** */
+/*      iOS specific       */
+/* *********************** */
+
+"matrix" = "ماتریکس";
+"notification_settings_enable_notifications" = "فعال سازی اعلان‌ها";
+
+// Notification settings screen 
+"notification_settings_disable_all" = "همه اعلان‌ها را غیرفعال کنید";
+"settings_title_notifications" = "اعلان‌ها";
+
+// Settings screen 
+"settings_title_config" = "پیکربندی";
+
+// contacts list screen 
+"invitation_message" = "من دوست دارم با شما با ماتریس گپ بزنم. لطفاً برای کسب اطلاعات بیشتر به وب سایت http://matrix.org مراجعه کنید.";
+
+// members list Screen 
+
+// accounts list Screen 
+
+// image size selection 
+
+// invitation members list Screen 
+
+// room creation dialog Screen 
+
+// room info dialog Screen
+
+// room details dialog screen
+"room_details_title" = "جزئیات اتاق";
+"login_error_must_start_http" = "آدرس باید با http[s]:// شروع شود";
+
+// Login Screen 
+"login_error_already_logged_in" = "قبلاً وارد سیستم شده‌اید";
+"message_unsaved_changes" = "تغییرات ذخیره نشده‌ای وجود دارد. ترک کردن موجب از بین رفتن این تغییرات می‌شود.";
+"unban" = "لغو تحریم";
+"ban" = "تحریم";
+"kick" = "اخراج";
+"invite" = "دعوت";
+"num_members_other" = "%@ کاربر";
+"num_members_one" = "%@ کاربر";
+"membership_ban" = "تحریم";
+"membership_leave" = "ترک کرد";
+"membership_invite" = "دعوت کرد";
+"create_account" = "ایجاد حساب";
+"login" = "ورود";
+"create_room" = "ایجاد اتاق";
+
+// actions 
+"action_logout" = "خروج";
+"view" = "مشاهده";
+"delete" = "حذف";
+"share" = "اشتراک گذاری";
+"redact" = "حذف";
+"resend" = "ارسال مجدد";
+"copy_button_name" = "کپی";
+"send" = "ارسال";
+"leave" = "ترک";
+"save" = "ذخیره";
+"cancel" = "لغو";
+
+// Room Screen 
+
+// general errors 
+
+// Home Screen 
+
+// Last seen time 
+
+// call events 
+
+/* -*- 
+   Automatic localization for en
+
+   The following key/value pairs were extracted from the android i18n file:
+    /console/src/main/res/values/strings.xml.
+*/
+
+
+// titles 
+
+// button names 
+"ok" = "خب";
+"notice_room_history_visible_to_members_from_joined_point_by_you_for_dm" = "پیام‌های آینده را از زمان ملحق شدن افراد برای همه قابل مشاهده کردید.";
+"notice_room_history_visible_to_members_from_joined_point_by_you" = "شما تاریخچه آینده اتاق را از همان زمانی که به آن ملحق شده‌اند، برای همه اعضای اتاق قابل مشاهده کردید.";
+"notice_room_history_visible_to_members_from_invited_point_by_you_for_dm" = "شما پیام‌های آینده را از زمان دعوت شدن برای همه قابل مشاهده کردید.";
+"notice_room_history_visible_to_members_from_invited_point_by_you" = "شما تاریخچه آینده اتاق را از همان زمانی که دعوت شده‌اند ، برای همه اعضای اتاق قابل مشاهده کردید.";
+"notice_room_history_visible_to_members_by_you_for_dm" = "شما پیام‌های آینده را برای همه اعضای اتاق قابل مشاهده کردید.";
+"notice_room_history_visible_to_anyone_by_you" = "شما تاریخچه آینده اتاق را برای همه قابل مشاهده کردید.";
+"notice_room_history_visible_to_members_by_you" = "شما تاریخچه آینده اتاق را برای همه اعضای اتاق قابل مشاهده کردید.";
+"notice_redaction_by_you" = "شما یک رویداد را مجدداً ویرایش کردید (شناسه: %@)";
+"notice_encryption_enabled_unknown_algorithm_by_you" = "رمزگذاری سرتاسری را فعال کردید (الگوریتم ناشناخته %@).";
+"notice_encryption_enabled_ok_by_you" = "رمزگذاری سرتاسری را فعال کردید.";
+"notice_room_created_by_you" = "شما اتاق را ایجاد و پیکربندی کردید.";
+"notice_profile_change_redacted_by_you" = "شما نمایه خود را به روز کردید %@";
+"notice_event_redacted_by_you" = " توسط شما";
+"notice_room_topic_removed_by_you" = "موضوع را حذف کردید";
+"notice_room_name_removed_by_you_for_dm" = "نام را حذف کردید";
+"notice_room_name_removed_by_you" = "نام اتاق را حذف کردید";
+"notice_conference_call_request_by_you" = "شما درخواست جلسه دادید";
+"notice_declined_video_call_by_you" = "شما تماس را رد کردید";
+"notice_ended_video_call_by_you" = "تماس را تمام کردید";
+"notice_answered_video_call_by_you" = "شما به تماس پاسخ دادید";
+"notice_placed_video_call_by_you" = "شما یک تماس ویدیویی برقرار کردید";
+"notice_placed_voice_call_by_you" = "شما یک تماس صوتی برقرار کردید";
+"notice_room_name_changed_by_you_for_dm" = "نام را به %@ تغییر دادید.";
+"notice_room_name_changed_by_you" = "نام اتاق را به %@ تغییر دادید.";
+"notice_topic_changed_by_you" = "شما موضوع را به \"%@\" تغییر دادید.";
+"notice_display_name_removed_by_you" = "نام خود را حذف کردید";
+"notice_display_name_changed_from_by_you" = "نام خود را از %@ به %@ تغییر دادید";
+"notice_display_name_set_by_you" = "نام خود را به %@ تنظیم کردید";
+"notice_avatar_url_changed_by_you" = "آواتار خود را تغییر دادید";
+"notice_room_withdraw_by_you" = "شما دعوت %@ را پس گرفتید";
+"notice_room_ban_by_you" = "شما %@ را تحریم کردید";
+"notice_room_unban_by_you" = "شما %@ را از تحریم خارج کردید";
+"notice_room_kick_by_you" = "شما %@ را اخراج کردید";
+"notice_room_reject_by_you" = "شما دعوت را رد کردید";
+"notice_room_leave_by_you" = "خارج شدید";
+"notice_room_join_by_you" = "شما پیوستید";
+"notice_room_third_party_revoked_invite_by_you_for_dm" = "شما دعوت %@ را لغو کردید";
+"notice_room_third_party_revoked_invite_by_you" = "شما دعوت از %@ برای پیوستن به اتاق را لغو کردید";
+"notice_room_third_party_registered_invite_by_you" = "شما دعوت %@ را پذیرفتید";
+"notice_room_third_party_invite_by_you_for_dm" = "شما %@ را دعوت کردید";
+"notice_room_third_party_invite_by_you" = "شما دعوت‌نامه‌ای به %@ برای پیوستن به اتاق ارسال کرده‌اید";
+"notice_room_invite_you" = "%@ شما را دعوت کرد";
+
+// Notice Events with "You"
+"notice_room_invite_by_you" = "شما %@ را دعوت کردید";
+"notice_conference_call_finished" = "جلسه به پایان رسید";
+"notice_conference_call_started" = "جلسه آغاز شد";
+"notice_conference_call_request" = "%@ درخواست جلسه مجازی کرد";
+"notice_declined_video_call" = "%@ تماس را رد کرد";
+"notice_ended_video_call" = "%@ به تماس پایان داد";
+"notice_answered_video_call" = "%@ به تماس پاسخ داد";
+"notice_placed_video_call" = "%@ تماس تصویری برقرار کرد";
+"notice_placed_voice_call" = "%@ تماس صوتی برقرار کرد";
+"notice_room_name_changed_for_dm" = "%@ نام را به %@ تغییر داد.";
+"notice_room_name_changed" = "%@ نام اتاق را به %@ تغییر داد.";
+"notice_topic_changed" = "%@ موضوع را به \"%@\" تغییر داد.";
+"notice_display_name_removed" = "%@ نام خود را حذف کرد";
+"notice_display_name_changed_from" = "%@ نام خود را از %@ به %@ تغییر داد";
+"notice_display_name_set" = "%@ نام خود را به %@ تنظیم کرد";
+"notice_avatar_url_changed" = "%@ آواتار خود را تغییر داد";
+"notice_room_reason" = ". دلیل: %@";
+"notice_room_withdraw" = "%@ دعوت %@ را پس گرفت";
+"notice_room_ban" = "%@ %@ را تحریم کرد";
+"notice_room_unban" = "%@ %@ را از تحریم خارج کرد";
+"notice_room_kick" = "%@ %@ را اخراج کرد";
+"notice_room_reject" = "%@ دعوت را رد کرد";
+"notice_room_leave" = "%@ ترک کرد";
+"notice_room_join" = "%@ پیوست";
+"notice_room_third_party_revoked_invite_for_dm" = "%@ دعوت %@ را لغو کرد";
+"notice_room_third_party_revoked_invite" = "%@ دعوت از %@ برای پیوستن به اتاق را لغو کرد";
+"notice_room_third_party_registered_invite" = "%@ دعوت %@ را پذیرفت";
+"notice_room_third_party_invite_for_dm" = "%@ %@ را دعوت کرد";
+"notice_room_third_party_invite" = "%@ برای پیوستن به اتاق به %@ دعوتنامه ارسال کرد";
+
+/* -*- 
+   Automatic localization for en
+
+   The following key/value pairs were extracted from the android i18n file:
+    /matrix-sdk/src/main/res/values/strings.xml.
+*/
+
+"notice_room_invite" = "%@ %@ را دعوت کرد";
+"language_picker_default_language" = "پیش فرض (%@)";
+
+// Language picker
+"language_picker_title" = "انتخاب زبان";
+
+// Country picker
+"country_picker_title" = "یک کشور را انتخاب کنید";
+"local_contacts_access_not_granted" = "کشف کاربران از دفترچه مخاطبین نیاز به دسترسی به مخاطبین شما دارد اما %@ اجازه استفاده از آنها را ندارد";
+"local_contacts_access_discovery_warning" = "برای کشف مخاطبی که در حال حاظر از ماتریکس استفاده می‌کند، %@ می تواند آدرس‌های ایمیل و شماره تلفن‌های موجود در دفترچه آدرس خود را به سرور هویت‌سنجی انتخابی شما ارسال کند. در صورت پشتیبانی، داده های شخصی قبل از ارسال هش می شوند - لطفا برای اطلاعات بیشتر سیاست حفظ حریم خصوصی سرور هویت‌سنجی خود را بررسی کنید.";
+"local_contacts_access_discovery_warning_title" = "کشف کاربران";
+"microphone_access_not_granted_for_call" = "تماس ها نیاز به دسترسی به میکروفن دارند اما %@ اجازه استفاده از آن را ندارد";
+
+// Permissions
+"camera_access_not_granted_for_call" = "تماس های ویدئویی نیاز به دسترسی به دوربین دارند اما %@ اجازه استفاده از آن را ندارد";
+"ssl_homeserver_url" = "آدرس سرور: %@";
+"user_id_placeholder" = "مثال: @akbar:homeserver";
+"network_error_not_reachable" = "لطفاً اتصال شبکه خود را بررسی کنید";
+"power_level" = "سطح قدرت";
+"public" = "عمومی";
+"private" = "خصوصی";
+"not_supported_yet" = "در حال حاظر پشتیبانی نمی‌شود";
+"error_common_message" = "خطایی رخ داد لطفاً بعداً دوباره امتحان کنید.";
+"error" = "خطا";
+"unsent" = "ارسال نشده";
+
+// Others
+"user_id_title" = "شناسه کاربری:";
+"e2e_passphrase_create" = "ایجاد عبارت عبور";
+"e2e_passphrase_not_match" = "عبارات عبور باید مطابقت داشته باشند";
+"e2e_passphrase_empty" = "عبارت عبور نباید خالی باشد";
+"e2e_passphrase_confirm" = "عبارت عبور را تأیید کنید";
+"e2e_export" = "ذخیره";
+"e2e_export_prompt" = "این فرآیند به شما امکان می دهد کلیدهای پیام هایی را که در اتاق های رمزگذاری شده دریافت کرده‌اید در یک فایل ذخیره کنید. سپس می توانید فایل را در آینده به یک کلاینت دیگر وارد کنید، بنابراین کلاینت همچنین می تواند این پیام ها را رمزگشایی کند.\nفایل ذخیره شده به هر کسی که می تواند آن را بخواند اجازه می دهد تا پیام‌های رمزگذاری شده‌ای را که می بینید رمزگشایی کند، بنابراین باید مراقب امنیت آن باشید.";
+
+// E2E export
+"e2e_export_room_keys" = "کلیدهای اتاق را صادر کنید";
+"e2e_passphrase_enter" = "عبارت عبور را وارد کنید";
+"e2e_import" = "وارد كردن";
+"notice_room_created_by_you_for_dm" = "شما پیوستید.";
+"default" = "پیش‌فرض";
+"offline" = "آفلاین";
+
+// E2E import
+"e2e_import_room_keys" = "ورود کلیدهای اتاق";
+"format_time_d" = "d";
+"format_time_h" = "h";
+"format_time_m" = "m";
+
+// Time
+"format_time_s" = "s";
+"search_searching" = "در حال جستجو ...";
+
+// Search
+"search_no_results" = "بدون نتیجه";
+"group_section" = "گروه‌ها";
+
+// Groups
+"group_invite_section" = "دعوت‌ها";
+"contact_local_contacts" = "مخاطبین محلی";
+
+// Contacts
+"contact_mx_users" = "کاربران ماتریکس";
+"attachment_e2e_keys_import" = "وارد كردن...";
+"attachment_e2e_keys_file_prompt" = "این پرونده شامل کلیدهای رمزگذاری کلاینت ماتریکس است.\nآیا می خواهید محتوای پرونده را مشاهده کنید یا کلیدهای موجود در آن را وارد کنید؟";
+"attachment_multiselection_original" = "اندازه واقعی";
+"attachment_multiselection_size_prompt" = "تصاویر به چه صورت ارسال شود:";
+
+// Attachment
+"attachment_size_prompt" = "می‌خواهید به چه صورت ارسال کنید:";
+"attachment_cancel_upload" = "بارگذاری لغو شود؟";
+"attachment_cancel_download" = "بارگیری لغو شود؟";
+"attachment_large" = "بزرگ: %@";
+"attachment_medium" = "متوسط: %@";
+"attachment_small" = "کوچک: %@";
+"attachment_original" = "اندازه واقعی: %@";
+
+// Room members
+"room_member_ignore_prompt" = "آیا مطمئن هستید که می خواهید همه پیام های این کاربر را پنهان کنید؟";
+"message_reply_to_message_to_reply_to_prefix" = "در پاسخ به";
+"message_reply_to_sender_sent_a_file" = "پرونده‌ای ارسال شد.";
+"message_reply_to_sender_sent_an_audio_file" = "یک فایل صوتی ارسال شد.";
+
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "یک تصویر ارسال شد.";
+"message_reply_to_sender_sent_a_video" = "یک ویدیو ارسال شد.";
+"room_no_conference_call_in_encrypted_rooms" = "جلسات در اتاق های رمزگذاری شده پشتیبانی نمی شوند";
+"room_no_power_to_create_conference_call" = "برای شروع جلسه در این اتاق نیاز به دسترسی دعوت دارید";
+"room_left_for_dm" = "خارج شدید";
+"room_left" = "شما از اتاق خارج شدید";
+"room_error_timeline_event_not_found" = "برنامه سعی داشت نقطه خاصی را در پیام‌های این اتاق بارگیری کند اما نتوانست آن را پیدا کند";
+"room_error_timeline_event_not_found_title" = "خطا در بارگیری موقعیت پیام‌ها";
+"room_error_cannot_load_timeline" = "خطا در بارگیری پیام‌ها";
+"room_error_topic_edition_not_authorized" = "شما مجاز به ویرایش موضوع در اتاق نیستید";
+"room_error_name_edition_not_authorized" = "شما مجاز به ویرایش این نام اتاق نیستید";
+"room_error_join_failed_empty_room" = "در حال حاضر امکان عضویت مجدد در یک اتاق خالی وجود ندارد.";
+"room_error_join_failed_title" = "پیوستن به اتاق با خطا مواجه شد";
+
+// Room
+"room_please_select" = "لطفا یک اتاق انتخاب کنید";
+"room_creation_participants_placeholder" = "(به عنوان مثال، @ali:homeserver1; @akbar:homeserver1; ...)";
+"room_creation_participants_title" = "شركت كنندگان:";
+"room_creation_alias_placeholder_with_homeserver" = "(به عنوان مثال، #foo%@)";
+"room_creation_alias_placeholder" = "(به عنوان مثال #foo:example.org)";
+"room_creation_alias_title" = "نام مستعار اتاق:";
+"room_creation_name_placeholder" = "به عنوان مثال(گروه ناهار)";
+
+// Room creation
+"room_creation_name_title" = "نام اتاق:";
+"account_error_push_not_allowed" = "اعلان مجاز نیست";
+"account_error_msisdn_wrong_description" = "به نظر نمی رسد این شماره تلفن معتبری باشد";
+"account_error_msisdn_wrong_title" = "شماره تلفن نامعتبر";
+"account_error_email_wrong_description" = "به نظر نمی رسد این یک آدرس ایمیل معتبر باشد";
+"account_error_email_wrong_title" = "آدرس ایمیل نامعتبر است";
+"account_error_matrix_session_is_not_opened" = "نشست ماتریس باز نیست";
+"account_error_picture_change_failed" = "تغییر تصویر انجام نشد";
+"account_error_display_name_change_failed" = "تغییر نام ناموفق بود";
+"account_msisdn_validation_error" = "تأیید شماره تلفن امکان پذیر نیست.";
+"account_msisdn_validation_message" = "ما یک پیامک با کد فعال‌سازی ارسال کرده‌ایم. لطفاً این کد را در زیر وارد کنید.";
+"account_msisdn_validation_title" = "در انتظار تأیید";
+"room_event_encryption_verify_message" = "برای تأیید اینکه این نشست قابل اعتماد است، لطفاً با استفاده از روشهای دیگر (مثلاً به صورت حضوری یا تماس تلفنی) با مالک آن تماس بگیرید و از آنها سوال کنید که آیا کلیدی که در تنظیمات کاربر خود برای این نشست می بینند با کلید زیر مطابقت دارد:\n\n نام نشست: %@\nشناسه نشست: %@\nکلید نشست: %@\n\nدر صورت مطابقت ، دکمه تأیید را در زیر فشار دهید. در صورت عدم تطابق، شخص ثالثی این نشست را رهگیری می کند و شما قاعدتا باید دکمه لیست سیاه را فشار دهید.\n\nدر آینده این روند تأیید پیچیده تر خواهد بود.";
+"account_email_validation_error" = "تأیید آدرس ایمیل انجام نشد. لطفاً ایمیل خود را بررسی کرده و روی پیوند حاوی آن کلیک کنید. پس از انجام این کار ، روی ادامه کلیک کنید";
+"account_email_validation_message" = "لطفاً ایمیل خود را بررسی کرده و روی پیوند حاوی آن کلیک کنید. پس از انجام این کار ، روی ادامه کلیک کنید.";
+"account_email_validation_title" = "در انتظار تایید";
+"account_linked_emails" = "ایمیل های متصل شده";
+"account_link_email" = "اتصال به ایمیل";
+
+// Account
+"account_save_changes" = "ذخیره تغییرات";
+"room_event_encryption_verify_ok" = "تأیید";
+"room_event_encryption_verify_title" = "تایید نشست\n\n";
+"room_event_encryption_info_unblock" = "خروج از لیست سیاه";
+"room_event_encryption_info_block" = "لیست سیاه";
+"room_event_encryption_info_unverify" = "تأیید نکردن";
+"room_event_encryption_info_verify" = "تأیید کنید ...";
+"room_event_encryption_info_device_blocked" = "در لیست سیاه قرار گرفت";
+"room_event_encryption_info_device_not_verified" = "تأیید نشده است";
+"room_event_encryption_info_device_verified" = "تأیید شده";
+"room_event_encryption_info_device_fingerprint" = "اثر انگشت Ed25519\n";
+"room_event_encryption_info_device_verification" = "تأیید هویت\n";
+"room_event_encryption_info_device_id" = "شناسه\n";
+"room_event_encryption_info_device_name" = "نام عمومی\n";
+"room_event_encryption_info_device_unknown" = "نشست ناشناخته\n";
+"room_event_encryption_info_device" = "\nاطلاعات نشست ارسال کننده\n";
+"room_event_encryption_info_event_none" = "هیچ یک";
+"room_event_encryption_info_event_unencrypted" = "رمزگذاری نشده";
+"room_event_encryption_info_event_decryption_error" = "خطای رمزگشایی\n";
+"room_event_encryption_info_event_session_id" = "شناسه جلسه\n";
+"room_event_encryption_info_event_algorithm" = "الگوریتم\n";
+"room_event_encryption_info_event_fingerprint_key" = "کلید اثر انگشت Ed25519 ادعا شده\n";
+"room_event_encryption_info_event_identity_key" = "کلید Curve25519\n";
+"room_event_encryption_info_event_user_id" = "شناسه کاربر\n";
+"room_event_encryption_info_event" = "اطلاعات رویداد\n";
+
+// Encryption information
+"room_event_encryption_info_title" = "اطلاعات رمزنگاری سرتاسری\n\n";
+"device_details_delete_prompt_message" = "این عملیات نیاز به احراز هویت مجدد دارد.\nبرای ادامه ، لطفاً گذرواژه خود را وارد کنید.";
+"device_details_delete_prompt_title" = "احراز هویت";
+"device_details_rename_prompt_message" = "نام عمومی یک نشست برای افرادی که با آنها ارتباط برقرار می کنید قابل مشاهده است";
+"device_details_rename_prompt_title" = "نام نشست";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_last_seen" = "آخرین بازدید\n";
+"device_details_identifier" = "شناسه\n";
+"device_details_name" = "نام عمومی\n";
+
+// Devices
+"device_details_title" = "اطلاعات نشست\n";
+"notification_settings_room_rule_title" = "اتاق: %@";
+"settings_enter_validation_token_for" = "توکن فعال‌سازی را برای %@ وارد کنید:";
+"settings_enable_push_notifications" = "فعال‌سازی اعلان";
+"settings_enable_inapp_notifications" = "فعال‌سازی اعلان درون برنامه ای";
+
+// Settings
+"settings" = "تنظیمات";
+"room_displayname_more_than_two_members" = "%@ و %@ نفر دیگر";
+"room_displayname_two_members" = "%@ و %@";
+"notice_crypto_unable_to_decrypt" = "** رمزگشایی امکان پذیر نیست: %@ **";
+"notice_room_history_visible_to_members_from_joined_point_for_dm" = "%@ پیام های آینده را از زمان پیوستن افراد قابل مشاهده کرد.";
+"notice_room_history_visible_to_members_from_invited_point_for_dm" = "%@ پیام های آینده را از زمان دعوت شدن برای همه قابل مشاهده کرد.";
+"notice_room_history_visible_to_members_for_dm" = "%@ پیام‌های آینده را برای همه اعضای اتاق قابل مشاهده کرد.";
+"notice_room_history_visible_to_members" = "%@ تاریخچه آینده اتاق را برای همه اعضای اتاق قابل مشاهده کرد.";
+"notice_room_history_visible_to_anyone" = "%@ تاریخچه آینده اتاق را برای همه قابل مشاهده کرد.";
+"notice_error_unknown_event_type" = "نوع رویداد ناشناخته";
+"notice_error_unexpected_event" = "رویداد غیرمنتظره";
+"notice_error_unsupported_event" = "رویداد پشتیبانی نشده";
+"notice_redaction" = "%@ یک رویداد را تغییر داد (شناسه: %@)";
+"notice_feedback" = "بازخورد (شناسه: %@): %@";
+"notice_unsupported_attachment" = "پیوست پشتیبانی نشده: %@";
+"notice_invalid_attachment" = "پیوست نامعتبر";
+"notice_file_attachment" = "پیوست پرونده";
+"notice_location_attachment" = "پیوست مکان";
+"call_transfer_to_user" = "انتقال به %@";
+"call_consulting_with_user" = "تماس با %@";
+"call_video_with_user" = "تماس تصویری با %@";
+"call_voice_with_user" = "تماس صوتی با %@";
+"call_ringing" = "در حال زنگ خوردن…";
+"microphone_access_not_granted_for_voice_message" = "جهت ارسال پیام صوتی نیاز به دسترسی به میکروفون وجود دارد اما %@ دسترسی استفاده از آن را ندارد";
+"e2e_passphrase_too_short" = "کلمه عبور بیش از حد کوتاه است (حداقل می‌بایست %d کاراکتر باشد)";
+"message_reply_to_sender_sent_a_voice_message" = "یک پیام صوتی ارسال کنید.";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/fi.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/fi.lproj/MatrixKit.strings
new file mode 100644
index 000000000..08a9690f9
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/fi.lproj/MatrixKit.strings
@@ -0,0 +1,151 @@
+"matrix" = "Matrix";
+// Login Screen
+"login_create_account" = "Luo tili:";
+"login_server_url_placeholder" = "URL (esim. https://matrix.org)";
+"login_home_server_title" = "Kotipalvelin:";
+"login_identity_server_title" = "Identiteettipalvelin:";
+"view" = "Näytä";
+"back" = "Takaisin";
+"continue" = "Jatka";
+"leave" = "Poistu";
+"invite" = "Kutsu";
+"retry" = "Yritä uudelleen";
+"cancel" = "Peruuta";
+"save" = "Tallenna";
+"login_password_placeholder" = "Salasana";
+"login_optional_field" = "valinnainen";
+"login_home_server_info" = "Kotipalvelin tallentaa kaikki keskustelu- ja tilitietosi";
+"login_display_name_placeholder" = "Näyttönimi (esim. Matti Meikäläinen)";
+"login_email_placeholder" = "Sähköpostiosoite";
+"login_error_title" = "Kirjautuminen epäonnistui";
+"login_error_registration_is_not_supported" = "Rekisteröinti ei ole tuettu tällä hetkellä";
+"login_error_forbidden" = "Virheellinen käyttäjätunnus tai salasana";
+"login_error_limit_exceeded" = "Liian monta pyyntöä on lähetetty";
+"login_leave_fallback" = "Peruuta";
+"register_error_title" = "Rekisteröinti epäonnistui";
+"login_mobile_device" = "Mobiili";
+"login_tablet_device" = "Tabletti";
+"login_desktop_device" = "Työpöytä";
+"close" = "Sulje";
+"select_account" = "Valitse tili";
+"invite_user" = "Kutsu Matrix-käyttäjä";
+"select_all" = "Valitse kaikki";
+"cancel_upload" = "Peruuta lähetys";
+"cancel_download" = "Peruuta lataus";
+"show_details" = "Näytä tiedot";
+"answer_call" = "Vastaa puheluun";
+"reject_call" = "Hylkää puhelu";
+"end_call" = "Lopeta puhelu";
+"notice_event_redacted_reason" = " [syy: %@]";
+"notice_encrypted_message" = "Salattu viesti";
+"notice_image_attachment" = "kuvaliite";
+"notice_audio_attachment" = "ääniliite";
+"notice_video_attachment" = "videoliite";
+"notice_location_attachment" = "sijaintiliite";
+"notice_file_attachment" = "tiedostoliite";
+"notice_invalid_attachment" = "virheellinen liite";
+// room display name
+"room_displayname_empty_room" = "Tyhjä huone";
+"room_displayname_two_members" = "%@ ja %@";
+// Settings
+"settings" = "Asetukset";
+"notification_settings_room_rule_title" = "Huone: '%@'";
+"device_details_name" = "Julkinen nimi\n";
+"device_details_last_seen" = "Viimeksi nähty\n";
+"device_details_rename_prompt_message" = "Istunnon julkinen nimi näkyy henkilöille, joiden kanssa keskustelet";
+"room_event_encryption_info_event_algorithm" = "Algoritmi\n";
+"room_event_encryption_info_event_session_id" = "Istunnon tunnus\n";
+"room_event_encryption_info_device_unknown" = "tuntematon istunto\n";
+"room_event_encryption_info_device_name" = "Julkinen nimi\n";
+// Account
+"account_save_changes" = "Tallenna muutokset";
+"account_error_matrix_session_is_not_opened" = "Matrix-istunto ei ole avattuna";
+"account_error_email_wrong_title" = "Virheellinen sähköpostiosoite";
+"account_error_email_wrong_description" = "Tämä ei vaikuta kelvolliselta sähköpostiosoitteelta";
+"account_error_msisdn_wrong_title" = "Virheellinen puhelinnumero";
+"account_error_msisdn_wrong_description" = "Tämä ei vaikuta kelvolliselta puhelinnumerolta";
+// Room creation
+"room_creation_name_title" = "Huoneen nimi:";
+// Room
+"room_please_select" = "Valitse huone";
+"room_error_join_failed_title" = "Liittyminen huoneeseen epäonnistui";
+"room_left" = "Poistuit huoneesta";
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "lähetti kuvan.";
+"message_reply_to_sender_sent_a_video" = "lähetti videon.";
+"message_reply_to_sender_sent_an_audio_file" = "lähetti äänitiedoston.";
+"message_reply_to_sender_sent_a_file" = "lähetti tiedoston.";
+"attachment_original" = "Todellinen koko: %@";
+"attachment_cancel_download" = "Perutaanko lataus?";
+"attachment_cancel_upload" = "Perutaanko lähetys?";
+"attachment_multiselection_original" = "Todellinen koko";
+"attachment_e2e_keys_import" = "Tuo...";
+// Contacts
+"contact_mx_users" = "Matrix-käyttäjät";
+"contact_local_contacts" = "Paikalliset yhteystiedot";
+"group_section" = "Ryhmät";
+// Search
+"search_no_results" = "Ei tuloksia";
+"search_searching" = "Haku käynnissä...";
+"e2e_import" = "Tuo";
+"e2e_export" = "Vie";
+"error" = "Virhe";
+"default" = "oletus";
+"private" = "Yksityinen";
+"public" = "Julkinen";
+"network_error_not_reachable" = "Tarkista verkkoyhteytesi";
+// Country picker
+"country_picker_title" = "Valitse maa";
+// Language picker
+"language_picker_title" = "Valitse kieli";
+"language_picker_default_language" = "Oletus (%@)";
+"notice_answered_video_call" = "%@ vastasi puheluun";
+"notice_ended_video_call" = "%@ lopetti puhelun";
+// button names 
+"ok" = "OK";
+"send" = "Lähetä";
+"copy_button_name" = "Kopioi";
+"redact" = "Poista";
+"share" = "Jaa";
+"delete" = "Poista";
+// actions 
+"action_logout" = "Kirjaudu ulos";
+"create_room" = "Luo huone";
+"login" = "Kirjaudu sisään";
+"create_account" = "Luo tili";
+// Login Screen 
+"login_error_already_logged_in" = "Jo sisäänkirjautuneena";
+// room details dialog screen
+"room_details_title" = "Huoneen tiedot";
+"settings_title_notifications" = "Ilmoitukset";
+// Notification settings screen 
+"notification_settings_disable_all" = "Poista käytöstä kaikki ilmoitukset";
+"notification_settings_enable_notifications" = "Käytä ilmoituksia";
+"notification_settings_always_notify" = "Ilmoita aina";
+"notification_settings_never_notify" = "Älä ilmoita koskaan";
+"notification_settings_select_room" = "Valitse huone";
+// gcm section 
+"settings_config_home_server" = "Kotipalvelin: %@";
+"settings_config_identity_server" = "Identiteettipalvelin: %@";
+// call string
+"call_waiting" = "Odottaa...";
+"call_connecting" = "Puhelu yhdistyy...";
+"call_ended" = "Puhelu loppui";
+"call_ring" = "Soitetaan...";
+"incoming_video_call" = "Saapuva videopuhelu";
+"incoming_voice_call" = "Saapuva äänipuhelu";
+"call_invite_expired" = "Puhelukutsu vanhentui";
+"ssl_logout_account" = "Kirjaudu ulos";
+"ssl_fingerprint_hash" = "Sormenjälki (%@):";
+"room_event_encryption_info_verify" = "Vahvista...";
+"room_event_encryption_info_unverify" = "Poista vahvistus";
+"room_event_encryption_verify_title" = "Varmenna istunto\n\n";
+"room_event_encryption_verify_ok" = "Vahvista";
+"account_email_validation_error" = "Sähköpostin vahvistaminen epäonnistui. Tarkistathan sähköpostisi ja seuraa linkkiä, joka on lähettämässämme viestissä. Sen jälkeen, täppää jatka";
+"account_msisdn_validation_title" = "Vahvistus meneillään";
+"account_msisdn_validation_error" = "Puhelinnumeron vahvistus epäonnistui.";
+"account_error_display_name_change_failed" = "Näyttönimen vaihtaminen epäonnistui";
+"account_error_picture_change_failed" = "Kuvan vaihtaminen epäonnistui";
+"ssl_could_not_verify" = "Etäpalvelimen identiteetin vahvistaminen epäonnistui.";
+"login_user_id_placeholder" = "Matrix ID (esim. @matti:matrix.org tai pelkästään matti)";
+"login_identity_server_info" = "Matrix tarjoaa identiteettipalvelimen joka osaa kertaa mikä sähköpostiosoite tai puhelinnumero vastaa mitäkin Matrix ID:tä. Vain https://matrix.org on tällä hetkellä käytettävissä.";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/fr.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/fr.lproj/MatrixKit.strings
new file mode 100644
index 000000000..758c3a3cb
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/fr.lproj/MatrixKit.strings
@@ -0,0 +1,475 @@
+"view" = "Afficher";
+"back" = "Retour";
+"continue" = "Continuer";
+"leave" = "Quitter";
+"invite" = "Inviter";
+"retry" = "Réessayer";
+"cancel" = "Annuler";
+"save" = "Enregistrer";
+// room details dialog screen
+"room_details_title" = "Détails du salon";
+"matrix" = "Matrix";
+// Login Screen
+"login_create_account" = "Créer un compte :";
+"login_server_url_placeholder" = "URL (par ex. https://matrix.org)";
+"login_home_server_title" = "URL du serveur d’accueil :";
+"login_home_server_info" = "Votre serveur d’accueil stocke toutes vos discussions et les données de votre compte";
+"login_identity_server_title" = "URL du serveur d’identité :";
+"login_identity_server_info" = "Matrix fournit des serveurs d’identité pour lier les e-mail, etc aux identifiants Matrix. Seul https://matrix.org existe pour l’instant.";
+"login_user_id_placeholder" = "Identifiant Matrix (par ex. @bob:matrix.org ou bob)";
+"login_password_placeholder" = "Mot de passe";
+"login_optional_field" = "facultatif";
+"login_display_name_placeholder" = "Nom d’affichage (par ex. Bob Obson)";
+"login_email_info" = "Définir une adresse e-mail permet aux autres utilisateurs de vous retrouver plus facilement sur Matrix et vous permettra de réinitialiser votre mot de passe.";
+"login_email_placeholder" = "Adresse e-mail";
+"login_prompt_email_token" = "Veuillez saisir votre jeton de validation d’e-mail :";
+"login_error_title" = "Échec d’authentification";
+"login_error_no_login_flow" = "Échec de la récupération des informations d’authentification depuis ce serveur d’accueil";
+"login_error_do_not_support_login_flows" = "Aucun des parcours d’authentification définis par ce serveur d'accueil n’est pris en charge pour le moment";
+"login_error_registration_is_not_supported" = "L’inscription n'est pas prise en charge pour le moment";
+"login_error_forbidden" = "Nom d’utilisateur ou mot de passe invalide";
+"login_error_unknown_token" = "Le jeton d’accès spécifié n'est pas reconnu";
+"login_error_bad_json" = "JSON mal formaté";
+"login_error_not_json" = "Ne contenait pas de JSON valide";
+"login_error_limit_exceeded" = "Trop de requêtes ont été envoyées";
+"login_error_user_in_use" = "Ce nom d’utilisateur est déjà utilisé";
+"login_error_login_email_not_yet" = "Vous n’avez pas encore cliqué sur le lien dans l’e-mail";
+"login_use_fallback" = "Utiliser la page de secours";
+"login_leave_fallback" = "Annuler";
+"login_invalid_param" = "Paramètre invalide";
+"register_error_title" = "Échec lors de l’inscription";
+"login_error_forgot_password_is_not_supported" = "La réinitialisation du mot de passe n’est pas prise en charge pour le moment";
+// Action
+"no" = "Non";
+"yes" = "Oui";
+"abort" = "Abandonner";
+"close" = "Fermer";
+"discard" = "Abandonner";
+"dismiss" = "Ignorer";
+"sign_up" = "S’inscrire";
+"submit" = "Valider";
+"submit_code" = "Envoyer le code";
+"set_default_power_level" = "Réinitialiser le rang";
+"set_moderator" = "Nommer modérateur";
+"set_admin" = "Nommer administrateur";
+"start_chat" = "Nouvelle conversation privée";
+"start_voice_call" = "Commencer un appel audio";
+"start_video_call" = "Commencer un appel vidéo";
+"mention" = "Mentionner";
+"select_account" = "Sélectionner un compte";
+"attach_media" = "Joindre un média de la médiathèque";
+"capture_media" = "Prendre une photo/vidéo";
+"invite_user" = "Inviter un utilisateur matrix";
+"reset_to_default" = "Réinitialiser aux valeurs par défaut";
+"resend_message" = "Renvoyer le message";
+"select_all" = "Tout sélectionner";
+"cancel_upload" = "Annuler l’envoi";
+"cancel_download" = "Annuler le téléchargement";
+"show_details" = "Afficher les détails";
+"answer_call" = "Répondre à l’appel";
+"reject_call" = "Rejeter l’appel";
+"end_call" = "Terminer l’appel";
+"ignore" = "Ignorer";
+"unignore" = "Ne plus ignorer";
+// Events formatter
+"notice_avatar_changed_too" = "(l’avatar a aussi changé)";
+"notice_room_name_removed" = "%@ a supprimé le nom du salon";
+"notice_room_topic_removed" = "%@ a supprimé le sujet";
+"notice_event_redacted" = "<effacé%@>";
+"notice_event_redacted_by" = " par %@";
+"notice_event_redacted_reason" = " [raison : %@]";
+"notice_profile_change_redacted" = "%@ ont mis à jour leur profil %@";
+"notice_room_created" = "%@ a créé et configuré le salon.";
+"notice_room_join_rule" = "La règle pour rejoindre le salon est : %@";
+"notice_room_power_level_intro" = "Les rangs des membres du salon sont :";
+"notice_room_power_level_acting_requirement" = "Le rang minimum qu’un utilisateur doit avoir pour interagir est :";
+"notice_room_power_level_event_requirement" = "Le rang minimum lié aux événements est :";
+"notice_room_aliases" = "Les alias du salon sont : %@";
+"notice_room_related_groups" = "Les groupes associés à ce salon sont : %@";
+"notice_encrypted_message" = "Message chiffré";
+"notice_encryption_enabled" = "%@ a activé le chiffrement de bout en bout (algorithme %@)";
+"notice_image_attachment" = "image en pièce-jointe";
+"notice_audio_attachment" = "audio en pièce-jointe";
+"notice_video_attachment" = "vidéo en pièce-jointe";
+"notice_file_attachment" = "fichier en pièce-jointe";
+"notice_invalid_attachment" = "pièce-jointe non valide";
+"notice_unsupported_attachment" = "Pièce-jointe non prise en charge : %@";
+"notice_redaction" = "%@ a supprimé un événement (id : %@)";
+"notice_error_unsupported_event" = "Évènement non pris en charge";
+"notice_error_unexpected_event" = "Événement inattendu";
+"notice_error_unknown_event_type" = "Type d’événement inconnu";
+"notice_room_history_visible_to_anyone" = "%@ a rendu l’historique futur du salon visible à tout le monde.";
+"notice_room_history_visible_to_members" = "%@ a rendu l’historique futur du salon visible à tous les membres du salon.";
+"notice_room_history_visible_to_members_from_invited_point" = "%@ a rendu l’historique futur du salon visible à tous les membres, à partir du moment où ils ont été invités.";
+"notice_room_history_visible_to_members_from_joined_point" = "%@ a rendu l’historique futur du salon visible à tous les membres, à partir de leur arrivée.";
+"notice_crypto_unable_to_decrypt" = "** Déchiffrement impossible : %@ **";
+"notice_crypto_error_unknown_inbound_session_id" = "La session de l’expéditeur ne nous a pas envoyé les clés pour ce message.";
+"notice_sticker" = "autocollant";
+// room display name
+"room_displayname_empty_room" = "Salon vide";
+"room_displayname_two_members" = "%@ et %@";
+"room_displayname_more_than_two_members" = "%@ et %u autres";
+// Settings
+"settings" = "Paramètres";
+"settings_enable_inapp_notifications" = "Activer les notifications dans l’application";
+"settings_enable_push_notifications" = "Activer les notifications push";
+"settings_enter_validation_token_for" = "Saisir le jeton de validation pour %@ :";
+"notification_settings_room_rule_title" = "Salon : « %@ »";
+// Devices
+"device_details_title" = "Informations sur la session\n";
+"device_details_name" = "Nom public\n";
+"device_details_identifier" = "Identifiant\n";
+"device_details_last_seen" = "Vu pour la dernière fois\n";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_rename_prompt_message" = "Le nom public de la session est visible par les personnes avec qui vous communiquez";
+"device_details_delete_prompt_title" = "Authentification";
+"device_details_delete_prompt_message" = "Cette opération requiert une nouvelle authentification.\nPour poursuivre, saisissez votre mot de passe.";
+// Encryption information
+"room_event_encryption_info_title" = "Informations sur le chiffrement de bout en bout\n\n";
+"room_event_encryption_info_event" = "Informations sur l’événement\n";
+"room_event_encryption_info_event_user_id" = "Identifiant utilisateur\n";
+"room_event_encryption_info_event_identity_key" = "Clé d’identité Curve25519\n";
+"room_event_encryption_info_event_fingerprint_key" = "Clé d’empreinte Ed25519 déclarée\n";
+"room_event_encryption_info_event_algorithm" = "Algorithme\n";
+"room_event_encryption_info_event_session_id" = "Identifiant de session\n";
+"room_event_encryption_info_event_decryption_error" = "Erreur de déchiffrement\n";
+"room_event_encryption_info_event_unencrypted" = "non chiffré";
+"room_event_encryption_info_event_none" = "aucun";
+"room_event_encryption_info_device" = "\nInformations sur la session de l’expéditeur\n";
+"room_event_encryption_info_device_unknown" = "session inconnue\n";
+"room_event_encryption_info_device_name" = "Nom public\n";
+"room_event_encryption_info_device_id" = "Identifiant\n";
+"room_event_encryption_info_device_verification" = "Vérification\n";
+"room_event_encryption_info_device_fingerprint" = "Empreinte Ed25519\n";
+"room_event_encryption_info_device_verified" = "Vérifié";
+"room_event_encryption_info_device_not_verified" = "NON vérifié";
+"room_event_encryption_info_device_blocked" = "Sur liste noire";
+"room_event_encryption_info_verify" = "Vérifier…";
+"room_event_encryption_info_unverify" = "Annuler la vérification";
+"room_event_encryption_info_block" = "Ajouter à la liste noire";
+"room_event_encryption_info_unblock" = "Supprimer de la liste noire";
+"room_event_encryption_verify_title" = "Vérifier la session\n\n";
+"room_event_encryption_verify_message" = "Pour vérifier que cette session est fiable, contactez son propriétaire par un autre moyen (par ex. en personne ou au téléphone) et demandez-lui si la clé qu’il voit dans ses paramètres utilisateur pour cette session est identique à la clé ci-dessous :\n\n\tNom de la session : %@\n\tIdentifiant de la session : %@\n\tClé de la session : %@\n\nSi les clés sont identiques, cliquez sur le bouton vérifier ci-dessous. Sinon, quelqu’un est probablement en train d’intercepter cette session et vous devriez plutôt l’ajouter à la liste noire.\n\nÀ l'avenir, ce processus de vérification sera plus élaboré.";
+"room_event_encryption_verify_ok" = "Vérifier";
+// Account
+"account_save_changes" = "Enregistrer les modifications";
+"account_link_email" = "Lier un e-mail";
+"account_linked_emails" = "E-mail liés";
+"account_email_validation_title" = "Vérification en attente";
+"account_email_validation_message" = "Vérifiez vos e-mails et cliquez sur le lien fourni. Ensuite, cliquez sur continuer.";
+"account_email_validation_error" = "Impossible de vérifier l'adresse e-mail. Vérifiez vos e-mails et cliquez sur le lien fourni. Ensuite, cliquez sur continuer";
+"account_msisdn_validation_title" = "Vérification en attente";
+"account_msisdn_validation_message" = "Nous vous avons envoyé un SMS avec un code d’activation. Veuillez le saisir ci-dessous.";
+"account_msisdn_validation_error" = "Impossible de vérifier le numéro de téléphone.";
+"account_error_display_name_change_failed" = "Échec de modification du nom d’affichage";
+"account_error_picture_change_failed" = "Échec de modification de l’image";
+"account_error_matrix_session_is_not_opened" = "La session Matrix n’est pas ouverte";
+"account_error_email_wrong_title" = "Adresse e-mail non valide";
+"account_error_email_wrong_description" = "L’adresse e-mail ne semble pas valide";
+"account_error_msisdn_wrong_title" = "Numéro de téléphone non valide";
+"account_error_msisdn_wrong_description" = "Le numéro de téléphone ne semble pas valide";
+// Room creation
+"room_creation_name_title" = "Nom du salon :";
+"room_creation_name_placeholder" = "(par ex. groupeDej)";
+"room_creation_alias_title" = "Alias du salon :";
+"room_creation_alias_placeholder" = "(par ex. #foo:exemple.org)";
+"room_creation_alias_placeholder_with_homeserver" = "(par ex. #foo%@)";
+"room_creation_participants_title" = "Membres :";
+"room_creation_participants_placeholder" = "(par ex. @bob:serveurdaccueil1 ; @john:serveurdaccueil2...)";
+// Room
+"room_please_select" = "Sélectionnez un salon";
+"room_error_join_failed_title" = "Échec de l’inscription au salon";
+"room_error_join_failed_empty_room" = "Il est impossible pour le moment de rejoindre un salon vide.";
+"room_error_name_edition_not_authorized" = "Vous n’êtes pas autorisé à modifier le nom du salon";
+"room_error_topic_edition_not_authorized" = "Vous n’êtes pas autorisé à modifier le sujet du salon";
+"room_error_cannot_load_timeline" = "Échec du chargement du fil de discussion";
+"room_error_timeline_event_not_found_title" = "Échec du chargement de la position dans le fil de discussion";
+"room_error_timeline_event_not_found" = "L’application a tenté de charger un instant précis dans l’historique du salon, mais ne l’a pas trouvée";
+"room_left" = "Vous avez quitté le salon";
+"room_no_power_to_create_conference_call" = "Des permissions sont requises pour inviter ou démarrer une téléconférence dans ce salon";
+"room_no_conference_call_in_encrypted_rooms" = "Les téléconférences ne sont pas prises en charges dans les salons chiffrés";
+// Room members
+"room_member_ignore_prompt" = "Voulez-vous vraiment masquer tous les messages de cet utilisateur ?";
+"room_member_power_level_prompt" = "Vous ne pourrez pas annuler cette modification car vous promouvez cet utilisateur au même rang que le vôtre.\nEn êtes-vous sûr ?";
+// Attachment
+"attachment_size_prompt" = "Voulez-vous envoyer au format :";
+"attachment_original" = "Taille réelle (%@)";
+"attachment_small" = "Petit (~%@)";
+"attachment_medium" = "Moyen (~%@)";
+"attachment_large" = "Grand (~%@)";
+"attachment_cancel_download" = "Annuler le téléchargement ?";
+"attachment_cancel_upload" = "Annuler l’envoi ?";
+"attachment_multiselection_size_prompt" = "Voulez-vous envoyer l’image au format :";
+"attachment_multiselection_original" = "Taille réelle";
+"attachment_e2e_keys_file_prompt" = "Ce fichier contient des clés de chiffrement exportées d’un client Matrix.\nVoulez-vous voir le contenu du fichier ou importer les clés qu'il contient ?";
+"attachment_e2e_keys_import" = "Importer…";
+// Contacts
+"contact_mx_users" = "Utilisateurs Matrix";
+"contact_local_contacts" = "Contacts locaux";
+// Groups
+"group_invite_section" = "Invitations";
+"group_section" = "Groupes";
+// Search
+"search_no_results" = "Aucun résultat";
+"search_searching" = "Recherche en cours…";
+// Time
+"format_time_s" = "s";
+"format_time_m" = "m";
+"format_time_h" = "h";
+"format_time_d" = "j";
+// E2E import
+"e2e_import_room_keys" = "Importer les clés du salon";
+"e2e_import_prompt" = "Ce processus permet d’importer les clés de chiffrement que vous avez précédemment exportées d’un autre client Matrix. Vous pourrez ensuite déchiffrer tous les messages que l’autre client pouvait déchiffrer.\nLe fichier exporté est protégé par une phrase secrète. Entrez la phrase secrète ci-dessous pour déchiffrer le fichier.";
+"e2e_import" = "Importer";
+"e2e_passphrase_enter" = "Entrer la phrase secrète";
+// E2E export
+"e2e_export_room_keys" = "Exporter les clés de salon";
+"e2e_export_prompt" = "Ce processus permet d’exporter vers un fichier local les clés des messages que vous avez reçu sur les salons chiffrés. Vous pourrez ensuite importer ce fichier dans un autre client Matrix, pour qu’il puisse déchiffrer aussi ces messages.\nLe fichier exporté permettra à tous ceux qui y ont accès de déchiffrer tous les messages chiffrés que vous pouvez voir, donc vous devriez le conserver dans un endroit sûr.";
+"e2e_export" = "Exporter";
+"e2e_passphrase_confirm" = "Confirmer la phrase secrète";
+"e2e_passphrase_empty" = "La phrase secrète ne peut pas être vide";
+"e2e_passphrase_not_match" = "Les phrases secrètes doivent être identiques";
+// Others
+"user_id_title" = "Identifiant utilisateur :";
+"offline" = "hors ligne";
+"unsent" = "Non envoyé";
+"error" = "Erreur";
+"not_supported_yet" = "Pas encore pris en charge";
+"default" = "par défaut";
+"private" = "Privé";
+"public" = "Public";
+"power_level" = "Rang";
+"network_error_not_reachable" = "Vérifiez votre connexion au réseau";
+"user_id_placeholder" = "ex : @bob:serveurdaccueil";
+"ssl_homeserver_url" = "URL du serveur d’accueil : %@";
+// Permissions
+"camera_access_not_granted_for_call" = "Pour passer un appel vidéo l’accès à l’appareil photo est indispensable mais %@ n’a pas les permissions nécessaires";
+"microphone_access_not_granted_for_call" = "Pour passer un appel l’accès au microphone est indispensable mais %@ n’a pas les permissions nécessaires";
+"local_contacts_access_not_granted" = "Pour découvrir des utilisateurs à partir des contacts locaux, l’accès aux contacts est indispensable mais %@ n’a pas les permissions nécessaires";
+"local_contacts_access_discovery_warning_title" = "Découverte des utilisateurs";
+"local_contacts_access_discovery_warning" = "Pour découvrir des contacts utilisant déjà Matrix, %@ peut envoyer les adresses e-mail et les numéros de téléphone de votre répertoire au serveur d’identité que vous avez choisi. S’il le prend en charge, vos données personnelles sont hachées avant d’être envoyées − vérifiez la politique de confidentialité de votre serveur d’identité pour plus de détails.";
+// Country picker
+"country_picker_title" = "Choisissez un pays";
+"notice_room_invite" = "%@ a invité %@";
+"notice_room_third_party_invite" = "%@ a invité %@ à rejoindre ce salon";
+"notice_room_third_party_registered_invite" = "%@ a accepté l’invitation à %@";
+"notice_room_join" = "%@ est arrivé";
+"notice_room_leave" = "%@ est parti";
+"notice_room_reject" = "%@ a rejeté l’invitation";
+"notice_room_kick" = "%@ a expulsé %@";
+"notice_room_unban" = "%@ a révoqué le bannissement de %@";
+"notice_room_ban" = "%@ a banni %@";
+"notice_room_withdraw" = "%@ a annulé l’invitation de %@";
+"notice_room_reason" = ". Raison : %@";
+"notice_avatar_url_changed" = "%@ a changé d’avatar";
+"notice_display_name_set" = "%@ a modifié son nom en %@";
+"notice_display_name_changed_from" = "%@ a modifié son nom de %@ à %@";
+"notice_display_name_removed" = "%@ a supprimé son nom d’affichage";
+"notice_topic_changed" = "%@ a modifié le sujet en : « %@ ».";
+"notice_room_name_changed" = "%@ a modifié le nom du salon en %@.";
+"notice_placed_voice_call" = "%@ a passé un appel audio";
+"notice_placed_video_call" = "%@ a passé un appel vidéo";
+"notice_answered_video_call" = "%@ a répondu à l’appel";
+"notice_ended_video_call" = "%@ a terminé l’appel";
+"notice_conference_call_request" = "%@ a débuté une téléconférence en VoIP";
+"notice_conference_call_started" = "Téléconférence en VoIP démarrée";
+"notice_conference_call_finished" = "Téléconférence en VoIP terminée";
+// button names 
+"ok" = "OK";
+"send" = "Envoyer";
+"copy_button_name" = "Copier";
+"resend" = "Renvoyer";
+"redact" = "Effacer";
+"share" = "Partager";
+"set_power_level" = "Définir le rang";
+"delete" = "Supprimer";
+// actions 
+"action_logout" = "Se déconnecter";
+"create_room" = "Créer un salon";
+"login" = "Connexion";
+"create_account" = "Créer un compte";
+"membership_invite" = "Invité";
+"membership_leave" = "Parti";
+"membership_ban" = "Banni";
+"num_members_one" = "%@ utilisateur";
+"num_members_other" = "%@ utilisateurs";
+"kick" = "Expulser";
+"ban" = "Bannir";
+"unban" = "Révoquer le bannissement";
+"message_unsaved_changes" = "Il y a des modifications non enregistrées. Quitter les annulera.";
+// Login Screen 
+"login_error_already_logged_in" = "Déjà connecté";
+"login_error_must_start_http" = "L’URL doit débuter par http[s]://";
+// contacts list screen 
+"invitation_message" = "Je souhaiterais discuter avec vous sur Matrix. Veuillez visiter le site web http://matrix.org pour plus d’informations.";
+// Settings screen 
+"settings_title_config" = "Configuration";
+"settings_title_notifications" = "Notifications";
+// Notification settings screen 
+"notification_settings_disable_all" = "Désactiver toutes les notifications";
+"notification_settings_enable_notifications" = "Activer les notifications";
+"notification_settings_enable_notifications_warning" = "Toutes les notifications sont actuellement désactivées pour tous les appareils.";
+"notification_settings_global_info" = "Les paramètres de notification sont sauvegardés sur le compte utilisateur et partagés entre tous les clients qui les prennent en charge (y compris les notifications de bureau).\n\nLes règles s’appliquent dans l'ordre ; la première règle applicable définit le résultat.\nEn conséquence : les notification par mot-clé sont plus importantes que les notifications par salon, qui sont plus importantes que les notifications par expéditeur.\nEntre plusieurs règles du même type, la première dans la liste est prioritaire.";
+"notification_settings_per_word_notifications" = "Notifications par mot-clé";
+"notification_settings_per_word_info" = "Les mots sont détectés sans tenir compte de la casse et peuvent contenir un joker *. Par conséquent :\nfoo détecte la chaîne foo entourée de délimiteurs de mots (par ex. ponctuation, espace et début ou fin de ligne).\nfoo* détecte tous les mots commençant par foo.\n*foo* détecte tous les mots qui contiennent les trois lettres foo.";
+"notification_settings_always_notify" = "Toujours notifier";
+"notification_settings_never_notify" = "Ne jamais notifier";
+"notification_settings_word_to_match" = "mots à détecter";
+"notification_settings_highlight" = "Mettre en valeur";
+"notification_settings_custom_sound" = "Son personnalisé";
+"notification_settings_per_room_notifications" = "Notifications par salon";
+"notification_settings_per_sender_notifications" = "Notifications par expéditeur";
+"notification_settings_sender_hint" = "@utilisateur:domaine.com";
+"notification_settings_select_room" = "Choisir un salon";
+"notification_settings_other_alerts" = "Autres alertes";
+"notification_settings_contain_my_user_name" = "Me notifier par un son lorsqu’un message contient mon nom d’utilisateur";
+"notification_settings_contain_my_display_name" = "Me notifier par un son lorsqu’un message contient mon nom d’affichage";
+"notification_settings_just_sent_to_me" = "Me notifier par un son lorsqu’un message privé m’est envoyé";
+"notification_settings_invite_to_a_new_room" = "Me notifier lorsque je suis invité dans un salon";
+"notification_settings_people_join_leave_rooms" = "Me notifier lorsque des personnes rejoignent et quittent les salons";
+"notification_settings_receive_a_call" = "Me notifier lorsque je reçois un appel";
+"notification_settings_suppress_from_bots" = "Supprimer les notifications des robots";
+"notification_settings_by_default" = "Par défaut…";
+"notification_settings_notify_all_other" = "Notifier pour tous les autres messages ou salons";
+// gcm section 
+"settings_config_home_server" = "Serveur d’accueil : %@";
+"settings_config_identity_server" = "Serveur d’identité : %@";
+"settings_config_user_id" = "Identifiant utilisateur : %@";
+// call string
+"call_waiting" = "En attente…";
+"call_connecting" = "Connexion…";
+"call_ended" = "Appel terminé";
+"call_ring" = "Appel…";
+"incoming_video_call" = "Appel vidéo entrant";
+"incoming_voice_call" = "Appel audio entrant";
+"call_invite_expired" = "La demande d’appel a expiré";
+// unrecognized SSL certificate
+"ssl_trust" = "Faire confiance";
+"ssl_logout_account" = "Se déconnecter";
+"ssl_remain_offline" = "Ignorer";
+"ssl_fingerprint_hash" = "Empreinte (%@) :";
+"ssl_could_not_verify" = "Impossible de vérifier l’identité du serveur distant.";
+"ssl_cert_not_trust" = "Cela pourrait signifier que quelqu’un de malveillant intercepte votre trafic, ou que votre téléphone ne fait pas confiance au certificat fourni par le serveur distant.";
+"ssl_cert_new_account_expl" = "Si l’administrateur affirme que ce comportement est normal, assurez-vous que l’empreinte ci-dessous est identique à celle qu’il fournit.";
+"ssl_unexpected_existing_expl" = "Le certificat a changé depuis qu’il a été approuvé par votre téléphone. Ce comportement est INATTENDU. Il est recommandé de ne PAS ACCEPTER ce nouveau certificat.";
+"ssl_expected_existing_expl" = "Le certificat était fiable et a été remplacé par un certificat qui ne l’est pas. Le serveur a peut-être renouvelé son certificat. Contactez l’administrateur du serveur pour lui demander l’empreinte de son certificat.";
+"ssl_only_accept" = "Accepter le certificat UNIQUEMENT si l’administrateur du serveur a publié une empreinte correspondant à celle ci-dessus.";
+"notice_feedback" = "Événement en retour (identifiant : %@) : %@";
+"notice_location_attachment" = "position en pièce-jointe";
+// Language picker
+"language_picker_title" = "Choisissez une langue";
+"language_picker_default_language" = "Défaut (%@)";
+"login_mobile_device" = "Téléphone";
+"login_tablet_device" = "Tablette";
+"login_desktop_device" = "Ordinateur";
+"notice_in_reply_to" = "En réponse à";
+"error_common_message" = "Une erreur est survenue. Veuillez réessayer ultérieurement.";
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "a envoyé une image.";
+"message_reply_to_sender_sent_a_video" = "a envoyé une vidéo.";
+"message_reply_to_sender_sent_an_audio_file" = "a envoyé un fichier audio.";
+"message_reply_to_sender_sent_a_file" = "a envoyé un fichier.";
+"message_reply_to_message_to_reply_to_prefix" = "En réponse à";
+"login_error_resource_limit_exceeded_title" = "Limite de ressources dépassée";
+"login_error_resource_limit_exceeded_message_default" = "Ce serveur d’accueil a dépassé une de ses limites de ressources.";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "Ce serveur d’accueil a atteint sa limite mensuelle d’utilisateurs actifs.";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nVeuillez contacter l’administrateur de votre service pour continuer à l’utiliser.";
+"login_error_resource_limit_exceeded_contact_button" = "Contacter l’administrateur";
+"e2e_passphrase_create" = "Créer la phrase secrète";
+"account_error_push_not_allowed" = "Les notifications ne sont pas autorisées";
+"notice_room_third_party_revoked_invite" = "%@ a retiré l’invitation de %@ à rejoindre ce salon";
+"device_details_rename_prompt_title" = "Nom de la session";
+"notice_encryption_enabled_ok" = "%@ a activé le chiffrement de bout en bout.";
+"notice_encryption_enabled_unknown_algorithm" = "%1$@ a activé le chiffrement de bout en bout (algorithme %2$@ inconnu).";
+// Notice Events with "You"
+"notice_room_invite_by_you" = "Vous avez invité %@";
+"notice_room_invite_you" = "%@ vous a invité";
+"notice_room_third_party_invite_by_you" = "Vous avez envoyé une invitation à %@ pour rejoindre le salon";
+"notice_room_third_party_registered_invite_by_you" = "Vous avez accepté l’invitation pour %@";
+"notice_room_third_party_revoked_invite_by_you" = "Vous avez révoqué l’invitation pour que %@ rejoigne le salon";
+"notice_room_join_by_you" = "Vous avez rejoint le salon";
+"notice_room_leave_by_you" = "Vous êtes parti";
+"notice_room_reject_by_you" = "Vous avez rejeté l’invitation";
+"notice_room_kick_by_you" = "Vous avez expulsé %@";
+"notice_room_unban_by_you" = "Vous avez révoqué le bannissement de %@";
+"notice_room_ban_by_you" = "Vous avez banni %@";
+"notice_room_withdraw_by_you" = "Vous avez annulé l’invitation de %@";
+"notice_avatar_url_changed_by_you" = "Vous avez changé votre avatar";
+"notice_display_name_set_by_you" = "Vous avez défini votre nom d’affichage en %@";
+"notice_display_name_changed_from_by_you" = "Vous avez changé votre nom d’affichage de %@ vers %@";
+"notice_display_name_removed_by_you" = "Vous avez supprimé votre nom d’affichage";
+"notice_topic_changed_by_you" = "Vous avez changé le sujet en « %@ ».";
+"notice_room_name_changed_by_you" = "Vous avez changé le nom du salon en %@.";
+"notice_placed_voice_call_by_you" = "Vous avez passé un appel audio";
+"notice_placed_video_call_by_you" = "Vous avez passé un appel vidéo";
+"notice_answered_video_call_by_you" = "Vous avez répondu à l’appel";
+"notice_ended_video_call_by_you" = "Vous avez terminé l’appel";
+"notice_conference_call_request_by_you" = "Vous avez demandé une conférence VoIP";
+"notice_room_name_removed_by_you" = "Vous avez supprimé le nom du salon";
+"notice_room_topic_removed_by_you" = "Vous avez supprimé le sujet";
+"notice_event_redacted_by_you" = " par vous";
+"notice_profile_change_redacted_by_you" = "Vous avez mis à jour votre profil %@";
+"notice_room_created_by_you" = "Vous avez créé et configuré le salon.";
+"notice_encryption_enabled_ok_by_you" = "Vous avez activé le chiffrement de bout en bout.";
+"notice_encryption_enabled_unknown_algorithm_by_you" = "Vous avez activé le chiffrement de bout en bout (algorithme non reconnu %@).";
+"notice_redaction_by_you" = "Vous avez supprimé un évènement (id : %@)";
+"notice_room_history_visible_to_anyone_by_you" = "Vous avez rendu l’historique futur du salon visible par tout le monde.";
+"notice_room_history_visible_to_members_by_you" = "Vous avez rendu l’historique futur du salon visible par tous les membres du salon.";
+"notice_room_history_visible_to_members_from_invited_point_by_you" = "Vous avez rendu l’historique futur du salon visible par tous les membres, à partir du moment où ils ont été invités.";
+"notice_room_history_visible_to_members_from_joined_point_by_you" = "Vous avez rendu l’historique futur du salon visible par tous les membres, à partir de leur arrivée.";
+"notice_room_history_visible_to_members_from_joined_point_by_you_for_dm" = "Vous avez rendu les messages ultérieurs visibles à tous le monde, à partir de leur arrivée.";
+"notice_room_history_visible_to_members_from_invited_point_by_you_for_dm" = "Vous avez rendu les messages ultérieurs visibles à tous le monde, à partir du moment où ils sont invités.";
+"notice_room_history_visible_to_members_by_you_for_dm" = "Vous avez rendu les messages ultérieurs visibles à tous les membres du salon.";
+"notice_room_created_by_you_for_dm" = "Vous êtes arrivé.";
+"notice_room_name_removed_by_you_for_dm" = "Vous avez supprimé le nom";
+"notice_room_name_changed_by_you_for_dm" = "Vous avez changé le nom en %@.";
+"notice_room_third_party_revoked_invite_by_you_for_dm" = "Vous avez supprimé l’invitation de %@";
+"notice_room_third_party_invite_by_you_for_dm" = "Vous avez invité %@";
+"notice_room_name_changed_for_dm" = "%@ a changé le nom en %@.";
+"notice_room_third_party_revoked_invite_for_dm" = "%@ a supprimé l’invitation de %@";
+"notice_room_third_party_invite_for_dm" = "%@ a invité %@";
+"room_left_for_dm" = "Vous êtes parti";
+"notice_room_history_visible_to_members_from_joined_point_for_dm" = "%@ a rendu les messages ultérieurs visibles à tout le monde, à partir de leur arrivée.";
+"notice_room_history_visible_to_members_from_invited_point_for_dm" = "%@ a rendu les messages ultérieurs visibles à tout le monde, à partir du moment où ils sont invités.";
+"notice_room_history_visible_to_members_for_dm" = "%@ a rendu les messages ultérieurs visibles à tous les membres du salon.";
+"notice_room_aliases_for_dm" = "Les alias sont : %@";
+"notice_room_power_level_intro_for_dm" = "Les rangs des membres sont :";
+"notice_room_join_rule_public_by_you_for_dm" = "Vous avez rendu le salon public.";
+"notice_room_join_rule_public_by_you" = "Vous avez rendu le salon public.";
+"notice_room_join_rule_public_for_dm" = "%@ a rendu le salon public.";
+"notice_room_join_rule_public" = "%@ a rendu le salon public.";
+"notice_room_join_rule_invite_by_you_for_dm" = "Vous avez rendu le salon joignable sur invitation exclusivement.";
+"notice_room_join_rule_invite_by_you" = "Vous avez rendu le salon joignable sur invitation exclusivement.";
+"notice_room_join_rule_invite_for_dm" = "%@ a rendu le salon joignable sur invitation exclusivement.";
+//  New
+"notice_room_join_rule_invite" = "%@ a rendu le salon joignable sur invitation exclusivement.";
+"notice_room_created_for_dm" = "%@ est arrivé.";
+"notice_room_name_removed_for_dm" = "%@ a supprimé le nom";
+"call_more_actions_dialpad" = "Pavé de numérotation";
+"call_more_actions_transfer" = "Transférer";
+"call_more_actions_audio_use_device" = "Haut parleur de l’appareil";
+"call_more_actions_audio_use_headset" = "Utiliser les écouteurs";
+"call_more_actions_change_audio_device" = "Changer de périphérique audio";
+"call_more_actions_unhold" = "Reprendre";
+"call_more_actions_hold" = "Mettre en attente";
+"call_holded" = "Vous avez mis l’appel en attente";
+"call_remote_holded" = "%@ a mis l’appel en attente";
+"notice_declined_video_call_by_you" = "Vous avez refusé l’appel";
+"notice_declined_video_call" = "%@ a refusé l’appel";
+"resume_call" = "Reprendre";
+"call_transfer_to_user" = "Transfert à %@";
+"call_consulting_with_user" = "Consultation de %@";
+"call_video_with_user" = "Appel vidéo avec %@";
+"call_voice_with_user" = "Appel audio avec %@";
+"call_ringing" = "Sonnerie…";
+"e2e_passphrase_too_short" = "La phrase secrète est trop courte, elle doit compter au moins %d caractères";
+"microphone_access_not_granted_for_voice_message" = "Pour les messages vocaux, l’accès au microphone est indispensable mais %@ n’a pas les permissions nécessaires";
+"message_reply_to_sender_sent_a_voice_message" = "envoyer un message vocal.";
+"attachment_large_with_resolution" = "Grand %@ (~%@)";
+"attachment_medium_with_resolution" = "Moyen %@ (~%@)";
+"attachment_small_with_resolution" = "Petit %@ (~%@)";
+"attachment_size_prompt_message" = "Vous pouvez désactiver ceci dans les paramètres.";
+"attachment_size_prompt_title" = "Préciser la taille pour l’envoi";
+"auth_username_in_use" = "";
+"auth_invalid_user_name" = "Nom d’utilisateur invalide";
+"rename" = "Renommer";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/hu.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/hu.lproj/MatrixKit.strings
new file mode 100644
index 000000000..d99934823
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/hu.lproj/MatrixKit.strings
@@ -0,0 +1,481 @@
+"matrix" = "Matrix";
+// Login Screen
+"login_create_account" = "Fiók létrehozása:";
+"login_server_url_placeholder" = "URL (például https://matrix.org)";
+"login_home_server_title" = "Matrix szerver URL:";
+"view" = "Megtekintés";
+"back" = "Vissza";
+"continue" = "Folytatás";
+"leave" = "Elhagyás";
+"invite" = "Meghívás";
+"login_home_server_info" = "A matrix szerver tárolja minden beszélgetésedet és felhasználói fiók adatodat";
+"login_identity_server_title" = "Azonosítási szerver URL:";
+"login_identity_server_info" = "Matrix biztosít egy azonosító szerver ami nyilvántartja, hogy melyik matrix azonosítóhoz milyen e-mail cím, stb. tartozik. Jelenleg csak a https://matrix.org az egyetlen ilyen szerver.";
+"login_user_id_placeholder" = "Matrix azonosító (pl.: @bob:matrix.org vagy csak bob)";
+"login_password_placeholder" = "Jelszó";
+"login_optional_field" = "opcionális";
+"login_display_name_placeholder" = "Megjelenített név (pl. Bob Obson)";
+"login_email_info" = "Az e-mail cím megadásával más felhasználók könnyebben találhatnak meg a Matrixon és lehetőséget ad a jelszó alaphelyzetbe állítására.";
+"login_email_placeholder" = "E-mail cím";
+"login_prompt_email_token" = "Kérlek add meg az e-mail érvényesítő kódot:";
+"login_error_title" = "A bejelentkezés sikertelen";
+"login_error_no_login_flow" = "Nem sikerült letölteni az azonosítási információkat erről a saját szerverről";
+"login_error_do_not_support_login_flows" = "Jelenleg nem támogatunk egyetlen bejelentkezési sémát sem azok közül amit a saját szerver ismer";
+"login_error_registration_is_not_supported" = "A regisztráció jelenleg nem támogatott";
+"login_error_forbidden" = "Érvénytelen felhasználói név/jelszó";
+"login_error_unknown_token" = "A megadott hozzáférési kód nem ismert";
+"login_error_bad_json" = "Hibás JSON";
+"login_error_not_json" = "Nem tartalmaz helyes JSON adatot";
+"login_error_limit_exceeded" = "Túl sok kérés lett elküldve";
+"login_error_user_in_use" = "Ez a felhasználói név már használatban van";
+"login_error_login_email_not_yet" = "Az e-mailben küldött hivatkozásra még nem kattintottál rá";
+"login_use_fallback" = "Alternatív oldal használata";
+"login_leave_fallback" = "Mégse";
+"login_invalid_param" = "Érvénytelen paraméter";
+"register_error_title" = "A regisztráció sikertelen";
+"login_error_forgot_password_is_not_supported" = "Az „elfelejtett jelszó” jelenleg nem támogatott";
+"login_mobile_device" = "Mobil";
+"login_tablet_device" = "Tablet";
+"login_desktop_device" = "Asztali";
+// Action
+"no" = "Nem";
+"yes" = "Igen";
+"abort" = "Megszakítás";
+"close" = "Bezár";
+"discard" = "Elvetés";
+"dismiss" = "Elutasítás";
+"retry" = "Újra";
+"sign_up" = "Regisztráció";
+"submit" = "Elküldés";
+"submit_code" = "Kód küldése";
+"set_default_power_level" = "Hozzáférési szint visszaállítása";
+"set_moderator" = "Beállítás moderátornak";
+"set_admin" = "Beállítás adminisztrátornak";
+"start_chat" = "Csevegés kezdése";
+"start_voice_call" = "Hanghívás kezdése";
+"start_video_call" = "Videóhívás kezdése";
+"mention" = "Megemlítés";
+"select_account" = "Felhasználói fiók kiválasztása";
+"attach_media" = "Média fájl csatolása a könyvtárból";
+"capture_media" = "Fénykép/videó készítése";
+"invite_user" = "Matrix felhasználó meghívása";
+"reset_to_default" = "Alapértelmezés visszaállítása";
+"resend_message" = "Üzenet újraküldése";
+"select_all" = "Mind kijelölése";
+"cancel_upload" = "Feltöltés megszakítása";
+"cancel_download" = "Letöltés megszakítása";
+"show_details" = "Részletek megmutatása";
+"answer_call" = "Hívás fogadása";
+"reject_call" = "Hívás elutasítása";
+"end_call" = "Hívás befejezése";
+"ignore" = "Figyelmen kívül hagyás";
+"unignore" = "Figyelembe vétel";
+// Events formatter
+"notice_avatar_changed_too" = "(a felhasználó képe is megváltozott )";
+"notice_room_name_removed" = "%@ törölte a szoba nevét";
+"notice_room_topic_removed" = "%@ törölte a témát";
+"notice_event_redacted" = "<kitakarva%@>";
+"notice_event_redacted_by" = " %@ által";
+"notice_event_redacted_reason" = " [indok: %@]";
+"notice_profile_change_redacted" = "%@ frissítette az adatait %@";
+"notice_room_created" = "%@ szobát készített és beállította.";
+"notice_room_join_rule" = "A csatlakozási szabály: %@";
+"notice_room_power_level_intro" = "A szoba tagjainak a hozzáférési szintje:";
+"notice_room_power_level_acting_requirement" = "Mielőtt a felhasználó ezt tehetné legalább az alábbi hozzáférési szinttel kell rendelkeznie:";
+"notice_room_power_level_event_requirement" = "Az eseményekhez kapcsolódó minimális hozzáférési szintek:";
+"notice_room_aliases" = "A szoba becenevei: %@";
+"notice_room_related_groups" = "A szobához kapcsolódó csoportok: %@";
+"notice_encrypted_message" = "Titkosított üzenet";
+"notice_encryption_enabled" = "%@ bekapcsolta a végponttól végpontig titkosítást (algoritmus: %@)";
+"notice_image_attachment" = "képmelléklet";
+"notice_audio_attachment" = "hangmelléklet";
+"notice_video_attachment" = "videómelléklet";
+"notice_location_attachment" = "helyadat-melléklet";
+"notice_file_attachment" = "fájlmelléklet";
+"notice_invalid_attachment" = "érvénytelen melléklet";
+"notice_unsupported_attachment" = "Nem támogatott melléklet: %@";
+"notice_feedback" = "Visszajelzés esemény (azon.: %@): %@";
+"notice_redaction" = "%@ kitakart egy eseményt (azon.: %@)";
+"notice_error_unsupported_event" = "Nem támogatott esemény";
+"notice_error_unexpected_event" = "Nem várt esemény";
+"notice_error_unknown_event_type" = "Ismeretlen eseménytípus";
+"notice_room_history_visible_to_anyone" = "%@ a szoba jövőbeni üzeneteit mindenki számára láthatóvá tette.";
+"notice_room_history_visible_to_members" = "%@ a szoba jövőbeni üzeneteit a szobában lévő minden felhasználó számára láthatóvá tette.";
+"notice_room_history_visible_to_members_from_invited_point" = "%@ a szoba jövőbeni üzeneteit a szobában lévő félhasználók számára a meghívásuk pillanatától tette láthatóvá.";
+"notice_room_history_visible_to_members_from_joined_point" = "%@ a szoba jövőbeni üzeneteit a szobában lévő felhasználók számára a csatlakozásuktól tette láthatóvá.";
+"notice_crypto_unable_to_decrypt" = "** Nem sikerül visszafejteni: %@ **";
+"notice_crypto_error_unknown_inbound_session_id" = "A küldő munkamenete nem küldte el a kulcsot ehhez az üzenethez.";
+"notice_sticker" = "Matrica";
+"notice_in_reply_to" = "Válaszolva erre";
+// Settings
+"settings" = "Beállítások";
+"settings_enable_inapp_notifications" = "Alkalmazáson belüli értesítések engedélyezése";
+"settings_enable_push_notifications" = "Leküldéses értesítések engedélyezése";
+"settings_enter_validation_token_for" = "Érvényesítő kód megadása (%@):";
+"notification_settings_room_rule_title" = "Szoba: „%@”";
+// Devices
+"device_details_title" = "Munkamenet információk\n";
+"device_details_name" = "Nyilvános név\n";
+"device_details_identifier" = "Azon.\n";
+"device_details_last_seen" = "Utoljára ekkor láttuk:\n";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_rename_prompt_message" = "A munkamenet nyilvános neve megjelenik azoknál az embereknél, akikkel beszélgetsz";
+"device_details_delete_prompt_title" = "Hitelesítés";
+"device_details_delete_prompt_message" = "A művelethez további hitelesítés szükséges.\nA továbblépéshez add meg a jelszavadat.";
+// Encryption information
+"room_event_encryption_info_title" = "Végpontok közötti titkosítási információk\n\n";
+"room_event_encryption_info_event" = "Esemény információ\n";
+"room_event_encryption_info_event_user_id" = "Felhasználó azonosító\n";
+"room_event_encryption_info_event_identity_key" = "Curve25519 azonosítási kulcs\n";
+"room_event_encryption_info_event_fingerprint_key" = "Claimed Ed25519 ujjlenyomat kulcs\n";
+"room_event_encryption_info_event_algorithm" = "Algoritmus\n";
+"room_event_encryption_info_event_session_id" = "Munkamenet-azonosító\n";
+"room_event_encryption_info_event_decryption_error" = "Visszafejtési hiba\n";
+"room_event_encryption_info_event_unencrypted" = "titkosítatlan";
+"room_event_encryption_info_event_none" = "nincs";
+"room_event_encryption_info_device" = "\nKüldő munkamenetének információi\n";
+"room_event_encryption_info_device_unknown" = "ismeretlen munkamenet\n";
+"room_event_encryption_info_device_name" = "Nyilvános név\n";
+"room_event_encryption_info_device_id" = "Azon.\n";
+"room_event_encryption_info_device_verification" = "Ellenőrzés\n";
+"room_event_encryption_info_device_fingerprint" = "Ed25519 ujjlenyomat\n";
+"room_event_encryption_info_device_verified" = "Ellenőrizve";
+"room_event_encryption_info_device_not_verified" = "NINCS ellenőrizve";
+"room_event_encryption_info_device_blocked" = "Tiltólistán";
+"room_event_encryption_info_verify" = "Ellenőriz...";
+"room_event_encryption_info_unverify" = "Ellenőrzés visszavonása";
+"room_event_encryption_info_block" = "Tiltólistára tétel";
+"room_event_encryption_info_unblock" = "Törlés a tiltólistáról";
+"room_event_encryption_verify_title" = "Munkamenet ellenőrzése\n\n";
+"room_event_encryption_verify_ok" = "Ellenőrzés";
+// Account
+"account_save_changes" = "Változások mentése";
+"account_link_email" = "E-mail cím összekötése";
+"account_linked_emails" = "Hozzárendelt e-mail címek";
+"account_email_validation_title" = "Ellenőrzés folyamatban";
+"account_msisdn_validation_title" = "Ellenőrzés folyamatban";
+"account_msisdn_validation_error" = "A telefonszám ellenőrzése sikertelen.";
+"account_error_display_name_change_failed" = "Megjelenítési név megváltoztatása sikertelen";
+"account_error_picture_change_failed" = "A kép megváltoztatása sikertelen";
+"account_error_matrix_session_is_not_opened" = "A Matrix munkamenet nincs megnyitva";
+"account_error_email_wrong_title" = "Érvénytelen e-mail cím";
+"account_error_email_wrong_description" = "Ez nem tűnik érvényes e-mail címnek";
+"account_error_msisdn_wrong_title" = "Érvénytelen telefonszám";
+"account_error_msisdn_wrong_description" = "Nem tűnik érvényes telefonszámnak";
+// Room creation
+"room_creation_name_title" = "Szoba neve:";
+"room_creation_name_placeholder" = "(pl.: ebédCsoport)";
+"room_creation_alias_title" = "Szoba beceneve:";
+"room_creation_alias_placeholder" = "(pl.: #foo:example.org)";
+"room_creation_alias_placeholder_with_homeserver" = "(pl.: #foo%@)";
+"room_creation_participants_title" = "Résztvevők:";
+"room_creation_participants_placeholder" = "(pl.: @bob:homeserver1; @john:homeserver2...)";
+// Room
+"room_please_select" = "Kérlek válassz szobát";
+"room_error_join_failed_title" = "A szobához való csatlakozás nem sikerült";
+"room_error_join_failed_empty_room" = "Üres szobába jelenleg nem lehet belépni.";
+"room_error_name_edition_not_authorized" = "A szoba nevének megváltoztatásához nincs jogosultságod";
+"room_event_encryption_verify_message" = "Ennek a munkamenet hitelességének a vizsgálatához vedd fel a kapcsolatot a tulajdonossal egy másik csatornán (pl. személyes találkozó vagy telefonhívás) és kérdezd meg, hogy amit ő lát a személyes beállításoknál mint a munkamenethez tartozó kulcs, az megegyezik az alábbi kulccsal:\n\n\tMunkamenet neve: %@\n\tMunkamenet azonosító: %@\n\tMunkamenet kulcs: %@\n\nHa egyezik akkor nyomd meg az ellenőrizve gombot alább. Ha nem egyezik, akkor valaki jogosulatlanul akarja használni a munkamenetet; talán a legjobb, ha a tiltólista gombot nyomod meg inkább.\n\nA jövőben ezen az ellenőrzési módon javítani fogunk.";
+"account_email_validation_message" = "Ellenőrizd a leveleidet, és kattints a levélben lévő hivatkozásra. Ha az megvan, akkor kattints itt a tovább gombra.";
+"account_email_validation_error" = "Az e-mail címet nem sikerült ellenőrizni. Ellenőrizd a leveleidet, és kattints a levélben lévő hivatkozásra. Ha az megvan, akkor kattints itt a tovább gombra";
+"account_msisdn_validation_message" = "SMS-t küldtünk az aktiváló kóddal. Add meg az aktiváló kódot alább.";
+"room_error_topic_edition_not_authorized" = "Nem vagy jogosult a szoba témájának szerkesztésére";
+"room_error_cannot_load_timeline" = "Az idővonalat nem sikerült betölteni";
+"room_error_timeline_event_not_found_title" = "Az idővonali pozíciót nem sikerült letölteni";
+"room_error_timeline_event_not_found" = "Az alkalmazás megpróbált az idővonalról betölteni egy időpillanatot de nem találja";
+"room_left" = "Elhagytad a szobát";
+"room_no_power_to_create_conference_call" = "Ebben a szobában nincs jogosultságod meghívni valakit konferenciát indítani";
+"room_no_conference_call_in_encrypted_rooms" = "Titkosított szobákban a konferenciahívások nem támogatottak";
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "kép elküldve.";
+"message_reply_to_sender_sent_a_video" = "videó elküldve.";
+"message_reply_to_sender_sent_an_audio_file" = "hangfájl elküldve.";
+"message_reply_to_sender_sent_a_file" = "fájl elküldve.";
+"message_reply_to_message_to_reply_to_prefix" = "Válaszolva erre";
+// Room members
+"room_member_ignore_prompt" = "Biztos, hogy eltakarod ennek a felhasználónak az összes üzenetét?";
+"room_member_power_level_prompt" = "Valószínűleg nem fogod tudni visszavonni ezt a műveletet, mivel ugyanarra a szintre emeled a felhasználót mint amin te magad vagy.\nBiztos vagy benne?";
+// Attachment
+"attachment_size_prompt" = "Hogy szeretnéd elküldeni:";
+"attachment_original" = "Jelenlegi méret (%@)";
+"attachment_small" = "Kicsi (~%@)";
+"attachment_medium" = "Közepes (~%@)";
+"attachment_large" = "Nagy (~%@)";
+"attachment_cancel_download" = "Megszakítod a letöltést?";
+"attachment_cancel_upload" = "Megszakítod a feltöltést?";
+"attachment_multiselection_size_prompt" = "Hogy szeretnéd elküldeni a képet:";
+"attachment_multiselection_original" = "Jelenlegi méret";
+"attachment_e2e_keys_file_prompt" = "Ez a fájl a Matrix kliensből kimentett titkosító kulcsokat tartalmaz.\nSzeretnéd megjeleníteni a fájl tartalmát vagy betöltöd a kulcsokat amiket tartalmaz?";
+"attachment_e2e_keys_import" = "Betöltés...";
+// Contacts
+"contact_mx_users" = "Matrix felhasználók";
+"contact_local_contacts" = "Helyi névjegyek";
+// Groups
+"group_invite_section" = "Meghívók";
+"group_section" = "Csoportok";
+// Search
+"search_no_results" = "Nincs találat";
+"search_searching" = "Keresés folyamatban...";
+// Time
+"format_time_s" = "mp";
+"format_time_m" = "p";
+"format_time_h" = "ó";
+"format_time_d" = "n";
+// E2E import
+"e2e_import_room_keys" = "Szoba kulcsok betöltése";
+"e2e_import_prompt" = "Ez a folyamat betölti azokat a titkosítási kulcsokat amiket előzőleg egy másik Matrix kliensből mentettél ki. Ez után minden olyan üzenetet vissza tudsz fejteni amit a másik eszköz vissza tud.\nA kulcsokat tartalmazó fájl jelszóval védett. Add meg itt a jelszót a fájl visszafejtéséhez.";
+"e2e_import" = "Betöltés";
+"e2e_passphrase_enter" = "Jelszó megadása";
+// E2E export
+"e2e_export_room_keys" = "Szoba kulcsok kimentése";
+"e2e_export_prompt" = "Ezzel a folyamattal kimentheted azokat a kulcsokat amiket a titkosított szobákban az üzenetek visszafejtésére használtál. Így később ezt a fájlt egy másik Matrix kliensbe betöltve a kliens vissza tudja fejteni ezeket az üzeneteket.\nAki el tudja olvasni a kimentett kulcsokat tartalmazó fájlt vissza fogja tudni fejteni az üzeneteket amiket látsz, ezért tartsd a fájlt biztonságosan.";
+"e2e_export" = "Kiment";
+"e2e_passphrase_confirm" = "Jelszó megerősítése";
+"e2e_passphrase_empty" = "A jelszó nem lehet üres";
+"e2e_passphrase_not_match" = "A jelszavaknak egyezniük kell";
+// Others
+"user_id_title" = "Felhasználói azonosító:";
+"offline" = "kapcsolat nélkül";
+"unsent" = "Elküldetlen";
+"error" = "Hiba";
+"error_common_message" = "Hiba történt. Kérlek próbáld meg később.";
+"not_supported_yet" = "Jelenleg nem támogatott";
+"default" = "alapértelmezett";
+"private" = "Privát";
+"public" = "Nyilvános";
+"power_level" = "Hozzáférési szint";
+"network_error_not_reachable" = "Ellenőrizd a hálózati hozzáférésed";
+"user_id_placeholder" = "pl.: @bob:matrixszerver";
+"ssl_homeserver_url" = "Matrix szerver URL: %@";
+// Permissions
+"camera_access_not_granted_for_call" = "Videó hívásokhoz engedélyezni kell a hozzáférést a kamerához de %@ nem rendelkezik ilyen engedéllyel";
+"microphone_access_not_granted_for_call" = "Hívásokhoz engedélyezni kell a hozzáférést a mikrofonhoz, de %@ nem rendelkezik ilyen engedéllyel";
+"local_contacts_access_not_granted" = "Címjegyzékben található felhasználók feltérképezéséhez engedéllyel kell rendelkezni a címjegyzékhez, de %@ nem rendelkezik ilyen engedéllyel";
+"local_contacts_access_discovery_warning_title" = "Felhasználók keresése";
+"local_contacts_access_discovery_warning" = "Az olyan ismerősök felderítéséhez akik már használják a Matrixot, %@ el tudja küldeni a címjegyzékben található e-mail címeket és telefonszámokat az általad választott Matrix azonosítási szervernek. Ahol lehetséges a személyes adatok hash-elve lesznek - kérlek ellenőrizd az azonosítási szervered adatvédelmi szabályait.";
+// Country picker
+"country_picker_title" = "Válassz országot";
+// Language picker
+"language_picker_title" = "Válassz nyelvet";
+"language_picker_default_language" = "Alapértelmezett (%@)";
+"notice_room_invite" = "%@ meghívta %@ felhasználót";
+"notice_room_third_party_invite" = "%@ meghívót küldött %@ felhasználónak, hogy lépjen be a szobába";
+"notice_room_third_party_registered_invite" = "%@ elfogadta a meghívást ide: %@";
+"notice_room_join" = "%@ csatlakozott";
+"notice_room_leave" = "%@ távozott";
+"notice_room_reject" = "%@ elutasította a meghívást";
+"notice_room_kick" = "%@ kirúgta: %@";
+"notice_room_unban" = "%@ visszaengedte: %@";
+"notice_room_ban" = "%@ kitiltotta: %@";
+"notice_room_withdraw" = "%@ visszavonta %@ meghívóját";
+"notice_room_reason" = ". Ok: %@";
+"notice_avatar_url_changed" = "%@ megváltoztatta a profilképét";
+"notice_display_name_set" = "%@ a becenevét %@ névre állította be";
+"notice_display_name_changed_from" = "%@ megváltoztatta a becenevét %@ névről %@ névre";
+"notice_display_name_removed" = "%@ törölte a becenevét";
+"notice_topic_changed" = "%@ megváltoztatta a témát erre: „%@”.";
+"notice_room_name_changed" = "%@ megváltoztatta a szoba nevét erre: %@.";
+"notice_placed_voice_call" = "%@ hanghívást kezdeményezett";
+"notice_placed_video_call" = "%@ videóhívást kezdeményezett";
+"notice_answered_video_call" = "%@ fogadta a hívást";
+"notice_ended_video_call" = "%@ befejezte a hívást";
+"notice_conference_call_request" = "%@ VoIP konferenciát kezdeményezett";
+"notice_conference_call_started" = "VoIP konferencia indult";
+"notice_conference_call_finished" = "VoIP konferencia befejeződött";
+// button names 
+"ok" = "Rendben";
+"cancel" = "Mégse";
+"save" = "Ment";
+"send" = "Küld";
+"copy_button_name" = "Másol";
+"resend" = "Újraküld";
+"redact" = "Töröl";
+"share" = "Megosztás";
+"set_power_level" = "Hozzáférési szint beállítása";
+"delete" = "Töröl";
+// actions 
+"action_logout" = "Kilép";
+"create_room" = "Szoba készítése";
+"login" = "Belép";
+"create_account" = "Felhasználói fiók készítés";
+"membership_invite" = "Meghívva";
+"membership_leave" = "Elhagyva";
+"membership_ban" = "Kitiltva";
+"num_members_one" = "%@ felhasználó";
+"num_members_other" = "%@ felhasználó";
+"kick" = "Elküld";
+"ban" = "Kitilt";
+"unban" = "Visszaenged";
+"message_unsaved_changes" = "Mentetlen beállítások vannak. Ha kilépsz a beállítások elvesznek.";
+// Login Screen 
+"login_error_already_logged_in" = "Már bejelentkeztél";
+"login_error_must_start_http" = "Az URL-nek http[s]:// -sel kell kezdődnie";
+// room details dialog screen
+"room_details_title" = "Szoba adatai";
+// contacts list screen 
+"invitation_message" = "Szeretnék veled beszélgetni a Matrix-szal. További információkért látogasd meg a http://matrix.org weboldalt.";
+// Settings screen 
+"settings_title_config" = "Beállítások";
+"settings_title_notifications" = "Értesítések";
+// Notification settings screen 
+"notification_settings_disable_all" = "Minden értesítés kikapcsolása";
+"notification_settings_enable_notifications" = "Értesítések engedélyezése";
+"notification_settings_enable_notifications_warning" = "Minden értesítés tiltva van minden eszközhöz.";
+"notification_settings_global_info" = "Az értesítések beállításai a felhasználói fiókhoz van elmentve és minden eszköz használhatja amelyik támogatja (beleértve az asztali értesítéseket is).\n\nA szabályok sorrendje számít; az első szabály ami illeszkedik határozza meg a viselkedést az üzenethez.\nÍgy a kulcsszó szintű értesítések fontosabbak mint a szoba szintűek amik fontosabbak mint a küldő szintű értesítések.\nHa több szabály van ugyanolyan kategóriából a listában az első szabály ami illeszkedik lesz a meghatározó.";
+"notification_settings_per_word_notifications" = "Kulcsszó alapú értesítések";
+"notification_settings_per_word_info" = "A szavaknál a kis-, és nagybetű nincs megkülönböztetve és tartalmazhat „wildcard” karaktert (*). Például:\nfoo illeszkedik minden szövegre ahol a foo szó elválasztó karakterrel van körülvéve (pl.: írásjel, szóköz, sor eleje, sor vége).\nfoo* illeszkedik minden szövegre ami foo-val kezdődik.\n*foo* illeszkedik minden szövegre ami a három betűt (foo) tartalmazza.";
+"notification_settings_always_notify" = "Mindig értesít";
+"notification_settings_never_notify" = "Soha ne értesítsen";
+"notification_settings_word_to_match" = "szó amire illeszkedjen";
+"notification_settings_highlight" = "Kiemel";
+"notification_settings_custom_sound" = "Egyedi hang";
+"notification_settings_per_room_notifications" = "Szoba szintű értesítések";
+"notification_settings_per_sender_notifications" = "Küldő szintű értesítések";
+"notification_settings_sender_hint" = "@felhasznalo:domain.com";
+"notification_settings_select_room" = "Válassz szobát";
+"notification_settings_other_alerts" = "További figyelmeztetések";
+"notification_settings_contain_my_user_name" = "Hangos értesítés ha az üzenet tartalmazza a nevemet";
+"notification_settings_contain_my_display_name" = "Hangos értesítés ha az üzenet a becenevemet tartalmazza";
+"notification_settings_just_sent_to_me" = "Hangos értesítés ha az üzenetet csak nekem küldték";
+"notification_settings_invite_to_a_new_room" = "Értesítés ha meghívnak egy új szobába";
+"notification_settings_people_join_leave_rooms" = "Értesítés, ha valaki belép vagy elhagy szobát";
+"notification_settings_receive_a_call" = "Értesítés, ha hívást kapok";
+"notification_settings_suppress_from_bots" = "Robotoktól való értesítések tiltása";
+"notification_settings_by_default" = "Alapértelmezetten...";
+"notification_settings_notify_all_other" = "Értesítés minden egyéb üzenethez/szobához";
+// gcm section 
+"settings_config_home_server" = "Matrix szerver: %@";
+"settings_config_identity_server" = "Azonosítási szerver: %@";
+"settings_config_user_id" = "Felhasználói azonosító: %@";
+// call string
+"call_waiting" = "Vár...";
+"call_connecting" = "Kapcsolás…";
+"call_ended" = "Hívás vége";
+"call_ring" = "Hívás...";
+"incoming_video_call" = "Érkező videó hívás";
+"incoming_voice_call" = "Érkező hang hívás";
+"call_invite_expired" = "Hívás meghívás lejárt";
+// unrecognized SSL certificate
+"ssl_trust" = "Megbízhatóság";
+"ssl_logout_account" = "Kilép";
+"ssl_remain_offline" = "Figyelmen kívül hagy";
+"ssl_fingerprint_hash" = "Ujjlenyomat (%@):";
+"ssl_could_not_verify" = "A távoli szerver nem azonosítható.";
+"ssl_cert_not_trust" = "Ez azt jelentheti, hogy valaki lehallgatja a forgalmat vagy a telefon nem tekinti megbízhatónak a szerver tanúsítványát.";
+"ssl_cert_new_account_expl" = "Ha a szolgáltatás adminisztrátorának információi alapján ez várható, ellenőrizd az ujjlenyomatot azzal amit az adminisztrátor közölt.";
+"ssl_unexpected_existing_expl" = "A tanúsítvány amit eddig a telefon elfogadott megváltozott. Ez nagyon GYANÚS. Ajánlott az új tanúsítvány ELUTASÍTÁSA.";
+"ssl_expected_existing_expl" = "Az eddig elfogadott tanúsítvány egy nem elfogadottra módosult. A szerver lehet, hogy megújította a tanúsítványát. Vedd fel a kapcsolatot a szerver adminisztrátorával az új ujjlenyomat ellenőrzéséhez.";
+"ssl_only_accept" = "CSAK akkor fogadd el a tanúsítványt ha a szerver adminisztrátora közzétette az ujjlenyomatot és az megegyezik az alábbival.";
+"login_error_resource_limit_exceeded_title" = "Erőforrás korlát túllépés";
+"login_error_resource_limit_exceeded_message_default" = "Ez a Matrix szerver túllépte az egyik erőforrás-korlátját.";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "Ez a Matrix szerver elérte a havi aktív felhasználói korlátját.";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nKérlek vedd fel a kapcsolatot a szolgáltatás adminisztrátorával, hogy tovább használhasd.";
+"login_error_resource_limit_exceeded_contact_button" = "Adminisztrátor kapcsolatfelvétel";
+// room display name
+"room_displayname_empty_room" = "Üres szoba";
+"room_displayname_two_members" = "%@ és %@";
+"room_displayname_more_than_two_members" = "%@ és %@ mások";
+"e2e_passphrase_create" = "Jelmondat készítés";
+"account_error_push_not_allowed" = "Értesítések nincsenek engedélyezve";
+"notice_room_third_party_revoked_invite" = "%@ visszavonta a a meghívót ehhez a szobához: %@";
+"device_details_rename_prompt_title" = "Munkamenet neve";
+"notice_encryption_enabled_ok" = "%@ bekapcsolta a végpontok közötti titkosítást.";
+"notice_encryption_enabled_unknown_algorithm" = "%1$@ bekapcsolta a végpontok közötti titkosítást (ismeretlen algoritmus: %2$@).";
+// Notice Events with "You"
+"notice_room_invite_by_you" = "Meghívtad őt: %@";
+"notice_room_invite_you" = "%@ meghívott";
+"notice_room_third_party_invite_by_you" = "Meghívót küldtél neki: %@, hogy be tudjon lépni a szobába";
+"notice_room_third_party_registered_invite_by_you" = "A meghívót ide: %@ elfogadtad";
+"notice_room_third_party_revoked_invite_by_you" = "Visszavontad a meghívót ehhez a szobához: %@";
+"notice_room_join_by_you" = "Beléptél";
+"notice_room_leave_by_you" = "Távoztál";
+"notice_room_reject_by_you" = "A meghívót elutasítottad";
+"notice_room_kick_by_you" = "Kirúgtad őt: %@";
+"notice_room_unban_by_you" = "Visszaengedted őt: %@";
+"notice_room_ban_by_you" = "Kitiltottad őt: %@";
+"notice_room_withdraw_by_you" = "%@ meghívóját visszavontad";
+"notice_avatar_url_changed_by_you" = "A profilképedet megváltoztattad";
+"notice_display_name_set_by_you" = "A megjelenő nevedet megváltoztattad erre: %@";
+"notice_display_name_changed_from_by_you" = "A megjelenő nevedet megváltoztattad erről: %@ erre: %@";
+"notice_display_name_removed_by_you" = "A megjelenő nevedet törölted";
+"notice_topic_changed_by_you" = "A témát megváltoztattad erre: „%@”.";
+"notice_room_name_changed_by_you" = "A szoba nevét megváltoztattad erre: %@.";
+"notice_placed_voice_call_by_you" = "Hanghívást kezdeményeztél";
+"notice_placed_video_call_by_you" = "Videóhívást kezdeményeztél";
+"notice_answered_video_call_by_you" = "Fogadtad a hívást";
+"notice_ended_video_call_by_you" = "Befejezted a hívást";
+"notice_conference_call_request_by_you" = "VoIP konferenciát kezdeményeztél";
+"notice_room_name_removed_by_you" = "A szoba nevét törölted";
+"notice_room_topic_removed_by_you" = "A szoba témáját törölted";
+"notice_event_redacted_by_you" = " nálad";
+"notice_profile_change_redacted_by_you" = "A profilodat megváltoztattad: %@";
+"notice_room_created_by_you" = "A szobát létrehoztad és beállítottad.";
+"notice_encryption_enabled_ok_by_you" = "A végpontok közötti titkosítást bekapcsoltad.";
+"notice_encryption_enabled_unknown_algorithm_by_you" = "A végpontok közötti titkosítást bekapcsoltad (az algoritmus ismeretlen: %@).";
+"notice_redaction_by_you" = "Kitakartál egy eseményt (azon.: %@)";
+"notice_room_history_visible_to_anyone_by_you" = "Láthatóvá tetted a szoba jövőbeni üzeneteit mindenki számára.";
+"notice_room_history_visible_to_members_by_you" = "Láthatóvá tetted a szoba jövőbeni üzeneteit a szobában tartózkodók számára.";
+"notice_room_history_visible_to_members_from_invited_point_by_you" = "A szoba jövőbeni üzeneteit a szobában lévő felhasználók számára a meghívásuk pillanatától láthatóvá tetted.";
+"notice_room_history_visible_to_members_from_joined_point_by_you" = "A szoba jövőbeni üzeneteit a szobában lévő felhasználók számára a szobába való belépésük pillanatától láthatóvá tetted.";
+"notice_room_name_removed_for_dm" = "%@ törölte a nevet";
+"notice_room_created_for_dm" = "%@ csatlakozott.";
+//  New
+"notice_room_join_rule_invite" = "%@meghívásossá tette a szobát.";
+"notice_room_join_rule_invite_for_dm" = "%@meghívásossá tette.";
+"notice_room_join_rule_invite_by_you" = "A szobát meghívásossá tetted.";
+"notice_room_join_rule_invite_by_you_for_dm" = "Meghívásossá tetted.";
+"notice_room_join_rule_public" = "%@ nyilvánossá tette a szobát.";
+"notice_room_join_rule_public_for_dm" = "%@ nyilvánossá tette.";
+"notice_room_join_rule_public_by_you" = "A szobát nyilvánossá tetted.";
+"notice_room_join_rule_public_by_you_for_dm" = "Ezt nyilvánossá tetted.";
+"notice_room_power_level_intro_for_dm" = "A tagok a hozzáférési szintje:";
+"notice_room_aliases_for_dm" = "A becenevek: %@";
+"notice_room_history_visible_to_members_for_dm" = "%@ a jövőbeni üzeneteket láthatóvá tette a szobában lévő minden felhasználó számára.";
+"notice_room_history_visible_to_members_from_invited_point_for_dm" = "%@ a jövőbeni üzeneteket láthatóvá tette mindenki számára a meghívásuk pillanatától.";
+"notice_room_history_visible_to_members_from_joined_point_for_dm" = "%@ a jövőbeni üzeneteket láthatóvá tette mindenki számára a belépésük pillanatától.";
+"room_left_for_dm" = "Távoztál";
+"notice_room_third_party_invite_for_dm" = "%@ meghívta %@ felhasználót";
+"notice_room_third_party_revoked_invite_for_dm" = "%@ visszavonta az ő meghívóját: %@";
+"notice_room_name_changed_for_dm" = "%@ megváltoztatta a nevet erre: %@.";
+"notice_room_third_party_invite_by_you_for_dm" = "Meghívtad őt: %@";
+"notice_room_third_party_revoked_invite_by_you_for_dm" = "Visszavontad az ő meghívóját: %@";
+"notice_room_name_changed_by_you_for_dm" = "Megváltoztattad a nevet erre: %@.";
+"notice_room_name_removed_by_you_for_dm" = "A nevet törölted";
+"notice_room_created_by_you_for_dm" = "Beléptél.";
+"notice_room_history_visible_to_members_by_you_for_dm" = "A jövőbeni üzeneteket láthatóvá tetted a szobában lévő minden felhasználó számára.";
+"notice_room_history_visible_to_members_from_invited_point_by_you_for_dm" = "A jövőbeni üzeneteket láthatóvá tetted mindenki számára a meghívásuk pillanatától.";
+"notice_room_history_visible_to_members_from_joined_point_by_you_for_dm" = "A jövőbeni üzeneteket láthatóvá tetted mindenki számára a belépésük pillanatától.";
+"call_more_actions_dialpad" = "Tárcsázó számlap";
+"call_more_actions_transfer" = "Átadás";
+"call_more_actions_audio_use_device" = "Eszköz hangszóró";
+"call_more_actions_audio_use_headset" = "Fejhallgató használata";
+"call_more_actions_change_audio_device" = "Hang eszköz megváltoztatása";
+"call_more_actions_unhold" = "Folytatás";
+"call_more_actions_hold" = "Várakoztat";
+"call_holded" = "Felfüggesztette a hívást";
+"call_remote_holded" = "%@ felfüggesztette a hívást";
+"notice_declined_video_call_by_you" = "Elutasította a hívást";
+"notice_declined_video_call" = "%@ elutasította a hívást";
+"resume_call" = "Folytatás";
+"call_transfer_to_user" = "Hívásátirányítás ide: %@";
+"call_consulting_with_user" = "Konzultáció vele: %@";
+"call_video_with_user" = "Videóhívás vele: %@";
+"call_voice_with_user" = "Hanghívás vele: %@";
+"call_ringing" = "Hívás…";
+"e2e_passphrase_too_short" = "A jelmondat túl rövid (legalább %d karakter hosszúnak kell lennie)";
+"microphone_access_not_granted_for_voice_message" = "Ha hangüzenetekhez a mikrofonhoz szükséges a hozzáférés, de %@ nem rendelkezik a használatához szükséges engedéllyel";
+"message_reply_to_sender_sent_a_voice_message" = "hang üzenet elküldve.";
+"attachment_large_with_resolution" = "Nagy %@ (~%@)";
+"attachment_medium_with_resolution" = "Közepes %@ (~%@)";
+"attachment_small_with_resolution" = "Kicsi %@ (~%@)";
+"attachment_size_prompt_message" = "Ezt a beállításokban kikapcsolhatod.";
+"attachment_size_prompt_title" = "Méret megerősítése küldéshez";
+"room_displayname_all_other_participants_left" = "%@ (Bal)";
+"auth_reset_password_error_not_found" = "Nem található";
+"auth_reset_password_error_unauthorized" = "Nem engedélyezett";
+"auth_username_in_use" = "A felhasználónév foglalt";
+"auth_invalid_user_name" = "Érvénytelen felhasználónév";
+"rename" = "Átnevez";
+"room_displayname_all_other_members_left" = "%@ (Bal)";
+"attachment_unsupported_preview_message" = "Ez a fájl típus nem támogatott.";
+"attachment_unsupported_preview_title" = "Az előnézetet nem lehet megjeleníteni";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/id.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/id.lproj/MatrixKit.strings
new file mode 100644
index 000000000..6dc5772bd
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/id.lproj/MatrixKit.strings
@@ -0,0 +1,559 @@
+
+
+"auth_username_in_use" = "Nama pengguna telah dipakai";
+"invite" = "Undang";
+"rename" = "Ubah Nama";
+"view" = "Tampilkan";
+"cancel" = "Batalkan";
+"leave" = "Tinggalkan";
+"save" = "Simpan";
+"notice_room_power_level_intro_for_dm" = "Level kekuatan anggota pesan langsung adalah:";
+"notice_room_power_level_intro" = "Level kekuatan anggota ruangan adalah:";
+"notice_room_join_rule_public_by_you_for_dm" = "Anda membuat pesan langsung ini publik.";
+"notice_room_join_rule_public_by_you" = "Anda membuat ruangan ini publik.";
+"notice_room_join_rule_public_for_dm" = "%@ membuat pesan langsung ini publik.";
+"notice_room_join_rule_public" = "%@ membuat ruangan ini publik.";
+"notice_room_join_rule_invite_by_you_for_dm" = "Anda membuat pesan langsung ini undangan saja.";
+"notice_room_join_rule_invite_by_you" = "Anda membuat ruangan ini undangan saja.";
+"notice_room_join_rule_invite_for_dm" = "%@ membuat pesan langsung ini undangan saja.";
+//  New
+"notice_room_join_rule_invite" = "%@ membuat ruangan ini undangan saja.";
+//  Old
+"notice_room_join_rule" = "Peraturan bergabung adalah: %@";
+"notice_room_created_for_dm" = "%@ bergabung.";
+"notice_room_created" = "%@ membuat dan mengatur ruangan ini.";
+"notice_profile_change_redacted" = "%@ memperbarui profilnya %@";
+"notice_event_redacted_reason" = " [alasan: %@]";
+"notice_event_redacted_by" = " dari %@";
+"notice_event_redacted" = "<redacted%@>";
+"notice_room_topic_removed" = "%@ menghapus topik ruangan";
+"notice_room_name_removed_for_dm" = "%@ menghapus nama pesan langsung";
+"notice_room_name_removed" = "%@ menghapus nama ruangan";
+
+// Events formatter
+"notice_avatar_changed_too" = "(avatar juga diganti)";
+"unignore" = "Hapus Pengabaian";
+"ignore" = "Abaikan";
+"resume_call" = "Lanjutkan";
+"end_call" = "Akhiri Panggilan";
+"reject_call" = "Tolak Panggilan";
+"answer_call" = "Jawab Panggilan";
+"show_details" = "Tampilkan Detail";
+"cancel_upload" = "Batal Mengunggah";
+"cancel_download" = "Batal Mengunduh";
+"select_all" = "Pilih Semua";
+"resend_message" = "Kirim ulang pesan";
+"reset_to_default" = "Atur ulang ke bawaan";
+"invite_user" = "Undang pengguna Matrix";
+"capture_media" = "Ambil Foto/Video";
+"attach_media" = "Lampirkan Media dari Library";
+"select_account" = "Pilih sebuah akun";
+"mention" = "Sebutan";
+"start_video_call" = "Mulai Panggilan Video";
+"start_voice_call" = "Mulai Panggilan Suara";
+"start_chat" = "Mulai Mengobrol";
+"set_moderator" = "Tetapkan Moderator";
+"set_admin" = "Tetapkan Admin";
+"set_power_level" = "Atur Level Kekuatan";
+"set_default_power_level" = "Atur Ulang Level Kekuatan";
+"submit_code" = "Kirim kode";
+"submit" = "Kirim";
+"sign_up" = "Daftar";
+"retry" = "Coba Lagi";
+"dismiss" = "Lupakan";
+"discard" = "Buang";
+"continue" = "Lanjutkan";
+"close" = "Tutup";
+"back" = "Kembali";
+"abort" = "Batalkan";
+"yes" = "Ya";
+
+// Action
+"no" = "Tidak";
+"login_error_resource_limit_exceeded_contact_button" = "Hubungi Administrator";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nSilakan hubungi service homeserver Anda untuk melanjutkan menggunakan perangkat ini.";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "Homeserver ini telah mencapai batas Pengguna Aktif Bulanan.";
+"login_error_resource_limit_exceeded_message_default" = "Homeserver ini telah melebihi batas sumbernya.";
+"login_error_resource_limit_exceeded_title" = "Melebihi Batas Sumber";
+"login_desktop_device" = "Desktop";
+"login_tablet_device" = "Tablet";
+"login_mobile_device" = "Mobile";
+"login_error_forgot_password_is_not_supported" = "Lupa kata sandi saat ini belum didukung";
+"register_error_title" = "Pendaftaran Gagal";
+"login_invalid_param" = "Parameter tidak valid";
+"login_leave_fallback" = "Batalkan";
+"login_use_fallback" = "Gunakan halaman fallback";
+"login_error_login_email_not_yet" = "Tautan email yang belum diklik";
+"login_error_user_in_use" = "Nama pengguna ini sudah dipakai";
+"login_error_limit_exceeded" = "Terlalu banyak permintaan yang dikirim";
+"login_error_not_json" = "Tidak mengandung JSON yang valid";
+"login_error_unknown_token" = "Token akses yang ditentukan tidak diketahui";
+"login_error_bad_json" = "JSON cacat";
+"login_error_forbidden" = "Nama pengguna/kata sandi tidak valid";
+"login_error_registration_is_not_supported" = "Pendaftaran saat ini tidak didukung";
+"login_error_do_not_support_login_flows" = "Saat ini kami tidak mendukung salah satu atau semua alur masuk yang ditentukan oleh homeserver ini";
+"login_error_no_login_flow" = "Kami gagal untuk menerima informasi otentikasi dari homeserver ini";
+"login_error_title" = "Login Gagal";
+"login_prompt_email_token" = "Harap masukkan token validasi email Anda:";
+"login_email_placeholder" = "Alamat email";
+"login_email_info" = "Menentukan alamat email memungkinkan pengguna lain untuk menemukan Anda di Matrix dengan lebih mudah, dan akan memberi Anda cara untuk menyetel ulang sandi di masa mendatang.";
+"login_display_name_placeholder" = "Nama tampilan (mis. Bob Obson)";
+"login_optional_field" = "opsional";
+"login_password_placeholder" = "Kata sandi";
+"login_user_id_placeholder" = "ID Matrix (mis. @bob:matrix.org atau bob)";
+"login_identity_server_info" = "Matrix menyediakan server identitas untuk melacak email mana, dll., milik ID Matrix mana. Hanya https://matrix.org yang saat ini ada.";
+"login_identity_server_title" = "URL server identitas:";
+"login_home_server_info" = "Homeserver Anda menyimpan semua pesan Anda dan data akun";
+"login_home_server_title" = "URL Homeserver:";
+"login_server_url_placeholder" = "URL (mis. https://matrix.org)";
+
+// Login Screen
+"login_create_account" = "Buat akun:";
+/* *********************** */
+/*      iOS specific       */
+/* *********************** */
+
+"matrix" = "Matrix";
+"auth_reset_password_error_not_found" = "Tidak ditemukan";
+"auth_reset_password_error_unauthorized" = "Tidak diotorisasi";
+"auth_invalid_user_name" = "Nama pengguna tidak valid";
+"ssl_only_accept" = "HANYA terima sertifikat jika administrator server telah mempublikasikan sidik jari yang cocok dengan sidik jari di atas.";
+"ssl_expected_existing_expl" = "Sertifikat ini telah berubah dari yang sebelumnya tepercaya menjadi yang tidak tepercaya. Servernya mungkin telah memperbarui sertifikatnya. Hubungi administrator server untuk sidik jari yang diharapkan.";
+"ssl_unexpected_existing_expl" = "Sertifikat ini telah berubah dari yang dipercaya oleh ponsel Anda. Ini SANGAT TIDAK BIASA. Anda disarankan untuk TIDAK MENERIMA sertifikat baru ini.";
+"ssl_cert_new_account_expl" = "Jika administrator server mengatakan bahwa ini diharapkan, pastikan bahwa sidik jari di bawah ini cocok dengan sidik jari yang disediakannya.";
+"ssl_cert_not_trust" = "Ini bisa berarti bahwa seseorang mencegat lalu lintas Anda, atau bahwa ponsel Anda tidak mempercayai sertifikat yang disediakan oleh server jarak jauh.";
+"ssl_could_not_verify" = "Tidak dapat memverifikasi identitas server jarak jauh.";
+"ssl_fingerprint_hash" = "Sidik Jari (%@):";
+"ssl_remain_offline" = "Abaikan";
+"ssl_logout_account" = "Keluar";
+
+// unrecognized SSL certificate
+"ssl_trust" = "Percayai";
+"call_transfer_to_user" = "Pindahkan ke %@";
+"call_consulting_with_user" = "Mengkonsultasi dengan %@";
+"call_video_with_user" = "Panggilan video dengan %@";
+"call_voice_with_user" = "Panggilan suara dengan %@";
+"call_more_actions_dialpad" = "Tombol penyetel";
+"call_more_actions_transfer" = "Pindahkan";
+"call_more_actions_audio_use_device" = "Speaker Perangkat";
+"call_more_actions_change_audio_device" = "Ubah Perangkat Audio";
+"call_more_actions_unhold" = "Lanjutkan";
+"call_more_actions_hold" = "Jeda";
+"call_holded" = "Anda menjeda panggilan ini";
+"call_remote_holded" = "%@ menjeda panggilan ini";
+"call_invite_expired" = "Undangan Panggilan Kedaluwarsa";
+"incoming_voice_call" = "Masuk Panggilan Suara";
+"incoming_video_call" = "Masuk Panggilan Video";
+"call_ended" = "Panggilan diakhiri";
+"call_ringing" = "Berdering…";
+
+// Settings keys 
+
+// call string
+"call_connecting" = "Menghubungkan…";
+"settings_config_user_id" = "ID Pengguna: %@";
+"settings_config_identity_server" = "Server identitas: %@";
+
+// gcm section 
+"settings_config_home_server" = "Homeserver: %@";
+"notification_settings_notify_all_other" = "Beritahu untuk semua pesan/ruangan lainnya";
+"notification_settings_by_default" = "Secara default...";
+"notification_settings_suppress_from_bots" = "Jangan beritahu saya tentang notifikasi dari bot";
+"notification_settings_receive_a_call" = "Beritahu saya ketika saya menerima panggilan";
+"notification_settings_people_join_leave_rooms" = "Beritahu saya ketika ada orang bergabung atau meninggalkan ruangan";
+"notification_settings_invite_to_a_new_room" = "Beritahu saya ketika saya diundang ke ruangan baru";
+"notification_settings_just_sent_to_me" = "Beritahu saya dengan suara tentang pesan yang baru saja dikirim ke saya";
+"notification_settings_contain_my_display_name" = "Beritahu saya dengan suara tentang pesan yang berisi nama tampilan saya";
+"notification_settings_contain_my_user_name" = "Beritahu saya dengan suara tentang pesan yang berisi nama pengguna saya";
+"notification_settings_other_alerts" = "Pemberitahuan Lainnya";
+"notification_settings_select_room" = "Pilih sebuah ruangan";
+"notification_settings_sender_hint" = "@pengguna:domain.com";
+"notification_settings_per_sender_notifications" = "Notifikasi per pengirim";
+"notification_settings_per_room_notifications" = "Notifikasi per ruangan";
+"notification_settings_custom_sound" = "Suara kustom";
+"notification_settings_highlight" = "Highlight";
+"notification_settings_word_to_match" = "kata untuk dicocokkan";
+"notification_settings_never_notify" = "Jangan diberitahu";
+"notification_settings_always_notify" = "Selalu diberitahu";
+"notification_settings_per_word_info" = "Kata-kata tidak cocok dengan huruf besar-kecil, dan mungkin menyertakan karakter pengganti *. Jadi:\nfoo cocok dengan string foo yang dikelilingi oleh pembatas kata (misalnya tanda baca dan spasi atau awal/akhir baris).\nfoo* cocok dengan kata apa pun yang dimulai foo.\n*foo* cocok dengan kata apa pun yang menyertakan 3 huruf foo.";
+"notification_settings_per_word_notifications" = "Notifikasi per kata";
+"notification_settings_global_info" = "Pengaturan notifikasi disimpan ke akun pengguna Anda dan dibagikan di antara semua client yang mendukungnya (termasuk pemberitahuan desktop).\n\nAturan diterapkan secara berurutan; aturan pertama yang cocok menentukan hasil untuk pesan.\nJadi: Notifikasi per kata lebih penting daripada notifikasi per ruangan yang lebih penting daripada notifikasi per pengirim.\nUntuk beberapa aturan dengan jenis yang sama, yang pertama dalam daftar yang cocok akan diprioritaskan.";
+"notification_settings_enable_notifications_warning" = "Semua notifikasi saat ini dinonaktifkan untuk semua perangkat.";
+"notification_settings_enable_notifications" = "Aktifkan notifikasi";
+
+// Notification settings screen 
+"notification_settings_disable_all" = "Nonaktifkan semua notifikasi";
+"settings_title_notifications" = "Notifikasi";
+
+// Settings screen 
+"settings_title_config" = "Konfigurasi";
+
+// members list Screen 
+
+// accounts list Screen 
+
+// image size selection 
+
+// invitation members list Screen 
+
+// room creation dialog Screen 
+
+// room info dialog Screen
+
+// room details dialog screen
+"room_details_title" = "Detail Ruangan";
+"login_error_must_start_http" = "URL harus dimulai dengan http[s]://";
+
+// Login Screen 
+"login_error_already_logged_in" = "Sudah masuk";
+"message_unsaved_changes" = "Ada perubahan yang belum disimpan. Meninggalkannya akan membuang mereka.";
+"unban" = "Hilangkan Cekalan";
+"ban" = "Cekal";
+"kick" = "Keluarkan";
+"num_members_other" = "%@ pengguna";
+"num_members_one" = "%@ pengguna";
+"membership_ban" = "Dicekal";
+"membership_leave" = "Keluar";
+"membership_invite" = "Diundang";
+"create_account" = "Buat Akun";
+"create_room" = "Buat Ruangan";
+"login" = "Masuk";
+
+// actions 
+"action_logout" = "Keluar";
+"delete" = "Hapus";
+"share" = "Bagikan";
+"redact" = "Hapus";
+"resend" = "Kirim Ulang";
+"copy_button_name" = "Salin";
+"send" = "Kirim";
+
+// Room Screen 
+
+// general errors 
+
+// Home Screen 
+
+// Last seen time 
+
+// call events 
+
+/* -*- 
+   Automatic localization for en
+
+   The following key/value pairs were extracted from the android i18n file:
+    /console/src/main/res/values/strings.xml.
+*/
+
+
+// titles 
+
+// button names 
+"ok" = "OK";
+"notice_room_history_visible_to_members_from_joined_point_by_you_for_dm" = "Anda membuat sejarah pesan di masa mendatang dapat dilihat oleh semuanya, sejak mereka bergabung.";
+"notice_room_history_visible_to_members_from_joined_point_by_you" = "Anda membuat sejarah ruangan di masa mendatang dapat dilihat oleh semua anggota ruang, sejak mereka bergabung.";
+"notice_encryption_enabled_unknown_algorithm_by_you" = "Anda mengaktifkan enkripsi ujung-ke-ujung (algoritma %@ tidak dikenal).";
+"notice_room_third_party_revoked_invite" = "%@ menghilangkan undangannya %@ untuk bergabung ke ruangan ini";
+"notice_room_third_party_revoked_invite_by_you" = "Anda menghilangkan undangannya %@ untuk bergabung ke ruangan ini";
+"account_email_validation_error" = "Tidak dapat memverifikasi alamat email. Silakan cek email Anda dan tekan tautannya yang ada. Setelah selesai, tekan lanjut";
+
+// contacts list screen 
+"invitation_message" = "Saya ingin berkomunikasi dengan Anda dengan Matrix. Silakan kunjungi ke websitenya di https://matrix.org untuk informasi selanjutnya.";
+"notice_room_history_visible_to_members_from_invited_point_by_you_for_dm" = "Anda membuat sejarah pesan di masa mendatang dapat dilihat oleh semuanya, sejak mereka diundang.";
+"notice_room_history_visible_to_members_from_invited_point_by_you" = "Anda membuat sejarah ruangan di masa mendatang dapat dilihat oleh semua anggota ruangan, sejak mereka diundang.";
+"notice_room_history_visible_to_members_by_you_for_dm" = "Anda membuat pesan di masa depan dapat dilihat oleh semua anggota ruangan.";
+"notice_room_history_visible_to_members_by_you" = "Anda membuat sejarah ruangan di masa mendatang dapat dilihat oleh semua anggota ruangan.";
+"notice_room_history_visible_to_anyone_by_you" = "Anda membuat sejarah ruangan di masa mendatang dapat dilihat oleh siapa saja.";
+"notice_redaction_by_you" = "Anda menghapus sebuah peristiwa (id: %@)";
+"notice_encryption_enabled_ok_by_you" = "Anda mengaktifkan enkripsi ujung-ke-ujung.";
+"notice_room_created_by_you_for_dm" = "Anda bergabung.";
+"notice_room_created_by_you" = "Anda membuat dan mengatur ruangan ini.";
+"notice_profile_change_redacted_by_you" = "Anda memperbarui profil Anda %@";
+"notice_event_redacted_by_you" = " oleh Anda";
+"notice_room_topic_removed_by_you" = "Anda menghilangkan topik ruangan ini";
+"notice_room_name_removed_by_you_for_dm" = "Anda menghilangkan nama ruangan ini";
+"notice_room_name_removed_by_you" = "Anda menghilangkan nama ruangan ini";
+"notice_conference_call_request_by_you" = "Anda telah meminta konferensi VoIP";
+"notice_declined_video_call_by_you" = "Anda menolak anggilannya";
+"notice_ended_video_call_by_you" = "Anda mengakhiri pangilannya";
+"notice_answered_video_call_by_you" = "Anda menjawab panggilannya";
+"notice_placed_video_call_by_you" = "Anda melakukan panggilan video";
+"notice_placed_voice_call_by_you" = "Anda melakukan panggilan suara";
+"notice_room_name_changed_by_you_for_dm" = "Anda mengubah nama ruangan ini ke%@.";
+"notice_room_name_changed_by_you" = "Anda mengubah nama ruangan ini ke %@.";
+"notice_topic_changed_by_you" = "Anda mengubah topik ruangan nini ke \"%@\".";
+"notice_display_name_removed_by_you" = "Anda menghilangkan nama tampilan Anda";
+"notice_display_name_changed_from_by_you" = "Anda mengubah nama tampilan Anda dari %@ ke %@";
+"notice_display_name_set_by_you" = "Anda mengubah nama tampilan Anda ke %@";
+"notice_avatar_url_changed_by_you" = "Anda mengubah avatar Anda";
+"notice_room_withdraw_by_you" = "Anda menghilangkan undangannya %@";
+"notice_room_ban_by_you" = "Anda mencekal %@";
+"notice_room_unban_by_you" = "Anda menghilangkan cekalan %@";
+"notice_room_kick_by_you" = "Anda mengeluarkan %@";
+"notice_room_reject_by_you" = "Anda menolak undangannya";
+"notice_room_leave_by_you" = "Anda keluar";
+"notice_room_join_by_you" = "Anda bergabung";
+"notice_room_third_party_revoked_invite_by_you_for_dm" = "Anda menghilangkan undangannya %@";
+"notice_room_third_party_registered_invite_by_you" = "Anda menerima undangan untuk %@";
+"notice_room_third_party_invite_by_you_for_dm" = "Anda mengundang %@";
+"notice_room_third_party_invite_by_you" = "Anda mengirim sebuah undangan ke @% untuk bergabung ke ruangan ini";
+"notice_room_invite_you" = "%@ mengundang Anda";
+
+// Notice Events with "You"
+"notice_room_invite_by_you" = "Anda mengundang %@";
+"notice_conference_call_finished" = "Konferensi VoIP diakhiri";
+"notice_conference_call_started" = "Konferensi VoIP dimulai";
+"notice_conference_call_request" = "%@ telah meminta konferensi VoIP";
+"notice_declined_video_call" = "%@ menolak panggilannya";
+"notice_ended_video_call" = "%@ mengakhiri panggilannya";
+"notice_answered_video_call" = "%@ menjawab panggilannya";
+"notice_placed_video_call" = "%@ melakukan panggilan video";
+"notice_placed_voice_call" = "%@ melakukan panggilan suara";
+"notice_room_name_changed_for_dm" = "%@ mengubah nama ruangan ini ke %@.";
+"notice_room_name_changed" = "%@ mengubah nama ruangan ini ke %@.";
+"notice_topic_changed" = "%@ mengubah topik ruangan ini ke \"%@\".";
+"notice_display_name_removed" = "%@ menghilangkan nama tampilannya";
+"notice_display_name_changed_from" = "%@ mengubah nama tampilannya dari %@ ke %@";
+"notice_display_name_set" = "%@ mengubah nama tampilannya ke %@";
+"notice_avatar_url_changed" = "%@ mengubah avatarnya";
+"notice_room_reason" = ". Alasan: %@";
+"notice_room_withdraw" = "%@ menghilangkan undangannya %@";
+"notice_room_ban" = "%@ mencekal %@";
+"notice_room_unban" = "%@ menghilangkan cekalan %@";
+"notice_room_kick" = "%@ mengeluarkan %@";
+"notice_room_reject" = "%@ menolak undangannya";
+"notice_room_leave" = "%@ keluar";
+"notice_room_join" = "%@ bergabung";
+"notice_room_third_party_revoked_invite_for_dm" = "%@ menghilangkan undangannya %@";
+"notice_room_third_party_registered_invite" = "%@ menerima undangan untuk %@";
+"notice_room_third_party_invite_for_dm" = "%@ mengundang %@";
+"notice_room_third_party_invite" = "%@ mengirim sebuah undangan ke %@ untuk bergabung ke ruangan ini";
+
+/* -*- 
+   Automatic localization for en
+
+   The following key/value pairs were extracted from the android i18n file:
+    /matrix-sdk/src/main/res/values/strings.xml.
+*/
+
+"notice_room_invite" = "%@ mengundang %@";
+"language_picker_default_language" = "Bawaan (%@)";
+
+// Language picker
+"language_picker_title" = "Pilih sebuah bahasa";
+
+// Country picker
+"country_picker_title" = "Pilih sebuah negara";
+"microphone_access_not_granted_for_voice_message" = "Pesan suara membutuhkan akses ke Mikrofon tetapi %@ tidak memiliki izin untuk menggunakannya";
+"local_contacts_access_discovery_warning" = "Untuk menemukan kontak Anda yang sudah menggunakan Matrix, %@ dapat mengirim alamat email dan nomor telepon di kontak Anda ke server identitas Matrix yang Anda pilih. Di mana saja yang didukung, data personal akan di-hash sebelum dikirim - mohon cek kebijakan privasi identitas server Anda untuk detail lainnya.";
+"local_contacts_access_discovery_warning_title" = "Penemuan pengguna";
+"local_contacts_access_not_granted" = "Penemuan pengguna dari kontak lokal membutuhkan akses ke kontak Anda tetapi %@ tidak memiliki izin untuk menggunakannya";
+"microphone_access_not_granted_for_call" = "Panggilan membutuhkan akses ke Mikrofon tetapi %@ tidak memiliki izin untuk menggunakannya";
+
+// Permissions
+"camera_access_not_granted_for_call" = "Panggilan video membutuhkan akses ke Kamera tetapi %@ tidak memiliki izin untuk menggunakannya";
+"ssl_homeserver_url" = "URL Homeserver: %@";
+"user_id_placeholder" = "misal: @bob:homeserver";
+"network_error_not_reachable" = "Mohon cek koneksi jaringan Anda";
+"power_level" = "Level Kekuatan";
+"public" = "Publik";
+"private" = "Privat";
+"default" = "bawaan";
+"not_supported_yet" = "Belum didukung";
+"error_common_message" = "Sebuah kesalahan terjadi. Coba lagi nanti.";
+"error" = "Gagal";
+"unsent" = "Belum Terkirim";
+"offline" = "offline";
+
+// Others
+"user_id_title" = "ID Pangguna:";
+"e2e_passphrase_create" = "Buat frasa sandi";
+"e2e_passphrase_not_match" = "Frasa sandi harus cocok";
+"e2e_passphrase_too_short" = "Frasa sandi terlalu pendek (Harus minimal %d karakter panjangnya)";
+"e2e_passphrase_empty" = "Frasa sandi tidak boleh kosong";
+"e2e_passphrase_confirm" = "Konfirmasi frasa sandi";
+"e2e_export" = "Ekspor";
+"e2e_export_prompt" = "Proses ini memungkinkan Anda untuk mengekspor kunci untuk pesan yang Anda telah terima di ruangan terenkripsi ke file lokal. Anda nanti akan dapat mengimpor filenya ke client Matrix lainnya di masa mendatang, supaya client itu juga bisa mendekripsi pesan yang terenkripsi.\nFile yang diekspor akan memungkinan siapa saja yang dapat membaca untuk mendekripsikan pesan terenkripsi apa saja yang Anda bisa lihat, jadi Anda harus berhati-hati untuk menyimpannya secara aman.";
+
+// E2E export
+"e2e_export_room_keys" = "Ekspor kunci ruangan";
+"e2e_passphrase_enter" = "Masukkan frasa sandi";
+"e2e_import" = "Impor";
+"e2e_import_prompt" = "Proses ini memungkinkan Anda untuk mengimpor kunci enkripsi yang Anda punya sebelumnya yang diekspor dari client Matrix lain. Anda nanti akan dapat mendekripsi pesan apa saja yang client lain dapat mendekripsinya.\nFile yang diekspor dilindungi dengan frasa sandi. Anda seharusnya masukkan frasa sandinya di sini, untuk mendekripsi filenya.";
+
+// E2E import
+"e2e_import_room_keys" = "Impor kunci ruangan";
+"format_time_d" = "h";
+"format_time_h" = "j";
+"format_time_m" = "m";
+
+// Time
+"format_time_s" = "d";
+"search_searching" = "Pencarian sedang dilakukan...";
+
+// Search
+"search_no_results" = "Tidak Ada Hasil";
+"group_section" = "Grup";
+
+// Groups
+"group_invite_section" = "Undangan";
+"contact_local_contacts" = "Kontak Local";
+
+// Contacts
+"contact_mx_users" = "Pengguna Matrix";
+"attachment_e2e_keys_import" = "Impor...";
+"attachment_e2e_keys_file_prompt" = "File ini berisi kunci enkripsi yang diimpor dari client Matrix lain.\nApakah Anda ingin menampilkan konten file atau impor kunci yang berisi?";
+"attachment_multiselection_original" = "Ukuran Sebenarnya";
+"attachment_multiselection_size_prompt" = "Apakah Anda ingin mengirim gambarnya sebagai:";
+"attachment_cancel_upload" = "Batalkan unggahannya?";
+"attachment_cancel_download" = "Batalkan unduhannya?";
+"attachment_large_with_resolution" = "Besar %@ (~%@)";
+"attachment_medium_with_resolution" = "Sedang %@ (~%@)";
+"attachment_small_with_resolution" = "Kecil %@ (~%@)";
+"attachment_large" = "Besar (~%@)";
+"attachment_medium" = "Sedang (~%@)";
+"attachment_small" = "Kecil (~%@)";
+"attachment_original" = "Ukuran Sebenarnya (%@)";
+"attachment_size_prompt_message" = "Anda dapat menonaktifkannya di pengaturan.";
+"attachment_size_prompt_title" = "Konfirmasi ukuran untuk dikirim";
+
+// Attachment
+"attachment_size_prompt" = "Apakah Anda ingin mengirimnya sebagai:";
+"room_member_power_level_prompt" = "Anda tidak akan lagi membatalkan perubahan ini ketika Anda mempromosikan penggunanya untuk memiliki tingkat daya yang sama dengan Anda sendiri.\nApakah Anda yakin?";
+
+// Room members
+"room_member_ignore_prompt" = "Apakah Anda yakin untuk menyembunyikan semua pesan dari pengguna ini?";
+"message_reply_to_message_to_reply_to_prefix" = "Membalas ke";
+"message_reply_to_sender_sent_a_file" = "mengirim sebuah file.";
+"message_reply_to_sender_sent_a_voice_message" = "mengirim sebuah pesan suara.";
+"message_reply_to_sender_sent_an_audio_file" = "mengirim sebuah file audio.";
+"message_reply_to_sender_sent_a_video" = "mengirim sebuah video.";
+
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "mengirim sebuah gambar.";
+"room_no_conference_call_in_encrypted_rooms" = "Panggilan konferensi tidak didukung di ruangan terenkripsi";
+"room_no_power_to_create_conference_call" = "Anda membutuhkan izin untuk mengundang untuk memulai konferensi di ruangan ini";
+"room_left_for_dm" = "Anda keluar";
+"room_left" = "Anda meninggalkan ruangan ini";
+"room_error_timeline_event_not_found" = "Aplikasi ini sedang mencoba untuk memuat titik tertenu di linimasa ruangan ini tetapi tidak dapat menemukannya";
+"room_error_timeline_event_not_found_title" = "Gagal untuk memuat posisi linimasa";
+"room_error_cannot_load_timeline" = "Gagal untuk memuat linimasa";
+"room_error_topic_edition_not_authorized" = "Anda tidak diizinkan untuk mengubah topik ruangan ini";
+"room_error_name_edition_not_authorized" = "Anda tidak diizinkan untuk mengubah nama ruangan ini";
+"room_error_join_failed_empty_room" = "Saat ini tidak mungkin untuk bergabung ke ruangan yang kosong.";
+"room_error_join_failed_title" = "Gagal untuk bergabung ke ruangan";
+
+// Room
+"room_please_select" = "Silakan pilih sebuah ruangan";
+"room_creation_participants_placeholder" = "(mis. @bob:homeserver1; @john:homeserver2...)";
+"room_creation_participants_title" = "Anggota:";
+"room_creation_alias_placeholder_with_homeserver" = "(mis. #foo%@)";
+"room_creation_alias_placeholder" = "(mis. #foo:example.org)";
+"room_creation_alias_title" = "Alias ruangan:";
+"room_creation_name_placeholder" = "(mis. grupMakanSiang)";
+
+// Room creation
+"room_creation_name_title" = "Nama ruangan:";
+"account_error_push_not_allowed" = "Notifikasi tidak diizinkan";
+"account_error_msisdn_wrong_description" = "Ini sepertinya bukan nomor telepon yang valid";
+"account_error_msisdn_wrong_title" = "Nomor Telepon Tidak Valid";
+"account_error_email_wrong_description" = "Ini sepertinya bukan alamat email yang valid";
+"account_error_email_wrong_title" = "Alamat Email Tidak Valid";
+"account_error_matrix_session_is_not_opened" = "Sesi Matrix tidak dibuka";
+"account_error_picture_change_failed" = "Penggantian gambar gagal";
+"account_error_display_name_change_failed" = "Penggantian nama tampilan gagal";
+"account_msisdn_validation_error" = "Tidak dapat memverifikasi nomor telepon.";
+"account_msisdn_validation_message" = "Kami telah mengirim sebuah SMS dengan kode aktivasi. Silakan masukkan kodenya di bawah.";
+"account_msisdn_validation_title" = "Menunggu Verifikasi";
+"account_email_validation_message" = "Silakan cek email Anda dan tekan tautannya yang ada. Setelah selesai, tekan lanjut.";
+"account_email_validation_title" = "Menunggu Verifikasi";
+"account_linked_emails" = "Email yang tertaut";
+"account_link_email" = "Tautkan Email";
+
+// Account
+"account_save_changes" = "Simpan perubahan";
+"room_event_encryption_verify_ok" = "Verifikasi";
+"room_event_encryption_verify_message" = "Untuk memverifikasi bahwa sesi ini dapat dipercaya, harap hubungi pemiliknya menggunakan cara lain (misalnya secara langsung atau melalui panggilan telepon) dan tanyakan apakah kunci yang mereka lihat di Pengaturan Pengguna untuk sesi ini cocok dengan kunci di bawah ini:\n\n\tNama sesi: %@\n\tID sesi: %@\n\tKunci sesi: %@\n\nJika cocok, tekan tombol verifikasi di bawah. Jika tidak, maka orang lain mencegat sesi ini dan Anda mungkin ingin menekan tombol daftar hitam sebagai gantinya.\n\nDi masa yang mendatang proses verifikasi ini akan semakin canggih.";
+"room_event_encryption_verify_title" = "Verifikasi sesi\n\n";
+"room_event_encryption_info_unblock" = "Hilangkan dari daftar hitam";
+"room_event_encryption_info_block" = "Tambahkan ke daftar hitam";
+"room_event_encryption_info_unverify" = "Hilangkan verifikasi";
+"room_event_encryption_info_verify" = "Verifikasi...";
+"room_event_encryption_info_device_blocked" = "Di dalam daftar hitam";
+"room_event_encryption_info_device_not_verified" = "TIDAK terverifikasi";
+"room_event_encryption_info_device_verified" = "Terverifikasi";
+"room_event_encryption_info_device_fingerprint" = "Sidik jari Ed25519\n";
+"room_event_encryption_info_device_verification" = "Verifikasi\n";
+"room_event_encryption_info_device_id" = "ID\n";
+"room_event_encryption_info_device_name" = "Nama Publik\n";
+"room_event_encryption_info_device_unknown" = "sesi tidak dikenal\n";
+"room_event_encryption_info_device" = "\nInformasi sesi pengirim\n";
+"room_event_encryption_info_event_none" = "tidak ada";
+"room_event_encryption_info_event_unencrypted" = "tidak terenkripsi";
+"room_event_encryption_info_event_decryption_error" = "Kesalahan saat mendekripsi\n";
+"room_event_encryption_info_event_session_id" = "ID Sesi\n";
+"room_event_encryption_info_event_algorithm" = "Algoritma\n";
+"room_event_encryption_info_event_fingerprint_key" = "Mendapatkan kunci sidik jari Ed25519\n";
+"room_event_encryption_info_event_identity_key" = "Kunci identitas Curve25519\n";
+"room_event_encryption_info_event_user_id" = "ID Pengguna\n";
+"room_event_encryption_info_event" = "Informasi peristiwa\n";
+
+// Encryption information
+"room_event_encryption_info_title" = "Informasi enkripsi ujung-ke-ujung\n\n";
+"device_details_delete_prompt_message" = "Operasi ini membutuhkan otentikasi tambahan.\nUntuk melanjutkan, silakan masukkan kata sandi Anda.";
+"device_details_delete_prompt_title" = "Otentikasi";
+"device_details_rename_prompt_message" = "Nama publik sesi dapat dilihat oleh orang yang berkomunikasi dengan Anda";
+"device_details_rename_prompt_title" = "Nama Sesi";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_last_seen" = "Terakhir dilihat\n";
+"device_details_identifier" = "ID\n";
+"device_details_name" = "Nama Publik\n";
+
+// Devices
+"device_details_title" = "Informasi sesi\n";
+"notification_settings_room_rule_title" = "Ruangan: '%@'";
+"settings_enter_validation_token_for" = "Masukkan token validasi untuk %@:";
+"settings_enable_push_notifications" = "Aktifkan notifikasi push";
+"settings_enable_inapp_notifications" = "Aktifkan notifikasi di dalam aplikasi";
+
+// Settings
+"settings" = "Pengaturan";
+"room_displayname_all_other_members_left" = "%@ (Keluar)";
+"room_displayname_more_than_two_members" = "%@ dan %@ lainnya";
+"room_displayname_two_members" = "%@ dan %@";
+
+// room display name
+"room_displayname_empty_room" = "Ruangan kosong";
+"notice_in_reply_to" = "Membalas ke";
+"notice_sticker" = "stiker";
+"notice_crypto_error_unknown_inbound_session_id" = "Sesi pengirim belum mengirim kami kunci untuk pesan ini.";
+"notice_crypto_unable_to_decrypt" = "** Tidak dapat mendekripsi: %@ **";
+"notice_room_history_visible_to_members_from_joined_point_for_dm" = "%@ membuat pesan di masa mendatang dapat dilihat oleh semuanya, sejak mereka bergabung.";
+"notice_room_history_visible_to_members_from_invited_point_for_dm" = "%@ membuat sejarah pesan di masa mendatang dapat dilihat oleh semuanya, sejak mereka diundang.";
+"notice_room_history_visible_to_members_from_joined_point" = "%@ membuat sejarah ruangan di masa mendatang dapat dilihat oleh semua anggota ruangan, sejak mereka bergabung.";
+"notice_room_history_visible_to_anyone" = "%@ membuat sejarah ruangan di masa mendatang dapat dilihat oleh siapa saja.";
+"notice_room_history_visible_to_members" = "%@ membuat sejarah ruangan di masa mendatang dapat dilihat oleh semua anggota ruangan.";
+"notice_room_history_visible_to_members_for_dm" = "%@ membuat semua pesan di masa mendatang dapat dilihat oleh semua anggota ruangan.";
+"notice_room_history_visible_to_members_from_invited_point" = "%@ membuat sejarah ruangan di masa mendatang dapat dilihat oleh semua anggota ruang, sejak mereka diundang.";
+"notice_error_unknown_event_type" = "Tipe peristiwa yang tidak dikenal";
+"notice_error_unexpected_event" = "Peristiwa yang tidak terduga";
+"notice_error_unsupported_event" = "Peristiwa yang tidak didukung";
+"notice_redaction" = "%@ menghapus sebuah peristiwa (id: %@)";
+"notice_feedback" = "Peristiwa umpan balik (id: %@): %@";
+"notice_unsupported_attachment" = "Lampiran yang tidak didukung: %@";
+"notice_invalid_attachment" = "lampiran tidak valid";
+"notice_file_attachment" = "lampiran file";
+"notice_location_attachment" = "lampiran lokasi";
+"notice_video_attachment" = "lampiran video";
+"notice_audio_attachment" = "lampiran audio";
+"notice_image_attachment" = "lampiran gambar";
+"notice_encryption_enabled_unknown_algorithm" = "%1$@ mengaktifkan enkripsi ujung-ke-ujung (algoritma %2$@ tidak dikenal).";
+"notice_encryption_enabled_ok" = "%@ mengaktifkan enkripsi ujung-ke-ujung.";
+"notice_encrypted_message" = "Pesan terenkripsi";
+"notice_room_related_groups" = "Grup yang terkait dengan ruangan ini adalah: %@";
+"notice_room_aliases_for_dm" = "Aliasnya adalah: %@";
+"notice_room_aliases" = "Alias ruangannya adalah: %@";
+"notice_room_power_level_event_requirement" = "Tingkat daya minimum yang terkait dengan peristiwa adalah:";
+"notice_room_power_level_acting_requirement" = "Tingkat daya minimum yang harus dimiliki pengguna sebelum bertindak adalah:";
+"attachment_unsupported_preview_title" = "Tidak dapat ditampilkan";
+"attachment_unsupported_preview_message" = "Tipe file ini tidak didukung.";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/is.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/is.lproj/MatrixKit.strings
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/is.lproj/MatrixKit.strings
@@ -0,0 +1 @@
+
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/it.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/it.lproj/MatrixKit.strings
new file mode 100644
index 000000000..6049a7351
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/it.lproj/MatrixKit.strings
@@ -0,0 +1,480 @@
+"matrix" = "Matrix";
+// Login Screen
+"login_create_account" = "Nuovo utente:";
+"login_server_url_placeholder" = "URL (es. https://matrix.org)";
+"login_home_server_title" = "URL homeserver:";
+"login_home_server_info" = "Lo storico delle conversazioni e i dati utente sono salvati sul tuo homeserver";
+"login_identity_server_title" = "URL del server d'identità:";
+"login_identity_server_info" = "Matrix fornisce dei server d'identità per associare i tuoi recapiti (es. l'indirizzo email) al tuo ID Matrix. Attualmente esiste solo il server https://matrix.org.";
+"login_user_id_placeholder" = "ID Matrix (es. @gianni:matrix.org o gianni)";
+"login_password_placeholder" = "Password";
+"login_optional_field" = "opzionale";
+"login_display_name_placeholder" = "Nome completo (es. Gianni Rossi)";
+"login_email_info" = "Indicare un indirizzo email consente ad altri utenti di trovarti facilmente in Matrix, e ti da modo di resettare la password in caso di necessità.";
+"login_email_placeholder" = "Indirizzo email";
+"login_prompt_email_token" = "Inserisci il token di validazione della tua email:";
+"login_error_title" = "Accesso fallito";
+"login_error_no_login_flow" = "Impossibile ottenere i dati di autenticazione da questo homeserver";
+"login_error_do_not_support_login_flows" = "Al momento non è supportato alcuno dei flussi di accesso definiti da questo homeserver";
+"login_error_registration_is_not_supported" = "La registrazione non è consentita al momento";
+"login_error_forbidden" = "Nome utente o password errati";
+"login_error_unknown_token" = "Il token di accesso inserito non è stato riconosciuto";
+"login_error_bad_json" = "JSON malformato";
+"login_error_not_json" = "Contenuto JSON non valido";
+"login_error_limit_exceeded" = "Limite di richieste superato";
+"login_error_user_in_use" = "Questo nome utente è già in uso";
+"login_error_login_email_not_yet" = "Il link inviato via email che non è stata ancora visitato";
+"login_use_fallback" = "Usa la pagina alternativa";
+"login_leave_fallback" = "Annulla";
+"login_invalid_param" = "Parametro non valido";
+"register_error_title" = "Registrazione fallita";
+"login_error_forgot_password_is_not_supported" = "Le password dimenticate non sono supportate";
+"notice_room_join_rule" = "Regole per accedere: %@";
+// contacts list screen 
+"invitation_message" = "Vorrei comunicare con te usando Matrix. Visita il sito web http://matrix.org per avere maggiori informazioni.";
+"login_mobile_device" = "Mobile";
+"login_tablet_device" = "Tablet";
+"login_desktop_device" = "Desktop";
+"login_error_resource_limit_exceeded_title" = "Superato il limite delle risorse";
+"login_error_resource_limit_exceeded_message_default" = "Questo homeserver ha superato uno dei suoi limiti di risorsa.";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "Questo homeserver ha raggiunto il limite massimo di utenti attivi in un mese.";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nContatta l’amministratore del sistema per continuare a usare questo servizio.";
+"login_error_resource_limit_exceeded_contact_button" = "Contatta l’amministratore";
+// Action
+"no" = "No";
+"yes" = "Si";
+"abort" = "Annulla";
+"back" = "Indietro";
+"close" = "Chiudi";
+"continue" = "Continua";
+"discard" = "Annulla";
+"dismiss" = "Annulla";
+"retry" = "Riprova";
+"sign_up" = "Registrati";
+"submit" = "Invia";
+"submit_code" = "Invia codice";
+"set_power_level" = "Imposta livello di accesso";
+"set_default_power_level" = "Ripristina livello di accesso";
+"set_moderator" = "Imposta moderatore";
+"set_admin" = "Imposta amministratore";
+"start_chat" = "Nuova chat";
+"start_voice_call" = "Nuova telefonata";
+"start_video_call" = "Nuova videochiamata";
+"mention" = "Menziona";
+"select_account" = "Seleziona un utente";
+"attach_media" = "Allega contenuto multimediale";
+"capture_media" = "Riprendi foto/video";
+"invite_user" = "Invita un utente Matrix";
+"reset_to_default" = "Ripristina predefinito";
+"resend_message" = "Reinvia messaggio";
+"select_all" = "Seleziona tutto";
+"cancel_upload" = "Annulla caricamento";
+"cancel_download" = "Annulla scaricamento";
+"show_details" = "Mostra dettagli";
+"answer_call" = "Rispondi a chiamata";
+"reject_call" = "Rifiuta chiamata";
+"end_call" = "Chiudi chiamata";
+"ignore" = "Ignora";
+"unignore" = "Non ignorare";
+// Events formatter
+"notice_avatar_changed_too" = "(anche l’avatar è cambiato)";
+"notice_room_name_removed" = "%@ ha cancellato il nome del canale";
+"notice_room_topic_removed" = "%@ ha cancellato il titolo";
+"notice_event_redacted" = "<modificato%@>";
+"notice_event_redacted_by" = " da %@";
+"notice_event_redacted_reason" = " [motivo: %@]";
+"notice_profile_change_redacted" = "%@ ha aggiornato il suo profilo %@";
+"notice_room_created" = "%@ ha creato e configurato la stanza.";
+"notice_room_power_level_intro" = "Il livello di accesso dei partecipanti è:";
+"notice_room_power_level_acting_requirement" = "Il livello minimo di accesso per partecipare è:";
+"notice_room_power_level_event_requirement" = "Il livello minimo di accesso per visualizzare eventi è:";
+"notice_room_aliases" = "Gli alias di questo canale sono: %@";
+"notice_room_related_groups" = "I gruppi associati a questo canale sono: %@";
+"notice_encrypted_message" = "Messaggio criptato";
+"notice_encryption_enabled" = "%@ ha attivato la crittografia end-to-end (algoritmo %@)";
+"notice_image_attachment" = "allegato immagine";
+"notice_audio_attachment" = "allegato audio";
+"notice_video_attachment" = "allegato video";
+"notice_location_attachment" = "allegato posizione";
+"notice_file_attachment" = "allegato file";
+"notice_invalid_attachment" = "allegato non valido";
+"notice_unsupported_attachment" = "Allegato non supportato: %@";
+"notice_feedback" = "Evento di feedback (id: %@): %@";
+"notice_redaction" = "%@ ha modificato un evento (id: %@)";
+"notice_error_unsupported_event" = "Evento non supportato";
+"notice_error_unexpected_event" = "Evento inatteso";
+"notice_error_unknown_event_type" = "Tipo di evento sconosciuto";
+"notice_room_history_visible_to_anyone" = "%@ ha permesso a chiunque di visualizzare lo storico della conversazione.";
+"notice_room_history_visible_to_members" = "%@ ha permesso di visualizzare lo storico della conversazione solo ai partecipanti.";
+"notice_room_history_visible_to_members_from_invited_point" = "%@ ha permesso di visualizzare lo storico della conversazione solo ai partecipanti, dal momento del loro invito.";
+"notice_room_history_visible_to_members_from_joined_point" = "%@ ha permesso di visualizzare lo storico della conversazione solo ai partecipanti, dal momento della loro entrata.";
+"notice_crypto_unable_to_decrypt" = "** Impossibile decriptare: %@ **";
+"notice_crypto_error_unknown_inbound_session_id" = "La sessione del mittente non ci ha inviato le chiavi per questo messaggio.";
+"notice_sticker" = "etichetta";
+"notice_in_reply_to" = "In risposta a";
+// room display name
+"room_displayname_empty_room" = "Canale senza partecipanti";
+"room_displayname_two_members" = "%@ e %@";
+"room_displayname_more_than_two_members" = "%@ e %@ altri";
+// Settings
+"settings" = "Impostazioni";
+"settings_enable_inapp_notifications" = "Abilita notifiche In-App";
+"settings_enable_push_notifications" = "Abilita notifiche push";
+"settings_enter_validation_token_for" = "Inserisci token di validazione per %@:";
+"notification_settings_room_rule_title" = "Canale: '%@'";
+// Devices
+"device_details_title" = "Informazioni sessione\n";
+"device_details_name" = "Nome pubblico\n";
+"device_details_identifier" = "ID\n";
+"device_details_last_seen" = "Ultimo contatto\n";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_rename_prompt_title" = "Nome sessione";
+"device_details_rename_prompt_message" = "Il nome pubblico della sessione è visibile alle persone con cui comunichi";
+"device_details_delete_prompt_title" = "Autenticazione";
+"device_details_delete_prompt_message" = "Questa operazione necessita di ulteriore autenticazione.\nInserisci la tua password per procedere.";
+// Encryption information
+"room_event_encryption_info_title" = "Informazioni crittografia End-to-end\n\n";
+"room_event_encryption_info_event" = "Informazioni evento\n";
+"room_event_encryption_info_event_user_id" = "ID utente:\n";
+"room_event_encryption_info_event_identity_key" = "Chiave di identificazione Curve25519\n";
+"room_event_encryption_info_event_fingerprint_key" = "Richiamata chiave per l’impronta Ed25519\n";
+"room_event_encryption_info_event_algorithm" = "Algoritmo\n";
+"room_event_encryption_info_event_session_id" = "ID sessione\n";
+"room_event_encryption_info_event_decryption_error" = "Errore decrittazione\n";
+"room_event_encryption_info_event_unencrypted" = "non criptato";
+"room_event_encryption_info_event_none" = "nessuna";
+"room_event_encryption_info_device" = "\nInformazioni sessione mittente\n";
+"room_event_encryption_info_device_unknown" = "sessione sconosciuta\n";
+"room_event_encryption_info_device_name" = "Nome pubblico\n";
+"room_event_encryption_info_device_id" = "ID\n";
+"room_event_encryption_info_device_verification" = "Verifica\n";
+"room_event_encryption_info_device_fingerprint" = "Impronta Ed25519\n";
+"room_event_encryption_info_device_verified" = "Verificato";
+"room_event_encryption_info_device_not_verified" = "NON verificato";
+"room_event_encryption_info_device_blocked" = "Bloccato";
+"room_event_encryption_info_verify" = "Verifica...";
+"room_event_encryption_info_unverify" = "Annulla verifica";
+"room_event_encryption_info_block" = "Bloccato";
+"room_event_encryption_info_unblock" = "Sbloccato";
+"room_event_encryption_verify_title" = "Verifica sessione\n\n";
+"room_event_encryption_verify_message" = "Per verificare che questa sessione possa essere fidata, si prega di contattare il suo proprietario in altro modo (es. di persona o via telefonica) e chiedergli se la chiave che lui vede nelle Impostazioni Utente per la sessione sia uguale a questa:\n\n\tNome sessione: %@\n\tID sessione: %@\n\tChiave sessione: %@\n\nSe le chiavi sono identiche, premere il pulsante di verifica qui sotto. Se non lo sono, allora quancun altro sta intercettando questa sessione e probabilmente dovresti bloccarlo.\n\nIn futuro questo processo di verifica sarà più sofisticato.";
+"room_event_encryption_verify_ok" = "Verifica";
+// Account
+"account_save_changes" = "Salva cambiamenti";
+"account_link_email" = "Collegamento email";
+"account_linked_emails" = "Indirizzi email collegati";
+"account_email_validation_title" = "Verifica in corso";
+"account_email_validation_message" = "Controlla l'email e clicca sul collegamento che contiene. Dopo averlo fatto, clicca su continua.";
+"account_email_validation_error" = "Impossibile verificare l'indirizzo email. Controlla l'email e clicca sul collegamento che contiene. Dopo averlo fatto, clicca su continua";
+"account_msisdn_validation_title" = "Verifica in corso";
+"account_msisdn_validation_message" = "Abbiamo inviato un SMS con un codice di attivazione. Inserisci il codice qui sotto.";
+"account_msisdn_validation_error" = "Impossibile verificare il numero di telefono.";
+"account_error_display_name_change_failed" = "Cambio del nome completo fallito";
+"account_error_picture_change_failed" = "Cambio dell'immagine fallito";
+"account_error_matrix_session_is_not_opened" = "La sessione Matrix non è attiva";
+"account_error_email_wrong_title" = "Indirizzo email non valido";
+"account_error_email_wrong_description" = "Questo non sembra essere un indirizzo email valido";
+"account_error_msisdn_wrong_title" = "Numero di telefono non valido";
+"account_error_msisdn_wrong_description" = "Questo non sembra essere un numero telefonico valido";
+"account_error_push_not_allowed" = "Notifiche non permesse";
+// Room creation
+"room_creation_name_title" = "Nome canale:";
+"room_creation_name_placeholder" = "(es. gruppoPranzo)";
+"room_creation_alias_title" = "Alias canale:";
+"room_creation_alias_placeholder" = "(es. #blah:dominio.it)";
+"room_creation_alias_placeholder_with_homeserver" = "(es. #blah%@)";
+"room_creation_participants_title" = "Partecipanti:";
+"room_creation_participants_placeholder" = "(e.g. @gianni:homeserver1; @alice:homeserver2...)";
+// Room
+"room_please_select" = "Seleziona un canale";
+"room_error_join_failed_title" = "Accesso al canale fallito";
+"room_error_join_failed_empty_room" = "Al momento non è possibile entrare in una stanza vuota.";
+"room_error_name_edition_not_authorized" = "Non sei autorizzato a modificare il nome di questo canale";
+"room_error_topic_edition_not_authorized" = "Non sei autorizzato a modificare l'argomento di questo canale";
+"room_error_cannot_load_timeline" = "Caricamento storico dei messaggi fallito";
+"room_error_timeline_event_not_found_title" = "Caricamento della posizione nello storico fallito";
+"room_error_timeline_event_not_found" = "L'applicazione ha cercato di caricare un punto specifico dello storico dei messaggi in questo canale, ma non è riuscita a trovarlo";
+"room_left" = "Sei uscito dalla stanza";
+"room_no_power_to_create_conference_call" = "Hai bisogno del permesso per invitare a iniziare una conferenza in questo canale";
+"room_no_conference_call_in_encrypted_rooms" = "Le chiamate in conferenza non sono supportate nei canali criptati";
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "immagine inviata.";
+"message_reply_to_sender_sent_a_video" = "video inviato.";
+"message_reply_to_sender_sent_an_audio_file" = "file audio inviato.";
+"message_reply_to_sender_sent_a_file" = "file inviato.";
+"message_reply_to_message_to_reply_to_prefix" = "In risposta a";
+// Room members
+"room_member_ignore_prompt" = "Sei sicuro di voler nascondere tutti i messaggi da questo utente?";
+"room_member_power_level_prompt" = "Non potrai annullare questa modifica perché stai innalzando i permessi dell'utente al tuo stesso livello di accesso.\nSei sicuro?";
+// Attachment
+"attachment_size_prompt" = "Vuoi inviare come:";
+"attachment_original" = "Dim. effettiva (%@)";
+"attachment_small" = "Piccolo (~%@)";
+"attachment_medium" = "Medio (~%@)";
+"attachment_large" = "Grande (~%@)";
+"attachment_cancel_download" = "Interrompi scaricamento?";
+"attachment_cancel_upload" = "Interrompi caricamento?";
+"attachment_multiselection_size_prompt" = "Vuoi inviare le immagini come:";
+"attachment_multiselection_original" = "Originali";
+"attachment_e2e_keys_file_prompt" = "Questo file contiene le chiavi crittografiche esportate da un client Matrix.\nVuoi visualizzarlo o importare le chiavi che contiene?";
+"attachment_e2e_keys_import" = "Importa...";
+// Contacts
+"contact_mx_users" = "Utenti Matrix";
+"contact_local_contacts" = "Contatti locali";
+// Groups
+"group_invite_section" = "Inviti";
+"group_section" = "Gruppi";
+// Search
+"search_no_results" = "Nessun risultato";
+"search_searching" = "Ricerca in corso...";
+// Time
+"format_time_s" = "s";
+"format_time_m" = "m";
+"format_time_h" = "h";
+"format_time_d" = "d";
+// E2E import
+"e2e_import_room_keys" = "Importa le chiavi del canale";
+"e2e_import_prompt" = "Questo processo ti consente di importare le chiavi di crittografia che hai precedentemente esportato da un altro client Matrix. Sarai quindi in grado di decifrare gli stessi messaggi leggibili dall'altro client.\nIl file esportato è protetto da password. Devi inserirla qui per decifrare il file.";
+"e2e_import" = "Importa";
+"e2e_passphrase_enter" = "Inserisci password";
+// E2E export
+"e2e_export_room_keys" = "Esporta chiavi del canale";
+"e2e_export_prompt" = "Questo processo consente di esportare in un file locale le chiavi per leggere i messaggi ricevuti in canali criptati. Sarai quindi in grado di importare il file in un altro client Matrix, in modo da rendergli possibile decriptare quei messaggi in futuro.\nIl file esportato consentirà a chiunque di decriptare tutti i messaggi che puoi leggere, quindi dovresti tenerlo al sicuro.";
+"e2e_export" = "Esporta";
+"e2e_passphrase_confirm" = "Conferma password di accesso";
+"e2e_passphrase_empty" = "La password di accesso non può essere vuota";
+"e2e_passphrase_not_match" = "Le password di accesso devono corrispondere";
+"e2e_passphrase_create" = "Crea password di accesso";
+// Others
+"user_id_title" = "ID utente:";
+"offline" = "non in linea";
+"unsent" = "Non inviato";
+"error" = "Errore";
+"error_common_message" = "Si è verificato un errore. Riprova più tardi.";
+"not_supported_yet" = "Non ancora supportato";
+"default" = "predefinito";
+"private" = "Privato";
+"public" = "Pubblico";
+"power_level" = "Livello di accesso";
+"network_error_not_reachable" = "Verifica di essere connesso alla rete";
+"user_id_placeholder" = "es.: @gianni@homeserver";
+"ssl_homeserver_url" = "URL homeserver: %@";
+// Permissions
+"camera_access_not_granted_for_call" = "Le video chiamate necessitano di accesso alla videocamera ma %@ non ha il permesso di usarla";
+"microphone_access_not_granted_for_call" = "Le telefonate necessitano l'accesso al microfono, ma %@ non ha il permesso di usarlo";
+"local_contacts_access_not_granted" = "La ricerca degli utenti fra i contatti locali necessita l'accesso alla rubrica, ma %@ non ha il permesso di usarla";
+"local_contacts_access_discovery_warning_title" = "Ricerca utenti";
+"local_contacts_access_discovery_warning" = "Per scoprire chi fra i tuoi contatti sta già usando Matrix, %@ può inviare gli indirizzi email e i numeri telefonici della tua rubrica al tuo server d'identità Matrix. Se possibile, i dati personali vengono codificati prima di essere inviati - controlla la politica di riservatezza del tuo server d'identità per maggiori dettagli.";
+// Country picker
+"country_picker_title" = "Scegli un paese";
+// Language picker
+"language_picker_title" = "Scegli una lingua";
+"language_picker_default_language" = "Predefinito (%@)";
+"notice_room_invite" = "%@ invitato %@";
+"notice_room_third_party_invite" = "%@ ha invitato %@ a unirsi al canale";
+"notice_room_third_party_registered_invite" = "%@ ha accettato l'invito per %@";
+"notice_room_third_party_revoked_invite" = "%@ ha ritirato l'invito per %@ a unirsi al canale";
+"notice_room_join" = "%@ si è unito al canale";
+"notice_room_leave" = "%@ ha lasciato il canale";
+"notice_room_reject" = "%@ ha rifiutato l'invito";
+"notice_room_kick" = "%@ ha espulso %@";
+"notice_room_unban" = "%@ ha revocato il divieto di accesso a %@";
+"notice_room_ban" = "%@ ha vietato l'accesso a %@";
+"notice_room_withdraw" = "%@ ha ritirato l'invito di %@";
+"notice_room_reason" = ". Motivo: %@";
+"notice_avatar_url_changed" = "%@ ha modificato la sua immagine";
+"notice_display_name_set" = "%@ ha impostato il suo nome in %@";
+"notice_display_name_changed_from" = "%@ ha cambiato il suo nome da %@ a %@";
+"notice_display_name_removed" = "%@ ha rimosso il suo nome";
+"notice_topic_changed" = "%@ ha cambiato l'argomento in \"%@\".";
+"notice_room_name_changed" = "%@ ha cambiato il nome della stanza in %@.";
+"notice_placed_voice_call" = "%@ ha effettuato una telefonata";
+"notice_placed_video_call" = "%@ ha iniziato una videochiamata";
+"notice_answered_video_call" = "%@ ha risposto alla chiamata";
+"notice_ended_video_call" = "%@ ha terminato la chiamata";
+"notice_conference_call_request" = "%@ ha richiesto una conferenza VoIP";
+"notice_conference_call_started" = "Conferenza VoIP iniziata";
+"notice_conference_call_finished" = "Conferenza VoIP terminata";
+// button names 
+"ok" = "OK";
+"cancel" = "Annulla";
+"save" = "Salva";
+"leave" = "Esci";
+"send" = "Invia";
+"copy_button_name" = "Copia";
+"resend" = "Invia di nuovo";
+"redact" = "Cancella";
+"share" = "Condividi";
+"delete" = "Elimina";
+"view" = "Visualizza";
+// actions 
+"action_logout" = "Esci";
+"create_room" = "Crea un canale";
+"login" = "Entra";
+"create_account" = "Crea utente";
+"membership_invite" = "Invitati";
+"membership_leave" = "Uscito";
+"membership_ban" = "Espulso";
+"num_members_one" = "%@ utente";
+"num_members_other" = "%@ utenti";
+"invite" = "Invita";
+"kick" = "Espelli";
+"ban" = "Vieta accesso";
+"unban" = "Consenti accesso";
+"message_unsaved_changes" = "Ci sono modifiche non salvate. Uscendo saranno perse.";
+// Login Screen 
+"login_error_already_logged_in" = "Accesso già effettuato";
+"login_error_must_start_http" = "l'URL deve iniziare con http[s]://";
+// room details dialog screen
+"room_details_title" = "Dettagli stanza";
+// Settings screen 
+"settings_title_config" = "Configurazione";
+"settings_title_notifications" = "Notifiche";
+// Notification settings screen 
+"notification_settings_disable_all" = "Disabilita tutte le notifiche";
+"notification_settings_enable_notifications" = "Abilita le notifiche";
+"notification_settings_enable_notifications_warning" = "Le notifiche sono al momento disabilitate per tutti i dispositivi.";
+"notification_settings_global_info" = "Le impostazioni di notifica sono salvate nel tuo account e condivise fra i client che le supportano (incluse le notifiche del desktop)\n\nLe regole si applicano in ordine; la prima regola che corrisponde definisce l'esito del messaggio.\nQuindi: Le notifiche per-parola hanno la precedenza sulle notifiche per-canale, che precedono quelle per-mittente.\nSe esistono diverse regole dello stesso tipo, viene applicata la prima della lista.";
+"notification_settings_per_word_notifications" = "Notifiche per-parola";
+"notification_settings_per_word_info" = "Le parole sono confrontate senza tenere conto dei caratteri maiuscoli/minuscoli, e possono includere asterischi. Quindi:\nblah corrisponde alla stringa blah con qualsiasi delimitatore di parola (es. segni di punteggiatura e spazi o segni di accapo).\nblah* corrisponde a qualsiasi parola inizi con blah.\n*blah* corrisponde a qualsiasi parola contenga le 4 lettere blah.";
+"notification_settings_always_notify" = "Notifica sempre";
+"notification_settings_never_notify" = "Non notificare mai";
+"notification_settings_word_to_match" = "parola da cercare";
+"notification_settings_highlight" = "Evidenziare";
+"notification_settings_custom_sound" = "Suono personalizzato";
+"notification_settings_per_room_notifications" = "Notifiche per-canale";
+"notification_settings_per_sender_notifications" = "Notifiche per-mittente";
+"notification_settings_sender_hint" = "@utente:dominio.it";
+"notification_settings_select_room" = "Seleziona un canale";
+"notification_settings_other_alerts" = "Altri avvisi";
+"notification_settings_contain_my_user_name" = "Notifica con un suono i messaggi che contengono il mio nome utente";
+"notification_settings_contain_my_display_name" = "Notifica con un suono i messaggi che contengono il mio nome completo";
+"notification_settings_just_sent_to_me" = "Notifica con un suono i messaggi inviati solo a me";
+"notification_settings_invite_to_a_new_room" = "Notifica quando sono invitato in un nuovo canale";
+"notification_settings_people_join_leave_rooms" = "Notifica quando gli utenti entrano o escono dai canali";
+"notification_settings_receive_a_call" = "Notifica quando ricevo una chiamata";
+"notification_settings_suppress_from_bots" = "Sopprimi le notifiche dai bot";
+"notification_settings_by_default" = "Come predefinito...";
+"notification_settings_notify_all_other" = "Notifica tutti gli altri messaggi/canali";
+// gcm section 
+"settings_config_home_server" = "Homeserver: %@";
+"settings_config_identity_server" = "Server d'identità: %@";
+"settings_config_user_id" = "ID utente: %@";
+// call string
+"call_waiting" = "Attendere...";
+"call_connecting" = "In connessione…";
+"call_ended" = "Chiamata terminata";
+"call_ring" = "Chiamata in corso...";
+"incoming_video_call" = "Videochiamata in arrivo";
+"incoming_voice_call" = "Telefonata in arrivo";
+"call_invite_expired" = "Tempo di chiamata scaduto";
+// unrecognized SSL certificate
+"ssl_trust" = "Fidati";
+"ssl_logout_account" = "Esci";
+"ssl_remain_offline" = "Ignora";
+"ssl_fingerprint_hash" = "Impronta (%@):";
+"ssl_could_not_verify" = "Impossibile verificare l'identità del server remoto.";
+"ssl_cert_not_trust" = "Potrebbe voler dire che qualcuno sta intercettando il tuo traffico, o che il tuo telefono non si fida del certificato offerto dal server remoto.";
+"ssl_cert_new_account_expl" = "Se l'amministratore del server ti ha detto che questo sarebbe successo, accertati che l'impronta qui sotto corrisponda a quella che lui ti ha fornito.";
+"ssl_unexpected_existing_expl" = "Il certificato è diverso da quello di cui il tuo telefono si fidava. Questo è un COMPORTAMENTO ANOMALO. Si consiglia di NON ACCETTARE questo nuovo certificato.";
+"ssl_expected_existing_expl" = "Il certificato è cambiato da uno precedentemente accettato a uno che non è fidato. Il server potrebbe averlo rinnovato. Contatta l'amministratore del server per verificarne l'impronta.";
+"ssl_only_accept" = "Accetta il certificato SOLAMENTE se l'amministratore del server ha pubblicato un'impronta che corrisponde a quella qui sopra.";
+"notice_encryption_enabled_ok" = "%@ ha attivato la crittografia end-to-end.";
+"notice_encryption_enabled_unknown_algorithm" = "%1$@ ha attivato la crittografia end-to-end (algoritmo %2$@ non riconosciuto).";
+// Notice Events with "You"
+"notice_room_invite_by_you" = "Hai invitato %@";
+"notice_room_invite_you" = "%@ ti ha invitato";
+"notice_room_third_party_invite_by_you" = "Hai mandato un invito a %@ a unirsi alla stanza";
+"notice_room_third_party_registered_invite_by_you" = "Hai accettato l'invito per %@";
+"notice_room_third_party_revoked_invite_by_you" = "Hai revocato l'invito per %@ a unirsi alla stanza";
+"notice_room_join_by_you" = "Sei entrato";
+"notice_room_leave_by_you" = "Sei uscito";
+"notice_room_reject_by_you" = "Hai rifiutato l'invito";
+"notice_room_kick_by_you" = "Hai buttato fuori %@";
+"notice_room_unban_by_you" = "Hai riammesso %@";
+"notice_room_ban_by_you" = "Hai bandito %@";
+"notice_room_withdraw_by_you" = "Hai ritirato l'invito di %@";
+"notice_avatar_url_changed_by_you" = "Hai cambiato il tuo avatar";
+"notice_display_name_set_by_you" = "Hai impostato il tuo nome visualizzato a %@";
+"notice_display_name_changed_from_by_you" = "Hai cambiato il tuo nome visualizzato da %@ a %@";
+"notice_display_name_removed_by_you" = "Hai rimosso il tuo nome visualizzato";
+"notice_topic_changed_by_you" = "Hai cambiato l'argomento in \"%@\".";
+"notice_room_name_changed_by_you" = "Hai cambiato il nome della stanza in %@.";
+"notice_placed_voice_call_by_you" = "Hai iniziato una telefonata";
+"notice_placed_video_call_by_you" = "Hai iniziato una videochiamata";
+"notice_answered_video_call_by_you" = "Hai risposto alla chiamata";
+"notice_ended_video_call_by_you" = "Hai terminato la chiamata";
+"notice_conference_call_request_by_you" = "Hai richiesto una conferenza VoIP";
+"notice_room_name_removed_by_you" = "Hai rimosso il nome della stanza";
+"notice_room_topic_removed_by_you" = "Hai rimosso l'argomento";
+"notice_event_redacted_by_you" = " da te";
+"notice_profile_change_redacted_by_you" = "Hai aggiornato il tuo profilo %@";
+"notice_room_created_by_you" = "Hai creato e configurato la stanza.";
+"notice_encryption_enabled_ok_by_you" = "Hai attivato la crittografia end-to-end.";
+"notice_encryption_enabled_unknown_algorithm_by_you" = "Hai attivato la crittografia end-to-end (algoritmo %@ sconosciuto).";
+"notice_redaction_by_you" = "Hai corretto un evento (id: %@)";
+"notice_room_history_visible_to_anyone_by_you" = "Hai reso visibile a chiunque la cronologia futura della stanza.";
+"notice_room_history_visible_to_members_by_you" = "Hai reso visibile a tutti i membri della stanza la cronologia futura della stanza.";
+"notice_room_history_visible_to_members_from_invited_point_by_you" = "Hai reso visibile a tutti i membri della stanza la cronologia futura della stanza, dal momento del loro invito.";
+"notice_room_history_visible_to_members_from_joined_point_by_you" = "Hai reso visibile a tutti i membri della stanza la cronologia futura della stanza, dal momento della loro entrata.";
+//  New
+"notice_room_join_rule_invite" = "%@ ha reso la stanza solo su invito.";
+"notice_room_join_rule_invite_by_you" = "Hai reso la stanza solo su invito.";
+"notice_room_join_rule_public" = "%@ ha reso la stanza pubblica.";
+"notice_room_join_rule_public_by_you" = "Hai reso la stanza pubblica.";
+"notice_room_name_removed_for_dm" = "%@ ha rimosso il nome";
+"notice_room_created_for_dm" = "%@ è entrato.";
+"notice_room_join_rule_invite_for_dm" = "%@ l'ha resa solo su invito.";
+"notice_room_join_rule_invite_by_you_for_dm" = "L'hai resa solo su invito.";
+"notice_room_join_rule_public_for_dm" = "%@ l'ha resa pubblica.";
+"notice_room_join_rule_public_by_you_for_dm" = "L'hai resa pubblica.";
+"notice_room_power_level_intro_for_dm" = "Il livello di accesso dei partecipanti è:";
+"notice_room_aliases_for_dm" = "Gli alias sono: %@";
+"notice_room_history_visible_to_members_for_dm" = "%@ ha reso visibili i messaggi futuri a tutti i membri della stanza.";
+"notice_room_history_visible_to_members_from_invited_point_for_dm" = "%@ ha reso visibili i messaggi futuri a chiunque, dal momento dell'invito.";
+"notice_room_history_visible_to_members_from_joined_point_for_dm" = "%@ ha reso visibili i messaggi futuri a chiunque, dal momento dell'entrata.";
+"room_left_for_dm" = "Sei uscito";
+"notice_room_third_party_invite_for_dm" = "%@ ha invitato %@";
+"notice_room_third_party_revoked_invite_for_dm" = "%@ ha revocato l'invito per %@";
+"notice_room_name_changed_for_dm" = "%@ ha cambiato il nome in %@.";
+"notice_room_third_party_invite_by_you_for_dm" = "Hai invitato %@";
+"notice_room_third_party_revoked_invite_by_you_for_dm" = "Hai revocato l'invito per %@";
+"notice_room_name_changed_by_you_for_dm" = "Hai cambiato il nome in %@.";
+"notice_room_name_removed_by_you_for_dm" = "Hai rimosso il nome";
+"notice_room_created_by_you_for_dm" = "Sei entrato.";
+"notice_room_history_visible_to_members_by_you_for_dm" = "Hai reso visibili i messaggi futuri a tutti i membri della stanza.";
+"notice_room_history_visible_to_members_from_invited_point_by_you_for_dm" = "Hai reso visibili i messaggi futuri a chiunque, dal momento dell'invito.";
+"notice_room_history_visible_to_members_from_joined_point_by_you_for_dm" = "Hai reso visibili i messaggi futuri a chiunque, dal momento dell'entrata.";
+"call_more_actions_dialpad" = "Tastierino numerico";
+"call_more_actions_transfer" = "Trasferisci";
+"call_more_actions_audio_use_device" = "Altoparlante dispositivo";
+"call_more_actions_audio_use_headset" = "Usa audio da cuffie";
+"call_more_actions_change_audio_device" = "Cambia dispositivo audio";
+"call_more_actions_unhold" = "Riprendi";
+"call_more_actions_hold" = "In attesa";
+"call_holded" = "Hai messo la chiamata in attesa";
+"call_remote_holded" = "%@ ha messo la chiamata in attesa";
+"notice_declined_video_call_by_you" = "Hai rifiutato la chiamata";
+"notice_declined_video_call" = "%@ ha rifiutato la chiamata";
+"resume_call" = "Riprendi";
+"call_transfer_to_user" = "Trasferisci a %@";
+"call_consulting_with_user" = "Consultazione con %@";
+"call_video_with_user" = "Videochiamata con %@";
+"call_voice_with_user" = "Telefonata con %@";
+"call_ringing" = "Sta squillando…";
+"e2e_passphrase_too_short" = "Password troppo corta (deve avere almeno %d caratteri)";
+"microphone_access_not_granted_for_voice_message" = "I messaggi vocali hanno bisogno dell'accesso al microfono, ma %@ non ha il permesso di usarlo";
+"message_reply_to_sender_sent_a_voice_message" = "inviato un messaggio vocale.";
+"attachment_large_with_resolution" = "Grande %@ (~%@)";
+"attachment_medium_with_resolution" = "Medio %@ (~%@)";
+"attachment_small_with_resolution" = "Piccolo %@ (~%@)";
+"attachment_size_prompt_message" = "Puoi disattivarlo nelle impostazioni.";
+"attachment_size_prompt_title" = "Conferma dimensione da inviare";
+"auth_reset_password_error_not_found" = "Non trovato";
+"auth_reset_password_error_unauthorized" = "Non autorizzato";
+"auth_invalid_user_name" = "Nome utente non valido";
+"room_displayname_all_other_members_left" = "%@ (Uscito)";
+"auth_username_in_use" = "Nome utente in uso";
+"rename" = "Rinomina";
+"attachment_unsupported_preview_message" = "Questo tipo di file non è supportato.";
+"attachment_unsupported_preview_title" = "Anteprima non disponibile";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/ja.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/ja.lproj/MatrixKit.strings
new file mode 100644
index 000000000..c4918a35e
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/ja.lproj/MatrixKit.strings
@@ -0,0 +1,409 @@
+"matrix" = "Matrix";
+// Login Screen
+"login_create_account" = "アカウント作成:";
+"login_server_url_placeholder" = "URL (例 https://matrix.org)";
+"login_home_server_title" = "接続先サーバURL:";
+"login_home_server_info" = "あなたの接続先サーバは、あなたの全ての会話とアカウント情報を保存します";
+"login_identity_server_title" = "認証サーバURL:";
+"login_password_placeholder" = "パスワード";
+"login_email_placeholder" = "メールアドレス";
+// Action
+"no" = "いいえ";
+"yes" = "はい";
+"back" = "戻る";
+"close" = "閉じる";
+"continue" = "続く";
+"sign_up" = "登録";
+"resend_message" = "メッセージを再送信する";
+"select_all" = "全て選択";
+"show_details" = "詳細を表示する";
+"login_identity_server_info" = "Matrixは、どの電子メールなどがどのMatrix IDに属しているかを追跡するアイデンティティサーバーを提供します。 現在 https://matrix.org のみが存在します。";
+"login_user_id_placeholder" = "Matrix ID（例 @bob:matrix.org または bob）";
+"login_optional_field" = "オプション";
+"login_display_name_placeholder" = "表示名 (例 Bob Obson)";
+"login_email_info" = "メールアドレスを指定すると、他のユーザーがあなたをMatrixで簡単に見つけることができ、今後パスワードをリセットすることができます。";
+"login_prompt_email_token" = "メールの検証トークンを入力してください:";
+"login_error_title" = "ログインに失敗しました";
+"login_error_no_login_flow" = "このホームサーバーから認証情報を取得できませんでした";
+"login_error_do_not_support_login_flows" = "現在、このホームサーバーによって定義されたログインフローの一部またはすべてをサポートしていません";
+"login_error_registration_is_not_supported" = "登録は現在サポートされていません";
+"login_error_forbidden" = "無効なユーザー名/パスワード";
+"login_error_unknown_token" = "指定されたアクセストークンが認識されませんでした";
+"login_error_bad_json" = "不正な形式のJSON";
+"login_error_not_json" = "有効なJSONを含んでいませんでした";
+"login_error_limit_exceeded" = "あまりにも多くのリクエストが送られました";
+"login_error_user_in_use" = "このユーザー名はすでに使用されています";
+"login_error_login_email_not_yet" = "まだクリックされていないメールリンク";
+"login_use_fallback" = "フォールバックページを使用する";
+"login_leave_fallback" = "キャンセル";
+"login_invalid_param" = "無効なパラメーター";
+"register_error_title" = "登録に失敗しました";
+"login_error_forgot_password_is_not_supported" = "Forgot passwordは現在サポートされていません";
+"login_mobile_device" = "携帯";
+"login_tablet_device" = "タブレット";
+"login_desktop_device" = "デスクトップ";
+"login_error_resource_limit_exceeded_title" = "リソース制限を超えました";
+"login_error_resource_limit_exceeded_message_default" = "このホームサーバーは、リソース制限の1つを超えています。";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "このホームサーバーは、月間アクティブユーザー制限を超えています。";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nこのサービスを続行するには、サービス管理者に連絡してください。";
+"login_error_resource_limit_exceeded_contact_button" = "管理者に連絡する";
+"abort" = "中断する";
+"discard" = "破棄";
+"dismiss" = "却下する";
+"retry" = "再試行";
+"submit" = "提出";
+"submit_code" = "コードを送信";
+"set_default_power_level" = "権限レベルをリセット";
+"set_moderator" = "モデレーターを設定";
+"set_admin" = "管理者を設定";
+"start_chat" = "チャットを始める";
+"start_voice_call" = "音声通話を開始";
+"start_video_call" = "ビデオ通話を開始";
+"mention" = "記載";
+"select_account" = "アカウントを選択";
+"attach_media" = "ライブラリからメディアを添付";
+"capture_media" = "写真/ビデオを撮る";
+"invite_user" = "matrixユーザーを招待";
+"reset_to_default" = "デフォルトにリセット";
+"cancel_upload" = "アップロードをキャンセル";
+"cancel_download" = "ダウンロードをキャンセル";
+"answer_call" = "通話に応答する";
+"reject_call" = "通話を拒否する";
+"end_call" = "通話終了";
+"ignore" = "無視";
+// Events formatter
+"notice_avatar_changed_too" = "(アバターも変わった)";
+"notice_room_name_removed" = "%@は部屋名を削除しました";
+"notice_room_topic_removed" = "%@はトピックを削除しました";
+"notice_event_redacted" = "<編集された%@>";
+"notice_event_redacted_by" = " %@により";
+"notice_event_redacted_reason" = " [理由: %@]";
+"notice_profile_change_redacted" = "%@は彼らのプロフィール %@を更新しました";
+"notice_room_created" = "%@は部屋を作成しました";
+"notice_room_join_rule" = "結合ルールは次のとおり: %@";
+"notice_room_power_level_intro" = "ルームメンバーの権限レベル:";
+"notice_room_power_level_acting_requirement" = "アクション前にユーザーの必要な最小権限レベル:";
+"notice_room_power_level_event_requirement" = "イベントに関連する最小権限レベル:";
+"notice_room_aliases" = "ルームエイリアス: %@";
+"notice_room_related_groups" = "この部屋に関連付けられたグループ: %@";
+"notice_encrypted_message" = "暗号化されたメッセージ";
+"notice_encryption_enabled" = "%@はエンドツーエンド暗号化を有効にする (アルゴリズム %@)";
+"notice_image_attachment" = "画像添付";
+"notice_audio_attachment" = "音声添付";
+"notice_video_attachment" = "動画添付";
+"notice_location_attachment" = "位置情報添付";
+"notice_file_attachment" = "ファイル添付";
+"notice_invalid_attachment" = "無効な添付";
+"notice_unsupported_attachment" = "サポートされていない添付: %@";
+"notice_feedback" = "フィードバックイベント (id: %@): %@";
+"notice_redaction" = "%@はイベントを編集しました (id: %@)";
+"notice_error_unsupported_event" = "サポートされていないイベント";
+"notice_error_unexpected_event" = "予期しないイベント";
+"notice_error_unknown_event_type" = "不明なイベントタイプ";
+"notice_room_history_visible_to_anyone" = "%@ 誰でも将来の部屋履歴を表示されます。";
+"notice_room_history_visible_to_members" = "%@ ルームメンバー全員に将来の部屋履歴を表示されます。";
+"notice_room_history_visible_to_members_from_invited_point" = "%@ ルームメンバー全員に招待した時点からの部屋履歴を表示されます。";
+"notice_room_history_visible_to_members_from_joined_point" = "%@ ルームメンバー全員に参加した時点からの部屋履歴を表示されます。";
+"notice_crypto_unable_to_decrypt" = "** 復号化できません: %@ **";
+"notice_crypto_error_unknown_inbound_session_id" = "送信者のセッションからこのメッセージのキーが送信されていません。";
+"notice_sticker" = "ステッカー";
+"notice_in_reply_to" = "に返信";
+// room display name
+"room_displayname_empty_room" = "空の部屋";
+"room_displayname_two_members" = "%@ と %@";
+"room_displayname_more_than_two_members" = "%@ と %@ 他";
+// Settings
+"settings" = "設定";
+"settings_enable_inapp_notifications" = "アプリ内通知を有効にする";
+"settings_enable_push_notifications" = "プッシュ通知を有効にする";
+"settings_enter_validation_token_for" = "%@の検証トークンを入力:";
+"notification_settings_room_rule_title" = "部屋: '%@'";
+// Devices
+"device_details_title" = "セッション情報\n";
+"device_details_name" = "名前\n";
+"device_details_identifier" = "ID\n";
+"device_details_last_seen" = "ラストシーン\n";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_rename_prompt_message" = "端末名:";
+"device_details_delete_prompt_title" = "認証";
+"device_details_delete_prompt_message" = "この操作には、追加の認証が必要です。\n続行するには、パスワードを入力してください。";
+// Encryption information
+"room_event_encryption_info_title" = "エンドツーエンド暗号化情報\n\n";
+"room_event_encryption_info_event" = "イベント情報\n";
+"room_event_encryption_info_event_user_id" = "ユーザーID\n";
+"room_event_encryption_info_event_identity_key" = "Curve25519 identity key\n";
+"room_event_encryption_info_event_fingerprint_key" = "クレームされたEd25519指紋キー\n";
+"room_event_encryption_info_event_algorithm" = "アルゴリズム\n";
+"room_event_encryption_info_event_session_id" = "セッションID\n";
+"room_event_encryption_info_event_decryption_error" = "復号化エラー\n";
+"room_event_encryption_info_event_unencrypted" = "暗号化されていない";
+"room_event_encryption_info_event_none" = "なし";
+"room_event_encryption_info_device" = "\n送信者セッション情報\n";
+"room_event_encryption_info_device_unknown" = "未知のセッション\n";
+"room_event_encryption_info_device_name" = "名前\n";
+"room_event_encryption_info_device_id" = "ID\n";
+"room_event_encryption_info_device_verification" = "検証\n";
+"room_event_encryption_info_device_fingerprint" = "Ed25519 fingerprint\n";
+"room_event_encryption_info_device_verified" = "検証済み";
+"room_event_encryption_info_device_not_verified" = "検証されていない";
+"room_event_encryption_info_device_blocked" = "ブラックリストに載せた";
+"room_event_encryption_info_verify" = "検証中...";
+"room_event_encryption_info_unverify" = "未検証";
+"room_event_encryption_info_block" = "ブラックリスト";
+"room_event_encryption_info_unblock" = "ブラックでないリスト";
+"room_event_encryption_verify_title" = "セッション検証\n\n";
+"room_event_encryption_verify_message" = "このセッションが信頼できることを確認するには、他の方法（個人や電話など）で所有者に連絡し、セッションのユーザー設定で表示される鍵が以下のキーと一致するかどうかを尋ねます。\n\nセッション名: %@\nセッションID: %@\nセッションkey: %@\n\n一致する場合は、下の確認ボタンを押します。 それ以外の人がこのセッションを傍受している場合は、代わりにブラックリストボタンを押してください。\n\n将来この検証プロセスはより洗練されたものになるでしょう。";
+"room_event_encryption_verify_ok" = "検証";
+// Account
+"account_save_changes" = "変更を保存";
+"account_link_email" = "リンクメール";
+"account_linked_emails" = "リンクされたメール";
+"account_email_validation_title" = "検証保留中";
+"account_email_validation_message" = "メールをチェックし、それに含まれているリンクをクリックしてください。 これが完了したら、[続行]をクリックします。";
+"account_email_validation_error" = "メールアドレスを確認できません。 あなたのメールをチェックし、それに含まれているリンクをクリックしてください。 これが完了したら、[続行]をクリックします";
+"account_msisdn_validation_title" = "検証保留中";
+"account_msisdn_validation_message" = "アクティベーションコード付きのSMSを送信しました。 以下にこのコードを入力してください。";
+"account_msisdn_validation_error" = "電話番号を確認できません。";
+"account_error_display_name_change_failed" = "表示名の変更に失敗しました";
+"account_error_picture_change_failed" = "画像の変更に失敗しました";
+"account_error_matrix_session_is_not_opened" = "Matrixセッションが開かれていません";
+"account_error_email_wrong_title" = "無効な電子メールアドレス";
+"account_error_email_wrong_description" = "これは有効なメールアドレスではないようです";
+"account_error_msisdn_wrong_title" = "無効な電話番号";
+"account_error_msisdn_wrong_description" = "これは有効な電話番号ではないようです";
+// Room creation
+"room_creation_name_title" = "部屋名:";
+"room_creation_name_placeholder" = "(例 ランチグループ)";
+"room_creation_alias_title" = "部屋の別名:";
+"room_creation_alias_placeholder" = "(例 #foo:example.org)";
+"room_creation_alias_placeholder_with_homeserver" = "(例 #foo%@)";
+"room_creation_participants_title" = "参加者:";
+"room_creation_participants_placeholder" = "(例 @bob:homeserver1; @john:homeserver2...)";
+// Room
+"room_please_select" = "部屋を選択してください";
+"room_error_join_failed_title" = "部屋に参加できませんでした";
+"room_error_join_failed_empty_room" = "現在空の部屋に再参加することはできません。";
+"room_error_name_edition_not_authorized" = "この部屋の名前を編集する権限がありません";
+"room_error_topic_edition_not_authorized" = "この部屋のトピックを編集する権限がありません";
+"room_error_cannot_load_timeline" = "タイムラインの読み込みに失敗しました";
+"room_error_timeline_event_not_found_title" = "タイムラインの位置を読み込めませんでした";
+"room_error_timeline_event_not_found" = "アプリケーションがこのルームのタイムラインに特定のポイントをロードしようとしましたが、それを見つけることができませんでした";
+"room_left" = "あなたは部屋を出ました";
+"room_no_power_to_create_conference_call" = "この部屋で会議を開始するために招待する権限が必要です";
+"room_no_conference_call_in_encrypted_rooms" = "暗号化された会議室では会議通話はサポートされません";
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "画像を送信しました。";
+"message_reply_to_sender_sent_a_video" = "動画を送りました。";
+"message_reply_to_sender_sent_an_audio_file" = "オーディオファイルを送信しました。";
+"message_reply_to_sender_sent_a_file" = "ファイルを送信しました。";
+"message_reply_to_message_to_reply_to_prefix" = "に返信";
+// Room members
+"room_member_ignore_prompt" = "このユーザーからのすべてのメッセージを非表示にしますか？";
+"room_member_power_level_prompt" = "この変更を元に戻すことはできません。ユーザーが自分と同じレベルの権限を持つように促しますが、よろしいですか?";
+// Attachment
+"attachment_size_prompt" = "次のように送信しますか:";
+"attachment_original" = "実際のサイズ: %@";
+"attachment_small" = "小: %@";
+"attachment_medium" = "中: %@";
+"attachment_large" = "大: %@";
+"attachment_cancel_download" = "ダウンロードをキャンセルしますか?";
+"attachment_cancel_upload" = "アップロードをキャンセルしますか?";
+"attachment_multiselection_size_prompt" = "画像を次のように送信しますか:";
+"attachment_multiselection_original" = "実際のサイズ";
+"attachment_e2e_keys_file_prompt" = "このファイルには、Matrixクライアントからエクスポートされた暗号化キーが含まれています。\nファイルの内容を表示するか、ファイルの内容をインポートしますか？";
+"attachment_e2e_keys_import" = "インポート...";
+// Contacts
+"contact_mx_users" = "Matrixユーザー";
+"contact_local_contacts" = "ローカルの連絡先";
+// Groups
+"group_invite_section" = "招待";
+"group_section" = "グループ";
+// Search
+"search_no_results" = "結果がありません";
+"search_searching" = "検索中...";
+// Time
+"format_time_s" = "秒";
+"format_time_m" = "分";
+"format_time_h" = "時";
+"format_time_d" = "日";
+// E2E import
+"e2e_import_room_keys" = "ルームキーをインポート";
+"e2e_import_prompt" = "このプロセスでは、以前に別のMatrixクライアントからエクスポートした暗号化キーをインポートできます。 これにより、他のクライアントが解読できるすべてのメッセージを解読することができます。\nエクスポートファイルはパスフレーズで保護されています。 ファイルを解読するには、パスフレーズをここに入力する必要があります。";
+"e2e_import" = "インポート";
+"e2e_passphrase_enter" = "パスフレーズを入力";
+// E2E export
+"e2e_export_room_keys" = "ルームキーのエクスポート";
+"e2e_export_prompt" = "このプロセスでは、暗号化されたルームで受信したメッセージのキーをローカルファイルにエクスポートできます。 その後、クライアントがこれらのメッセージを復号化できるように、ファイルを別のMatrixクライアントにインポートすることができます。\nエクスポートされたファイルは、誰でも閲覧できる暗号化されたメッセージを復号化することができるので、安全に保つように注意する必要があります。";
+"e2e_export" = "エクスポート";
+"e2e_passphrase_confirm" = "パスフレーズを確認";
+"e2e_passphrase_empty" = "パスフレーズは空であってはいけません";
+"e2e_passphrase_not_match" = "パスフレーズは一致する必要があります";
+"e2e_passphrase_create" = "パスフレーズの作成";
+// Others
+"user_id_title" = "ユーザーID:";
+"offline" = "オフライン";
+"unsent" = "未送信";
+"error" = "エラー";
+"error_common_message" = "エラーが発生しました。 後でもう一度お試しください。";
+"not_supported_yet" = "まだサポートされていません";
+"default" = "既定";
+"private" = "Private";
+"public" = "Public";
+"power_level" = "権限レベル";
+"network_error_not_reachable" = "ネットワーク接続を確認してください";
+"user_id_placeholder" = "例: @bob:homeserver";
+"ssl_homeserver_url" = "ホームサーバーのURL: %@";
+// Permissions
+"camera_access_not_granted_for_call" = "ビデオ通話はカメラにアクセスする必要がありますが、%@にはそのカメラを使用する権限がありません";
+"microphone_access_not_granted_for_call" = "通話にはマイクへのアクセスが必要ですが、%@には使用許可がありません";
+"local_contacts_access_not_granted" = "ローカルの連絡先からユーザーを探すには連絡先にアクセスする必要がありますが、%@にはそのアクセス権限がありません";
+"local_contacts_access_discovery_warning_title" = "ユーザーの探索";
+"local_contacts_access_discovery_warning" = "%@は、ユーザーを検索するためにあなたの連絡先から電子メールと電話番号をアップロードしたい";
+// Country picker
+"country_picker_title" = "国を選択する";
+// Language picker
+"language_picker_title" = "言語を選択する";
+"language_picker_default_language" = "既定値 (%@)";
+"notice_room_invite" = "%@は%@を招待しました";
+"notice_room_third_party_invite" = "%@は、部屋に参加するよう%@へ招待状を送った";
+"notice_room_third_party_registered_invite" = "%@は%@の招待を受け入れました";
+"notice_room_join" = "%@ は参加しました";
+"notice_room_leave" = "%@ は退出しました";
+"notice_room_reject" = "%@は招待を拒否しました";
+"notice_room_kick" = "%@は%@を追い出しました";
+"notice_room_unban" = "%@は%@を追放解除した";
+"notice_room_ban" = "%@は%@を追放した";
+"notice_room_withdraw" = "%@は%@の招待を辞退しました";
+"notice_room_reason" = ". 理由: %@";
+"notice_avatar_url_changed" = "%@はアバターを変更しました";
+"notice_display_name_set" = "%@は表示名を%@に設定しました";
+"notice_display_name_changed_from" = "%@は表示名を%@から%@に変更しました";
+"notice_display_name_removed" = "%@は表示名を削除しました";
+"notice_topic_changed" = "%@はトピックを次のように変更しました: %@";
+"notice_room_name_changed" = "%@は部屋名を次のように変更しました: %@";
+"notice_placed_voice_call" = "%@は電話をかけました";
+"notice_placed_video_call" = "%@はビデオ電話をかけました";
+"notice_answered_video_call" = "%@は通話に応答しました";
+"notice_ended_video_call" = "%@は通話を終了しました";
+"notice_conference_call_request" = "%@はVoIP会議をリクエストしました";
+"notice_conference_call_started" = "VoIP会議が開始されました";
+"notice_conference_call_finished" = "VoIP会議が終了しました";
+// button names 
+"ok" = "OK";
+"cancel" = "キャンセル";
+"save" = "保存";
+"leave" = "保存しない";
+"send" = "送信";
+"copy_button_name" = "コピー";
+"resend" = "再送信";
+"redact" = "編集";
+"share" = "共有";
+"set_power_level" = "権限レベル";
+"delete" = "削除";
+"view" = "表示";
+// actions 
+"action_logout" = "ログアウト";
+"create_room" = "部屋を作る";
+"login" = "ログイン";
+"create_account" = "アカウントを作成する";
+"membership_invite" = "招待した";
+"membership_leave" = "退出";
+"membership_ban" = "追放";
+"num_members_one" = "%@ ユーザー";
+"num_members_other" = "%@ ユーザー";
+"invite" = "招待";
+"kick" = "追い出す";
+"ban" = "追放";
+"unban" = "追放解除";
+"message_unsaved_changes" = "保存されていない変更があります。 放置すると捨てられます。";
+// Login Screen 
+"login_error_already_logged_in" = "ログイン済み";
+"login_error_must_start_http" = "URLは http[s]:// で始まる必要があります";
+// room details dialog screen
+"room_details_title" = "部屋の詳細";
+// contacts list screen 
+"invitation_message" = "私はmatrixであなたとチャットしたい。 詳細はウェブサイトhttp://matrix.orgをお尋ねください。";
+// Settings screen 
+"settings_title_config" = "構成";
+"settings_title_notifications" = "通知";
+// Notification settings screen 
+"notification_settings_disable_all" = "すべての通知を無効にする";
+"notification_settings_enable_notifications" = "通知を有効にする";
+"notification_settings_enable_notifications_warning" = "現在、すべての端末ですべての通知が無効になっています。";
+"notification_settings_global_info" = "通知設定はユーザーアカウントに保存され、デスクトップ通知を含むすべてのクライアント間で共有されます。\n\nルールは順番に適用されます。 一致する最初のルールは、メッセージの結果を定義します。\nだから：単語ごとの通知は、送信者ごとの通知よりも重要な部屋ごとの通知よりも重要です。\n同じ種類の複数のルールの場合、一致するリストの最初のルールが優先されます。";
+"notification_settings_per_word_notifications" = "単語単位の通知";
+"notification_settings_per_word_info" = "単語は大文字と小文字を区別せずに一致させ、*ワイルドカードを含めることができます。 従って:\nfooは、区切り文字で囲まれた文字列foo（例 句読点や空白、行の開始/終了）と一致します。\nfoo*は、fooで始まる単語に一致します。\n*foo*は、3文字のfooを含む単語に一致します。";
+"notification_settings_always_notify" = "常に通知";
+"notification_settings_never_notify" = "決して通知しない";
+"notification_settings_word_to_match" = "一致する単語";
+"notification_settings_highlight" = "Highlight";
+"notification_settings_custom_sound" = "カスタムサウンド";
+"notification_settings_per_room_notifications" = "1部屋あたりの通知";
+"notification_settings_per_sender_notifications" = "送信者ごとの通知";
+"notification_settings_sender_hint" = "@user:domain.com";
+"notification_settings_select_room" = "部屋を選択";
+"notification_settings_other_alerts" = "その他のアラート";
+"notification_settings_contain_my_user_name" = "私のユーザー名を含むメッセージについて音で私に通知してください";
+"notification_settings_contain_my_display_name" = "私の表示名が含まれているメッセージについて音で私に通知する";
+"notification_settings_just_sent_to_me" = "私に送られたメッセージについての音で私に知らせる";
+"notification_settings_invite_to_a_new_room" = "私が新しい部屋に招待されたときに知らせる";
+"notification_settings_people_join_leave_rooms" = "人が部屋に入退室したときに私に通知する";
+"notification_settings_receive_a_call" = "通話を受信したときに通知する";
+"notification_settings_suppress_from_bots" = "ボットからの通知を抑制する";
+"notification_settings_by_default" = "既定値では...";
+"notification_settings_notify_all_other" = "他のすべてのメッセージ/部屋について通知する";
+// gcm section 
+"settings_config_home_server" = "ホームサーバー: %@";
+"settings_config_identity_server" = "IDサーバー: %@";
+"settings_config_user_id" = "ユーザーID: %@";
+// call string
+"call_waiting" = "待機中...";
+"call_connecting" = "通話接続中...";
+"call_ended" = "通話終了";
+"call_ring" = "呼び出し中...";
+"incoming_video_call" = "着信ビデオ通話";
+"incoming_voice_call" = "着信音声通話";
+"call_invite_expired" = "期限切れの招待コール";
+// unrecognized SSL certificate
+"ssl_trust" = "信頼";
+"ssl_logout_account" = "ログアウト";
+"ssl_remain_offline" = "無視";
+"ssl_fingerprint_hash" = "指紋 (%@):";
+"ssl_could_not_verify" = "リモートサーバーのIDを確認できませんでした。";
+"ssl_cert_not_trust" = "これは、誰かがあなたのトラフィックを悪意を持って傍受しているか、あなたの電話機がリモートサーバーから提供された証明書を信頼していないことを意味します。";
+"ssl_cert_new_account_expl" = "サーバー管理者がこれが予期されると述べた場合は、以下の指紋が提供された指紋と一致することを確認してください。";
+"ssl_unexpected_existing_expl" = "証明書は、お使いの携帯電話にて信頼されたものから変更されました。 これは非常に珍しいことです。 この新しい証明書に同意しないことをお勧めします。";
+"ssl_expected_existing_expl" = "証明書が以前に信頼されたものから信頼されていないものに変更されました。 サーバーが証明書を更新した可能性があります。 予想される指紋については、サーバー管理者にお問い合わせください。";
+"ssl_only_accept" = "サーバー管理者が上記のものと一致する指紋を発行した場合にのみ、証明書を受け入れます。";
+"unignore" = "無視しない";
+"notice_encryption_enabled_ok" = "%@ がエンドツーエンド暗号化をオンにしました。";
+"notice_encryption_enabled_unknown_algorithm" = "%1$@ がエンドツーエンド暗号化をオンにしました (不明なアルゴリズム %2$@)。";
+"device_details_rename_prompt_title" = "セッション名";
+"account_error_push_not_allowed" = "通知は許可されていません";
+"notice_room_third_party_revoked_invite" = "%@ は %@ の部屋への招待を取り消しました";
+// Notice Events with "You"
+"notice_room_invite_by_you" = "%@を招待しました";
+"notice_room_invite_you" = "%@があなたを招待しました";
+"notice_room_join_by_you" = "参加しました";
+"notice_room_leave_by_you" = "退室しました";
+"notice_room_kick_by_you" = "%@をキックしました";
+"notice_room_unban_by_you" = "%@をBANしました";
+"notice_room_ban_by_you" = "%@をBANしました";
+"notice_avatar_url_changed_by_you" = "アバターを変更しました";
+"notice_display_name_set_by_you" = "表示名を%@に変更しました";
+"notice_display_name_changed_from_by_you" = "表示名を%@から%@に変更しました";
+"notice_display_name_removed_by_you" = "表示名を削除しました";
+"notice_topic_changed_by_you" = "トピックを変更しました: %@";
+"notice_room_name_changed_by_you" = "部屋の名前を変更しました: %@";
+"notice_placed_voice_call_by_you" = "音声通話を開始しました";
+"notice_placed_video_call_by_you" = "ビデオ通話を開始しました";
+"notice_answered_video_call_by_you" = "電話に出ました";
+"notice_ended_video_call_by_you" = "通話を終了しました";
+"notice_conference_call_request_by_you" = "VoIP会議をリクエストしました";
+"notice_room_name_removed_by_you" = "部屋名を削除しました";
+"notice_room_topic_removed_by_you" = "トピックを削除しました";
+"notice_profile_change_redacted_by_you" = "プロフィール %@を更新しました";
+"notice_room_created_by_you" = "部屋を作成しました";
+"notice_encryption_enabled_ok_by_you" = "あなたはエンドツーエンド暗号化をオンにしました。";
+"notice_encryption_enabled_unknown_algorithm_by_you" = "あなたはエンドツーエンド暗号化をオンにしました (不明なアルゴリズム %2$@)。";
+"notice_redaction_by_you" = "イベントを編集しました (id: %@)";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/kab.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/kab.lproj/MatrixKit.strings
new file mode 100644
index 000000000..8749803a1
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/kab.lproj/MatrixKit.strings
@@ -0,0 +1,530 @@
+
+
+
+"ssl_expected_existing_expl" = "Aselkin yettwabeddel seg win yettwamanen ɣer win ur nettwaman ara. Ahat aqeddac iɛawed-d aselkin-ines. Nermes anedbal n uqeddac ɣef udsil umḍin yetturaǧun.";
+"ssl_unexpected_existing_expl" = "Aselken yettubeddel deg ubdil n win yettwamanen deg tiliɣri-inek·inem. Aya MAČČI D AYEN IGERRZEN. Issefk UR TETTAQBALEḌ ARA aselkin-a amaynut.";
+"ssl_cert_new_account_expl" = "Ma yella anedbal n uqeddac yenna-d belli aya yettuau, ẓer ma yella adsil umḍin ddaw yemṣada d udsil umḍin i d-mudden nutni.";
+"ssl_cert_not_trust" = "Aya yebɣa ad d-yini yellawin d ugur i tikli-inek·inem s yir udem, neɣ tiliɣri-inek·inem ur yettkil ara ɣef uselkin i as-imudd uqeddac anmeggag.";
+"ssl_could_not_verify" = "D awezɣi ad nsenqed timagit n uqeddac agemmaḍ.";
+"ssl_remain_offline" = "Ttu";
+"ssl_logout_account" = "Tuffɣa";
+
+// unrecognized SSL certificate
+"ssl_trust" = "Ittkel";
+"incoming_voice_call" = "Asiwel s taɣect i d-ikecmen";
+"incoming_video_call" = "Asiwel s tvidyut i d-ikecmen";
+"call_ring" = "Yessawal...";
+"call_ended" = "Asiwel yekfa";
+"notification_settings_notify_all_other" = "Ṭṭef-d ilɣa i meṛṛa iznan/tixxamin";
+"settings_title_notifications" = "Ilɣa";
+
+// Settings screen 
+"settings_title_config" = "Tawila";
+
+// members list Screen 
+
+// accounts list Screen 
+
+// image size selection 
+
+// invitation members list Screen 
+
+// room creation dialog Screen 
+
+// room info dialog Screen
+
+// room details dialog screen
+"room_details_title" = "Talqayt n texxamt";
+"login_error_must_start_http" = "Ilaq ad yebdu URL s http[s]://";
+"ban" = "Agi";
+"kick" = "Suffeɣ";
+"invite" = "Nced";
+"membership_leave" = "Azelmaḍ";
+"membership_invite" = "Yettwancad";
+"create_account" = "Rnu amiḍan";
+"login" = "Isem n useqdac";
+"create_room" = "Rnu taxxamt";
+
+// actions 
+"action_logout" = "Tuffɣa";
+"view" = "Wali";
+"delete" = "Kkes";
+"share" = "Bḍu";
+"redact" = "Sfeḍ";
+"resend" = "Ɛawed azen";
+"copy_button_name" = "Nɣel";
+"send" = "Azen";
+"leave" = "Ffeɣ";
+"save" = "Sekles";
+"cancel" = "Sefsex";
+
+// Room Screen 
+
+// general errors 
+
+// Home Screen 
+
+// Last seen time 
+
+// call events 
+
+/* -*- 
+   Automatic localization for en
+
+   The following key/value pairs were extracted from the android i18n file:
+    /console/src/main/res/values/strings.xml.
+*/
+
+
+// titles 
+
+// button names 
+"ok" = "IH";
+"notice_room_created_by_you_for_dm" = "Terniḍ.";
+"notice_room_created_by_you" = "Aql-ak·akem terniḍ, tsewleḍ taxxamt.";
+"notice_conference_call_request_by_you" = "Tsutreḍ-d asarag VoIP";
+"notice_avatar_url_changed_by_you" = "Tbeddleḍ avatar-inek·inem";
+"notice_room_reject_by_you" = "Tufiḍ tinubga";
+"notice_room_leave_by_you" = "Truḥeḍ";
+"notice_room_join_by_you" = "Terniḍ";
+"notice_conference_call_finished" = "Asarag VoIP yekfa";
+"notice_conference_call_started" = "Asarag VoIP yebda";
+
+// Country picker
+"country_picker_title" = "Fren tamurt";
+"public" = "Azayez";
+"private" = "Amaẓlay";
+"default" = "amezwer";
+"error" = "Tuccḍa";
+"e2e_passphrase_create" = "Rnu tafyirt tuffirt";
+"e2e_passphrase_not_match" = "Tifyar tuffirin ilaq ad mṣadant";
+"e2e_passphrase_empty" = "Tafyirt tuffirt ur ilaq ara ad ilint d tilmawin";
+"e2e_passphrase_confirm" = "Sentem tafyirt tuffirt";
+"e2e_export" = "Sifeḍ";
+
+// E2E export
+"e2e_export_room_keys" = "Sifeḍ tisura n texxamt";
+"e2e_passphrase_enter" = "Sekcem tafyirt tuffirt";
+"e2e_import" = "Kter";
+
+// E2E import
+"e2e_import_room_keys" = "Kter tisura n texxamt";
+"format_time_d" = "d";
+"format_time_h" = "sr";
+
+// Time
+"format_time_s" = "s";
+"group_section" = "Igrawen";
+
+// Groups
+"group_invite_section" = "Inced-d";
+"attachment_cancel_upload" = "Sefsex asali?";
+"attachment_cancel_download" = "Sefsex asider?";
+"room_member_power_level_prompt" = "Ur tettizmireḍ ara ad tesfesxeḍ asnifel-a acku tessebɣaseḍ aseqdac ad yesɛu aswir n tezmert am kečč·kemm.\nTebɣiḍ s tidet?";
+"room_no_conference_call_in_encrypted_rooms" = "Isiwlen isaragen ur ttwasefraken ara deg texxamin yettwawgelhen";
+"room_no_power_to_create_conference_call" = "Tesriḍ tisirag akken ad tebduḍ asarag deg texxamt-a";
+"room_left_for_dm" = "Truḥeḍ";
+"room_left" = "Teǧǧiḍ taxxamt";
+"room_error_timeline_event_not_found_title" = "Asali n yideg n tesnakudt ur yeddi ara";
+"room_error_join_failed_title" = "Anekcum ɣer texxamt ur yeddi ara";
+"account_error_email_wrong_description" = "Tagi ur tettban ara d tansa n yimayl tameɣtut";
+"account_error_email_wrong_title" = "Tansa n yimayl d tarameɣtut";
+"account_msisdn_validation_error" = "Asenqed n wuṭṭun n tilifun ur yeddi ara.";
+"account_msisdn_validation_title" = "Asenqed yettṛaǧu";
+"account_email_validation_message" = "Ma ulac aɣilif, senqed imayl-ik/im syen sit ɣef useɣwen i yellan. Akken ara yemmed waya, sit ad tkemmleḍ.";
+"account_email_validation_title" = "Asenqed yettṛaǧu";
+
+// Account
+"account_save_changes" = "Sekles ibeddilen";
+"room_event_encryption_verify_ok" = "Senqed";
+"room_event_encryption_info_unblock" = "Kkes seg tebdart taberkant";
+"room_event_encryption_info_block" = "Tabdart taberkant";
+"room_event_encryption_info_unverify" = "Ur yettusenqed ara";
+"room_event_encryption_info_device_blocked" = "Deg tebdart taberkant";
+"room_event_encryption_info_device_verified" = "Yettwasenqed";
+"room_event_encryption_info_event_none" = "ulac";
+"device_details_delete_prompt_message" = "Tamahelt-a tesra asentem-nniḍen.\nI ukemmel, ma ulac aɣilif sekcem awal-ik·im uffir.";
+"device_details_delete_prompt_title" = "Asesteb";
+"device_details_rename_prompt_message" = "Isem n tiɣimit tazayezt yettban i yimdanen wukud tettmeslayeḍ";
+
+// Settings
+"settings" = "Iɣewwaren";
+"notice_encrypted_message" = "Izen yettwawgelhen";
+"notice_room_join_rule_invite_by_you_for_dm" = "Tgiḍ aya i tinubga kan.";
+"notice_room_join_rule_invite_by_you" = "Terriḍ taxxamt s tinubga kan.";
+"unignore" = "Ur yettwazgel ara";
+"ignore" = "Ttu";
+"show_details" = "Sken talqayt";
+"cancel_download" = "Sefsex Asider";
+"cancel_upload" = "Sefsex Asali";
+"select_all" = "Fren kulec";
+"reset_to_default" = "Wennez ɣer umezwer";
+"mention" = "Abder";
+"start_video_call" = "Yebda usiwel s tvidyut";
+"start_voice_call" = "Yebda usiwel s taɣect";
+"submit" = "Azen";
+"sign_up" = "Jerred";
+"retry" = "Ɛreḍ tikkelt-nniḍen";
+"dismiss" = "Agi";
+"discard" = "Ignorer";
+"continue" = "Kemmel";
+"close" = "Mdel";
+"back" = "Uɣal ɣer deffir";
+"abort" = "Sefsex";
+"yes" = "Ih";
+
+// Action
+"no" = "Uhu";
+"login_error_resource_limit_exceeded_contact_button" = "Nermes anedbal";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "Aqeddac-a agejdan yewweḍ ɣer talast n useqdac urmid n wayyur.";
+"login_error_resource_limit_exceeded_message_default" = "Aqeddac-a agejdan iɛedda yiwet seg tlisa-ines tiɣbula.";
+"login_error_resource_limit_exceeded_title" = "Talast n yiɣbula tettuɛedda";
+"login_desktop_device" = "Aniraw";
+"login_tablet_device" = "Taṭablit";
+"login_mobile_device" = "Aziraz";
+"login_leave_fallback" = "Sefex";
+"login_error_login_email_not_yet" = "Aseɣwen n yimayl iɣef mazal ur yettusit ara fell-as";
+"login_error_user_in_use" = "Isem n useqdac-a yettwaseqdac yakan";
+"login_error_limit_exceeded" = "Aṭas n yisuturen i yettwaznen";
+"login_error_not_json" = "Ulac deg-s JSON ameɣtu";
+"login_error_bad_json" = "JSON ur yemsil ara akken iwata";
+"login_error_unknown_token" = "Ajuṭu n unekcum i yettwafernen ur yettwassen ara";
+"login_error_forbidden" = "Isem n uqeddac/awal uffir d arameɣtu";
+"login_email_placeholder" = "Tansa n l'email";
+"login_password_placeholder" = "Mot de passe";
+/* *********************** */
+/*      iOS specific       */
+/* *********************** */
+
+"matrix" = "Matrix";
+"account_msisdn_validation_message" = "Ad naze-n SMS deg-s tangalt n usenqed. Ttxil-k·m sekcem tangalt-a ddaw.";
+"login_server_url_placeholder" = "URL (e.g. https://matrix.org)";
+"notification_settings_per_room_notifications" = "Ilɣa s texxamt";
+"notification_settings_per_word_notifications" = "Ilɣa s awal";
+"notice_redaction_by_you" = "Tsemsawiḍ aneḍru (asulay: %@)";
+"notice_room_third_party_revoked_invite_by_you_for_dm" = "Tesfesxeḍ tinubga n %@";
+"notice_room_third_party_revoked_invite_for_dm" = "%@ isefsex tinubga n %@";
+"device_details_last_seen" = "Timeẓri taneggarut\n";
+"notice_feedback" = "Aneḍru n timawin (asulay: %@): %@";
+"login_error_registration_is_not_supported" = "Iklasen ur ttusefraken ara akka tura";
+"ssl_only_accept" = "Ur qebbel ara aselkin alamma isuffeɣ-d unedbal n uqeddac adsil umḍin yemṣadan d win yellan ddaw-a.";
+"ssl_fingerprint_hash" = "Adsil umḍin (%@):";
+"call_invite_expired" = "Ancad ɣer usiwel yezri";
+
+// Settings keys 
+
+// call string
+"call_waiting" = "Yettraǧu...";
+"settings_config_user_id" = "Asulay n useqdac:%@";
+"notification_settings_other_alerts" = "Ilɣuten-nniḍen";
+"notification_settings_select_room" = "Fren taxxamt";
+"notification_settings_sender_hint" = "@user:domain.com";
+"notification_settings_highlight" = "Asebrureq";
+"notification_settings_never_notify" = "Ur ttelɣu ara akk";
+"notification_settings_always_notify" = "Selɣu yal tikkelt";
+"notification_settings_enable_notifications" = "Rmed ilɣa";
+"num_members_other" = "%@ iseqdacen";
+"num_members_one" = "%@ n useqdac";
+"membership_ban" = "Yettwagdel";
+"notice_profile_change_redacted_by_you" = "Tleqqmeḍ amaɣnu-inek·inem %@";
+"notice_event_redacted_by_you" = " sɣur-k·m";
+"notice_display_name_set_by_you" = "Tesbadud isem n uskan ɣer %@";
+"notice_room_unban_by_you" = "Tgedleḍ %@";
+"notice_room_third_party_registered_invite_by_you" = "Tqebleḍ tinubga n %@";
+"notice_room_third_party_invite_by_you_for_dm" = "Tnecdeḍ-d %@";
+"notice_room_invite_you" = "%@ inced-ik·kem-id";
+
+// Notice Events with "You"
+"notice_room_invite_by_you" = "Tnecdeḍ-d %@";
+"notice_conference_call_request" = "%@ isuter asarag VoIP";
+"notice_ended_video_call" = "%@ iḥbes asiwel";
+"notice_answered_video_call" = "%@ yerra ɣef usiwel";
+"notice_placed_video_call" = "%@ isɛedda siwel s tvidyut";
+"notice_placed_voice_call" = "%@ isɛedda asiwel s taɣect";
+"notice_avatar_url_changed" = "%@ t·ibeddel·t avatar-ines";
+"notice_room_ban" = "%@ igdel %@";
+"notice_room_unban" = "%@ ur yegdil ara %@";
+"notice_room_kick" = "%@ isuffeɣ %@";
+"notice_room_reject" = "%@ yugi tinubga";
+"notice_room_leave" = "%@ azelmaḍ";
+"notice_room_join" = "%@ yerna";
+"notice_room_third_party_registered_invite" = "%@ yeqbel tinnubga n %@";
+"notice_room_third_party_invite_for_dm" = "%@ inced-d %@";
+
+/* -*- 
+   Automatic localization for en
+
+   The following key/value pairs were extracted from the android i18n file:
+    /matrix-sdk/src/main/res/values/strings.xml.
+*/
+
+"notice_room_invite" = "%@ inced-d %@";
+"ssl_homeserver_url" = "URL n uqeddac agejdan: %@";
+"user_id_placeholder" = "am.: @bob:amedya.com";
+"network_error_not_reachable" = "Ma ulac aɣilif senqed tuqqna-inek·inem";
+"offline" = "aruqqin";
+
+// Others
+"user_id_title" = "Asulay n useqdac:";
+"format_time_m" = "m";
+"search_searching" = "Anadi la iteddu...";
+
+// Search
+"search_no_results" = "Ulac igmaḍ";
+"contact_local_contacts" = "Inermisen idiganen";
+
+// Contacts
+"contact_mx_users" = "Iseqdacen n Matrix";
+"attachment_e2e_keys_import" = "Kter...";
+"attachment_large" = "Meqqer: %@";
+"attachment_medium" = "Alemmas: %@";
+"attachment_small" = "Mecṭuḥ: %@";
+"message_reply_to_sender_sent_a_file" = "yuzen afaylu.";
+"message_reply_to_sender_sent_a_video" = "yuzen-d tavidyut.";
+
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "Azen tugna.";
+
+// Room
+"room_please_select" = "Ttxil-k·m fren taxxamt";
+"room_creation_participants_title" = "Imttekkiyen:";
+"room_creation_alias_placeholder_with_homeserver" = "(am. +foo%@)";
+"room_creation_name_placeholder" = "(am. lunchGroup)";
+
+// Room creation
+"room_creation_name_title" = "Isem n texxamt:";
+"account_error_msisdn_wrong_description" = "Ur yettban ara wagi d uṭṭun n tiliɣri ameɣtu";
+"account_error_msisdn_wrong_title" = "Yir uṭṭun n tiliɣri";
+"account_error_matrix_session_is_not_opened" = "Tiɣimit n Matrix ur teldi ara";
+"account_email_validation_error" = "Ulamek akk tettwasenqed tansa n yimayl. Ma ulac aɣilif senqed imayl-inek·inem syen sit ɣef useɣwen yellan deg-s. Akken ara tgeḍ aya, sit ɣef kemmel";
+"room_event_encryption_info_verify" = "Senqed...";
+"room_event_encryption_info_device_not_verified" = "UR yettwasenqed ARA";
+"room_event_encryption_info_device_fingerprint" = "Adsil umḍin Ed25519\n";
+"room_event_encryption_info_device_name" = "Isem azayez\n";
+"room_event_encryption_info_event_unencrypted" = "ur yettwawgelhen ara";
+"room_event_encryption_info_event_decryption_error" = "Tuccḍa deg tukksa n uwgelhen\n";
+"room_event_encryption_info_event_algorithm" = "Alguritm\n";
+"room_event_encryption_info_event_fingerprint_key" = "Tasarut n udsil umḍin Ed25519 tettusra\n";
+"room_event_encryption_info_event_identity_key" = "Tasarut n timagit Curve25519\n";
+"room_event_encryption_info_event_user_id" = "Asulay n useqdac\n";
+"room_event_encryption_info_event" = "Talɣut n uneḍru\n";
+
+// Encryption information
+"room_event_encryption_info_title" = "Talɣut n uwgelhen seg yixef ɣer yixef\n\n";
+"device_details_rename_prompt_title" = "Isem n tɣimit";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_name" = "Isem azayez\n";
+
+// Devices
+"device_details_title" = "Talɣut ɣef tɣimit\n";
+"notification_settings_room_rule_title" = "Taxxamt: '%@'";
+"settings_enter_validation_token_for" = "Sekcem ajiṭun n usentem i %@:";
+"settings_enable_push_notifications" = "Rmed ilɣa n push";
+"room_displayname_more_than_two_members" = "%@ d %@ d wiyaḍ";
+"room_displayname_two_members" = "%@ akked %@";
+
+// room display name
+"room_displayname_empty_room" = "Texxamt tilemt";
+"notice_crypto_unable_to_decrypt" = "**Ukamek yettwakkes uwgelhen: %@**";
+"notice_invalid_attachment" = "taceqquft yeddan d tarameɣtut";
+"notice_file_attachment" = "afaylu yeddan";
+"notice_room_related_groups" = "Igrawen icudden ɣer texxamt-a d: %@";
+"notice_room_join_rule_public" = "%@ yerra taxxamt d tazayazt.";
+"notice_room_created_for_dm" = "%@ yerna.";
+"notice_room_created" = "%@ yerna taxxamt syen iswel-itt.";
+"notice_profile_change_redacted" = "%@ leqqmen amaɣnu-nsen %@";
+"notice_event_redacted_by" = " s %@";
+"notice_event_redacted" = "<redacted%@>";
+
+// Events formatter
+"notice_avatar_changed_too" = "(ula d avaṭar yettubeddel)";
+"reject_call" = "Agi asiwel";
+"answer_call" = "Err ɣef usiwel";
+"resend_message" = "Ales tuzna n yizen";
+"capture_media" = "Ṭṭef tawlaft/tavidyut";
+"select_account" = "Fren amiḍan";
+"start_chat" = "Bdu adiwenni";
+"set_admin" = "Sbadu anedbal";
+"submit_code" = "Azen tangalt";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nTtxil-k·m nermes anedbal-ik·im n uqeddac i wakken ad tkemmleḍ aseqdec n uqeddac-a.";
+"register_error_title" = "Ajerred yecceḍ";
+"login_invalid_param" = "Aɣewwar d arameɣtu";
+"login_use_fallback" = "Seqdec asebtar n ufrananeggaru";
+"login_prompt_email_token" = "Ttxil-k sekcem ajuṭu-inek·inem n usentem n yimayl:";
+"login_optional_field" = "d afrayan";
+"login_identity_server_title" = "URL n uqeddac n timagit:";
+"login_home_server_title" = "URL n uqeddac agejdan:";
+
+// Login Screen
+"login_create_account" = "Rnu amiḍan:";
+"notification_settings_per_word_info" = "Awalen i d-yettwafen s war ma nefka azal i umṣada n yisekkilen, i izemren ad yesεu ajukeṛ *. Ihi:\nfoo yufa-d azrir foo zzin-as-d s yijemmaqen n wawalen (am. aisgez, tallunt d tazwara neɣ taggara n yizirig).\nfoo* yufa-d meṛṛa awalen i ibeddun s foo.\n*foo* yufa-d akk awalen ideg llan kraḍ n yisekkilen-a foo.";
+"notification_settings_global_info" = "Iɣewwaren n yilɣa ttuskelsen deg umiḍan-inek·inem n useqdac, ad ttwabḍun gar meṛṛa imsaɣen ara ten-isferken (ula d iɣewwaren n tnarit).\n\nIlugan ttusnasen akken myezwaren; alugan amezwaru i yemṣadan tesbaduy agmuḍ n yizen.\nIhi: Ilɣa s wawal sεan azal ugar n yilɣa s texxamt i yesεan azal ula d nutni ɣef yilɣa s umazan.\nI wugar n yilugan n yiwen wanaw, amezwaru deg tebdart yemṣadan d netta i d tazwart.";
+"local_contacts_access_discovery_warning" = "I usnirem n yinermisen s useqdec yakan n Matrix, %@ yezmer ad yazen tansiwin n yimayl d wuṭṭunen n tiliɣri n udlis-inek·inem n tansiwin ɣer uqeddac-inek·inem n timagit n Matrix i tferneḍ. Ma yella yettusefrak, isefka-inek·inem udmawanen ad ttwagzamen send ad ttwaznen - ttxil-k·m senqed tasertit n tudert tabaḍnit n uqeddac-ik·im n timagit i wugar n telqayt.";
+"local_contacts_access_not_granted" = "I usnirem n yiseqdacen seg yinermisen idiganen, anekcum ɣer yinermisen yettusra maca %@ ur yesεi ara tisirag ad t-iseqdec";
+"e2e_export_prompt" = "Akala-a ad ak·am-imudd tisirag i usifeḍ n tsura n yiznan i d-tremseḍ deg texxamin yettwawgelhen, ɣer ufaylu adigan. Syen tzemreḍ ad tketreḍ afaylu deg umsaɣ-nniḍen n Matrix, i wakken amsaɣ-a ad yizmir ad yekkes awgelhen i yiznan-a.\nAfaylu i d-yettusifḍen ad imudd tisirag i yal win i izemren ad t-iɣer, ad yekkes awgelhen i yiznan yettwawgelhen i tzemreḍ ad twaliḍ. Γef waya ilaq ad t-tḥerzeḍ deg wadeg aɣellsan.";
+"e2e_import_prompt" = "Akala-a ad ak·am-imudd tisirag i wakken ad tketreḍ tisura i d-tsifḍeḍ yakan seg umsaɣ-nniḍen n Matrix. Tzemreḍ mbeεd ad tekkseḍ awgelhen n yal izen iwumi yezmer umsaɣ-nniḍen ad asen-yekkes awgelhen.\nAfaylu i d-yettisifḍen yettwammesten s tefyirt tuffirt. Ilaq ad teskecmeḍ tafyirt tuffirt dagi, i wakken ad tekkseḍ awgelhen i ufaylu.";
+"attachment_e2e_keys_file_prompt" = "Afaylu-a deg-s tisura n uwgelhen ttusifḍent-d seg umsaɣ Matrix.\nTebɣiḍ ad twaliḍ agbur n ufaylu neɣ ad d-tketreḍ tisura i yellan deg-s?";
+"room_error_timeline_event_not_found" = "Asnas yettaεraḍ ad d-isali kra n wagazen ufrinen deg tesnakudt n texxamt, maca ur tt-yifi ara";
+"room_event_encryption_verify_message" = "I usenqed n tɣimit-a ma tzemreḍ ad tettekleḍ fell-as, ttxil-k·m nermes bab-is s useqdec s ubrid-nniḍen (am. s timmad-is neɣ s usiwel) syen steqsi-t ma yella tasarut i yettwali deg yiɣewwaren-is n useqdac n tɣimit-a temṣada d tsarut yellan ddaw:\n\n Isem n tɣimit: %@\n Asulay n texxamt: %@\n Tasarut n texxamt: %@\n\nMa yella mṣadant, sit ɣef tqeffalt n usenqed ddaw. Ma yella ur mṣadant ara, ihi yella win i yettεekkiṛen tiɣimit-a, neɣ ahat tebɣiḍ ad tsiteḍ ɣef tqeffalt n tebdart taberkant deg ubdel.\n\nΓer sdat, akala-a n usenqed-a ad yuɣal yemmed ugar.";
+"call_connecting" = "Asiwel iteddu...";
+"settings_config_identity_server" = "Aqeddac n timagit: %@";
+
+// gcm section 
+"settings_config_home_server" = "Aqeddac agejdan: %@";
+"notification_settings_by_default" = "S umezwer...";
+"notification_settings_suppress_from_bots" = "Kkes ilɣa n yiṛubuten";
+"notification_settings_receive_a_call" = "Lɣu-yi-d mi ara yi-d-yaweḍ usiwel";
+"notification_settings_people_join_leave_rooms" = "Lɣu-yi-d mi ara ad d-rnun neɣ ad ǧǧen yimdanen tixxamin";
+"notification_settings_invite_to_a_new_room" = "Lɣu-yi-d mi ara ttunecdeɣ ɣer texxamt tamaynut";
+"notification_settings_just_sent_to_me" = "Lɣu-yi-d s yimesli ɣef yiznan i d-yettwaznen i nekk kan";
+"notification_settings_contain_my_display_name" = "Lɣu-yi-d s yimesli ɣef yiznan ideg yella yisem-iw ameskan";
+"notification_settings_contain_my_user_name" = "Lɣu-yi-d s yimesli ɣef yiznan ideg yella yisem-inu n useqdac";
+"notification_settings_per_sender_notifications" = "Ilɣa s umazan";
+"notification_settings_custom_sound" = "imesli udmawan";
+"notification_settings_word_to_match" = "awala ara d-yettwafen";
+"notification_settings_enable_notifications_warning" = "Meṛṛa ilɣa nsan akka tura ɣef meṛṛa ibenkan.";
+
+// Notification settings screen 
+"notification_settings_disable_all" = "Sens meṛṛa ilɣa";
+
+// contacts list screen 
+"invitation_message" = "Bɣiɣ ad mmeslayeɣ yid-k·m s Matrix. Ttxil-k·m, rzu ɣer usmel web http://matrix.org i wugar n talɣut.";
+
+// Login Screen 
+"login_error_already_logged_in" = "Yeqqen yakan";
+"message_unsaved_changes" = "Llan isenfal ur nettusekles ara. Tuffɣa ad ten-tsefsex.";
+"unban" = "Kkes agdel";
+"notice_room_history_visible_to_members_from_joined_point_by_you_for_dm" = "Terriḍ iznan si sya d asawen ad ttbanen i yal yiwen, segmi ara d-rnun.";
+"notice_room_history_visible_to_members_from_joined_point_by_you" = "Terriḍ azray n texxamt si sya d asawen ad d-yettban i meṛṛa imttekkiyen n texxamt, sgmi ara d-rnun.";
+"notice_room_history_visible_to_members_from_invited_point_by_you_for_dm" = "Terriḍ iznan si sya d asawen ad d-ttbanen i yal yiwen, segmi ara d-ttusnubegten.";
+"notice_room_history_visible_to_members_from_invited_point_by_you" = "Terriḍ azray n texxamt si sya d asawen ad d-yettban i meṛṛa imttekkiyen n texxamt, segmi ara d-ttusnubegten.";
+"notice_room_history_visible_to_members_by_you_for_dm" = "Terriḍ iznan si sya ɣer sdat ad d-ttbanen i meṛṛa imttekkiyen n texxamt.";
+"notice_room_history_visible_to_members_by_you" = "Terriḍ azray n texxamt si sya ɣer sdat ad d-yettban i meṛṛa imttekkiyen n texxamt.";
+"notice_room_history_visible_to_anyone_by_you" = "Terriḍ azray n texxamt si sya ɣer sdat ad yettban i yal yiwen.";
+"notice_encryption_enabled_unknown_algorithm_by_you" = "Tremdeḍ awgelhen seg yixef ɣer yixef (alguritm d arussin %@).";
+"notice_encryption_enabled_ok_by_you" = "Tremdeḍ awgelhen seg yixef ɣer yixef.";
+"notice_room_topic_removed_by_you" = "Tekkseḍ asentel";
+"notice_room_name_removed_by_you_for_dm" = "Tekkseḍ isem";
+"notice_room_name_removed_by_you" = "Tekkseḍ isem n texxamt";
+"notice_ended_video_call_by_you" = "Tekfiḍ asiwel";
+"notice_answered_video_call_by_you" = "Terriḍ ɣef usiwel";
+"notice_placed_video_call_by_you" = "Tseεeddaḍ asiwel s tvidyut";
+"notice_placed_voice_call_by_you" = "Tesεeddaḍ asiwel s umeslaw";
+"notice_room_name_changed_by_you_for_dm" = "Tbeddleḍ isem s %@.";
+"notice_room_name_changed_by_you" = "Tbeddleḍ isem n texxamt s %@.";
+"notice_topic_changed_by_you" = "Tbeddleḍ asentel s \"%@\".";
+"notice_display_name_removed_by_you" = "Tekkzeḍ isem-inek·inem ameskan";
+"notice_display_name_changed_from_by_you" = "Tbeddleḍ isem-inek ameskan seg %@ ɣer %@";
+"notice_room_withdraw_by_you" = "Tesfesxeḍ tinubga n %@";
+"notice_room_kick_by_you" = "Tsuffɣeḍ %@";
+"notice_room_ban_by_you" = "Tgedleḍ %@";
+"notice_room_third_party_revoked_invite_by_you" = "Tekkseḍ tinubga n %@ i wakken ad d-yernu ɣer texxamt";
+"notice_room_third_party_invite_by_you" = "Tuzneḍ tinubga i %@ i wakken ad d-yernu ɣer texxamt";
+"notice_room_name_changed_for_dm" = "%@ ibeddel isem s %@.";
+"notice_room_name_changed" = "%@ ibeddel isem n texxamt s %@.";
+"notice_topic_changed" = "%@ ibeddel asentel s \"%@\".";
+"notice_display_name_removed" = "%@ yekkes isem-is ameskan";
+"notice_display_name_changed_from" = "%@ ibeddel isem-is ameskan seg %@ ɣer %@";
+"notice_display_name_set" = "%@ yesbadu isem-ines ameskan s %@";
+"notice_room_reason" = "Ssebba: %@";
+"notice_room_withdraw" = "%@ isefsex tinubga n %@";
+"notice_room_third_party_revoked_invite" = "%@ yekkes tinubga n %@ i wakken ad d-yernu ɣer texxamt";
+"notice_room_third_party_invite" = "%@ yuzen tinubga i %@ i wakken ad d-yernu  ɣer texxamt";
+"language_picker_default_language" = "Amezwer (%@)";
+
+// Language picker
+"language_picker_title" = "Fren tutlayt";
+"local_contacts_access_discovery_warning_title" = "Asnirem n yiseqdacen";
+"microphone_access_not_granted_for_call" = "Isawalen sran ad kecmen ɣer usawaḍ maca %@ ur yesεi ara tisirag ad t-iseqdec";
+
+// Permissions
+"camera_access_not_granted_for_call" = "Isawalen s tvidyut sran anekcum ɣer tkamiṛat maca %@ ur yesεi ara tisirag ad tt-iseqdec";
+"power_level" = "Aswir n tezmert";
+"not_supported_yet" = "Ur yettusefrak ara akka tura";
+"error_common_message" = "Tella-d tuccḍa. Ttxil-kṃ εreḍ tikkelt-nniḍen ticki.";
+"unsent" = "Ur yettwazen ara";
+"attachment_multiselection_original" = "Teɣzi tamirant";
+"attachment_multiselection_size_prompt" = "Tebɣiḍ ad tazneḍ iznan d:";
+"attachment_original" = "Teɣzi tamirant: %@";
+
+// Attachment
+"attachment_size_prompt" = "Tebɣiḍ ad t-tazneḍ d:";
+
+// Room members
+"room_member_ignore_prompt" = "D tidet tebɣiḍ ad teffreḍ meṛṛa iznan i d-yusan sɣur aseqdac-a?";
+"message_reply_to_message_to_reply_to_prefix" = "D tiririt i";
+"message_reply_to_sender_sent_an_audio_file" = "yuzen afaylu ameslaw.";
+"room_error_cannot_load_timeline" = "Asali n tesnakudt ur yeddi ara";
+"room_error_topic_edition_not_authorized" = "Ur tesεiḍ tisirag ad tesnefleḍ asentel n texxamt-a";
+"room_error_name_edition_not_authorized" = "Ur tesεiḍ ara tisirag ad tesnefleḍ isem n texxamt-a";
+"room_error_join_failed_empty_room" = "D awezɣi akka tura ad talseḍ tuɣalin ɣer texxamt tilemt.";
+"room_creation_participants_placeholder" = "(am. @bob:homeserver1; @john:homeserver2...)";
+"room_creation_alias_placeholder" = "(am. #foo:example.org)";
+"room_creation_alias_title" = "Isem yettunefken i texxamt:";
+"account_error_push_not_allowed" = "Ilɣa ur ttusirgen ara";
+"account_error_picture_change_failed" = "Asenfel n tugna yecceḍ";
+"account_error_display_name_change_failed" = "Asenfel n yisem ameskan yecceḍ";
+"account_linked_emails" = "Imaylen yettwacudden";
+"account_link_email" = "Rnu imayl";
+"room_event_encryption_verify_title" = "Senqed tiɣimit\n\n";
+"room_event_encryption_info_device_verification" = "Asenqed\n";
+"room_event_encryption_info_device_id" = "Asulay\n";
+"room_event_encryption_info_device_unknown" = "tiɣimit tarussint\n";
+"room_event_encryption_info_device" = "\nTalɣut n tɣimit n umazan\n";
+"room_event_encryption_info_event_session_id" = "Asulay n tɣimit\n";
+"device_details_identifier" = "Asulay\n";
+"settings_enable_inapp_notifications" = "Rmed ilɣa deg usnas";
+"notice_in_reply_to" = "D tiririt i";
+"notice_sticker" = "astiker";
+"notice_crypto_error_unknown_inbound_session_id" = "Tiɣimit n umazan ur aɣ-d-tuzin ara tisura i yizen-a.";
+"notice_room_history_visible_to_members_from_joined_point_for_dm" = "%@ yerra iznan si sya ɣer sdat ttbanen i yal yiwen, seg wasmi ara d-rnun.";
+"notice_room_history_visible_to_members_from_joined_point" = "%@ yerra azray n texxamt si sya ɣer sdat yettban i meṛṛa imttekkiyen, seg wasmi ara d-rnun.";
+"notice_room_history_visible_to_members_from_invited_point_for_dm" = "%@ yerra azray n texxamt si sya ɣer sdat yettban i yal yiwen, segmi ara d-yettusnubget.";
+"notice_room_history_visible_to_members_from_invited_point" = "%@ yerra azray n texxamt si sya ɣer sdat yettban i meṛṛa imttekkiyen n texxamt, seg wasmi ara d-ttusnubegten.";
+"notice_room_history_visible_to_anyone" = "%@ yerra azray n texxamt si sya ɣer sdat yettban i yal yiwen.";
+"notice_room_history_visible_to_members" = "%@ yerra azray n texxamt si sya ɣer sdat yettban i meṛṛa imttekkiyen n texxmat.";
+"notice_room_history_visible_to_members_for_dm" = "%@ yerra iznan si sya ɣer sdat ttbanen i meṛṛa imttekkiyen n texxamt.";
+"notice_error_unknown_event_type" = "Anaw n uneḍru d arussin";
+"notice_error_unexpected_event" = "Aneḍru ur nettwaṛǧæ ara";
+"notice_error_unsupported_event" = "Aneḍru ur yettusefrak ara";
+"notice_redaction" = "%@ yekkes aneḍru (asulay: %@)";
+"notice_unsupported_attachment" = "taceqquft yeddan ur tettusefrak ara: %@";
+"notice_location_attachment" = "adig yeddan";
+"notice_video_attachment" = "tavidyut yeddan";
+"notice_audio_attachment" = "ameslaw yeddan";
+"notice_image_attachment" = "tugna yeddan";
+"notice_encryption_enabled_unknown_algorithm" = "%1$@ yermed awgelhen seg yixef ɣer yixef (alguritm %2$@ d arussin).";
+"notice_encryption_enabled_ok" = "%@ yermed awgelhen seg yixef ɣer yixef.";
+"notice_room_aliases_for_dm" = "Ismawen yettunefken d: %@";
+"notice_room_aliases" = "Ismawen yettunefken i texxamt d: %@";
+"notice_room_power_level_event_requirement" = "Iswiren n tezmert addayen icudden ɣer yineḍruyen d:";
+"notice_room_power_level_acting_requirement" = "Iswiren n tezmert addayen i yezmer ad yesεu useqdac send asedmer d:";
+"notice_room_power_level_intro" = "Aswir n tezmert n yimttekkiyen n texxamt d:";
+"notice_room_power_level_intro_for_dm" = "Aswir n tezmert n yimttekkiyen d:";
+"notice_room_join_rule_public_by_you_for_dm" = "Terriḍ aya d azayaz.";
+"notice_room_join_rule_public_by_you" = "Terriḍ taxxamt d tazayazt.";
+"notice_event_redacted_reason" = " [ssebba: %@]";
+"notice_room_join_rule_public_for_dm" = "%@ yerra aya d azayaz.";
+"notice_room_join_rule_invite_for_dm" = "%@ yerra aya s tinubga kan.";
+//  New
+"notice_room_join_rule_invite" = "%@ yerra taxxamt s tinubga kan.";
+//  Old
+"notice_room_join_rule" = "Alugan n tmerna d: %@";
+"notice_room_topic_removed" = "%@ yekkes asentel";
+"notice_room_name_removed" = "%@ yekkes isem n texxamt";
+"notice_room_name_removed_for_dm" = "%@ yekkes isem";
+"end_call" = "Kfu asiwel";
+"invite_user" = "Snubget-d aseqdac n Matrix";
+"attach_media" = "Seddu amidyat seg temkarḍit";
+"set_moderator" = "Sbadu imḍebber";
+"set_power_level" = "Sbadu aswir n tezmert";
+"set_default_power_level" = "Wennez aswir n tezmert";
+"login_error_forgot_password_is_not_supported" = "Tatut n wawal uffir ur yettusefrak ara akka tura";
+"login_error_do_not_support_login_flows" = "Akka tura ur nsefrak ara ula yiwen neɣ meṛṛa aragen yettusbadun s uqeddac-a agejdan";
+"login_error_no_login_flow" = "Tiririt n telɣut n usesteb seg uqeddac-a agejdan ur teddi ara";
+"login_error_title" = "Anekcum yecceḍ";
+"login_email_info" = "Afran n tansa n yiamyl tettaǧǧa iseqdacen-nniḍen ad ak·akem-afen deg Matrix s sshala, rnu ad ak-tmudd abrid ad twennzeḍ awala-ik·im uffir ar sdat.";
+"login_display_name_placeholder" = "Isem yettwaskanen (am. Bob Obson)";
+"login_user_id_placeholder" = "Asulay n Matrix (am. @bob:matrix.org neɣ bob)";
+"login_identity_server_info" = "Matrix yettmuddu-d iqeddacen n timagit i ucuddu n yimaylen, atg. Wuɣur ttuɣalen yisulayen n Matrix. Ala https://matrix.org i yellan akka tura.";
+"login_home_server_info" = "Aqeddac-ik·im agejdan isseklas meṛṛa idiwenniyen-inek·inem d yisefka n umiḍan-inekịnem";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/ko.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/ko.lproj/MatrixKit.strings
new file mode 100644
index 000000000..88e2af12a
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/ko.lproj/MatrixKit.strings
@@ -0,0 +1,381 @@
+"view" = "보기";
+"back" = "돌아가기";
+"continue" = "계속";
+"leave" = "떠나기";
+"invite" = "초대";
+"retry" = "다시 시도";
+"cancel" = "취소";
+"save" = "저장";
+"matrix" = "Matrix";
+// Login Screen
+"login_create_account" = "계정 만들기:";
+"login_server_url_placeholder" = "URL (예: https://matrix.org)";
+"login_home_server_title" = "홈서버 URL:";
+"login_identity_server_title" = "ID 서버 URL:";
+"login_user_id_placeholder" = "Matrix ID (예: @bob:matrix.org 혹은 bob)";
+"login_password_placeholder" = "비밀번호";
+"login_optional_field" = "선택";
+"login_email_placeholder" = "이메일 주소";
+"login_error_title" = "로그인 실패";
+"login_error_forbidden" = "잘못된 이름/비밀번호";
+"login_error_user_in_use" = "이 이름은 이미 사용중입니다";
+"login_leave_fallback" = "취소";
+"register_error_title" = "가입 실패";
+"login_error_forgot_password_is_not_supported" = "비밀번호 찾기는 현재 지원하지 않습니다";
+"login_mobile_device" = "모바일";
+"login_tablet_device" = "태블릿";
+"login_desktop_device" = "데스크톱";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "이 홈서버가 월 간 활성 사용자 한도를 초과했습니다.";
+"login_error_resource_limit_exceeded_message_contact" = "\n\n서비스를 계속 이용하려면 서비스 관리자에게 연락하세요.";
+"login_error_resource_limit_exceeded_contact_button" = "관리자에게 연락하기";
+// Action
+"no" = "아니요";
+"yes" = "네";
+"close" = "닫기";
+"sign_up" = "등록하기";
+"submit" = "제출";
+"submit_code" = "코드 제출";
+"set_moderator" = "중재자로 설정";
+"set_admin" = "관리자로 설정";
+"start_chat" = "대화 시작";
+"abort" = "중단";
+"discard" = "삭제";
+"start_voice_call" = "음성 통화 시작";
+"start_video_call" = "영상 통화 시작";
+"select_account" = "계정 선택";
+"capture_media" = "사진/영상 찍기";
+"invite_user" = "Matrix 사용자 초대";
+"reset_to_default" = "기본으로 되돌리기";
+"resend_message" = "메시지 다시 보내기";
+"select_all" = "모두 선택";
+"cancel_upload" = "업로드 취소";
+"cancel_download" = "다운로드 취소";
+"show_details" = "세부 정보 표시";
+"answer_call" = "전화 받기";
+"reject_call" = "전화 거부";
+"end_call" = "전화 끝내기";
+"ignore" = "무시";
+"unignore" = "무시하지 않기";
+"notice_sticker" = "스티커";
+// room display name
+"room_displayname_empty_room" = "빈 방";
+"room_displayname_two_members" = "%@님과 %@님";
+// Settings
+"settings" = "설정";
+"settings_enable_push_notifications" = "푸시 알림 켜기";
+// Devices
+"device_details_title" = "기기 정보\n";
+"device_details_name" = "공개 이름\n";
+"device_details_identifier" = "ID\n";
+"device_details_rename_prompt_message" = "기기의 공개 이름은 대화하는 사람들에게 보여집니다";
+"device_details_delete_prompt_title" = "확인";
+"device_details_delete_prompt_message" = "이 작업은 추가 확인이 필요합니다.\n계속하려면, 비밀번호를 입력해주세요.";
+// Encryption information
+"room_event_encryption_info_title" = "종단간 암호화 정보\n\n";
+"room_event_encryption_info_event_user_id" = "사용자 ID\n";
+"room_event_encryption_info_event_algorithm" = "알고리즘\n";
+"room_event_encryption_info_event_unencrypted" = "암호화되지 않음";
+"room_event_encryption_info_device" = "\n발신자 기기 정보\n";
+"room_event_encryption_info_device_unknown" = "알 수 없는 기기\n";
+"room_event_encryption_info_device_name" = "공개 이름\n";
+"room_event_encryption_info_device_id" = "ID\n";
+"room_event_encryption_info_device_verification" = "확인\n";
+"room_event_encryption_info_device_fingerprint" = "Ed25519 지문\n";
+"room_event_encryption_info_device_verified" = "확인됨";
+"room_event_encryption_info_device_not_verified" = "확인되지 않음";
+"account_link_email" = "이메일 연결";
+"account_linked_emails" = "이메일 연결함";
+// Others
+"user_id_title" = "사용자 ID:";
+"offline" = "오프라인";
+"error" = "오류";
+"not_supported_yet" = "아직 지원하지 않음";
+"default" = "기본";
+"ssl_homeserver_url" = "홈서버 URL: %@";
+// Country picker
+"country_picker_title" = "나라를 고르세요";
+// Language picker
+"language_picker_title" = "언어를 고르세요";
+"language_picker_default_language" = "기본 (%@)";
+"login_home_server_info" = "당신의 홈서버는 대화와 계정 정보를 저장합니다";
+"login_identity_server_info" = "Matrix는 어떤 이메일이 어떤 Matrix ID에 속하느 지 추적하도록 ID 서버를 제공합니다. 현재는 https://matrix.org만 존재합니다.";
+"login_display_name_placeholder" = "표시 이름 (예: Bob Obson)";
+"login_email_info" = "다른 사용자가 Matrix에서 당신을 더 쉽게 찾고, 이후 비밀번호를 다시 설정할 수 있도록 이메일 주소를 지정하세요.";
+"login_prompt_email_token" = "이메일 확인 토큰을 입럭해주세요:";
+"login_error_no_login_flow" = "이 홈서버에서 확인 정보를 검색하는데 실패함";
+"login_error_do_not_support_login_flows" = "현재 이 홈서버가 정의한 일부 혹은 모든 로그인 흐름을 지원하지 않음";
+"login_error_registration_is_not_supported" = "등록을 현재 지원하지 않음";
+"login_error_unknown_token" = "지정된 접근 토큰이 인식되지 않음";
+"login_error_bad_json" = "잘못된 JSON";
+"login_error_not_json" = "올바른 JSON을 포함하지 않음";
+"login_error_limit_exceeded" = "너무 많은 요청을 보냈습니다";
+"login_error_login_email_not_yet" = "아직 클릭하지 않은 이메일 링크";
+"login_use_fallback" = "대체 페이지 사용";
+"login_invalid_param" = "잘못된 매개변수";
+"login_error_resource_limit_exceeded_title" = "리소스 한도 초과됨";
+"login_error_resource_limit_exceeded_message_default" = "이 홈서버가 리소스 한도를 초과했습니다.";
+"dismiss" = "버리기";
+"set_power_level" = "권한 등급 설정";
+"set_default_power_level" = "권한 등급 다시 설정";
+"mention" = "언급";
+"attach_media" = "라이브러리에서 미디어 첨부";
+// Events formatter
+"notice_avatar_changed_too" = "(아바타도 변경됬습니다)";
+"notice_room_name_removed" = "%@님이 방 이름을 제거했습니다";
+"notice_room_topic_removed" = "%@님이 주제를 제거했습니다";
+"notice_event_redacted" = "<%@ 검열됨>";
+"notice_event_redacted_by" = " 사용자 %@님";
+"notice_event_redacted_reason" = " [이유: %@]";
+"notice_profile_change_redacted" = "%@님이 프로필 %@을(를) 업데이트했습니다";
+"notice_room_created" = "%@님이 방을 만들었습니다";
+"notice_room_join_rule" = "참가 규칙: %@";
+"notice_room_power_level_intro" = "방 구성원의 권한 등급:";
+"notice_room_power_level_acting_requirement" = "사용자가 활동할 수 있는 최소 권한 등급:";
+"notice_room_power_level_event_requirement" = "이벤트와 관련된 최소 권한 등급:";
+"notice_room_aliases" = "방의 별칭: %@";
+"notice_room_related_groups" = "이 방과 관련된 그룹: %@";
+"notice_encrypted_message" = "암호화된 메시지";
+"notice_encryption_enabled" = "%@님이 종단간 암호화를 켰습니다 (알고리즘 %@)";
+"notice_image_attachment" = "사진 첨부";
+"notice_audio_attachment" = "소리 첨부";
+"notice_video_attachment" = "영상 첨부";
+"notice_location_attachment" = "위치 첨부";
+"notice_file_attachment" = "파일 첨부";
+"notice_invalid_attachment" = "잘못된 첨부";
+"notice_unsupported_attachment" = "지원하지 않는 첨부: %@";
+"notice_feedback" = "피드백 이벤트 (ID: %@): %@";
+"notice_redaction" = "%@님이 이벤트를 검열했습니다 (ID: %@)";
+"notice_error_unsupported_event" = "지원하지 않는 이벤트";
+"notice_error_unexpected_event" = "예기치 못한 이벤트";
+"notice_error_unknown_event_type" = "알 수 없는 이벤트 유형";
+"notice_room_history_visible_to_anyone" = "%@님이 이후 방 기록을 누구나 볼 수 있게 했습니다.";
+"notice_room_history_visible_to_members" = "%@님이 이후 방 기록을 모든 방 구성원이 볼 수 있게 했습니다.";
+"notice_room_history_visible_to_members_from_invited_point" = "%@님이 이후 방 기록을 초대된 시점부터 모든 방 구성원이 볼 수 있게 했습니다.";
+"notice_room_history_visible_to_members_from_joined_point" = "%@님이 이후 방 기록을 참가한 시점부터 모든 방 구성원이 볼 수 있게 했습니다.";
+"notice_crypto_unable_to_decrypt" = "** 암호를 복호화할 수 없음: %@ **";
+"notice_crypto_error_unknown_inbound_session_id" = "발신자의 기기에서 이 메시지의 키를 보내지 않았습니다.";
+"notice_in_reply_to" = "관련 대화";
+"room_displayname_more_than_two_members" = "%@님 외 %@명";
+"settings_enable_inapp_notifications" = "인앱 알림 켜기";
+"settings_enter_validation_token_for" = "%@의 확인 토큰을 입력하세요:";
+"notification_settings_room_rule_title" = "방: '%@'";
+"device_details_last_seen" = "마지막으로 본 순간\n";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"room_event_encryption_info_event" = "이벤트 정보\n";
+"room_event_encryption_info_event_identity_key" = "Curve25519 ID 키\n";
+"room_event_encryption_info_event_fingerprint_key" = "Ed25519 핑거프린트 키가 필요함\n";
+"room_event_encryption_info_event_session_id" = "세션 ID\n";
+"room_event_encryption_info_event_decryption_error" = "암호 복호화 오류\n";
+"room_event_encryption_info_event_none" = "없음";
+"room_event_encryption_info_device_blocked" = "블랙리스트 대상";
+"room_event_encryption_info_verify" = "확인 중...";
+"room_event_encryption_info_unverify" = "확인하지 않음";
+"room_event_encryption_info_block" = "블랙리스트";
+"room_event_encryption_info_unblock" = "블랙리스트 제외";
+"room_event_encryption_verify_title" = "기기 확인\n\n";
+"room_event_encryption_verify_message" = "이 기기를 신뢰할 수 있는지 확인하려면, 다른 방법을 사용하여 소유자와 연락해주세요 (예: 현실에서 혹은 전화로) 그리고 이 기기의 사용자 설정에서 볼 수 있는 키가 아래의 키와 일치하는지 물어보세요:\n\n\t기기 이름: %@\n\t기기 ID: %@\n\t기기 키: %@\n\n그것이 맞다면, 아래 확인 버튼을 누르세요. 맞지 않다면, 다른 사람이 이 기기를 가로채고 있는 것이고 블랙리스트에 올려야 합니다.\n\n앞으로 이 확인 절차는 더 정교해질 것입니다.";
+"room_event_encryption_verify_ok" = "확인";
+// Account
+"account_save_changes" = "변경 사항 저장";
+"account_email_validation_title" = "확인 보류 중";
+"account_email_validation_message" = "이메일을 확인하고 거기에 있는 링크를 클릭해주세요. 모두 끝나면, 계속을 클릭하세요.";
+"account_email_validation_error" = "이메일 주소를 확인할 수 없습니다. 이메일을 확인하고 거기에 있는 링크를 클릭해주세요. 모두 끝나면, 계속을 클릭하세요";
+"account_msisdn_validation_title" = "확인 보류 중";
+"account_msisdn_validation_message" = "활성 코드가 있는 SMS를 보냈습니다. 아래에 이 코드를 입력해주세요.";
+"account_msisdn_validation_error" = "전화번호를 확인할 수 없습니다.";
+"account_error_display_name_change_failed" = "표시 이름 변경에 실패함";
+"account_error_picture_change_failed" = "사진 변경에 실패함";
+"account_error_matrix_session_is_not_opened" = "Matrix 세션이 열리지 않았습니다";
+"account_error_email_wrong_title" = "올바르지 않은 이메일 주소";
+"account_error_email_wrong_description" = "올바른 이메일 주소로 보이지 않습니다";
+"account_error_msisdn_wrong_title" = "올바르지 않은 전화번호";
+"account_error_msisdn_wrong_description" = "올바른 전화번호로 보이지 않습니다";
+"account_error_push_not_allowed" = "알림이 허용되지 않음";
+// Room creation
+"room_creation_name_title" = "방 이름:";
+"room_creation_name_placeholder" = "(예: lunchGroup)";
+"room_creation_alias_title" = "방 별칭:";
+"room_creation_alias_placeholder" = "(예: #foo:example.org)";
+"room_creation_alias_placeholder_with_homeserver" = "(예: #foo%@)";
+"room_creation_participants_title" = "참가자:";
+"room_creation_participants_placeholder" = "(예: @bob:homeserver1; @john:homeserver2...)";
+// Room
+"room_please_select" = "방을 선택해주세요";
+"room_error_join_failed_title" = "방 참가에 실패함";
+"room_error_join_failed_empty_room" = "현재 빈 방에 다시 참가할 수 없습니다.";
+"room_error_name_edition_not_authorized" = "이 방 이름을 편집할 권한이 없습니다";
+"room_error_topic_edition_not_authorized" = "이 방 주제를 편집할 권한이 없습니다";
+"room_error_cannot_load_timeline" = "타임라인 불러오기에 실패함";
+"room_error_timeline_event_not_found_title" = "타임라인 위치 불러오기에 실패함";
+"room_error_timeline_event_not_found" = "애플리케이션이 이 방의 타임라인에서 특정 시점을 불러오려 했으나 찾을 수 없었습니다";
+"room_left" = "당신은 방을 떠났습니다";
+"room_no_power_to_create_conference_call" = "이 방에 회의를 시작하려면 초대할 권한이 필요합니다";
+"room_no_conference_call_in_encrypted_rooms" = "암호화된 방에서 회의 전화는 지원되지 않습니다";
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "사진 보내기.";
+"message_reply_to_sender_sent_a_video" = "영상 보내기.";
+"message_reply_to_sender_sent_an_audio_file" = "음성 파일 보내기.";
+"message_reply_to_sender_sent_a_file" = "파일 보내기.";
+"message_reply_to_message_to_reply_to_prefix" = "관련 대화";
+// Room members
+"room_member_ignore_prompt" = "이 사용자의 모든 메시지를 숨기겠습니까?";
+"room_member_power_level_prompt" = "사용자를 자신과 같은 권한 등급으로 승급시키는 변경 사항은 취소할 수 없습니다.\n확신합니까?";
+// Attachment
+"attachment_size_prompt" = "다음으로 보내겠습니까:";
+"attachment_original" = "실제 크기: %@";
+"attachment_small" = "작게: %@";
+"attachment_medium" = "중간: %@";
+"attachment_large" = "크게: %@";
+"attachment_cancel_download" = "다운로드를 취소합니까?";
+"attachment_cancel_upload" = "업로드를 취소합니까?";
+"attachment_multiselection_size_prompt" = "다음으로 사진을 보내겠습니까:";
+"attachment_multiselection_original" = "실제 크기";
+"attachment_e2e_keys_file_prompt" = "이 파일은 Matrix 클라이언트에서 내보낸 암호화 키를 갖고 있습니다.\n파일 내용물을 보거나 갖고 있는 키를 가져오고 싶나요?";
+"attachment_e2e_keys_import" = "가져오기...";
+// Contacts
+"contact_mx_users" = "Matrix 사용자";
+"contact_local_contacts" = "로컬 연락처";
+// Groups
+"group_invite_section" = "초대";
+"group_section" = "그룹";
+// Search
+"search_no_results" = "결과 없음";
+"search_searching" = "검색 중...";
+// Time
+"format_time_s" = "초";
+"format_time_m" = "분";
+"format_time_h" = "시";
+"format_time_d" = "일";
+// E2E import
+"e2e_import_room_keys" = "방 키 가져오기";
+"e2e_import_prompt" = "이 과정으로 다른 Matrix 클라이언트에서 이전에 내보낸 암호화 키를 가져올 수 있습니다. 이 키로 다른 클라이언트에서 복호화할 수 있는 모든 메시지를 복호화할 수 있게 됩니다.\n내보낸 파일은 암호로 보호됩니다. 파일을 복호화하려면 여기에 암호를 입력해야 합니다.";
+"e2e_import" = "가져오기";
+"e2e_passphrase_enter" = "암호 입력";
+// E2E export
+"e2e_export_room_keys" = "방 키 내보내기";
+"e2e_export_prompt" = "이 과정으로 암호화된 방에서 받은 메시지의 키를 로컬 파일로 내보낼 수 있습니다. 그런 다음 이후 다른 Matrix 클라이언트에 파일을 가져올 수 있습니다, 이 키로 메시지를 복호화할 수 있게 됩니다.\n파일을 읽을 수 있는 모든 사용자는 내보낸 파일로 볼 수 있는 암호화된 메시지를 복호화할 수 있으므로, 안전하게 보관해야 합니다.";
+"e2e_export" = "내보내기";
+"e2e_passphrase_confirm" = "암호 확인";
+"e2e_passphrase_empty" = "암호를 입력해주세요";
+"e2e_passphrase_not_match" = "암호가 일치하지 않음";
+"e2e_passphrase_create" = "암호 만들기";
+"unsent" = "보내지지 않음";
+"error_common_message" = "오류가 발생했습니다. 나중에 다시 시도해주세요.";
+"private" = "보안";
+"public" = "공개";
+"power_level" = "권한 등급";
+"network_error_not_reachable" = "네트워크 연결 상태를 확인해주세요";
+"user_id_placeholder" = "예: @bob:homeserver";
+// Permissions
+"camera_access_not_granted_for_call" = "영상 통화를 하려면 카메라에 접근해야 하지만 %@은(는) 사용할 권한이 없습니다";
+"microphone_access_not_granted_for_call" = "전화를 하려면 마이크에 접근해야 하지만 %@은(는) 사용할 권한이 없습니다";
+"local_contacts_access_not_granted" = "로컬 연락처에서 사용자를 검색하려면 연락처에 접근해야 하지만 %@은(는) 사용할 권한이 없습니다";
+"local_contacts_access_discovery_warning_title" = "사용자 검색";
+"local_contacts_access_discovery_warning" = "Matrix를 사용 중인 연락처 사람들을 찾기 위해 %@은(는) 주소록에 있는 이메일 주소와 전화번호를 선택한 Matrix ID 서버로 보낼 수 있습니다. 서버가 지원한다면, 개인 정보는 보내기 전에 해시됩니다 - 더 자세한 정보는 ID 서버의 개인 정보 정책을 확인해주세요.";
+"notice_room_invite" = "%@님이 %@님을 초대했습니다";
+"notice_room_third_party_invite" = "%@님이 %@님에게 방에 참가하라는 초대를 보냈습니다";
+"notice_room_third_party_registered_invite" = "%@님이 %@님의 초대를 수락했습니다";
+"notice_room_join" = "%@님이 참가했습니다";
+"notice_room_leave" = "%@님이 떠났습니다";
+"notice_room_reject" = "%@님이 초대를 거절했습니다";
+"notice_room_kick" = "%@님이 %@님을 추방했습니다";
+"notice_room_unban" = "%@님이 %@님의 출입 금지를 풀었습니다";
+"notice_room_ban" = "%@님이 %@님을 출입 금지했습니다";
+"notice_room_withdraw" = "%@님이 %@님의 초대를 취소했습니다";
+"notice_room_reason" = ". 이유: %@";
+"notice_avatar_url_changed" = "%@님이 아바타를 바꿨습니다";
+"notice_display_name_set" = "%@님이 표시 이름을 %@(으)로 설정했습니다";
+"notice_display_name_changed_from" = "%@님이 표시 이름을 %@에서 %@(으)로 바꿨습니다";
+"notice_display_name_removed" = "%@님이 표시 이름을 제거했습니다";
+"notice_topic_changed" = "%@님이 주제를 다음으로 바꿨습니다: %@";
+"notice_room_name_changed" = "%@님이 방 이름을 다음으로 바꿨습니다: %@";
+"notice_placed_voice_call" = "%@님이 음성 통화를 걸었습니다";
+"notice_placed_video_call" = "%@님이 영상 통화를 걸었습니다";
+"notice_answered_video_call" = "%@님이 전화를 받았습니다";
+"notice_ended_video_call" = "%@님이 전화를 끊었습니다";
+"notice_conference_call_request" = "%@님이 VoIP 회의를 요청했습니다";
+"notice_conference_call_started" = "VoIP 회의가 시작했습니다";
+"notice_conference_call_finished" = "VoIP 회의가 끝났습니다";
+// button names 
+"ok" = "예";
+"send" = "보내기";
+"copy_button_name" = "복사";
+"resend" = "다시 보내기";
+"redact" = "감추기";
+"share" = "공유";
+"delete" = "삭제";
+// actions 
+"action_logout" = "로그아웃";
+"create_room" = "방 만들기";
+"login" = "로그인";
+"create_account" = "계정 만들기";
+"membership_invite" = "초대받음";
+"membership_leave" = "떠남";
+"membership_ban" = "출입 금지당함";
+"num_members_one" = "%@명의 사용자";
+"num_members_other" = "%@명의 사용자";
+"kick" = "추방";
+"ban" = "출입 금지";
+"unban" = "출입 금지 풀기";
+"message_unsaved_changes" = "저장하지 않은 변경 사항이 있습니다. 떠나게 되면 변경 사항은 버려집니다.";
+// Login Screen 
+"login_error_already_logged_in" = "이미 로그인됨";
+"login_error_must_start_http" = "URL은 http[s]://로 시작해야 함";
+// room details dialog screen
+"room_details_title" = "방 세부 사항";
+// contacts list screen 
+"invitation_message" = "저는 Matrix로 당신과 대화하고 싶습니다. 자세한 정보는 웹사이트 http://martix.org에 방문해주세요.";
+// Settings screen 
+"settings_title_config" = "설정";
+"settings_title_notifications" = "알림";
+// Notification settings screen 
+"notification_settings_disable_all" = "모든 알림 끄기";
+"notification_settings_enable_notifications" = "알림 켜기";
+"notification_settings_enable_notifications_warning" = "모든 기기에 모든 알림이 현재부터 꺼집니다.";
+"notification_settings_global_info" = "알림 설정은 사용자 계정에 저장되며 계정을 등록한 모든 클라이언트 간에 공유됩니다 (데스크톱 알림 포함)\n\n규칙은 순서대로 적용됩니다; 일치하는 것의 첫 번째 규칙은 메시지의 결과를 정의하는 것입니다.\n따라서: 발신자 별 알림보다 방 별 알림이, 방 별 알림보다 단어 별 알림이 더 중요합니다.\n동일한 종류의 여러 규칙이 있다면, 목록에서 일치하는 첫 번째 규칙이 우선됩니다.";
+"notification_settings_per_word_notifications" = "단어 별 알림";
+"notification_settings_per_word_info" = "단어는 대소문자를 구분하지 않고, * 와이드카드 기호를 넣을 수 있습니다. 따라서:\nfoo라는 단어는 양끝에 단어가 이어지지 않은 경우 (예: 문장 부호, 공백 또는 문장의 시작과 끝)에 있는 단어를 맞춥니다.\nfoo*는 foo로 시작하는 모든 단어를 맞춥니다.\n*foo*는 foo라는 세 글자를 포함하는 모든 단어를 맞춥니다.";
+"notification_settings_always_notify" = "항상 알림";
+"notification_settings_never_notify" = "절대 알리지 않기";
+"notification_settings_word_to_match" = "맞춰볼 단어";
+"notification_settings_highlight" = "강조";
+"notification_settings_custom_sound" = "맞춤 소리";
+"notification_settings_per_room_notifications" = "방 별 알림";
+"notification_settings_per_sender_notifications" = "발신자 별 알림";
+"notification_settings_sender_hint" = "@user:domain.com";
+"notification_settings_select_room" = "방 선택";
+"notification_settings_other_alerts" = "기타 경고";
+"notification_settings_contain_my_user_name" = "내 사용자 이름이 있는 메시지에 대해 소리로 알림";
+"notification_settings_contain_my_display_name" = "내 표시 이름이 있는 메시지에 대해 소리로 알림";
+"notification_settings_just_sent_to_me" = "나에게만 온 메시지에 대해 소리로 알림";
+"notification_settings_invite_to_a_new_room" = "내가 새 방에 초대받았을 때 알림";
+"notification_settings_people_join_leave_rooms" = "사람들이 참가하고 떠날 때 알림";
+"notification_settings_receive_a_call" = "전화를 받을 때 알림";
+"notification_settings_suppress_from_bots" = "봇의 알림 억제";
+"notification_settings_by_default" = "기본으로 되돌리기...";
+"notification_settings_notify_all_other" = "모든 다른 메시지/방의 알림";
+// gcm section 
+"settings_config_home_server" = "홈서버: %@";
+"settings_config_identity_server" = "ID 서버: %@";
+"settings_config_user_id" = "사용자 ID: %@";
+// call string
+"call_waiting" = "대기 중...";
+"call_connecting" = "전화 연결 중...";
+"call_ended" = "전화 종료됨";
+"call_ring" = "전화 중...";
+"incoming_video_call" = "수신 영상 통화";
+"incoming_voice_call" = "수신 음성 통화";
+"call_invite_expired" = "전화 초대가 만료됨";
+// unrecognized SSL certificate
+"ssl_trust" = "신뢰";
+"ssl_logout_account" = "로그아웃";
+"ssl_remain_offline" = "무시";
+"ssl_fingerprint_hash" = "핑거프린트 (%@):";
+"ssl_could_not_verify" = "원격 서버의 ID를 확인할 수 없습니다.";
+"ssl_cert_not_trust" = "누군가가 악의적으로 트래픽을 가로채고 있거나, 휴대 전화가 원격 서버에서 제공한 인증을 신뢰하지 않습니다.";
+"ssl_cert_new_account_expl" = "서버 관리자가 예상된다고 대답했다면, 아래 핑거프린트가 그들이 제공한 핑거프린트와 맞는지 확인하세요.";
+"ssl_unexpected_existing_expl" = "휴대 전화를 인증했던 인증서가 다른 것으로 변경되었습니다. 이것은 매우 비정상적입니다. 이 새로운 인증서를 수락하지 않는 것을 권합니다.";
+"ssl_expected_existing_expl" = "인증서가 신뢰했던 것에서 신뢰하지 않은 것으로 변경되었습니다. 서버가 인증서를 세로 작성했을 수 있습니자. 예상되는 핑거프린트를 위해 서버 관리자에게 연락하세요.";
+"ssl_only_accept" = "위의 것과 일치한 핑거프린트를 서버 관리자가 게시해야 인증서를 수락할 수 있습니다.";
+"notice_room_third_party_revoked_invite" = "%@님이 %@님에게 보낸 초대를 취소했습니다";
+"device_details_rename_prompt_title" = "기기 이름";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/lv.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/lv.lproj/MatrixKit.strings
new file mode 100644
index 000000000..b7e38eef4
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/lv.lproj/MatrixKit.strings
@@ -0,0 +1,119 @@
+"matrix" = "Matrix";
+// Login Screen
+"login_create_account" = "Izveidot kontu:";
+"login_server_url_placeholder" = "URL adrese (piemēram, https://matrix.org)";
+"login_home_server_title" = "Mājas serveria URL:";
+"login_home_server_info" = "Tavs mājas serveris glabā visas sarunas un konta datus";
+"login_identity_server_title" = "Identifikācijas servera URL:";
+"view" = "Skatīt";
+"back" = "Atpakaļ";
+"continue" = "Turpināt";
+"leave" = "Atstāt";
+"invite" = "Uzaicināt";
+"retry" = "Atgriezties";
+"cancel" = "Atcelt";
+"save" = "Saglabāt";
+"login_password_placeholder" = "Parole";
+"login_display_name_placeholder" = "Displeja vārds (piem. Bob Obson)";
+"login_email_placeholder" = "Epasta adrese";
+"login_prompt_email_token" = "Lūdzu ievadi savu epasta pārbaudes kodu:";
+"login_error_title" = "Piekļuve neizdevās";
+"login_error_registration_is_not_supported" = "Reģistrācija pašlaik netiek atbalstīta";
+"login_error_forbidden" = "Nederīgs lietotājvārds/parole";
+"login_error_limit_exceeded" = "Pārāk daudz pieprasījumi tikuši izsūtīti";
+"login_error_user_in_use" = "Šis lietotājvārds jau tiek izmantots";
+"login_leave_fallback" = "Atcelt";
+"login_invalid_param" = "Nepareizs parametrs";
+"register_error_title" = "Reģistrācija neizdevās";
+"login_error_resource_limit_exceeded_title" = "Resursu Limits Pārsniegts";
+"yes" = "Jā";
+"close" = "Aizvērt";
+"sign_up" = "Pieteikties";
+"start_chat" = "Sākt čatu";
+"start_voice_call" = "Sākt Balss Zvanu";
+"start_video_call" = "Sākt Video Zvanu";
+"select_account" = "Izvēlies kontu";
+"invite_user" = "Uzaicini matrix Lietotāju";
+"select_all" = "Izvēlēties Visus";
+"cancel_upload" = "Atcelt Augšupielādi";
+"cancel_download" = "Atcelt Lejupielādi";
+"show_details" = "Rādīt Detaļas";
+"answer_call" = "Pacelt Zvanu";
+"reject_call" = "Atteikt Zvanu";
+"end_call" = "Beigt Zvanu";
+"ignore" = "Ignorēt";
+"unignore" = "At-Ignorēt";
+"notice_room_name_removed" = "%@ noņēma istabas nosaukumu";
+"notice_room_created" = "%@ izveidoja istabu";
+"notice_encrypted_message" = "Šifrēts ziņojums";
+"notice_image_attachment" = "attēla pielikums";
+"notice_audio_attachment" = "audio pielikums";
+"notice_video_attachment" = "video pielikums";
+"notice_location_attachment" = "atrašanās vietas pielikums";
+"notice_file_attachment" = "datnes pielikums";
+"notice_invalid_attachment" = "nederīgs pielikums";
+"notice_unsupported_attachment" = "Neatbalstīts pielikums: %@";
+"notice_error_unsupported_event" = "Neatbalstīts notikums";
+"notice_error_unexpected_event" = "Negaidīts notikums";
+"notice_error_unknown_event_type" = "Nezināms notikuma veids";
+"notice_sticker" = "uzlīme";
+"room_displayname_two_members" = "%@ un %@";
+"room_displayname_more_than_two_members" = "%@ un %@ citi";
+"notification_settings_room_rule_title" = "Istaba: '%@'";
+"device_details_identifier" = "ID\n";
+"device_details_last_seen" = "Pēdējoreiz redzēts\n";
+"device_details_rename_prompt_title" = "Sesijas Nosaukums";
+"device_details_delete_prompt_title" = "Autentifikācija";
+"room_event_encryption_info_event_user_id" = "Lietotāja ID\n";
+"room_event_encryption_info_event_identity_key" = "Curve25519 identitātes atslēga\n";
+"room_event_encryption_info_event_algorithm" = "Algoritms\n";
+"room_event_encryption_info_event_session_id" = "Sesijas ID\n";
+"room_event_encryption_info_event_decryption_error" = "Atšifrēšanas kļūda\n";
+"room_event_encryption_info_event_none" = "nav";
+"room_event_encryption_info_device_unknown" = "nezināma sesija\n";
+"room_event_encryption_info_device_name" = "Publiskais Nosaukums\n";
+"room_event_encryption_info_device_id" = "ID\n";
+"room_event_encryption_info_device_verification" = "Verifikācija\n";
+"room_event_encryption_info_device_verified" = "Verificēts";
+"room_event_encryption_info_device_not_verified" = "NAV verificēts";
+"notice_room_name_removed_for_dm" = "%@ noņēma nosaukumu";
+
+// Events formatter
+"notice_avatar_changed_too" = "(avatars arī tika nomainīts)";
+"resume_call" = "Atjaunot";
+"resend_message" = "Atkārtot ziņojuma sūtīšanu";
+"reset_to_default" = "Atietatīt uz noklusējumu";
+"capture_media" = "Uzņemt foto/video";
+"attach_media" = "Pievienot mediju no bibliotēkas";
+"mention" = "Pieminēt";
+"set_admin" = "Norādīt administratoru";
+"set_moderator" = "Norādīt moderatoru";
+"set_default_power_level" = "Nodzēst jaudas līmeni";
+"set_power_level" = "Iestatīt jaudas līmeni";
+"submit_code" = "Iesniegt kodu";
+"submit" = "Iesniegt";
+"dismiss" = "Noraidīt";
+"discard" = "Izmest";
+"abort" = "Pārtraukt";
+
+// Action
+"no" = "Nē";
+"login_error_resource_limit_exceeded_contact_button" = "Sazinieties ar administratoru";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nLai turpinātu lietot šo pakalpojumu, lūdzu, sazinieties ar savu pakalpojuma administratoru.";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "Šis mājas serveris ir sasniedzis ikmēneša aktīvo lietotāju limitu.";
+"login_error_resource_limit_exceeded_message_default" = "Šis mājas serveris ir sasniedzis vienu no savu resursu limitiem.";
+"login_desktop_device" = "Dators";
+"login_tablet_device" = "Planšete";
+"login_mobile_device" = "Mobilā iekārta";
+"login_error_forgot_password_is_not_supported" = "“Aizmirsu paroli” patlaban nav atbalstīta";
+"login_use_fallback" = "Lietojiet atkāpšanās lappusi";
+"login_error_login_email_not_yet" = "E-pasta saite vel nav noklikšķināta";
+"login_error_not_json" = "Nesatur derīgu JSON";
+"login_error_bad_json" = "Bojāts JSON";
+"login_error_unknown_token" = "Netika atpazīta norādītā pieejas atslēga";
+"login_error_do_not_support_login_flows" = "Mēs patrez neatbalstām jebkādas pieteikšanās plūsmas, kas definētas no šī mājas servera";
+"login_error_no_login_flow" = "Mums neizdevās saņemt autentifikācijas informāciju no šī mājas servera.";
+"login_email_info" = "E-pasta adreses norādīšana ļauj citiem lietotājiem viegli atras tevi Matix, kā arī nodrošinās tev iespēju nākotnē atjaunot savu paroli.";
+"login_optional_field" = "neobligāts";
+"login_user_id_placeholder" = "Matrix ID (piem. @bob:matrix.org vai bobs)";
+"login_identity_server_info" = "Matrix nodrošina identifikācijas serverus, lai atšķirtu, kuri e-pasti, u.c., pieder kuram Matrix ID. Patlaban pastāv vienīgi https://matrix.org";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/nb-NO.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/nb-NO.lproj/MatrixKit.strings
new file mode 100644
index 000000000..7f2347f95
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/nb-NO.lproj/MatrixKit.strings
@@ -0,0 +1,544 @@
+
+
+"room_event_encryption_info_device_verification" = "Verifisering\n";
+"notice_display_name_set" = "%@ satte visningsnavnet sitt til %@";
+"room_no_power_to_create_conference_call" = "Du trenger tillatelse til å invitere for å starte en konferanse i dette rommet";
+"room_error_join_failed_empty_room" = "Det er for øyeblikket ikke mulig å bli med i et tomt rom igjen.";
+"room_event_encryption_verify_message" = "For å verifisere at denne økten er til å stole på, vennligst kontakt eieren på andre måter (f.eks. personlig eller en telefonsamtale) og spør dem om nøkkelen de ser i brukerinnstillingene for denne økten samsvarer med nøkkelen nedenfor:\n\n\tØkt-navn: %@\n\tØkt-ID: %@\n\tØkt-nøkkel: %@\n\nHvis den stemmer overens, trykk på verifiserings-knappen nedenfor. Hvis den ikke gjør det, er det noen andre som overvåker denne økten, og du vil sannsynligvis trykke på svartelisteknappen i stedet.\n\nI fremtiden vil denne verifiseringsprosessen bli mer sofistikert.";
+"room_event_encryption_info_block" = "Svarteliste";
+"device_details_delete_prompt_title" = "Autentisering";
+"notice_room_power_level_acting_requirement" = "Minimum tilgangsnivå en bruker må ha før utførelse av handling er:";
+"login_prompt_email_token" = "Vennligst skriv inn valideringstokenet ditt for e-post:";
+"login_server_url_placeholder" = "URL (f.eks. https://matrix.org)";
+
+// Login Screen
+"login_create_account" = "Opprett konto:";
+/* *********************** */
+/*      iOS specific       */
+/* *********************** */
+
+"matrix" = "Matrix";
+"ssl_cert_not_trust" = "Dette kan bety at noen overvåker trafikken din, eller at telefonen ikke stoler på sertifikatet fra den eksterne serveren.";
+"resend" = "Send på nytt";
+"login_identity_server_title" = "URL til identitetsserver:";
+"login_home_server_info" = "Hjemmeserveren lagrer alle samtalene og kontodataene dine";
+"login_home_server_title" = "Hjemmeserver-URL:";
+"login_identity_server_info" = "Matrix tilbyr identitetsservere for å spore hvilke e-postadresser etc. som tilhører hvilke Matrix-IDer. Bare https://matrix.org eksisterer for øyeblikket.";
+"login_user_id_placeholder" = "Matrix-ID (f.eks. @Bob: matrix.org eller bob)";
+"login_email_info" = "Angi en e-postadresse slik at andre brukere lettere kan finne deg, og samtidig gi deg en måte å tilbakestille passordet ditt senere.";
+"login_display_name_placeholder" = "Visningsnavn (f.eks. Bob Obson)";
+"login_optional_field" = "valgfri";
+"login_password_placeholder" = "Passord";
+"login_error_do_not_support_login_flows" = "Foreløpig støtter vi ikke påloggingsflytene som er definert for denne hjemmeserveren";
+"login_error_no_login_flow" = "Vi kunne ikke hente autentiseringsinformasjon fra denne hjemmeserveren";
+"login_error_title" = "Innlogging feilet";
+"login_email_placeholder" = "E-postadresse";
+"login_error_unknown_token" = "Angitt tilgangstoken ble ikke gjenkjent";
+"login_error_forbidden" = "Ugyldig brukernavn/passord";
+"login_error_registration_is_not_supported" = "Registrering støttes ikke for øyeblikket";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "Denne hjemmeserveren har nådd grensen for aktive månedlige brukere.";
+"login_error_resource_limit_exceeded_message_default" = "Denne hjemmeserveren har overskredet en av ressursgrensene.";
+"login_error_resource_limit_exceeded_title" = "Ressursgrensen er overskredet";
+"login_desktop_device" = "PC";
+"login_tablet_device" = "Nettbrett";
+"login_mobile_device" = "Mobil";
+"login_error_forgot_password_is_not_supported" = "Glemt passord støttes for øyeblikket ikke";
+"register_error_title" = "Registrering feilet";
+"login_invalid_param" = "Ugyldig parameter";
+"login_leave_fallback" = "Avbryt";
+"login_use_fallback" = "Bruk reserveside";
+"login_error_login_email_not_yet" = "E-postlinken som ikke er klikket på ennå";
+"login_error_user_in_use" = "Dette brukernavnet er allerede brukt";
+"login_error_limit_exceeded" = "Det er sendt for mange forespørsler";
+"login_error_not_json" = "Inneholdt ikke gyldig JSON";
+"login_error_bad_json" = "Feilformatert JSON";
+"set_power_level" = "Bestem tilgangsnivå";
+"submit_code" = "Send inn kode";
+"submit" = "Send inn";
+"sign_up" = "Meld deg på";
+"retry" = "Prøv på nytt";
+"dismiss" = "Ignorer";
+"discard" = "Forkast";
+"continue" = "Fortsett";
+"close" = "Lukk";
+"back" = "Tilbake";
+"abort" = "Avbryt";
+"yes" = "Ja";
+
+// Action
+"no" = "Nei";
+"login_error_resource_limit_exceeded_contact_button" = "Kontakt administrator";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nKontakt tjenesteadministratoren din for å fortsette å bruke denne tjenesten.";
+"set_default_power_level" = "Tilbakestill tilgangsnivå";
+"start_chat" = "Start samtale";
+"set_admin" = "Velg admin";
+"set_moderator" = "Velg moderator";
+"invite_user" = "Inviter bruker";
+"capture_media" = "Ta bilde/video";
+"attach_media" = "Legg ved media fra biblioteket";
+"select_account" = "Velg en konto";
+"mention" = "Nevn";
+"start_video_call" = "Start videoanrop";
+"start_voice_call" = "Start taleanrop";
+"answer_call" = "Svar på anrop";
+"show_details" = "Vis detaljer";
+"cancel_download" = "Avbryt nedlasting";
+"cancel_upload" = "Avbryt opplasting";
+"select_all" = "Velg alle";
+"resend_message" = "Send meldingen på nytt";
+"reset_to_default" = "Tilbakestill til standard";
+"reject_call" = "Avvis anrop";
+"end_call" = "Avslutt samtale";
+//  Old
+"notice_room_join_rule" = "Bli-med regelen er: %@";
+"notice_room_created_for_dm" = "%@ ble med.";
+"notice_room_created" = "%@ opprettet og konfigurerte rommet.";
+"notice_profile_change_redacted" = "%@ oppdaterte profilen sin %@";
+"notice_event_redacted_reason" = " [årsak: %@]";
+"notice_event_redacted_by" = " av %@";
+"notice_event_redacted" = "<slettet%@>";
+"notice_room_topic_removed" = "%@ fjernet emnet";
+"notice_room_name_removed_for_dm" = "%@ fjernet navnet";
+"notice_room_name_removed" = "%@ fjernet romnavnet";
+
+// Events formatter
+"notice_avatar_changed_too" = "(avatar ble også endret)";
+"unignore" = "Opphev ignorering";
+"ignore" = "Ignorer";
+"resume_call" = "Gjenoppta";
+"notice_room_power_level_intro" = "Medlemmenes tilgangsnivå i rommet er:";
+"notice_room_join_rule_public_by_you_for_dm" = "Du gjorde dette offentlig.";
+"notice_room_join_rule_public_by_you" = "Du gjorde rommet offentlig.";
+"notice_room_join_rule_public_for_dm" = "%@ gjorde dette offentlig.";
+"notice_room_join_rule_public" = "%@ gjorde rommet offentlig.";
+"notice_room_join_rule_invite_by_you_for_dm" = "Du endret til kun inviterte.";
+"notice_room_join_rule_invite_by_you" = "Du endret rommet til kun inviterte.";
+"notice_room_join_rule_invite_for_dm" = "%@ endret til kun inviterte.";
+//  New
+"notice_room_join_rule_invite" = "%@ endret rommet til kun inviterte.";
+"notice_room_power_level_intro_for_dm" = "Medlemmenes tilgangsnivå er:";
+"notice_room_power_level_event_requirement" = "Minimum tilgangsnivå relatert til events er:";
+"notice_unsupported_attachment" = "Ikke støttet vedlegg: %@";
+"notice_invalid_attachment" = "ugyldig vedlegg";
+"notice_file_attachment" = "filvedlegg";
+"notice_location_attachment" = "lokasjonsvedlegg";
+"notice_video_attachment" = "videovedlegg";
+"notice_audio_attachment" = "lydvedlegg";
+"notice_image_attachment" = "bildevedlegg";
+"notice_encryption_enabled_unknown_algorithm" = "%1$@ slo på ende-til-ende-kryptering (ukjent algoritme %2$@).";
+"notice_encryption_enabled_ok" = "%@ slo på ende-til-ende-kryptering.";
+"notice_encrypted_message" = "Kryptert melding";
+"notice_room_related_groups" = "Gruppene som er tilknyttet dette rommet er: %@";
+"notice_room_aliases_for_dm" = "Aliasene er: %@";
+"notice_room_aliases" = "Rom-aliasene er: %@";
+"room_event_encryption_info_event" = "Hendelseinformasjon\n";
+
+// Encryption information
+"room_event_encryption_info_title" = "Ende-til-ende-krypteringsinformasjon\n\n";
+"device_details_delete_prompt_message" = "Denne operasjonen krever ekstra godkjenning.\nFor å fortsette, vennligst skriv inn passordet ditt.";
+"device_details_rename_prompt_message" = "En økts offentlige navn er synlig for folk du kommuniserer med";
+"device_details_rename_prompt_title" = "Øktnavn";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_last_seen" = "Sist sett\n";
+"device_details_identifier" = "ID\n";
+"device_details_name" = "Offentlig navn\n";
+
+// Devices
+"device_details_title" = "Øktinformasjon\n";
+"notification_settings_room_rule_title" = "Rom: '%@'";
+"settings_enter_validation_token_for" = "Angi valideringstoken for %@:";
+"settings_enable_push_notifications" = "Aktiver push-varsler";
+"settings_enable_inapp_notifications" = "Aktiver varsler i appen";
+
+// Settings
+"settings" = "Innstillinger";
+"room_displayname_more_than_two_members" = "%@ og %@ andre";
+"room_displayname_two_members" = "%@ og %@";
+
+// room display name
+"room_displayname_empty_room" = "Tomt rom";
+"notice_in_reply_to" = "Som svar på";
+"notice_sticker" = "klistremerke";
+"notice_crypto_error_unknown_inbound_session_id" = "Avsenderøkten har ikke sendt oss nøklene til denne meldingen.";
+"notice_crypto_unable_to_decrypt" = "** Kan ikke dekryptere: %@ **";
+"notice_room_history_visible_to_members_from_joined_point_for_dm" = "%@ gjorde fremtidige meldinger synlige for alle, fra de ble med.";
+"notice_room_history_visible_to_members_from_invited_point_for_dm" = "%@ gjorde fremtidige meldinger synlige for alle, fra de blir invitert.";
+"notice_room_history_visible_to_anyone" = "%@ gjorde fremtidig romhistorie synlig for alle.";
+"notice_error_unknown_event_type" = "Ukjent hendelsestype";
+"notice_error_unexpected_event" = "Uventet hendelse";
+"notice_error_unsupported_event" = "Ikke støttet hendelse";
+"notice_feedback" = "Tilbakemeldingshendelse (id: %@): %@";
+"notice_room_history_visible_to_members_from_joined_point" = "%@ synliggjorde fremtidig romhistorie for alle medlemmer i rommet, fra det tidspunktet de ble med.";
+"notice_room_history_visible_to_members_from_invited_point" = "%@ synliggjorde fremtidig romhistorie for alle medlemmer i rommet, fra det punktet de er invitert.";
+"notice_room_history_visible_to_members_for_dm" = "%@ gjorde fremtidige meldinger synlige for alle medlemmer i rommet.";
+"notice_room_history_visible_to_members" = "%@ synliggjorde fremtidig romhistorie for alle medlemmer i rommet.";
+"notice_redaction" = "%@ holdt igjen en hendelse (id: %@)";
+"room_event_encryption_info_event_fingerprint_key" = "Benyttet Ed25519 fingeravtrykknøkkel\n";
+"room_event_encryption_info_event_identity_key" = "Curve25519 identitetsnøkkel\n";
+"room_event_encryption_info_event_user_id" = "Bruker-ID\n";
+"room_event_encryption_info_event_session_id" = "Økt-ID\n";
+"room_event_encryption_info_event_algorithm" = "Algoritme\n";
+"account_email_validation_message" = "Sjekk e-posten din og klikk på linken den inneholder. Når dette er gjort, klikker du på fortsett.";
+"account_linked_emails" = "Linkede e-poster";
+"account_link_email" = "Link e-post";
+
+// Account
+"account_save_changes" = "Lagre endringer";
+"room_event_encryption_verify_ok" = "Verifiser";
+"room_event_encryption_verify_title" = "Verifiser økt\n\n";
+"room_event_encryption_info_unblock" = "Fjern svartelisting";
+"room_event_encryption_info_unverify" = "Fjern verifisering";
+"room_event_encryption_info_verify" = "Verifiser...";
+"room_event_encryption_info_device_blocked" = "Svartelistet";
+"room_event_encryption_info_device_not_verified" = "IKKE verifisert";
+"room_event_encryption_info_device_verified" = "Verifisert";
+"room_event_encryption_info_device_fingerprint" = "Ed25519 fingeravtrykk\n";
+"room_event_encryption_info_device_id" = "ID\n";
+"room_event_encryption_info_device_name" = "Offentlig navn\n";
+"room_event_encryption_info_device_unknown" = "ukjent økt\n";
+"room_event_encryption_info_device" = "\nInformasjon om avsenderøkt\n";
+"room_event_encryption_info_event_none" = "ingen";
+"room_event_encryption_info_event_unencrypted" = "ukryptert";
+"room_event_encryption_info_event_decryption_error" = "Dekrypteringsfeil\n";
+"account_email_validation_title" = "Venter på verifisering";
+"room_creation_alias_placeholder" = "(f.eks. #foo:example.org)";
+"room_creation_alias_title" = "Romalias:";
+"room_creation_name_placeholder" = "(f.eks. lunsjgruppe)";
+
+// Room creation
+"room_creation_name_title" = "Romnavn:";
+"account_error_push_not_allowed" = "Varsler ikke tillatt";
+"account_error_msisdn_wrong_description" = "Dette ser ikke ut til å være et gyldig telefonnummer";
+"account_error_msisdn_wrong_title" = "Ugyldig telefonnummer";
+"account_error_email_wrong_description" = "Dette ser ikke ut til å være en gyldig e-postadresse";
+"account_error_email_wrong_title" = "Ugyldig e-postadresse";
+"account_error_matrix_session_is_not_opened" = "Matrix-økt er ikke åpnet";
+"account_error_picture_change_failed" = "Endring av bildet feilet";
+"account_error_display_name_change_failed" = "Endring av visningsnavn feilet";
+"account_msisdn_validation_error" = "Kan ikke bekrefte telefonnummeret.";
+"account_msisdn_validation_message" = "Vi har sendt en SMS med en aktiveringskode. Vennligst skriv inn denne koden nedenfor.";
+"account_email_validation_error" = "Kan ikke bekrefte e-postadressen. Sjekk e-posten din og klikk på lenken den inneholder. Når dette er gjort, klikker du på fortsett";
+"account_msisdn_validation_title" = "Venter på verifisering";
+"room_error_join_failed_title" = "Deltakelse i rommet feilet";
+
+// Room
+"room_please_select" = "Vennligst velg et rom";
+"room_creation_participants_placeholder" = "(f.eks. @bob:hjemmeserver1; @john:hjemmeserver2 ...)";
+"room_creation_participants_title" = "Deltakere:";
+"room_creation_alias_placeholder_with_homeserver" = "(f.eks. #foo%@)";
+"room_member_power_level_prompt" = "Du vil ikke kunne angre denne endringen ettersom du gir brukeren samme tilgangsnivå som deg selv.\nEr du sikker?";
+
+// Room members
+"room_member_ignore_prompt" = "Er du sikker på at du vil skjule alle meldinger fra denne brukeren?";
+"message_reply_to_message_to_reply_to_prefix" = "Som svar på";
+"message_reply_to_sender_sent_a_file" = "sendte en fil.";
+"message_reply_to_sender_sent_an_audio_file" = "sendte en lydfil.";
+"message_reply_to_sender_sent_a_video" = "sendte en video.";
+
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "sendte et bilde.";
+"room_no_conference_call_in_encrypted_rooms" = "Konferansesamtaler støttes ikke i krypterte rom";
+"room_left_for_dm" = "Du forlot";
+"room_left" = "Du forlot rommet";
+"room_error_timeline_event_not_found" = "Applikasjonen prøvde å laste inn et bestemt punkt i tidslinjen til dette rommet, men kunne ikke finne det";
+"room_error_timeline_event_not_found_title" = "Kunne ikke laste tidslinjeposisjonen";
+"room_error_cannot_load_timeline" = "Kunne ikke laste tidslinjen";
+"room_error_topic_edition_not_authorized" = "Du har ikke autorisasjon til å redigere dette romemnet";
+"room_error_name_edition_not_authorized" = "Du har ikke autorisasjon til å redigere dette romnavnet";
+
+// Groups
+"group_invite_section" = "Invitasjoner";
+"contact_local_contacts" = "Lokale kontakter";
+
+// Contacts
+"contact_mx_users" = "Matrix-brukere";
+"attachment_e2e_keys_import" = "Importer...";
+"attachment_e2e_keys_file_prompt" = "Denne filen inneholder krypteringsnøkler eksportert fra en Matrix-klient.\nVil du se filinnholdet eller importere nøklene den inneholder?";
+"attachment_multiselection_original" = "Faktisk størrelse";
+"attachment_multiselection_size_prompt" = "Vil du sende bilder som:";
+"attachment_cancel_upload" = "Avbryte opplastingen?";
+"attachment_cancel_download" = "Avbryte nedlastingen?";
+"attachment_large" = "Stor: %@";
+"attachment_medium" = "Medium: %@";
+"attachment_small" = "Liten: %@";
+"attachment_original" = "Faktisk størrelse: %@";
+
+// Attachment
+"attachment_size_prompt" = "Vil du sende som:";
+"search_searching" = "Søk pågår...";
+
+// Search
+"search_no_results" = "Ingen resultater";
+"group_section" = "Grupper";
+"format_time_h" = "t";
+"format_time_m" = "m";
+
+// Time
+"format_time_s" = "s";
+"e2e_import_prompt" = "Denne prosessen lar deg importere krypteringsnøkler som du tidligere hadde eksportert fra en annen app. Du vil da kunne dekryptere alle meldinger som den andre klienten kan dekryptere.\nEksportfilen er beskyttet med en passordfrase. Du bør angi passordet her for å dekryptere filen.";
+
+// E2E import
+"e2e_import_room_keys" = "Importer romnøkler";
+"format_time_d" = "d";
+"e2e_import" = "Importer";
+"e2e_export_prompt" = "Denne prosessen lar deg eksportere nøklene for meldinger du har mottatt i krypterte rom til en lokal fil. Du vil da kunne importere filen til en annen app i fremtiden, slik at den også kan dekryptere disse meldingene.\nDen eksporterte filen lar alle som kan lese den dekryptere alle krypterte meldinger du kan se, så du bør passe på å lagre den sikkert.";
+
+// E2E export
+"e2e_export_room_keys" = "Eksporter romnøkler";
+"e2e_passphrase_enter" = "Skriv inn passordfrase";
+"e2e_export" = "Eksporter";
+"e2e_passphrase_empty" = "Passordfrase kan ikke være tom";
+"e2e_passphrase_confirm" = "Bekreft passordfrase";
+"power_level" = "Tilgangsnivå";
+"public" = "Offentlig";
+"private" = "Privat";
+"default" = "standard";
+"not_supported_yet" = "Støttes ikke ennå";
+"error_common_message" = "En feil oppstod. Prøv igjen senere.";
+"error" = "Feil";
+"unsent" = "Ikke sendt";
+"offline" = "offline";
+
+// Others
+"user_id_title" = "Bruker-ID:";
+"e2e_passphrase_create" = "Opprett passordfrase";
+"e2e_passphrase_not_match" = "Passordfrase må stemme overens";
+"user_id_placeholder" = "eks: @bob:hjemmeserver";
+"network_error_not_reachable" = "Vennligst kontroller nettverkstilkoblingen";
+"local_contacts_access_discovery_warning" = "For å finne kontakter som allerede bruker løsningen, kan %@ sende e-postadresser og telefonnumre i adresseboken til den valgte identitetsserveren. Der det støttes, blir personlige data indeksert før sending - vennligst sjekk identitetsserverens personvernregler for mer informasjon.";
+"local_contacts_access_discovery_warning_title" = "Finne brukere";
+"local_contacts_access_not_granted" = "Å finne brukere fra lokale kontakter krever tilgang til dine kontakter, men %@ har ikke tillatelse til å bruke dem";
+"microphone_access_not_granted_for_call" = "Samtaler krever tilgang til mikrofonen, men %@ har ikke tillatelse til å bruke den";
+
+// Permissions
+"camera_access_not_granted_for_call" = "Videosamtaler krever tilgang til kameraet, men %@ har ikke tillatelse til å bruke det";
+"ssl_homeserver_url" = "Hjemmeserver-URL:% @";
+
+/* -*- 
+   Automatic localization for en
+
+   The following key/value pairs were extracted from the android i18n file:
+    /matrix-sdk/src/main/res/values/strings.xml.
+*/
+
+"notice_room_invite" = "%@ inviterte %@";
+"language_picker_default_language" = "Standard (%@)";
+
+// Language picker
+"language_picker_title" = "Velg språk";
+
+// Country picker
+"country_picker_title" = "Velg et land";
+"notice_room_kick" = "%@ utviste %@";
+"notice_room_reject" = "%@ avviste invitasjonen";
+"notice_room_leave" = "%@ forlot";
+"notice_room_join" = "%@ ble med";
+"notice_room_third_party_registered_invite" = "%@ godtok invitasjonen til %@";
+"notice_room_third_party_invite_for_dm" = "%@ inviterte %@";
+"notice_room_third_party_invite" = "%@ sendte en invitasjon til %@ om å bli med i rommet";
+"notice_room_third_party_revoked_invite_for_dm" = "%@ tilbakekalte invitasjonen til %@ om å bli med i rommet";
+"notice_room_third_party_revoked_invite" = "%@ tilbakekalte invitasjonen til %@ om å bli med i rommet";
+"notice_answered_video_call" = "%@ svarte på anropet";
+"notice_placed_video_call" = "%@ startet et videoanrop";
+"notice_placed_voice_call" = "%@ startet et taleanrop";
+"notice_room_name_changed_for_dm" = "%@ endret navnet til %@.";
+"notice_room_name_changed" = "%@ endret romnavnet til %@.";
+"notice_topic_changed" = "%@ endret emnet til \"%@\".";
+"notice_display_name_removed" = "%@ fjernet visningsnavnet";
+"notice_display_name_changed_from" = "%@ endret visningsnavnet fra %@ til %@";
+"notice_avatar_url_changed" = "%@ byttet avatar";
+"notice_room_reason" = ". Grunnen til: %@";
+"notice_room_withdraw" = "%@ trakk tilbake invitasjonen til %@";
+"notice_room_ban" = "%@ utestengte %@";
+"notice_room_unban" = "%@ omgjorde utestenging %@";
+"notice_declined_video_call" = "%@ avviste anropet";
+"notice_ended_video_call" = "%@ avsluttet samtalen";
+"notice_room_third_party_invite_by_you" = "Du sendte en invitasjon til %@ om å bli med i rommet";
+"notice_room_invite_you" = "%@ inviterte deg";
+
+// Notice Events with "You"
+"notice_room_invite_by_you" = "Du inviterte %@";
+"notice_conference_call_finished" = "VoIP-konferansen avsluttet";
+"notice_conference_call_started" = "VoIP-konferansen startet";
+"notice_conference_call_request" = "%@ ba om en VoIP-konferanse";
+"notice_room_kick_by_you" = "Du utviste %@";
+"notice_room_reject_by_you" = "Du avviste invitasjonen";
+"notice_room_leave_by_you" = "Du forlot";
+"notice_room_join_by_you" = "Du ble med";
+"notice_room_third_party_revoked_invite_by_you_for_dm" = "Du tilbakekalte invitasjonen til %@";
+"notice_room_third_party_revoked_invite_by_you" = "Du tilbakekalte invitasjonen til %@ om å bli med i rommet";
+"notice_room_third_party_registered_invite_by_you" = "Du godtok invitasjonen til %@";
+"notice_room_third_party_invite_by_you_for_dm" = "Du inviterte %@";
+"notice_room_unban_by_you" = "Du omgjorde utestenging av %@";
+"notice_room_ban_by_you" = "Du utestengte %@";
+"notice_answered_video_call_by_you" = "Du svarte på anropet";
+"notice_placed_video_call_by_you" = "Du startet et videoanrop";
+"notice_placed_voice_call_by_you" = "Du startet et taleanrop";
+"notice_room_name_changed_by_you_for_dm" = "Du endret navnet til %@.";
+"notice_room_name_changed_by_you" = "Du endret romnavnet til %@.";
+"notice_topic_changed_by_you" = "Du endret emnet til \"%@\".";
+"notice_display_name_removed_by_you" = "Du fjernet visningsnavnet ditt";
+"notice_display_name_changed_from_by_you" = "Du endret visningsnavnet ditt fra %@ til %@";
+"notice_display_name_set_by_you" = "Du satte visningsnavnet ditt til %@";
+"notice_room_withdraw_by_you" = "Du trakk tilbake invitasjonen til %@";
+"notice_avatar_url_changed_by_you" = "Du byttet avatar";
+"notice_declined_video_call_by_you" = "Du avviste anropet";
+"notice_ended_video_call_by_you" = "Du avsluttet samtalen";
+"login" = "Innlogging";
+"create_room" = "Opprett rom";
+
+// actions 
+"action_logout" = "Logg ut";
+"view" = "Visning";
+"delete" = "Slett";
+"share" = "Del";
+"redact" = "Fjern";
+"copy_button_name" = "Kopier";
+"send" = "Send";
+"leave" = "Forlat";
+"save" = "Lagre";
+"cancel" = "Avbryt";
+
+// Room Screen 
+
+// general errors 
+
+// Home Screen 
+
+// Last seen time 
+
+// call events 
+
+/* -*- 
+   Automatic localization for en
+
+   The following key/value pairs were extracted from the android i18n file:
+    /console/src/main/res/values/strings.xml.
+*/
+
+
+// titles 
+
+// button names 
+"ok" = "OK";
+"notice_room_history_visible_to_members_from_joined_point_by_you_for_dm" = "Du gjorde fremtidige meldinger synlige for alle, fra de ble med.";
+"notice_room_history_visible_to_members_from_joined_point_by_you" = "Du gjorde fremtidig romhistorie synlig for alle medlemmer i rommet, fra det tidspunktet de ble med.";
+"notice_room_history_visible_to_members_from_invited_point_by_you_for_dm" = "Du gjorde fremtidige meldinger synlige for alle, fra de blir invitert.";
+"notice_room_history_visible_to_members_from_invited_point_by_you" = "Du gjorde fremtidig romhistorie synlig for alle medlemmer i rommet, fra det tidspunktet de er invitert.";
+"notice_room_history_visible_to_members_by_you_for_dm" = "Du gjorde fremtidige meldinger synlige for alle medlemmer i rommet.";
+"notice_room_history_visible_to_members_by_you" = "Du gjorde fremtidig romhistorie synlig for alle medlemmer i rommet.";
+"notice_room_history_visible_to_anyone_by_you" = "Du gjorde fremtidig romhistorie synlig for alle.";
+"notice_redaction_by_you" = "Du fjernet en hendelse (id: %@)";
+"notice_encryption_enabled_unknown_algorithm_by_you" = "Du slo på ende-til-ende-kryptering (ukjent algoritme %@).";
+"notice_encryption_enabled_ok_by_you" = "Du slo på ende-til-ende-kryptering.";
+"notice_room_created_by_you_for_dm" = "Du ble med.";
+"notice_room_created_by_you" = "Du opprettet og konfigurerte rommet.";
+"notice_profile_change_redacted_by_you" = "Du oppdaterte profilen din %@";
+"notice_event_redacted_by_you" = " av deg";
+"notice_room_topic_removed_by_you" = "Du fjernet emnet";
+"notice_room_name_removed_by_you_for_dm" = "Du fjernet navnet";
+"notice_room_name_removed_by_you" = "Du fjernet romnavnet";
+"notice_conference_call_request_by_you" = "Du ba om en VoIP-konferanse";
+"kick" = "Utvis";
+"invite" = "Inviter";
+"num_members_other" = "%@ brukere";
+"num_members_one" = "%@ bruker";
+"membership_ban" = "Utestengt";
+"membership_leave" = "Forlot";
+"membership_invite" = "Invitert";
+"create_account" = "Opprett konto";
+"notification_settings_global_info" = "Varslingsinnstillinger lagres i brukerkontoen din og deles mellom alle klienter som støtter dem (inkludert skrivebordsvarsler).\n\nRegler brukes i rekkefølge; den første regelen som samsvarer definerer resultatet for meldingen.\nSå: Varsler per ord er viktigere enn varsler per rom som er viktigere enn varsler per avsender.\nVed flere regler av samme type benyttes den første i listen som samsvarer.";
+"notification_settings_enable_notifications_warning" = "Alle varsler er for øyeblikket deaktivert for alle enheter.";
+"notification_settings_enable_notifications" = "Aktiver varsler";
+
+// Notification settings screen 
+"notification_settings_disable_all" = "Deaktiver alle varsler";
+"settings_title_notifications" = "Varsler";
+
+// Settings screen 
+"settings_title_config" = "Konfigurasjon";
+
+// contacts list screen 
+"invitation_message" = "Jeg vil gjerne chatte med deg med Matrix. Besøk nettstedet https://matrix.org for å få mer informasjon.";
+
+// members list Screen 
+
+// accounts list Screen 
+
+// image size selection 
+
+// invitation members list Screen 
+
+// room creation dialog Screen 
+
+// room info dialog Screen
+
+// room details dialog screen
+"room_details_title" = "Romdetaljer";
+"login_error_must_start_http" = "URL må starte med http[s]://";
+
+// Login Screen 
+"login_error_already_logged_in" = "Allerede logget inn";
+"message_unsaved_changes" = "Endringer er ikke lagret. Hvis du avslutter, forkastes de.";
+"unban" = "Omgjør utestenging";
+"ban" = "Utesteng";
+"notification_settings_receive_a_call" = "Varsle meg når jeg mottar et anrop";
+"notification_settings_people_join_leave_rooms" = "Varsle meg når folk blir med eller forlater rom";
+"notification_settings_invite_to_a_new_room" = "Varsle meg når jeg blir invitert til et nytt rom";
+"notification_settings_just_sent_to_me" = "Varsle meg med lyd om meldinger sendt bare til meg";
+"notification_settings_contain_my_display_name" = "Varsle meg med lyd om meldinger som inneholder visningsnavnet mitt";
+"notification_settings_contain_my_user_name" = "Varsle meg med lyd om meldinger som inneholder brukernavnet mitt";
+"notification_settings_other_alerts" = "Andre varsler";
+"notification_settings_select_room" = "Velg et rom";
+"notification_settings_sender_hint" = "@bruker:domene.com";
+"notification_settings_per_sender_notifications" = "Varsler per avsender";
+"notification_settings_per_room_notifications" = "Varsler per rom";
+"notification_settings_custom_sound" = "Egendefinert lyd";
+"notification_settings_highlight" = "Fremhev";
+"notification_settings_word_to_match" = "ord som skal samsvare";
+"notification_settings_never_notify" = "Aldri varsle";
+"notification_settings_always_notify" = "Alltid varsle";
+"notification_settings_per_word_info" = "Ord samsvarer uten å ta hensyn til store eller små bokstaver, og kan inneholde et * jokertegn. Så:\nfoo samsvarer med strengen foo omgitt av ordavgrensere (f.eks. tegnsetting og mellomrom eller start/slutt på linjen).\nfoo* samsvarer med et slikt ord som begynner foo.\n*foo* samsvarer med et hvilket som helst ord som inkluderer de tre bokstavene foo.";
+"notification_settings_per_word_notifications" = "Varsler per ord";
+"notification_settings_suppress_from_bots" = "Blokker meldinger fra roboter";
+"notification_settings_notify_all_other" = "Varsle for alle andre meldinger/rom";
+"notification_settings_by_default" = "Som standard ...";
+"incoming_video_call" = "Innkommende videoanrop";
+"call_ended" = "Samtale avsluttet";
+"call_ringing" = "Ringer…";
+
+// Settings keys 
+
+// call string
+"call_connecting" = "Kobler til…";
+"settings_config_user_id" = "Bruker-ID: %@";
+"settings_config_identity_server" = "Identitetsserver: %@";
+
+// gcm section 
+"settings_config_home_server" = "Hjemmeserver: %@";
+"incoming_voice_call" = "Innkommende taleanrop";
+"call_invite_expired" = "Anropsinvitasjon utløpt";
+
+// unrecognized SSL certificate
+"ssl_trust" = "Tillit";
+"call_transfer_to_user" = "Overfør til %@";
+"call_consulting_with_user" = "Rådfører seg med %@";
+"call_video_with_user" = "Videosamtale med %@";
+"call_voice_with_user" = "Taleanrop med %@";
+"call_more_actions_dialpad" = "Tastaturet";
+"call_more_actions_transfer" = "Overfør";
+"call_more_actions_audio_use_device" = "Bruk enhetslyd";
+"call_more_actions_audio_use_headset" = "Bruk hodetelefonlyd";
+"call_more_actions_change_audio_device" = "Bytt lydenhet";
+"call_more_actions_unhold" = "Gjenoppta";
+"call_more_actions_hold" = "Hold";
+"call_holded" = "Du holdt samtalen";
+"call_remote_holded" = "%@ satte samtalen på vent";
+"ssl_unexpected_existing_expl" = "Sertifikatet har endret seg fra et som telefonen din klarerte. Dette er VELDIG UVANLIG. Det anbefales derfor at du IKKE godtar dette nye sertifikatet.";
+"ssl_cert_new_account_expl" = "Hvis serveradministratoren har sagt at dette forventes, må du forsikre deg om at fingeravtrykket nedenfor samsvarer med fingeravtrykket du har fått.";
+"ssl_could_not_verify" = "Kunne ikke bekrefte identiteten til den eksterne serveren.";
+"ssl_fingerprint_hash" = "Fingeravtrykk (%@):";
+"ssl_remain_offline" = "Ignorer";
+"ssl_logout_account" = "Logg ut";
+"ssl_expected_existing_expl" = "Sertifikatet er endret fra et tidligere klarert til et som ikke er klarert. Serveren kan ha fornyet sertifikatet. Kontakt serveradministratoren for forventet fingeravtrykk.";
+"ssl_only_accept" = "Godta KUN sertifikatet hvis serveradministratoren har publisert et fingeravtrykk som samsvarer med det over.";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/nl.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/nl.lproj/MatrixKit.strings
new file mode 100644
index 000000000..8c6e58224
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/nl.lproj/MatrixKit.strings
@@ -0,0 +1,542 @@
+/*
+ Copyright 2017 Vector Creations 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.
+ */
+
+/* *********************** */
+/*      iOS specific       */
+/* *********************** */
+
+"matrix" = "Matrix";
+// Login Screen
+"login_create_account" = "Account aanmaken:";
+"login_server_url_placeholder" = "URL (bv. https://matrix.org)";
+"login_home_server_title" = "Thuisserver-URL:";
+"login_home_server_info" = "Uw thuisserver slaat al uw gespreks- en accountgegevens op";
+"login_identity_server_title" = "Identiteitsserver-URL:";
+"login_identity_server_info" = "Matrix verstrekt identiteitsservers om te achterhalen welke e-mailadressen enz. bij welke Matrix-ID’s horen. Tot nu toe bestaat alleen https://matrix.org.";
+"login_user_id_placeholder" = "Matrix-ID (bv. @jan:matrix.org of jan)";
+"login_password_placeholder" = "Wachtwoord";
+"login_optional_field" = "optioneel";
+"login_display_name_placeholder" = "Weergavenaam (bv. Jan Janssens)";
+"login_email_info" = "Door een e-mailadres in te voeren kunnen andere gebruikers u eenvoudiger op Matrix vinden, verder geeft het u een manier om uw wachtwoord in de toekomst te wijzigen.";
+"login_email_placeholder" = "E-mailadres";
+"login_prompt_email_token" = "Voer uw e-mailadres-validatiebewijs in:";
+"login_error_title" = "Aanmelden Mislukt";
+"login_error_no_login_flow" = "Ophalen van authenticatie-informatie van deze thuisserver is mislukt";
+"login_error_do_not_support_login_flows" = "Momenteel bieden we geen ondersteuning voor sommige of alle aanmeldingsmethoden van deze thuisserver";
+"login_error_registration_is_not_supported" = "Registratie wordt momenteel niet ondersteund";
+"login_error_forbidden" = "Ongeldige gebruikersnaam/wachtwoord";
+"login_error_unknown_token" = "Het gespecificeerde toegangsbewijs is niet herkend";
+"login_error_bad_json" = "Ongeldige JSON";
+"login_error_not_json" = "Bevat geen geldige JSON";
+"login_error_limit_exceeded" = "Er zijn te veel verzoeken verzonden";
+"login_error_user_in_use" = "Deze gebruikersnaam is al in gebruik";
+"login_error_login_email_not_yet" = "De koppeling in de e-mail is nog niet geopend";
+"login_use_fallback" = "Terugvalpagina gebruiken";
+"login_leave_fallback" = "Annuleren";
+"login_invalid_param" = "Ongeldige parameter";
+"register_error_title" = "Registratie Mislukt";
+"login_error_forgot_password_is_not_supported" = "Wachtwoord vergeten wordt momenteel nog niet ondersteund";
+// Action
+"no" = "Nee";
+"yes" = "Ja";
+"abort" = "Afbreken";
+"back" = "Terug";
+"close" = "Sluiten";
+"continue" = "Verdergaan";
+"discard" = "Verwerpen";
+"dismiss" = "Sluiten";
+"retry" = "Opnieuw proberen";
+"sign_up" = "Aanmelden";
+"submit" = "Versturen";
+"submit_code" = "Code versturen";
+"set_power_level" = "Machtsniveau instellen";
+"set_default_power_level" = "Machtsniveau opnieuw instellen";
+"set_moderator" = "Tot moderator benoemen";
+"set_admin" = "Tot beheerder benoemen";
+"start_chat" = "Gesprek beginnen";
+"start_voice_call" = "Spraakoproep beginnen";
+"start_video_call" = "Video-oproep beginnen";
+"mention" = "Vermelden";
+"select_account" = "Selecteer een account";
+"attach_media" = "Media van de bibliotheek bijvoegen";
+"capture_media" = "Foto/video maken";
+"invite_user" = "Matrix-gebruiker uitnodigen";
+"reset_to_default" = "Standaardwaarden herstellen";
+"resend_message" = "Bericht opnieuw versturen";
+"select_all" = "Alles selecteren";
+"cancel_upload" = "Upload annuleren";
+"cancel_download" = "Download annuleren";
+"show_details" = "Details weergeven";
+"answer_call" = "Oproep beantwoorden";
+"reject_call" = "Oproep afwijzen";
+"end_call" = "Ophangen";
+"ignore" = "Negeren";
+"unignore" = "Stoppen met negeren";
+// Events formatter
+"notice_avatar_changed_too" = "(avatar is ook veranderd)";
+"notice_room_name_removed" = "%@ heeft de gespreksnaam verwijderd";
+"notice_room_topic_removed" = "%@ heeft het onderwerp verwijderd";
+"notice_event_redacted" = "<verwijderd%@>";
+"notice_event_redacted_by" = " door %@";
+"notice_event_redacted_reason" = " [reden: %@]";
+"notice_profile_change_redacted" = "%@ heeft zijn/haar profiel bijgewerkt %@";
+"notice_room_created" = "%@ heeft de kamer aangemaakt en ingesteld.";
+"notice_room_join_rule" = "De toetredingsregel is: %@";
+"notice_room_power_level_intro" = "De machtsniveaus van de gespreksleden zijn:";
+"notice_room_power_level_acting_requirement" = "De minimale machtsniveaus waarover een gebruiker moet beschikken vooraleer deze kan handelen zijn:";
+"notice_room_power_level_event_requirement" = "De minimale machtsniveaus gerelateerd aan gebeurtenissen zijn:";
+"notice_room_aliases" = "De gespreksbijnamen zijn: %@";
+"notice_encrypted_message" = "Versleuteld bericht";
+"notice_encryption_enabled" = "%@ heeft eind-tot-eind-versleuteling aangezet (%@-algoritme)";
+"notice_image_attachment" = "afbeeldingsbijlage";
+"notice_audio_attachment" = "audiobijlage";
+"notice_video_attachment" = "videobijlage";
+"notice_location_attachment" = "locatiebijlage";
+"notice_file_attachment" = "bestandsbijlage";
+"notice_invalid_attachment" = "ongeldige bijlage";
+"notice_unsupported_attachment" = "Niet-ondersteunde bijlage: %@";
+"notice_feedback" = "Feedbackgebeurtenis (id: %@): %@";
+"notice_redaction" = "%@ een gebeurtenis verwijderd (id: %@)";
+"notice_error_unsupported_event" = "Niet-ondersteunde gebeurtenis";
+"notice_error_unexpected_event" = "Onverwachte gebeurtenis";
+"notice_error_unknown_event_type" = "Onbekend gebeurtenistype";
+"notice_room_history_visible_to_anyone" = "%@ heeft de toekomstige gespreksgeschiedenis voor iedereen zichtbaar gemaakt.";
+"notice_room_history_visible_to_members" = "%@ heeft de toekomstige gespreksgeschiedenis voor alle gespreksleden zichtbaar gemaakt.";
+"notice_room_history_visible_to_members_from_invited_point" = "%@ heeft de toekomstige gespreksgeschiedenis zichtbaar gemaakt voor alle gespreksleden, vanaf het moment dat ze uitgenodigd zijn.";
+"notice_room_history_visible_to_members_from_joined_point" = "%@ heeft de toekomstige gespreksgeschiedenis zichtbaar gemaakt voor alle gespreksleden, vanaf het moment dat ze toetreden.";
+"notice_crypto_unable_to_decrypt" = "** Kan niet ontsleutelen: %@ **";
+"notice_crypto_error_unknown_inbound_session_id" = "De sessie van de afzender heeft ons geen sleutels voor dit bericht gestuurd.";
+// room display name
+"room_displayname_empty_room" = "Leeg gesprek";
+"room_displayname_two_members" = "%@ en %@";
+"room_displayname_more_than_two_members" = "%@ en %@ anderen";
+// Settings
+"settings" = "Instellingen";
+"settings_enable_inapp_notifications" = "In-app-meldingen inschakelen";
+"settings_enable_push_notifications" = "Pushmeldingen inschakelen";
+"settings_enter_validation_token_for" = "Voer validatiebewijs voor %@ in:";
+"notification_settings_room_rule_title" = "Gesprek: ‘%@’";
+// Devices
+"device_details_title" = "Sessie-informatie\n";
+"device_details_name" = "Publieke naam\n";
+"device_details_identifier" = "ID\n";
+"device_details_last_seen" = "Laatst gezien\n";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_rename_prompt_message" = "De publieke naam van een sessie is zichtbaar voor de personen waarmee u communiceert";
+"device_details_delete_prompt_title" = "Authenticatie";
+"device_details_delete_prompt_message" = "Deze handeling vereist bijkomende authenticatie.\nVoer uw wachtwoord in om verder te gaan.";
+// Encryption information
+"room_event_encryption_info_title" = "Informatie over eind-tot-eind-versleuteling\n\n";
+"room_event_encryption_info_event" = "Gebeurtenisinformatie\n";
+"room_event_encryption_info_event_user_id" = "Gebruikers-ID\n";
+"room_event_encryption_info_event_identity_key" = "Curve25519-identiteitssleutel\n";
+"room_event_encryption_info_event_fingerprint_key" = "Geclaimde Ed25519-vingerafdrukssleutel\n";
+"room_event_encryption_info_event_algorithm" = "Algoritme\n";
+"room_event_encryption_info_event_session_id" = "Sessie-ID\n";
+"room_event_encryption_info_event_decryption_error" = "Ontsleutelingsfout\n";
+"room_event_encryption_info_event_unencrypted" = "onversleuteld";
+"room_event_encryption_info_event_none" = "geen";
+"room_event_encryption_info_device" = "\nInformatie over sessie van afzender\n";
+"room_event_encryption_info_device_unknown" = "onbekende sessie\n";
+"room_event_encryption_info_device_name" = "Publieke naam\n";
+"room_event_encryption_info_device_id" = "ID\n";
+"room_event_encryption_info_device_verification" = "Verificatie\n";
+"room_event_encryption_info_device_fingerprint" = "Ed25519-vingerafdruk\n";
+"room_event_encryption_info_device_verified" = "Geverifieerd";
+"room_event_encryption_info_device_not_verified" = "NIET geverifieerd";
+"room_event_encryption_info_device_blocked" = "Geblokkeerd";
+"room_event_encryption_info_verify" = "Verifiëren…";
+"room_event_encryption_info_unverify" = "Ontverifiëren";
+"room_event_encryption_info_block" = "Blokkeren";
+"room_event_encryption_info_unblock" = "Deblokkeren";
+"room_event_encryption_verify_title" = "Sessie verifiëren\n\n";
+"room_event_encryption_verify_message" = "Om te verifiëren dat deze sessie vertrouwd kan worden, neemt u contact op met de eigenaar van de sessie op een andere manier (bv. persoonlijk of door te bellen) en vraagt u hem/haar of de sleutel die hij/zij in de gebruikersinstellingen ziet overeenkomt met de onderstaande sleutel:\n\n\tSessienaam: %@\n\tSessie-ID: %@\n\tSessiesleutel: %@\n\nAls het overeenkomt, klikt u hieronder op de knop ‘Verifiëren’. Als het niet overeenkomt, onderschept iemand anders deze sessie en drukt u in plaats daarvan op de knop ‘Blokkeren’.\n\nIn de toekomst zal dit verificatieproces verbeterd worden.";
+"room_event_encryption_verify_ok" = "Verifiëren";
+// Account
+"account_save_changes" = "Wijzigingen opslaan";
+"account_link_email" = "E-mailadres koppelen";
+"account_linked_emails" = "Gekoppelde e-mailadressen";
+"account_email_validation_title" = "Verificatie in afwachting";
+"account_email_validation_message" = "Bekijk uw e-mail en open de koppeling erin. Wanneer dit gedaan is, tikt u op verder gaan.";
+"account_email_validation_error" = "Kan het e-mailadres niet verifiëren. Bekijk uw e-mail en open de koppeling erin. Wanneer dit gedaan is, tikt u op verder gaan";
+"account_msisdn_validation_title" = "Verificatie in afwachting";
+"account_msisdn_validation_message" = "We hebben een sms met een activatiecode verstuurd. Voer deze code hieronder in.";
+"account_msisdn_validation_error" = "Kan het telefoonnummer niet verifiëren.";
+"account_error_display_name_change_failed" = "Wijzigen van weergavenaam is mislukt";
+"account_error_picture_change_failed" = "Wijzigen van afbeelding is mislukt";
+"account_error_matrix_session_is_not_opened" = "Matrix-sessie is niet geopend";
+"account_error_email_wrong_title" = "Ongeldig e-mailadres";
+"account_error_email_wrong_description" = "Het ziet er niet naar uit dat dit een geldig e-mailadres is";
+"account_error_msisdn_wrong_title" = "Ongeldig telefoonnummer";
+"account_error_msisdn_wrong_description" = "Het ziet er niet naar uit dat dit een geldig telefoonnummer is";
+// Room creation
+"room_creation_name_title" = "Gespreksnaam:";
+"room_creation_name_placeholder" = "(bv. lunchGroep)";
+"room_creation_alias_title" = "Gespreksbijnaam:";
+"room_creation_alias_placeholder" = "(bv. #foo:voorbeeld.org)";
+"room_creation_alias_placeholder_with_homeserver" = "(bv. #foo%@)";
+"room_creation_participants_title" = "Deelnemers:";
+"room_creation_participants_placeholder" = "(bv. @jan:thuisserver1; @joep:thuisserver2…)";
+// Room
+"room_please_select" = "Selecteer een gesprek";
+"room_error_join_failed_title" = "Toetreden tot het gesprek is mislukt";
+"room_error_join_failed_empty_room" = "Het is momenteel niet mogelijk om tot een leeg gesprek toe te treden.";
+"room_error_name_edition_not_authorized" = "U bent niet bevoegd om de naam van dit gesprek te wijzigen";
+"room_error_topic_edition_not_authorized" = "U bent niet bevoegd om het onderwerp van dit gesprek te wijzigen";
+"room_error_cannot_load_timeline" = "Laden van tijdslijn is mislukt";
+"room_error_timeline_event_not_found_title" = "Laden van tijdslijnpositie is mislukt";
+"room_error_timeline_event_not_found" = "De app heeft geprobeerd een specifiek punt in de tijdslijn van dit gesprek te laden, maar kon het niet vinden";
+"room_left" = "U heeft het gesprek verlaten";
+"room_no_power_to_create_conference_call" = "U heeft toestemming nodig om een vergadering in dit groepsgesprek te starten";
+"room_no_conference_call_in_encrypted_rooms" = "Vergadergesprekken worden niet ondersteund in versleutelde gesprekken";
+// Room members
+"room_member_ignore_prompt" = "Weet u zeker dat u alle berichten van deze gebruiker wilt verbergen?";
+"room_member_power_level_prompt" = "U kunt deze veranderingen niet ongedaan maken aangezien u de gebruiker tot hetzelfde niveau als uzelf promoveert.\nWeet u het zeker?";
+// Attachment
+"attachment_size_prompt" = "Wilt u het versturen als:";
+"attachment_original" = "Werkelijke grootte (%@)";
+"attachment_small" = "Klein (~%@)";
+"attachment_medium" = "Middel (~%@)";
+"attachment_large" = "Groot (~%@)";
+"attachment_cancel_download" = "Download annuleren?";
+"attachment_cancel_upload" = "Upload annuleren?";
+"attachment_multiselection_size_prompt" = "Wilt u afbeeldingen versturen als:";
+"attachment_multiselection_original" = "Werkelijke grootte";
+"attachment_e2e_keys_file_prompt" = "Dit bestand bevat versleutelingssleutels die uit een Matrix-client geëxporteerd zijn.\nWilt u de bestandsinhoud bekijken of de sleutels die het bevat importeren?";
+"attachment_e2e_keys_import" = "Bezig met importeren…";
+// Contacts
+"contact_mx_users" = "Matrix-gebruikers";
+"contact_local_contacts" = "Lokale contacten";
+// Search
+"search_no_results" = "Geen resultaten";
+// Time
+"format_time_s" = "s";
+"format_time_m" = "m";
+"format_time_h" = "u";
+"format_time_d" = "d";
+// E2E import
+"e2e_import_room_keys" = "Gesprekssleutels importeren";
+"e2e_import_prompt" = "Dit proces maakt het mogelijk om versleutelingssleutels die u eerder had geëxporteerd vanaf een andere Matrix-cliënt te importeren. Daarna kunt u alle berichten ontsleutelen die de andere cliënt ook kon ontsleutelen.\nHet exporteerbestand is beschermd met een wachtwoord. Voer hier het wachtwoord in om het bestand te ontsleutelen.";
+"e2e_import" = "Importeren";
+"e2e_passphrase_enter" = "Voer wachtwoord in";
+// E2E export
+"e2e_export_room_keys" = "Gesprekssleutels exporteren";
+"e2e_export_prompt" = "Dit proces maakt het mogelijk om de sleutels voor berichten die u heeft ontvangen in versleutelde gesprekken te exporteren naar een lokaal bestand. Daarna kunt u het bestand in de toekomst in een andere Matrix-cliënt importeren, zodat die cliënt ook deze berichten zal kunnen ontsleutelen.\nHet geëxporteerde bestand zal iedereen die het kan lezen de mogelijkheid bieden om de versleutelde berichten die u kunt zien te ontsleutelen, dus wees voorzichtig en bewaar het op een veilige plaats.";
+"e2e_export" = "Exporteren";
+"e2e_passphrase_confirm" = "Bevestig wachtwoord";
+"e2e_passphrase_empty" = "Wachtwoord mag niet leeg zijn";
+"e2e_passphrase_not_match" = "Wachtwoorden moeten overeenkomen";
+// Others
+"user_id_title" = "Gebruikers-ID:";
+"offline" = "offline";
+"unsent" = "Niet verstuurd";
+"error" = "Fout";
+"not_supported_yet" = "Nog niet ondersteund";
+"default" = "standaard";
+"private" = "Privé";
+"public" = "Publiek";
+"power_level" = "Machtsniveau";
+"network_error_not_reachable" = "Controleer uw netwerkverbinding";
+"user_id_placeholder" = "bv: @jan:thuisserver";
+"ssl_homeserver_url" = "Thuisserver-URL: %@";
+// Permissions
+"camera_access_not_granted_for_call" = "Video-oproepen vereisen toegang tot de camera, maar %@ heeft hier geen toestemming voor";
+"microphone_access_not_granted_for_call" = "Oproepen vereisen toegang tot de camera, maar %@ heeft hier geen toestemming voor";
+"local_contacts_access_not_granted" = "Gebruikers zoeken op basis van uw lokale contacten vereist toegang tot die contacten, maar %@ heeft hier geen toestemming voor";
+"local_contacts_access_discovery_warning_title" = "Gebruikers zoeken";
+"local_contacts_access_discovery_warning" = "Om contacten te vinden die Matrix al gebruiken, kan %@ de e-mailadressen en telefoonnummers in uw adresboek naar uw gekozen Matrix-identiteitsserver sturen. Waar ondersteund worden de persoonlijke gegevens gehasht vóór het versturen - bekijk het privacybeleid van uw identiteitsserver voor meer informatie.";
+// Country picker
+"country_picker_title" = "Kies een land";
+/* -*- 
+   Automatic localization for en
+
+   The following key/value pairs were extracted from the android i18n file:
+    /matrix-sdk/src/main/res/values/strings.xml.
+*/
+
+"notice_room_invite" = "%@ heeft %@ uitgenodigd";
+"notice_room_third_party_invite" = "%@ heeft een uitnodiging gestuurd naar %@ om tot het gesprek toe te treden";
+"notice_room_third_party_registered_invite" = "%@ heeft de uitnodiging voor %@ aanvaard";
+"notice_room_join" = "%@ is tot de kamer toegetreden";
+"notice_room_leave" = "%@ heeft de kamer verlaten";
+"notice_room_reject" = "%@ heeft de uitnodiging geweigerd";
+"notice_room_kick" = "%@ heeft %@ uit de kamer gezet";
+"notice_room_unban" = "%@ heeft %@ ontbannen";
+"notice_room_ban" = "%@ heeft %@ verbannen";
+"notice_room_withdraw" = "%@ heeft de uitnodiging van %@ ingetrokken";
+"notice_room_reason" = ". Reden: %@";
+"notice_avatar_url_changed" = "%@ heeft zijn/haar avatar veranderd";
+"notice_display_name_set" = "%@ heeft zijn/haar weergavenaam veranderd naar %@";
+"notice_display_name_changed_from" = "%@ heeft zijn/haar weergavenaam veranderd van %@ naar %@";
+"notice_display_name_removed" = "%@ heeft zijn/haar weergavenaam verwijderd";
+"notice_topic_changed" = "%@ heeft het onderwerp veranderd naar \"%@\".";
+"notice_room_name_changed" = "%@ heeft de gespreksnaam veranderd naar %@.";
+"notice_placed_voice_call" = "%@ heeft een spraakoproep gestart";
+"notice_placed_video_call" = "%@ heeft een video-oproep gestart";
+"notice_answered_video_call" = "%@ heeft de oproep beantwoord";
+"notice_ended_video_call" = "%@ heeft opgehangen";
+"notice_conference_call_request" = "%@ heeft een VoIP-vergadering aangevraagd";
+"notice_conference_call_started" = "VoIP-vergadering gestart";
+"notice_conference_call_finished" = "VoIP-vergadering beëindigd";
+// Room Screen 
+
+// general errors 
+
+// Home Screen 
+
+// Last seen time 
+
+// call events 
+
+/* -*- 
+   Automatic localization for en
+
+   The following key/value pairs were extracted from the android i18n file:
+    /console/src/main/res/values/strings.xml.
+*/
+
+// titles 
+
+// button names 
+"ok" = "Oké";
+"cancel" = "Annuleren";
+"save" = "Opslaan";
+"leave" = "Verlaten";
+"send" = "Versturen";
+"copy_button_name" = "Kopiëren";
+"resend" = "Opnieuw versturen";
+"redact" = "Verwijderen";
+"share" = "Delen";
+"delete" = "Verwijderen";
+"view" = "Bekijken";
+// actions 
+"action_logout" = "Afmelden";
+"create_room" = "Gesprek aanmaken";
+"login" = "Aanmelden";
+"create_account" = "Account aanmaken";
+"membership_invite" = "Uitgenodigd";
+"membership_leave" = "Verlaten";
+"membership_ban" = "Verbannen";
+"num_members_one" = "%@ gebruiker";
+"num_members_other" = "%@ gebruikers";
+"invite" = "Uitnodigen";
+"kick" = "Er uit zetten";
+"ban" = "Verbannen";
+"unban" = "Ontbannen";
+"message_unsaved_changes" = "Er zijn onopgeslagen wijzigingen. Verlaten zal ze verwijderen.";
+// Login Screen 
+"login_error_already_logged_in" = "Reeds aangemeld";
+"login_error_must_start_http" = "URL moet beginnen met http[s]://";
+// members list Screen 
+
+// accounts list Screen 
+
+// image size selection 
+
+// invitation members list Screen 
+
+// room creation dialog Screen 
+
+// room info dialog Screen
+
+// room details dialog screen
+"room_details_title" = "Kamerdetails";
+// contacts list screen 
+"invitation_message" = "Ik wil graag praten via Matrix. Bezoek de website https://matrix.org voor meer informatie.";
+// Settings screen 
+"settings_title_config" = "Configuratie";
+"settings_title_notifications" = "Meldingen";
+// Notification settings screen 
+"notification_settings_disable_all" = "Alle meldingen uitschakelen";
+"notification_settings_enable_notifications" = "Meldingen inschakelen";
+"notification_settings_enable_notifications_warning" = "Alle meldingen zijn momenteel voor alle apparaten uitgeschakeld.";
+"notification_settings_global_info" = "Meldingsinstellingen worden op uw account opgeslagen en gedeeld met alle cliënten die dat ondersteunen (inclusief bureaubladmeldingen).\n\nRegels worden in volgorde toegepast; de eerste regel die overeenkomt bepaalt de uitkomst van een bericht.\nDus: per-woord-meldingen zijn belangrijker dan per-gespreks-meldingen, die op hun beurt weer belangrijker zijn dan per-afzender-meldingen.\nVoor meerdere regels van hetzelfde type geldt dat de eerste in de lijst die overeenkomt de prioriteit heeft.";
+"notification_settings_per_word_notifications" = "Per-woord-meldingen";
+"notification_settings_per_word_info" = "Woorden komen niet hoofdlettergevoelig met elkaar overeen en kunnen een *-wildcard bevatten. Dus:\nfoo komt overeen met de tekenreeks ‘foo’, die omgeven wordt door woordscheidingstekens (zoals punctuatie en spaties, of het begin of einde van een regel).\nfoo* komt overeen met elk woord dat met ‘foo’ begint.\n*foo* komt overeen met elk woord dat de drie letters ‘foo’ bevat.";
+"notification_settings_always_notify" = "Altijd melden";
+"notification_settings_never_notify" = "Nooit melden";
+"notification_settings_word_to_match" = "woord om mee overeen te komen";
+"notification_settings_highlight" = "Markeren";
+"notification_settings_custom_sound" = "Aangepast geluid";
+"notification_settings_per_room_notifications" = "Per-gespreks-meldingen";
+"notification_settings_per_sender_notifications" = "Per-afzender-meldingen";
+"notification_settings_sender_hint" = "@gebruiker:domein.com";
+"notification_settings_select_room" = "Selecteer een gesprek";
+"notification_settings_other_alerts" = "Andere meldingen";
+"notification_settings_contain_my_user_name" = "Meld mij met geluid over berichten die mijn gebruikersnaam bevatten";
+"notification_settings_contain_my_display_name" = "Meld mij met geluid over berichten die mijn weergavenaam bevatten";
+"notification_settings_just_sent_to_me" = "Meld mij met geluid over berichten die alleen naar mij gestuurd zijn";
+"notification_settings_invite_to_a_new_room" = "Meld mij wanneer ik in een nieuw gesprek uitgenodigd word";
+"notification_settings_people_join_leave_rooms" = "Meld mij wanneer mensen het gesprek verlaten of betreden";
+"notification_settings_receive_a_call" = "Meld mij wanneer ik een oproep ontvang";
+"notification_settings_suppress_from_bots" = "Meldingen van robots onderdrukken";
+"notification_settings_by_default" = "Standaard…";
+"notification_settings_notify_all_other" = "Melden voor alle andere berichten/gesprekken";
+// gcm section 
+"settings_config_home_server" = "Thuisserver: %@";
+"settings_config_identity_server" = "Identiteitsserver: %@";
+"settings_config_user_id" = "Gebruikers-ID: %@";
+// Settings keys 
+
+// call string
+"call_waiting" = "In afwachting…";
+"call_connecting" = "Verbinden…";
+"call_ended" = "Oproep beëindigd";
+"call_ring" = "Bellen…";
+"incoming_video_call" = "Inkomende video-oproep";
+"incoming_voice_call" = "Inkomende spraakoproep";
+"call_invite_expired" = "Oproepuitnodiging verlopen";
+// unrecognized SSL certificate
+"ssl_trust" = "Vertrouwen";
+"ssl_logout_account" = "Afmelden";
+"ssl_remain_offline" = "Negeren";
+"ssl_fingerprint_hash" = "Vingerafdruk (%@):";
+"ssl_could_not_verify" = "Kan de identiteit van de externe server niet bepalen.";
+"ssl_cert_not_trust" = "Dit kan betekenen dat iemand kwaadwillig uw verkeer onderschept, of dat uw telefoon het certificaat dat door de externe server wordt geleverd niet vertrouwt.";
+"ssl_cert_new_account_expl" = "Als de serverbeheerder heeft gezegd dat dit de bedoeling is, wees er dan zeker van dat de vingerafdruk hieronder overeenkomt met de vingerafdruk die door hen wordt geleverd.";
+"ssl_unexpected_existing_expl" = "Het certificaat is veranderd van één dat door uw telefoon werd vertrouwd naar een ander. Dit is HEEL ONGEBRUIKELIJK. Het wordt aangeraden om dit nieuwe certificaat NIET TE AANVAARDEN.";
+"ssl_expected_existing_expl" = "Het certificaat is veranderd van een vertrouwd naar een onvertrouwd certificaat. De server heeft misschien zijn certificaat vernieuwd. Contacteer de serverbeheerder voor de verwachte vingerafdruk.";
+"ssl_only_accept" = "Aanvaard het certificaat alleen als de serverbeheerder een vingerafdruk heeft gepubliceerd die overeenkomt met degene hierboven.";
+"search_searching" = "Bezig met zoeken…";
+// Language picker
+"language_picker_title" = "Kies een taal";
+"language_picker_default_language" = "Standaard (%@)";
+"login_mobile_device" = "Mobiel";
+"login_tablet_device" = "Tablet";
+"login_desktop_device" = "Desktop";
+"notice_room_related_groups" = "De groepen die geassocieerd zijn met dit gesprek zijn: %@";
+// Groups
+"group_invite_section" = "Uitnodigingen";
+"group_section" = "Groepen";
+"notice_sticker" = "sticker";
+"notice_in_reply_to" = "In antwoord op";
+"error_common_message" = "Er is een fout opgetreden. Probeer het later opnieuw.";
+"login_error_resource_limit_exceeded_title" = "Bronlimiet Overschreden";
+"login_error_resource_limit_exceeded_message_default" = "Deze thuisserver heeft één of meerdere van zijn bronlimieten overschreden.";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "Deze thuisserver heeft zijn limiet voor maandelijks actieve gebruikers bereikt.";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nGelieve contact op te nemen met uw dienstbeheerder om deze dienst te blijven gebruiken.";
+"login_error_resource_limit_exceeded_contact_button" = "Beheerder contacteren";
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "heeft een afbeelding gestuurd.";
+"message_reply_to_sender_sent_a_video" = "heeft een video gestuurd.";
+"message_reply_to_sender_sent_an_audio_file" = "heeft een audiobestand gestuurd.";
+"message_reply_to_sender_sent_a_file" = "heeft een bestand gestuurd.";
+"message_reply_to_message_to_reply_to_prefix" = "In antwoord op";
+"e2e_passphrase_create" = "Wachtwoord aanmaken";
+"account_error_push_not_allowed" = "Meldingen niet toegestaan";
+"notice_room_third_party_revoked_invite" = "%@ heeft de uitnodiging voor %@ om tot het gesprek toe te treden ingetrokken";
+"device_details_rename_prompt_title" = "Sessienaam";
+"notice_encryption_enabled_ok" = "%@ heeft eind-tot-eind-versleuteling ingeschakeld.";
+"notice_encryption_enabled_unknown_algorithm" = "%1$@ heeft eind-tot-eind-versleuteling ingeschakeld (onbekend algoritme %2$@).";
+"notice_room_name_removed_for_dm" = "%@ heeft de naam verwijderd";
+"notice_room_ban_by_you" = "U heeft %@ verbannen";
+"notice_room_unban_by_you" = "U heeft %@ ontbannen";
+"notice_room_history_visible_to_members_from_joined_point_by_you_for_dm" = "U heeft toekomstige berichten voor iedereen zichtbaar gemaakt vanaf het moment dat zij deelnemen aan het gesprek.";
+"notice_room_history_visible_to_members_from_joined_point_by_you" = "U heeft de toekomstige gespreksgeschiedenis zichtbaar gemaakt voor alle gespreksleden, vanaf het moment dat ze toegetreden zijn.";
+"notice_room_history_visible_to_members_from_invited_point_by_you_for_dm" = "U heeft toekomstige berichten voor iedereen zichtbaar gemaakt vanaf het moment dat zij zijn uitgenodigd.";
+"notice_room_history_visible_to_members_from_invited_point_by_you" = "U heeft de toekomstige gespreksgeschiedenis zichtbaar gemaakt voor alle gespreksleden, vanaf het moment dat ze uitgenodigd zijn.";
+"notice_room_history_visible_to_members_by_you_for_dm" = "U heeft toekomstige berichten voor alle gespreksleden zichtbaar gemaakt.";
+"notice_room_history_visible_to_members_by_you" = "U heeft de toekomstige gespreksgeschiedenis voor alle gespreksleden zichtbaar gemaakt.";
+"notice_room_history_visible_to_anyone_by_you" = "U heeft de toekomstige gespreksgeschiedenis voor iedereen zichtbaar gemaakt.";
+"notice_redaction_by_you" = "U heeft een gebeurtenis bewerkt (ID: %@)";
+"notice_encryption_enabled_unknown_algorithm_by_you" = "U heeft eind-tot-eind-versleuteling ingeschakeld (onbekend algoritme %@).";
+"notice_encryption_enabled_ok_by_you" = "U heeft eind-tot-eind-versleuteling ingeschakeld.";
+"notice_room_created_by_you_for_dm" = "U bent toegetreden.";
+"notice_room_created_by_you" = "U heeft de kamer aangemaakt en ingesteld.";
+"notice_profile_change_redacted_by_you" = "U heeft uw profiel %@ bijgewerkt";
+"notice_event_redacted_by_you" = " door u";
+"notice_room_topic_removed_by_you" = "U heeft het onderwerp verwijderd";
+"notice_room_name_removed_by_you_for_dm" = "U heeft de naam verwijderd";
+"notice_room_name_removed_by_you" = "U heeft de gespreksnaam verwijderd";
+"notice_conference_call_request_by_you" = "U heeft een VoIP-vergadering aangevraagd";
+"notice_ended_video_call_by_you" = "U heeft opgehangen";
+"notice_answered_video_call_by_you" = "U heeft de oproep beantwoord";
+"notice_placed_video_call_by_you" = "U heeft een spraakoproep gestart";
+"notice_placed_voice_call_by_you" = "U heeft een spraakoproep gestart";
+"notice_room_name_changed_by_you_for_dm" = "U heeft de gespreksnaam veranderd naar %@.";
+"notice_room_name_changed_by_you" = "U heeft de gespreksnaam veranderd naar %@.";
+"notice_topic_changed_by_you" = "U heeft het onderwerp veranderd naar \"%@\".";
+"notice_display_name_removed_by_you" = "U heeft uw weergavenaam verwijderd";
+"notice_display_name_changed_from_by_you" = "U heeft uw weergavenaam veranderd van %@ naar %@";
+"notice_display_name_set_by_you" = "U heeft uw weergavenaam veranderd naar %@";
+"notice_avatar_url_changed_by_you" = "U heeft uw profielfoto veranderd";
+"notice_room_withdraw_by_you" = "U heeft %@'s uitnodiging teruggetrokken";
+"notice_room_kick_by_you" = "U heeft %@ verwijderd uit het gesprek";
+"notice_room_reject_by_you" = "U heeft de uitnodiging geweigerd";
+"notice_room_leave_by_you" = "U heeft het gesprek verlaten";
+"notice_room_join_by_you" = "U bent toegetreden";
+"notice_room_third_party_revoked_invite_by_you_for_dm" = "U heeft %@'s uitnodiging ingetrokken";
+"notice_room_third_party_revoked_invite_by_you" = "U heeft de uitnodiging aan %@ om aan het gesprek deel te nemen ingetrokken";
+"notice_room_third_party_registered_invite_by_you" = "U heeft de uitnodiging van %@ aanvaard";
+"notice_room_third_party_invite_by_you_for_dm" = "U heeft %@ uitgenodigd";
+"notice_room_third_party_invite_by_you" = "U heeft %@ uitgenodigd om aan het gesprek deel te nemen";
+"notice_room_invite_you" = "%@ heeft u uitgenodigd";
+
+// Notice Events with "You"
+"notice_room_invite_by_you" = "U heeft %@ uitgenodigd";
+"notice_room_name_changed_for_dm" = "%@ heeft de gespreksnaam veranderd naar %@.";
+"notice_room_third_party_revoked_invite_for_dm" = "%@ heeft %@'s uitnodiging ingetrokken";
+"notice_room_third_party_invite_for_dm" = "%@ heeft %@ uitgenodigd";
+"room_left_for_dm" = "U heeft het gesprek verlaten";
+"notice_room_history_visible_to_members_from_joined_point_for_dm" = "%@ heeft toekomstige berichten voor iedereen zichtbaar gemaakt vanaf het moment dat zij deelnemen aan het gesprek.";
+"notice_room_history_visible_to_members_from_invited_point_for_dm" = "%@ heeft toekomstige berichten voor iedereen zichtbaar gemaakt vanaf het moment dat zij zijn uitgenodigd.";
+"notice_room_history_visible_to_members_for_dm" = "%@ heeft toekomstige berichten voor alle gespreksleden zichtbaar gemaakt.";
+"notice_room_aliases_for_dm" = "De bijnamen zijn: %@";
+"notice_room_join_rule_public_by_you_for_dm" = "U maakte dit publiekelijk.";
+"notice_room_join_rule_public_by_you" = "U heeft de kamer publiekelijk gemaakt.";
+"notice_room_join_rule_public_for_dm" = "%@ maakte dit publiekelijk.";
+"notice_room_join_rule_public" = "%@ heeft de kamer publiekelijk gemaakt.";
+"notice_room_created_for_dm" = "%@ is toegetreden.";
+"notice_room_power_level_intro_for_dm" = "Het machtsniveau van de gespreksleden is:";
+"notice_room_join_rule_invite_by_you_for_dm" = "U maakte dit gesprek alleen op uitnodiging.";
+"notice_room_join_rule_invite_by_you" = "U heeft het toegangsbeleid gewijzigd naar alleen genodigden.";
+//  New
+"notice_room_join_rule_invite" = "%@ heeft het toegangsbeleid gewijzigd naar alleen genodigden.";
+"notice_room_join_rule_invite_for_dm" = "%@ heeft dit gesprek alleen op uitnodiging gemaakt.";
+"call_more_actions_dialpad" = "Kiestoetsen";
+"call_more_actions_transfer" = "Doorschakelen";
+"call_more_actions_audio_use_device" = "Ingebouwde Luidspreker";
+"call_more_actions_audio_use_headset" = "Audio-koptelefoon gebruiken";
+"call_more_actions_change_audio_device" = "Audio-apparaat wisselen";
+"call_more_actions_unhold" = "Hervatten";
+"call_more_actions_hold" = "Vasthouden";
+"call_holded" = "U heeft de oproep in de wacht";
+"call_remote_holded" = "%@ heeft de oproep in de wacht";
+"notice_declined_video_call_by_you" = "U heeft de oproep afgewezen";
+"notice_declined_video_call" = "%@ heeft de oproep afgewezen";
+"resume_call" = "Hervatten";
+"call_consulting_with_user" = "In de wacht bij %@";
+"call_transfer_to_user" = "Doorverbinden met %@";
+"call_video_with_user" = "Video-oproep met %@";
+"call_voice_with_user" = "Spraakoproep met %@";
+"call_ringing" = "Bellen…";
+"e2e_passphrase_too_short" = "Wachtwoord is te kort (hij moet minimaal %d tekens lang zijn)";
+"microphone_access_not_granted_for_voice_message" = "Spraakberichten vereisen toegang tot de Microfoon maar %@ heeft geen toestemming om het te gebruiken";
+"message_reply_to_sender_sent_a_voice_message" = "heeft een spraakbericht gestuurd.";
+"attachment_large_with_resolution" = "Groot %@ (~%@)";
+"attachment_medium_with_resolution" = "Middel %@ (~%@)";
+"attachment_small_with_resolution" = "Klein %@ (~%@)";
+"attachment_size_prompt_message" = "U kunt dit uitzetten in uw instellingen.";
+"attachment_size_prompt_title" = "Bevestig de afmeting om te versturen";
+"room_displayname_all_other_participants_left" = "%@ (vertrok)";
+"auth_reset_password_error_not_found" = "Niet gevonden";
+"auth_reset_password_error_unauthorized" = "Niet toegestaan";
+"auth_invalid_user_name" = "Ongeldige inlognaam";
+"attachment_unsupported_preview_message" = "Dit bestandstype wordt niet ondersteund.";
+"attachment_unsupported_preview_title" = "Kan geen voorbeeld geven";
+"room_displayname_all_other_members_left" = "%@ (Vertrok)";
+"auth_username_in_use" = "Inlognaam al in gebruik";
+"rename" = "Hernoemen";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/pl.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/pl.lproj/MatrixKit.strings
new file mode 100644
index 000000000..d90ed3c37
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/pl.lproj/MatrixKit.strings
@@ -0,0 +1,498 @@
+"matrix" = "Matrix";
+// Login Screen
+"login_create_account" = "Stwórz konto:";
+"login_server_url_placeholder" = "URL (np. https://matrix.org)";
+"login_identity_server_title" = "URL serwera tożsamości:";
+"login_password_placeholder" = "Hasło";
+"login_optional_field" = "opcjonalne";
+"login_email_placeholder" = "Adres e-mail";
+"login_error_forbidden" = "Nieprawidłowa nazwa użytkownika/hasło";
+"login_error_unknown_token" = "Wprowadzony token dostępu nie został rozpoznany";
+"login_error_bad_json" = "Uszkodzony JSON";
+"login_error_not_json" = "Nie zawiera prawidłowego JSON";
+"login_error_limit_exceeded" = "Wysłano zbyt wiele żądań";
+"login_error_user_in_use" = "Ta nazwa użytkownika jest już używana";
+"login_error_login_email_not_yet" = "Nie kliknięto odnośnika z wiadomości e-mail";
+"login_leave_fallback" = "Anuluj";
+"login_error_resource_limit_exceeded_title" = "Przekroczono limit dostępu do zasobów";
+"login_error_resource_limit_exceeded_message_default" = "Ten serwer przekroczył jeden z limitów dostępu do zasobów.";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "Ten serwer osiągnął miesięczny limit aktywnych użytkowników.";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nSkontaktuj się z administratorem Twojego serwera domowego, aby korzystać dalej z tej usługi.";
+"login_error_resource_limit_exceeded_contact_button" = "Skontaktuj się z administratorem";
+// Action
+"no" = "Nie";
+"yes" = "Tak";
+"back" = "Powrót";
+"close" = "Zamknij";
+"continue" = "Kontynuuj";
+"dismiss" = "Zamknij";
+"retry" = "Ponów";
+"submit" = "Wyślij";
+"login_home_server_title" = "URL serwera domowego:";
+"login_display_name_placeholder" = "Wyświetlana nazwa (np. Bob Obson)";
+"login_invalid_param" = "Nieprawidłowy parametr";
+"login_tablet_device" = "Tablet";
+"discard" = "Odrzuć";
+"start_chat" = "Rozpocznij rozmowę";
+"start_voice_call" = "Rozpocznij połączenie głosowe";
+"start_video_call" = "Rozpocznij połączenie wideo";
+"mention" = "Wspomnij";
+"capture_media" = "Zrób zdjęcie/film";
+"resend_message" = "Wyślij ponownie wiadomość";
+"select_all" = "Zaznacz wszystko";
+"cancel_upload" = "Anuluj wysyłanie";
+"cancel_download" = "Anuluj pobieranie";
+"ignore" = "Ignoruj";
+"unignore" = "Przestań ignorować";
+// Events formatter
+"notice_avatar_changed_too" = "(awatar też został zmieniony)";
+"notice_room_name_removed" = "%@ usunął(-ęła) nazwę pokoju";
+"notice_room_topic_removed" = "%@ usunął(-ęła) temat pokoju";
+"notice_event_redacted" = "<zredagowane%@>";
+"notice_event_redacted_by" = " przez %@";
+"notice_event_redacted_reason" = " [powód: %@]";
+"notice_profile_change_redacted" = "%@ zaktualizował(-a) swój profil %@";
+"notice_encrypted_message" = "Wiadomość zaszyfrowana";
+"notice_encryption_enabled" = "%@ włączył(a) szyfrowanie end-to-end (algorytm %@)";
+"ssl_only_accept" = "Akceptuj certyfikat TYLKO wtedy gdy administrator opublikował odcisk palca pasujący do tego powyżej.";
+"ssl_unexpected_existing_expl" = "Certyfikat zmienił stan z zaufanego na niezaufany. Jest to NIEZWYKLE RZADKIE. Zalecane jest NIE AKCEPTOWANIE nowego certyfikatu.";
+"ssl_cert_not_trust" = "Może to oznaczać że ktoś zakłóca twoje połączenie, lub Twój telefon nie ufa certyfikatowi dostarczonemu przez zdalny serwer.";
+"ssl_could_not_verify" = "Nie można zweryfikować tożsamości serwera.";
+"ssl_fingerprint_hash" = "Fingerprint (%@):";
+"ssl_remain_offline" = "Ignoruj";
+"ssl_logout_account" = "Wyloguj";
+// unrecognized SSL certificate
+"ssl_trust" = "Ufaj";
+"incoming_voice_call" = "Przychodzące połączenie głosowe";
+"incoming_video_call" = "Przychodzące połączenie wideo";
+"call_ring" = "Dzwonię…";
+"call_ended" = "Zakończono połączenie";
+"call_connecting" = "Łączenie…";
+"settings_config_user_id" = "ID użytkownika: %@";
+"settings_config_identity_server" = "Serwer tożsamości: %@";
+// gcm section 
+"settings_config_home_server" = "Serwer Domowy: %@";
+"notification_settings_notify_all_other" = "Powiadamiaj o wszystkich innych wiadomośsciach/pokojach";
+"notification_settings_select_room" = "Wybierz pokój";
+"notification_settings_sender_hint" = "@user:domain.com";
+"notification_settings_enable_notifications" = "Włącz powiadomienia";
+// Notification settings screen 
+"notification_settings_disable_all" = "Wyłącz wszystkie powiadomienia";
+"settings_title_notifications" = "Powiadomienia";
+// room details dialog screen
+"room_details_title" = "Szczegóły pokoju";
+"login_error_must_start_http" = "URL musi zaczynać się od http[s]://";
+"select_account" = "Wybierz konto";
+"show_details" = "Pokaż szczegóły";
+"end_call" = "Zakończ rozmowę";
+"login_error_title" = "Logowanie nie powiodło się";
+"login_error_registration_is_not_supported" = "Rejestracja nie jest obecnie wspierana";
+"register_error_title" = "Rejestracja nie powiodła się";
+"abort" = "Przerwij";
+"sign_up" = "Zarejestruj się";
+"submit_code" = "Prześlij kod";
+"attach_media" = "Dołącz zawartość multimedialną z Biblioteki";
+"reset_to_default" = "Przywróć ustawienia domyślne";
+"notice_room_created" = "%@ stworzył(-a) i skonfigurował (-a) pokój.";
+"notice_audio_attachment" = "załącznik (audio)";
+"notice_video_attachment" = "załącznik (wideo)";
+"notice_invalid_attachment" = "nieprawidłowy załącznik";
+"notice_unsupported_attachment" = "Niewspierany załącznik: %@";
+"notice_room_history_visible_to_members" = "%@ uczynił(-a) przyszłą historię pokoju widoczną dla wszystkich uczestników pokoju.";
+"notice_room_history_visible_to_members_from_invited_point" = "%@ uczynił(-a) przyszłą historię pokoju widoczną dla wszystkich uczestników pokoju, od momentu ich zaproszenia.";
+"notice_room_history_visible_to_members_from_joined_point" = "%@ uczynił(-a) przyszłą historię pokoju widoczną dla wszystkich uczestników pokoju, od momentu ich dołączenia.";
+"notice_crypto_error_unknown_inbound_session_id" = "Sesja nadawcy nie wysłała kluczy do wiadomości dla bieżącej sesji.";
+"notice_sticker" = "naklejka";
+"notice_in_reply_to" = "W odpowiedzi do";
+// room display name
+"room_displayname_empty_room" = "Pusty pokój";
+"room_displayname_two_members" = "%@ i %@";
+"room_displayname_more_than_two_members" = "%@ i %@ innych";
+// Settings
+"settings" = "Ustawienia";
+"notification_settings_room_rule_title" = "Pokój: '%@'";
+// Devices
+"device_details_title" = "Informacje o sesji\n";
+"device_details_name" = "Publiczna nazwa\n";
+"device_details_identifier" = "ID\n";
+"device_details_last_seen" = "Ostatnio widziany(-a)\n";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_rename_prompt_message" = "Publiczna nazwa sesji jest widoczna dla osób z którymi się komunikujesz";
+"device_details_delete_prompt_title" = "Uwierzytelnienie";
+"device_details_delete_prompt_message" = "To działanie wymaga dodatkowego uwierzytelnienia.\nWprowadź hasło, aby kontynuować.";
+// Encryption information
+"room_event_encryption_info_title" = "Informacje o szyfrowaniu end-to-end\n\n";
+"room_event_encryption_info_event" = "Informacje o zdarzeniu\n";
+"room_event_encryption_info_event_user_id" = "ID użytkownika\n";
+"room_event_encryption_info_event_identity_key" = "Klucz tożsamości Curve25519\n";
+"room_event_encryption_info_event_algorithm" = "Algorytm\n";
+"room_event_encryption_info_event_decryption_error" = "Błąd deszyfrowania\n";
+"room_event_encryption_info_device" = "\nInformacje o sesji nadawcy\n";
+"room_event_encryption_info_device_unknown" = "nieznana sesja\n";
+"room_event_encryption_info_device_name" = "Publiczna nazwa\n";
+"room_event_encryption_info_device_id" = "ID\n";
+"notification_settings_never_notify" = "Nigdy nie powiadamiaj";
+"notification_settings_always_notify" = "Zawsze powiadamiaj";
+// Settings screen 
+"settings_title_config" = "Konfiguracja";
+"ban" = "Zbanuj";
+"unban" = "Odbanuj";
+"kick" = "Wyproś";
+"invite" = "Zaproś";
+"num_members_other" = "%@ użytkowników";
+"num_members_one" = "%@ użytkownik";
+"create_account" = "Stwórz konto";
+"create_room" = "Utwórz pokój";
+// actions 
+"action_logout" = "Wyloguj";
+"view" = "Podgląd";
+"delete" = "Usuń";
+"set_power_level" = "Ustaw poziom uprawnień";
+"share" = "Udostępnij";
+"redact" = "Usuń";
+"resend" = "Wyślij ponownie";
+"copy_button_name" = "Kopiuj";
+"send" = "Wyślij";
+"leave" = "Opuść";
+"save" = "Zapisz";
+"cancel" = "Anuluj";
+// button names 
+"ok" = "OK";
+"notice_conference_call_finished" = "Zakończono konferencję VoIP";
+"notice_conference_call_started" = "Rozpoczęto konferencję VoIP";
+"notice_conference_call_request" = "%@ zaprasza do konferencji VoIP";
+"set_default_power_level" = "Resetuj poziom uprawnień";
+"notice_file_attachment" = "załącznik (plik)";
+"notice_room_history_visible_to_anyone" = "%@ uczynił(-a) przyszłą historię pokoju widoczną dla każdego.";
+"notice_crypto_unable_to_decrypt" = "** Nie można odszyfrować: %@ **";
+"ssl_cert_new_account_expl" = "Jeśli administrator serwera oświadczył, że jest to oczekiwane, upewnij się, że poniższy odcisk palca odpowiada odciskowi palca dostarczonemu przez niego.";
+"notification_settings_by_default" = "Domyślnie…";
+"notification_settings_suppress_from_bots" = "Ogranicz powiadomienia od botów";
+"notification_settings_custom_sound" = "Dźwięk niestandardowy";
+"login_home_server_info" = "Twój serwer domowy przechowuje wszystkie Twoje rozmowy i dane konta";
+"login_user_id_placeholder" = "Identyfikator Matrix (np. @bob:matrix.org lub bob)";
+"search_searching" = "Wyszukiwanie...";
+
+// Search
+"search_no_results" = "Brak wyników";
+"group_section" = "Grupy";
+
+// Groups
+"group_invite_section" = "Zaproszenia";
+"attachment_e2e_keys_import" = "Importuj...";
+"attachment_multiselection_original" = "Rzeczywisty rozmiar";
+"attachment_multiselection_size_prompt" = "Czy chcesz wysłać obrazy jako:";
+"attachment_cancel_upload" = "Przerwać wgrywanie?";
+"attachment_cancel_download" = "Przerwać pobieranie?";
+"membership_ban" = "Zbanowany(-a)";
+"login_desktop_device" = "Komputer";
+"login_mobile_device" = "Smartphone";
+"login_error_forgot_password_is_not_supported" = "Przywracanie hasła nie jest obecnie obsługiwane";
+"login_prompt_email_token" = "Wprowadź token weryfikacyjny wysłany na e-mail:";
+"room_event_encryption_info_event_session_id" = "ID sesji\n";
+"room_event_encryption_info_event_fingerprint_key" = "Odebrany klucz Ed25519 fingerprint\n";
+"device_details_rename_prompt_title" = "Nazwa sesji";
+"settings_enter_validation_token_for" = "Wprowadź token weryfikacyjny dla %@:";
+"settings_enable_push_notifications" = "Włącz powiadomienia push";
+"settings_enable_inapp_notifications" = "Włącz powiadomienia aplikacyjne";
+"notice_room_history_visible_to_members_from_joined_point_for_dm" = "%@ uczynił(-a) przyszłą historię pokoju widoczną dla wszystkich uczestników pokoju, od momentu ich dołączenia.";
+"notice_room_history_visible_to_members_from_invited_point_for_dm" = "%@ uczynił(-a) przyszłą historię pokoju widoczną dla wszystkich uczestników pokoju, od momentu ich zaproszenia.";
+"notice_room_history_visible_to_members_for_dm" = "%@ uczynił(-a) przyszłą historię pokoju widoczną dla wszystkich uczestników pokoju.";
+"notice_error_unknown_event_type" = "Nieznany typ zdarzenia";
+"notice_error_unexpected_event" = "Niespodziewane zdarzenie";
+"notice_error_unsupported_event" = "Nieobsługiwane zdarzenie";
+"notice_redaction" = "%@ zredagował(-a) zdarzenie (id: %@)";
+"notice_feedback" = "Opis zdarzenia (id: %@): %@";
+"notice_location_attachment" = "załącznik (lokalizacja)";
+"notice_image_attachment" = "załącznik (obraz)";
+"notice_encryption_enabled_unknown_algorithm" = "%1$@ włączył(-a) szyfrowanie end-to-end (nierozpoznany algorytm %2$@).";
+"notice_encryption_enabled_ok" = "%@ włączył(-a) szyfrowanie end-to-end.";
+"notice_room_related_groups" = "Społeczności powiązane z tym pokojem: %@";
+"notice_room_aliases_for_dm" = "Aliasy pokoju: %@";
+"notice_room_aliases" = "Aliasy pokoju: %@";
+"notice_room_power_level_event_requirement" = "Minimalny poziom uprawnień związany ze zdarzeniami:";
+"notice_room_power_level_acting_requirement" = "Minimalny poziom uprawnień uczestnika pokoju, aby mógł podjąć działania:";
+"notice_room_power_level_intro_for_dm" = "Poziom uprawnień uczestników pokoju:";
+"notice_room_power_level_intro" = "Poziom uprawnień uczestników pokoju:";
+"notice_room_join_rule_public_by_you_for_dm" = "Ustawiłeś(-aś) widoczność tego pokoju jako 'pokój publiczny'.";
+"notice_room_join_rule_public_by_you" = "Ustawiłeś(-aś) widoczność tego pokoju jako 'pokój publiczny'.";
+"notice_room_join_rule_public_for_dm" = "%@ ustawił(-a) widoczność tego pokoju jako 'pokój publiczny'.";
+"notice_room_join_rule_public" = "%@ ustawił(-a) widoczność tego pokoju jako 'pokój publiczny'.";
+"notice_room_join_rule_invite_by_you_for_dm" = "Ustawiłeś(-aś) dostępność tego pokoju na 'Tylko osoby, które zostały zaproszone'.";
+"notice_room_join_rule_invite_by_you" = "Ustawiłeś(-aś) dostępność tego pokoju na 'Tylko osoby, które zostały zaproszone'.";
+"notice_room_join_rule_invite_for_dm" = "%@ ustawił(-a) dostępność tego pokoju na 'Tylko osoby, które zostały zaproszone'.";
+//  New
+"notice_room_join_rule_invite" = "%@ ustawił(-a) dostępność tego pokoju na 'Tylko osoby, które zostały zaproszone'.";
+//  Old
+"notice_room_join_rule" = "Reguła dołączenia to: %@";
+"notice_room_created_for_dm" = "%@ stworzył(-a) pokój.";
+"notice_room_name_removed_for_dm" = "%@ usunął(-ęła) nazwę pokoju";
+"resume_call" = "Wznów";
+"reject_call" = "Odrzuć połączenie";
+"answer_call" = "Odbierz połączenie";
+"invite_user" = "Zaproś użytkownika Matrix";
+"set_admin" = "Nadaj uprawnienia Administratora";
+"set_moderator" = "Nadaj uprawnienia Moderatora";
+"login_use_fallback" = "Użyj strony zastępczej";
+"login_error_do_not_support_login_flows" = "Obecnie nie obsługujemy żadnego lub wszystkich przepływów logowania zdefiniowanych przez ten Serwer Domowy";
+"login_error_no_login_flow" = "Nie udało się pobrać informacji uwierzytelniających z tego serwera domowego";
+"login_email_info" = "Podanie adresu e-mail pozwala innym użytkownikom na znalezienie Ciebie w sieci Matrix oraz pozwala na zresetowanie hasła.";
+"login_identity_server_info" = "Matrix zapewnia serwery tożsamości do śledzenia, które e-maile itp. Należą do których identyfikatorów Matrix. Obecnie istnieje tylko https://matrix.org.";
+"ssl_expected_existing_expl" = "Certyfikat zmienił się z wcześniej zaufanego na taki, który nie jest zaufany. Serwer mógł odnowić swój certyfikat. Skontaktuj się z administratorem serwera, aby uzyskać oczekiwany odcisk palca.";
+"call_transfer_to_user" = "Transfer do %@";
+"call_consulting_with_user" = "Konsultacje z %@";
+"call_video_with_user" = "Połączenie wideo z %@";
+"call_voice_with_user" = "Połączenie głosowe z %@";
+"call_more_actions_dialpad" = "Klawiatura numeryczna";
+"call_more_actions_transfer" = "Transferuj";
+"call_more_actions_audio_use_device" = "Wyjście audio";
+"call_more_actions_audio_use_headset" = "Użyj zestawu głosowego";
+"call_more_actions_change_audio_device" = "Zmień urządzenie dźwiękowe";
+"call_more_actions_unhold" = "Wznów";
+"call_more_actions_hold" = "Wstrzymaj";
+"call_holded" = "Wstrzymałeś połączenie";
+"call_remote_holded" = "%@ wstrzymał(-a) połączenie";
+"call_invite_expired" = "Zaproszenie do rozmowy wygasło";
+"call_ringing" = "Dzwonię…";
+"notification_settings_receive_a_call" = "Powiadom mnie, gdy ktoś do mnie dzwoni";
+"notification_settings_people_join_leave_rooms" = "Powiadamiaj mnie, gdy ktoś dołącza do pokoju lub go opuszcza";
+"notification_settings_invite_to_a_new_room" = "Powiadamiaj mnie, gdy jestem zaproszony do nowego pokoju";
+"notification_settings_just_sent_to_me" = "Powiadamiaj mnie dźwiękiem o wiadomościach wysłanych tylko do mnie";
+"notification_settings_contain_my_display_name" = "Powiadamiaj mnie dźwiękiem o wiadomościach zawierających moją nazwę wyświetlaną";
+"notification_settings_contain_my_user_name" = "Powiadamiaj mnie dźwiękiem o wiadomościach zawierających moją nazwę użytkownika";
+"notification_settings_other_alerts" = "Inne Alarmy";
+"notification_settings_per_sender_notifications" = "Powiadomienia per-nadawca";
+"notification_settings_per_room_notifications" = "Powiadomienia per-pokój";
+"notification_settings_highlight" = "Wyróżnienie";
+"notification_settings_word_to_match" = "słowo do dopasowania";
+"notification_settings_per_word_info" = "Słowa dopasowują wielkość liter bez uwzględniania wielkości liter i mogą zawierać * symbol wieloznaczny. Więc:\nfoo dopasowuje ciąg foo otoczony ogranicznikami słów (np. interpunkcja i białe spacje lub początek / koniec linii).\nfoo* odpowiada każdemu słowu zaczynającemu się foo.\n*foo* pasuje do każdego takiego słowa, które zawiera 3 litery foo.";
+"notification_settings_per_word_notifications" = "Powiadomienia według słów";
+"notification_settings_global_info" = "Ustawienia powiadomień są zapisywane na koncie użytkownika i są udostępniane wszystkim klientom, które je obsługują.\n\nReguły powiadomień są stosowane w kolejności; pierwsza pasująca reguła określa wynik wiadomości.\nTak więc: powiadomienia według słów są ważniejsze niż powiadomienia dotyczące pokoju, które są ważniejsze niż powiadomienia według nadawcy.\nW przypadku wielu reguł tego samego typu pierwszeństwo ma pierwsza na liście pasująca reguła.";
+"notification_settings_enable_notifications_warning" = "Wszystkie powiadomienia są obecnie wyłączone dla wszystkich urządzeń.";
+
+// contacts list screen 
+"invitation_message" = "Chciałbym z Tobą porozmawiać za pomocą sieci Matrix. Odwiedź witrynę http://matrix.org, aby uzyskać więcej informacji.";
+
+// Login Screen 
+"login_error_already_logged_in" = "Jesteś już zalogowany(-a)";
+"message_unsaved_changes" = "Istnieją niezapisane zmiany. Opuszczenie spowoduje ich odrzucenie.";
+"membership_leave" = "Odszedł(-a)";
+"membership_invite" = "Zaproszony(-a)";
+"login" = "Zaloguj się";
+"notice_room_history_visible_to_members_from_joined_point_by_you_for_dm" = "Sprawiłeś(-aś), że przyszłe wiadomości będą widoczne tylko dla uczestników pokoju od momentu, gdy dołączyli.";
+"notice_room_history_visible_to_members_from_joined_point_by_you" = "Sprawiłeś(-aś), że przyszłe wiadomości będą widoczne tylko dla uczestników pokoju od momentu, gdy dołączyli.";
+"notice_room_history_visible_to_members_from_invited_point_by_you_for_dm" = "Sprawiłeś(-aś), że przyszłe wiadomości będą widoczne dla wszystkich uczestników pokoju od momentu, gdy zostali zaproszeni.";
+"notice_room_history_visible_to_members_from_invited_point_by_you" = "Sprawiłeś(-aś), że przyszłe wiadomości będą widoczne dla wszystkich uczestników pokoju od momentu, gdy zostali zaproszeni.";
+"notice_room_history_visible_to_members_by_you_for_dm" = "Sprawiłeś(-aś), że przyszłe wiadomości będą widoczne dla wszystkich uczestników pokoju.";
+"notice_room_history_visible_to_members_by_you" = "Sprawiłeś(-aś), że przyszłe wiadomości będą widoczne dla wszystkich uczestników pokoju.";
+"notice_room_history_visible_to_anyone_by_you" = "Sprawiłeś(-aś), że przyszłe wiadomości będą widoczne dla każdego.";
+"notice_redaction_by_you" = "Zredagowałeś(-aś) zdarzenie (id: %@)";
+"notice_encryption_enabled_unknown_algorithm_by_you" = "Włączyłeś(-aś) szyfrowanie end-to-end (nierozpoznany algorytm %@).";
+"notice_encryption_enabled_ok_by_you" = "Włączyłeś(-aś) szyfrowanie end-to-end.";
+"notice_room_created_by_you_for_dm" = "Utworzyłeś(-aś) i skonfigurowałeś(-aś) pokój.";
+"notice_room_created_by_you" = "Utworzyłeś(-aś) i skonfigurowałeś(-aś) pokój.";
+"notice_profile_change_redacted_by_you" = "Zaktualizowałeś(-aś) swój profil %@";
+"notice_event_redacted_by_you" = " przez Ciebie";
+"notice_room_topic_removed_by_you" = "Usunąłeś(-aś) temat";
+"notice_room_name_removed_by_you_for_dm" = "Usunąłeś(-aś) nazwę pokoju";
+"notice_room_name_removed_by_you" = "Usunąłeś(-aś) nazwę pokoju";
+"notice_conference_call_request_by_you" = "Poprosiłeś(-aś) o konferencję VoIP";
+"notice_declined_video_call_by_you" = "Odrzuciłeś(-aś) połączenie";
+"notice_ended_video_call_by_you" = "Zakończyłeś(-aś) połączenie";
+"notice_answered_video_call_by_you" = "Odebrałeś(-aś) połączenie";
+"notice_placed_video_call_by_you" = "Nawiązałeś(-aś) rozmowę wideo";
+"notice_placed_voice_call_by_you" = "Nawiązałeś(-aś) połączenie głosowe";
+"notice_room_name_changed_by_you_for_dm" = "Zmieniłeś(-aś) nazwę na %@.";
+"notice_room_name_changed_by_you" = "Zmieniłeś(-aś) nazwę pokoju na %@.";
+"notice_topic_changed_by_you" = "Zmieniłeś(-aś) temat na \"%@\".";
+"notice_display_name_removed_by_you" = "Usunąłeś(-aś) swoją wyświetlaną nazwę";
+"notice_display_name_changed_from_by_you" = "Zmieniłeś(-aś) wyświetlaną nazwę z %@ na %@";
+"notice_display_name_set_by_you" = "Zmieniłeś(-aś) wyświetlaną nazwę na %@";
+"notice_avatar_url_changed_by_you" = "Zmieniłeś(-aś) swój awatar";
+"notice_room_withdraw_by_you" = "Wycofałeś(-aś) zaproszenie do pokoju dla %@";
+"notice_room_ban_by_you" = "Zbanowałeś(-aś) %@";
+"notice_room_unban_by_you" = "Odbanowałeś(-aś) %@";
+"notice_room_kick_by_you" = "Wyprosiłeś(-aś) %@";
+"notice_room_reject_by_you" = "Odrzuciłeś(-aś) zaproszenie";
+"notice_room_leave_by_you" = "Opuściłeś(-aś) pokój";
+"notice_room_join_by_you" = "Dołączyłeś(-aś) do pokoju";
+"notice_room_third_party_revoked_invite_by_you_for_dm" = "Odrzuciłeś(-aś) zaproszenie %@";
+"notice_room_third_party_revoked_invite_by_you" = "Odrzuciłeś(-aś) zaproszenie do pokoju od %@";
+"notice_room_third_party_registered_invite_by_you" = "Przyjąłeś(-aś) zaproszenie od %@";
+"notice_room_third_party_invite_by_you_for_dm" = "Zaprosiłeś(-aś) %@";
+"notice_room_third_party_invite_by_you" = "Wysłałeś(-aś) zaproszenie do pokoju dla %@";
+"notice_room_invite_you" = "%@ zaprosił(-a) Ciebie";
+
+// Notice Events with "You"
+"notice_room_invite_by_you" = "Zaprosiłeś(-aś) %@";
+"notice_declined_video_call" = "%@ odrzucił(-a) połączenie";
+"notice_ended_video_call" = "%@ zakończył(-a) połączenie";
+"notice_answered_video_call" = "%@ odebrał(-a) połączenie";
+"notice_placed_video_call" = "%@ nawiązał(-a) połączenie wideo";
+"notice_placed_voice_call" = "%@ nawiązał(-a) połączenie głosowe";
+"notice_room_name_changed_for_dm" = "%@ zmienił(-a) nazwę na %@.";
+"notice_room_name_changed" = "%@ zmienił(-a) nazwę pokoju na %@.";
+"notice_topic_changed" = "%@ zmienił(-a) temat na \"%@\".";
+"notice_display_name_removed" = "%@ usunął(-ęła) swoją wyświetlaną nazwę";
+"notice_display_name_changed_from" = "%@ zmienił(-a) swoją wyświetlaną nazwę z %@ na %@";
+"notice_display_name_set" = "%@ zmienił(-a) swoją wyświetlaną nazwę na %@";
+"notice_avatar_url_changed" = "%@ zmienił(-a) swój awatar";
+"notice_room_reason" = ". Powód: %@";
+"notice_room_withdraw" = "%@ wycofał(-a) zaproszenie %@";
+"notice_room_ban" = "%@ zbanował(-a) %@";
+"notice_room_unban" = "%@ odbanował(-a) %@";
+"notice_room_kick" = "%@ wyprosiła(-a) %@";
+"notice_room_reject" = "%@ odrzucił(-a) zaproszenie";
+"notice_room_leave" = "%@ opuścił(-a) pokój";
+"notice_room_join" = "%@ dołączył(-a)";
+"notice_room_third_party_revoked_invite_for_dm" = "%@ odrzucił(-a) zaproszenie do pokoju od %@";
+"notice_room_third_party_registered_invite" = "%@ przyjął(-ęła) zaproszenie od %@";
+"notice_room_third_party_revoked_invite" = "%@ odrzucił(-a) zaproszenie do pokoju od %@";
+"notice_room_third_party_invite_for_dm" = "%@ zaprosił(-a) %@";
+"notice_room_third_party_invite" = "%@ wysłał(-a) zaproszenie do pokoju dla %@";
+
+/* -*- 
+   Automatic localization for en
+
+   The following key/value pairs were extracted from the android i18n file:
+    /matrix-sdk/src/main/res/values/strings.xml.
+*/
+
+"notice_room_invite" = "%@ zaprosił(-a) %@";
+"language_picker_default_language" = "Domyślny (%@)";
+
+// Language picker
+"language_picker_title" = "Wybierz język";
+
+// Country picker
+"country_picker_title" = "Wybierz kraj";
+"local_contacts_access_discovery_warning" = "Aby znaleźć kontakty, które są użytkownikami sieci Matrix, %@ może wysłać adresy e-mail i numery telefonów z Twojej książki adresowej do wybranego serwera tożsamości Matrix. Jeśli serwer na to pozwala, dane osobowe są szyfrowane przed wysłaniem - zapoznaj się z polityką prywatności Twojego serwera tożsamości, aby uzyskać więcej informacji.";
+"local_contacts_access_discovery_warning_title" = "Odkrywanie użytkowników";
+"local_contacts_access_not_granted" = "Wyszukiwanie użytkowników sieci Matrix na podstawie lokalnych kontaktów wymaga dostępu do Twoich kontaktów, ale %@ nie ma uprawnień, które umożliwiłyby ich użycie";
+"microphone_access_not_granted_for_call" = "Połączenia głosowe wymagają dostępu do mikrofonu, ale %@ nie ma pozwolenia na jego używanie";
+
+// Permissions
+"camera_access_not_granted_for_call" = "Rozmowy wideo wymagają dostępu do kamery, ale %@ nie ma pozwolenia na jej używanie";
+"ssl_homeserver_url" = "URL Serwera Domowego: %@";
+"user_id_placeholder" = "np.: @bob:homeserver";
+"network_error_not_reachable" = "Sprawdź połączenie internetowe";
+"power_level" = "Poziom uprawnień";
+"public" = "Publiczny";
+"private" = "Prywatny";
+"default" = "domyślny";
+"not_supported_yet" = "Jeszcze nie obsługiwane";
+"error_common_message" = "Wystąpił błąd. Spróbuj ponownie później.";
+"error" = "Błąd";
+"unsent" = "Niewysłane";
+"offline" = "offline";
+
+// Others
+"user_id_title" = "ID użytkownika:";
+"e2e_passphrase_create" = "Utwórz hasło";
+"e2e_passphrase_not_match" = "Hasła muszą się zgadzać";
+"e2e_passphrase_empty" = "Hasło nie może być puste";
+"e2e_passphrase_confirm" = "Potwierdź hasło";
+"e2e_export" = "Eksport";
+"e2e_export_prompt" = "Ten proces umożliwia wyeksportowanie do pliku lokalnego kluczy wiadomości odebranych w zaszyfrowanych pokojach. Dzięki temu będziesz mógł w przyszłości zaimportować plik do innego klienta Matrix i odszyfrować te wiadomości.\nWyeksportowany plik pozwoli każdemu, kto może go odczytać, na odszyfrowanie wszelkich zaszyfrowanych wiadomości, które widzisz, więc powinieneś zadbać o jego bezpieczeństwo.";
+
+// E2E export
+"e2e_export_room_keys" = "Eksportuj klucze pokoju";
+"e2e_passphrase_enter" = "Wprowadź hasło";
+"e2e_import" = "Importuj";
+"e2e_import_prompt" = "Ten proces umożliwia zaimportowanie kluczy szyfrowania, które zostały wcześniej wyeksportowane z innego klienta Matrix. Będziesz mógł odszyfrować wszystkie wiadomości, które inny klient mógłby odszyfrować. \nPlik eksportu jest chroniony hasłem. Wprowadź hasło, aby odszyfrować plik.";
+
+// E2E import
+"e2e_import_room_keys" = "Importuj klucze pokoju";
+"format_time_d" = "d";
+"format_time_h" = "h";
+"format_time_m" = "m";
+
+// Time
+"format_time_s" = "s";
+"contact_local_contacts" = "Lokalne Kontakty";
+
+// Contacts
+"contact_mx_users" = "Użytkownicy Matrix";
+"attachment_e2e_keys_file_prompt" = "Ten plik zawiera klucze szyfrowania wyeksportowane z klienta Matrix.\nChcesz przejrzeć zawartość pliku czy zaimportować zawarte w nim klucze?";
+"attachment_large" = "Duży (%@)";
+"attachment_medium" = "Średni (%@)";
+"attachment_small" = "Mały (%@)";
+"attachment_original" = "Rzeczywisty rozmiar (%@)";
+
+// Attachment
+"attachment_size_prompt" = "Czy chcesz wysłać jako:";
+"room_member_power_level_prompt" = "Nie będzie można cofnąć tej zmiany, ponieważ nadajesz użytkownikowi uprawnienia równoważne do Twoich. \nCzy jesteś pewny(-a)?";
+
+// Room members
+"room_member_ignore_prompt" = "Czy na pewno chcesz ukryć wszystkie wiadomości od tego użytkownika?";
+"message_reply_to_message_to_reply_to_prefix" = "W odpowiedzi na";
+"message_reply_to_sender_sent_a_file" = "wysłał(-a) plik.";
+"message_reply_to_sender_sent_a_video" = "wysłał(-a) plik wideo.";
+"message_reply_to_sender_sent_an_audio_file" = "wysłał(-a) plik audio.";
+
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "wysłał(-a) obraz.";
+"room_no_conference_call_in_encrypted_rooms" = "Połączenia konferencyjne nie są obsługiwane w zaszyfrowanych pokojach";
+"room_no_power_to_create_conference_call" = "Nie masz uprawnień do rozpoczęcia konferencji w tym pokoju";
+"room_left_for_dm" = "Opuściłeś(-aś) pokój";
+"room_left" = "Opuściłeś(-aś) pokój";
+"room_error_timeline_event_not_found" = "Aplikacja próbowała załadować określony punkt na osi czasu tego pokoju, ale nie mogła go znaleźć";
+"room_error_timeline_event_not_found_title" = "Nie udało się załadować pozycji na osi czasu";
+"room_error_cannot_load_timeline" = "Nie udało się załadować osi czasu";
+"room_error_topic_edition_not_authorized" = "Nie masz uprawnień do edytowania tematu tego pokoju";
+"room_error_name_edition_not_authorized" = "Nie masz uprawnień do edytowania nazwy tego pokoju";
+"room_error_join_failed_empty_room" = "Obecnie nie jest możliwe ponowne dołączenie do pustego pokoju.";
+"room_error_join_failed_title" = "Nie udało się dołączyć do pokoju";
+
+// Room
+"room_please_select" = "Wybierz pokój";
+"room_creation_participants_placeholder" = "(np. @bob:homeserver1; @john:homeserver2...)";
+"room_creation_participants_title" = "Uczestnicy:";
+"room_creation_alias_placeholder_with_homeserver" = "(np. #foo%@)";
+"room_creation_alias_placeholder" = "(np. #foo:example.org)";
+"room_creation_alias_title" = "Alias pokoju:";
+"room_creation_name_placeholder" = "(np. grupa obiadowa)";
+
+// Room creation
+"room_creation_name_title" = "Nazwa pokoju:";
+"account_error_push_not_allowed" = "Powiadomienia nie są dozwolone";
+"account_error_msisdn_wrong_description" = "To nie wygląda na prawidłowy numer telefonu";
+"account_error_msisdn_wrong_title" = "Nieprawidłowy numer telefonu";
+"account_error_email_wrong_description" = "To nie wygląda na prawidłowy adres e-mail";
+"account_error_email_wrong_title" = "Niepoprawny adres e-mail";
+"account_error_matrix_session_is_not_opened" = "Sesja Matrix nie jest otwarta";
+"account_error_picture_change_failed" = "Zmiana obrazu nie powiodła się";
+"account_error_display_name_change_failed" = "Zmiana wyświetlanej nazwy nie powiodła się";
+"account_msisdn_validation_error" = "Nie można zweryfikować numeru telefonu.";
+"account_msisdn_validation_message" = "Wysłaliśmy SMS-a z kodem aktywacyjnym. Wpisz otrzymany kod poniżej.";
+"account_msisdn_validation_title" = "Oczekiwanie na weryfikację";
+"account_email_validation_error" = "Nie można zweryfikować adresu e-mail. Sprawdź swoją skrzynkę e-mail i kliknij zawarte w niej łącze. Gdy to zrobisz, kliknij kontynuuj";
+"account_email_validation_message" = "Sprawdź swoją skrzynkę e-mail i kliknij zawarte w niej łącze. Gdy to zrobisz, kliknij kontynuuj.";
+"account_email_validation_title" = "Oczekiwanie na weryfikację";
+"account_linked_emails" = "Połączone adresy e-mail";
+"account_link_email" = "Połącz adres e-mail";
+
+// Account
+"account_save_changes" = "Zapisz zmiany";
+"room_event_encryption_verify_ok" = "Zweryfikuj";
+"room_event_encryption_verify_message" = "Aby sprawdzić, czy tej sesji można zaufać, skontaktuj się z jej właścicielem w inny sposób (np. osobiście lub telefonicznie) i zapytaj, czy klucz, który widzą w swoich ustawieniach użytkownika dla tej sesji, odpowiada kluczowi poniżej:\n\nNazwa sesji: %@\nIdentyfikator sesji: %@\nKlucz sesji: %@\n\nJeżeli klucze są identyczne, naciśnij przycisk weryfikacji poniżej. Jeżeli klucze się różnią, to oznacza to, że ktoś inny mógł przechwycić tę sesję — w takim przypadku naciśnij przycisk zablokuj.\n\nW przyszłości proces weryfikacji będzie bardziej wyrafinowany.";
+"room_event_encryption_verify_title" = "Zweryfikuj sesję\n\n";
+"room_event_encryption_info_unblock" = "Odblokuj";
+"room_event_encryption_info_block" = "Zablokuj";
+"room_event_encryption_info_unverify" = "Cofnij weryfikację";
+"room_event_encryption_info_verify" = "Zweryfikuj...";
+"room_event_encryption_info_device_blocked" = "Zablokowany";
+"room_event_encryption_info_device_not_verified" = "NIE zweryfikowano";
+"room_event_encryption_info_device_verified" = "Zweryfikowano";
+"room_event_encryption_info_device_fingerprint" = "Ed25519 fingerprint\n";
+"room_event_encryption_info_device_verification" = "Weryfikacja\n";
+"room_event_encryption_info_event_none" = "brak";
+"room_event_encryption_info_event_unencrypted" = "niezaszyfrowane";
+"e2e_passphrase_too_short" = "Hasło jest zbyt krótkie (Hasło musi składać się z co najmniej %d znaków)";
+"microphone_access_not_granted_for_voice_message" = "Wiadomości głosowe wymagają dostępu do mikrofonu ale %@ nie posiada uprawnień do użycia go";
+"message_reply_to_sender_sent_a_voice_message" = "wysłał(-a) wiadomość głosową.";
+"attachment_large_with_resolution" = "Duży %@ (~%@)";
+"attachment_medium_with_resolution" = "Średni %@ (~%@)";
+"attachment_small_with_resolution" = "Mały %@ (~%@)";
+"attachment_size_prompt_message" = "Możesz to wyłączyć w ustawieniach.";
+"attachment_size_prompt_title" = "Potwierdź rozmiar, który chcesz wysłać";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/pt_BR.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/pt_BR.lproj/MatrixKit.strings
new file mode 100644
index 000000000..f3dba6590
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/pt_BR.lproj/MatrixKit.strings
@@ -0,0 +1,481 @@
+"matrix" = "Matrix";
+// Login Screen
+"login_create_account" = "Criar conta:";
+"login_server_url_placeholder" = "URL (e.g. https://matrix.org)";
+"login_home_server_title" = "URL de Servidorcasa:";
+"login_home_server_info" = "Seu servidorcasa armazena todas as suas conversas e dados de conta";
+"login_identity_server_title" = "URL de servidor de identidade:";
+"login_identity_server_info" = "Matrix provê servidores de identidade para rastrear quais emails, etc. pertencem a quais IDs Matrix. Somente https://matrix.org existe atualmente.";
+"login_user_id_placeholder" = "ID Matrix (e.g. @bob:matrix.org ou bob)";
+"login_password_placeholder" = "Senha";
+"login_optional_field" = "opcional";
+"login_display_name_placeholder" = "Nome de exibição (e.g. Bob Obson)";
+"login_email_info" = "Especificar um endereço de email permite que outras(os) usuárias(os) encontrem você mais facilmente, e vai dar a você uma forma de resettar sua senha no futuro.";
+"login_email_placeholder" = "Endereço de email";
+"login_prompt_email_token" = "Por favor entre seu token de validação de email:";
+"login_error_title" = "Login Falhou";
+"login_error_no_login_flow" = "Nós falhamos para recuperar informação de autenticação deste servidorcasa";
+"view" = "Visualizar";
+"login_error_do_not_support_login_flows" = "Atualmente nós não suportamos qualquer ou todos os fluxos de login definidos por este servidorcasa";
+"back" = "Voltar";
+"continue" = "Continuar";
+"leave" = "Sair";
+"invite" = "Convidar";
+"retry" = "Retentar";
+"cancel" = "Cancelar";
+"save" = "Salvar";
+"login_error_registration_is_not_supported" = "Registro não é suportado atualmente";
+"login_error_forbidden" = "Nome de usuária(o)/senha inválidos";
+"login_error_unknown_token" = "O token de acesso especificado não foi reconhecido";
+"login_error_bad_json" = "JSON malformado";
+"login_error_not_json" = "Não continha JSON válido";
+"login_error_limit_exceeded" = "Requisições demais têm sido enviadas";
+"login_error_user_in_use" = "Este nome de usuária(o) já é usado";
+"login_desktop_device" = "Desktop";
+// Action
+"no" = "Não";
+"yes" = "Sim";
+"abort" = "Abortar";
+"close" = "Fechar";
+"discard" = "Descartar";
+"dismiss" = "Dispensar";
+"sign_up" = "Fazer signup";
+"submit" = "Submeter";
+"submit_code" = "Submeter código";
+"set_default_power_level" = "Resettar Nível de Poder";
+"set_moderator" = "Definir Moderador(a)";
+"set_admin" = "Definir Admin";
+"start_chat" = "Começar Chat";
+"start_voice_call" = "Começar Chamada de Voz";
+"start_video_call" = "Começar Chamada de Vídeo";
+"mention" = "Mencionar";
+"select_account" = "Selecionar uma conta";
+"attach_media" = "Anexar Mídia desde Biblioteca";
+"capture_media" = "Tirar Foto/Vídeo";
+"invite_user" = "Convidar Usuária(o) matrix";
+"reset_to_default" = "Resettar para default";
+"resend_message" = "Reenviar a mensagem";
+"select_all" = "Selecionar Todas";
+"cancel_upload" = "Cancelar Upload";
+"cancel_download" = "Cancelar Download";
+"show_details" = "Mostrar Detalhes";
+"answer_call" = "Atender Chamada";
+"reject_call" = "Rejeitar Chamada";
+"end_call" = "Terminar Chamada";
+"ignore" = "Ignorar";
+"unignore" = "Designorar";
+"login_error_forgot_password_is_not_supported" = "Esqueceu senha não é suportada atualmente";
+"login_error_login_email_not_yet" = "O link de email que ainda não tem sido clicado";
+"login_use_fallback" = "Usar página de fallback";
+"login_leave_fallback" = "Cancelar";
+"login_invalid_param" = "Parâmetro inválido";
+"register_error_title" = "Registro Falhou";
+"login_tablet_device" = "Tablet";
+"login_error_resource_limit_exceeded_title" = "Limite de Recursos Excedido";
+"login_error_resource_limit_exceeded_message_default" = "Este servidorcasa tem excedido um de seus limites de recursos.";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "Este servidorcasa tem atingido seu limite de Usuárias(os) Mensalmente Ativos.";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nPor favor contacte seu/sua administrador(a) de serviço para continuar usando este serviço.";
+"login_error_resource_limit_exceeded_contact_button" = "Contactar Administrador(a)";
+// Events formatter
+"notice_avatar_changed_too" = "(avatar foi mudado também)";
+"notice_room_name_removed" = "%@ removeu o nome da sala";
+"notice_room_topic_removed" = "%@ removeu o tópico";
+"notice_event_redacted_by" = " por %@";
+"notice_event_redacted_reason" = " [razão: %@]";
+"login_mobile_device" = "Celular";
+"notice_event_redacted" = "<redigida%@>";
+"notice_profile_change_redacted" = "%@ atualizou perfil dela(e) %@";
+"notice_room_created" = "%@ criou e configurou a sala.";
+"notice_room_join_rule" = "A regra de se juntar é: %@";
+"notice_room_power_level_intro" = "Os níveis de poder de membros da sala são:";
+"notice_room_power_level_acting_requirement" = "Os níveis de poder mínimos que um/a usuária(o) deve ter antes de agir são:";
+"notice_room_power_level_event_requirement" = "Os níveis mínimos de poder relacionados a eventos são:";
+"notice_room_aliases" = "Os aliases da sala são: %@";
+"notice_room_related_groups" = "Os grupos associados a esta sala são: %@";
+"notice_encrypted_message" = "Mensagem encriptada";
+"set_power_level" = "Definir Nível de Poder";
+"power_level" = "Nível de Poder";
+"notice_encryption_enabled" = "%@ ativou a criptografia de ponta a ponta (algorithm %@)";
+"notice_image_attachment" = "anexo de imagem";
+"notice_audio_attachment" = "anexo de áudio";
+"notice_video_attachment" = "anexo de vídeo";
+"notice_location_attachment" = "anexo de local";
+"notice_file_attachment" = "anexo de arquivo";
+"notice_invalid_attachment" = "anexo inválido";
+"notice_unsupported_attachment" = "Anexo insuportado: %@";
+"notice_feedback" = "Evento de feedback (id: %@): %@";
+"notice_redaction" = "%@ redigiu um evento (id: %@)";
+"notice_error_unsupported_event" = "Evento insuportado";
+"notice_error_unexpected_event" = "Evento não-esperado";
+"notice_error_unknown_event_type" = "Tipo de evento desconhecido";
+"notice_room_history_visible_to_anyone" = "%@ fez histórico da sala futuro visível para qualquer pessoa.";
+"notice_room_history_visible_to_members" = "%@ fez histórico da sala futuro visível para todos os membros da sala.";
+"notice_room_history_visible_to_members_from_invited_point" = "%@ fez histórico da sala futuro visível para todos os membros da sala, do ponto que foram convidados.";
+"notice_room_history_visible_to_members_from_joined_point" = "%@ fez histórico da sala futuro visível para todos os membros da sala, do ponto que se juntaram.";
+"notice_crypto_unable_to_decrypt" = "** Incapaz de decriptar: %@ **";
+"notice_crypto_error_unknown_inbound_session_id" = "A sessão do/da enviador(a) não nos tem enviado as chaves para esta mensagem.";
+"notice_sticker" = "sticker";
+"notice_in_reply_to" = "Em resposta a";
+// room display name
+"room_displayname_empty_room" = "Sala vazia";
+"room_displayname_two_members" = "%@ e %@";
+"room_displayname_more_than_two_members" = "%@ e %@ outros";
+// Settings
+"settings" = "Configurações";
+"settings_enable_inapp_notifications" = "Habilitar notificações Em-App";
+"settings_enable_push_notifications" = "Habilitar notificações push";
+"settings_enter_validation_token_for" = "Entrar token de validação para %@:";
+"notification_settings_room_rule_title" = "Sala: '%@'";
+// Devices
+"device_details_title" = "Informação de sessão\n";
+"device_details_name" = "Nome Público\n";
+"device_details_identifier" = "ID\n";
+"device_details_last_seen" = "Visto por último\n";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_rename_prompt_message" = "O nome público de uma sessão é visível para pessoas com quem você se comunica";
+"device_details_delete_prompt_title" = "Autenticação";
+"device_details_delete_prompt_message" = "Esta operação requer autenticação adicional.\nPara continuar, por favor entre sua senha.";
+// Encryption information
+"room_event_encryption_info_title" = "Informação de encriptação ponta-a-ponta\n\n";
+"room_event_encryption_info_event" = "Informação de evento\n";
+"room_event_encryption_info_event_user_id" = "ID de usuária(o)\n";
+"room_event_encryption_info_event_algorithm" = "Algoritmo\n";
+"room_event_encryption_info_event_session_id" = "ID de sessão\n";
+"room_event_encryption_info_event_unencrypted" = "não-encriptado";
+"room_event_encryption_info_event_none" = "nenhuma";
+"room_event_encryption_info_device" = "\nInformação de sessão de enviador(a)\n";
+"room_event_encryption_info_device_unknown" = "sessão desconhecida\n";
+"room_event_encryption_info_device_name" = "Nome Público\n";
+"room_event_encryption_info_device_id" = "ID\n";
+"room_event_encryption_info_device_verification" = "Verificação\n";
+"room_event_encryption_info_event_decryption_error" = "Erro de decriptação\n";
+"room_event_encryption_info_device_verified" = "Verificado";
+"room_event_encryption_info_device_not_verified" = "NÃO verificado";
+"room_event_encryption_info_device_blocked" = "Na lista negra";
+"room_event_encryption_info_verify" = "Verificar...";
+"room_event_encryption_info_unverify" = "Desverificar";
+"room_event_encryption_info_block" = "Adicionar à lista negra";
+"room_event_encryption_info_unblock" = "Remover da lista negra";
+"room_event_encryption_verify_title" = "Verificar sessão\n\n";
+"room_event_encryption_verify_message" = "Para verificar que esta sessão pode ser confiada, por favor contacte a/o dona(o) dela usando alguma outro meio (e.g. em pessoa ou uma chamada de telefone) e pergunte-lhe se a chave que ela/ele vê em suas Configurações de Usuária(o) para esta sessão bate com a chave abaixo:\n\n\tNome de sessão: %@\n\tID de sessão: %@\n\tChave de sessão: %@\n\nSe ela bate, pressione o botão verificar abaixo. Se não bate, então alguma outra pessoa está interceptando esa sessão e você provavelmente quer pressionar o botão adicionar à lista negra em vez disso.\n\nNo futuro este processo de verificação vai ser mais sofisticado.";
+"room_event_encryption_verify_ok" = "Verificar";
+// Account
+"account_save_changes" = "Salvar mudanças";
+"account_link_email" = "Linkar Email";
+"account_linked_emails" = "Emails linkados";
+"account_email_validation_title" = "Verificação Pendendo";
+"account_email_validation_message" = "Por favor cheque seu email e clique no link que ele contém. Uma vez que isto seja feito, clique em continuar.";
+"account_email_validation_error" = "Incapaz de verificar endereço de email. Por favor cheque seu email e clique no link que ele contém. Uma vez que isto seja feito, clique em continuar";
+"account_msisdn_validation_title" = "Verificação Pendendo";
+"account_msisdn_validation_message" = "Nós temos enviado um SMS com um código de ativação. Por favor entre este código abaixo.";
+"account_msisdn_validation_error" = "Incapaz de verificar número de telefone.";
+"room_event_encryption_info_event_identity_key" = "Chave de identidade Curve25519\n";
+"room_event_encryption_info_event_fingerprint_key" = "Chave de impressão digital Ed25519 clamada\n";
+"room_event_encryption_info_device_fingerprint" = "Impressão digital Ed25519\n";
+"account_error_display_name_change_failed" = "Mudança de nome de exibição falhou";
+"account_error_picture_change_failed" = "Mudança de imagem falhou";
+"account_error_matrix_session_is_not_opened" = "Sessão Matrix não está aberta";
+"account_error_email_wrong_title" = "Endereço de Email Inválido";
+"account_error_email_wrong_description" = "Isto não parece ser um endereço de email válido";
+"account_error_msisdn_wrong_title" = "Número de Telefone Inválido";
+"account_error_msisdn_wrong_description" = "Isto não parece ser um número de telefone válido";
+// Room creation
+"room_creation_name_title" = "Nome de sala:";
+"room_creation_name_placeholder" = "(e.g. grupoDeAlmoço)";
+"room_creation_alias_title" = "Alias de sala:";
+"room_creation_participants_title" = "Participantes:";
+// Room
+"room_please_select" = "Por favor selecione uma sala";
+"room_error_join_failed_title" = "Falha para se juntar a sala";
+"room_error_join_failed_empty_room" = "Não é atualmente possível se juntar a uma sala vazia.";
+"room_error_name_edition_not_authorized" = "Você não está autorizada(o) a editar o nome deste sala";
+"room_error_topic_edition_not_authorized" = "Você não está autorizada(o) a editar o tópico desta sala";
+"room_error_cannot_load_timeline" = "Falha para carregar timeline";
+"room_error_timeline_event_not_found_title" = "Falha para carregar posição de timeline";
+"room_error_timeline_event_not_found" = "O aplicativo estava tentando carregar um ponto específico na timeline desta sala mas foi incapaz de o encontrar";
+"room_left" = "Você saiu da sala";
+"room_no_power_to_create_conference_call" = "Você precisa de permissão para convidar para começar uma conferência nesta sala";
+"room_no_conference_call_in_encrypted_rooms" = "Chamadas de conferência não são suportadas em salas encriptadas";
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "enviou uma imagem.";
+"message_reply_to_sender_sent_a_video" = "enviou um vídeo.";
+"room_creation_alias_placeholder" = "(e.g. #foo:exemplo.org)";
+"room_creation_alias_placeholder_with_homeserver" = "(e.g. #foo%@)";
+"room_creation_participants_placeholder" = "(e.g. @bob:servidorcasa1; @john:servidorcasa2...)";
+"message_reply_to_sender_sent_an_audio_file" = "enviou um arquivo de áudio.";
+"message_reply_to_sender_sent_a_file" = "enviou um arquivo.";
+"message_reply_to_message_to_reply_to_prefix" = "Em resposta a";
+// Room members
+"room_member_ignore_prompt" = "Você tem certeza que você quer esconder todas as mensagens desta(e) usuária(o)?";
+"room_member_power_level_prompt" = "Você não vai ser capaz de desfazer esta mudança como você está promovendo a/o usuária(o) para ter o mesmo nível de poder que você mesma(o).\nVocê tem certeza?";
+// Attachment
+"attachment_size_prompt" = "Você quer enviar como:";
+"attachment_original" = "Tamanho de Verdade (%@)";
+"attachment_small" = "Pequeno (~%@)";
+"attachment_medium" = "Médio (~%@)";
+"attachment_large" = "Grande (~%@)";
+"attachment_cancel_download" = "Cancelar o download?";
+"attachment_cancel_upload" = "Cancelar o upload?";
+"attachment_multiselection_size_prompt" = "Você quer enviar imagens como:";
+"attachment_multiselection_original" = "Tamanho de Verdade";
+"attachment_e2e_keys_file_prompt" = "Este arquivo contém chaves de encriptação exportadas de um cliente Matrix.\nVocê quer visualizar o conteúdo do arquivo ou importar as chaves que ele contém?";
+"attachment_e2e_keys_import" = "Importar...";
+// Contacts
+"contact_mx_users" = "Usuárias(os) Matrix";
+"contact_local_contacts" = "Contatos Locais";
+// Groups
+"group_invite_section" = "Convites";
+"group_section" = "Grupos";
+// Search
+"search_no_results" = "Nenhum Resultado";
+"search_searching" = "Pesquisa em Progresso...";
+// Time
+"format_time_s" = "s";
+"format_time_m" = "m";
+"format_time_h" = "h";
+"format_time_d" = "d";
+// E2E import
+"e2e_import_room_keys" = "Importar chaves de sala";
+"e2e_import_prompt" = "Esse processo permite a você importar chaves de encriptação que você tinha previamente exportado de um outro cliente Matrix. Você vai então ser capaz de descriptar quaisquer mensagens que o outro cliente podia decriptar.\nO arquivo de exportação é protegido com uma frasepasse. Você deveria inserir a frasepasse aqui, para decriptar o arquivo.";
+"e2e_import" = "Importar";
+"e2e_passphrase_enter" = "Entrar frasepasse";
+// E2E export
+"e2e_export_room_keys" = "Exportar chaves de sala";
+"e2e_export_prompt" = "Este processo permite a você exportar as chaves para mensagens que você recebeu em salas encriptadas para um arquivo local. Você vai então ser capaz importar o arquivo para um outro cliente Matrix no futuro, para que o cliente também possa decriptar estas mensagens.\nO arquivo exportado vai permitir a qualquer pessoa que o possa ler decriptar quaisquer mensagens encriptadas que você pode ver, então você deveria ser cuidadosa(o) para mantê-lo protegido.";
+"e2e_export" = "Exportar";
+"e2e_passphrase_confirm" = "Confirmar frasepasse";
+"e2e_passphrase_empty" = "Frasepasse não deve estar vazia";
+"e2e_passphrase_not_match" = "Frasepasses devem corresponder";
+"e2e_passphrase_create" = "Criar frasepasse";
+// Others
+"user_id_title" = "ID de usuária(o):";
+"offline" = "offline";
+"unsent" = "Não-enviado";
+"error" = "Erro";
+"error_common_message" = "Um erro ocorreu. Por favor tente de novo mais tarde.";
+"not_supported_yet" = "Não suportado ainda";
+"default" = "padrão";
+"private" = "Privado";
+"public" = "Público";
+"network_error_not_reachable" = "Por favor cheque sua conectividade de rede";
+"user_id_placeholder" = "ex: @bob:servidorcasa";
+"ssl_homeserver_url" = "URL de servidorcasa: %@";
+// Permissions
+"camera_access_not_granted_for_call" = "Chamadas de vídeo requerem acesso à Câmera mas %@ não tem permissão para usá-la";
+"microphone_access_not_granted_for_call" = "Chamadas requerem acesso ao Microfone mas %@ não tem permissão para usá-lo";
+"local_contacts_access_not_granted" = "Descoberta de usuárias(os) desde contatos locais requer acesso a seus contatos mas %@ não tem permissão para usá-los";
+"local_contacts_access_discovery_warning_title" = "Descoberta de usuárias(os)";
+"local_contacts_access_discovery_warning" = "Para descobrir contatos já usando Matrix, %@ pode enviar endereços de email e números de telefone em seu livro de endereços para seu servidor de identidade Matrix escolhido. Onde suportado, dados pessoais são hashados antes do envio - por favor cheque a política de privacidade de seu servidor de identidade para mais detalhes.";
+// Country picker
+"country_picker_title" = "Escolha um país";
+// Language picker
+"language_picker_title" = "Escolha uma língua";
+"language_picker_default_language" = "Default (%@)";
+"notice_room_invite" = "%@ convidou %@";
+"notice_room_third_party_invite" = "%@ enviou um convite para %@ para se juntar à sala";
+"notice_room_third_party_registered_invite" = "%@ aceitou o convite para %@";
+"notice_room_join" = "%@ juntou-se";
+"notice_room_leave" = "%@ saiu";
+"notice_room_reject" = "%@ rejeitou o convite";
+"notice_room_kick" = "%@ expulsou %@";
+"notice_room_unban" = "%@ desbaniu %@";
+"notice_room_ban" = "%@ baniu %@";
+"notice_room_withdraw" = "%@ retirou o convite de %@";
+"notice_room_reason" = ". Razão: %@";
+"notice_avatar_url_changed" = "%@ mudou o avatar dela(e)";
+"notice_display_name_set" = "%@ definiu o nome de exibição dela(e) para %@";
+"notice_display_name_changed_from" = "%@ mudou o nome de exibição dela(e) de %@ para %@";
+"notice_display_name_removed" = "%@ removeu o nome de exibição dela(e)";
+"notice_topic_changed" = "%@ mudou o tópico para \"%@\".";
+"notice_room_name_changed" = "%@ mudou o nome da sala para %@.";
+"notice_placed_voice_call" = "%@ começou uma chamada de voz";
+"notice_placed_video_call" = "%@ começou uma chamada de vídeo";
+"notice_answered_video_call" = "%@ atendeu a chamada";
+"notice_ended_video_call" = "%@ terminou a chamada";
+"notice_conference_call_request" = "%@ requisitou uma conferência de VoIP";
+"notice_conference_call_started" = "Conferência de VoIP começada";
+"notice_conference_call_finished" = "Conferência de VoIP terminada";
+// button names 
+"ok" = "OK";
+"send" = "Enviar";
+"copy_button_name" = "Copiar";
+"resend" = "Reenviar";
+"redact" = "Remover";
+"share" = "Compartilhar";
+"delete" = "Deletar";
+// actions 
+"action_logout" = "Fazer logout";
+"create_room" = "Criar Sala";
+"login" = "Fazer login";
+"create_account" = "Criar Conta";
+"membership_invite" = "Convidada(o)";
+"membership_leave" = "Saiu";
+"membership_ban" = "Banida(o)";
+"num_members_one" = "%@ usuária(o)";
+"num_members_other" = "%@ usuárias(os)";
+"kick" = "Expulsar";
+"ban" = "Banir";
+"unban" = "Des-banir";
+"message_unsaved_changes" = "Existem mudanças não-salvas. Sair vai descartá-las.";
+// Login Screen 
+"login_error_already_logged_in" = "Login já feito";
+"login_error_must_start_http" = "URL deve começar com http[s]://";
+// room details dialog screen
+"room_details_title" = "Detalhes de Sala";
+// contacts list screen 
+"invitation_message" = "Eu gostaria de conversar com você com matrix. Por favor, visite o website http://matrix.org para ter mais informação.";
+// Settings screen 
+"settings_title_config" = "Configuração";
+"settings_title_notifications" = "Notificações";
+// Notification settings screen 
+"notification_settings_disable_all" = "Desabilitar todas as notificações";
+"notification_settings_enable_notifications" = "Habilitar notificações";
+"notification_settings_enable_notifications_warning" = "Todas as notificações estão atualmente desabilitadas para todos os dispositivos.";
+"notification_settings_global_info" = "Configurações de notificação são salvas em sua conta de usuária(o) e são compartilhadas entre todos os clientes que as suportam (incluindo notificações de desktop).\n\nRegras são aplicadas em ordem; a primeira regra que corresponde define o resultado da mensagem.\nEntão: Notificações per-palavra são mais importantes que notificações per-sala que são mais importantes que notificações per-enviador(a).\nPara múltiplas regras do mesmo tipo, a primeira na lista que corresponde leva prioridade.";
+"notification_settings_per_word_notifications" = "Notificações per-palavra";
+"notification_settings_per_word_info" = "Palavras correspondem insensivelmente a maiúsculas e minúsculas, e podem incluir um wildcard *. Então:\nfoo corresponde a string foo rodeado por delimitadores de palavras (e.g., pontuação e whitespace ou início/fim de linha).\nfoo* corresponde a qualquer palavra que começa foo.\n*foo* corresponde a qualquer palavra que inclui as 3 letras foo.";
+"notification_settings_always_notify" = "Sempre notificar";
+"notification_settings_never_notify" = "Nunca notificar";
+"notification_settings_word_to_match" = "palavra para corresponder";
+"notification_settings_highlight" = "Destacar";
+"notification_settings_custom_sound" = "Som personalizado";
+"notification_settings_per_room_notifications" = "Notificações per-sala";
+"notification_settings_per_sender_notifications" = "Notificações per-enviador(a)";
+"notification_settings_sender_hint" = "@usuarix:dominio.com";
+"notification_settings_select_room" = "Selecionar uma sala";
+"notification_settings_other_alerts" = "Outros Alertas";
+"notification_settings_contain_my_user_name" = "Notificar-me com som sobre mensagens que contêm meu nome de usuária(o)";
+"notification_settings_contain_my_display_name" = "Notificar-me com som sobre mensagens que contêm meu nome de exibição";
+"notification_settings_just_sent_to_me" = "Notificar-me com som sobre mensagens enviadas apenas para mim";
+"notification_settings_invite_to_a_new_room" = "Notificar-me quando eu sou convidada(o) para uma nova sala";
+"notification_settings_people_join_leave_rooms" = "Notificar-me quando pessoas se juntam ou saem de salas";
+"notification_settings_receive_a_call" = "Notificar-me quando eu recebo uma chamada";
+"notification_settings_suppress_from_bots" = "Suprimir notificações de bots";
+"notification_settings_by_default" = "Por default...";
+"notification_settings_notify_all_other" = "Notificar para todas as outras mensagens/salas";
+// gcm section 
+"settings_config_home_server" = "Servidorcasa: %@";
+"settings_config_identity_server" = "Servidor de identidade: %@";
+"settings_config_user_id" = "ID de usuária(o): %@";
+// call string
+"call_waiting" = "Aguardando...";
+"call_connecting" = "Conectando…";
+"call_ended" = "Chamada terminada";
+"call_ring" = "Chamando...";
+"incoming_video_call" = "Chamada de Vídeo Entrante";
+"incoming_voice_call" = "Chamada de Voz Entrante";
+"call_invite_expired" = "Convite de Chamada Expirado";
+// unrecognized SSL certificate
+"ssl_trust" = "Confiar";
+"ssl_logout_account" = "Fazer logout";
+"ssl_remain_offline" = "Ignorar";
+"ssl_fingerprint_hash" = "Impressão digital (%@):";
+"ssl_could_not_verify" = "Não foi possível verificar identidade de servidor remoto.";
+"ssl_cert_not_trust" = "Isto pode significar que alguém está interceptando maliciosamente seu tráfico, ou que seu telefone não confia no certificado provido pelo servidor remoto.";
+"ssl_cert_new_account_expl" = "Se o/a administrador(a) do servidor tem dito que isto é esperado, assegure-se que a impressão digital abaixo bate com a impressão digital provida por ele(a).";
+"ssl_unexpected_existing_expl" = "O certificado tem mudado de um que esta confiado por seu telefone. Isto é ALTAMENTE INCOMUM. É recomendado que você NÃO ACEITE este novo certificado.";
+"ssl_expected_existing_expl" = "O certificado tem sido mudado de um previamente confiado para um que não é confiado. O servidor pode ter renovado o certificado dele. Contacte o/a administrador(a) do servidor a impressão digital esperada.";
+"ssl_only_accept" = "SOMENTE aceite o certificado se o/a administrador(a) do servidor tem publicado uma impressão digital que corresponde à acima.";
+"notice_encryption_enabled_ok" = "%@ ativou encriptação ponta-a-ponta.";
+"notice_encryption_enabled_unknown_algorithm" = "%1$@ ativou encriptação ponta-a-ponta (algoritmo não-reconhecido %2$@).";
+"device_details_rename_prompt_title" = "Nome da Sessão";
+"account_error_push_not_allowed" = "Notificações não permitidas";
+"notice_room_third_party_revoked_invite" = "%@ revogou o convite para %@ para se juntar à sala";
+// Notice Events with "You"
+"notice_room_invite_by_you" = "Você convidou %@";
+"notice_room_invite_you" = "%@ convidou você";
+"notice_room_third_party_invite_by_you" = "Você enviou um convite para %@ para se juntar à sala";
+"notice_room_third_party_registered_invite_by_you" = "Você aceitou o convite para %@";
+"notice_room_third_party_revoked_invite_by_you" = "Você revogou o convite para que %@ se junte à sala";
+"notice_room_join_by_you" = "Você juntou-se";
+"notice_room_leave_by_you" = "Você saiu";
+"notice_room_reject_by_you" = "Você rejeitou o convite";
+"notice_room_kick_by_you" = "Você expulsou %@";
+"notice_room_unban_by_you" = "Você desbaniu %@";
+"notice_room_ban_by_you" = "Você baniu %@";
+"notice_room_withdraw_by_you" = "Você retirou o convite de %@";
+"notice_avatar_url_changed_by_you" = "Você mudou seu avatar";
+"notice_display_name_set_by_you" = "Você definiu seu nome de exibição para %@";
+"notice_display_name_changed_from_by_you" = "Você mudou seu nome de exibição de %@ para %@";
+"notice_display_name_removed_by_you" = "Você removeu seu nome de exibição";
+"notice_topic_changed_by_you" = "Você mudou o tópico para \"%@\".";
+"notice_room_name_changed_by_you" = "Você mudou o nome da sala para %@.";
+"notice_placed_voice_call_by_you" = "Você começou uma chamada de voz";
+"notice_placed_video_call_by_you" = "Você começou uma chamada de vídeo";
+"notice_answered_video_call_by_you" = "Você atendeu a chamada";
+"notice_ended_video_call_by_you" = "Você terminou a chamada";
+"notice_conference_call_request_by_you" = "Você requisitou uma conferência de VoIP";
+"notice_room_name_removed_by_you" = "Você removeu o nome da sala";
+"notice_room_topic_removed_by_you" = "Você removeu o tópico";
+"notice_event_redacted_by_you" = " por você";
+"notice_profile_change_redacted_by_you" = "Você atualizou seu perfil %@";
+"notice_room_created_by_you" = "Você criou e configurou a sala.";
+"notice_encryption_enabled_ok_by_you" = "Você ativou encriptação ponta-a-ponta.";
+"notice_encryption_enabled_unknown_algorithm_by_you" = "Você ativou a encriptação ponta-a-ponta (algoritmo irreconhecido %@).";
+"notice_redaction_by_you" = "Você redigiu um evento (id: %@)";
+"notice_room_history_visible_to_anyone_by_you" = "Você fez histórico da sala futuro visível para qualquer pessoa.";
+"notice_room_history_visible_to_members_by_you" = "Você fez histórico da sala futuro visível para todos os membros da sala.";
+"notice_room_history_visible_to_members_from_invited_point_by_you" = "Você fez histórico de sala futuro visível para todos os membros da sala, do ponto que são convidados.";
+"notice_room_history_visible_to_members_from_joined_point_by_you" = "Você fez histórico da sala futuro visível para todos os membros da sala, do momento que se juntaram.";
+"notice_room_name_removed_for_dm" = "%@ removeu o nome";
+"notice_room_created_for_dm" = "%@ juntou-se.";
+//  New
+"notice_room_join_rule_invite" = "%@ fez a sala somente convite.";
+"notice_room_join_rule_invite_for_dm" = "%@ fez isto somente convite.";
+"notice_room_join_rule_invite_by_you" = "Você fez a sala somente convite.";
+"notice_room_join_rule_invite_by_you_for_dm" = "Você fez isto somente convite.";
+"notice_room_join_rule_public" = "%@ fez a sala pública.";
+"notice_room_join_rule_public_for_dm" = "%@ fez isto público.";
+"notice_room_join_rule_public_by_you" = "Você fez a sala pública.";
+"notice_room_join_rule_public_by_you_for_dm" = "Você fez isto público.";
+"notice_room_power_level_intro_for_dm" = "Os níveis de poder de membros são:";
+"notice_room_aliases_for_dm" = "Os aliases são: %@";
+"notice_room_history_visible_to_members_for_dm" = "%@ fez mensagens futuras visíveis para todos os membros da sala.";
+"notice_room_history_visible_to_members_from_invited_point_for_dm" = "%@ fez mensagens futuras visíveis para todas as pessoas, do ponto que são convidadas.";
+"notice_room_history_visible_to_members_from_joined_point_for_dm" = "%@ fez mensagens futuras visíveis para todas as pessoas, do ponto que se juntaram.";
+"room_left_for_dm" = "Você saiu";
+"notice_room_third_party_invite_for_dm" = "%@ convidou %@";
+"notice_room_third_party_revoked_invite_for_dm" = "%@ revogou o convite de %@";
+"notice_room_name_changed_for_dm" = "%@ mudou o nome para %@.";
+"notice_room_third_party_invite_by_you_for_dm" = "Você convidou %@";
+"notice_room_third_party_revoked_invite_by_you_for_dm" = "Você revogou o convite de %@";
+"notice_room_name_changed_by_you_for_dm" = "Você mudou o nome para %@.";
+"notice_room_name_removed_by_you_for_dm" = "Você removeu o nome";
+"notice_room_created_by_you_for_dm" = "Você juntou-se.";
+"notice_room_history_visible_to_members_by_you_for_dm" = "Você fez mensagens futuras visíveis para todos os membros da sala.";
+"notice_room_history_visible_to_members_from_invited_point_by_you_for_dm" = "Você fez mensagens futuras visíveis para todas as pessoas, do ponto que são convidadas.";
+"notice_room_history_visible_to_members_from_joined_point_by_you_for_dm" = "Você fez mensagens futuras visíveis para todas as pessoas, do ponto que se juntaram.";
+"call_more_actions_dialpad" = "Pad de disco";
+"call_more_actions_unhold" = "Retomar";
+"call_more_actions_hold" = "Pôr em espera";
+"call_holded" = "Você pôs a chamada em espera";
+"call_remote_holded" = "%@ pôs a chamada em espera";
+"notice_declined_video_call_by_you" = "Você declinou a chamada";
+"notice_declined_video_call" = "%@ declinou a chamada";
+"resume_call" = "Retomar";
+"call_more_actions_transfer" = "Transferir";
+"call_more_actions_audio_use_device" = "Falante de Dispositivo";
+"call_more_actions_audio_use_headset" = "Usar Áudio de Auscultador";
+"call_more_actions_change_audio_device" = "Mudar Dispositivo de Áudio";
+"call_video_with_user" = "Chamada de vídeo com %@";
+"call_voice_with_user" = "Chamada de voz com %@";
+"call_ringing" = "Tocando…";
+"call_transfer_to_user" = "Transferir para %@";
+"call_consulting_with_user" = "Consultando com %@";
+"e2e_passphrase_too_short" = "Frasepasse curta demais (Ela deve ser a um mínimo %d caracteres em comprimento)";
+"microphone_access_not_granted_for_voice_message" = "Mensagens de voz requerem acesso ao Microfone mas %@ não tem permissão para usá-lo";
+"message_reply_to_sender_sent_a_voice_message" = "enviou uma mensagem de voz.";
+"attachment_large_with_resolution" = "Grande %@ (~%@)";
+"attachment_medium_with_resolution" = "Médio %@ (~%@)";
+"attachment_small_with_resolution" = "Pequeno %@ (~%@)";
+"attachment_size_prompt_message" = "Você pode desligar isto em configurações.";
+"attachment_size_prompt_title" = "Confirmar tamanho para enviar";
+"room_displayname_all_other_participants_left" = "%@ (Saiu)";
+"auth_reset_password_error_not_found" = "Não encontrado";
+"auth_reset_password_error_unauthorized" = "Não-autorizada(o)";
+"auth_username_in_use" = "Nome de usuária(o) em uso";
+"auth_invalid_user_name" = "Nome de usuária(o) inválido";
+"rename" = "Renomear";
+"room_displayname_all_other_members_left" = "%@ (Saiu)";
+"attachment_unsupported_preview_message" = "Este tipo de arquivo não é suportado.";
+"attachment_unsupported_preview_title" = "Incapaz de previsualizar";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/ru.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/ru.lproj/MatrixKit.strings
new file mode 100644
index 000000000..53403ae12
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/ru.lproj/MatrixKit.strings
@@ -0,0 +1,478 @@
+"matrix" = "Matrix";
+// Login Screen
+"login_create_account" = "Регистрация:";
+"login_server_url_placeholder" = "URL (например https://matrix.org)";
+"login_home_server_title" = "URL домашнего сервера:";
+"login_home_server_info" = "Ваш домашний сервер хранит все ваши разговоры и данные о аккаунте";
+"login_identity_server_title" = "Cервер идентификации URL:";
+"login_identity_server_info" = "Серверы идентификации Matrix обеспечивают определение соответствия между email и Matrix ID. В настоящее время существует только https://matrix.org.";
+"login_user_id_placeholder" = "Matrix ID (например, @bob:matrix.org или bob)";
+"login_password_placeholder" = "Пароль";
+"login_optional_field" = "не обязательно";
+"login_display_name_placeholder" = "Отображаемое имя (например, Иван Петров)";
+"login_email_info" = "Укажите адрес электронной почты, чтобы другие пользователи могли легко находить вас в Matrix. Кроме того, вы сможете при необходимости восстановить свой пароль.";
+"login_email_placeholder" = "Адрес электронной почты";
+"login_prompt_email_token" = "Введите токен подтверждения адреса электронной почты:";
+"login_error_title" = "Не удалось войти";
+"login_error_no_login_flow" = "Не удалось получить информацию для аутентификации с этого домашнего сервера";
+"login_error_registration_is_not_supported" = "Регистрация в настоящее время не поддерживается";
+"login_error_forbidden" = "Неверное имя пользователя или пароль";
+"login_error_unknown_token" = "Указанный токен доступа не распознан";
+"login_error_bad_json" = "Поврежденный JSON";
+"login_error_not_json" = "Не содержит допустимый JSON";
+"login_error_limit_exceeded" = "Отправлено слишком много запросов";
+"login_error_user_in_use" = "Это имя пользователя уже используется";
+"login_error_login_email_not_yet" = "Вы не перешли по высланной в email ссылке";
+"login_leave_fallback" = "Отмена";
+"login_invalid_param" = "Недопустимый параметр";
+"register_error_title" = "Регистрация не удалась";
+// Action
+"no" = "Нет";
+"yes" = "Да";
+"abort" = "Отменить";
+"back" = "Назад";
+"close" = "Закрыть";
+"continue" = "Продолжить";
+"discard" = "Отказаться";
+"dismiss" = "Отклонить";
+"retry" = "Попробовать снова";
+"sign_up" = "Зарегистрироваться";
+"submit" = "Отправить";
+"submit_code" = "Отправить код";
+"set_default_power_level" = "Сбросить уровень доступа";
+"set_moderator" = "Сделать модератором";
+"set_admin" = "Сделать администратором";
+"start_chat" = "Начать чат";
+"start_voice_call" = "Начать голосовой вызов";
+"start_video_call" = "Начать видеовызов";
+"mention" = "Упоминание";
+"select_account" = "Выберите аккаунт";
+"attach_media" = "Прикрепить файл из библиотеки";
+"capture_media" = "Сделать фото/видео";
+"invite_user" = "Пригласить пользователя matrix";
+"reset_to_default" = "Восстановить по умолчанию";
+"resend_message" = "Отправить сообщение снова";
+"select_all" = "Выбрать все";
+"cancel_upload" = "Отменить отправку";
+"cancel_download" = "Отменить загрузку";
+"show_details" = "Показать детали";
+"answer_call" = "Ответить на вызов";
+"reject_call" = "Отклонить вызов";
+"end_call" = "Завершить вызов";
+"ignore" = "Игнорировать";
+"unignore" = "Перестать игнорировать";
+// Events formatter
+"notice_avatar_changed_too" = "(аватар также изменился)";
+"notice_room_name_removed" = "%@ удалил(а) название комнаты";
+"notice_room_topic_removed" = "%@ удалил(а) тему";
+"notice_event_redacted_reason" = " [причина: %@]";
+"notice_profile_change_redacted" = "%@ обновил(а) свой профиль %@";
+"notice_room_created" = "%@ создал(а) и настроил(а) комнату.";
+"notice_room_power_level_intro" = "Уровень доступа членов комнаты:";
+"notice_room_power_level_acting_requirement" = "Минимальные уровни доступа пользователя для совершения действия:";
+"notice_room_power_level_event_requirement" = "Минимальные уровни доступа, связанные с событиями:";
+"notice_encrypted_message" = "Зашифрованное сообщение";
+"notice_encryption_enabled" = "%@ включил(а) сквозное шифрование (алгоритм %@)";
+"notice_image_attachment" = "прикрепленное изображение";
+"notice_audio_attachment" = "прикрепленное аудио";
+"notice_video_attachment" = "прикрепленное видео";
+"notice_location_attachment" = "прикрепленное местоположение";
+"notice_file_attachment" = "прикрепленный файл";
+"notice_invalid_attachment" = "недопустимое вложение";
+"notice_unsupported_attachment" = "Неподдерживаемое вложение: %@";
+"notice_redaction" = "%@ отредактировал(а) событие (id: %@)";
+"notice_error_unsupported_event" = "Неподдерживаемое событие";
+"notice_error_unexpected_event" = "Непредвиденное событие";
+"notice_error_unknown_event_type" = "Неизвестный тип события";
+"notice_room_history_visible_to_anyone" = "%@ сделал(а) будущую историю комнату видимой всем.";
+"notice_room_history_visible_to_members" = "%@ сделал(а) будущую историю комнаты видимой всем членам комнаты.";
+"notice_room_history_visible_to_members_from_invited_point" = "%@ сделал(а) будущую историю комнаты видимой всем членам комнаты с момента их приглашения.";
+"notice_room_history_visible_to_members_from_joined_point" = "%@ сделал(а) будущую историю комнаты видимой всем членам комнаты с момента их входа.";
+"notice_crypto_unable_to_decrypt" = "** Не удалось расшифровать: %@ **";
+"notice_crypto_error_unknown_inbound_session_id" = "Сессия отправителя не отправила вам ключи для этого сообщения.";
+// room display name
+"room_displayname_empty_room" = "Пустая комната";
+"room_displayname_two_members" = "%@ и %@";
+"room_displayname_more_than_two_members" = "%@ и %u другие";
+// Settings
+"settings" = "Настройки";
+"settings_enable_inapp_notifications" = "Включить уведомления в приложении";
+"settings_enable_push_notifications" = "Включить push-уведомления";
+"settings_enter_validation_token_for" = "Введите токен подтверждения для %@:";
+"notification_settings_room_rule_title" = "Комната: '%@'";
+// Devices
+"device_details_title" = "Информация о сессии\n";
+"device_details_name" = "Публичное имя\n";
+"device_details_identifier" = "ID\n";
+"device_details_last_seen" = "Последняя активность\n";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_rename_prompt_message" = "Публичные имена сессий видны людям, с которыми вы общаетесь";
+"device_details_delete_prompt_title" = "Аутентификация";
+"room_event_encryption_info_event" = "Информация о событии\n";
+"room_event_encryption_info_event_user_id" = "ID пользователя\n";
+"room_event_encryption_info_event_algorithm" = "Алгоритм\n";
+"room_event_encryption_info_event_session_id" = "ID сессии\n";
+"room_event_encryption_info_event_decryption_error" = "Ошибка расшифровки\n";
+"room_event_encryption_info_event_unencrypted" = "незашифровано";
+"room_event_encryption_info_device" = "\nИнформация о сессии отправителя\n";
+"room_event_encryption_info_device_unknown" = "неизвестная сессия\n";
+"room_event_encryption_info_device_name" = "Публичное имя\n";
+"room_creation_participants_title" = "Участники:";
+// Room
+"room_please_select" = "Пожалуйста, выберите комнату";
+"room_error_join_failed_title" = "Не удалось войти в комнату";
+"room_left" = "Вы покинули комнату";
+// Room members
+"room_member_ignore_prompt" = "Вы уверены, что хотите скрыть все сообщения этого пользователя?";
+"room_member_power_level_prompt" = "Вы не сможете отменить это действие, поскольку пользователь получит такой же уровень доступа, как и у вас. \nВы уверены?";
+"power_level" = "Уровень доступа";
+// Country picker
+"country_picker_title" = "Выберите страну";
+// Language picker
+"language_picker_title" = "Выберите язык";
+"language_picker_default_language" = "По умолчанию (%@)";
+"notice_room_join" = "%@ вошел(ла)";
+"notice_room_leave" = "%@ вышел(ла)";
+"notice_room_reject" = "%@ отклонил(а) приглашение";
+"notice_room_kick" = "%@ выкинул(а) %@";
+"notice_room_unban" = "%@ разблокировал(а) %@";
+"notice_room_ban" = "%@ заблокировал(а) %@";
+"notice_room_withdraw" = "%@ отозвал(а) приглашение %@";
+"notice_room_reason" = ". Причина: %@";
+"notice_avatar_url_changed" = "%@ изменил(а) свой аватар";
+"notice_display_name_set" = "%@ сделал(а) своим отображаемым именем %@";
+"notice_display_name_changed_from" = "%@ изменил(а) свое отображаемое имя с %@ на %@";
+"notice_display_name_removed" = "%@ удалил(а) свое отображаемое имя";
+"notice_topic_changed" = "%@ изменил(а) тему на \"%@\".";
+"notice_room_name_changed" = "%@ изменил(а) название комнаты на %@.";
+"notice_placed_voice_call" = "%@ совершил(а) голосовой вызов";
+"notice_placed_video_call" = "%@ совершил(а) видео вызов";
+"notice_answered_video_call" = "%@ ответил(а) на вызов";
+"notice_ended_video_call" = "%@ завершил(а) вызов";
+"notice_conference_call_request" = "%@ запросил(а) голосовую конференцию";
+"notice_conference_call_started" = "голосовая конференция началась";
+"notice_conference_call_finished" = "голосовая конференция завершилась";
+// button names 
+"ok" = "OK";
+"cancel" = "Отмена";
+"save" = "Сохранить";
+"leave" = "Покинуть";
+"send" = "Отправить";
+"copy_button_name" = "Скопировать";
+"resend" = "Переотправить";
+"redact" = "Удалить";
+"share" = "Поделиться";
+"set_power_level" = "Установить уровень мощности";
+"delete" = "Удалить";
+// actions 
+"action_logout" = "Выйти";
+"create_room" = "Создать комнату";
+"login" = "Войти";
+"create_account" = "Создать аккаунт";
+"membership_invite" = "Приглашен";
+"membership_leave" = "Покинул";
+"membership_ban" = "Заблокирован";
+"num_members_one" = "%@ пользователь";
+"num_members_other" = "%@ пользователей";
+"invite" = "Пригласить";
+"kick" = "Выкинуть";
+"ban" = "Заблокировать";
+"unban" = "Разблокировать";
+// Room creation
+"room_creation_name_title" = "Название комнаты:";
+"login_use_fallback" = "Использовать резервную страницу";
+"login_error_do_not_support_login_flows" = "В настоящее время мы не поддерживаем потоки авторизации, определенных данным домашним сервером";
+"login_error_forgot_password_is_not_supported" = "\"Забытый пароль\" в настоящее время не поддерживается";
+"notice_event_redacted" = "<отредактировано%@>";
+"notice_event_redacted_by" = " от %@";
+"notice_room_join_rule" = "Правило присоединения: %@";
+"device_details_delete_prompt_message" = "Для этой операции требуется дополнительная аутентификация.\nЧтобы продолжить, введите свой пароль.";
+// Encryption information
+"room_event_encryption_info_title" = "Сведения о сквозном шифровании\n\n";
+"room_event_encryption_info_event_identity_key" = "Ключ идентификации Curve25519\n";
+"room_event_encryption_info_event_fingerprint_key" = "Требуемый ключ цифрового отпечатка Ed25519\n";
+"room_event_encryption_info_event_none" = "никого нет";
+"room_event_encryption_info_device_id" = "Идентификатор устройства\n";
+"room_event_encryption_info_device_verification" = "Верификация\n";
+"room_event_encryption_info_device_fingerprint" = "Отпечаток Ed25519\n";
+"room_event_encryption_info_device_verified" = "Подтверждено";
+"room_event_encryption_info_device_not_verified" = "НЕ подтверждено";
+"room_event_encryption_info_device_blocked" = "В черном списке";
+"room_event_encryption_info_verify" = "Проверка...";
+"room_event_encryption_info_unverify" = "Отменить верификацию";
+"room_event_encryption_info_block" = "Черный список";
+"room_event_encryption_info_unblock" = "Удалить из черного списка";
+"room_event_encryption_verify_title" = "Проверить сессию\n\n";
+"room_event_encryption_verify_message" = "Для верификации сессии, пожалуйста, свяжитесь с владельцем используя другие методы коммуникации (например, лично или по телефону) и попросите его подтвердить, что он видит такой же ключ как написанный ниже:\n\n\tИмя сессии: %@\n\tИдентификатор сессии: %@\n\tКлюч сессии: %@\n\nЕсли совпадают, то нажмите кнопку верификации ниже. Если нет, значит кто-то перехватил эту сессию и вы, скорее всего, захотите внести его в черный список.\n\nВ будущем процесс верификации будет усложнен.";
+"room_event_encryption_verify_ok" = "Подтвердить";
+// Account
+"account_save_changes" = "Сохранить изменения";
+"account_linked_emails" = "Связанные адреса электронной почты";
+"account_link_email" = "Связанный адрес электронной почты";
+"account_email_validation_title" = "Ожидание проверки";
+"account_email_validation_message" = "Проверьте свою электронную почту и нажмите на содержащуюся ссылку. После этого нажмите кнопку Продолжить.";
+"account_email_validation_error" = "Не удалось проверить адрес электронной почты. Проверьте свою электронную почту и нажмите на содержащуюся ссылку. Когда это будет сделано, нажмите Продолжить";
+"account_msisdn_validation_title" = "Ожидание проверки";
+"account_msisdn_validation_message" = "Мы отправили SMS с кодом активации. Введите этот код в поле ниже.";
+"account_msisdn_validation_error" = "Не удалось проверить номер телефона.";
+"account_error_display_name_change_failed" = "Не удалось изменить отображаемое имя";
+"account_error_picture_change_failed" = "Не удалось изменить аватар";
+"account_error_matrix_session_is_not_opened" = "Сессия Matrix не открыта";
+"account_error_email_wrong_title" = "Неверный адрес электронной почты";
+"account_error_email_wrong_description" = "Похоже это недействительный адрес электронной почты";
+"account_error_msisdn_wrong_title" = "Некорректный номер телефона";
+"account_error_msisdn_wrong_description" = "Это недействительный номер телефона";
+"room_creation_name_placeholder" = "(напр. lunchGroup)";
+"room_creation_alias_title" = "Псевдоним комнаты:";
+"room_creation_alias_placeholder" = "(напр. #foo:primer.ru)";
+"room_creation_alias_placeholder_with_homeserver" = "(напр. #foo%@)";
+"room_creation_participants_placeholder" = "(напр. @boris:homeserver1; @ivan:homeserver2...)";
+"room_error_join_failed_empty_room" = "В настоящее время невозможно присоединиться в пустую комнату.";
+"room_error_name_edition_not_authorized" = "У вас нет прав на редактирование названия этой комнаты";
+"room_error_topic_edition_not_authorized" = "У вас нет прав редактировать тему этой комнаты";
+"room_error_cannot_load_timeline" = "Не удалось загрузить хронологию";
+"room_error_timeline_event_not_found_title" = "Не удалось загрузить метку из хронологии";
+"room_error_timeline_event_not_found" = "Приложение пыталось загрузить конкретную позицию хронологии этой комнаты, но не смогло ее найти";
+"room_no_power_to_create_conference_call" = "Вы должны иметь право выдачи приглашений, чтобы начать конференцию в этой комнате";
+"room_no_conference_call_in_encrypted_rooms" = "Групповые вызовы не поддерживаются в зашифрованных комнатах";
+// Attachment
+"attachment_size_prompt" = "Вы хотите отправить как:";
+"attachment_original" = "Фактический размер (%@)";
+"attachment_small" = "Маленький (%@)";
+"attachment_medium" = "Средний (%@)";
+"attachment_large" = "Большой (%@)";
+"attachment_cancel_download" = "Отменить загрузку?";
+"attachment_cancel_upload" = "Отменить отправку?";
+"attachment_multiselection_size_prompt" = "Вы хотите отправить изображения как:";
+"attachment_multiselection_original" = "Фактический размер";
+"attachment_e2e_keys_file_prompt" = "Этот файл содержит ключи шифрования, экспортированные из клиента Matrix.\nВы хотите просмотреть содержимое файла или импортировать содержащиеся в нем ключи?";
+"attachment_e2e_keys_import" = "Импорт...";
+// Contacts
+"contact_mx_users" = "Пользователи Matrix";
+"contact_local_contacts" = "Локальные контакты";
+// Search
+"search_no_results" = "Нет результатов";
+// Time
+"format_time_s" = "с";
+"format_time_m" = "м";
+"format_time_h" = "ч";
+"format_time_d" = "д";
+// E2E import
+"e2e_import_room_keys" = "Импорт ключей комнаты";
+"e2e_import_prompt" = "Этот процесс позволит вам импортировать ключи шифрования, которые вы экспортировали ранее из клиента Matrix. Это позволит вам расшифровать историю чата.\nФайл защищен парольной фразой. Введите ее для расшифровки файла.";
+"e2e_import" = "Импорт";
+"e2e_passphrase_enter" = "Введите парольную фразу";
+// E2E export
+"e2e_export_room_keys" = "Экспорт ключей комнаты";
+"notice_feedback" = "Обратная связь (id: %@): %@";
+"e2e_export_prompt" = "Этот процесс позволяет вам экспортировать ключи для сообщений, которые вы получили в комнатах с шифрованием, в локальный файл. Вы сможете импортировать эти ключи в другой клиент Matrix чтобы расшифровать эти сообщения.\nЭкспортированный файл позволит любому пользователю расшифровать и зашифровать сообщения, которые вы видите, поэтому вы должны быть крайне осторожны и держать файл в надежном месте.";
+"e2e_export" = "Экспорт";
+"e2e_passphrase_confirm" = "Подтвердить парольную фразу";
+"e2e_passphrase_empty" = "Парольная фраза не может быть пустой";
+"e2e_passphrase_not_match" = "Парольные фразы должны совпадать";
+// Others
+"user_id_title" = "Идентификатор пользователя:";
+"offline" = "не в сети";
+"unsent" = "Не отправлено";
+"error" = "Ошибка";
+"not_supported_yet" = "Пока не поддерживается";
+"default" = "по умолчанию";
+"network_error_not_reachable" = "Проверьте подключение к сети";
+"user_id_placeholder" = "напр.: @boris:homeserver";
+"ssl_homeserver_url" = "URL-адрес домашнего сервера: %@";
+// Permissions
+"camera_access_not_granted_for_call" = "Для видеозвонков требуется доступ к камере, но %@ не имеет разрешения на ее использование";
+"microphone_access_not_granted_for_call" = "Для звонков требуется доступ к микрофону, но %@ не имеет разрешения на его использование";
+"local_contacts_access_not_granted" = "Поиск пользователей из локальных контактов требует доступа к вашим контактам, но %@ не имеет разрешения на их использование";
+"local_contacts_access_discovery_warning_title" = "Обнаружение пользователей";
+"local_contacts_access_discovery_warning" = "Чтобы обнаружить контакты, уже использующие Matrix, %@ может отправлять адреса электронной почты и номера телефонов в вашей адресной книге на выбранный вами сервер идентификации Matrix. Там, где это поддерживается, личные данные перед отправкой хэшируются - пожалуйста, ознакомьтесь с политикой конфиденциальности вашего сервера идентификации для более подробной информации.";
+"notice_room_invite" = "%@ пригласил(а) %@";
+"notice_room_third_party_invite" = "%@ отправил(а) приглашение для %@ войти в комнату";
+"notice_room_third_party_registered_invite" = "%@ принял(а) приглашение от %@";
+"notice_room_aliases" = "Псевдонимы комнаты: %@";
+"private" = "Приватный";
+"public" = "Публичный";
+"view" = "Просмотр";
+"message_unsaved_changes" = "Имеются несохраненные изменения. Они будут потеряны.";
+// Login Screen 
+"login_error_already_logged_in" = "Уже вошли";
+"login_error_must_start_http" = "URL-адрес должен начинаться с http[s]://";
+// room details dialog screen
+"room_details_title" = "Информация о комнате";
+// contacts list screen 
+"invitation_message" = "Я бы хотел поговорить с вами в Matrix. Пожалуйста, посетите веб-сайт https://matrix.org для получения дополнительной информации.";
+// Settings screen 
+"settings_title_config" = "Конфигурация";
+"settings_title_notifications" = "Уведомления";
+// Notification settings screen 
+"notification_settings_disable_all" = "Отключить все уведомления";
+"notification_settings_enable_notifications" = "Включить уведомления";
+"notification_settings_enable_notifications_warning" = "Все уведомления отключены для всех устройств.";
+"notification_settings_global_info" = "Настройки уведомлений сохраняются в учетной записи и распространяются на все клиенты, которые их поддерживают (включая настольный компьютер).\n\nПравила применяются по порядку; будет использовано первое подходящее.\nТаким образом: уведомления для сообщений приоритетней уведомлений для комнат, которые, в свою очередь, приоритетней уведомлений для отправителей.\nДля нескольких правил одинакового типа будет использован первый по счету.";
+"notification_settings_always_notify" = "Всегда уведомлять";
+"notification_settings_never_notify" = "Никогда не уведомлять";
+"notification_settings_word_to_match" = "соответствие слов";
+"notification_settings_custom_sound" = "Пользовательский звук";
+"notification_settings_sender_hint" = "@user:domain.com";
+"notification_settings_select_room" = "Выберите комнату";
+"notification_settings_other_alerts" = "Другие предупреждения";
+"notification_settings_contain_my_user_name" = "Уведомлять звуком о сообщениях, содержащих мое имя пользователя";
+"notification_settings_contain_my_display_name" = "Уведомлять звуком о сообщениях, содержащих мое отображаемое имя";
+"notification_settings_just_sent_to_me" = "Уведомлять звуком о сообщениях, отправленных только мне";
+"notification_settings_invite_to_a_new_room" = "Уведомлять меня о приглашении в новую комнату";
+"notification_settings_people_join_leave_rooms" = "Уведомлять, когда пользователи заходят или выходят из комнат";
+"notification_settings_receive_a_call" = "Уведомлять о получении звонка";
+"notification_settings_suppress_from_bots" = "Подавлять уведомления от ботов";
+"notification_settings_by_default" = "По умолчанию...";
+"notification_settings_notify_all_other" = "Уведомлять о всех других сообщениях/комнатах";
+// gcm section 
+"settings_config_home_server" = "Домашний сервер: %@";
+"settings_config_identity_server" = "Сервер идентификации: %@";
+"settings_config_user_id" = "Идентификатор пользователя: %@";
+// call string
+"call_waiting" = "Ожидание...";
+"call_connecting" = "Соединение…";
+"call_ended" = "Вызов завершен";
+"call_ring" = "Вызов...";
+"incoming_video_call" = "Входящий видеовызов";
+"incoming_voice_call" = "Входящий голосовой вызов";
+"call_invite_expired" = "Срок действия приглашения на звонок истек";
+// unrecognized SSL certificate
+"ssl_trust" = "Доверять";
+"ssl_logout_account" = "Выход";
+"ssl_remain_offline" = "Игнорировать";
+"ssl_could_not_verify" = "Не удалось проверить подлинность удаленного сервера.";
+"ssl_cert_not_trust" = "Это может означать, что кто-то злонамеренно перехватывает ваш трафик или что ваш телефон не доверяет сертификату, предоставленному удаленным сервером.";
+"ssl_unexpected_existing_expl" = "Сертификат изменился у пользователя, который был доверенным для вашего устройства. Это ОЧЕНЬ НЕОБЫЧНО. Рекомендуется НЕ ПРИНИМАТЬ новый сертификат.";
+"ssl_only_accept" = "Примите сертификат ТОЛЬКО в том случае, если администратор сервера опубликовал отпечаток, соответствующий приведенному выше.";
+"ssl_fingerprint_hash" = "Отпечаток (%@):";
+"notification_settings_per_word_notifications" = "Уведомления по одному слову";
+"notification_settings_per_word_info" = "Слова нечувствительны к регистру и могут содержать * спецсимвол. Так:\nFoo соответствует строке foo, окруженной разделителями слов (например, пунктуацией и пробелом или началом/концом строки).\nFoo * соответствует любому такому слову, которое начинается с foo.\n* Foo * соответствует любому такому слову, которое включает в себя 3 буквы foo.";
+"notification_settings_highlight" = "Подсветка";
+"notification_settings_per_room_notifications" = "Уведомления для каждой комнаты";
+"notification_settings_per_sender_notifications" = "Уведомления для отдельного собеседника";
+"ssl_cert_new_account_expl" = "Если администратор сервера сказал, что это ожидается, убедитесь, что отпечаток ниже соответствует предоставленному им отпечатку.";
+"ssl_expected_existing_expl" = "Сертификат изменился с ранее доверенного на один, которому не доверяют. Возможно, сервер обновил свой сертификат. Обратитесь к администратору сервера за ожидаемым отпечатком.";
+"search_searching" = "Выполняется поиск...";
+"login_mobile_device" = "Мобильное устройство";
+"login_tablet_device" = "Планшет";
+"login_desktop_device" = "Компьютер";
+"notice_room_related_groups" = "Группы, связанные с этой комнатой: %@";
+// Groups
+"group_invite_section" = "Приглашения";
+"group_section" = "Группы";
+"notice_sticker" = "стикер";
+"notice_in_reply_to" = "В ответ на";
+"error_common_message" = "Произошла ошибка. Пожалуйста, повторите попытку позже.";
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "отправил(а) изображение.";
+"message_reply_to_sender_sent_a_video" = "отправил(а) видео.";
+"message_reply_to_sender_sent_an_audio_file" = "отправил(а) аудиофайл.";
+"message_reply_to_sender_sent_a_file" = "отправил(а) файл.";
+"message_reply_to_message_to_reply_to_prefix" = "В ответ на";
+"login_error_resource_limit_exceeded_title" = "Превышен лимит ресурса";
+"login_error_resource_limit_exceeded_contact_button" = "Связаться с администратором";
+"login_error_resource_limit_exceeded_message_default" = "Этот сервер превысил один из лимитов ресурсов.";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "Этот сервер достиг ежемесячного лимита активных пользователей.";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nПожалуйста свяжитесь с вашим администратором что бы продолжить пользоваться этим сервисом.";
+"e2e_passphrase_create" = "Создать парольную фразу";
+"account_error_push_not_allowed" = "Уведомления не разрешены";
+"notice_room_third_party_revoked_invite" = "%@ отозвал приглашение для %@ на вступление в комнату";
+"device_details_rename_prompt_title" = "Имя Сессии";
+"notice_encryption_enabled_ok" = "%@ включил сквозное шифрование.";
+"notice_encryption_enabled_unknown_algorithm" = "%1$@ включил сквозное шифрование (нераспознанный алгоритм %2$@).";
+// Notice Events with "You"
+"notice_room_invite_by_you" = "Вы пригласили %@";
+"notice_room_invite_you" = "%@ пригласил Вас";
+"notice_room_third_party_invite_by_you" = "Вы отправили приглашение %@ вступить в комнату";
+"notice_room_third_party_registered_invite_by_you" = "Вы приняли приглашение для @%";
+"notice_room_third_party_revoked_invite_by_you" = "Вы отозвали приглашение для %@ вступить в комнату";
+"notice_room_join_by_you" = "Вы вошли";
+"notice_room_leave_by_you" = "Вы вышли";
+"notice_room_reject_by_you" = "Вы отклонили приглашение";
+"notice_room_kick_by_you" = "Вы исключили %@";
+"notice_room_unban_by_you" = "Вы разбанили %@";
+"notice_room_ban_by_you" = "Вы забанили %@";
+"notice_avatar_url_changed_by_you" = "Вы сменили свой аватар";
+"notice_display_name_set_by_you" = "Вы установили своё отображаемое имя как %@";
+"notice_display_name_changed_from_by_you" = "Вы сменили своё отображаемое имя с %@ на %@";
+"notice_display_name_removed_by_you" = "Вы удалили своё отображаемое имя";
+"notice_topic_changed_by_you" = "Вы сменили тему на \"%@\".";
+"notice_room_name_changed_by_you" = "Вы сменили имя комнаты на %@.";
+"notice_room_withdraw_by_you" = "Вы отозвали приглашение %@";
+"notice_placed_voice_call_by_you" = "Вы начали звонок";
+"notice_placed_video_call_by_you" = "Вы начали видеозвонок";
+"notice_answered_video_call_by_you" = "Вы ответили на звонок";
+"notice_ended_video_call_by_you" = "Вы закончили звонок";
+"notice_conference_call_request_by_you" = "Вы запросили VoIP конференцию";
+"notice_room_name_removed_by_you" = "Вы удалили название комнаты";
+"notice_room_topic_removed_by_you" = "Вы удалили эту тему";
+"notice_event_redacted_by_you" = " вами";
+"notice_profile_change_redacted_by_you" = "Вы обновили свой профиль %@";
+"notice_room_created_by_you" = "Вы создали и настроили комнату.";
+"notice_encryption_enabled_ok_by_you" = "Вы активировали сквозное шифрование.";
+"notice_encryption_enabled_unknown_algorithm_by_you" = "Вы активировали сквозное шифрование (неопознанный алгоритм %@).";
+"notice_redaction_by_you" = "Вы отредактировали событие (id: %@)";
+"notice_room_history_visible_to_anyone_by_you" = "Вы сделали будущую историю комнаты видимой для всех.";
+"notice_room_history_visible_to_members_by_you" = "Вы сделали будущую историю комнаты видимой для всех членов комнаты.";
+"notice_room_history_visible_to_members_from_invited_point_by_you" = "Вы сделали будущую историю комнаты видимой для всех членов комнаты, с того момента, как они приглашены.";
+"notice_room_history_visible_to_members_from_joined_point_by_you" = "Вы сделали будущую историю комнаты видимой для всех членов комнаты, с того момента, как они присоединились.";
+//  New
+"notice_room_join_rule_invite" = "%@ сделал(а) комнату доступной только по приглашению.";
+"notice_room_join_rule_invite_by_you" = "Вы сделали комнату только по приглашению.";
+"notice_room_join_rule_public" = "%@ сделал(а) комнату публичной.";
+"notice_room_join_rule_public_by_you" = "Вы сделали комнату публичной.";
+"notice_room_name_removed_for_dm" = "%@ удалил(а) название";
+"notice_room_created_for_dm" = "%@ вошёл(ла).";
+"notice_room_join_rule_invite_for_dm" = "%@ сделал(а) доступ только по приглашению.";
+"notice_room_join_rule_invite_by_you_for_dm" = "Вы сделали доступ только по приглашению.";
+"notice_room_join_rule_public_for_dm" = "%@ сделал(а) комнату публичной.";
+"notice_room_join_rule_public_by_you_for_dm" = "Вы сделали комнату публичной.";
+"notice_room_power_level_intro_for_dm" = "Уровень доступа членов комнаты:";
+"notice_room_aliases_for_dm" = "Псевдонимы: %@";
+"notice_room_history_visible_to_members_for_dm" = "%@ сделал(а) будущую историю сообщений видимой всем членам комнаты.";
+"notice_room_history_visible_to_members_from_invited_point_for_dm" = "%@ сделал(а) будущие сообщения видимыми для всех с момента их приглашения.";
+"notice_room_history_visible_to_members_from_joined_point_for_dm" = "%@ сделал(а) будущие сообщения видимыми для всех с момента их присоединения.";
+"room_left_for_dm" = "Вы вышли";
+"notice_room_third_party_invite_for_dm" = "%@ пригласил(а) %@";
+"notice_room_third_party_revoked_invite_for_dm" = "%@ отозвал(а) приглашение %@";
+"notice_room_name_changed_for_dm" = "%@ изменил(а) название на %@.";
+"notice_room_third_party_invite_by_you_for_dm" = "Вы пригласили %@";
+"notice_room_third_party_revoked_invite_by_you_for_dm" = "Вы отозвали приглашение %@";
+"notice_room_name_changed_by_you_for_dm" = "Вы сменили название на %@.";
+"notice_room_name_removed_by_you_for_dm" = "Вы удалили название";
+"notice_room_created_by_you_for_dm" = "Вы вошли.";
+"notice_room_history_visible_to_members_by_you_for_dm" = "Вы сделали будущие сообщения видимыми для всех участников комнаты.";
+"notice_room_history_visible_to_members_from_invited_point_by_you_for_dm" = "Вы сделали будущие сообщения видимыми для всех с момента их приглашения.";
+"notice_room_history_visible_to_members_from_joined_point_by_you_for_dm" = "Вы сделали будущие сообщения видимыми для всех с момента их присоединения.";
+"call_more_actions_dialpad" = "Панель набора номера";
+"call_more_actions_transfer" = "Перевод";
+"call_more_actions_audio_use_device" = "Динамик устройства";
+"call_more_actions_audio_use_headset" = "Использовать звук гарнитуры";
+"call_more_actions_change_audio_device" = "Сменить аудиоустройство";
+"call_more_actions_unhold" = "Возобновить";
+"call_more_actions_hold" = "Удерживать";
+"call_holded" = "Вы поставили вызов на удержание";
+"call_remote_holded" = "%@ поставил(а) вызов на удержание";
+"notice_declined_video_call_by_you" = "Вы отменили вызов";
+"notice_declined_video_call" = "%@ отменил(а) этот вызов";
+"resume_call" = "Возобновить";
+"call_transfer_to_user" = "Передача с %@";
+"call_consulting_with_user" = "Консультация с %@";
+"call_video_with_user" = "Видеовызов с %@";
+"call_voice_with_user" = "Голосовой вызов с %@";
+"call_ringing" = "Звонок…";
+"microphone_access_not_granted_for_voice_message" = "Голосовые сообщения требуют доступа к микрофону, но у %@ нет разрешения на его использование";
+"e2e_passphrase_too_short" = "Слишком короткая парольная фраза (Длина парольной фразы должна быть не менее %d символов)";
+"message_reply_to_sender_sent_a_voice_message" = "отправил(а) голосовое сообщение.";
+"attachment_large_with_resolution" = "Большой %@ (~%@)";
+"attachment_medium_with_resolution" = "Средний %@ (~%@)";
+"attachment_small_with_resolution" = "Маленький %@ (~%@)";
+"attachment_size_prompt_message" = "Это можно отключить в настройках.";
+"attachment_size_prompt_title" = "Подтвердите размер для отправки";
+"auth_reset_password_error_not_found" = "Не найдено";
+"auth_reset_password_error_unauthorized" = "Неавторизованный";
+"auth_invalid_user_name" = "Недопустимое имя пользователя";
+"auth_username_in_use" = "Имя пользователя занято";
+"rename" = "Переименовать";
+"room_displayname_all_other_members_left" = "%@ (Вышел)";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/si.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/si.lproj/MatrixKit.strings
new file mode 100644
index 000000000..5efc3e3d5
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/si.lproj/MatrixKit.strings
@@ -0,0 +1,25 @@
+
+
+"invite" = "ආරාධනා";
+"settings_title_notifications" = "දැනුම්දීම්";
+"notification_settings_sender_hint" = "@පරිශීලක:වසම.ලංකා";
+"login_password_placeholder" = "මුරපදය";
+"login_leave_fallback" = "අවලංගු කරන්න";
+"login_email_placeholder" = "වි-තැපැල් ලිපිනය";
+"login_identity_server_title" = "අනන්‍යතා සේවාදායකයේ ඒ.ස.නි.:";
+"login_home_server_info" = "ඔබගේ මූලික සේවාදායකය ඔබගේ සියලු සංවාද සහ ගිණුමේ දත්ත ගබඩා කරයි";
+"login_home_server_title" = "මූලික සේවාදායකයේ ඒ.ස.නි.:";
+"login_server_url_placeholder" = "ඒ.ස.නි.(URL) (උදා. https://matrix.org)";
+
+// Login Screen
+"login_create_account" = "ගිණුම සාදන්න:";
+/* *********************** */
+/*      iOS specific       */
+/* *********************** */
+
+"matrix" = "මැට්‍රික්ස්";
+"save" = "සුරකින්න";
+"cancel" = "අවලංගු කරන්න";
+"leave" = "හැරයන්න";
+"continue" = "ඉදිරියට";
+"back" = "ආපසු";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/sk.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/sk.lproj/MatrixKit.strings
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/sk.lproj/MatrixKit.strings
@@ -0,0 +1 @@
+
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/sq.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/sq.lproj/MatrixKit.strings
new file mode 100644
index 000000000..48323eea3
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/sq.lproj/MatrixKit.strings
@@ -0,0 +1,477 @@
+"matrix" = "Matrix";
+// Login Screen
+"login_create_account" = "Krijo llogari:";
+"login_server_url_placeholder" = "URL (p.sh. https://matrix.org)";
+"login_home_server_title" = "URL Shërbyesi Home:";
+"login_identity_server_title" = "URL Shërbyesi Identitetesh:";
+"login_password_placeholder" = "Fjalëkalim";
+"login_optional_field" = "opsionale";
+"login_email_placeholder" = "Adresë email";
+"login_prompt_email_token" = "Ju lutemi, jepni token-in tuaj të vleftësimit të email-it:";
+"login_error_title" = "Dështoi Hyrja";
+"login_error_registration_is_not_supported" = "Hëpërhë regjistrimet nuk mbulohen";
+"login_error_forbidden" = "Emër përdoruesi/fjalëkalim i pavlefshëm";
+"login_error_unknown_token" = "Token-i i hyrjeve i dhënë nuk u njoh";
+"login_error_bad_json" = "JSON e keqformuar";
+"login_error_not_json" = "S’përmbante JSON të vlefshëm";
+"login_error_user_in_use" = "Ky emër përdoruesi është i përdorur tashmë";
+"login_use_fallback" = "Përdor faqe <em>fallback</em>";
+"login_leave_fallback" = "Anuloje";
+"login_invalid_param" = "Parametër i pavlefshëm";
+"register_error_title" = "Regjistrimi Dështoi";
+"login_error_forgot_password_is_not_supported" = "Harrimi i fjalëkalimeve hëpërhë s’mbulohet";
+"login_mobile_device" = "Celular";
+"login_tablet_device" = "Tablet";
+"login_desktop_device" = "Desktop";
+// Action
+"no" = "Jo";
+"yes" = "Po";
+"abort" = "Ndërprite";
+"back" = "Mbrapsht";
+"close" = "Mbylle";
+"continue" = "Vazhdo";
+"discard" = "Hidhe Tej";
+"dismiss" = "Mos e merr parasysh";
+"retry" = "Riprovo";
+"sign_up" = "Regjistrohuni";
+"submit" = "Parashtroje";
+"set_default_power_level" = "Rikthe Shkallët e Pushtetit Te Parazgjedhja";
+"set_moderator" = "Caktojeni Moderator";
+"set_admin" = "Caktojeni Përgjegjës";
+"start_chat" = "Filloni Fjalosje";
+"start_voice_call" = "Nis Thirrje Audio";
+"start_video_call" = "Nis Thirrje Video";
+"mention" = "Përmendje";
+"select_account" = "Përzgjidhni një llogari";
+"attach_media" = "Bashkëngjitni media nga Mediateka";
+"capture_media" = "Bëni Foto/Video";
+"invite_user" = "Ftoni Përdorues matrix";
+"reset_to_default" = "Riktheje te parazgjedhjet";
+"resend_message" = "Ridërgoje mesazhin";
+"select_all" = "Përzgjidhe Krejt";
+"cancel_upload" = "Anuloje Ngarkimin";
+"cancel_download" = "Anuloje Shkarkimin";
+"show_details" = "Shfaq Hollësi";
+"answer_call" = "Përgjigjuni Thirrjes";
+"reject_call" = "Hidhe poshtë Thirrjen";
+"end_call" = "Përfundoje Thirrjen";
+"ignore" = "Shpërfille";
+"unignore" = "Hiqja shpërfilljen";
+// Events formatter
+"notice_avatar_changed_too" = "(u ndryshua edhe avatari)";
+"notice_room_name_removed" = "%@ hoqi emrin e dhomës";
+"notice_room_topic_removed" = "%@ hoqi temën";
+"notice_event_redacted" = "<redaktoi%@>";
+"notice_event_redacted_by" = " nga %@";
+"notice_event_redacted_reason" = " [arsye: %@]";
+"notice_profile_change_redacted" = "%@ përditësoi profilin e vet %@";
+"notice_room_created" = "%@ krijoi dhe formësoi dhomën.";
+"notice_room_join_rule" = "Rregulli për pjesëmarrje është: %@";
+"notice_room_power_level_intro" = "Shkallët e pushtetit të anëtarëve të dhomës janë:";
+"notice_room_aliases" = "Aliaset e dhomës janë: %@";
+"notice_room_related_groups" = "Grupet përshoqëruar kësaj dhome janë: %@";
+"notice_encrypted_message" = "Mesazhi i fshehtëzuar";
+"notice_encryption_enabled" = "%@ aktivizoi fshehtëzimin skaj-më-skaj (algoritëm %@)";
+"notice_image_attachment" = "bashkëngjitje figurash";
+"notice_audio_attachment" = "bashkëngjitje audio";
+"notice_video_attachment" = "bashkëngjitje videosh";
+"notice_file_attachment" = "bashkëngjitje kartelash";
+"notice_invalid_attachment" = "bashkëngjitje e pavlefshme";
+"notice_unsupported_attachment" = "Bashkëngjitje e pambuluar: %@";
+"notice_error_unsupported_event" = "Akt i pambuluar";
+"notice_error_unexpected_event" = "Akt i papritur";
+"notice_error_unknown_event_type" = "Lloj i panjohur akti";
+"notice_crypto_unable_to_decrypt" = "** S’arrihet të shfshehtëzohet: %@ **";
+// room display name
+"room_displayname_empty_room" = "Dhomë e zbrazët";
+"room_displayname_more_than_two_members" = "%@ dhe %@ të tjerë";
+// Settings
+"settings" = "Rregullime";
+"settings_enable_inapp_notifications" = "Aktivizoni njoftime Aplikacioni";
+"settings_enable_push_notifications" = "Aktivizoni njoftime push";
+"settings_enter_validation_token_for" = "Jepni token vleftësimi për %@:";
+"notification_settings_room_rule_title" = "Dhomë: '%@'";
+// Devices
+"device_details_title" = "Të dhëna sesioni\n";
+"device_details_name" = "Emër Publik\n";
+"device_details_identifier" = "ID\n";
+"device_details_last_seen" = "Parë së fundi më\n";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_rename_prompt_message" = "Emri publik i një sesioni është i dukshëm për persona me të cilët komunikoni";
+"device_details_delete_prompt_title" = "Mirëfilltësim";
+// Encryption information
+"room_event_encryption_info_title" = "Të dhëna fshehtëzimi skaj-më-skaj\n\n";
+"room_event_encryption_info_event" = "Të dhëna akti\n";
+"room_event_encryption_info_event_user_id" = "ID Përdoruesi\n";
+"room_event_encryption_info_event_identity_key" = "Kyç identiteti Curve25519\n";
+"room_event_encryption_info_event_algorithm" = "Algoritëm\n";
+"room_event_encryption_info_event_session_id" = "ID sesioni\n";
+"room_event_encryption_info_event_decryption_error" = "Gabim shfshehtëzimi\n";
+"room_event_encryption_info_event_unencrypted" = "të pafshehtëzuara";
+"room_event_encryption_info_event_none" = "asnjë";
+"room_event_encryption_info_device" = "\nTë dhëna sesioni dërguesi\n";
+"room_event_encryption_info_device_unknown" = "sesion i panjohur\n";
+"room_event_encryption_info_device_name" = "Emër Publik\n";
+"room_event_encryption_info_device_id" = "ID\n";
+"room_event_encryption_info_device_verification" = "Verifikim\n";
+"room_event_encryption_info_device_fingerprint" = "Shenja gishtash Ed25519\n";
+"room_event_encryption_info_device_verified" = "E verifikuar";
+"room_event_encryption_info_device_not_verified" = "JO e verifikuar";
+"room_event_encryption_info_device_blocked" = "Në Listë të Zezë";
+"room_event_encryption_info_verify" = "Verifikoni…";
+"room_event_encryption_info_block" = "Listë e zezë";
+"room_event_encryption_verify_title" = "Verifiko sesionin\n\n";
+"room_event_encryption_verify_ok" = "Verifikoje";
+// Account
+"account_save_changes" = "Ruaji ndryshimet";
+"account_link_email" = "Lidhni Email";
+"account_linked_emails" = "Email-e të lidhur";
+"account_email_validation_title" = "Verifikim Në Pritje të Miratimit";
+"account_msisdn_validation_title" = "Verifikim Në Pritje të Miratimit";
+"account_msisdn_validation_error" = "S’arrihet të verifikohet numër telefoni.";
+"account_error_display_name_change_failed" = "Ndryshimi i emrit të shfaqjes dështoi";
+"account_error_picture_change_failed" = "Ndryshimi i fotos dështoi";
+"account_error_matrix_session_is_not_opened" = "Sesioni Matrix s’është hapur";
+"account_error_email_wrong_title" = "Adresë Email e Pavlefshme";
+"account_error_email_wrong_description" = "Kjo s’duket se është adresë email e vlefshme";
+"account_error_msisdn_wrong_title" = "Numër Telefoni i Pavlefshëm";
+"account_error_msisdn_wrong_description" = "Ky s’duket të jetë numër telefoni i vlefshëm";
+// Room creation
+"room_creation_name_title" = "Emër dhome:";
+"room_creation_name_placeholder" = "(p.sh., Grupiiçajit)";
+"room_creation_alias_title" = "Alias dhome:";
+"room_creation_alias_placeholder" = "(p.sh. #kot:shembull.org)";
+"room_creation_alias_placeholder_with_homeserver" = "(p.sh. #kot%@)";
+"room_creation_participants_title" = "Pjesëmarrës:";
+// Room
+"room_please_select" = "Ju lutemi, përzgjidhni një dhomë";
+"room_error_join_failed_title" = "S’u arrit të hyhej në dhomë";
+"room_error_name_edition_not_authorized" = "S’jeni i autorizuar të përpunoni emrin e kësaj dhome";
+"room_error_topic_edition_not_authorized" = "S’jeni i autorizuar ta përpunoni temën e kësaj dhome";
+"room_error_cannot_load_timeline" = "S’u arrit të ngarkohej rrjedha kohore";
+"room_error_timeline_event_not_found_title" = "S’u arrit të ngarkohej pozicion rrjedhe kohore";
+"room_left" = "Dolët prej dhomës";
+// Attachment
+"attachment_size_prompt" = "Doni të dërgohet si:";
+"attachment_original" = "Madhësi Faktike (%@)";
+"attachment_small" = "E vogël (~ %@)";
+"attachment_medium" = "Mesatare (~%@)";
+"attachment_large" = "E madhe (~ %@)";
+"attachment_cancel_download" = "Të anulohet shkarkimi?";
+"attachment_cancel_upload" = "Të anulohet ngarkimin?";
+"attachment_multiselection_size_prompt" = "Doni të dërgoni figura si:";
+"attachment_multiselection_original" = "Madhësi Faktike";
+"attachment_e2e_keys_import" = "Importoni…";
+// Contacts
+"contact_mx_users" = "Përdorues të Matrix-it";
+"contact_local_contacts" = "Kontakte Vendore";
+// Groups
+"group_invite_section" = "Ftesa";
+"group_section" = "Grupe";
+// Search
+"search_no_results" = "S’ka Përfundime";
+"search_searching" = "Kërkim në ecuri e sipër…";
+// Time
+"format_time_s" = "s";
+"format_time_m" = "m";
+"format_time_h" = "h";
+"format_time_d" = "d";
+// E2E import
+"e2e_import_room_keys" = "Importo kyçe dhome";
+"e2e_import" = "Importo";
+"e2e_passphrase_enter" = "Jepni frazëkalimin";
+// E2E export
+"e2e_export_room_keys" = "Eksporto kyçe dhome";
+"e2e_export" = "Eksporto";
+"e2e_passphrase_confirm" = "Ripohoni frazëkalimin";
+"e2e_passphrase_empty" = "Frazëkalimi s’duhet të jetë i zbrazët";
+"e2e_passphrase_not_match" = "Frazëkalimet duhet të përputhen";
+// Others
+"user_id_title" = "ID Përdoruesi:";
+"offline" = "jo në linjë";
+"error" = "Gabim";
+"not_supported_yet" = "S’mbulohen ende";
+"default" = "parazgjedhje";
+"private" = "Private";
+"public" = "Publike";
+"power_level" = "Shkallë Pushteti";
+"user_id_placeholder" = "p.sh.: @beni:homeserver";
+"ssl_homeserver_url" = "URL Shërbyesi Home: %@";
+"local_contacts_access_discovery_warning_title" = "Zbulim përdoruesish";
+// Country picker
+"country_picker_title" = "Zgjidhni një vend";
+// Language picker
+"language_picker_title" = "Zgjidhni gjuhë";
+"language_picker_default_language" = "Parazgjedhje (%@)";
+"notice_room_invite" = "%@ ftoi %@";
+"notice_room_third_party_invite" = "%@ dërgoi një ftesë për %@ që të vijë te dhoma";
+"notice_room_third_party_registered_invite" = "%@ e pranoi ftesën për %@";
+"notice_room_join" = "%@ u bë pjesë";
+"notice_room_leave" = "%@ doli";
+"notice_room_reject" = "%@ hodhi tej ftesën";
+"notice_room_kick" = "%@ përzuri %@";
+"notice_room_ban" = "%@ dëboi %@";
+"notice_room_withdraw" = "%@ e tërhoqi ftesën për %@";
+"notice_room_reason" = ". Arsye: %@";
+"notice_avatar_url_changed" = "%@ ndryshoi avatarin e vet";
+"notice_display_name_set" = "%@ caktoi emrin e vet të ekranit si %@";
+"notice_display_name_changed_from" = "%@ ndryshoi emrin e vet të ekranit nga %@ në %@";
+"notice_display_name_removed" = "%@ hoqi emrin e vet të ekranit";
+"notice_topic_changed" = "%@ ndryshoi temën në \"%@\".";
+"notice_room_name_changed" = "%@ ndryshoi emrin e dhomës në %@.";
+"notice_placed_voice_call" = "%@ bëri një thirrje zanore";
+"notice_placed_video_call" = "%@ bëri një thirrje video";
+"notice_answered_video_call" = "%@ iu përgjigj thirrjes";
+"notice_ended_video_call" = "%@ e përfundoi thirrjen";
+"notice_conference_call_request" = "%@ kërkoi një konferencë VoIP";
+"notice_conference_call_started" = "Konferenca VoIP filloi";
+"notice_conference_call_finished" = "Konferenca VoIP përfundoi";
+// button names 
+"ok" = "OK";
+"cancel" = "Anuloje";
+"save" = "Ruaje";
+"leave" = "Dilni";
+"send" = "Dërgoje";
+"copy_button_name" = "Kopjoje";
+"resend" = "Ridërgoje";
+"set_power_level" = "Caktoni Shkallë Pushteti";
+"delete" = "Fshije";
+"view" = "Shiheni";
+// actions 
+"action_logout" = "Dalje";
+"create_room" = "Krijo Dhomë";
+"login" = "Hyrje";
+"create_account" = "Krijo Llogari";
+"membership_invite" = "I ftuar";
+"membership_leave" = "I ikur";
+"membership_ban" = "I dëbuar";
+"num_members_one" = "%@ përdorues";
+"num_members_other" = "%@ përdorues";
+"invite" = "Ftoje";
+"kick" = "Përzëre";
+"ban" = "Dëboje";
+"unban" = "Hiqja dëbimin";
+"message_unsaved_changes" = "Ka ndryshime të paruajtura. Ikja do të shkaktojë hedhjen tej të tyre.";
+// Login Screen 
+"login_error_already_logged_in" = "Tashmë i futur";
+"login_error_must_start_http" = "URL-ja duhet të fillojë me http[s]://";
+// room details dialog screen
+"room_details_title" = "Hollësi Dhome";
+// Settings screen 
+"settings_title_config" = "Formësim";
+"settings_title_notifications" = "Njoftime";
+// Notification settings screen 
+"notification_settings_disable_all" = "Çaktivizoji krejt njoftimet";
+"notification_settings_enable_notifications" = "Aktivizo njoftimet";
+"notification_settings_enable_notifications_warning" = "Krejt njoftimet hëpërhë janë çaktivizuar për krejt pajisjet.";
+"notification_settings_always_notify" = "Njoftomë përherë";
+"notification_settings_never_notify" = "Mos njofto kurrë";
+"notification_settings_word_to_match" = "fjalë për përputhje";
+"notification_settings_highlight" = "Theksoje";
+"notification_settings_custom_sound" = "Tingull vetjak";
+"notification_settings_sender_hint" = "@përdorues:përkatësi.com";
+"notification_settings_select_room" = "Përzgjidhni një dhomë";
+"notification_settings_other_alerts" = "Sinjalizime të Tjera";
+"notification_settings_contain_my_user_name" = "Njoftomë me tingull mbi mesazhe që përmbajnë emrin tim";
+"notification_settings_contain_my_display_name" = "Njoftomë me tingull mbi mesazhe që përmbajnë emrin tim të shfaqjes";
+"notification_settings_just_sent_to_me" = "Njoftomë me tingull mbi mesazhe dërguar vetëm për mua";
+"notification_settings_suppress_from_bots" = "Ndaloji njoftimet nga robotë";
+"notification_settings_by_default" = "Si parazgjedhje…";
+"notification_settings_notify_all_other" = "Njoftim për krejt mesazhet/dhomat e tjera";
+// gcm section 
+"settings_config_home_server" = "Shërbyes home: %@";
+"settings_config_identity_server" = "Shërbyes identitetesh: %@";
+"settings_config_user_id" = "ID Përdoruesi: %@";
+// call string
+"call_waiting" = "Po pritet…";
+"call_ended" = "Thirrja përfundoi";
+"call_ring" = "Po thirret…";
+"incoming_video_call" = "Thirrje Video Ardhëse";
+"incoming_voice_call" = "Thirrje Audio Ardhëse";
+"call_invite_expired" = "Ftesa Për Thirrje Skadoi";
+// unrecognized SSL certificate
+"ssl_trust" = "Besoje";
+"ssl_logout_account" = "Dalje";
+"ssl_remain_offline" = "Shpërfille";
+"ssl_fingerprint_hash" = "Shenja Gishtash (%@):";
+"ssl_could_not_verify" = "S’u verifikua dot identiteti i shërbyesit të largët.";
+"submit_code" = "Parashtroni kod";
+"notice_location_attachment" = "bashkëngjitje vendndodhjeje";
+"notice_redaction" = "%@ përpunoi një veprimtari (id: %@)";
+"notice_sticker" = "ngjitës";
+"unsent" = "Të padërguar";
+"network_error_not_reachable" = "Ju lutemi, kontrolloni aftësinë e lidhjes në rrjetin tuaj";
+"share" = "Ndajeni me të tjerët";
+"login_home_server_info" = "Shërbyesi juaj home depoziton krejt të dhënat e bisedave dhe llogarive tuaja";
+"login_identity_server_info" = "Matrix ofron shërbyes identiteti për të ndjekur se cilat email-e, etj, u përkasin ID-ve Matrix IDs. Hëpërhë ekziston vetëm https://matrix.org.";
+"login_user_id_placeholder" = "ID Matrix (p.sh. @poku:matrix.org ose poku)";
+"login_display_name_placeholder" = "Emër në ekran (p.sh. Mane Trimi)";
+"login_email_info" = "Përcaktimi i një adrese email i lejon përdoruesit e tjerë t’ju gjejnë më lehtë në Matrix, dhe do t’ju japë një rrugë për ricaktimin e fjalëkalimit tuaj në të ardhmen.";
+"login_error_no_login_flow" = "Dështuam në marrje të dhënash mirëfilltësimi nga ky Shërbyes Home";
+"login_error_do_not_support_login_flows" = "Hëpërhë nuk mbulojmë ndonjë ose krejt rrjedhat e hyrjeve të përkufizuara nga ky Shërbyes Home";
+"login_error_limit_exceeded" = "Janë dërguar shumë kërkesa";
+"login_error_login_email_not_yet" = "Lidhja email që s’është klikuar ende";
+"notice_room_power_level_acting_requirement" = "Shkallët minimum të pushtetit që duhet të ketë një përdorues përpara se të veprojë, janë:";
+"notice_room_power_level_event_requirement" = "Shkallët minimum të pushtetit që lidhen me aktet janë:";
+"notice_room_history_visible_to_anyone" = "%@ e bëri historikun e ardhshëm të dhomës të dukshëm për këdo.";
+"notice_room_history_visible_to_members" = "%@ e bëri historikun e ardhshëm të dhomës të dukshëm për krejt anëtarët e dhomës.";
+"notice_room_history_visible_to_members_from_invited_point" = "%@ e bëri historikun e ardhshëm të dhomës të dukshëm për krejt anëtarët e dhomës, prej çastit kur janë ftuar.";
+"notice_room_history_visible_to_members_from_joined_point" = "%@ e bëri historikun e ardhshëm të dhomës të dukshëm për krejt anëtarët e dhomës, prej çastit kur morën pjesë.";
+"notice_crypto_error_unknown_inbound_session_id" = "Sesioni i dërguesit nuk na ka dërguar kyçet për këtë mesazh.";
+"notice_in_reply_to" = "Në përgjigje të";
+"device_details_delete_prompt_message" = "Ky veprim lyp mirëfilltësim shtesë.\nQë të vazhdohet, ju lutemi, jepni fjalëkalimin tuaj.";
+"room_event_encryption_info_unverify" = "Hiqi verifikimin";
+"room_event_encryption_info_unblock" = "Hiqe nga listë e zezë";
+"room_event_encryption_verify_message" = "Që të verifikohet se ky sesion mund të besohet, ju lutemi, lidhuni me të zotin e tij duke përdorur ndonjë rrugë tjetër (p.sh., personalisht apo përmes një thirrjeje telefonike) dhe kërkojini nëse kyçi që sheh te Rregullimet e veta të Përdoruesit për këtë sesion përputhet me kyçin më poshtë:\n\n\tEmër sesioni: %@\n\tID sesioni: %@\n\tKyç sesioni: %@\n\nNëse përputhet, shtypni më poshtë butonin e verifikimit. Nëse jo, atëherë dikush tjetër është duke përgjuar këtë pajisje dhe do të donit më mirë të shtypnit butonin e kalimit në listë të zezë.\n\nNë të ardhmen ky proces verifikimi do të jetë më i sofistikuar.";
+"account_email_validation_message" = "Ju lutemi, kontrolloni email-in tuaj dhe klikoni mbi lidhjen që përmban. Pasi të jetë bërë kjo, klikoni që të vazhdohet.";
+"account_email_validation_error" = "S’arrihet të verifikohet adresë email. Ju lutemi, kontrolloni email-in tuaj dhe klikoni mbi lidhjen që përmban. Pasi të jetë bërë kjo, klikoni që të vazhdohet";
+"account_msisdn_validation_message" = "Kemi dërguar një SMS me një kod aktivizimi. Ju lutemi, jepeni këtë kod më poshtë.";
+"room_creation_participants_placeholder" = "(p.sh. @mane:homeserver1; @taku:homeserver2...)";
+"room_error_join_failed_empty_room" = "Hëpërhë s’është e mundur të hyhet në një dhomë të zbrazët.";
+"room_error_timeline_event_not_found" = "Aplikacioni u rrek të ngarkonte një pikë të dhënë prej rrjedhës kohore në këtë dhomë, por s’qe në gjendje ta gjente";
+"room_no_power_to_create_conference_call" = "Ju duhen leje për ftesa, që të nisni një konferencë në këtë dhomë";
+"room_no_conference_call_in_encrypted_rooms" = "Thirrjet konferencë nuk mbulohen në dhoma të fshehtëzuara";
+// Room members
+"room_member_ignore_prompt" = "Doni të fshihen krejt mesazhet nga ky përdorues?";
+"room_member_power_level_prompt" = "S’do të jeni në gjendje ta zhbëni këtë ndryshim, ngaqë po e promovoni përdoruesin të ketë të njëjtën shkallë pushteti si ju vetë.\nJeni i sigurt?";
+"attachment_e2e_keys_file_prompt" = "Kjo kartelë përmban kyçe fshehtëzimi të eksportur nga një klient Matrix.\nDoni të shihni lëndën e kartelës apo të importoni kyçet që ajo përmban?";
+"e2e_import_prompt" = "Ky proces ju lejon të importoni kyçe fshehtëzimi që keni eksportuar më parë nga një tjetër klient Matrix. Mandej do të jeni në gjendje të shfshehtëzoni çfarëdo mesazhesh që mund të shfshehtëzojë ai klient tjetër.\nKartela e eksportit është e mbrojtur me një frazëkalim. Që të shfshehtëzoni kartelën, duhet ta jepni frazëkalimin këtu.";
+"e2e_export_prompt" = "Ky proces ju lejon të eksportoni te një kartelë vendore kyçet për mesazhe që keni marrë në dhoma të fshehtëzuara. Mandej do të jeni në gjendje ta importoni kartelën te një tjetër klient Matrix në të ardhmen, që kështu ai klient të jetë në gjendje t’i fshehtëzojë këto mesazhe.\nKartela e eksportuar do t’i lejojë, cilitdo që mund ta lexojë, të shfshehtëzojë çfarëdo mesazhesh të fshehtëzuar që mund të shihni ju, ndaj duhet të bëni kujdes ta mbani të parrezikuar.";
+"error_common_message" = "Ndodhi një gabim. Ju lutemi, riprovoni më vonë.";
+// Permissions
+"camera_access_not_granted_for_call" = "Thirrjet video lypin përdorim të Kamerës, por %@ s’ka leje për ta përdorur";
+"microphone_access_not_granted_for_call" = "Thirrjet lypin përdorim të Mikrofonit, por %@ s’ka leje ta përdorë atë";
+"local_contacts_access_not_granted" = "Zbulimi i përdoruesve nga kontaktet vendore lyp hyrje te kontaktet tuaja, por %@ s’ka leje t’i përdorë ato";
+"local_contacts_access_discovery_warning" = "Që të mund të zbulojë kontakte që përdorin tashmë Matrix-in, %@ mund të dërgojë adresa email dhe numra telefonash nga libri juaj i adresave te shërbyesi juaj i zgjedhur i identiteteve Matrix. Kur kjo mbulohet, të dhënat personale fshehtëzohen, përpara dërgimit - për më tepër hollësi, ju lutemi kontrolloni rregulla privatësie të shërbyesit tuaj të identiteteve.";
+"notice_room_unban" = "%@ i hoqi dëbimin %@";
+"redact" = "Hiqe";
+// contacts list screen 
+"invitation_message" = "Do të doja të bisedoja me ju me Matrix. Për të pasur më tepër itë dhëna, ju lutem, vizitoni sajtin http://matrix.org.";
+"notification_settings_global_info" = "Rregullimet mbi njoftimet ruhen te llogaria juaj e përdoruesit dhe ndahen me krejt klientët që i mbulojnë ato (përfshi njoftimet në desktop).\n\nRregullat zbatohen sipas një radhe; rregulli i parë që ka përputhje përcakton lëndën për mesazhin.\nKështu: njoftimet sipas fjalësh janë më të rëndësishme se njoftimet sipas dhomash të cilat janë më të rëndësishme se njoftimet sipas dërguesish.\nFor multiple rules of the same kind, the first one in the list that matches takes priority.";
+"notification_settings_per_word_notifications" = "Njoftime sipas fjale";
+"notification_settings_per_word_info" = "Për fjalët përputhjet gjenden pa marrë parasysh shkrimin me të madhe apo të vogël, dhe mund të përfshijnë një shenjë të gjithëpushtetshme *. Kështu:\nkot përputhet me vargun kot të rrethuar nga përkufizues fjalësh (p.sh. shenja pikësimi apo hapësira, ose fillim/fund rreshti).\nkot* përputhet me çfarëdo fjale që fillon me kot.\n*kot* përputhet me çfarëdo fjale që përfshin 3 shkronjat kot.";
+"notification_settings_per_room_notifications" = "Njoftime sipas dhome";
+"notification_settings_per_sender_notifications" = "Njoftime sipas dërguesi";
+"notification_settings_invite_to_a_new_room" = "Njoftomë kur ftohem në një dhomë të re";
+"notification_settings_people_join_leave_rooms" = "Njoftomë kur vijnë ose ikin persona nga dhoma";
+"notification_settings_receive_a_call" = "Njoftomë kur marr një thirrje";
+"call_connecting" = "Po lidhet…";
+"ssl_cert_not_trust" = "Kjo mund të ishte shenjë se dikush po përgjon me dashakeqësi trafikun tuaj, ose se telefoni juaj nuk i beson dëshmisë së furnizuar nga shërbyesi i largët.";
+"ssl_cert_new_account_expl" = "Nëse përgjegjësi i shërbyesit ka thënë se kjo është e pritshme, sigurohuni që shenjat e gishtave më poshtë përputhen me shenjat e gishtave të furnizuara prej tyre.";
+"ssl_unexpected_existing_expl" = "Dëshmia ka ndryshuar nga ajo që qe besuar nga telefoni juaj. Kjo është SHUMË E PAZAKONTË. Këshillohet që TË MOS E PRANONI këtë dëshmi të re.";
+"ssl_expected_existing_expl" = "Dëshmia ka ndryshuar nga një e besueshme dikur në një që nuk besohet. Shërbyesi mund të ketë rinovuar dëshminë e tij. Lidhuni me përgjegjësin e shërbyesit për shenjat e pritshme të gishtave.";
+"ssl_only_accept" = "Pranojeni dëshminë VETËM nëse përgjegjësi i shërbyesit ka publikuar shenja gishtash që përputhen me ato më sipër.";
+"login_error_resource_limit_exceeded_title" = "U tejkalua Kufi Burimesh";
+"login_error_resource_limit_exceeded_message_default" = "Ky shërbyes home ka tejkaluar një nga kufijtë mbi burimet.";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "Ky shërbyes home ka tejkaluar kufirin Përdorues Aktivë Mujorë.";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nJu lutemi, që të vazhdoni të përdorni këtë shërbim, lidhuni me përgjegjësin e shërbimit tuaj.";
+"login_error_resource_limit_exceeded_contact_button" = "Lidhuni Me Përgjegjësin";
+"room_displayname_two_members" = "%@ dhe %@";
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "dërgoi një figurë.";
+"message_reply_to_sender_sent_a_video" = "dërgoi një video.";
+"message_reply_to_sender_sent_an_audio_file" = "dërgoi një kartelë audio.";
+"message_reply_to_sender_sent_a_file" = "dërgoi një kartelë.";
+"message_reply_to_message_to_reply_to_prefix" = "Në përgjigje të";
+"e2e_passphrase_create" = "Krijoni frazëkalim";
+"room_event_encryption_info_event_fingerprint_key" = "U pretendua për kyç Ed25519 shenjash gishtash\n";
+"notice_feedback" = "Akt dhënieje përshtypjesh (id: %@): %@";
+"account_error_push_not_allowed" = "Nuk lejohen njoftime";
+"notice_room_third_party_revoked_invite" = "%@ shfuqizoi ftesën për pjesëmarrje në dhomë për %@";
+"device_details_rename_prompt_title" = "Emër Sesioni";
+"notice_encryption_enabled_ok" = "%@ aktivizoi fshehtëzimin skaj-më-skaj.";
+"notice_encryption_enabled_unknown_algorithm" = "%1$@ aktivizoi fshehtëzimin skaj-më-skaj (algoritëm që s’është njohur %2$@).";
+// Notice Events with "You"
+"notice_room_invite_by_you" = "Ftuat %@";
+"notice_room_invite_you" = "Ju ftoi %@";
+"notice_room_third_party_invite_by_you" = "I dërguat %@ një ftesë të marrë pjesë te dhoma";
+"notice_room_third_party_registered_invite_by_you" = "Pranuat ftesën nga %@";
+"notice_room_third_party_revoked_invite_by_you" = "Shfuqizuat ftesën për ardhje në dhomë për %@";
+"notice_room_join_by_you" = "Erdhët";
+"notice_room_leave_by_you" = "Ikët";
+"notice_room_reject_by_you" = "Hodhët poshtë ftesën";
+"notice_room_kick_by_you" = "Përzutë %@";
+"notice_room_unban_by_you" = "Hoqët dëbimin për %@";
+"notice_room_ban_by_you" = "Dëbuat %@";
+"notice_room_withdraw_by_you" = "Tërhoqët mbrapsht ftesën për %@";
+"notice_avatar_url_changed_by_you" = "Ndryshuat avatarin tuaj";
+"notice_display_name_set_by_you" = "Caktuat si emrin tuaj në ekran %@";
+"notice_display_name_changed_from_by_you" = "Ndryshuat emrin tuaj në ekran nga %@ në %@";
+"notice_display_name_removed_by_you" = "Hoqët emrin tuaj në ekran";
+"notice_topic_changed_by_you" = "E ndryshuat temën në \"%@\".";
+"notice_room_name_changed_by_you" = "E ndryshuat emrin e dhomës në \"%@\".";
+"notice_placed_voice_call_by_you" = "Bëtë një thirrje zanore";
+"notice_placed_video_call_by_you" = "Bëtë një thirrje video";
+"notice_answered_video_call_by_you" = "Iu përgjigjët thirrjes";
+"notice_ended_video_call_by_you" = "E përfunduat thirrjen";
+"notice_conference_call_request_by_you" = "Kërkuat një konferencë VoIP";
+"notice_room_name_removed_by_you" = "Hoqët emrin e dhomës";
+"notice_room_topic_removed_by_you" = "Hoqët temën";
+"notice_event_redacted_by_you" = " nga ju";
+"notice_profile_change_redacted_by_you" = "Përditësuat profilin tuaj %@";
+"notice_room_created_by_you" = "Krijuat dhe formësuat dhomën.";
+"notice_encryption_enabled_ok_by_you" = "Aktivizuat fshehtëzimin skaj-më-skaj.";
+"notice_encryption_enabled_unknown_algorithm_by_you" = "Aktivizuat fshehtëzim skaj-më-skaj (algoritëm %@ i papranuar).";
+"notice_redaction_by_you" = "Redaktuat një akt (id: %@)";
+"notice_room_history_visible_to_anyone_by_you" = "E bëtë historikun e ardhshëm të dhomës të dukshëm për këdo.";
+"notice_room_history_visible_to_members_by_you" = "E bëtë historikun e ardhshëm të dhomës të dukshëm për krejt anëtarët e dhomës.";
+"notice_room_history_visible_to_members_from_invited_point_by_you" = "E bëtë historikun e ardhshëm të dhomës të dukshëm për krejt anëtarët e dhomës, nga çasti që janë ftuar.";
+"notice_room_history_visible_to_members_from_joined_point_by_you" = "E bëtë historikun e ardhshëm të dhomës të dukshëm për krejt anëtarët e dhomës, që nga çasti që bëhen pjesë e dhomës.";
+//  New
+"notice_room_join_rule_invite" = "%@ e bëri dhomën vetëm me ftesa.";
+"notice_room_join_rule_invite_by_you" = "E bëtë dhomën vetëm me ftesa.";
+"notice_room_join_rule_public" = "%@ e bëri dhomën publike.";
+"notice_room_join_rule_public_by_you" = "E bëtë dhomën publike.";
+"notice_room_name_removed_for_dm" = "%@ hoqi emrin";
+"notice_room_created_for_dm" = "%@ hyri.";
+"notice_room_join_rule_invite_for_dm" = "%@ e bëri këtë “vetëm me ftesa”.";
+"notice_room_join_rule_invite_by_you_for_dm" = "E bëtë këtë “vetëm me ftesa”.";
+"notice_room_join_rule_public_for_dm" = "%@ e bëri këtë publike.";
+"notice_room_join_rule_public_by_you_for_dm" = "E bëtë këtë publike.";
+"notice_room_power_level_intro_for_dm" = "Shkallë pushteti që kanë anëtarët:";
+"notice_room_aliases_for_dm" = "Aliaset janë: %@";
+"notice_room_history_visible_to_members_for_dm" = "%@ i bëri mesazhet e ardhshëm të dukshëm për krejt anëtarët e dhomës.";
+"notice_room_history_visible_to_members_from_invited_point_for_dm" = "%@ i bëri mesazhet e ardhshëm të dukshëm për këdo, që nga çasti që ftohen.";
+"notice_room_history_visible_to_members_from_joined_point_for_dm" = "%@ i bëri mesazhet e ardhshëm të dukshëm për këdo, që nga çasti bëhen pjesë e bisedës.";
+"room_left_for_dm" = "Dolët";
+"notice_room_third_party_invite_for_dm" = "%@ ftoi %@";
+"notice_room_third_party_revoked_invite_for_dm" = "%@ shfuqizoi ftesën për %@";
+"notice_room_name_changed_for_dm" = "%@ ndryshoi emrin në %@.";
+"notice_room_third_party_invite_by_you_for_dm" = "Ftuat %@";
+"notice_room_third_party_revoked_invite_by_you_for_dm" = "Shfuqizuar ftesën për %@";
+"notice_room_name_changed_by_you_for_dm" = "Ndryshuat emrin në %@.";
+"notice_room_name_removed_by_you_for_dm" = "Hoqët emrin";
+"notice_room_created_by_you_for_dm" = "Hytë.";
+"notice_room_history_visible_to_members_by_you_for_dm" = "I bëtë mesazhet e ardhshëm të dukshëm për krejt anëtarët e dhomës.";
+"notice_room_history_visible_to_members_from_invited_point_by_you_for_dm" = "I bëtë mesazhet e ardhshëm të dukshëm për këdo, nga çasti që ftohen.";
+"notice_room_history_visible_to_members_from_joined_point_by_you_for_dm" = "I bëtë mesazhet e ardhshëm të dukshëm për këdo, nga çasti që hyjnë në bisedë.";
+"resume_call" = "Rimerre";
+"call_holded" = "E mbajtët pezull thirrjen";
+"notice_declined_video_call" = "%@ e hodhi poshtë thirrjen";
+"notice_declined_video_call_by_you" = "E hodhët poshtë thirrjen";
+"call_remote_holded" = "%@ e mbajti pezull thirrjen";
+"call_more_actions_hold" = "Mbaje pezull";
+"call_more_actions_unhold" = "Rimerre";
+"call_more_actions_change_audio_device" = "Ndryshoni Pajisje Audio";
+"call_more_actions_audio_use_headset" = "Përdorni Kufje dhe Mikrofon";
+"call_more_actions_audio_use_device" = "Altoparlant Pajisjeje";
+"call_more_actions_transfer" = "Shpërngule";
+"call_more_actions_dialpad" = "Tastierë numerike";
+"call_transfer_to_user" = "Shpërngulje te %@";
+"call_consulting_with_user" = "Konsultim me %@";
+"call_video_with_user" = "Thirrje me video me %@";
+"call_voice_with_user" = "Thirrje me zë me %@";
+"call_ringing" = "Po i bihet ziles…";
+"e2e_passphrase_too_short" = "Frazëkalim shumë i shkurtër (Duhet të jetë e pakta %d shenja i gjatë)";
+"microphone_access_not_granted_for_voice_message" = "Mesazhet zanorë lypin përdorim të Mikrofonit, por %@ s’ka leje përdorimi të tij";
+"message_reply_to_sender_sent_a_voice_message" = "dërgoi një mesazh zanor.";
+"attachment_large_with_resolution" = "E madhe %@ (~%@)";
+"attachment_medium_with_resolution" = "Mesatare %@ (~%@)";
+"attachment_small_with_resolution" = "E vogël %@ (~%@)";
+"attachment_size_prompt_message" = "Këtë mund ta çaktivizoni te rregullimet.";
+"attachment_size_prompt_title" = "Ripohoni madhësi për dërgim";
+"auth_reset_password_error_not_found" = "S’u gjet";
+"auth_reset_password_error_unauthorized" = "I paautorizuar";
+"auth_username_in_use" = "Emër përdoruesi i përdorur";
+"auth_invalid_user_name" = "Emër i pavlefshëm përdoruesi";
+"rename" = "Riemërtojeni";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/sv.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/sv.lproj/MatrixKit.strings
new file mode 100644
index 000000000..317d36810
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/sv.lproj/MatrixKit.strings
@@ -0,0 +1,472 @@
+"matrix" = "Matrix";
+// Login Screen
+"login_create_account" = "Skapa konto:";
+"login_server_url_placeholder" = "URL (t.ex. https://matrix.org)";
+"login_home_server_title" = "Hemserver-URL:";
+"login_home_server_info" = "Din hemserver lagrar alla dina konversationer och din kontodata";
+"login_identity_server_title" = "Identitetsserver-URL:";
+"login_identity_server_info" = "Matrix tillhandahåller identitetsservrar för att spåra vilka e-postadresser o.s.v. som tillhör vilka Matrix-ID:n. Endast https://matrix.org finns för närvarande.";
+"login_user_id_placeholder" = "Matrix-ID (t.ex. @bob:matrix.org eller bob)";
+"login_password_placeholder" = "Lösenord";
+"login_optional_field" = "valfritt";
+"login_display_name_placeholder" = "Visningsnamn (t.ex. Sven Svensson)";
+"login_email_info" = "Genom att ange en e-postadress kan andra användare hitta dig på Matrix lättare, och det ger dig ett sätt att återställa ditt lösenord i framtiden.";
+"login_email_placeholder" = "E-postadress";
+"login_prompt_email_token" = "Ange din e-postvalideringstoken:";
+"login_error_title" = "Inloggning misslyckades";
+"login_error_no_login_flow" = "Vi misslyckades att hämta autentiseringsinformation från den här hemservern";
+"login_error_do_not_support_login_flows" = "För närvarande stöder vi inte några eller alla inloggningsflöden som har definierats av den här hemservern";
+"login_error_registration_is_not_supported" = "Registrering stöds inte för närvarande";
+"login_error_forbidden" = "Ogiltigt användarnamn eller lösenord";
+"login_error_unknown_token" = "Den åtkomsttoken som specificerades kändes inte igen";
+"login_error_bad_json" = "Felformaterad JSON";
+"login_error_not_json" = "Innehöll inte giltig JSON";
+"login_error_limit_exceeded" = "För många förfrågningar har skickats";
+"login_error_user_in_use" = "Det här användarnamnet har redan använts";
+"login_error_login_email_not_yet" = "E-postlänken har inte klickats än";
+"login_use_fallback" = "Använd reservsida";
+"login_leave_fallback" = "Avbryt";
+"login_invalid_param" = "Ogiltig parameter";
+"register_error_title" = "Registrering misslyckades";
+"login_error_forgot_password_is_not_supported" = "Lösenordsåterställning stöds ännu inte";
+"login_mobile_device" = "Mobil";
+"login_tablet_device" = "Surfplatta";
+"login_desktop_device" = "Skrivbord";
+"login_error_resource_limit_exceeded_title" = "Resursgräns överskriden";
+"login_error_resource_limit_exceeded_message_default" = "Hemservern har överskridit en av sina resursgränser.";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "Den här hemservern har nått sin gräns för aktiva användare per månad.";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nVänligen kontakta din tjänstadministratör för att fortsätta använda den här tjänsten.";
+"login_error_resource_limit_exceeded_contact_button" = "Kontakta administratör";
+// Action
+"no" = "Nej";
+"yes" = "Ja";
+"abort" = "Avbryt";
+"back" = "Tillbaka";
+"close" = "Stäng";
+"continue" = "Fortsätt";
+"discard" = "Släng";
+"dismiss" = "Avvisa";
+"retry" = "Försök igen";
+"sign_up" = "Bli medlem";
+"submit" = "Skicka";
+"submit_code" = "Skicka kod";
+"set_power_level" = "Sätt behörighetsnivå";
+"set_default_power_level" = "Återställ behörighetsnivå";
+"set_moderator" = "Sätt till moderator";
+"set_admin" = "Sätt till administratör";
+"start_chat" = "Starta chatt";
+"start_voice_call" = "Starta röstsamtal";
+"start_video_call" = "Starta videosamtal";
+"mention" = "Nämn";
+"select_account" = "Välj ett konto";
+"attach_media" = "Bifoga media från biblioteket";
+"capture_media" = "Ta bild/video";
+"invite_user" = "Bjud in Matrixanvändare";
+"reset_to_default" = "Återställ till standard";
+"resend_message" = "Skicka meddelandet igen";
+"select_all" = "Välj allt";
+"cancel_upload" = "Avbryt uppladdning";
+"cancel_download" = "Avbryt nedladdning";
+"show_details" = "Visa detaljer";
+"answer_call" = "Svara på samtal";
+"reject_call" = "Avvisa samtal";
+"end_call" = "Avsluta samtal";
+"ignore" = "Ignorera";
+"unignore" = "Avignorera";
+// Events formatter
+"notice_avatar_changed_too" = "(avataren ändrades också)";
+"notice_room_name_removed" = "%@ tog bort rumsnamnet";
+"notice_room_topic_removed" = "%@ tog bort ämnet";
+"notice_event_redacted" = "<dold%@>";
+"notice_event_redacted_by" = " av %@";
+"notice_event_redacted_reason" = " [anledning: %@]";
+"notice_profile_change_redacted" = "%@ uppdaterade sin profil %@";
+"notice_room_created" = "%@ skapade och konfigurerade rummet.";
+"notice_room_join_rule" = "Regeln för att gå med är: %@";
+"notice_room_power_level_intro" = "Behörighetsnivå för rumsmedlemmar är:";
+"notice_room_power_level_acting_requirement" = "Den minimala behörighetsnivån en användare behöver har innan den kan göra något är:";
+"notice_room_power_level_event_requirement" = "Den minimala behörighetsnivån relaterad till händelser är:";
+"notice_room_aliases" = "Rumsaliasen är: %@";
+"notice_room_related_groups" = "Grupperna associerade med det här rummet är: %@";
+"notice_encrypted_message" = "Krypterat meddelande";
+"notice_encryption_enabled_ok" = "%@ aktiverade totalsträckskryptering.";
+"notice_encryption_enabled_unknown_algorithm" = "%1$@ aktiverade totalsträckskryptering (okänd algoritm %2$@).";
+"notice_image_attachment" = "bildbilaga";
+"notice_audio_attachment" = "ljudbilaga";
+"notice_video_attachment" = "videobilaga";
+"notice_location_attachment" = "positionsbilaga";
+"notice_file_attachment" = "filbilaga";
+"notice_invalid_attachment" = "ogiltig bilaga";
+"notice_unsupported_attachment" = "Ostödd bilaga: %@";
+"notice_feedback" = "Återkopplingshändelse (id: %@): %@";
+"notice_redaction" = "%@ dolde en händelse (id: %@)";
+"notice_error_unsupported_event" = "Ostödd händelse";
+"notice_error_unexpected_event" = "Oväntad händelse";
+"notice_error_unknown_event_type" = "Okänd händelsetyp";
+"notice_room_history_visible_to_anyone" = "%@ gjorde framtida rumshistorik synlig för alla.";
+"notice_room_history_visible_to_members" = "%@ gjorde framtida rumshistorik synlig för alla rumsmedlemmar.";
+"notice_room_history_visible_to_members_from_invited_point" = "%@ gjorde framtida rumshistorik synlig för alla rumsmedlemmar från när de bjöds in.";
+"notice_room_history_visible_to_members_from_joined_point" = "%@ gjorde framtida rumshistorik synlig för alla rumsmedlemmar från när de gick med.";
+"notice_crypto_unable_to_decrypt" = "** Kunde inte avkryptera: %@ **";
+"notice_crypto_error_unknown_inbound_session_id" = "Avsändarens session har inte gett oss nycklarna för det här meddelandet.";
+"notice_sticker" = "dekal";
+"notice_in_reply_to" = "Svar på";
+// room display name
+"room_displayname_empty_room" = "Tomt rum";
+"room_displayname_two_members" = "%@ och %@";
+"room_displayname_more_than_two_members" = "%@ och %@ till";
+// Settings
+"settings" = "Inställningar";
+"settings_enable_inapp_notifications" = "Aktivera aviseringar i appen";
+"settings_enable_push_notifications" = "Aktivera pushnotiser";
+"settings_enter_validation_token_for" = "Ange valideringstoken för &@:";
+"notification_settings_room_rule_title" = "Rum: '%@'";
+// Devices
+"device_details_title" = "Sessionsinformation\n";
+"device_details_name" = "Offentligt namn\n";
+"device_details_identifier" = "ID\n";
+"device_details_last_seen" = "Senast sedd\n";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_rename_prompt_title" = "Sessionsnamn";
+"device_details_rename_prompt_message" = "En sessions offentliga namn är synligt för personer du kommunicerar med";
+"device_details_delete_prompt_title" = "Autentisering";
+"device_details_delete_prompt_message" = "Den här handlingen kräver ytterligare autentisering.\nFör att fortsätta, vänligen ange ditt lösenord.";
+// Encryption information
+"room_event_encryption_info_title" = "Totalsträckskrypteringsinformation\n\n";
+"room_event_encryption_info_event" = "Händelseinformation\n";
+"room_event_encryption_info_event_user_id" = "Användar-ID\n";
+"room_event_encryption_info_event_identity_key" = "Curve25519-identitetsnyckel\n";
+"room_event_encryption_info_event_fingerprint_key" = "Hävdad Ed25519-fingeravtrycksnyckel\n";
+"room_event_encryption_info_event_algorithm" = "Algoritm\n";
+"room_event_encryption_info_event_session_id" = "Sessions-ID\n";
+"room_event_encryption_info_event_decryption_error" = "Avkrypteringsfel\n";
+"room_event_encryption_info_event_unencrypted" = "okrypterad";
+"room_event_encryption_info_event_none" = "ingen";
+"room_event_encryption_info_device" = "\nAvsändarens sessionsinformation\n";
+"room_event_encryption_info_device_unknown" = "Okänd session\n";
+"room_event_encryption_info_device_name" = "Offentligt namn\n";
+"room_event_encryption_info_device_id" = "ID\n";
+"room_event_encryption_info_device_verification" = "Verifiering\n";
+"room_event_encryption_info_device_fingerprint" = "Ed25519-fingeravtryck\n";
+"room_event_encryption_info_device_verified" = "Verifierad";
+"room_event_encryption_info_device_not_verified" = "INTE verifierad";
+"room_event_encryption_info_device_blocked" = "Svartlistad";
+"room_event_encryption_info_verify" = "Verifiera…";
+"room_event_encryption_info_unverify" = "Avverifiera";
+"room_event_encryption_info_block" = "Svartlista";
+"room_event_encryption_info_unblock" = "Avsvartlista";
+"room_event_encryption_verify_title" = "Verifiera session\n\n";
+"room_event_encryption_verify_message" = "För att verifiera att denna session går att lita på, vänligen kontakta ägaren på annat sätt (t.ex. personligen eller med ett telefonsamtal) och fråga dem om nyckeln de ser i sina användarinställningar för den här sessionen matchar nyckeln nedan:\n\n\tSessionsnamn: %@\n\tSessions-ID: %@\n\tSessionsnyckel: %@\n\nOm de matchar, tryck på verifieringsknappen nedan. Om de inte gör det så betyder det att någon annan snappar upp denna session och du vill antagligen trycka på svartlistknappen istället.\n\nI framtiden kommer denna verifieringsprocess att bli mer sofistikerad.";
+"room_event_encryption_verify_ok" = "Verifiera";
+// Account
+"account_save_changes" = "Spara ändringar";
+"account_link_email" = "Länka e-post";
+"account_linked_emails" = "Länkade e-postadresser";
+"account_email_validation_title" = "Avvaktar verifiering";
+"account_email_validation_message" = "Vänligen kolla din e-post och klicka på länken den innehåller. När detta är klart, klicka fortsätt.";
+"account_email_validation_error" = "Kunde inte verifiera e-postadressen. Kontrollera din e-post och klicka på länken den innehåller. När detta är klart, klicka på fortsätt";
+"account_msisdn_validation_title" = "Avvaktar verifiering";
+"account_msisdn_validation_message" = "Vi har skickat ett SMS med en aktiveringskod. Ange den koden nedan.";
+"account_msisdn_validation_error" = "Kunde inte verifiera telefonnummer.";
+"account_error_display_name_change_failed" = "Byte av visningsnamn misslyckades";
+"account_error_picture_change_failed" = "Byte av bild misslyckades";
+"account_error_matrix_session_is_not_opened" = "Matrixsession har inte öppnats";
+"account_error_email_wrong_title" = "Ogiltig e-postadress";
+"account_error_email_wrong_description" = "Det här ser inte ut som en giltig e-postadress";
+"account_error_msisdn_wrong_title" = "Ogiltigt telefonnummer";
+"account_error_msisdn_wrong_description" = "Det här ser inte ut som ett giltigt telefonnummer";
+"account_error_push_not_allowed" = "Aviseringar tillåts inte";
+// Room creation
+"room_creation_name_title" = "Rumsnamn:";
+"room_creation_name_placeholder" = "(t.ex. lunchgrupp)";
+"room_creation_alias_title" = "Rumsalias:";
+"room_creation_alias_placeholder" = "(t.ex. #foo:exempel.org)";
+"room_creation_alias_placeholder_with_homeserver" = "(t.ex. #foo%@)";
+"room_creation_participants_title" = "Deltagare:";
+"room_creation_participants_placeholder" = "(t.ex. @sven:hemserver1; @anna:hemserver2…)";
+// Room
+"room_please_select" = "Vänligen välj ett rum";
+"room_error_join_failed_title" = "Misslyckades att gå med i rum";
+"room_error_join_failed_empty_room" = "Det går för närvarande inte att gå med i ett tomt rum.";
+"room_error_name_edition_not_authorized" = "Du är inte auktoriserad att redigera det här rummets namn";
+"room_error_topic_edition_not_authorized" = "Du är inte auktoriserad att ändra det här rummets ämne";
+"room_error_cannot_load_timeline" = "Misslyckades att ladda tidslinjen";
+"room_error_timeline_event_not_found_title" = "Misslyckades att ladda position på tidslinjen";
+"room_error_timeline_event_not_found" = "Appen försökte ladda en viss punkt i detta rums tidslinje men kunde inte hitta den";
+"room_left" = "Du lämnade rummet";
+"room_no_power_to_create_conference_call" = "Du behöver behörighet att bjuda in personer för att starta ett gruppsamtal i det här rummet";
+"room_no_conference_call_in_encrypted_rooms" = "Gruppsamtal stöds inte i krypterade rum";
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "skickade en bild.";
+"message_reply_to_sender_sent_a_video" = "skickade en video.";
+"message_reply_to_sender_sent_an_audio_file" = "skickade en ljudfil.";
+"message_reply_to_sender_sent_a_file" = "skickade en fil.";
+"message_reply_to_message_to_reply_to_prefix" = "Svar på";
+// Room members
+"room_member_ignore_prompt" = "Är du säker på att du vill dölja alla meddelande från den här användaren?";
+"room_member_power_level_prompt" = "Du kommer inte att kunna ångra denna ändring eftersom du befordrar användaren till samma behörighetsnivå som dig själv.\nÄr du säker?";
+// Attachment
+"attachment_size_prompt" = "Vill du skicka som:";
+"attachment_original" = "Faktisk storlek (%@)";
+"attachment_small" = "Liten (%@)";
+"attachment_medium" = "Mellan (%@)";
+"attachment_large" = "Stor (%@)";
+"attachment_cancel_download" = "Avbryt nedladdningen?";
+"attachment_cancel_upload" = "Avbryt uppladdningen?";
+"attachment_multiselection_size_prompt" = "Vill du skicka bilder som:";
+"attachment_multiselection_original" = "Faktisk storlek";
+"attachment_e2e_keys_file_prompt" = "Den här filen innehåller krypteringsnycklar som har exporteras från en Matrixklient.\nVill du visa filinnehållet eller importera nycklarna som den innehåller?";
+"attachment_e2e_keys_import" = "Importera…";
+// Contacts
+"contact_mx_users" = "Matrixanvändare";
+"contact_local_contacts" = "Lokala kontakter";
+// Groups
+"group_invite_section" = "Inbjudningar";
+"group_section" = "Grupper";
+// Search
+"search_no_results" = "Inga resultat";
+"search_searching" = "Sökning pågår…";
+// Time
+"format_time_s" = "s";
+"format_time_m" = "m";
+"format_time_h" = "t";
+"format_time_d" = "d";
+// E2E import
+"e2e_import_room_keys" = "Importera rumsnycklar";
+"e2e_import_prompt" = "Denna process låter dig importera krypteringsnycklar som du tidigare har exporterat från en annan Matrixklient. Du kommer då kunna avkryptera alla meddelanden som den andra klienten kan avkryptera.\nExportfilen är skyddad med en lösenfras. Du bör ange lösenfrasen här för att avkryptera filen.";
+"e2e_import" = "Importera";
+"e2e_passphrase_enter" = "Ange lösenfras";
+// E2E export
+"e2e_export_room_keys" = "Exportera rumsnycklar";
+"e2e_export_prompt" = "Denna process låter dig exportera nycklarna för meddelanden som du har fått i krypterade rum till en lokal fil. Du kommer då att kunna importera filen till en annan Matrixklient i framtiden, så att klienten också kan avkryptera dessa meddelanden.\nDen exporterade filen tillåter alla som kan läsa den att avkryptera alla krypterade meddelanden som du kan se, så du bör vara noga med att hålla den säker.";
+"e2e_export" = "Exportera";
+"e2e_passphrase_confirm" = "Bekräfta lösenfras";
+"e2e_passphrase_empty" = "Lösenfrasen får inte var tom";
+"e2e_passphrase_not_match" = "Lösenfraserna måste matcha";
+"e2e_passphrase_create" = "Skapa lösenfras";
+// Others
+"user_id_title" = "Användar-ID:";
+"offline" = "offline";
+"unsent" = "Oskickad";
+"error" = "Fel";
+"error_common_message" = "Ett fel inträffade. Försök igen senare.";
+"not_supported_yet" = "Stöds inte än";
+"default" = "förval";
+"private" = "Privat";
+"public" = "Offentlig";
+"power_level" = "Behörighetsnivå";
+"network_error_not_reachable" = "Vänligen kolla din nätverksuppkoppling";
+"user_id_placeholder" = "t.ex.: @sven:hemserver";
+"ssl_homeserver_url" = "Hemserver-URL: %@";
+// Permissions
+"camera_access_not_granted_for_call" = "Videosamtal kräver åtkomst till kameran men %@ har inte behörighet att använda den";
+"microphone_access_not_granted_for_call" = "Samtal kräver åtkomst till mikrofonen men %@ har inte behörighet att använda den";
+"local_contacts_access_not_granted" = "Upptäckt av användare från lokala kontakter kräver åtkomst till dina kontakter men %@ har inte behörighet att komma åt dem";
+"local_contacts_access_discovery_warning_title" = "Användarupptäckt";
+"local_contacts_access_discovery_warning" = "För att upptäcka kontakter som redan använder Matrix kan %@ skicka e-postadresser och telefonnummer i din adressbok till din valda Matrixidentitetsserver. Där det stöds hashas personuppgifter innan de skickas - kontrollera din identitetsservers integritetspolicy för mer information.";
+// Country picker
+"country_picker_title" = "Välj ett land";
+// Language picker
+"language_picker_title" = "Välj ett språk";
+"language_picker_default_language" = "Förval (%@)";
+"notice_room_invite" = "%@ bjöd in %@";
+"notice_room_third_party_invite" = "%@ skickade bjöd in %@ att gå med i rummet";
+"notice_room_third_party_registered_invite" = "%@ accepterade inbjudan för %@";
+"notice_room_third_party_revoked_invite" = "%@ drog tillbaka inbjudan för %@ att gå med i rummet";
+"notice_room_join" = "%@ gick med";
+"notice_room_leave" = "%@ lämnade";
+"notice_room_reject" = "%@ avvisade inbjudan";
+"notice_room_kick" = "%@ kickade %@";
+"notice_room_unban" = "%@ avbannade %@";
+"notice_room_ban" = "%@ bannade %@";
+"notice_room_withdraw" = "%@ drog tillbaka inbjudan för %@";
+"notice_room_reason" = ". Anledning: %@";
+"notice_avatar_url_changed" = "%@ bytte sin avatar";
+"notice_display_name_set" = "%@ satte sitt visningsnamn till %@";
+"notice_display_name_changed_from" = "%@ bytte sitt visningsnamn från %@ till %@";
+"notice_display_name_removed" = "%@ tog bort sitt visningsnamn";
+"notice_topic_changed" = "%@ bytte ämnet till \"%@\".";
+"notice_room_name_changed" = "%@ bytte rummets namn till %@.";
+"notice_placed_voice_call" = "%@ startade ett röstsamtal";
+"notice_placed_video_call" = "%@ startade ett videosamtal";
+"notice_answered_video_call" = "%@ svarade på samtalet";
+"notice_ended_video_call" = "%@ avslutade samtalet";
+"notice_conference_call_request" = "%@ begärde ett VoIP-gruppsamtal";
+"notice_conference_call_started" = "VoIP-gruppsamtal startat";
+"notice_conference_call_finished" = "VoIP-gruppsamtal avslutat";
+// Notice Events with "You"
+"notice_room_invite_by_you" = "Du bjöd in %@";
+"notice_room_invite_you" = "%@ bjöd in dig";
+"notice_room_third_party_invite_by_you" = "Du bjöd in %@ att gå med i rummet";
+"notice_room_third_party_registered_invite_by_you" = "Du accepterade inbjudan för %@";
+"notice_room_third_party_revoked_invite_by_you" = "Du drog tillbaka inbjudan för %@ att gå med i rummet";
+"notice_room_join_by_you" = "Du gick med";
+"notice_room_leave_by_you" = "Du lämnade";
+"notice_room_reject_by_you" = "Du avvisade inbjudan";
+"notice_room_kick_by_you" = "Du kickade %@";
+"notice_room_unban_by_you" = "Du avbannade %@";
+"notice_room_ban_by_you" = "Du bannade %@";
+"notice_room_withdraw_by_you" = "Du drog tillbaka inbjudan för %@";
+"notice_avatar_url_changed_by_you" = "Du ändrade din avatar";
+"notice_display_name_set_by_you" = "Du bytte ditt visningsnamn till %@";
+"notice_display_name_changed_from_by_you" = "Du bytte ditt visningsnamn från %@ till %@";
+"notice_display_name_removed_by_you" = "Du tog bort ditt visningsnamn";
+"notice_topic_changed_by_you" = "Du bytte ämnet till \"%@\".";
+"notice_room_name_changed_by_you" = "Du bytte rummets namn till %@.";
+"notice_placed_voice_call_by_you" = "Du startade ett röstsamtal";
+"notice_placed_video_call_by_you" = "Du startade ett videosamtal";
+"notice_answered_video_call_by_you" = "Du svarade på samtalet";
+"notice_ended_video_call_by_you" = "Du avslutade samtalet";
+"notice_conference_call_request_by_you" = "Du begärde ett VoIP-gruppsamtal";
+"notice_room_name_removed_by_you" = "Du tog bort rummets namn";
+"notice_room_topic_removed_by_you" = "Du tog bort ämnet";
+"notice_event_redacted_by_you" = " av dig";
+"notice_profile_change_redacted_by_you" = "Du uppdaterade din profil %@";
+"notice_room_created_by_you" = "Du skapade och konfigurerade rummet.";
+"notice_encryption_enabled_ok_by_you" = "Du aktiverade totalsträckskryptering.";
+"notice_encryption_enabled_unknown_algorithm_by_you" = "Du aktiverade totalsträckskryptering (okänd algoritm %@).";
+"notice_redaction_by_you" = "Du dolde en händelse (id: %@)";
+"notice_room_history_visible_to_anyone_by_you" = "Du gjorde framtida rumshistorik synlig för alla.";
+"notice_room_history_visible_to_members_by_you" = "Du gjorde framtida rumshistorik synlig för alla rumsmedlemmar.";
+"notice_room_history_visible_to_members_from_invited_point_by_you" = "Du gjorde framtida rumshistorik synlig för alla rumsmedlemmar från när de bjöds in.";
+"notice_room_history_visible_to_members_from_joined_point_by_you" = "Du gjorde framtida rumshistorik synlig för alla rumsmedlemmar från när de gick med.";
+// button names 
+"ok" = "OK";
+"cancel" = "Avbryt";
+"save" = "Spara";
+"leave" = "Lämna";
+"send" = "Skicka";
+"copy_button_name" = "Kopiera";
+"resend" = "Skicka igen";
+"redact" = "Ta bort";
+"share" = "Dela";
+"delete" = "Radera";
+"view" = "Visa";
+// actions 
+"action_logout" = "Logga ut";
+"create_room" = "Skapa rum";
+"login" = "Logga in";
+"create_account" = "Skapa konto";
+"membership_invite" = "Inbjuden";
+"membership_leave" = "Lämnade";
+"membership_ban" = "Bannade";
+"num_members_one" = "%@ användare";
+"num_members_other" = "%@ användare";
+"invite" = "Bjud in";
+"kick" = "Kicka";
+"ban" = "Banna";
+"unban" = "Avbanna";
+"message_unsaved_changes" = "Det finns osparade ändringar. Att lämna kommer att slänga dem.";
+// Login Screen 
+"login_error_already_logged_in" = "Redan inloggad";
+"login_error_must_start_http" = "URL:en måste börja på http[s]://";
+// room details dialog screen
+"room_details_title" = "Rumsdetaljer";
+// contacts list screen 
+"invitation_message" = "Jag vill chatta med dig på Matrix. Besök sidan https://matrix.org för mer information.";
+// Settings screen 
+"settings_title_config" = "Konfiguration";
+"settings_title_notifications" = "Aviseringar";
+// Notification settings screen 
+"notification_settings_disable_all" = "Inaktivera alla aviseringar";
+"notification_settings_enable_notifications" = "Aktivera aviseringar";
+"notification_settings_enable_notifications_warning" = "Alla aviseringar är för närvarande inaktiverade för alla enheter.";
+"notification_settings_global_info" = "Aviseringsinställningar sparas i ditt användarkonto och delas mellan alla klienter som stöder dem (inklusive skrivbordsaviseringar).\n\nRegler tillämpas i ordning; den första regeln som matchar definierar resultatet för meddelandet.\nSå: Aviseringar per ord är viktigare än aviseringar per rum som är viktigare än aviseringar per avsändare.\nFör flera regler av samma slag prioriteras den första i listan som matchar.";
+"notification_settings_per_word_notifications" = "Aviseringar per ord";
+"notification_settings_per_word_info" = "Matchning av ord är inte skiftlägeskänsligt, och kan innehålla ett jokertecken (*). Så:\nfoo matchar strängen foo omgiven av ordavgränsare (t.ex. skiljetecken och mellanslag eller start/slut på rad).\nfoo* matchar alla ord som börjar foo.\n*foo* matchar alla ord som innehåller de tre bokstäverna foo.";
+"notification_settings_always_notify" = "Avisera alltid";
+"notification_settings_never_notify" = "Avisera aldrig";
+"notification_settings_word_to_match" = "ord att matcha";
+"notification_settings_highlight" = "Markera";
+"notification_settings_custom_sound" = "Anpassade ljud";
+"notification_settings_per_room_notifications" = "Aviseringar per rum";
+"notification_settings_per_sender_notifications" = "Aviseringar per avsändare";
+"notification_settings_sender_hint" = "@användare:domän.com";
+"notification_settings_select_room" = "Välj ett rum";
+"notification_settings_other_alerts" = "Andra larm";
+"notification_settings_contain_my_user_name" = "Avisera mig med ett ljud om meddelande som innehåller mitt användarnamn";
+"notification_settings_contain_my_display_name" = "Avisera mig med ett ljud om meddelande som innehåller mitt visningsnamn";
+"notification_settings_just_sent_to_me" = "Avisera med ett ljud om meddelanden skickade till bara mig";
+"notification_settings_invite_to_a_new_room" = "Avisera mig när jag bjuds in till ett nytt rum";
+"notification_settings_people_join_leave_rooms" = "Avisera mig när personer går med i eller lämnar rum";
+"notification_settings_receive_a_call" = "Avisera mig när jag får ett samtal";
+"notification_settings_suppress_from_bots" = "Dämpa aviseringar från bottar";
+"notification_settings_by_default" = "Som förval…";
+"notification_settings_notify_all_other" = "Avisera för alla andra meddelanden/rum";
+// gcm section 
+"settings_config_home_server" = "Hemserver: %@";
+"settings_config_identity_server" = "Identitetsserver: %@";
+"settings_config_user_id" = "Användar-ID: %@";
+// call string
+"call_waiting" = "Väntar…";
+"call_connecting" = "Ansluter…";
+"call_ended" = "Samtal avslutat";
+"call_ring" = "Ringer…";
+"incoming_video_call" = "Inkommande videosamtal";
+"incoming_voice_call" = "Inkommande röstsamtal";
+"call_invite_expired" = "Samtalsinbjudan har löpt ut";
+// unrecognized SSL certificate
+"ssl_trust" = "Lita";
+"ssl_logout_account" = "Logga ut";
+"ssl_remain_offline" = "Ignorera";
+"ssl_fingerprint_hash" = "Fingeravtryck (%@):";
+"ssl_could_not_verify" = "Kunde inte verifiera fjärrserverns identitet.";
+"ssl_cert_not_trust" = "Det kan betyda att någon genskjuter din trafik eller att din telefon inte litar på certifikatet från fjärrservern.";
+"ssl_cert_new_account_expl" = "Om serveradministratören har sagt att detta förväntas, kolla att fingeravtrycket nedan matchar det fingeravtryck som de tillhandahåller.";
+"ssl_unexpected_existing_expl" = "Certifikatet har ändrats från ett som din telefon litade på. Detta är MYCKET OVANLIGT. Det rekommenderas att du INTE ACCEPTERAR detta nya certifikat.";
+"ssl_expected_existing_expl" = "Certifikatet har ändrats från ett som din telefon litade på till ett som inte är betrott. Servern kan ha förnyat sitt certifikat. Kontakta serveradministratören för det förväntade fingeravtrycket.";
+"ssl_only_accept" = "Acceptera ENDAST certifikatet om serveradministratören har publicerat ett fingeravtryck som matchar ovanstående.";
+"notice_room_name_removed_for_dm" = "%@ tog bort namnet";
+"notice_room_created_for_dm" = "%@ gick med.";
+//  New
+"notice_room_join_rule_invite" = "%@ ändrade rummet till endast inbjudna.";
+"notice_room_join_rule_invite_for_dm" = "%@ ändrade detta till endast inbjudna.";
+"notice_room_join_rule_invite_by_you" = "Du ändrade rummet till endast inbjudna.";
+"notice_room_join_rule_invite_by_you_for_dm" = "Du ändrade detta till endast inbjudna.";
+"notice_room_join_rule_public" = "%@ gjorde rummet offentligt.";
+"notice_room_join_rule_public_for_dm" = "%@ gjorde detta offentligt.";
+"notice_room_join_rule_public_by_you" = "Du gjorde rummet offentligt.";
+"notice_room_join_rule_public_by_you_for_dm" = "Du gjorde detta offentligt.";
+"notice_room_power_level_intro_for_dm" = "Behörighetsnivå för medlemmar är:";
+"notice_room_aliases_for_dm" = "Aliasen är: %@";
+"notice_room_history_visible_to_members_for_dm" = "%@ gjorde framtida meddelanden synliga för alla rumsmedlemmar.";
+"notice_room_history_visible_to_members_from_invited_point_for_dm" = "%@ gjorde framtida meddelanden synliga för alla från när de bjöds in.";
+"notice_room_history_visible_to_members_from_joined_point_for_dm" = "%@ gjorde framtida meddelanden synliga för alla från när de gick med.";
+"room_left_for_dm" = "Du lämnade";
+"notice_room_third_party_invite_for_dm" = "%@ bjöd in %@";
+"notice_room_third_party_revoked_invite_for_dm" = "%@ drog tillbaka inbjudan för %@";
+"notice_room_name_changed_for_dm" = "%@ bytte namnet till %@.";
+"notice_room_third_party_invite_by_you_for_dm" = "Du bjöd in %@";
+"notice_room_third_party_revoked_invite_by_you_for_dm" = "Du drog tillbaka inbjudan för %@";
+"notice_room_name_changed_by_you_for_dm" = "Du bytte namnet till %@.";
+"notice_room_name_removed_by_you_for_dm" = "Du tog bort namnet";
+"notice_room_created_by_you_for_dm" = "Du gick med.";
+"notice_room_history_visible_to_members_by_you_for_dm" = "Du gjorde framtida meddelanden synliga för alla rumsmedlemmar.";
+"notice_room_history_visible_to_members_from_invited_point_by_you_for_dm" = "Du gjorde framtida meddelanden synliga för alla från när de bjöds in.";
+"notice_room_history_visible_to_members_from_joined_point_by_you_for_dm" = "Du gjorde framtida meddelanden synliga för alla från när de gick med.";
+"call_more_actions_dialpad" = "Knappsats";
+"call_more_actions_transfer" = "Överför";
+"call_more_actions_audio_use_device" = "Enhetshögtalare";
+"call_more_actions_audio_use_headset" = "Använd headsetljud";
+"call_more_actions_change_audio_device" = "Byt ljudenhet";
+"call_more_actions_unhold" = "Återuppta";
+"call_more_actions_hold" = "Parkera";
+"call_holded" = "Du parkerade samtalet";
+"call_remote_holded" = "%@ parkerade samtalet";
+"notice_declined_video_call_by_you" = "Du avslog samtalet";
+"notice_declined_video_call" = "%@ avslog samtalet";
+"resume_call" = "Återuppta";
+"call_transfer_to_user" = "Överför till %@";
+"call_consulting_with_user" = "Rådfrågar %@";
+"call_video_with_user" = "Videosamtal med %@";
+"call_voice_with_user" = "Röstsamtal med %@";
+"call_ringing" = "Ringer…";
+"e2e_passphrase_too_short" = "Lösenfras för kort (den måste vara minst %d tecken långt)";
+"microphone_access_not_granted_for_voice_message" = "Röstmeddelanden kräver åtkomst till mikrofonen, men %@ har inte behörighet att använda den";
+"message_reply_to_sender_sent_a_voice_message" = "skickade ett röstmeddelande.";
+"attachment_large_with_resolution" = "Stor %@ (~%@)";
+"attachment_medium_with_resolution" = "Mellan %@ (~%@)";
+"attachment_small_with_resolution" = "Liten %@ (~%@)";
+"attachment_size_prompt_message" = "Du kan stänga av detta i inställningarna.";
+"attachment_size_prompt_title" = "Bekräfta storlek att skicka";
+"room_displayname_all_other_participants_left" = "%@ (Kvar)";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/szl.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/szl.lproj/MatrixKit.strings
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/szl.lproj/MatrixKit.strings
@@ -0,0 +1 @@
+
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/tzm.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/tzm.lproj/MatrixKit.strings
new file mode 100644
index 000000000..f1a0a2a8f
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/tzm.lproj/MatrixKit.strings
@@ -0,0 +1,14 @@
+
+
+
+"notice_event_redacted_by" = " Sɣur %@";
+"close" = "Rgel";
+"yes" = "Yah";
+
+// Action
+"no" = "Uhu";
+/* *********************** */
+/*      iOS specific       */
+/* *********************** */
+
+"matrix" = "Matrix";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/uk.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/uk.lproj/MatrixKit.strings
new file mode 100644
index 000000000..f9ca88a63
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/uk.lproj/MatrixKit.strings
@@ -0,0 +1,534 @@
+
+
+"resend" = "Повторно надіслати";
+"delete" = "Видалити";
+"share" = "Поділитися";
+"redact" = "Вилучити";
+"copy_button_name" = "Копіювати";
+"send" = "Надіслати";
+"register_error_title" = "Поле реєстрації";
+"login_invalid_param" = "Недійсний параметр";
+"save" = "Зберегти";
+"login_leave_fallback" = "Скасувати";
+"cancel" = "Скасувати";
+"submit" = "Надіслати";
+"sign_up" = "Зареєструватися";
+"retry" = "Повторити";
+"unban" = "Розблокувати";
+"ban" = "Заблокувати";
+"kick" = "Викинути";
+"invite" = "Запросити";
+"leave" = "Вийти";
+"discard" = "Відхилити";
+"continue" = "Продовжити";
+"close" = "Закрити";
+"back" = "Назад";
+"view" = "Вигляд";
+"login_server_url_placeholder" = "URL (наприклад, https://matrix.org)";
+
+// Login Screen
+"login_create_account" = "Створіть обліковий запис:";
+/* *********************** */
+/*      iOS specific       */
+/* *********************** */
+
+"matrix" = "Matrix";
+
+// Events formatter
+"notice_avatar_changed_too" = "(аватар теж змінено)";
+"unignore" = "Не нехтувати";
+"ignore" = "Нехтувати";
+"resume_call" = "Продовжити";
+"end_call" = "Завершити виклик";
+"reject_call" = "Відхилити виклик";
+"answer_call" = "Відповісти на виклик";
+"show_details" = "Показати подробиці";
+"cancel_download" = "Скасувати завантаження";
+"cancel_upload" = "Скасувати вивантаження";
+"select_all" = "Вибрати всі";
+"resend_message" = "Повторити надсилання повідомлення";
+"reset_to_default" = "Скинути до типових";
+"invite_user" = "Запросити користувача matrix";
+"capture_media" = "Зробити знімок/зафільмувати";
+"attach_media" = "Долучити медіа з бібліотеки";
+"select_account" = "Вибрати обліковий запис";
+"mention" = "Згадати";
+"start_video_call" = "Розпочати відеовиклик";
+"start_voice_call" = "Розпочати голосовий виклик";
+"start_chat" = "Почати бесіду";
+"set_admin" = "Призначити адміністратора";
+"set_moderator" = "Призначити модератора";
+"set_default_power_level" = "Скинути рівень повноважень";
+"set_power_level" = "Визначити рівень повноважень";
+"submit_code" = "Надіслати код";
+"dismiss" = "Відхилити";
+"abort" = "Перервати";
+"yes" = "Так";
+
+// Action
+"no" = "Ні";
+"login_error_resource_limit_exceeded_contact_button" = "Зв'язатися з адміністратором";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nЗверніться до адміністратора своєї служби, щоб продовжувати користуватися нею.";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "Цей домашній сервер досяг свого місячного обмеження активних користувачів.";
+"login_error_resource_limit_exceeded_message_default" = "Цей домашній сервер перевищив одне з обмежень ресурсів.";
+"login_error_resource_limit_exceeded_title" = "Обмеження ресурсів перевищено";
+"login_desktop_device" = "Комп'ютер";
+"login_tablet_device" = "Планшет";
+"login_mobile_device" = "Мобільний";
+"login_error_forgot_password_is_not_supported" = "Відновлення пароля зараз не підтримується";
+"login_use_fallback" = "Застосувати запасну сторінку";
+"login_error_login_email_not_yet" = "Посилання на електронну адресу, на яке ще не клацнули";
+"login_error_user_in_use" = "Це ім'я користувача вже використовується";
+"login_error_limit_exceeded" = "Було надіслано забагато запитів";
+"login_error_not_json" = "Не містить дійсного JSON";
+"login_error_bad_json" = "Неправильний синтаксис JSON";
+"login_error_unknown_token" = "Вказаний ключ доступу не було розпізнано";
+"login_error_forbidden" = "Не правильне ім'я користувача/пароль";
+"login_error_registration_is_not_supported" = "На цей час реєстрація не підтримується";
+"login_error_no_login_flow" = "Не вдалося отримати дані автентифікації з цього домашнього сервера";
+"login_error_title" = "Не вдалося увійти";
+"login_prompt_email_token" = "Введіть ключ підтвердження електронної пошти:";
+"login_email_placeholder" = "Адреса е-пошти";
+"login_email_info" = "Вкажіть адресу електронної пошти, щоб інші користувачі могли легше знаходити вас на Matrix і надання вам можливості відновити пароль у майбутньому.";
+"login_display_name_placeholder" = "Видиме ім'я (наприклад Bob Obson)";
+"login_optional_field" = "необов'язково";
+"login_password_placeholder" = "Пароль";
+"login_user_id_placeholder" = "Ідентифікатор Matrix (наприклад @bob:matrix.org або bob)";
+"login_identity_server_info" = "Matrix забезпечує сервери ідентифікації для відстеження, до яких ідентифікаторів Matrix, які електронні листи належать. Наразі доступно лише для https://matrix.org.";
+"login_identity_server_title" = "URL-адреса сервера ідентифікації:";
+"login_home_server_info" = "Ваш домашній сервер зберігає всі ваші розмови та дані облікового запису";
+"login_home_server_title" = "URL-адреса домашнього сервера:";
+"notice_room_power_level_intro_for_dm" = "Рівні повноважень учасників:";
+"notice_room_power_level_intro" = "Рівні повноважень учасників кімнати:";
+"notice_room_join_rule_public_by_you_for_dm" = "Ви дозволяєте доступ всім.";
+"notice_room_join_rule_public_by_you" = "Ви дозволяєте доступ до кімнати всім.";
+"notice_room_join_rule_public_for_dm" = "%@ дозволяє доступ всім.";
+"notice_room_join_rule_public" = "%@ дозволяє доступ до кімнати всім.";
+"notice_room_join_rule_invite_by_you_for_dm" = "Ви забороняєте доступ всім, окрім запрошених.";
+"notice_room_join_rule_invite_by_you" = "Ви забороняєте доступ до кімнати всім, окрім запрошених.";
+//  New
+"notice_room_join_rule_invite" = "%@ забороняє доступ до кімнати всім, окрім запрошених.";
+"notice_room_join_rule_invite_for_dm" = "%@ забороняє доступ всім, окрім запрошених.";
+//  Old
+"notice_room_join_rule" = "Правило приєднання: %@";
+"notice_room_created_for_dm" = "%@ приєднується.";
+"notice_room_created" = "%@ створює і налаштовує кімнату.";
+"notice_profile_change_redacted" = "%@ оновлює свій профіль %@";
+"notice_event_redacted_reason" = " [причина: %@]";
+"notice_event_redacted_by" = " від %@";
+"notice_event_redacted" = "<змінено%@>";
+"notice_room_topic_removed" = "%@ вилучає тему";
+"notice_room_name_removed_for_dm" = "%@ вилучає назву";
+"notice_room_name_removed" = "%@ вилучає назву кімнати";
+"login_error_do_not_support_login_flows" = "Наразі ми не підтримуємо один або кілька потоків авторизації, визначених цим домашнім сервером";
+"notification_settings_never_notify" = "Ніколи не сповіщати";
+"notification_settings_always_notify" = "Завжди сповіщати";
+
+// members list Screen 
+
+// accounts list Screen 
+
+// image size selection 
+
+// invitation members list Screen 
+
+// room creation dialog Screen 
+
+// room info dialog Screen
+
+// room details dialog screen
+"room_details_title" = "Подробиці про кімнату";
+"login_error_must_start_http" = "URL-адреса повинна починатися з http[s]://";
+"num_members_other" = "%@ користувачів";
+"num_members_one" = "%@ користувач";
+"membership_invite" = "Запрошено";
+"create_account" = "Створити обліковий запис";
+"login" = "Увійти";
+"create_room" = "Створити кімнату";
+"call_video_with_user" = "Відеовиклик з %@";
+"call_voice_with_user" = "Голосовий виклик з %@";
+"ssl_fingerprint_hash" = "Відбиток (%@):";
+"ssl_remain_offline" = "Нехтувати";
+"ssl_logout_account" = "Вийти";
+
+// actions 
+"action_logout" = "Вийти";
+
+// Room Screen 
+
+// general errors 
+
+// Home Screen 
+
+// Last seen time 
+
+// call events 
+
+/* -*- 
+   Automatic localization for en
+
+   The following key/value pairs were extracted from the android i18n file:
+    /console/src/main/res/values/strings.xml.
+*/
+
+
+// titles 
+
+// button names 
+"ok" = "Гаразд";
+"notice_declined_video_call_by_you" = "Ви відхилили виклик";
+"notice_ended_video_call_by_you" = "Ви завершили виклик";
+"notice_avatar_url_changed_by_you" = "Ви змінили свій аватар";
+"notice_room_kick_by_you" = "Ви викинули %@";
+"notice_room_invite_you" = "%@ запрошує вас";
+
+// Notice Events with "You"
+"notice_room_invite_by_you" = "Ви запросили %@";
+"notice_room_third_party_invite_by_you_for_dm" = "Ви запросили %@";
+"notice_room_reason" = ". Причина: %@";
+"notice_room_third_party_registered_invite" = "%@ приймає запрошення від %@";
+"notice_room_third_party_invite_for_dm" = "%@ запрошує %@";
+
+/* -*- 
+   Automatic localization for en
+
+   The following key/value pairs were extracted from the android i18n file:
+    /matrix-sdk/src/main/res/values/strings.xml.
+*/
+
+"notice_room_invite" = "%@ запрошує %@";
+"ssl_homeserver_url" = "URL-адреса домашнього сервера: %@";
+"user_id_placeholder" = "наприклад: @bob:homeserver";
+"network_error_not_reachable" = "Перевірте під'єднання до мережі";
+"power_level" = "Рівень повноважень";
+"public" = "Загальнодоступний";
+"private" = "Приватний";
+"default" = "типово";
+"not_supported_yet" = "Поки що не підтримується";
+"error_common_message" = "Сталася помилка. Повторіть спробу пізніше.";
+"error" = "Помилка";
+"membership_ban" = "Заблоковано";
+"notice_room_ban_by_you" = "Ви заблокували %@";
+"notice_room_unban_by_you" = "Ви розблокували %@";
+"notice_room_ban" = "%@ блокує %@";
+"notice_room_unban" = "%@ розблоковує %@";
+"call_invite_expired" = "Запрошення на виклик не чинне";
+"incoming_voice_call" = "Вхідний голосовий виклик";
+"incoming_video_call" = "Вхідний відеовиклик";
+"call_ended" = "Виклик завершено";
+"call_ringing" = "Виклик…";
+
+// Settings keys 
+
+// call string
+"call_connecting" = "З'єднання…";
+"settings_config_user_id" = "ID користувача: %@";
+"settings_config_identity_server" = "Сервер ідентифікації: %@";
+
+// gcm section 
+"settings_config_home_server" = "Домашній сервер: %@";
+"notification_settings_other_alerts" = "Інші попередження";
+"notification_settings_select_room" = "Вибрати кімнату";
+"notification_settings_sender_hint" = "@user:domain.com";
+"notification_settings_enable_notifications_warning" = "Наразі всі сповіщення вимкнено для всіх пристроїв.";
+"notification_settings_enable_notifications" = "Увімкнути сповіщення";
+
+// Notification settings screen 
+"notification_settings_disable_all" = "Вимкнути сповіщення";
+"settings_title_notifications" = "Сповіщення";
+
+// Settings
+"settings" = "Налаштування";
+"room_displayname_more_than_two_members" = "%@ і %@ інших";
+"room_displayname_two_members" = "%@ і %@";
+
+// room display name
+"room_displayname_empty_room" = "Порожня кімната";
+"notice_sticker" = "наліпка";
+"notice_unsupported_attachment" = "Непідтримуване вкладення: %@";
+"notice_file_attachment" = "прикріплений файл";
+"notice_location_attachment" = "прикріплене місцеперебування";
+"notice_video_attachment" = "прикріплене відео";
+"notice_audio_attachment" = "прикріплене аудіо";
+"notice_image_attachment" = "прикріплене зображення";
+"notice_encryption_enabled_unknown_algorithm" = "%1$@ вмикає наскрізне шифрування (нерозпізнаний алгоритм %2$@).";
+"notice_encryption_enabled_ok" = "%@ вмикає наскрізне шифрування.";
+"notice_encrypted_message" = "Зашифроване повідомлення";
+"notice_avatar_url_changed" = "%@ змінює свій аватар";
+
+// Settings screen 
+"settings_title_config" = "Конфігурація";
+
+// Others
+"user_id_title" = "ID користувача:";
+"e2e_export" = "Експорт";
+"e2e_import" = "Імпорт";
+"search_searching" = "Триває пошук...";
+
+// Search
+"search_no_results" = "Немає результатів";
+"group_section" = "Групи";
+
+// Groups
+"group_invite_section" = "Запрошення";
+"contact_local_contacts" = "Локальні контакти";
+
+// Contacts
+"contact_mx_users" = "Користувачі Matrix";
+"attachment_e2e_keys_import" = "Імпорт...";
+"attachment_multiselection_original" = "Справжній розмір";
+"attachment_multiselection_size_prompt" = "Хочете надіслати зображення як:";
+"attachment_cancel_upload" = "Скасувати вивантаження?";
+"attachment_cancel_download" = "Скасувати завантаження?";
+"attachment_large" = "Великий (~%@)";
+"attachment_medium" = "Середній (~%@)";
+"attachment_small" = "Маленький (~%@)";
+"attachment_original" = "Справжній розмір (%@)";
+
+// Attachment
+"attachment_size_prompt" = "Бажаєте надіслати:";
+"message_reply_to_sender_sent_a_file" = "надсилає файл.";
+"message_reply_to_sender_sent_an_audio_file" = "надсилає звуковий файл.";
+"message_reply_to_sender_sent_a_voice_message" = "надсилає голосове повідомлення.";
+"message_reply_to_sender_sent_a_video" = "надсилає відео.";
+
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "надсилає зображення.";
+
+// E2E import
+"e2e_import_room_keys" = "Імпорт ключів кімнати";
+"format_time_d" = "д";
+"format_time_h" = "год";
+"format_time_m" = "хв";
+
+// Time
+"format_time_s" = "с";
+"room_error_join_failed_title" = "Не вдалося приєднатися до кімнати";
+
+// Room
+"room_please_select" = "Виберіть кімнату";
+"room_creation_participants_placeholder" = "(наприклад @bob:homeserver1; @john:homeserver2...)";
+"room_creation_participants_title" = "Учасники:";
+"room_creation_name_placeholder" = "(наприклад lunchGroup)";
+
+// Room creation
+"room_creation_name_title" = "Назва кімнати:";
+"room_event_encryption_info_device_fingerprint" = "Відбиток Ed25519\n";
+"room_event_encryption_info_event_unencrypted" = "незашифровано";
+"room_event_encryption_info_event_decryption_error" = "Помилка розшифрування\n";
+"room_event_encryption_info_event_session_id" = "ID сеансу\n";
+"room_event_encryption_info_event_algorithm" = "Алгоритм\n";
+"room_event_encryption_info_event_identity_key" = "Ключ ідентифікації Curve25519\n";
+"room_event_encryption_info_event_user_id" = "ID користувача\n";
+"room_event_encryption_info_event" = "Відомості про подію\n";
+
+// Encryption information
+"room_event_encryption_info_title" = "Відомості про наскрізне шифрування\n\n";
+"device_details_rename_prompt_title" = "Назва сеансу";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_identifier" = "ID\n";
+"room_event_encryption_info_device_id" = "ID\n";
+"room_event_encryption_info_device_name" = "Загальнодоступна назва\n";
+"device_details_name" = "Загальнодоступна назва\n";
+
+// Devices
+"device_details_title" = "Відомості про сеанс\n";
+"notification_settings_room_rule_title" = "Кімната: '%@'";
+"notice_in_reply_to" = "У відповідь на";
+"message_reply_to_message_to_reply_to_prefix" = "У відповідь на";
+"notice_crypto_unable_to_decrypt" = "** Не вдалося розшифрувати: %@ **";
+"notice_error_unknown_event_type" = "Невідомий тип події";
+"notice_error_unexpected_event" = "Неочікувана подія";
+"notice_error_unsupported_event" = "Непідтримувана подія";
+"notice_invalid_attachment" = "неприпустиме вкладення";
+"notice_room_history_visible_to_members_from_joined_point_for_dm" = "%@ робить майбутню історію повідомлень видимою всім від часу їхнього приєднання.";
+"notice_room_history_visible_to_members_from_joined_point" = "%@ робить майбутню історію кімнати видимою всім учасникам кімнати від часу їхнього приєднання.";
+"notice_room_history_visible_to_members_from_invited_point_for_dm" = "%@ робить майбутню історію повідомлень видимою всім від часу їхнього запрошення.";
+"notice_room_history_visible_to_members_from_invited_point" = "%@ робить майбутню історію кімнати видимою усім учасникам кімнати від часу їхнього запрошення.";
+"notice_room_history_visible_to_members_for_dm" = "%@ робить майбутню історію повідомлень видимою усім учасникам кімнати.";
+"notice_room_history_visible_to_members" = "%@ робить майбутню історію кімнати видимою усім учасникам кімнати.";
+"notice_room_history_visible_to_anyone" = "%@ робить майбутню історію кімнати видимою усім.";
+"notice_redaction" = "%@ редагує подію (id: %@)";
+"notice_feedback" = "Подія відгуку (id: %@): %@";
+"notice_room_related_groups" = "Групи пов'язані з цією кімнатою: %@";
+"notice_room_power_level_acting_requirement" = "Мінімальний рівень повноважень користувача для виконання дії:";
+"notification_settings_by_default" = "Типово...";
+"membership_leave" = "Виходить";
+"notice_redaction_by_you" = "Ви відредагували подію (id: %@)";
+"notice_encryption_enabled_unknown_algorithm_by_you" = "Ви ввімкнули наскрізне шифрування (нерозпізнаний алгоритм %@).";
+"notice_encryption_enabled_ok_by_you" = "Ви ввімкнули наскрізне шифрування.";
+"notice_room_created_by_you_for_dm" = "Ви приєдналися.";
+"notice_room_third_party_revoked_invite_by_you_for_dm" = "Ви відкликали запрошення для %@";
+"notice_room_third_party_revoked_invite_by_you" = "Ви відкликали запрошення приєднатися до кімнати для %@";
+"notice_room_third_party_registered_invite_by_you" = "Ви прийняли запрошення для %@";
+"notice_room_withdraw_by_you" = "Ви анулювали запрошення для %@";
+"notice_room_reject_by_you" = "Ви відхилили запрошення";
+"notice_room_third_party_invite_by_you" = "Ви надіслали запрошення приєднатися до кімнати для %@";
+"notice_room_name_changed_for_dm" = "%@ змінює назву на %@.";
+"notice_room_name_changed" = "%@ змінює назву кімнати на %@.";
+"notice_topic_changed" = "%@ змінює тему на «%@».";
+"notice_display_name_removed" = "%@ вилучає своє показуване ім'я";
+"notice_display_name_changed_from" = "%@ змінює своє показуване ім'я з %@ на %@";
+"notice_display_name_set" = "%@ встановлює своїм показуваним іменем %@";
+"notice_room_withdraw" = "%@ анульовує запрошення для %@";
+"notice_room_kick" = "%@ викидає %@";
+"notice_room_reject" = "%@ відхиляє запрошення";
+"notice_room_leave" = "%@ виходить";
+"notice_room_join" = "%@ приєднується";
+"notice_room_third_party_revoked_invite_for_dm" = "%@ відкликає запрошення для %@";
+"notice_room_third_party_revoked_invite" = "%@ відкликає запрошення приєднатися до кімнати для %@";
+"notice_room_third_party_invite" = "%@ надсилає запрошення приєднатися до кімнати для %@";
+"microphone_access_not_granted_for_voice_message" = "Для голосових повідомлень потрібен доступ до мікрофона, але %@ не має дозволу на його використання";
+"microphone_access_not_granted_for_call" = "Для викликів потрібен доступ до мікрофона, але %@ не має дозволу на його використання";
+
+// Permissions
+"camera_access_not_granted_for_call" = "Для відеовикликів потрібен доступ до камери, але %@ не має дозволу на її використання";
+"language_picker_default_language" = "Типово (%@)";
+
+// Language picker
+"language_picker_title" = "Виберіть мову";
+
+// Country picker
+"country_picker_title" = "Виберіть країну";
+"notice_room_join_by_you" = "Ви приєдналися";
+"notice_room_leave_by_you" = "Ви вийшли";
+"room_left_for_dm" = "Ви вийшли";
+"room_left" = "Ви вийшли з кімнати";
+"call_more_actions_unhold" = "Продовжити";
+"call_more_actions_change_audio_device" = "Змінити звуковий пристрій";
+"call_more_actions_audio_use_device" = "Гучномовець пристрою";
+"call_more_actions_transfer" = "Переведення";
+"call_more_actions_dialpad" = "Номеронабирач";
+"call_transfer_to_user" = "Передавання до %@";
+
+// unrecognized SSL certificate
+"ssl_trust" = "Довіряти";
+
+// Account
+"account_save_changes" = "Зберегти зміни";
+"room_event_encryption_info_unblock" = "Видалити з чорного списку";
+"room_event_encryption_info_block" = "Чорний список";
+"room_event_encryption_info_device_blocked" = "У чорному списку";
+"room_event_encryption_info_device_unknown" = "невідомий сеанс\n";
+"room_event_encryption_info_device" = "\nВідомості про сеанс відправника\n";
+"device_details_delete_prompt_title" = "Автентифікація";
+"settings_enter_validation_token_for" = "Введіть токен підтвердження для %@:";
+"settings_enable_push_notifications" = "Увімкнути push-сповіщення";
+"settings_enable_inapp_notifications" = "Увімкнути сповіщення в застосунку";
+"room_displayname_all_other_participants_left" = "%@ (виходить)";
+"notice_crypto_error_unknown_inbound_session_id" = "Сеанс відправника не надіслав нам ключі для цього повідомлення.";
+"notice_room_power_level_event_requirement" = "Найнижчий рівень повноважень пов'язаний з подією:";
+"notification_settings_global_info" = "Налаштування сповіщень зберігаються у вашому обліковому записі й спільні для всіх клієнтів, які їх підтримують (включно зі сповіщеннями стільниці).\n\nПравила застосовуються по черзі; спочатку надсилається повідомлення першого збігу з правилом.\nОтже: сповіщення для кожного слова важливіші за сповіщення для кожної кімнати, які важливіші за сповіщення від кожного відправника.\nДля кількох правил одного виду важливіше перше у списку.";
+"notification_settings_per_word_notifications" = "Сповіщення для кожного слова";
+"notification_settings_per_word_info" = "Слова збігу не чутливі до регістру й можуть містити символ *. Так:\nfoo збігається з рядком foo, оточеним роздільниками слів (наприклад, розділовими знаками та пробілами або початком/кінцем рядка).\nfoo* збігається з будь-яким таким словом, яке починається з foo.\n*foo* збігається з будь-яким таким словом, яке містить три букви foo.";
+"notification_settings_word_to_match" = "слово збігу";
+"notification_settings_highlight" = "Підсвічування";
+"notification_settings_per_room_notifications" = "Сповіщення від кожної кімнати";
+"notification_settings_per_sender_notifications" = "Сповіщення про кожного відправника";
+"notification_settings_contain_my_user_name" = "Сповіщати звуком про повідомлення, що містять моє ім'я користиувача";
+"notification_settings_contain_my_display_name" = "Сповіщати звуком про повідомлення, що містять моє показуване ім'я";
+"notification_settings_just_sent_to_me" = "Сповіщати звуком про надіслані лише мені повідомлення";
+"notification_settings_invite_to_a_new_room" = "Сповіщати про запрошення до нових кімнат";
+"notification_settings_people_join_leave_rooms" = "Сповіщати, коли люди приєднуються чи виходять з кімнат";
+"notification_settings_receive_a_call" = "Сповіщати про виклики";
+"notification_settings_suppress_from_bots" = "Приховувати сповіщень від ботів";
+"notification_settings_notify_all_other" = "Сповіщати про всі інші повідомлення/кімнати";
+"notification_settings_custom_sound" = "Власний звук";
+"account_error_push_not_allowed" = "Сповіщення не дозволені";
+"account_error_msisdn_wrong_description" = "Це не схоже на правильний номер телефону";
+"account_error_msisdn_wrong_title" = "Неправильний номер телефону";
+"account_error_email_wrong_description" = "Це не схоже на правильну адресу е-пошти";
+"account_error_email_wrong_title" = "Неправильна адреса е-пошти";
+"account_error_matrix_session_is_not_opened" = "Сеанс Matrix не відкрито";
+"account_error_picture_change_failed" = "Не вдалося змінити зображення";
+"account_error_display_name_change_failed" = "Не вдалося змінити показуване ім'я";
+"account_msisdn_validation_error" = "Не вдалося перевірити номер телефону.";
+"account_email_validation_title" = "Очікування перевірки";
+"account_msisdn_validation_title" = "Очікування перевірки";
+"account_msisdn_validation_message" = "Ми надіслали СМС із кодом активації. Введіть цей код унизу.";
+"account_linked_emails" = "Пов'язані адреси е-пошти";
+"account_link_email" = "Пов'язати е-пошту";
+"room_event_encryption_verify_ok" = "Звірити";
+"room_event_encryption_info_device_not_verified" = "НЕ звірений";
+"room_event_encryption_info_device_verified" = "Звірений";
+"room_event_encryption_verify_title" = "Звірити сеанс\n\n";
+"room_event_encryption_info_unverify" = "Скасувати перевірку";
+"room_event_encryption_info_verify" = "Звірити...";
+"room_event_encryption_info_device_verification" = "Перевірка\n";
+"room_event_encryption_info_event_none" = "нічого";
+"room_event_encryption_info_event_fingerprint_key" = "Потрібен ключ цифрового відбитка Ed25519\n";
+"device_details_delete_prompt_message" = "Виконання цієї дії вимагає додаткової автентифікації.\nЩоб продовжити, введіть свій пароль.";
+"device_details_rename_prompt_message" = "Загальнодоступну назву сеансу бачать люди, з якими ви спілкуєтесь";
+"device_details_last_seen" = "Останні відвідини\n";
+"notice_room_aliases_for_dm" = "Псевдоніми: %@";
+"notice_room_aliases" = "Псевдо кімнати: %@";
+"unsent" = "Не надіслано";
+"offline" = "не в мережі";
+"e2e_passphrase_create" = "Створити парольну фразу";
+"e2e_passphrase_not_match" = "Парольні фрази повинні збігатися";
+"e2e_passphrase_too_short" = "Парольна фраза закоротка (Її довжина повинна складати принаймні %d символів)";
+
+// E2E export
+"e2e_export_room_keys" = "Експорт ключів кімнати";
+"e2e_passphrase_enter" = "Введіть парольну фразу";
+"e2e_passphrase_empty" = "Парольна фраза не повинна бути порожньою";
+"e2e_passphrase_confirm" = "Підтвердити парольну фразу";
+"notice_room_history_visible_to_members_from_joined_point_by_you_for_dm" = "Ви зробили майбутні повідомлення кімнати видимими будь-кому від часу їхнього приєднання.";
+"notice_room_history_visible_to_members_from_joined_point_by_you" = "Ви зробили майбутню історію кімнати видимою усім учасникам кімнати від часу їхнього приєднання.";
+"notice_room_history_visible_to_members_from_invited_point_by_you_for_dm" = "Ви зробили майбутні повідомлення кімнати видимими будь-кому від часу запрошення їх.";
+"notice_room_history_visible_to_members_from_invited_point_by_you" = "Ви зробили майбутню історію кімнати видимою усім учасникам кімнати від часу запрошення їх.";
+"notice_room_history_visible_to_members_by_you_for_dm" = "Ви зробили майбутні повідомлення кімнати видимими усім учасникам кімнати.";
+"notice_room_history_visible_to_members_by_you" = "Ви зробили майбутню історію кімнати видимою усім учасникам кімнати.";
+"notice_room_history_visible_to_anyone_by_you" = "Ви зробили майбутню історію кімнати видимою будь-кому.";
+"notice_room_created_by_you" = "Ви створили й сконфігурували кімнату.";
+"notice_profile_change_redacted_by_you" = "Ви оновили свій профіль %@";
+"notice_event_redacted_by_you" = " вами";
+"notice_room_topic_removed_by_you" = "Ви вилучили тему";
+"notice_room_name_removed_by_you_for_dm" = "Ви вилучили назву";
+"notice_room_name_removed_by_you" = "Ви вилучили назву кімнати";
+"notice_conference_call_request_by_you" = "Ви запитали VoIP-конференцію";
+"notice_answered_video_call_by_you" = "Ви відповіли на виклик";
+"notice_placed_video_call_by_you" = "Ви розпочали відеовиклик";
+"notice_placed_voice_call_by_you" = "Ви розпочали голосовий виклик";
+"notice_room_name_changed_by_you_for_dm" = "Ви змінили назву на %@.";
+"notice_room_name_changed_by_you" = "Ви змінили назву кімнати на %@.";
+"notice_topic_changed_by_you" = "Ви змінили тему на «%@».";
+"notice_display_name_removed_by_you" = "Ви вилучили показуване ім'я";
+"notice_display_name_changed_from_by_you" = "Ви змінили показуване ім'я з %@ на %@";
+"notice_display_name_set_by_you" = "Ви вказали показуваним іменем %@";
+"notice_conference_call_finished" = "VoIP-конференція завершилася";
+"notice_conference_call_started" = "VoIP-конференція розпочалася";
+"notice_conference_call_request" = "%@ запитує VoIP-конференцію";
+"notice_declined_video_call" = "%@ відхиляє виклик";
+"notice_ended_video_call" = "%@ завершує виклик";
+"notice_answered_video_call" = "%@ відповідає на виклик";
+"notice_placed_video_call" = "%@ здійснює відеовиклик";
+"notice_placed_voice_call" = "%@ здійснює голосовий виклик";
+
+// Room members
+"room_member_ignore_prompt" = "Ви впевнені, що хочете сховати всі повідомлення від цього користувача?";
+"room_no_conference_call_in_encrypted_rooms" = "Кімнати з шифруванням не підтримують конференцвиклики";
+"room_error_topic_edition_not_authorized" = "Ви не маєте повноважень змінювати тему цієї кімнати";
+"room_error_name_edition_not_authorized" = "Ви не маєте повноважень змінювати назву цієї кімнати";
+"room_error_join_failed_empty_room" = "На цю мить неможливо приєднатися до порожньої кімнати.";
+"room_creation_alias_placeholder_with_homeserver" = "(напр. #foo%@)";
+"room_creation_alias_placeholder" = "(напр. #foo:example.org)";
+"account_email_validation_message" = "Перевірте свою електронну пошту та натисніть на посилання у ній. Після цього натисніть кнопку Продовжити.";
+"room_displayname_all_other_members_left" = "%@ (виходять)";
+"auth_username_in_use" = "Ім'я користувача зайняте";
+"rename" = "Перейменувати";
+"room_creation_alias_title" = "Псевдоніми кімнати:";
+"account_email_validation_error" = "Не вдалося перевірити адресу електронної пошти. Перевірте свою електронну пошту та натисніть на посилання в ній. Після цього натисніть продовжити";
+"auth_reset_password_error_not_found" = "Не знайдено";
+"auth_reset_password_error_unauthorized" = "Не авторизовано";
+"auth_invalid_user_name" = "Хибне імʼя користувача";
+"ssl_could_not_verify" = "Не вдалося перевірити справжність сервера ідентифікації.";
+"call_consulting_with_user" = "Консультація з %@";
+"local_contacts_access_discovery_warning_title" = "Виявлення користувачів";
+"attachment_large_with_resolution" = "Великий %@ (~%@)";
+"attachment_medium_with_resolution" = "Середній %@ (~%@)";
+"attachment_small_with_resolution" = "Малий %@ (~%@)";
+"attachment_size_prompt_message" = "Ви можете вимкнути це у налаштуваннях.";
+"attachment_size_prompt_title" = "Підтвердити розмір, щоб надіслати";
+"room_no_power_to_create_conference_call" = "Вам потрібен дозвіл, щоб надсилати запрошення, щоб розпочати конференцію в цій кімнаті";
+"room_event_encryption_verify_message" = "Щоб переконатися, що цьому сеансу можна довіряти, зв’яжіться з його власником іншим способом (наприклад, особисто чи телефоном) і запитайте його, чи збігається ключ, який вони бачать у налаштуваннях користувача для цього сеансу, з ключем нижче:\n\nНазва сеансу: %@\nID сеансу: %@\nКлюч сеансу: %@\n\nЯкщо він збігається, натисніть кнопку підтвердження внизу. Якщо ні, значить хтось інший перехоплює цей сеанс, і ви, ймовірно, хочете натиснути кнопку чорного списку.\n\nУ майбутньому цей процес перевірки буде ускладнено.";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/vi.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/vi.lproj/MatrixKit.strings
new file mode 100644
index 000000000..6f7fbb694
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/vi.lproj/MatrixKit.strings
@@ -0,0 +1,359 @@
+"matrix" = "Matrix";
+// Login Screen
+"login_create_account" = "Tạo tài khoản:";
+"login_server_url_placeholder" = "URL (e.g. https://matrix.org)";
+"login_home_server_title" = "Máy chủ nhà:";
+"login_home_server_info" = "Máy chủ nhà của bạn lưu trữ tất cả dữ liệu cần giữ gìn và tài khoản";
+"login_identity_server_title" = "Máy chủ xác thực:";
+"login_identity_server_info" = "Matrix cung cấp máy chủ xác thực để theo dõi email nào thuộc về Matrix IDs nào. Chỉ https://matrix.org hiện đang tồn tại.";
+"login_user_id_placeholder" = "Matrix ID (ví dụ: @bob:matrix.org hoặc bob)";
+"login_password_placeholder" = "Mật khẩu";
+"login_optional_field" = "không bắt buộc";
+"login_display_name_placeholder" = "Tên hiển thị (ví dụ: Bob Obson)";
+"login_email_info" = "Định nghĩa địa chỉ email cho phép người dùng khác tìm thấy bạn trên Matrix dễ dàng hơn và giúp bạn đặt lại mật khẩu của bạn sau này.";
+"login_email_placeholder" = "Địa chỉ email";
+"login_prompt_email_token" = "Vui lòng nhập mã xác nhận hợp lệ email của bạn:";
+"login_error_title" = "Đăng nhập thất bại";
+"login_error_no_login_flow" = "Chúng tôi không thể truy xuất thông tin xác thực từ Home Server này";
+"login_error_do_not_support_login_flows" = "Hiện tại chúng tôi không hỗ trợ bất cứ luồng đăng nhập được định nghĩa nào từ Home Server này";
+"login_error_registration_is_not_supported" = "Đăng kí hiện đang không được hỗ trợ";
+"login_error_forbidden" = "Sai tên đăng nhập/mật khẩu";
+"login_error_unknown_token" = "Mã truy cập được chỉ định không được công nhận";
+"login_error_bad_json" = "Sai định dạng JSON";
+"login_error_not_json" = "Không chứa một JSON hợp lệ";
+"login_error_limit_exceeded" = "Quá nhiều yêu cầu đã được gửi";
+"login_error_user_in_use" = "Tên đăng nhập này đã được sử dụng";
+"login_error_login_email_not_yet" = "Liên kết email chưa được nhấp vào";
+"login_use_fallback" = "Sử dụng dự phòng";
+"login_leave_fallback" = "Huỷ";
+"login_invalid_param" = "Tham số không hợp lệ";
+"register_error_title" = "Đăng kí thất bại";
+"login_error_forgot_password_is_not_supported" = "Chức năng quên mật khẩu chưa hỗ trợ";
+"login_mobile_device" = "Di động";
+"login_tablet_device" = "Máy tính bảng";
+"login_desktop_device" = "Máy tính bàn";
+// Action
+"no" = "Không";
+"yes" = "Có";
+"abort" = "Huỷ bỏ";
+"back" = "Trở về";
+"close" = "Đóng";
+"continue" = "Tiếp tục";
+"discard" = "Huỷ bỏ";
+"dismiss" = "Bỏ qua";
+"retry" = "Thử lại";
+"sign_up" = "Đăng kí";
+"submit" = "Gửi đi";
+"submit_code" = "Gửi mã lên";
+"set_default_power_level" = "Thiết lập lại cấp độ";
+"set_moderator" = "Đặt người kiểm duyệt";
+"set_admin" = "Đặt người quản trị";
+"start_chat" = "Bắt đầu chat";
+"start_voice_call" = "Bắt đầu cuộc gọi thoại";
+"start_video_call" = "Bắt đầu cuộc gọi video";
+"mention" = "Đề cập đến";
+"select_account" = "Chọn một tài khoản";
+"attach_media" = "Đính kèm Media từ thư viện";
+"capture_media" = "Chụp ảnh/quay video";
+"invite_user" = "Mời người dùng Matrix";
+"reset_to_default" = "Thiết lập lại về mặc định";
+"resend_message" = "Gửi lại tin nhắn";
+"select_all" = "Chọn tất cả";
+"cancel_upload" = "Huỷ tải lên";
+"cancel_download" = "Huỷ tải xuống";
+"show_details" = "Xem chi tiết";
+"answer_call" = "Trả lời cuộc gọi";
+"reject_call" = "Từ chối cuộc gọi";
+"end_call" = "Kết thúc cuộc gọi";
+"ignore" = "Bỏ qua";
+"unignore" = "Huỷ bỏ qua";
+// Events formatter
+"notice_avatar_changed_too" = "(hình đại diện cũng đã được thay đổi)";
+"notice_room_name_removed" = "%@ bị gỡ bỏ khỏi tên của phòng";
+"notice_room_topic_removed" = "%@ bị gỡ bỏ khỏi chủ đề của phòng";
+"notice_event_redacted" = "<sửa lại%@>";
+"notice_event_redacted_by" = " bởi %@";
+"notice_event_redacted_reason" = " [lí do: %@]";
+"notice_profile_change_redacted" = "%@ cập nhật hồ sơ của họ %@";
+"notice_room_created" = "%@ đã tạo phòng";
+"notice_room_join_rule" = "Quy tắc tham gia là: %@";
+"notice_room_power_level_intro" = "Công suất của thành viên trong phòng:";
+"notice_room_power_level_acting_requirement" = "Mức công suất tối thiểu mà người dùng phải có trước khi hoạt động là:";
+"notice_room_power_level_event_requirement" = "Mức công suất tối thiểu liên quan đến sự kiện là:";
+"notice_room_aliases" = "Các bí danh phòng là:% @";
+"notice_encrypted_message" = "Tin nhắn đã được mã hoá";
+"notice_encryption_enabled" = "%@ đã bật mã hoá end-to-end (thuật toán %@)";
+"notice_image_attachment" = "hình ảnh đính kèm";
+"notice_audio_attachment" = "âm thanh đính kèm";
+"notice_video_attachment" = "video đính kèm";
+"notice_location_attachment" = "địa điểm đính kèm";
+"notice_file_attachment" = "tập tin đính kèm";
+"notice_invalid_attachment" = "đính kèm không hợp lệ";
+"notice_unsupported_attachment" = "Đính kèm chưa được hỗ trợ: %@";
+"notice_feedback" = "Sự kiện phản hồi (id: %@): %@";
+"notice_redaction" = "%@ đã biên soạn một sự kiện (id: %@)";
+"notice_error_unsupported_event" = "Sự kiện không được hỗ trợ";
+"notice_error_unexpected_event" = "Sự kiện bất ngờ";
+"notice_error_unknown_event_type" = "Loại sự kiện không xác định";
+"notice_room_history_visible_to_anyone" = "%@ làm cho mọi người có thể thấy lịch sử phòng.";
+"notice_room_history_visible_to_members" = "%@ làm cho thành viên trong phòng có thể thấy được lịch sử phòng.";
+"notice_room_history_visible_to_members_from_invited_point" = "%@ làm cho mọi thành viên có thể thấy được lịch sử phòng từ thời điểm được mời.";
+"notice_room_history_visible_to_members_from_joined_point" = "%@ làm cho mọi người có thể thấy lịch sử phòng từ thời điểm họ tham gia.";
+"notice_crypto_unable_to_decrypt" = "** Không thể giải mã: %@ **";
+"notice_crypto_error_unknown_inbound_session_id" = "Thiết bị gửi đi đã không gửi cho chúng ta các khoá giải mã tin nhắn.";
+// room display name
+"room_displayname_empty_room" = "Phòng trống";
+"room_displayname_two_members" = "%@ và %@";
+"room_displayname_more_than_two_members" = "%@ và %u người khác";
+// Settings
+"settings" = "Cài đặt";
+"settings_enable_inapp_notifications" = "Bật thông báo bên trong ứng dụng";
+"settings_enable_push_notifications" = "Bật thông báo";
+"settings_enter_validation_token_for" = "Nhập mã thông báo xác nhận cho %@:";
+"notification_settings_room_rule_title" = "Phòng chat: '%@'";
+// Devices
+"device_details_title" = "Thông tin thiết bị\n";
+"device_details_name" = "Tên\n";
+"device_details_identifier" = "ID Thiết bị\n";
+"device_details_last_seen" = "Lần cuối nhìn thấy\n";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_rename_prompt_message" = "Tên thiết bị:";
+"device_details_delete_prompt_title" = "Xác thực";
+"device_details_delete_prompt_message" = "Thao tác này yêu cầu xác thực bổ sung.\nĐể tiếp tục, vui lòng nhập mật khẩu của bạn.";
+// Encryption information
+"room_event_encryption_info_title" = "Thông tin mã hoá end-to-end\n\n";
+"room_event_encryption_info_event" = "Thông tin sự kiện\n";
+"room_event_encryption_info_event_user_id" = "ID Người dùng\n";
+"room_event_encryption_info_event_identity_key" = "Khoá xác thực Curve25519\n";
+"room_event_encryption_info_event_fingerprint_key" = "Chìa khoá vân tay Claimed Ed25519\n";
+"room_event_encryption_info_event_algorithm" = "Thuật toán\n";
+"room_event_encryption_info_event_session_id" = "ID Phiên làm việc\n";
+"room_event_encryption_info_event_decryption_error" = "Lỗi giải mã\n";
+"room_event_encryption_info_event_unencrypted" = "đã giải mã";
+"room_event_encryption_info_event_none" = "không";
+"room_event_encryption_info_device" = "\nThông tin thiết bị gửi đi\n";
+"room_event_encryption_info_device_unknown" = "thiết bị không xác định\n";
+"room_event_encryption_info_device_name" = "Tên\n";
+"room_event_encryption_info_device_id" = "ID Thiết bị\n";
+"room_event_encryption_info_device_verification" = "Xác minh\n";
+"room_event_encryption_info_device_fingerprint" = "Dấu vân tay Claimed Ed25519\n";
+"room_event_encryption_info_device_verified" = "Đã xác thực";
+"room_event_encryption_info_device_not_verified" = "CHƯA xác thực";
+"room_event_encryption_info_device_blocked" = "Danh sách đen";
+"room_event_encryption_info_verify" = "Xác thực...";
+"room_event_encryption_info_unverify" = "Huỷ xác thực";
+"room_event_encryption_info_block" = "Danh sách đen";
+"room_event_encryption_info_unblock" = "Huỷ danh sách đen";
+"room_event_encryption_verify_title" = "Xác minh thiết bị\n\n";
+"room_event_encryption_verify_message" = "Để xác minh rằng thiết bị này có thể tin cậy, vui lòng liên hệ chủ sở hữu bằng cách sử dụng một số phương tiện khác (ví dụ: trực tiếp hoặc qua điện thoại) và yêu cầu họ xem khoá mà họ nhìn thấy trong \"Cài đặt người dùng\" cho thiết bị này có trùng khớp với khoá dưới đây:\n\n\tTên thiết bị: %@\n\tID thiết bị: %@\n\tKhóa thiết bị: %@\n\nNếu nó trùng khớp, nhấn nút xác minh dưới đây. Nếu không, thì ai đó đang chặn thiết bị này và bạn có thể muốn nhấn nút danh sách đen thay vì nhấn nút xác minh.\n\nTrong tương lai quá trình xác minh này sẽ phức tạp hơn.";
+"room_event_encryption_verify_ok" = "Xác thực";
+// Account
+"account_save_changes" = "Lưu thay đổi";
+"account_link_email" = "Liên kết email";
+"account_linked_emails" = "Email đã được liên kết";
+"account_email_validation_title" = "Xác minh đang chờ xử lí";
+"account_email_validation_message" = "Vui lòng check email của bạn và nhấn vào đường dẫn đính kèm trong đó. Sau khi việc đó hoàn thành, nhấn tiếp tục.";
+"account_email_validation_error" = "Không thể xác minh địa chỉ email. Vui lòng kiểm tra email của bạn và nhấn vào liên kết mà nó được đính kèm. Sau khi việc đó hoàn thành, nhất tiếp tục";
+"account_msisdn_validation_title" = "Xác minh đang chờ xử lí";
+"account_msisdn_validation_message" = "Chúng tôi đã gửi mã kích hoạt qua SMS. Vui lòng nhập mã kích hoạt bên dưới.";
+"account_msisdn_validation_error" = "Không thể xác thực số điện thoại.";
+"account_error_display_name_change_failed" = "Thay đổi tên hiển thị thất bại";
+"account_error_picture_change_failed" = "Thay đổi hình ảnh thất bại";
+"account_error_matrix_session_is_not_opened" = "Phiên làm việc matrix chưa được mở";
+"account_error_email_wrong_title" = "Địa chỉ email không hợp lệ";
+"account_error_email_wrong_description" = "Nó có vẻ không phải là một địa chỉ email hợp lệ";
+"account_error_msisdn_wrong_title" = "Số điện thoại không hợp lệ";
+"account_error_msisdn_wrong_description" = "Nó có vẻ không phải là một số điện thoại hợp lệ";
+// Room creation
+"room_creation_name_title" = "Tên phòng:";
+"room_creation_name_placeholder" = "(ví dụ: lunchGroup)";
+"room_creation_alias_title" = "Bí danh phòng:";
+"room_creation_alias_placeholder" = "(ví dụ: #foo:example.org)";
+"room_creation_alias_placeholder_with_homeserver" = "(ví dụ: #foo%@)";
+"room_creation_participants_title" = "Người tham gia:";
+"room_creation_participants_placeholder" = "(ví dụ: @bob:homeserver1; @john:homeserver2...)";
+// Room
+"room_please_select" = "Vui lòng chọn một phòng";
+"room_error_join_failed_title" = "Tham gia phòng thất bại";
+"room_error_join_failed_empty_room" = "Hiện tại không thể tham gia lại phòng trống.";
+"room_error_name_edition_not_authorized" = "Bạn chưa được uỷ quyền để sửa tên phòng";
+"room_error_topic_edition_not_authorized" = "Bạn chưa được uỷ quyền để sửa chủ đề phòng";
+"room_error_cannot_load_timeline" = "Không tải được dòng thời gian";
+"room_error_timeline_event_not_found_title" = "Không tải được vị trí dòng thời gian";
+"room_error_timeline_event_not_found" = "Ứng dụng đã cố gắng tải một điểm cụ thể trong thời gian của phòng này nhưng không thể tìm thấy nó";
+"room_left" = "Bạn đã rời phòng";
+"room_no_power_to_create_conference_call" = "Bạn cần cấp quyền để mời bắt đầu cuộc gọi hội họp trong phòng này";
+"room_no_conference_call_in_encrypted_rooms" = "Gọi hội họp chưa được hỗ trợ trong các phòng đã mã hoá";
+// Room members
+"room_member_ignore_prompt" = "Bạn có chắc chắn muốn ẩn tất cả tin nhắn từ người dùng này?";
+"room_member_power_level_prompt" = "Bạn sẽ không thể hoàn tác thay đổi này khi bạn đang quảng cáo cho người dùng có mức năng lượng như chính bạn.\nBạn có chắc không?";
+// Attachment
+"attachment_size_prompt" = "Bạn có muốn gửi dưới dạng:";
+"attachment_original" = "Kích thước thực sự: %@";
+"attachment_small" = "Nhỏ: %@";
+"attachment_medium" = "Trung bình: %@";
+"attachment_large" = "Lớn: %@";
+"attachment_cancel_download" = "Huỷ bỏ tải xuống?";
+"attachment_cancel_upload" = "Huỷ bỏ tải lên?";
+"attachment_multiselection_size_prompt" = "Bạn có muốn gửi hình ảnh dưới dạng:";
+"attachment_multiselection_original" = "Kích thước thực sự";
+"attachment_e2e_keys_file_prompt" = "Tập tin này chứa các khoá mã hoá được xuất từ một máy khách Matrix.\nBạn có muốn xem nội dung tập tin hoặc nhập khẩu các khóa nó chứa?";
+"attachment_e2e_keys_import" = "Nhập...";
+// Contacts
+"contact_mx_users" = "Người dùng của Matrix";
+"contact_local_contacts" = "Danh bạ";
+// Search
+"search_no_results" = "Không có kết quả";
+"search_searching" = "Đang tìm kiếm...";
+// Time
+"format_time_s" = "giây";
+"format_time_m" = "phút";
+"format_time_h" = "giờ";
+"format_time_d" = "ngày";
+// E2E import
+"e2e_import_room_keys" = "Nhập khóa phòng";
+"e2e_import_prompt" = "Quá trình này cho phép bạn nhập các khoá mã hoá mà trước đây bạn đã xuất từ một máy khách Matrix khác. Sau đó, bạn sẽ có thể giải mã bất kỳ thư nào mà khách hàng khác có thể giải mã.\nTệp xuất được bảo vệ bằng cụm mật khẩu. Bạn nên nhập cụm từ mật khẩu ở đây, để giải mã tệp.";
+"e2e_import" = "Nhập";
+"e2e_passphrase_enter" = "Nhập cụm mật khẩu";
+// E2E export
+"e2e_export_room_keys" = "Xuất các khoá của phòng";
+"e2e_export_prompt" = "Quá trình này cho phép bạn xuất khẩu các khoá cho tin nhắn bạn đã nhận được trong các phòng được mã hoá tới một tập tin cục bộ. Sau đó, bạn sẽ có thể nhập tập tin vào máy khách Matrix khác trong tương lai, để khách hàng cũng có thể giải mã các thư này.\nTập tin được xuất sẽ cho phép bất kỳ ai có thể đọc nó để giải mã bất kỳ tin nhắn nào được mã hóa mà bạn có thể thấy, do đó bạn nên cẩn thận để giữ an toàn.";
+"e2e_export" = "Xuất";
+"e2e_passphrase_confirm" = "Xác nhận cụm mật khẩu";
+"e2e_passphrase_empty" = "Cụm mật khẩu không được để trống";
+"e2e_passphrase_not_match" = "Cụm mật khẩu phải trùng khớp";
+// Others
+"user_id_title" = "ID Người dùng:";
+"offline" = "ngoại tuyến";
+"unsent" = "Chưa được gửi";
+"error" = "Lỗi";
+"not_supported_yet" = "Chưa hỗ trợ";
+"default" = "mặc định";
+"private" = "Riêng tư";
+"public" = "Công khai";
+"power_level" = "Độ nhiệt huyết";
+"network_error_not_reachable" = "Vui lòng kiểm tra kết nối mạng của bạn";
+"user_id_placeholder" = "ví dụ: @bob:homeserver";
+"ssl_homeserver_url" = "Home Server URL: %@";
+// Permissions
+"camera_access_not_granted_for_call" = "Cuộc gọi video yêu cầu quyền truy cập tới máy ảnh nhưng %@ chưa có quyền để sử dụng nó";
+"microphone_access_not_granted_for_call" = "Cuộc gọi thoại yêu cầu truy cập tới Microphone nhưng %@ chưa có quyền để sử dụng nó";
+"local_contacts_access_not_granted" = "Người dùng tìm thấy từ địa chỉ liên hệ cục bộ yêu cầu quyền truy cập vào danh sách liên hệ của bạn nhưng %@ không có quyền sử dụng nó";
+"local_contacts_access_discovery_warning_title" = "Quét người dùng";
+"local_contacts_access_discovery_warning" = "%@ muốn tải lên danh sách email và số điện thoại từ danh bạ của bạn để quét người dùng";
+// Country picker
+"country_picker_title" = "Chọn một quốc gia";
+// Language picker
+"language_picker_title" = "Chọn một ngôn ngữ";
+"language_picker_default_language" = "Mặc định (%@)";
+"notice_room_invite" = "%@ đã mời %@";
+"notice_room_third_party_invite" = "%@ gửi một lời mời tới %@ để tham gia phòng";
+"notice_room_third_party_registered_invite" = "%@ chấp nhận lời mời cho %@";
+"notice_room_join" = "%@ đã tham gia";
+"notice_room_leave" = "%@ đã rời";
+"notice_room_reject" = "%@ từ chối lời yêu cầu";
+"notice_room_kick" = "%@ đã đá %@ ra khỏi phòng";
+"notice_room_unban" = "%@ đã huỷ cấm %@";
+"notice_room_ban" = "%@ đã cấm %@";
+"notice_room_withdraw" = "%@ đã thu hồi lời mời của %@";
+"notice_room_reason" = ". Lý do: %@";
+"notice_avatar_url_changed" = "%@ đã thay đổi ảnh đại diện của họ";
+"notice_display_name_set" = "%@ đặt tên hiển thị của họ thành %@";
+"notice_display_name_changed_from" = "%@ thay đổi tên hiển thị của họ từ %@ thành %@";
+"notice_display_name_removed" = "%@ đã gỡ bỏ tên hiển thị của họ";
+"notice_topic_changed" = "%@ thay đổi chủ đề thành: %@";
+"notice_room_name_changed" = "%@ đã thay đổi tên phòng thành: %@";
+"notice_placed_voice_call" = "%@ tạo một cuộc gọi thoại";
+"notice_placed_video_call" = "%@ tạo một cuộc gọi video";
+"notice_answered_video_call" = "%@ đã trả lời cuộc gọi";
+"notice_ended_video_call" = "%@ kết thúc cuộc gọi";
+"notice_conference_call_request" = "%@ yêu cầu một hội nghị VoIP";
+"notice_conference_call_started" = "Cuộc gọi hội nghị VoIP đã bắt đầu";
+"notice_conference_call_finished" = "Cuộc gọi hội nghị VoIP đã kết thúc";
+// button names 
+"ok" = "OK";
+"cancel" = "Huỷ";
+"save" = "Lưu";
+"leave" = "Rời khỏi";
+"send" = "Gửi";
+"copy_button_name" = "Sao chép";
+"resend" = "Gửi lại";
+"redact" = "Biên tập lại";
+"share" = "Chia sẻ";
+"set_power_level" = "Độ nhiệt huyết";
+"delete" = "Xoá";
+"view" = "Xem";
+// actions 
+"action_logout" = "Đăng xuất";
+"create_room" = "Tạo phòng";
+"login" = "Đăng nhập";
+"create_account" = "Tạo tài khoản";
+"membership_invite" = "Đã mời";
+"membership_leave" = "Đã rời";
+"membership_ban" = "Bị cấm";
+"num_members_one" = "%@ người dùng";
+"num_members_other" = "%@ người dùng";
+"invite" = "Mời";
+"kick" = "Đá";
+"ban" = "Cấm";
+"unban" = "Huỷ cấm";
+"message_unsaved_changes" = "Có vài thay đổi chưa được lưu. Rời khỏi sẽ mất những thay đổi này.";
+// Login Screen 
+"login_error_already_logged_in" = "Đã đăng nhập";
+"login_error_must_start_http" = "URL phải bắt đầu với http[s]://";
+// room details dialog screen
+"room_details_title" = "Chi tiết phòng chat";
+// contacts list screen 
+"invitation_message" = "Tôi muốn trò chuyện với bạn với matrix. Vui lòng truy cập trang web http://matrix.org để biết thêm thông tin.";
+// Settings screen 
+"settings_title_config" = "Cấu hình";
+"settings_title_notifications" = "Thông báo";
+// Notification settings screen 
+"notification_settings_disable_all" = "Tắt tất cả thông báo";
+"notification_settings_enable_notifications" = "Bật thông báo";
+"notification_settings_enable_notifications_warning" = "Tất cả thông báo hiện tại đang bị vô hiệu hoá cho tất cả thiết bị.";
+"notification_settings_global_info" = "Cài đặt thông báo được lưu vào tài khoản người dùng của bạn và được chia sẻ giữa tất cả các máy khách có hỗ trợ chúng (bao gồm thông báo trên máy bàn).\n\nCác quy tắc được áp dụng theo thứ tự; quy tắc đầu tiên khớp với định nghĩa của thông báo đến từ bên ngoài.\nVì vậy: Thông báo mỗi lần quan trọng hơn thông báo cho mỗi phòng điều mà quan trọng hơn thông báo mỗi người gửi.\nĐối với nhiều quy tắc cùng loại, lựa chọn đầu tiên trong danh sách phù hợp sẽ được ưu tiên.";
+"notification_settings_per_word_notifications" = "Thông báo mỗi từ";
+"notification_settings_per_word_info" = "Các từ khớp với trường hợp vô nghĩa và có thể bao gồm ký tự đại diện *. Vì thế:\nfoo phù hợp với chuỗi foo bao quanh bởi từ phân cách chữ (ví dụ: chấm câu và khoảng trắng hoặc bắt đầu / kết thúc dòng).\nfoo * khớp với bất kỳ từ nào bắt đầu foo.\n* foo * khớp bất kỳ từ nào trong đó bao gồm 3 chữ foo.";
+"notification_settings_always_notify" = "Luôn thông báo";
+"notification_settings_never_notify" = "Không bao giờ thông báo";
+"notification_settings_word_to_match" = "từ để so khớp";
+"notification_settings_highlight" = "Điểm nhấn";
+"notification_settings_custom_sound" = "Âm thanh tuỳ chỉnh";
+"notification_settings_per_room_notifications" = "Thông báo mỗi phòng";
+"notification_settings_per_sender_notifications" = "Thông báo mỗi người gửi";
+"notification_settings_sender_hint" = "@nguoidung:tenmien.com";
+"notification_settings_select_room" = "Chọn một phòng";
+"notification_settings_other_alerts" = "Các thông báo khác";
+"notification_settings_contain_my_user_name" = "Thông báo cho tôi với âm thanh về các tin nhắn chứa tên của tôi";
+"notification_settings_contain_my_display_name" = "Thông báo cho tôi với âm thanh về các tin nhắn chưa tên hiển thị của tôi";
+"notification_settings_just_sent_to_me" = "Thông báo cho tôi với âm thành về các tin nhắn chỉ gửi cho tôi";
+"notification_settings_invite_to_a_new_room" = "Thông báo cho tôi khi tôi được mời vào một phòng mới";
+"notification_settings_people_join_leave_rooms" = "Thông báo cho tôi khi mọi người tham gia hoặc rời các phòng";
+"notification_settings_receive_a_call" = "Thông báo cho tôi khi tôi nhận cuộc gọi";
+"notification_settings_suppress_from_bots" = "Chặn thông báo từ các bot";
+"notification_settings_by_default" = "Theo mặc định...";
+"notification_settings_notify_all_other" = "Thông báo cho tất cả tin nhắn/phòng";
+// gcm section 
+"settings_config_home_server" = "Home server: %@";
+"settings_config_identity_server" = "Máy chủ xác thực: %@";
+"settings_config_user_id" = "ID Người dùng: %@";
+// call string
+"call_waiting" = "Đang đợi...";
+"call_connecting" = "Đang kết nối cuộc gọi...";
+"call_ended" = "Cuộc gọi kết thúc";
+"call_ring" = "Đang gọi...";
+"incoming_video_call" = "Cuộc gọi video tới";
+"incoming_voice_call" = "Cuộc gọi thoại tới";
+"call_invite_expired" = "Lời mời cuộc gọi đã quá hạn";
+// unrecognized SSL certificate
+"ssl_trust" = "Tin tưởng";
+"ssl_logout_account" = "Đăng xuất";
+"ssl_remain_offline" = "Bỏ qua";
+"ssl_fingerprint_hash" = "Vân tay (%@):";
+"ssl_could_not_verify" = "Không thể xác minh danh tính của máy chủ từ xa.";
+"ssl_cert_not_trust" = "Điều này có thể có nghĩa là ai đó đang ngăn chặn lưu lượng truy cập của bạn, hoặc điện thoại của bạn không tin tưởng vào chứng chỉ được cung cấp bởi máy chủ từ xa.";
+"ssl_cert_new_account_expl" = "Nếu quản trị viên máy chủ đã nói rằng điều này được mong đợi, đảm bảo rằng các dấu vân tay dưới đây phù hợp với dấu vân tay được cung cấp bởi chúng.";
+"ssl_unexpected_existing_expl" = "Chứng chỉ đã thay đổi từ chứng chỉ mà điện thoại của bạn tin cậy. Điều này là KHÔNG THƯỜNG XUYÊN. Chúng tôi khuyên bạn KHÔNG CHẤP NHẬN chứng chỉ mới này.";
+"ssl_expected_existing_expl" = "Chứng chỉ đã thay đổi từ một tài khoản đáng tin cậy trước đó sang chứng chỉ không đáng tin cậy. Máy chủ có thể đã gia hạn chứng chỉ của nó. Liên hệ với quản trị viên máy chủ để lấy dấu vân tay được mong đợi.";
+"ssl_only_accept" = "CHỈ chấp nhận chứng chỉ nếu quản trị viên máy chủ đã xuất bản một dấu vân tay phù hợp với bảng trên.";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/vls.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/vls.lproj/MatrixKit.strings
new file mode 100644
index 000000000..0e58e8e60
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/vls.lproj/MatrixKit.strings
@@ -0,0 +1,123 @@
+"matrix" = "Matrix";
+// Login Screen
+"login_create_account" = "Account anmoakn:";
+"login_server_url_placeholder" = "URL (bv. https://matrix.org)";
+"login_home_server_title" = "Thuusserver:";
+"login_home_server_info" = "Je thuusserver sloat al je gespreks- en accountgegeevns ip";
+"login_identity_server_title" = "Identiteitsserver:";
+"login_user_id_placeholder" = "Matrix-ID (bv. @jean:matrix.org of jean)";
+"login_password_placeholder" = "Paswoord";
+"login_optional_field" = "optioneel";
+"login_display_name_placeholder" = "Weergoavenoame (bv. Jean Kieckens)";
+"login_email_info" = "Door een e-mailadresse in te geevn kunn andere gebruukers je gemakkeliker ip Matrix wereviendn, en 't gift jen ook e maniere voor in den toekomst je paswoord te verandern.";
+"login_email_placeholder" = "E-mailadresse";
+"login_prompt_email_token" = "Gif jen e-mailadressevalidoatiebewys in:";
+"login_error_title" = "Anmeldn mislukt";
+"login_error_no_login_flow" = "Iphoaln van de authenticoatie-informoatie van dezen thuusserver is mislukt";
+"view" = "Toogn";
+"login_identity_server_info" = "Matrix verstrekt identiteitsservers vo t’achterhoaln wukke e-mailadressn e.d.m. dat der by wukke Matrix-ID’s hoorn. Tot nu toe bestoat alleene mo https://matrix.org.";
+"login_error_do_not_support_login_flows" = "Vo de moment biedn we geen oundersteunienge vo sommigste of alle anmeldiengsmethoodn van dezen thuusserver";
+"login_error_registration_is_not_supported" = "Registroasje wor vo de moment nie oundersteund";
+"login_error_forbidden" = "Oungeldig(e) gebrukersnoame/paswoord";
+"login_error_unknown_token" = "’t Ingegeevn toegangsbewys is nie herkend";
+"login_error_bad_json" = "Oungeldigen JSON";
+"login_error_not_json" = "Bevat gene geldigen JSON";
+"login_error_limit_exceeded" = "’t Zyn te vele verzoekn verzonden gewist";
+"login_error_user_in_use" = "Deze gebrukersnoame is al in gebruuk";
+"login_error_login_email_not_yet" = "De koppelienge in den e-mail is nog nie geopend gewist";
+"login_use_fallback" = "Weerevalblad gebruukn";
+"login_leave_fallback" = "Annuleern";
+"login_invalid_param" = "Oungeldige parameter";
+"register_error_title" = "Registroasje mislukt";
+"login_error_forgot_password_is_not_supported" = "Paswoord vergeten wor vo de moment nog nie oundersteund";
+"login_mobile_device" = "Gsm";
+"login_tablet_device" = "Tablet";
+"login_desktop_device" = "Computer";
+"login_error_resource_limit_exceeded_title" = "Bronlimiet overschreedn";
+"login_error_resource_limit_exceeded_message_default" = "Dezen thuusserver èt één of meer van z’n bronlimietn overschreedn.";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "Dezen thuusserver è z’n limiet vo moandeliks actieve gebrukers bereikt.";
+"login_error_resource_limit_exceeded_message_contact" = "\n\nContacteert je dienstbeheerder vo deze dienst te bluuvn gebruukn.";
+"login_error_resource_limit_exceeded_contact_button" = "Beheerder contacteern";
+// Action
+"no" = "Nee";
+"yes" = "Ja";
+"abort" = "Afbreekn";
+"back" = "Weere";
+"close" = "Sluutn";
+"continue" = "Verdergoan";
+"discard" = "Verwerpn";
+"dismiss" = "Sluutn";
+"retry" = "Herprobeern";
+"sign_up" = "Anmeldn";
+"submit" = "Indienn";
+"submit_code" = "Code indienn";
+"set_power_level" = "Machtsniveau instelln";
+"set_default_power_level" = "Machtsniveau herinstelln";
+"set_moderator" = "Benoemn tou moderator";
+"set_admin" = "Benoemn tou beheerder";
+"start_chat" = "Gesprek beginn";
+"start_voice_call" = "Sproakiproep beginn";
+"start_video_call" = "Video-iproep beginn";
+"mention" = "Vermeldn";
+"select_account" = "Selecteert een account";
+"attach_media" = "Media van de bibliotheek byvoegn";
+"capture_media" = "Fotootje/filmtje moakn";
+"invite_user" = "Matrix-gebruker uutnodign";
+"reset_to_default" = "Standoardwoardn herstelln";
+"resend_message" = "Bericht hersteurn";
+"select_all" = "Alles selecteern";
+"cancel_upload" = "Upload annuleern";
+"cancel_download" = "Download annuleern";
+"show_details" = "Details weeregeevn";
+"answer_call" = "Iproep beantwoordn";
+"reject_call" = "Iproep afwyzn";
+"end_call" = "Iphangn";
+"ignore" = "Negeern";
+"unignore" = "Stoppen me negeern";
+// Events formatter
+"notice_avatar_changed_too" = "(profielfoto is ook veranderd gewist)";
+"notice_room_name_removed" = "%@ èt de gespreksnoame verwyderd";
+"notice_room_topic_removed" = "%@ è ’t ounderwerp verwyderd";
+"notice_event_redacted" = "<verwyderd%@>";
+"notice_event_redacted_by" = " deur %@";
+"notice_event_redacted_reason" = " [reden: %@]";
+"notice_profile_change_redacted" = "%@ èt zyn/heur profiel bygewerkt %@";
+"notice_room_created" = "%@ è ’t gesprek angemakt";
+"notice_room_join_rule" = "De toetrediengsregel is: %@";
+"notice_room_power_level_intro" = "’t Machtsniveau van gespreksleden is:";
+"notice_room_power_level_acting_requirement" = "De minimoale machtsniveau waarover dat e gebruker moe beschikkn vooraleer da t’n kut handeln zyn:";
+"notice_room_power_level_event_requirement" = "De minimoale machtsniveaus gerelateerd an gebeurtenissn zyn:";
+"notice_room_aliases" = "De gespreksbynoamn zyn: %@";
+"notice_room_related_groups" = "De groepn da geassocieerd zyn me da gesprek hier zyn: %@";
+"notice_encrypted_message" = "Versleuterd bericht";
+"notice_encryption_enabled" = "%@ èt end-tout-end-versleuterienge angezet (%@-algoritme)";
+"notice_image_attachment" = "fotobylage";
+"notice_audio_attachment" = "geluudsbylage";
+"notice_video_attachment" = "videobylage";
+"notice_location_attachment" = "locoasjebylage";
+"notice_file_attachment" = "bestandsbylage";
+"notice_invalid_attachment" = "oungeldige bylage";
+"notice_unsupported_attachment" = "Nie-oundersteunde bylage: %@";
+"notice_feedback" = "Feedbackgebeurtenisse (id: %@): %@";
+"notice_redaction" = "%@ èt e gebeurtenisse verwyderd (id: %@)";
+"notice_error_unsupported_event" = "Nie-oundersteunde gebeurtenisse";
+"notice_error_unexpected_event" = "Ounverwachte gebeurtenisse";
+"notice_error_unknown_event_type" = "Ounbekend gebeurtenistype";
+"notice_room_history_visible_to_anyone" = "%@ èt de toekomstige gesprekgeschiedenisse voor iedereen zichtboar gemakt.";
+"cancel" = "Annuleern";
+"save" = "Ipsloan";
+"leave" = "Verloatn";
+"invite" = "Uutnodign";
+"notice_room_history_visible_to_members" = "%@ èt de toekomstige gespreksgeschiedenisse voor alle gespreksleedn zichtboar gemakt ghed.";
+"notice_crypto_unable_to_decrypt" = "** Kostege nie ountsleutern: %@ **";
+"notice_crypto_error_unknown_inbound_session_id" = "’t Toestel van den afzender èt uus geen sleuters vo da bericht hier gestuurd ghed.";
+"notice_sticker" = "sticker";
+"notice_in_reply_to" = "In antwoord op";
+// room display name
+"room_displayname_empty_room" = "Leeg gesprek";
+"room_displayname_two_members" = "%@ en %@";
+"room_displayname_more_than_two_members" = "%@ en %@ anderen";
+// Settings
+"settings" = "Instelliengn";
+"settings_enable_inapp_notifications" = "In-app-meldiengn inschoakeln";
+"settings_enable_push_notifications" = "Pushmeldiengn inschoakeln";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/zh_Hans.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/zh_Hans.lproj/MatrixKit.strings
new file mode 100644
index 000000000..87fdb0a0c
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/zh_Hans.lproj/MatrixKit.strings
@@ -0,0 +1,482 @@
+"view" = "视图";
+"back" = "返回";
+"continue" = "继续";
+"leave" = "离开";
+"invite" = "邀请";
+"retry" = "重试";
+"cancel" = "取消";
+"save" = "保存";
+// room details dialog screen
+"room_details_title" = "聊天室详情";
+"matrix" = "Matrix";
+// Login Screen
+"login_create_account" = "创建账户：";
+"login_server_url_placeholder" = "网址（例如 https://matrix.org）";
+"login_home_server_title" = "主服务器网址：";
+"login_home_server_info" = "您的主服务器存储了您所有的对话和账户数据";
+"login_identity_server_title" = "身份认证服务器网址：";
+"login_identity_server_info" = "Matrix 提供了身份认证服务器以验证邮箱地址等是否属于某个 Matrix ID。目前只有 https://matrix.org 支持。";
+"login_user_id_placeholder" = "Matrix ID（例如 @bob:matrix.org 或 bob）";
+"login_password_placeholder" = "密码";
+"login_optional_field" = "可选";
+"login_display_name_placeholder" = "显示名（例如 Bob Obson）";
+"login_email_placeholder" = "电子邮件地址";
+"login_prompt_email_token" = "请输入您的电子邮件认证令牌：";
+"login_error_title" = "登录失败";
+"login_error_registration_is_not_supported" = "目前不支持注册";
+"login_error_forbidden" = "无效的用户名/密码";
+"login_error_unknown_token" = "不能识别特定访问令牌";
+"login_error_bad_json" = "JSON 格式错误";
+"login_error_not_json" = "不包含有效的 JSON";
+"login_error_limit_exceeded" = "发送了太多的请求";
+"login_error_user_in_use" = "此用户名已占用";
+"login_error_login_email_not_yet" = "此电子邮件链接还没有被点击";
+"login_use_fallback" = "使用备用页面";
+"login_leave_fallback" = "取消";
+"login_invalid_param" = "参数无效";
+"register_error_title" = "注册失败";
+"login_error_forgot_password_is_not_supported" = "当前不支持忘记密码";
+// Action
+"no" = "否";
+"yes" = "是";
+"abort" = "中止";
+"close" = "关闭";
+"discard" = "放弃";
+"dismiss" = "无视";
+"sign_up" = "注册";
+"submit" = "提交";
+"submit_code" = "提交码";
+"set_default_power_level" = "重置权限级别";
+"set_moderator" = "设置主持人";
+"set_admin" = "设置管理员";
+"start_chat" = "启动聊天";
+"start_voice_call" = "启动语音通话";
+"start_video_call" = "启动视频通话";
+"mention" = "提到";
+"select_account" = "选择一个账户";
+"attach_media" = "从库附加媒体";
+"capture_media" = "拍照片/视频";
+"invite_user" = "邀请 Matrix 用户";
+"reset_to_default" = "重置到默认";
+"resend_message" = "重新发送此消息";
+"select_all" = "选择全部";
+"cancel_upload" = "取消上传";
+"cancel_download" = "取消下载";
+"show_details" = "显示详情";
+"answer_call" = "接听通话";
+"reject_call" = "拒绝通话";
+"end_call" = "结束通话";
+"ignore" = "忽略";
+"unignore" = "取消忽略";
+// Events formatter
+"notice_avatar_changed_too" = "（头像也已经改变）";
+"notice_room_name_removed" = "%@ 移除了此聊天室的名称";
+"notice_room_topic_removed" = "%@ 移除了话题";
+"notice_event_redacted" = "<redacted%@>";
+"notice_event_redacted_by" = " 由 %@";
+"notice_event_redacted_reason" = " [理由：%@]";
+"notice_profile_change_redacted" = "%@ 已经更新了他的个人档案 %@";
+"notice_room_created" = "%@ 创建并配置了此聊天室。";
+"notice_room_join_rule" = "加入规则是：%@";
+"notice_room_power_level_intro" = "此聊天室成员的权限级别是：";
+"notice_room_power_level_acting_requirement" = "要进行此操作，用户必须具备的最低权限级别是 ：";
+"notice_room_power_level_event_requirement" = "事件所需的最小权限级别：";
+"notice_room_aliases" = "此聊天室的别名是：%@";
+"notice_encrypted_message" = "已加密消息";
+"notice_encryption_enabled" = "%@ 打开了端对端加密（算法 %@）";
+"notice_image_attachment" = "图片附件";
+"notice_audio_attachment" = "音频附件";
+"notice_video_attachment" = "视频附件";
+"notice_location_attachment" = "位置附件";
+"notice_file_attachment" = "文件附件";
+"notice_invalid_attachment" = "无效附件";
+"notice_unsupported_attachment" = "不支持的附件：%@";
+"login_email_info" = "指定邮箱地址可以让其他 Matrix 用户更容易找到您，并允许您可以在未来重置密码。";
+"login_error_no_login_flow" = "我们未能从此主服务器获取认证信息";
+"login_error_do_not_support_login_flows" = "当前我们不支持此主服务器定义的任何或者所有登录流";
+"notice_feedback" = "反馈事件 (id: %@)：%@";
+"notice_redaction" = "%@ 取消了一个事件 (id: %@)";
+"notice_error_unsupported_event" = "不支持的事件";
+"notice_error_unexpected_event" = "意外的事件";
+"notice_error_unknown_event_type" = "未知的事件类型";
+"notice_room_history_visible_to_anyone" = "%@ 将未来的聊天室消息历史设为对所有人可见。";
+"notice_room_history_visible_to_members" = "%@ 将未来的聊天室消息历史设为对所有聊天室成员可见。";
+"notice_room_history_visible_to_members_from_invited_point" = "你将未来的聊天室消息历史设为对所有聊天室成员可见，从他们被邀请时开始。";
+"notice_room_history_visible_to_members_from_joined_point" = "%@ 将未来的聊天室消息历史设为对所有聊天室成员可见，从他们加入时开始。";
+"notice_crypto_unable_to_decrypt" = "** 无法解密：%@ **";
+"notice_crypto_error_unknown_inbound_session_id" = "发送者的会话没有向我们发送此消息的密钥。";
+// room display name
+"room_displayname_empty_room" = "空聊天室";
+"room_displayname_two_members" = "%@ 和 %@";
+"room_displayname_more_than_two_members" = "%@ 和 %@ 个其他人";
+// Settings
+"settings" = "设置";
+"settings_enable_inapp_notifications" = "启用应用内通知";
+"settings_enable_push_notifications" = "启用推送通知";
+"settings_enter_validation_token_for" = "请输入 %@ 的验证令牌：";
+"notification_settings_room_rule_title" = "聊天室：“%@”";
+// Devices
+"device_details_title" = "会话信息\n";
+"device_details_name" = "公开名称\n";
+"device_details_identifier" = "ID\n";
+"device_details_last_seen" = "最近一次上线\n";
+"device_details_last_seen_format" = "%@ @ %@\n";
+"device_details_rename_prompt_message" = "会话的公开名称对与你联络的人可见";
+"device_details_delete_prompt_title" = "认证";
+"device_details_delete_prompt_message" = "此操作需要额外的认证。\n要继续，请输入您的密码。";
+// Encryption information
+"room_event_encryption_info_title" = "端对端加密信息\n\n";
+"room_event_encryption_info_event" = "事件信息\n";
+"room_event_encryption_info_event_user_id" = "用户 ID\n";
+"room_event_encryption_info_event_identity_key" = "Curve25519 认证密钥\n";
+"login_mobile_device" = "移动设备";
+"login_tablet_device" = "平板电脑";
+"login_desktop_device" = "桌面设备";
+"notice_room_related_groups" = "和此聊天室关联的社群是：%@";
+"room_event_encryption_info_event_session_id" = "会话 ID\n";
+"room_event_encryption_info_event_decryption_error" = "解密错误\n";
+"room_event_encryption_info_event_unencrypted" = "未加密";
+"room_event_encryption_info_event_none" = "无";
+"room_event_encryption_info_device" = "\n发送者的会话信息\n";
+"room_event_encryption_info_device_unknown" = "未知会话\n";
+"room_event_encryption_info_device_name" = "公开名称\n";
+"room_event_encryption_info_device_id" = "ID\n";
+"room_event_encryption_info_device_verification" = "验证\n";
+"room_event_encryption_info_device_verified" = "已验证";
+"room_event_encryption_info_device_not_verified" = "未验证";
+"room_event_encryption_info_device_blocked" = "已拉黑";
+"room_event_encryption_info_verify" = "验证…";
+"room_event_encryption_info_unverify" = "取消验证";
+"room_event_encryption_verify_title" = "验证会话\n\n";
+"account_error_display_name_change_failed" = "昵称修改失败";
+"account_error_email_wrong_title" = "邮箱地址无效";
+"account_error_msisdn_wrong_title" = "手机号码无效";
+// Room creation
+"room_creation_name_title" = "聊天室名称：";
+"room_creation_name_placeholder" = "（例如：今天中午吃啥）";
+// Room
+"room_please_select" = "请选择一个聊天室";
+"room_error_join_failed_title" = "加入聊天室失败";
+"room_error_cannot_load_timeline" = "时间线加载失败";
+"room_error_timeline_event_not_found_title" = "时间线位置加载失败";
+"room_left" = "你离开了聊天室";
+"attachment_small" = "小 (~%@）";
+"attachment_medium" = "中 (~%@)";
+"attachment_large" = "大 (~%@)";
+"attachment_cancel_download" = "是否取消下载？";
+"attachment_cancel_upload" = "是否取消上传？";
+"attachment_e2e_keys_import" = "导入…";
+// Search
+"search_no_results" = "没有结果";
+"search_searching" = "正在搜索…";
+// Time
+"format_time_s" = "秒";
+"format_time_m" = "分钟";
+"format_time_h" = "小时";
+"format_time_d" = "天";
+// E2E import
+"e2e_import_room_keys" = "导入聊天室密钥";
+"e2e_import" = "导入";
+"e2e_passphrase_enter" = "输入密码";
+// E2E export
+"e2e_export_room_keys" = "导出聊天室密钥";
+"e2e_export" = "导出";
+"e2e_passphrase_empty" = "密码不能为空";
+// Others
+"user_id_title" = "用户 ID：";
+"offline" = "离线";
+"unsent" = "取消发送";
+"error" = "错误";
+"default" = "默认";
+"private" = "私人";
+"public" = "公开";
+"power_level" = "权限级别";
+"network_error_not_reachable" = "请检查你的网络连接";
+"user_id_placeholder" = "例如：@bob:homeserver";
+"ssl_homeserver_url" = "主服务器网址：%@";
+// Country picker
+"country_picker_title" = "请选择国家";
+// Language picker
+"language_picker_title" = "请选择语言";
+"language_picker_default_language" = "默认（%@）";
+"notice_room_invite" = "%@ 邀请了 %@";
+"notice_room_third_party_invite" = "%@ 邀请 %@ 加入聊天室";
+"notice_room_third_party_registered_invite" = "%@ 同意了 %@ 的邀请";
+"notice_room_join" = "%@ 已加入";
+"notice_room_leave" = "%@ 已退出";
+"notice_room_reject" = "%@ 拒绝了邀请";
+"notice_room_kick" = "%@ 移除了 %@";
+"notice_room_unban" = "%@ 解封了 %@";
+"notice_room_ban" = "%@ 封禁了 %@";
+"notice_room_withdraw" = "%@ 撤回了对 %@ 的邀请";
+"notice_room_reason" = "。理由：%@";
+"notice_avatar_url_changed" = "%@ 更换了头像";
+"notice_display_name_set" = "%@ 将自己的昵称设置为 %@";
+"notice_display_name_changed_from" = "%@ 将自己的昵称从 %@ 改成 %@";
+"notice_display_name_removed" = "%@ 删除了自己的昵称";
+"notice_room_name_changed" = "%@ 将聊天室名称修改为 %@。";
+// button names 
+"ok" = "确定";
+"send" = "发送";
+"copy_button_name" = "复制";
+"resend" = "重新发送";
+"share" = "分享";
+"redact" = "移除";
+"set_power_level" = "设置权限级别";
+"delete" = "删除";
+"create_room" = "创建聊天室";
+"login" = "登录";
+"create_account" = "创建账号";
+"membership_invite" = "邀请";
+"membership_leave" = "退出";
+"membership_ban" = "已被封禁";
+"num_members_one" = "%@ 位用户";
+"num_members_other" = "%@ 位用户";
+"kick" = "移除";
+"ban" = "封禁";
+"unban" = "解封";
+// Login Screen 
+"login_error_already_logged_in" = "已登录";
+"login_error_must_start_http" = "URL 必须以 http[s]:// 开头";
+// Settings screen 
+"settings_title_config" = "选项";
+"settings_title_notifications" = "通知";
+// contacts list screen 
+"invitation_message" = "我想使用 Matrix 和你聊天。请访问 https://martix.org 以了解更多信息。";
+"account_error_matrix_session_is_not_opened" = "没有打开 Matrix 会话";
+"account_error_email_wrong_description" = "此邮箱地址似乎是无效的";
+"account_error_msisdn_wrong_description" = "此手机号码似乎是无效的";
+"room_creation_participants_placeholder" = "（例如：@bob:homeserver1; @john:homeserver2…）";
+"room_creation_participants_title" = "成员：";
+"room_creation_alias_placeholder_with_homeserver" = "（例如：#foo%@）";
+"room_creation_alias_placeholder" = "（例如：#foo:example.org）";
+"room_error_join_failed_empty_room" = "目前无法加入空聊天室。";
+"room_error_name_edition_not_authorized" = "你没有修改聊天室名称所需的权限";
+"room_error_topic_edition_not_authorized" = "你没有修改聊天室话题所需的权限";
+// Room members
+"room_member_ignore_prompt" = "你确定要隐藏所有此用户发送的消息吗？";
+// Contacts
+"contact_mx_users" = "Matrix 用户";
+"contact_local_contacts" = "本地联系人";
+// Groups
+"group_invite_section" = "邀请";
+"group_section" = "群组";
+"e2e_passphrase_confirm" = "确认密码";
+"notification_settings_enable_notifications" = "启用通知";
+// Notification settings screen 
+"notification_settings_disable_all" = "禁用通知";
+"notification_settings_highlight" = "高亮";
+"notification_settings_custom_sound" = "自定义铃声";
+"notification_settings_select_room" = "选择一个聊天室";
+"notification_settings_other_alerts" = "其他警报";
+// gcm section 
+"settings_config_home_server" = "主服务器：%@";
+"settings_config_identity_server" = "身份认证服务器：%@";
+"settings_config_user_id" = "用户 ID：%@";
+"call_ended" = "通话结束";
+// unrecognized SSL certificate
+"ssl_trust" = "信任";
+"ssl_logout_account" = "登出";
+// actions 
+"action_logout" = "登出";
+"ssl_remain_offline" = "忽略";
+"message_unsaved_changes" = "尚有未经保存的修改。现在退出将会取消这些修改。";
+"notice_sticker" = "贴纸";
+"ssl_could_not_verify" = "无法验证远程服务器的身份。";
+// Account
+"account_save_changes" = "保存更改";
+"account_link_email" = "邮箱地址";
+"account_linked_emails" = "邮箱地址";
+"account_email_validation_title" = "等待验证中";
+"account_msisdn_validation_title" = "等待验证中";
+"account_msisdn_validation_error" = "无法验证此手机号。";
+"account_error_picture_change_failed" = "头像修改失败";
+"e2e_passphrase_not_match" = "密码必须匹配";
+"not_supported_yet" = "尚未支持";
+"local_contacts_access_discovery_warning_title" = "发现用户";
+"notice_topic_changed" = "%@ 将话题修改为 \"%@\"。";
+"notice_placed_voice_call" = "%@ 发起了语音通话";
+"notice_placed_video_call" = "%@ 发起了视频通话";
+"notice_answered_video_call" = "%@ 接听了通话";
+"notice_ended_video_call" = "%@ 结束了通话";
+"notification_settings_always_notify" = "总是通知";
+"notification_settings_never_notify" = "从不通知";
+"notification_settings_sender_hint" = "@user:domain.com";
+// call string
+"call_waiting" = "请等待…";
+"call_connecting" = "连接中…";
+"call_ring" = "正在通话…";
+"room_event_encryption_info_event_algorithm" = "算法\n";
+"room_event_encryption_verify_message" = "为验证此会话是否可信，请通过其他方式（例如当面交换或拨打电话）与其拥有者联系，并询问他们该会话的用户设置中的密钥是否与以下密钥匹配：\n\n\t会话名称：%@\n\t会话 ID：%@\n\t会话密钥：%@\n\n如果匹配，请点击下面的按钮。如果不匹配，那么说明有其他人截取了此会话，您可能想点击黑名单按钮。\n\n未来，这个验证过程将会变得更加精致、巧妙一些。";
+"room_event_encryption_info_event_fingerprint_key" = "声称的 Ed25519 指纹密钥\n";
+"room_event_encryption_info_device_fingerprint" = "Ed25519 指纹\n";
+"room_event_encryption_verify_ok" = "验证";
+"room_event_encryption_info_block" = "拉黑";
+"room_event_encryption_info_unblock" = "取消拉黑";
+"room_creation_alias_title" = "聊天室别称：";
+"notice_conference_call_started" = "VoIP 会议已开始";
+"notice_conference_call_request" = "%@ 发起了 VoIP 会议";
+"notice_conference_call_finished" = "VoIP 会议已结束";
+"notification_settings_enable_notifications_warning" = "所有设备上的通知都已被禁用。";
+"notice_in_reply_to" = "回复";
+"account_email_validation_message" = "请检查您的电子邮箱并点击邮件中的链接。完成此操作后，点击继续。";
+"account_email_validation_error" = "无法验证邮箱地址。请检查你的电子邮箱并点击邮件中的链接。完成后，请点击继续";
+"login_error_resource_limit_exceeded_title" = "超出资源使用限制";
+"login_error_resource_limit_exceeded_contact_button" = "联系管理员";
+"login_error_resource_limit_exceeded_message_default" = "此主服务器已超出某资源的使用限制。";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "此主服务器已达到月活跃用户限制。";
+"login_error_resource_limit_exceeded_message_contact" = "\n\n请联系管理员以继续使用本服务。";
+"account_msisdn_validation_message" = "我们通过短信向您发送了一条验证码，请在下方输入它。";
+"room_error_timeline_event_not_found" = "应用程序试图加载此聊天室时间线中的特定点，但无法找到该时间点";
+"room_no_power_to_create_conference_call" = "您需要获得邀请权限才能在此聊天室开始会议";
+"room_no_conference_call_in_encrypted_rooms" = "加密聊天室暂不支持通话会议";
+// Reply to message
+"message_reply_to_sender_sent_an_image" = "发送了一张图片。";
+"message_reply_to_sender_sent_an_audio_file" = "发送了一个音频文件。";
+"message_reply_to_sender_sent_a_file" = "发送了一个文件。";
+"message_reply_to_message_to_reply_to_prefix" = "回复";
+"room_member_power_level_prompt" = "该用户将被提升至与您一样的权限级别，所以此操作将无法撤销。\n您确定吗？";
+// Attachment
+"attachment_size_prompt" = "发送为：";
+"attachment_original" = "实际大小 (%@)";
+"attachment_multiselection_size_prompt" = "发送图片为：";
+"attachment_multiselection_original" = "实际大小";
+"attachment_e2e_keys_file_prompt" = "此文件含有 Matrix 客户端导出的密钥。\n您想要查看文件内容还是导入密钥？";
+"message_reply_to_sender_sent_a_video" = "发送了一段视频。";
+"call_invite_expired" = "通话邀请已过期";
+"ssl_fingerprint_hash" = "指纹（%@）：";
+"e2e_import_prompt" = "此操作允许您导入此前从其他 Matrix 客户端上导出的加密密钥。您将能够解密任何该客户端能解密的消息。\n该导出文件受密码保护。您应在此处输入密码以解密该文件。";
+"e2e_export_prompt" = "此操作允许您将加密聊天室中接收到的消息导出为一个本地文件。您将来可以将此文件导入到其他 Matrix 客户端中去解密这些消息。\n导出的文件将允许任何能够读取它的人解密您可以看到的任何加密消息，因此您应该小心保证其安全。";
+"e2e_passphrase_create" = "创建密码";
+"error_common_message" = "出现错误。请稍后再试。";
+// Permissions
+"camera_access_not_granted_for_call" = "视频通话需要摄像头使用权限，但 %@ 无此权限";
+"microphone_access_not_granted_for_call" = "通话需要麦克风使用权限，但 %@ 无此权限";
+"local_contacts_access_not_granted" = "本地通讯录用户查找功能需要通讯录权限，但 %@ 无此权限";
+"local_contacts_access_discovery_warning" = "为了发现已经使用 Matrix 的联系人，%@ 可以把你地址簿里的邮箱地址和电话号码发送给你选定的 Matrix 身份认证服务器。如果支持的话，个人数据会在发送前被哈希——请检查你的身份认证服务器的隐私条款获知更多细节。";
+"notification_settings_global_info" = "通知设置已保存在您的账号中并在所有支持的客户端中共享（包括桌面通知）。\n\n规则会按顺序应用；第一条匹配的规则定义了消息的输出结果。\n因此：按字符规则的通知比按聊天室规则的通知级别更高，而这两者都比按发送者规则的通知级别更高。\n对于同一类型的多条规则，匹配列表中的第一条优先级最高。";
+"notification_settings_per_word_notifications" = "按字符通知";
+"notification_settings_per_word_info" = "单词不区分大小写，并且可能包含 * 通配符。 所以：\nfoo 匹配由单词分隔符包围的字符串 foo（例如标点符号和空格，或一行的开头/结尾）。\nfoo* 匹配任何以 foo 开头的单词。\n*foo* 匹配任何包含3个字母 foo 的单词。";
+"notification_settings_word_to_match" = "匹配的单词";
+"notification_settings_per_room_notifications" = "按聊天室通知";
+"notification_settings_per_sender_notifications" = "按发送者通知";
+"notification_settings_contain_my_user_name" = "有包含我的用户名的消息时用铃声通知";
+"notification_settings_contain_my_display_name" = "有包含我的昵称的消息时用铃声通知";
+"notification_settings_just_sent_to_me" = "有发送给我的消息时用铃声通知";
+"notification_settings_invite_to_a_new_room" = "我被邀请去一个新聊天室时用铃声通知";
+"notification_settings_people_join_leave_rooms" = "有人加入或离开聊天室时发送通知";
+"notification_settings_receive_a_call" = "当我收到通话请求时发送通知";
+"notification_settings_suppress_from_bots" = "取消来自机器人的通知";
+"notification_settings_by_default" = "默认…";
+"notification_settings_notify_all_other" = "为所有其他消息/聊天室发送通知";
+"incoming_video_call" = "视频通话来电";
+"incoming_voice_call" = "语音通话来电";
+"ssl_cert_not_trust" = "这可能意味着有人正在恶意劫持您的流量，或者您的手机不信任远程服务器提供的数字证书。";
+"ssl_cert_new_account_expl" = "如果服务器管理员说这是预期的情况，请确保下面的指纹与管理员提供的指纹相匹配。";
+"ssl_unexpected_existing_expl" = "证书已从一个先前受您的设备信任的证书更改为另一个。这非常反常！建议您 不要 接受此新证书。";
+"ssl_expected_existing_expl" = "证书已从曾受信任的证书更改为不受信任的证书。服务器可能已更新其证书，请联系管理员并核对服务器的指纹。";
+"ssl_only_accept" = "请 仅 在服务器管理员发布了与上述指纹匹配的指纹的情况下接受该证书。";
+"notice_encryption_enabled_ok" = "%@ 启用了端到端加密。";
+"notice_encryption_enabled_unknown_algorithm" = "%1$@ 启用了端到端加密（无法识别的算法 %2$@）。";
+"device_details_rename_prompt_title" = "会话名称";
+"account_error_push_not_allowed" = "未允许通知";
+"notice_room_third_party_revoked_invite" = "%@ 撤回了对 %@ 加入聊天室的邀请";
+"notice_encryption_enabled_ok_by_you" = "你启用了端对端加密。";
+"notice_room_created_by_you_for_dm" = "你加入了。";
+"notice_room_topic_removed_by_you" = "你移除了话题";
+"notice_room_name_removed_by_you_for_dm" = "你移除了名称";
+"notice_room_name_removed_by_you" = "你移除了聊天室名称";
+"notice_conference_call_request_by_you" = "你请求了 VoIP 会议";
+"notice_room_ban_by_you" = "你封禁了 %@";
+"notice_room_unban_by_you" = "你解封了 %@";
+"notice_room_kick_by_you" = "你移除了 %@";
+"notice_room_reject_by_you" = "你拒绝了邀请";
+"notice_room_leave_by_you" = "你退出了";
+"notice_room_join_by_you" = "你加入了";
+"notice_room_third_party_registered_invite_by_you" = "你接受了 %@ 的邀请";
+"notice_room_third_party_invite_by_you_for_dm" = "你邀请了 %@";
+"notice_room_invite_you" = "%@ 邀请了你";
+
+// Notice Events with "You"
+"notice_room_invite_by_you" = "你邀请了 %@";
+"notice_declined_video_call" = "%@ 拒接了通话";
+"notice_room_name_changed_for_dm" = "%@ 将名称修改为 %@。";
+"notice_room_third_party_revoked_invite_for_dm" = "%@ 撤回了对 %@ 的邀请";
+"notice_room_third_party_invite_for_dm" = "%@ 邀请了 %@";
+"room_left_for_dm" = "你离开了";
+"notice_room_power_level_intro_for_dm" = "成员的权限级别是：";
+"notice_room_aliases_for_dm" = "别名是：%@";
+"notice_room_created_for_dm" = "%@ 已加入。";
+"notice_room_name_removed_for_dm" = "%@ 移除了名称";
+"resume_call" = "恢复";
+"notice_encryption_enabled_unknown_algorithm_by_you" = "你启用了端对端加密（无法识别的算法 %@）。";
+"notice_event_redacted_by_you" = " 被你";
+"notice_room_third_party_revoked_invite_by_you" = "你撤回了对 %@ 加入此聊天室的邀请";
+"notice_room_join_rule_public_by_you_for_dm" = "你将此聊天设为公开。";
+"notice_room_join_rule_public_by_you" = "你将此聊天室设为公开。";
+"notice_room_join_rule_public_for_dm" = "%@ 将此聊天设为公开。";
+"notice_room_join_rule_public" = "%@ 将此聊天室设为公开。";
+"notice_room_join_rule_invite_by_you_for_dm" = "你将此聊天设为仅邀请。";
+"notice_room_join_rule_invite_by_you" = "你将此聊天室设为仅邀请。";
+"notice_room_join_rule_invite_for_dm" = "%@ 将此聊天设为仅邀请。";
+//  New
+"notice_room_join_rule_invite" = "%@ 将此聊天室设为仅邀请。";
+"notice_room_history_visible_to_members_from_invited_point_for_dm" = "%@ 将未来的消息设为对所有人可见，从他们被邀请时开始。";
+"notice_room_history_visible_to_members_from_invited_point_by_you_for_dm" = "你将未来的消息设为对所有人可见，从他们被邀请时开始。";
+"notice_room_history_visible_to_members_from_joined_point_by_you_for_dm" = "你将未来的消息设为对所有人可见，从他们加入时开始。";
+"notice_room_history_visible_to_members_from_joined_point_for_dm" = "%@ 将未来的消息设为对所有人可见，从他们加入时开始。";
+"notice_room_history_visible_to_members_from_joined_point_by_you" = "你将未来的聊天室消息历史设为对所有聊天室成员可见，从他们加入时开始。";
+"notice_room_history_visible_to_members_from_invited_point_by_you" = "你将未来的聊天室消息历史设为对所有聊天室成员可见，从他们被邀请时开始。";
+"notice_room_history_visible_to_members_for_dm" = "%@ 将未来的消息设为对所有聊天室成员可见。";
+"notice_room_third_party_invite_by_you" = "你邀请 %@ 加入此聊天室";
+"notice_room_history_visible_to_members_by_you_for_dm" = "你将未来的消息设为对所有聊天室成员可见。";
+"notice_room_history_visible_to_members_by_you" = "你将未来的聊天室消息历史设为对所有聊天室成员可见。";
+"notice_room_history_visible_to_anyone_by_you" = "你将未来的聊天室消息历史设为对所有人可见。";
+"notice_redaction_by_you" = "你撤回了一个事件（id：%@）";
+"notice_room_withdraw_by_you" = "你撤回了对 %@ 的邀请";
+"notice_room_third_party_revoked_invite_by_you_for_dm" = "你撤回了对 %@ 的邀请";
+"call_more_actions_dialpad" = "拨号键盘";
+"call_more_actions_transfer" = "转移";
+"call_more_actions_audio_use_device" = "设备扬声器";
+"call_more_actions_audio_use_headset" = "使用耳机音频";
+"call_more_actions_change_audio_device" = "更改音频设备";
+"call_more_actions_unhold" = "继续";
+"call_more_actions_hold" = "挂起";
+"call_holded" = "你挂起了通话";
+"call_remote_holded" = "%@ 挂起了通话";
+"notice_room_created_by_you" = "你创建并配置了此聊天室。";
+"notice_profile_change_redacted_by_you" = "你更新了你的资料 %@";
+"notice_declined_video_call_by_you" = "你拒绝了通话";
+"notice_ended_video_call_by_you" = "你挂断了通话";
+"notice_answered_video_call_by_you" = "你接听了通话";
+"notice_placed_video_call_by_you" = "你发起了视频通话";
+"notice_placed_voice_call_by_you" = "你发起了语音通话";
+"notice_room_name_changed_by_you_for_dm" = "你将名称修改为 %@。";
+"notice_room_name_changed_by_you" = "你将聊天室名称修改为 %@。";
+"notice_topic_changed_by_you" = "你将话题修改为 \"%@\"。";
+"notice_display_name_set_by_you" = "你将你的昵称设置为 %@";
+"notice_display_name_changed_from_by_you" = "你将你的昵称从 %@ 更改为 %@";
+"notice_display_name_removed_by_you" = "你移除了你的昵称";
+"notice_avatar_url_changed_by_you" = "你更换了头像";
+"call_transfer_to_user" = "转接到 %@";
+"call_ringing" = "响铃中…";
+"call_consulting_with_user" = "与 %@ 商量";
+"call_video_with_user" = "与 %@ 进行视频通话";
+"call_voice_with_user" = "与 %@ 进行语音通话";
+"e2e_passphrase_too_short" = "密码口令太短 (长度至少为 %d 个字符)";
+"microphone_access_not_granted_for_voice_message" = "语音消息需要访问麦克风，但 %@ 无权使用它";
+"message_reply_to_sender_sent_a_voice_message" = "发送了一条语音消息。";
+"attachment_large_with_resolution" = "大 %@ (~%@)";
+"attachment_medium_with_resolution" = "中等 %@ (~%@)";
+"attachment_small_with_resolution" = "小 %@ (~%@)";
+"attachment_size_prompt_message" = "你可以在设置中关闭这个。";
+"attachment_size_prompt_title" = "确认要发送的大小";
+"room_displayname_all_other_participants_left" = "%@ (离开)";
+"auth_reset_password_error_not_found" = "未找到";
+"auth_reset_password_error_unauthorized" = "未经授权";
+"auth_invalid_user_name" = "用户名无效";
+"room_displayname_all_other_members_left" = "%@ (离开)";
+"auth_username_in_use" = "用户名被占用";
+"rename" = "重命名";
+"attachment_unsupported_preview_message" = "文件类型不受支持。";
+"attachment_unsupported_preview_title" = "无法预览";
diff --git a/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/zh_Hant.lproj/MatrixKit.strings b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/zh_Hant.lproj/MatrixKit.strings
new file mode 100644
index 000000000..a30a6d084
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/zh_Hant.lproj/MatrixKit.strings
@@ -0,0 +1,247 @@
+"view" = "檢視";
+"back" = "上一步";
+"continue" = "繼續";
+"leave" = "離開";
+"invite" = "邀請";
+"retry" = "重試";
+"cancel" = "取消";
+"save" = "儲存";
+"matrix" = "Matrix";
+// Login Screen
+"login_create_account" = "建立帳號：";
+"login_server_url_placeholder" = "URL（如 https://matrix.org）";
+"login_home_server_title" = "主伺服器：";
+"login_home_server_info" = "您的主伺服器會儲存所有的對話紀錄跟帳號資料";
+"login_identity_server_title" = "身份認證伺服器：";
+"login_identity_server_info" = "Matrix 提供身份認證伺服器來追蹤電子郵件信箱與 Matrix ID 的關係。目前只有 https://matrix.org 提供這個服務。";
+"login_user_id_placeholder" = "Matrix ID（如 @bob:matrix.org 或 bob）";
+"login_password_placeholder" = "密碼";
+"login_optional_field" = "選擇性";
+"login_display_name_placeholder" = "顯示名稱（如 Bob Obson）";
+"login_email_placeholder" = "電子郵件地址";
+"login_leave_fallback" = "取消";
+// Encryption information
+"room_event_encryption_info_title" = "點對點加密資訊\n\n";
+"room_event_encryption_info_event" = "事件資訊\n";
+"room_event_encryption_info_event_user_id" = "使用者 ID\n";
+"room_event_encryption_info_event_identity_key" = "Curve25519 身份認證金鑰\n";
+"room_event_encryption_info_event_fingerprint_key" = "已聲請之 Ed25519 指紋金鑰\n";
+"room_event_encryption_info_event_algorithm" = "演算法\n";
+"room_event_encryption_info_event_session_id" = "會話 ID\n";
+"room_event_encryption_info_event_decryption_error" = "解密錯誤\n";
+"room_event_encryption_info_event_unencrypted" = "未加密";
+"room_event_encryption_info_event_none" = "無";
+"room_event_encryption_info_device" = "\n發送者的裝置訊息\n";
+"room_event_encryption_info_device_unknown" = "未知的裝置\n";
+"room_event_encryption_info_device_name" = "名稱\n";
+"room_event_encryption_info_device_id" = "裝置 ID\n";
+"room_event_encryption_info_device_verification" = "驗證\n";
+"room_event_encryption_info_device_fingerprint" = "Ed25519 指紋\n";
+"room_event_encryption_info_device_verified" = "已驗證";
+"room_event_encryption_info_device_not_verified" = "未驗證";
+"room_event_encryption_info_device_blocked" = "已列入黑名單";
+"room_event_encryption_info_verify" = "驗證...";
+"room_event_encryption_info_unverify" = "取消驗證";
+"room_event_encryption_info_block" = "黑名單";
+"room_event_encryption_info_unblock" = "解除黑名單";
+"room_event_encryption_verify_title" = "驗證裝置\n\n";
+"room_event_encryption_verify_message" = "若要檢查這個裝置是可被信任的，請透過其他方法聯絡所有者（例如面對面或是在電話中），並詢問在其使用者設定中以下金鑰是否是一致的：\n\n\n\t裝置名稱：%@\n\t裝置 ID：%@\n\t裝置金鑰：%@\n\n若相同，請點選下面的「驗證確認」按鈕。如果不相同，表示有人從中攔截這個裝置，您可能要點選「黑名單」按鈕。\n\n未來驗證手續會更加簡單，若有不便敬請見諒。";
+"room_event_encryption_verify_ok" = "驗證確認";
+// Account
+"account_save_changes" = "儲存修改";
+// Groups
+"group_invite_section" = "邀請";
+// E2E import
+"e2e_import_room_keys" = "匯入聊天室金鑰";
+"e2e_import" = "匯入";
+"e2e_passphrase_enter" = "輸入通關密語";
+// E2E export
+"e2e_export_room_keys" = "匯出房間金鑰";
+"e2e_export" = "匯出";
+"e2e_passphrase_empty" = "通關密語不能為空";
+"e2e_passphrase_not_match" = "通關密語必須符合";
+// Others
+"user_id_title" = "使用者 ID：";
+"offline" = "離線";
+"unsent" = "取消傳送";
+"error" = "錯誤";
+"not_supported_yet" = "尚未支援";
+"default" = "預設";
+"private" = "私密";
+"public" = "公開";
+"power_level" = "權限等級";
+"network_error_not_reachable" = "請檢查您的網路連線";
+"user_id_placeholder" = "例：@bob:homeserver";
+"ssl_homeserver_url" = "家伺服器 URL：%@";
+// Permissions
+"camera_access_not_granted_for_call" = "視訊電話需要使用相機權限，但是 %@ 沒有存取權限";
+"microphone_access_not_granted_for_call" = "電話需要使用麥克風權限，但是 %@ 沒有存取權限";
+"local_contacts_access_not_granted" = "從本機的聯絡資訊探索使用者，需要存取聯絡資訊的權限，但是 %@ 沒有存取權限";
+"local_contacts_access_discovery_warning_title" = "使用者探索";
+"local_contacts_access_discovery_warning" = "%@ 要從您的聯絡資訊上傳電子郵件位址跟電話號碼來探索使用者";
+// Country picker
+"country_picker_title" = "選擇國家";
+// Language picker
+"language_picker_title" = "選擇語言";
+"language_picker_default_language" = "預設 (%@)";
+"notice_room_invite" = "%@ 邀請了 %@";
+"notice_room_third_party_invite" = "%@ 已邀請 %@ 加入聊天室";
+"notice_room_third_party_registered_invite" = "%@ 同意了 %@ 的邀請";
+"notice_room_join" = "%@ 已進入";
+"notice_room_leave" = "%@ 已離開";
+"notice_room_reject" = "%@ 拒絕了邀請";
+"notice_room_kick" = "%@ 踢了 %@";
+"notice_room_unban" = "%@ 解除了 %@ 的封鎖";
+"notice_room_ban" = "%@ 封鎖了 %@";
+"notice_room_withdraw" = "%@ 撤回了 %@ 的邀請";
+"notice_room_reason" = "，原因：%@";
+"notice_avatar_url_changed" = "%@ 變更了頭像";
+"notice_display_name_set" = "%@ 設定了自己的顯示名稱為 %@";
+"notice_display_name_changed_from" = "%@ 將自己的顯示名稱從 %@ 改為 %@";
+"notice_display_name_removed" = "%@ 移除了自己的顯示名稱";
+"notice_topic_changed" = "%@ 已經變更主題為：%@";
+"notice_room_name_changed" = "%@ 將房間名稱變更為 %@";
+"notice_placed_voice_call" = "%@ 開始了語音通話";
+"notice_placed_video_call" = "%@ 開始了視訊通話";
+"notice_answered_video_call" = "%@ 接聽了通話";
+"notice_ended_video_call" = "%@ 結束了通話";
+"notice_conference_call_request" = "%@ 請求了 VoIP 會議";
+"notice_conference_call_started" = "VoIP 會議已開始";
+"notice_conference_call_finished" = "VoIP 會議已結束";
+// button names 
+"ok" = "好";
+"send" = "傳送";
+"copy_button_name" = "複製";
+"resend" = "重新傳送";
+"redact" = "撤除";
+"share" = "分享";
+"set_power_level" = "權限等級";
+"delete" = "刪除";
+// actions 
+"action_logout" = "登出";
+"create_room" = "建立聊天室";
+"login" = "登入";
+"create_account" = "建立帳號";
+"membership_invite" = "邀請";
+"membership_leave" = "離開";
+"membership_ban" = "已被封鎖";
+"num_members_one" = "%@ 位使用者";
+"num_members_other" = "%@ 位使用者";
+"kick" = "踢人";
+"ban" = "封鎖";
+"unban" = "解除封鎖";
+// unrecognized SSL certificate
+"ssl_trust" = "信任";
+"ssl_logout_account" = "登出";
+"ssl_remain_offline" = "忽略";
+"ssl_fingerprint_hash" = "指紋 (%@)：";
+"ssl_could_not_verify" = "無法驗證遠端伺服器的身份。";
+"ssl_cert_not_trust" = "這可能代表有人惡意攔截您的流量，或是裝置無法信任遠端伺服器所提供的憑證。";
+"ssl_cert_new_account_expl" = "如果伺服器管理者表示這是可預期的狀況，請確定以下指紋與管理者提供的一致。";
+"ssl_unexpected_existing_expl" = "這個憑證有別於原本在您裝置所信任的憑證，這個狀況相當不常見。建議您不要信任新的憑證。";
+"ssl_expected_existing_expl" = "這個憑證從原本信任的憑證換成不信任的憑證，可能因為伺服器更新了它的憑證。請聯絡伺服器管理者確認新的指紋一致。";
+"ssl_only_accept" = "只有在伺服器管理者提供的指紋與以上指紋一致時，您才能信任這個憑證。";
+// Devices
+"device_details_title" = "裝置資訊\n";
+"login_error_title" = "登入失敗";
+"login_error_no_login_flow" = "無法從該主伺服器取得驗證訊息";
+"login_error_do_not_support_login_flows" = "目前我們不支援任何該主伺服器定義的登入流程";
+"login_error_registration_is_not_supported" = "目前不支援註冊";
+"login_error_forbidden" = "無效的使用者名稱/密碼";
+"login_error_unknown_token" = "不能識別指定的訪問權杖";
+"login_error_bad_json" = "JSON 格式錯誤";
+"login_error_not_json" = "未包含有效的 JSON";
+"login_error_limit_exceeded" = "已傳送過多的請求";
+"login_error_user_in_use" = "該使用者名稱已被使用";
+"login_error_login_email_not_yet" = "該電子郵件連結向未被點擊";
+"login_use_fallback" = "使用備用頁";
+"login_invalid_param" = "無效的參數";
+"register_error_title" = "註冊失敗";
+"login_tablet_device" = "平板電腦";
+// Action
+"no" = "否";
+"yes" = "是";
+"abort" = "終止";
+"login_email_info" = "指定一個電子郵件地址可以讓其他 Matirx 用戶更容易找到您，並讓您可以在未來重置密碼。";
+"login_prompt_email_token" = "請輸入您的電子郵件認證權杖:";
+"login_error_forgot_password_is_not_supported" = "目前不支援忘記密碼";
+"login_mobile_device" = "行動裝置";
+"login_desktop_device" = "桌上型電腦";
+"close" = "關閉";
+"discard" = "放棄";
+"dismiss" = "無視";
+"sign_up" = "註冊";
+"submit" = "送出";
+"submit_code" = "送出碼";
+"set_default_power_level" = "重設權限等級";
+"set_admin" = "設定管理員";
+"set_moderator" = "設定主持人";
+"start_chat" = "開始聊天";
+"start_voice_call" = "開始語音通話";
+"start_video_call" = "開始視訊通話";
+"mention" = "提到";
+"select_account" = "選擇一個帳號";
+"capture_media" = "拍攝照片/影片";
+"invite_user" = "邀請 Matrix 用戶";
+"reset_to_default" = "重置為預設值";
+"attach_media" = "從庫中附加媒體";
+"resend_message" = "重新傳送該訊息";
+"select_all" = "全選";
+"cancel_upload" = "取消上傳";
+"cancel_download" = "取消下載";
+"show_details" = "顯示詳細資料";
+"answer_call" = "接聽來電";
+"reject_call" = "拒絕來電";
+"end_call" = "結束通話";
+"ignore" = "忽略";
+"unignore" = "取消忽略";
+// Events formatter
+"notice_avatar_changed_too" = "(頭像也已經改變)";
+"notice_room_name_removed" = "%@ 移除了該聊天室的名字";
+"notice_room_topic_removed" = "%@ 移除了該主題";
+"notice_event_redacted_by" = " 由 %@";
+"notice_event_redacted_reason" = " [理由：%@]";
+"notice_profile_change_redacted" = "%@ 已更新他的個人檔案 %@";
+"notice_room_created" = "%@ 創建了該聊天室";
+"notice_room_join_rule" = "加入規則: %@";
+"notice_room_power_level_intro" = "聊天室成員們的權限级别是：";
+"notice_event_redacted" = "<撤回%@>";
+// room details dialog screen
+"room_details_title" = "聊天室詳細資料";
+"notice_encrypted_message" = "已加密的訊息";
+"notice_image_attachment" = "附加圖片";
+"notice_audio_attachment" = "附加音訊";
+"notice_video_attachment" = "附加視訊";
+"notice_location_attachment" = "附加位置資訊";
+"notice_file_attachment" = "附加檔案";
+"notice_invalid_attachment" = "無效的附加資訊";
+"notice_unsupported_attachment" = "未支援的附加資訊：%@";
+"notice_sticker" = "貼圖";
+// room display name
+"room_displayname_empty_room" = "空的聊天室";
+"room_displayname_two_members" = "%@ 和 %@";
+"room_displayname_more_than_two_members" = "%@ 和 %u 個其他人";
+// Settings
+"settings" = "設定";
+"settings_enable_push_notifications" = "啟用推播通知";
+"device_details_name" = "名稱\n";
+"device_details_identifier" = "裝置代碼\n";
+"device_details_last_seen" = "上次使用\n";
+"device_details_rename_prompt_message" = "裝置名稱：";
+"login_error_resource_limit_exceeded_title" = "超過資源限制";
+"login_error_resource_limit_exceeded_message_default" = "此家伺服器已經超過其中一項資源限制。";
+"login_error_resource_limit_exceeded_message_monthly_active_user" = "此家伺服器已經達到其每月活躍使用者限制。";
+"login_error_resource_limit_exceeded_message_contact" = "\n\n請聯絡您的伺服器管理員以繼續使用其服務。";
+"login_error_resource_limit_exceeded_contact_button" = "聯絡管理員";
+"notice_room_power_level_acting_requirement" = "完成此操作之前使用者必須具有的最小權限級別是：";
+"notice_room_power_level_event_requirement" = "事件相關的最小權限級別是：";
+"notice_room_aliases" = "此聊天室別名是：%@";
+"notice_room_related_groups" = "此聊天室關聯的群組是：%@";
+"notice_encryption_enabled" = "%@ 開啓了端對端加密 （演算法 %@）";
+"notice_feedback" = "回報事件 （id：%@）：%@";
+"notice_redaction" = "%@ 取消了一个事件 (id: %@)";
+"notice_error_unsupported_event" = "不支援的事件";
+"notice_error_unexpected_event" = "意外事件";
+"notice_error_unknown_event_type" = "未知的事件類型";
+"notice_room_history_visible_to_anyone" = "%@ 讓任何人都能看到未來的聊天室歷史記錄。";
+"notice_room_history_visible_to_members" = "%@ 讓所有聊天室成員都能看到未來的房間歷史記錄。";
diff --git a/Riot/Modules/MatrixKit/Categories/DTHTMLElement+MatrixKit.swift b/Riot/Modules/MatrixKit/Categories/DTHTMLElement+MatrixKit.swift
new file mode 100644
index 000000000..9e4315d09
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Categories/DTHTMLElement+MatrixKit.swift
@@ -0,0 +1,97 @@
+//
+// Copyright 2020 The Matrix.org Foundation C.I.C
+//
+// 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 DTCoreText
+
+public extension DTHTMLElement {
+    typealias ImageHandler = (_ sourceURL: String, _ width: CGFloat, _ height: CGFloat) -> URL?
+    
+    /// Sanitize the element using the given parameters.
+    /// - Parameters:
+    ///   - allowedHTMLTags: An array of tags that are allowed. All other tags will be removed.
+    ///   - font: The default font to use when resetting the content of any unsupported tags.
+    ///   - imageHandler: An optional image handler to be run on `img` tags (if allowed) to update the `src` attribute.
+    @objc func sanitize(with allowedHTMLTags: [String], bodyFont font: UIFont, imageHandler: ImageHandler?) {
+        if let name = name, !allowedHTMLTags.contains(name) {
+            
+            // This is an unsupported tag.
+            // Remove any attachments to fix rendering.
+            textAttachment = nil
+            
+            // If the element has plain text content show that,
+            // otherwise prevent the tag from displaying.
+            if let stringContent = attributedString()?.string,
+               !stringContent.isEmpty,
+               let element = DTTextHTMLElement(name: nil, attributes: nil) {
+                element.setText(stringContent)
+                removeAllChildNodes()
+                addChildNode(element)
+                
+                if let parent = parent() {
+                    element.inheritAttributes(from: parent)
+                } else {
+                    fontDescriptor = DTCoreTextFontDescriptor()
+                    fontDescriptor.fontFamily = font.familyName
+                    fontDescriptor.fontName = font.fontName
+                    fontDescriptor.pointSize = font.pointSize
+                    paragraphStyle = DTCoreTextParagraphStyle.default()
+                    
+                    element.inheritAttributes(from: self)
+                }
+                element.interpretAttributes()
+                
+            } else if let parent = parent() {
+                parent.removeChildNode(self)
+            } else {
+                didOutput = true
+            }
+            
+        } else {
+            // Process images with the handler when self is an image tag.
+            if name == "img", let imageHandler = imageHandler {
+                process(with: imageHandler)
+            }
+            
+            // This element is a supported tag, but it may contain children that aren't,
+            // so santize all child nodes to ensure correct tags.
+            if let childNodes = childNodes as? [DTHTMLElement] {
+                childNodes.forEach { $0.sanitize(with: allowedHTMLTags, bodyFont: font, imageHandler: imageHandler) }
+            }
+        }
+    }
+    
+    /// Process the element with the supplied image handler.
+    private func process(with imageHandler: ImageHandler) {
+        // Get the values required to pass to the image handler
+        guard let sourceURL = attributes["src"] as? String else { return }
+        
+        var width: CGFloat = -1
+        if let widthString = attributes["width"] as? String,
+           let widthDouble = Double(widthString) {
+            width = CGFloat(widthDouble)
+        }
+        
+        var height: CGFloat = -1
+        if let heightString = attributes["height"] as? String,
+           let heightDouble = Double(heightString) {
+            height = CGFloat(heightDouble)
+        }
+        
+        // If the handler returns an updated URL, update the text attachment.
+        guard let localSourceURL = imageHandler(sourceURL, width, height) else { return }
+        textAttachment.contentURL = localSourceURL
+    }
+}
diff --git a/Riot/Modules/MatrixKit/Categories/MXAggregatedReactions+MatrixKit.h b/Riot/Modules/MatrixKit/Categories/MXAggregatedReactions+MatrixKit.h
new file mode 100644
index 000000000..f4d023328
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Categories/MXAggregatedReactions+MatrixKit.h
@@ -0,0 +1,30 @@
+/*
+ Copyright 2019 The Matrix.org Foundation C.I.C
+
+ 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 "MXKEventFormatter.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ Define a `MXEvent` category at matrixKit level to store data related to UI handling.
+ */
+@interface MXAggregatedReactions (MatrixKit)
+
+- (nullable MXAggregatedReactions *)aggregatedReactionsWithSingleEmoji;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Riot/Modules/MatrixKit/Categories/MXAggregatedReactions+MatrixKit.m b/Riot/Modules/MatrixKit/Categories/MXAggregatedReactions+MatrixKit.m
new file mode 100644
index 000000000..4d4baee51
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Categories/MXAggregatedReactions+MatrixKit.m
@@ -0,0 +1,44 @@
+/*
+ Copyright 2019 The Matrix.org Foundation C.I.C
+
+ 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 "MXAggregatedReactions+MatrixKit.h"
+
+#import "MXKTools.h"
+
+@implementation MXAggregatedReactions (MatrixKit)
+
+- (nullable MXAggregatedReactions *)aggregatedReactionsWithSingleEmoji
+{
+    NSMutableArray *reactions = [NSMutableArray arrayWithCapacity:self.reactions.count];
+    for (MXReactionCount *reactionCount in self.reactions)
+    {
+        if ([MXKTools isSingleEmojiString:reactionCount.reaction])
+        {
+            [reactions addObject:reactionCount];
+        }
+    }
+
+    MXAggregatedReactions *aggregatedReactionsWithSingleEmoji;
+    if (reactions.count)
+    {
+        aggregatedReactionsWithSingleEmoji = [MXAggregatedReactions new];
+        aggregatedReactionsWithSingleEmoji.reactions = reactions;
+    }
+
+    return aggregatedReactionsWithSingleEmoji;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Categories/MXEvent+MatrixKit.h b/Riot/Modules/MatrixKit/Categories/MXEvent+MatrixKit.h
new file mode 100644
index 000000000..9ef0eb1b1
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Categories/MXEvent+MatrixKit.h
@@ -0,0 +1,34 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKEventFormatter.h"
+
+/**
+ Define a `MXEvent` category at matrixKit level to store data related to UI handling.
+ */
+@interface MXEvent (MatrixKit)
+
+/**
+ The potential error observed when the event formatter tried to stringify the event (MXKEventFormatterErrorNone by default).
+ */
+@property (nonatomic) MXKEventFormatterError mxkEventFormatterError;
+
+/**
+ Tell whether the event is highlighted or not (NO by default).
+ */
+@property (nonatomic) BOOL mxkIsHighlighted;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Categories/MXEvent+MatrixKit.m b/Riot/Modules/MatrixKit/Categories/MXEvent+MatrixKit.m
new file mode 100644
index 000000000..53c79e6c9
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Categories/MXEvent+MatrixKit.m
@@ -0,0 +1,52 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXEvent+MatrixKit.h"
+#import <objc/runtime.h>
+
+@implementation MXEvent (MatrixKit)
+
+- (MXKEventFormatterError)mxkEventFormatterError
+{
+    NSNumber *associatedError = objc_getAssociatedObject(self, @selector(mxkEventFormatterError));
+    if (associatedError)
+    {
+        return [associatedError unsignedIntegerValue];
+    }
+    return MXKEventFormatterErrorNone;
+}
+
+- (void)setMxkEventFormatterError:(MXKEventFormatterError)mxkEventFormatterError
+{
+    objc_setAssociatedObject(self, @selector(mxkEventFormatterError), [NSNumber numberWithUnsignedInteger:mxkEventFormatterError], OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+- (BOOL)mxkIsHighlighted
+{
+    NSNumber *associatedIsHighlighted = objc_getAssociatedObject(self, @selector(mxkIsHighlighted));
+    if (associatedIsHighlighted)
+    {
+        return [associatedIsHighlighted boolValue];
+    }
+    return NO;
+}
+
+- (void)setMxkIsHighlighted:(BOOL)mxkIsHighlighted
+{
+    objc_setAssociatedObject(self, @selector(mxkIsHighlighted), [NSNumber numberWithBool:mxkIsHighlighted], OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Categories/MXRoom+Sync.h b/Riot/Modules/MatrixKit/Categories/MXRoom+Sync.h
new file mode 100644
index 000000000..b95389d39
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Categories/MXRoom+Sync.h
@@ -0,0 +1,34 @@
+/*
+ Copyright 2018 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/Foundation.h>
+
+#import <MatrixSDK/MatrixSDK.h>
+
+/**
+ Temporary category to help in the transition from synchronous access to room.state
+ to asynchronous access.
+ */
+@interface MXRoom (Sync)
+
+/**
+ Get the room state if it has been already loaded else return nil.
+
+ Use this method only where you are sure the room state is already mounted.
+ */
+@property (nonatomic, readonly) MXRoomState *dangerousSyncState;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Categories/MXRoom+Sync.m b/Riot/Modules/MatrixKit/Categories/MXRoom+Sync.m
new file mode 100644
index 000000000..8866c8a49
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Categories/MXRoom+Sync.m
@@ -0,0 +1,36 @@
+/*
+ Copyright 2018 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 "MXRoom+Sync.h"
+
+@implementation MXRoom (Sync)
+
+- (MXRoomState *)dangerousSyncState
+{
+    __block MXRoomState *syncState;
+
+    // If syncState is called from the right place, the following call will be
+    // synchronous and every thing will be fine
+    [self state:^(MXRoomState *roomState) {
+        syncState = roomState;
+    }];
+
+    NSAssert(syncState, @"[MXRoom+Sync] syncState failed. Are you sure the state of the room has been already loaded?");
+
+    return syncState;
+}
+
+@end
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessage.swift b/Riot/Modules/MatrixKit/Categories/MXSession+MatrixKit.h
similarity index 62%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessage.swift
rename to Riot/Modules/MatrixKit/Categories/MXSession+MatrixKit.h
index 46ad7daf8..188b6b40b 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessage.swift
+++ b/Riot/Modules/MatrixKit/Categories/MXSession+MatrixKit.h
@@ -1,5 +1,5 @@
 // 
-// Copyright 2021 New Vector Ltd
+// Copyright 2020 The Matrix.org Foundation C.I.C
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,14 +14,15 @@
 // limitations under the License.
 //
 
-import Foundation
+#import <MatrixSDK/MatrixSDK.h>
 
-/// A chat message send to the timeline within a room.
-struct TemplateRoomChatMessage {
-    let id: String
-    let content: TemplateRoomChatMessageContent
-    let sender: TemplateRoomChatMember
-    let timestamp: Date
-}
+NS_ASSUME_NONNULL_BEGIN
 
-extension TemplateRoomChatMessage: Identifiable {}
+@interface MXSession (MatrixKit)
+
+/// Flag to indicate whether the session is in a suitable state to show some activity indicators on UI.
+@property (nonatomic, readonly) BOOL shouldShowActivityIndicator;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Riot/Modules/MatrixKit/Categories/MXSession+MatrixKit.m b/Riot/Modules/MatrixKit/Categories/MXSession+MatrixKit.m
new file mode 100644
index 000000000..6d136c306
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Categories/MXSession+MatrixKit.m
@@ -0,0 +1,34 @@
+// 
+// Copyright 2020 The Matrix.org Foundation C.I.C
+//
+// 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 "MXSession+MatrixKit.h"
+
+@implementation MXSession (MatrixKit)
+
+- (BOOL)shouldShowActivityIndicator
+{
+    switch (self.state)
+    {
+        case MXSessionStateInitialised:
+        case MXSessionStateProcessingBackgroundSyncCache:
+        case MXSessionStateSyncInProgress:
+            return YES;
+        default:
+            return NO;
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Categories/NSAttributedString+MatrixKit.swift b/Riot/Modules/MatrixKit/Categories/NSAttributedString+MatrixKit.swift
new file mode 100644
index 000000000..c72e5c76c
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Categories/NSAttributedString+MatrixKit.swift
@@ -0,0 +1,32 @@
+// 
+// Copyright 2020 The Matrix.org Foundation C.I.C
+//
+// 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
+
+public extension NSAttributedString {
+    /// Returns a string created by joining all ranges of the attributed string that don't have
+    /// the `kMXKToolsBlockquoteMarkAttribute` attribute.
+    @objc func mxk_unquotedString() -> NSString? {
+        var unquotedSubstrings = [String]()
+        
+        enumerateAttributes(in: NSRange(location: 0, length: self.length), options: []) { attributes, range, stop in
+            guard !attributes.keys.contains(where: { $0.rawValue == kMXKToolsBlockquoteMarkAttribute }) else { return }
+            unquotedSubstrings.append(self.attributedSubstring(from: range).string)
+        }
+        
+        return unquotedSubstrings.joined(separator: " ") as NSString
+    }
+}
diff --git a/Riot/Modules/MatrixKit/Categories/NSBundle+MXKLanguage.h b/Riot/Modules/MatrixKit/Categories/NSBundle+MXKLanguage.h
new file mode 100644
index 000000000..f8e5dff5d
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Categories/NSBundle+MXKLanguage.h
@@ -0,0 +1,54 @@
+/*
+ Copyright 2017 Vector Creations 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/Foundation.h>
+
+@interface NSBundle (MXKLanguage)
+
+/**
+ Set the application language independently from the device language.
+ 
+ The language can be changed at runtime but the app display must be reloaded.
+ 
+ @param language the ISO language code. nil lets the OS choose it according to the device language
+                 and languages available in the app bundle.
+ */
++ (void)mxk_setLanguage:(NSString *)language;
+
+/**
+ The language set by mxk_setLanguage.
+
+ @return the ISO language code of the current language.
+ */
++ (NSString *)mxk_language;
+
+/**
+ Some strings may lack a translation in a language. 
+ Use mxk_setFallbackLanguage to define a fallback language where all the 
+ translation is complete.
+
+ @param language the ISO language code.
+ */
++ (void)mxk_setFallbackLanguage:(NSString*)language;
+
+/**
+ The fallback language set by mxk_setFallbackLanguage.
+
+ @return the ISO language code of the current fallback language.
+ */
++ (NSString *)mxk_fallbackLanguage;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Categories/NSBundle+MXKLanguage.m b/Riot/Modules/MatrixKit/Categories/NSBundle+MXKLanguage.m
new file mode 100644
index 000000000..a0112bf99
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Categories/NSBundle+MXKLanguage.m
@@ -0,0 +1,103 @@
+/*
+ Copyright 2017 Vector Creations 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 "NSBundle+MXKLanguage.h"
+
+#import <objc/runtime.h>
+
+static const char _bundle = 0;
+static const char _fallbackBundle = 0;
+static const char _language = 0;
+static const char _fallbackLanguage = 0;
+
+@interface MXKLanguageBundle : NSBundle
+@end
+
+@implementation MXKLanguageBundle
+
+- (NSString*)localizedStringForKey:(NSString *)key value:(NSString *)value table:(NSString *)tableName
+{
+    NSBundle* bundle = objc_getAssociatedObject(self, &_bundle);
+
+    // Check if the translation is available in the selected or default language.
+    // Use "_", a string that does not worth to be translated, as default value to mark
+    // a key that does not have a translation.
+    NSString *localizedString = bundle ? [bundle localizedStringForKey:key value:@"_" table:tableName] : [super localizedStringForKey:key value:@"_" table:tableName];
+
+    if (!localizedString || (localizedString.length == 1 && [localizedString isEqualToString:@"_"]))
+    {
+        // Use the string in the fallback language
+        NSBundle *fallbackBundle = objc_getAssociatedObject(self, &_fallbackBundle);
+        localizedString = [fallbackBundle localizedStringForKey:key value:value table:tableName];
+    }
+
+    return localizedString;
+}
+@end
+
+@implementation NSBundle (MXKLanguage)
+
++ (void)mxk_setLanguage:(NSString *)language
+{
+    [self setupMXKLanguageBundle];
+
+    // [NSBundle localizedStringForKey] calls will be redirected to the bundle corresponding
+    // to "language"
+    objc_setAssociatedObject([NSBundle mainBundle],
+                             &_bundle, language ? [NSBundle bundleWithPath:[[NSBundle mainBundle] pathForResource:language ofType:@"lproj"]] : nil,
+                             OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+
+    objc_setAssociatedObject([NSBundle mainBundle],
+                             &_language, language,
+                             OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
++ (NSString *)mxk_language
+{
+    return objc_getAssociatedObject([NSBundle mainBundle], &_language);
+}
+
++ (void)mxk_setFallbackLanguage:(NSString *)language
+{
+    [self setupMXKLanguageBundle];
+
+    objc_setAssociatedObject([NSBundle mainBundle],
+                             &_fallbackBundle, language ? [NSBundle bundleWithPath:[[NSBundle mainBundle] pathForResource:language ofType:@"lproj"]] : nil,
+                             OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+
+    objc_setAssociatedObject([NSBundle mainBundle],
+                             &_fallbackLanguage, language,
+                             OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
++ (NSString *)mxk_fallbackLanguage
+{
+    return objc_getAssociatedObject([NSBundle mainBundle], &_fallbackLanguage);
+}
+
+#pragma mark - Private methods
+
++ (void)setupMXKLanguageBundle
+{
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+
+        // Use MXKLanguageBundle as the [NSBundle mainBundle] class
+        object_setClass([NSBundle mainBundle], [MXKLanguageBundle class]);
+    });
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Categories/NSBundle+MatrixKit.h b/Riot/Modules/MatrixKit/Categories/NSBundle+MatrixKit.h
new file mode 100644
index 000000000..9bcc5572a
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Categories/NSBundle+MatrixKit.h
@@ -0,0 +1,61 @@
+/*
+ Copyright 2015 OpenMarket 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/UIKit.h>
+
+/**
+ Define a `NSBundle` category at MatrixKit level to retrieve images and sounds from MatrixKit Assets bundle.
+ */
+@interface NSBundle (MatrixKit)
+
+/**
+ Retrieve an image from MatrixKit Assets bundle.
+ 
+ @param name image file name without extension.
+ @return a UIImage instance (nil if the file does not exist).
+ */
++ (UIImage *)mxk_imageFromMXKAssetsBundleWithName:(NSString *)name;
+
+/**
+ Retrieve an audio file url from MatrixKit Assets bundle.
+ 
+ @param name audio file name without extension.
+ @return a NSURL instance.
+ */
++ (NSURL *)mxk_audioURLFromMXKAssetsBundleWithName:(NSString *)name;
+
+/**
+ Customize the table used to retrieve the localized version of a string during [mxk_localizedStringForKey:] call.
+ If the key is not defined in this table, the localized string is retrieved from the default table "MatrixKit.strings".
+ 
+ @param tableName the name of the table containing the key-value pairs. Also, the suffix for the strings file (a file with the .strings extension) to store the localized string.
+ */
++ (void)mxk_customizeLocalizedStringTableName:(NSString*)tableName;
+
+/**
+ Retrieve localized string from the customized table. If none, MatrixKit Assets bundle is used.
+ 
+ @param key The string key.
+ @return The localized string.
+ */
++ (NSString *)mxk_localizedStringForKey:(NSString *)key;
+
+/**
+ An AppExtension-compatible wrapper for bundleForClass.
+ */
++ (NSBundle *)mxk_bundleForClass:(Class)aClass;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Categories/NSBundle+MatrixKit.m b/Riot/Modules/MatrixKit/Categories/NSBundle+MatrixKit.m
new file mode 100644
index 000000000..70a75a59b
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Categories/NSBundle+MatrixKit.m
@@ -0,0 +1,150 @@
+/*
+ Copyright 2015 OpenMarket 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 "NSBundle+MatrixKit.h"
+#import "NSBundle+MXKLanguage.h"
+#import "MXKViewController.h"
+
+@implementation NSBundle (MatrixKit)
+
+static NSString *customLocalizedStringTableName = nil;
+
++ (NSBundle*)mxk_assetsBundle
+{
+    // Get the bundle within MatrixKit
+    NSBundle *bundle = [NSBundle mxk_bundleForClass:[MXKViewController class]];
+    NSURL *assetsBundleURL = [bundle URLForResource:@"MatrixKitAssets" withExtension:@"bundle"];
+
+    return [NSBundle bundleWithURL:assetsBundleURL];
+}
+
++ (NSBundle*)mxk_languageBundle
+{
+    NSString *language = [NSBundle mxk_language];
+    NSBundle *bundle = [NSBundle mxk_assetsBundle];
+
+    // If there is a runtime language (different from the legacy language chose by the OS),
+    // return the sub bundle for this language
+    if (language)
+    {
+        bundle =  [NSBundle bundleWithPath:[bundle pathForResource:[NSBundle mxk_language] ofType:@"lproj"]];
+    }
+
+    return bundle;
+}
+
++ (NSBundle*)mxk_fallbackLanguageBundle
+{
+    NSString *fallbackLanguage = [NSBundle mxk_fallbackLanguage];
+    NSBundle *bundle = [NSBundle mxk_assetsBundle];
+
+    // Return the sub bundle of the fallback language if any
+    if (fallbackLanguage)
+    {
+        bundle =  [NSBundle bundleWithPath:[bundle pathForResource:fallbackLanguage ofType:@"lproj"]];
+    }
+
+    return bundle;
+}
+
+// use a cache to avoid loading images from file system.
+// It often triggers an UI lag.
+static MXLRUCache *imagesResourceCache = nil;
+
++ (UIImage *)mxk_imageFromMXKAssetsBundleWithName:(NSString *)name
+{
+    // use a cache to avoid loading the image at each call
+    if (!imagesResourceCache)
+    {
+        imagesResourceCache = [[MXLRUCache alloc] initWithCapacity:20];
+    }
+    
+    NSString *imagePath = [[NSBundle mxk_assetsBundle] pathForResource:name ofType:@"png" inDirectory:@"Images"];
+    UIImage* image = (UIImage*)[imagesResourceCache get:imagePath];
+    
+    // the image does not exist
+    if (!image)
+    {
+        // retrieve it
+        image = [UIImage imageWithContentsOfFile:imagePath];
+        // and store it in the cache.
+        [imagesResourceCache put:imagePath object:image];
+    }
+    
+    return image;
+}
+
++ (NSURL*)mxk_audioURLFromMXKAssetsBundleWithName:(NSString *)name
+{
+    return [NSURL fileURLWithPath:[[NSBundle mxk_assetsBundle] pathForResource:name ofType:@"mp3" inDirectory:@"Sounds"]];
+}
+
++ (void)mxk_customizeLocalizedStringTableName:(NSString*)tableName
+{
+    customLocalizedStringTableName = tableName;
+}
+
++ (NSString *)mxk_localizedStringForKey:(NSString *)key
+{
+    NSString *localizedString;
+    
+    // Check first customized table
+    // Use "_", a string that does not worth to be translated, as default value to mark
+    // a key that does not have a value in the customized table.
+    if (customLocalizedStringTableName)
+    {
+        localizedString = NSLocalizedStringWithDefaultValue(key, customLocalizedStringTableName, [NSBundle mainBundle], @"_", nil);
+    }
+
+    if (!localizedString || (localizedString.length == 1 && [localizedString isEqualToString:@"_"]))
+    {
+        // Check if we need to manage a fallback language
+        // as we do in NSBundle+MXKLanguage
+        NSString *language = [NSBundle mxk_language];
+        NSString *fallbackLanguage = [NSBundle mxk_fallbackLanguage];
+
+        BOOL manageFallbackLanguage = fallbackLanguage && ![fallbackLanguage isEqualToString:language];
+
+        localizedString = NSLocalizedStringWithDefaultValue(key, @"MatrixKit",
+                                                            [NSBundle mxk_languageBundle],
+                                                            manageFallbackLanguage ? @"_" : nil,
+                                                            nil);
+
+        if (manageFallbackLanguage
+            && (!localizedString || (localizedString.length == 1 && [localizedString isEqualToString:@"_"])))
+        {
+            // The translation is not available, use the fallback language
+            localizedString = NSLocalizedStringFromTableInBundle(key, @"MatrixKit",
+                                                                 [NSBundle mxk_fallbackLanguageBundle],
+                                                                 nil);
+        }
+    }
+    
+    return localizedString;
+}
+
++ (NSBundle *)mxk_bundleForClass:(Class)aClass
+{
+    NSBundle *bundle = [NSBundle bundleForClass:aClass];
+    if ([[bundle.bundleURL pathExtension] isEqualToString:@"appex"])
+    {
+        // For App extensions, peel off two levels
+        bundle = [NSBundle bundleWithURL:[[bundle.bundleURL URLByDeletingLastPathComponent] URLByDeletingLastPathComponent]];
+    }
+    return bundle;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Categories/NSString+MatrixKit.swift b/Riot/Modules/MatrixKit/Categories/NSString+MatrixKit.swift
new file mode 100644
index 000000000..0a7826571
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Categories/NSString+MatrixKit.swift
@@ -0,0 +1,66 @@
+// 
+// Copyright 2020 The Matrix.org Foundation C.I.C
+//
+// 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 MatrixSDK.MXLog
+
+public extension NSString {
+    /// Gets the first URL contained in the string ignoring any links to hosts defined in
+    /// the `firstURLDetectionIgnoredHosts` property of `MXKAppSettings`.
+    /// - Returns: A URL if detected, otherwise nil.
+    @objc func mxk_firstURLDetected() -> NSURL? {
+        let hosts = MXKAppSettings.standard().firstURLDetectionIgnoredHosts ?? []
+        return mxk_firstURLDetected(ignoring: hosts)
+    }
+    
+    /// Gets the first URL contained in the string ignoring any links to the specified hosts.
+    /// - Returns: A URL if detected, otherwise nil.
+    @objc func mxk_firstURLDetected(ignoring ignoredHosts: [String]) -> NSURL? {
+        guard let linkDetector = try? NSDataDetector(types: NSTextCheckingResult.CheckingType.link.rawValue) else {
+            MXLog.debug("[NSString+URLDetector]: Unable to create link detector.")
+            return nil
+        }
+        
+        var detectedURL: NSURL?
+        
+        // enumerate all urls that were found in the string to ensure
+        // detection of a valid link if there are invalid links preceding it
+        linkDetector.enumerateMatches(in: self as String,
+                                      options: [],
+                                      range: NSRange(location: 0, length: self.length)) { match, flags, stop in
+            guard let match = match else { return }
+            
+            // check if the match is a valid url
+            let urlString = self.substring(with: match.range)
+            guard let url = NSURL(string: urlString) else { return }
+            
+            // ensure the match is a web link
+            guard let scheme = url.scheme?.lowercased(),
+                  scheme == "https" || scheme == "http"
+            else { return }
+            
+            // discard any links to ignored hosts
+            guard let host = url.host?.lowercased(),
+                  !ignoredHosts.contains(host)
+            else { return }
+            
+            detectedURL = url
+            stop.pointee = true
+        }
+        
+        return detectedURL
+    }
+}
diff --git a/Riot/Modules/MatrixKit/Categories/UIAlertController+MatrixKit.h b/Riot/Modules/MatrixKit/Categories/UIAlertController+MatrixKit.h
new file mode 100644
index 000000000..d30b01787
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Categories/UIAlertController+MatrixKit.h
@@ -0,0 +1,31 @@
+/*
+ Copyright 2017 Vector Creations 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/UIKit.h>
+
+/**
+ Define a `UIAlertController` category at MatrixKit level to handle accessibility identifiers.
+ */
+@interface UIAlertController (MatrixKit)
+
+/**
+ Apply an accessibility on the alert view and its items (actions and text fields).
+ 
+ @param accessibilityIdentifier the identifier.
+ */
+- (void)mxk_setAccessibilityIdentifier:(NSString *)accessibilityIdentifier;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Categories/UIAlertController+MatrixKit.m b/Riot/Modules/MatrixKit/Categories/UIAlertController+MatrixKit.m
new file mode 100644
index 000000000..716da03ce
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Categories/UIAlertController+MatrixKit.m
@@ -0,0 +1,38 @@
+/*
+ Copyright 2017 Vector Creations 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 "UIAlertController+MatrixKit.h"
+
+@implementation UIAlertController (MatrixKit)
+
+- (void)mxk_setAccessibilityIdentifier:(NSString *)accessibilityIdentifier
+{
+    self.view.accessibilityIdentifier = accessibilityIdentifier;
+    
+    for (UIAlertAction *action in self.actions)
+    {
+        action.accessibilityLabel = [NSString stringWithFormat:@"%@Action%@", accessibilityIdentifier, action.title];
+    }
+    
+    NSArray *textFieldArray = self.textFields;
+    for (NSUInteger index = 0; index < textFieldArray.count; index++)
+    {
+        UITextField *textField = textFieldArray[index];
+        textField.accessibilityIdentifier = [NSString stringWithFormat:@"%@TextField%tu", accessibilityIdentifier, index];
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Categories/UITextView+MatrixKit.h b/Riot/Modules/MatrixKit/Categories/UITextView+MatrixKit.h
new file mode 100644
index 000000000..775aa9f8b
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Categories/UITextView+MatrixKit.h
@@ -0,0 +1,33 @@
+/*
+ Copyright 2019 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;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface UITextView(MatrixKit)
+
+/**
+ Determine if there is a link near a location point in UITextView bounds.
+
+ @param point The point inside the UITextView bounds
+ @return YES to indicate that a link has been detected near the location point.
+ */
+- (BOOL)isThereALinkNearPoint:(CGPoint)point;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Riot/Modules/MatrixKit/Categories/UITextView+MatrixKit.m b/Riot/Modules/MatrixKit/Categories/UITextView+MatrixKit.m
new file mode 100644
index 000000000..b22817f60
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Categories/UITextView+MatrixKit.m
@@ -0,0 +1,54 @@
+/*
+ Copyright 2019 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 "UITextView+MatrixKit.h"
+
+@implementation UITextView(MatrixKit)
+
+- (BOOL)isThereALinkNearPoint:(CGPoint)point
+{
+    if (!CGRectContainsPoint(self.bounds, point))
+    {
+        return NO;
+    }
+    
+    UITextPosition *textPosition = [self closestPositionToPoint:point];
+    
+    if (!textPosition)
+    {
+        return NO;
+    }
+    
+    UITextRange *textRange = [self.tokenizer rangeEnclosingPosition:textPosition
+                                                    withGranularity:UITextGranularityCharacter
+                                                        inDirection:UITextLayoutDirectionLeft];
+    
+    if (!textRange)
+    {
+        return NO;
+    }
+    
+    NSInteger startIndex = [self offsetFromPosition:self.beginningOfDocument toPosition:textRange.start];
+    
+    if (startIndex < 0)
+    {
+        return NO;
+    }
+    
+    return [self.attributedText attribute:NSLinkAttributeName atIndex:startIndex effectiveRange:NULL] != nil;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Categories/UIViewController+MatrixKit.h b/Riot/Modules/MatrixKit/Categories/UIViewController+MatrixKit.h
new file mode 100644
index 000000000..1b1b8fde2
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Categories/UIViewController+MatrixKit.h
@@ -0,0 +1,30 @@
+/*
+ Copyright 2018 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/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface UIViewController (MatrixKit)
+
+/**
+ The main navigation controller if the view controller is embedded inside a split view controller.
+ */
+@property (nullable, nonatomic, readonly) UINavigationController *mxk_mainNavigationController;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Riot/Modules/MatrixKit/Categories/UIViewController+MatrixKit.m b/Riot/Modules/MatrixKit/Categories/UIViewController+MatrixKit.m
new file mode 100644
index 000000000..4d9f981fb
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Categories/UIViewController+MatrixKit.m
@@ -0,0 +1,45 @@
+/*
+ Copyright 2018 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 "UIViewController+MatrixKit.h"
+
+@implementation UIViewController (MatrixKit)
+
+- (UINavigationController *)mxk_mainNavigationController
+{
+    UINavigationController *mainNavigationController;
+
+    if (self.splitViewController)
+    {
+        mainNavigationController = self.navigationController;
+        UIViewController *parentViewController = self.parentViewController;
+        while (parentViewController)
+        {
+            if (parentViewController.navigationController)
+            {
+                mainNavigationController = parentViewController.navigationController;
+                parentViewController = parentViewController.parentViewController;
+            }
+            else
+            {
+                break;
+            }
+        }
+    }
+
+    return mainNavigationController;
+}
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKAccountDetailsViewController.h b/Riot/Modules/MatrixKit/Controllers/MXKAccountDetailsViewController.h
new file mode 100644
index 000000000..60b9c4044
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKAccountDetailsViewController.h
@@ -0,0 +1,124 @@
+/*
+Copyright 2015 OpenMarket 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/UIKit.h>
+
+#import "MXKTableViewController.h"
+
+#import "MXKAccountManager.h"
+
+#import "MXK3PID.h"
+
+/**
+ */
+typedef void (^blockMXKAccountDetailsViewController_onReadyToLeave)(void);
+
+/**
+ MXKAccountDetailsViewController instance may be used to display/edit the details of a matrix account.
+ Only one matrix session is handled by this view controller.
+ */
+@interface MXKAccountDetailsViewController : MXKTableViewController <UIImagePickerControllerDelegate, UINavigationControllerDelegate>
+{
+@protected
+    
+    /**
+     Section index
+     */
+    NSInteger linkedEmailsSection;
+    NSInteger notificationsSection;
+    NSInteger configurationSection;
+    
+    /**
+     The logout button
+     */
+    UIButton *logoutButton;
+    
+    /**
+     Linked email
+     */
+    MXK3PID  *submittedEmail;
+    UIButton *emailSubmitButton;
+    UITextField *emailTextField;
+
+    // Notifications
+    UISwitch *apnsNotificationsSwitch;
+    UISwitch *inAppNotificationsSwitch;
+    
+    // The table cell with "Global Notification Settings" button
+    UIButton *notificationSettingsButton;
+}
+
+/**
+ The account displayed into the view controller.
+ */
+@property (nonatomic) MXKAccount *mxAccount;
+
+/**
+ The default account picture displayed when no picture is defined.
+ */
+@property (nonatomic) UIImage *picturePlaceholder;
+
+@property (nonatomic, readonly) IBOutlet UIButton *userPictureButton;
+@property (nonatomic, readonly) IBOutlet UITextField *userDisplayName;
+@property (nonatomic, readonly) IBOutlet UIButton *saveUserInfoButton;
+
+@property (nonatomic, readonly) IBOutlet UIView *profileActivityIndicatorBgView;
+@property (nonatomic, readonly) IBOutlet UIActivityIndicatorView *profileActivityIndicator;
+
+#pragma mark - Class methods
+
+/**
+ Returns the `UINib` object initialized for a `MXKAccountDetailsViewController`.
+
+ @return The initialized `UINib` object or `nil` if there were errors during initialization
+ or the nib file could not be located.
+ 
+ @discussion You may override this method to provide a customized nib. If you do,
+ you should also override `accountDetailsViewController` to return your
+ view controller loaded from your custom nib.
+ */
++ (UINib *)nib;
+
+/**
+ Creates and returns a new `MXKAccountDetailsViewController` object.
+
+ @discussion This is the designated initializer for programmatic instantiation.
+ @return An initialized `MXKAccountDetailsViewController` object if successful, `nil` otherwise.
+ */
++ (instancetype)accountDetailsViewController;
+
+/**
+ Action registered on the following events:
+ - 'UIControlEventTouchUpInside' for each UIButton instance.
+ - 'UIControlEventValueChanged' for each UISwitch instance.
+ */
+- (IBAction)onButtonPressed:(id)sender;
+
+/**
+ Action registered to handle text field edition
+ */
+- (IBAction)textFieldEditingChanged:(id)sender;
+
+/**
+ Prompt user to save potential changes before leaving the view controller.
+ 
+ @param handler A block object called when the changes have been saved or discarded.
+ 
+ @return YES if no change is observed. NO when the user is prompted.
+ */
+- (BOOL)shouldLeave:(blockMXKAccountDetailsViewController_onReadyToLeave)handler;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKAccountDetailsViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKAccountDetailsViewController.m
new file mode 100644
index 000000000..95732b072
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKAccountDetailsViewController.m
@@ -0,0 +1,1172 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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 "MXKAccountDetailsViewController.h"
+
+@import MatrixSDK;
+#import "MXK3PID.h"
+
+#import "MXKTools.h"
+
+#import "MXKTableViewCellWithButton.h"
+#import "MXKTableViewCellWithTextFieldAndButton.h"
+#import "MXKTableViewCellWithLabelTextFieldAndButton.h"
+#import "MXKTableViewCellWithTextView.h"
+#import "MXKTableViewCellWithLabelAndSwitch.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKConstants.h"
+
+#import "MXKSwiftHeader.h"
+
+NSString* const kMXKAccountDetailsLinkedEmailCellId = @"kMXKAccountDetailsLinkedEmailCellId";
+
+@interface MXKAccountDetailsViewController ()
+{
+    NSMutableArray *alertsArray;
+    
+    // User's profile
+    MXMediaLoader *imageLoader;
+    NSString *currentDisplayName;
+    NSString *currentPictureURL;
+    NSString *currentDownloadId;
+    NSString *uploadedPictureURL;
+    // Local changes
+    BOOL isAvatarUpdated;
+    BOOL isSavingInProgress;
+    blockMXKAccountDetailsViewController_onReadyToLeave onReadyToLeaveHandler;
+    
+    // account user's profile observer
+    id accountUserInfoObserver;
+
+    // Dynamic rows in the Linked emails section
+    NSInteger submittedEmailRowIndex;
+    
+    // Notifications
+    // Dynamic rows in the Notifications section
+    NSInteger enablePushNotifRowIndex;
+    NSInteger enableInAppNotifRowIndex;
+    
+    UIImagePickerController *mediaPicker;
+}
+
+@end
+
+@implementation MXKAccountDetailsViewController
+@synthesize userPictureButton, userDisplayName, saveUserInfoButton;
+@synthesize profileActivityIndicator, profileActivityIndicatorBgView;
+
+#pragma mark - Class methods
+
++ (UINib *)nib
+{
+    return [UINib nibWithNibName:NSStringFromClass([MXKAccountDetailsViewController class])
+                          bundle:[NSBundle bundleForClass:[MXKAccountDetailsViewController class]]];
+}
+
++ (instancetype)accountDetailsViewController
+{
+    return [[[self class] alloc] initWithNibName:NSStringFromClass([MXKAccountDetailsViewController class])
+                                          bundle:[NSBundle bundleForClass:[MXKAccountDetailsViewController class]]];
+}
+
+#pragma mark -
+
+- (void)finalizeInit
+{
+    [super finalizeInit];
+    
+    alertsArray = [NSMutableArray array];
+    
+    isAvatarUpdated = NO;
+    isSavingInProgress = NO;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    // Check whether the view controller has been pushed via storyboard
+    if (!userPictureButton)
+    {
+        // Instantiate view controller objects
+        [[[self class] nib] instantiateWithOwner:self options:nil];
+    }
+    
+    self.userPictureButton.backgroundColor = [UIColor clearColor];
+    [self updateUserPictureButton:self.picturePlaceholder];
+    
+    [userPictureButton.layer setCornerRadius:userPictureButton.frame.size.width / 2];
+    userPictureButton.clipsToBounds = YES;
+    
+    [saveUserInfoButton setTitle:[MatrixKitL10n accountSaveChanges] forState:UIControlStateNormal];
+    [saveUserInfoButton setTitle:[MatrixKitL10n accountSaveChanges] forState:UIControlStateHighlighted];
+    
+    // Force refresh
+    self.mxAccount = _mxAccount;
+}
+
+- (void)didReceiveMemoryWarning
+{
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+    
+    if (imageLoader)
+    {
+        [imageLoader cancel];
+        imageLoader = nil;
+    }
+}
+
+- (void)dealloc
+{
+    alertsArray = nil;
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onAPNSStatusUpdate) name:kMXKAccountAPNSActivityDidChangeNotification object:nil];
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    
+    [self stopProfileActivityIndicator];
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXKAccountAPNSActivityDidChangeNotification object:nil];
+}
+
+#pragma mark - override
+
+- (void)onMatrixSessionChange
+{
+    [super onMatrixSessionChange];
+    
+    if (self.mainSession.state != MXSessionStateRunning)
+    {
+        userPictureButton.enabled = NO;
+        userDisplayName.enabled = NO;
+    }
+    else if (!isSavingInProgress)
+    {
+        userPictureButton.enabled = YES;
+        userDisplayName.enabled = YES;
+    }
+}
+
+#pragma mark -
+
+- (void)setMxAccount:(MXKAccount *)account
+{
+    // Remove observer and existing data
+    [self reset];
+    
+    _mxAccount = account;
+    
+    if (account)
+    {
+        // Report matrix account session
+        [self addMatrixSession:account.mxSession];
+        
+        // Set current user's information and add observers
+        [self updateUserPicture:_mxAccount.userAvatarUrl force:YES];
+        currentDisplayName = _mxAccount.userDisplayName;
+        self.userDisplayName.text = currentDisplayName;
+        [self updateSaveUserInfoButtonStatus];
+
+        // Load linked emails
+        [self loadLinkedEmails];
+
+        // Add observer on user's information
+        accountUserInfoObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXKAccountUserInfoDidChangeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+            // Ignore any refresh when saving is in progress
+            if (self->isSavingInProgress)
+            {
+                return;
+            }
+            
+            NSString *accountUserId = notif.object;
+            
+            if ([accountUserId isEqualToString:self->_mxAccount.mxCredentials.userId])
+            {   
+                // Update displayName
+                if (![self->currentDisplayName isEqualToString:self->_mxAccount.userDisplayName])
+                {
+                    self->currentDisplayName = self->_mxAccount.userDisplayName;
+                    self.userDisplayName.text = self->_mxAccount.userDisplayName;
+                }
+                // Update user's avatar
+                [self updateUserPicture:self->_mxAccount.userAvatarUrl force:NO];
+                
+                // Update button management
+                [self updateSaveUserInfoButtonStatus];
+                
+                // Display user's presence
+                UIColor *presenceColor = [MXKAccount presenceColor:self->_mxAccount.userPresence];
+                if (presenceColor)
+                {
+                    self->userPictureButton.layer.borderWidth = 2;
+                    self->userPictureButton.layer.borderColor = presenceColor.CGColor;
+                }
+                else
+                {
+                    self->userPictureButton.layer.borderWidth = 0;
+                }
+            }
+        }];
+    }
+    
+    [self.tableView reloadData];
+}
+
+- (UIImage*)picturePlaceholder
+{
+    return [NSBundle mxk_imageFromMXKAssetsBundleWithName:@"default-profile"];
+}
+
+- (BOOL)shouldLeave:(blockMXKAccountDetailsViewController_onReadyToLeave)handler
+{
+    // Check whether some local changes have not been saved
+    if (saveUserInfoButton.enabled)
+    {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            
+            UIAlertController *alert = [UIAlertController alertControllerWithTitle:nil message:[MatrixKitL10n messageUnsavedChanges] preferredStyle:UIAlertControllerStyleAlert];
+            
+            [self->alertsArray addObject:alert];
+            [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n discard]
+                                                      style:UIAlertActionStyleDefault
+                                                    handler:^(UIAlertAction * action) {
+                                                        
+                                                        [self->alertsArray removeObject:alert];
+                                                        
+                                                        // Discard changes
+                                                        self.userDisplayName.text = self->currentDisplayName;
+                                                        [self updateUserPicture:self->_mxAccount.userAvatarUrl force:YES];
+                                                        
+                                                        // Ready to leave
+                                                        if (handler)
+                                                        {
+                                                            handler();
+                                                        }
+                                                        
+                                                    }]];
+            
+            [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n save]
+                                                      style:UIAlertActionStyleDefault
+                                                    handler:^(UIAlertAction * action) {
+                                                        
+                                                        [self->alertsArray removeObject:alert];
+                                                        
+                                                        // Start saving (Report handler to leave at the end).
+                                                        self->onReadyToLeaveHandler = handler;
+                                                        [self saveUserInfo];
+                                                        
+                                                    }]];
+            
+            [self presentViewController:alert animated:YES completion:nil];
+        });
+        
+        return NO;
+    }
+    else if (isSavingInProgress)
+    {
+        // Report handler to leave at the end of saving
+        onReadyToLeaveHandler = handler;
+        return NO;
+    }
+    return YES;
+}
+
+#pragma mark - Internal methods
+
+- (void)startProfileActivityIndicator
+{
+    if (profileActivityIndicatorBgView.hidden)
+    {
+        profileActivityIndicatorBgView.hidden = NO;
+        [profileActivityIndicator startAnimating];
+    }
+    userPictureButton.enabled = NO;
+    userDisplayName.enabled = NO;
+    saveUserInfoButton.enabled = NO;
+}
+
+- (void)stopProfileActivityIndicator
+{
+    if (!isSavingInProgress)
+    {
+        if (!profileActivityIndicatorBgView.hidden)
+        {
+            profileActivityIndicatorBgView.hidden = YES;
+            [profileActivityIndicator stopAnimating];
+        }
+        userPictureButton.enabled = YES;
+        userDisplayName.enabled = YES;
+        [self updateSaveUserInfoButtonStatus];
+    }
+}
+
+- (void)reset
+{
+    [self dismissMediaPicker];
+    
+    // Remove observers
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    
+    // Cancel picture loader (if any)
+    if (imageLoader)
+    {
+        [imageLoader cancel];
+        imageLoader = nil;
+    }
+    
+    // Cancel potential alerts
+    for (UIAlertController *alert in alertsArray)
+    {
+        [alert dismissViewControllerAnimated:NO completion:nil];
+    }
+    
+    // Remove listener
+    if (accountUserInfoObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:accountUserInfoObserver];
+        accountUserInfoObserver = nil;
+    }
+    
+    currentPictureURL = nil;
+    currentDownloadId = nil;
+    uploadedPictureURL = nil;
+    isAvatarUpdated = NO;
+    [self updateUserPictureButton:self.picturePlaceholder];
+    
+    currentDisplayName = nil;
+    self.userDisplayName.text = nil;
+    
+    saveUserInfoButton.enabled = NO;
+    
+    submittedEmail = nil;
+    emailSubmitButton = nil;
+    emailTextField = nil;
+    
+    [self removeMatrixSession:self.mainSession];
+    
+    logoutButton = nil;
+    
+    onReadyToLeaveHandler = nil;
+}
+
+- (void)destroy
+{
+    if (isSavingInProgress)
+    {
+        __weak typeof(self) weakSelf = self;
+        onReadyToLeaveHandler = ^()
+        {
+            __strong __typeof(weakSelf)strongSelf = weakSelf;
+            [strongSelf destroy];
+        };
+    }
+    else
+    {
+        // Reset account to dispose all resources (Discard here potentials changes)
+        self.mxAccount = nil;
+        
+        if (imageLoader)
+        {
+            [imageLoader cancel];
+            imageLoader = nil;
+        }
+        
+        // Remove listener
+        if (accountUserInfoObserver)
+        {
+            [[NSNotificationCenter defaultCenter] removeObserver:accountUserInfoObserver];
+            accountUserInfoObserver = nil;
+        }
+        
+        [super destroy];
+    }
+}
+
+- (void)saveUserInfo
+{
+    [self startProfileActivityIndicator];
+    isSavingInProgress = YES;
+    
+    // Check whether the display name has been changed
+    NSString *displayname = self.userDisplayName.text;
+    if ((displayname.length || currentDisplayName.length) && [displayname isEqualToString:currentDisplayName] == NO)
+    {
+        // Save display name
+        __weak typeof(self) weakSelf = self;
+        
+        [_mxAccount setUserDisplayName:displayname success:^{
+            
+            if (weakSelf)
+            {
+                // Update the current displayname
+                typeof(self) self = weakSelf;
+                self->currentDisplayName = displayname;
+                
+                // Go to the next change saving step
+                [self saveUserInfo];
+            }
+            
+        } failure:^(NSError *error) {
+            
+            MXLogDebug(@"[MXKAccountDetailsVC] Failed to set displayName");
+            if (weakSelf)
+            {
+                typeof(self) self = weakSelf;
+                
+                // Alert user
+                NSString *title = [error.userInfo valueForKey:NSLocalizedFailureReasonErrorKey];
+                if (!title)
+                {
+                    title = [MatrixKitL10n accountErrorDisplayNameChangeFailed];
+                }
+                NSString *msg = [error.userInfo valueForKey:NSLocalizedDescriptionKey];
+                
+                UIAlertController *alert = [UIAlertController alertControllerWithTitle:title message:msg preferredStyle:UIAlertControllerStyleAlert];
+                
+                [self->alertsArray addObject:alert];
+                
+                [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n abort]
+                                                          style:UIAlertActionStyleDefault
+                                                        handler:^(UIAlertAction * action) {
+                                                            
+                                                            [self->alertsArray removeObject:alert];
+                                                            // Discard changes
+                                                            self.userDisplayName.text = self->currentDisplayName;
+                                                            [self updateUserPicture:self.mxAccount.userAvatarUrl force:YES];
+                                                            // Loop to end saving
+                                                            [self saveUserInfo];
+                                                            
+                                                        }]];
+                
+                [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n retry]
+                                                          style:UIAlertActionStyleDefault
+                                                        handler:^(UIAlertAction * action) {
+                                                            
+                                                            [self->alertsArray removeObject:alert];
+                                                            // Loop to retry saving
+                                                            [self saveUserInfo];
+                                                            
+                                                        }]];
+                
+                
+                [self presentViewController:alert animated:YES completion:nil];
+            }
+            
+         }];
+        
+        return;
+    }
+    
+    // Check whether avatar has been updated
+    if (isAvatarUpdated)
+    {
+        if (uploadedPictureURL == nil)
+        {
+            // Retrieve the current picture and make sure its orientation is up
+            UIImage *updatedPicture = [MXKTools forceImageOrientationUp:[self.userPictureButton imageForState:UIControlStateNormal]];
+            
+            MXWeakify(self);
+            
+            // Upload picture
+            MXMediaLoader *uploader = [MXMediaManager prepareUploaderWithMatrixSession:self.mainSession initialRange:0 andRange:1.0];
+            [uploader uploadData:UIImageJPEGRepresentation(updatedPicture, 0.5) filename:nil mimeType:@"image/jpeg" success:^(NSString *url)
+             {
+                 MXStrongifyAndReturnIfNil(self);
+                 
+                 // Store uploaded picture url and trigger picture saving
+                 self->uploadedPictureURL = url;
+                 [self saveUserInfo];
+             } failure:^(NSError *error)
+             {
+                 MXLogDebug(@"[MXKAccountDetailsVC] Failed to upload image");
+                 MXStrongifyAndReturnIfNil(self);
+                 [self handleErrorDuringPictureSaving:error];
+             }];
+            
+        }
+        else
+        {
+            MXWeakify(self);
+            
+            [_mxAccount setUserAvatarUrl:uploadedPictureURL
+                                 success:^{
+                                     
+                                     // uploadedPictureURL becomes the user's picture
+                                     MXStrongifyAndReturnIfNil(self);
+                                     
+                                     [self updateUserPicture:self->uploadedPictureURL force:YES];
+                                     // Loop to end saving
+                                     [self saveUserInfo];
+                                     
+                                 }
+                                 failure:^(NSError *error) {
+                                     MXLogDebug(@"[MXKAccountDetailsVC] Failed to set avatar url");
+                                     MXStrongifyAndReturnIfNil(self);
+                                     [self handleErrorDuringPictureSaving:error];
+                                 }];
+        }
+        
+        return;
+    }
+    
+    // Backup is complete
+    isSavingInProgress = NO;
+    [self stopProfileActivityIndicator];
+    
+    // Ready to leave
+    if (onReadyToLeaveHandler)
+    {
+        onReadyToLeaveHandler();
+        onReadyToLeaveHandler = nil;
+    }
+}
+
+- (void)handleErrorDuringPictureSaving:(NSError*)error
+{
+    NSString *title = [error.userInfo valueForKey:NSLocalizedFailureReasonErrorKey];
+    if (!title)
+    {
+        title = [MatrixKitL10n accountErrorPictureChangeFailed];
+    }
+    NSString *msg = [error.userInfo valueForKey:NSLocalizedDescriptionKey];
+    
+    UIAlertController *alert = [UIAlertController alertControllerWithTitle:title message:msg preferredStyle:UIAlertControllerStyleAlert];
+    
+    [alertsArray addObject:alert];
+    [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n abort]
+                                              style:UIAlertActionStyleDefault
+                                            handler:^(UIAlertAction * action) {
+                                                
+                                                [self->alertsArray removeObject:alert];
+                                                
+                                                // Remove change
+                                                self.userDisplayName.text = self->currentDisplayName;
+                                                [self updateUserPicture:self->_mxAccount.userAvatarUrl force:YES];
+                                                // Loop to end saving
+                                                [self saveUserInfo];
+                                                
+                                            }]];
+    
+    [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n retry]
+                                              style:UIAlertActionStyleDefault
+                                            handler:^(UIAlertAction * action) {
+                                                
+                                                [self->alertsArray removeObject:alert];
+                                                
+                                                // Loop to retry saving
+                                                [self saveUserInfo];
+                                                
+                                            }]];
+    
+    [self presentViewController:alert animated:YES completion:nil];
+}
+
+- (void)updateUserPicture:(NSString *)avatar_url force:(BOOL)force
+{
+    if (force || currentPictureURL == nil || [currentPictureURL isEqualToString:avatar_url] == NO)
+    {
+        // Remove any pending observers
+        [[NSNotificationCenter defaultCenter] removeObserver:self];
+        // Cancel previous loader (if any)
+        if (imageLoader)
+        {
+            [imageLoader cancel];
+            imageLoader = nil;
+        }
+        // Cancel any local change
+        isAvatarUpdated = NO;
+        uploadedPictureURL = nil;
+        
+        currentPictureURL = [avatar_url isEqual:[NSNull null]] ? nil : avatar_url;
+        
+        // Check whether this url is valid
+        currentDownloadId = [MXMediaManager thumbnailDownloadIdForMatrixContentURI:currentPictureURL
+                                                                          inFolder:kMXMediaManagerAvatarThumbnailFolder
+                                                                     toFitViewSize:self.userPictureButton.frame.size
+                                                                        withMethod:MXThumbnailingMethodCrop];
+        if (!currentDownloadId)
+        {
+            // Set the placeholder in case of invalid Matrix Content URI.
+            [self updateUserPictureButton:self.picturePlaceholder];
+        }
+        else
+        {
+            // Check whether the image download is in progress
+            id loader = [MXMediaManager existingDownloaderWithIdentifier:currentDownloadId];
+            if (loader)
+            {
+                // Observe this loader
+                [[NSNotificationCenter defaultCenter] addObserver:self
+                                                         selector:@selector(onMediaLoaderStateChange:)
+                                                             name:kMXMediaLoaderStateDidChangeNotification
+                                                           object:loader];
+            }
+            else
+            {
+                NSString *cacheFilePath = [MXMediaManager thumbnailCachePathForMatrixContentURI:currentPictureURL
+                                                                                        andType:nil
+                                                                                       inFolder:kMXMediaManagerAvatarThumbnailFolder
+                                                                                  toFitViewSize:self.userPictureButton.frame.size
+                                                                                     withMethod:MXThumbnailingMethodCrop];
+                // Retrieve the image from cache
+                UIImage* image = [MXMediaManager loadPictureFromFilePath:cacheFilePath];
+                if (image)
+                {
+                    [self updateUserPictureButton:image];
+                }
+                else
+                {
+                    // Download the image, by adding download observer
+                    [[NSNotificationCenter defaultCenter] addObserver:self
+                                                             selector:@selector(onMediaLoaderStateChange:)
+                                                                 name:kMXMediaLoaderStateDidChangeNotification
+                                                               object:nil];
+                    imageLoader = [self.mainSession.mediaManager downloadThumbnailFromMatrixContentURI:currentPictureURL
+                                                                                              withType:nil
+                                                                                              inFolder:kMXMediaManagerAvatarThumbnailFolder
+                                                                                         toFitViewSize:self.userPictureButton.frame.size
+                                                                                            withMethod:MXThumbnailingMethodCrop
+                                                                                               success:nil
+                                                                                               failure:nil];
+                }
+            }
+        }
+    }
+}
+
+- (void)updateUserPictureButton:(UIImage*)image
+{
+    [self.userPictureButton setImage:image forState:UIControlStateNormal];
+    [self.userPictureButton setImage:image forState:UIControlStateHighlighted];
+    [self.userPictureButton setImage:image forState:UIControlStateDisabled];
+}
+
+- (void)updateSaveUserInfoButtonStatus
+{
+    // Check whether display name has been changed
+    NSString *displayname = self.userDisplayName.text;
+    BOOL isDisplayNameUpdated = ((displayname.length || currentDisplayName.length) && [displayname isEqualToString:currentDisplayName] == NO);
+    
+    saveUserInfoButton.enabled = (isDisplayNameUpdated || isAvatarUpdated) && !isSavingInProgress;
+}
+
+- (void)onMediaLoaderStateChange:(NSNotification *)notif
+{
+    MXMediaLoader *loader = (MXMediaLoader*)notif.object;
+    if ([loader.downloadId isEqualToString:currentDownloadId])
+    {
+        // update the image
+        switch (loader.state) {
+            case MXMediaLoaderStateDownloadCompleted:
+            {
+                UIImage *image = [MXMediaManager loadPictureFromFilePath:loader.downloadOutputFilePath];
+                if (image == nil)
+                {
+                    image = self.picturePlaceholder;
+                }
+                [self updateUserPictureButton:image];
+                // remove the observers
+                [[NSNotificationCenter defaultCenter] removeObserver:self];
+                imageLoader = nil;
+                break;
+            }
+            case MXMediaLoaderStateDownloadFailed:
+            case MXMediaLoaderStateCancelled:
+                [self updateUserPictureButton:self.picturePlaceholder];
+                // remove the observers
+                [[NSNotificationCenter defaultCenter] removeObserver:self];
+                imageLoader = nil;
+                // Reset picture URL in order to try next time
+                currentPictureURL = nil;
+                break;
+            default:
+                break;
+        }
+    }
+}
+
+- (void)onAPNSStatusUpdate
+{
+    // Force table reload to update notifications section
+    apnsNotificationsSwitch = nil;
+    
+    [self.tableView reloadData];
+}
+
+- (void)dismissMediaPicker
+{
+    if (mediaPicker)
+    {
+        [self dismissViewControllerAnimated:NO completion:nil];
+        mediaPicker.delegate = nil;
+        mediaPicker = nil;
+    }
+}
+
+- (void)showValidationEmailDialogWithMessage:(NSString*)message
+{
+    UIAlertController *alert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n accountEmailValidationTitle] message:message preferredStyle:UIAlertControllerStyleAlert];
+    
+    [alertsArray addObject:alert];
+    [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n abort]
+                                              style:UIAlertActionStyleDefault
+                                            handler:^(UIAlertAction * action) {
+                                                
+                                                [self->alertsArray removeObject:alert];
+                                                
+                                                self->emailSubmitButton.enabled = YES;
+                                                
+                                            }]];
+    
+    [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n continue]
+                                              style:UIAlertActionStyleDefault
+                                            handler:^(UIAlertAction * action) {
+                                                
+                                                [self->alertsArray removeObject:alert];
+                                                
+                                                __weak typeof(self) weakSelf = self;
+                                                
+                                                // We do not bind anymore emails when registering, so let's do the same here
+                                                [self->submittedEmail add3PIDToUser:NO success:^{
+                                                    
+                                                    if (weakSelf)
+                                                    {
+                                                        typeof(self) self = weakSelf;
+                                                        
+                                                        // Release pending email and refresh table to remove related cell
+                                                        self->emailTextField.text = nil;
+                                                        self->submittedEmail = nil;
+                                                        
+                                                        // Update linked emails
+                                                        [self loadLinkedEmails];
+                                                    }
+                                                    
+                                                } failure:^(NSError *error) {
+                                                    
+                                                    if (weakSelf)
+                                                    {
+                                                        typeof(self) self = weakSelf;
+                                                        
+                                                        MXLogDebug(@"[MXKAccountDetailsVC] Failed to bind email");
+                                                        
+                                                        // Display the same popup again if the error is M_THREEPID_AUTH_FAILED
+                                                        MXError *mxError = [[MXError alloc] initWithNSError:error];
+                                                        if (mxError && [mxError.errcode isEqualToString:kMXErrCodeStringThreePIDAuthFailed])
+                                                        {
+                                                            [self showValidationEmailDialogWithMessage:[MatrixKitL10n accountEmailValidationError]];
+                                                        }
+                                                        else
+                                                        {
+                                                            // Notify MatrixKit user
+                                                            NSString *myUserId = self.mxAccount.mxCredentials.userId;
+                                                            [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+                                                        }
+                                                        
+                                                        // Release the pending email (even if it is Authenticated)
+                                                        [self.tableView reloadData];
+                                                    }
+                                                    
+                                                }];
+                                                
+                                            }]];
+    
+    [self presentViewController:alert animated:YES completion:nil];
+}
+
+- (void)loadLinkedEmails
+{
+    // Refresh the account 3PIDs list
+    [_mxAccount load3PIDs:^{
+
+        [self.tableView reloadData];
+
+    } failure:^(NSError *error) {
+        // Display the data that has been loaded last time
+        [self.tableView reloadData];
+    }];
+}
+
+#pragma mark - Actions
+
+- (IBAction)onButtonPressed:(id)sender
+{
+    [self dismissKeyboard];
+
+    if (sender == saveUserInfoButton)
+    {
+        [self saveUserInfo];
+    }
+    else if (sender == userPictureButton)
+    {
+        // Open picture gallery
+        mediaPicker = [[UIImagePickerController alloc] init];
+        mediaPicker.delegate = self;
+        mediaPicker.sourceType = UIImagePickerControllerSourceTypePhotoLibrary;
+        mediaPicker.allowsEditing = NO;
+        [self presentViewController:mediaPicker animated:YES completion:nil];
+    }
+    else if (sender == logoutButton)
+    {
+        [[MXKAccountManager sharedManager] removeAccount:_mxAccount completion:nil];
+        self.mxAccount = nil;
+    }
+    else if (sender == emailSubmitButton)
+    {
+        // Email check
+        if (![MXTools isEmailAddress:emailTextField.text])
+        {
+            UIAlertController *alert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n accountErrorEmailWrongTitle] message:[MatrixKitL10n accountErrorEmailWrongDescription] preferredStyle:UIAlertControllerStyleAlert];
+            
+            [alertsArray addObject:alert];
+            [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
+                                                      style:UIAlertActionStyleDefault
+                                                    handler:^(UIAlertAction * action) {
+                                                        
+                                                        [self->alertsArray removeObject:alert];
+                                                        
+                                                    }]];
+            
+            [self presentViewController:alert animated:YES completion:nil];
+
+            return;
+        }
+        
+        if (!submittedEmail || ![submittedEmail.address isEqualToString:emailTextField.text])
+        {
+            submittedEmail = [[MXK3PID alloc] initWithMedium:kMX3PIDMediumEmail andAddress:emailTextField.text];
+        }
+        
+        emailSubmitButton.enabled = NO;
+        __weak typeof(self) weakSelf = self;
+
+        [submittedEmail requestValidationTokenWithMatrixRestClient:self.mainSession.matrixRestClient isDuringRegistration:NO nextLink:nil success:^{
+
+            if (weakSelf)
+            {
+                typeof(self) self = weakSelf;
+                [self showValidationEmailDialogWithMessage:[MatrixKitL10n accountEmailValidationMessage]];
+            }
+
+        } failure:^(NSError *error) {
+
+            MXLogDebug(@"[MXKAccountDetailsVC] Failed to request email token");
+            if (weakSelf)
+            {
+                typeof(self) self = weakSelf;
+                // Notify MatrixKit user
+                NSString *myUserId = self.mxAccount.mxCredentials.userId;
+                [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+                
+                self->emailSubmitButton.enabled = YES;
+            }
+
+        }];
+    }
+    else if (sender == apnsNotificationsSwitch)
+    {
+        [_mxAccount enablePushNotifications:apnsNotificationsSwitch.on success:nil failure:nil];
+        apnsNotificationsSwitch.enabled = NO;
+    }
+    else if (sender == inAppNotificationsSwitch)
+    {
+        _mxAccount.enableInAppNotifications = inAppNotificationsSwitch.on;
+        [self.tableView reloadData];
+    }
+}
+
+#pragma mark - keyboard
+
+- (void)dismissKeyboard
+{
+    if ([userDisplayName isFirstResponder])
+    {
+        // Hide the keyboard
+        [userDisplayName resignFirstResponder];
+        [self updateSaveUserInfoButtonStatus];
+    }
+    else if ([emailTextField isFirstResponder])
+    {
+        [emailTextField resignFirstResponder];
+    }
+}
+
+#pragma mark - UITextField delegate
+
+- (BOOL)textFieldShouldReturn:(UITextField*)textField
+{
+    // "Done" key has been pressed
+    [self dismissKeyboard];
+    return YES;
+}
+
+- (IBAction)textFieldEditingChanged:(id)sender
+{
+    if (sender == userDisplayName)
+    {
+        [self updateSaveUserInfoButtonStatus];
+    }
+}
+
+#pragma mark - UITableView data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+    NSInteger count = 0;
+    
+    linkedEmailsSection = notificationsSection = configurationSection = -1;
+    
+    if (!_mxAccount.disabled)
+    {
+        linkedEmailsSection = count ++;
+        notificationsSection = count ++;
+    }
+    
+    configurationSection = count ++;
+    
+    return count;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    NSInteger count = 0;
+    if (section == linkedEmailsSection)
+    {
+        count = _mxAccount.linkedEmails.count;
+        submittedEmailRowIndex = count++;
+    }
+    else if (section == notificationsSection)
+    {
+        enableInAppNotifRowIndex = enablePushNotifRowIndex = -1;
+        
+        if ([MXKAccountManager sharedManager].isAPNSAvailable) {
+            enablePushNotifRowIndex = count++;
+        }
+        enableInAppNotifRowIndex = count++;
+    }
+    else if (section == configurationSection)
+    {
+        count = 2;
+    }
+    
+    return count;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    if (indexPath.section == configurationSection)
+    {
+        if (indexPath.row == 0)
+        {
+            UITextView *textView = [[UITextView alloc] initWithFrame:CGRectMake(0, 0, tableView.frame.size.width, MAXFLOAT)];
+            textView.font = [UIFont systemFontOfSize:14];
+            textView.text = [NSString stringWithFormat:@"%@\n%@\n%@", [MatrixKitL10n settingsConfigHomeServer:_mxAccount.mxCredentials.homeServer], [MatrixKitL10n settingsConfigIdentityServer:_mxAccount.identityServerURL], [MatrixKitL10n settingsConfigUserId:_mxAccount.mxCredentials.userId]];
+            
+            CGSize contentSize = [textView sizeThatFits:textView.frame.size];
+            return contentSize.height + 1;
+        }
+    }
+    
+    return 44;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    UITableViewCell *cell = nil;
+    
+    if (indexPath.section == linkedEmailsSection)
+    {
+        if (indexPath.row < _mxAccount.linkedEmails.count)
+        {
+            cell = [tableView dequeueReusableCellWithIdentifier:kMXKAccountDetailsLinkedEmailCellId];
+            if (!cell)
+            {
+                cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:kMXKAccountDetailsLinkedEmailCellId];
+            }
+            
+            cell.selectionStyle = UITableViewCellSelectionStyleNone;
+            cell.textLabel.text = [_mxAccount.linkedEmails objectAtIndex:indexPath.row];
+        }
+        else if (indexPath.row == submittedEmailRowIndex)
+        {
+            // Report the current email value (if any)
+            NSString *currentEmail = nil;
+            if (emailTextField)
+            {
+                currentEmail = emailTextField.text;
+            }
+            
+            MXKTableViewCellWithTextFieldAndButton *submittedEmailCell = [tableView dequeueReusableCellWithIdentifier:[MXKTableViewCellWithTextFieldAndButton defaultReuseIdentifier]];
+            if (!submittedEmailCell)
+            {
+                submittedEmailCell = [[MXKTableViewCellWithTextFieldAndButton alloc] init];
+            }
+            
+            submittedEmailCell.mxkTextField.text = currentEmail;
+            submittedEmailCell.mxkTextField.keyboardType = UIKeyboardTypeEmailAddress;
+            submittedEmailCell.mxkButton.enabled = (currentEmail.length != 0);
+            [submittedEmailCell.mxkButton setTitle:[MatrixKitL10n accountLinkEmail] forState:UIControlStateNormal];
+            [submittedEmailCell.mxkButton setTitle:[MatrixKitL10n accountLinkEmail] forState:UIControlStateHighlighted];
+            [submittedEmailCell.mxkButton addTarget:self action:@selector(onButtonPressed:) forControlEvents:UIControlEventTouchUpInside];
+            
+            emailSubmitButton = submittedEmailCell.mxkButton;
+            emailTextField = submittedEmailCell.mxkTextField;
+
+            cell = submittedEmailCell;
+        }
+    }
+    else if (indexPath.section == notificationsSection)
+    {
+        MXKTableViewCellWithLabelAndSwitch *notificationsCell = [tableView dequeueReusableCellWithIdentifier:[MXKTableViewCellWithLabelAndSwitch defaultReuseIdentifier]];
+        if (!notificationsCell)
+        {
+            notificationsCell = [[MXKTableViewCellWithLabelAndSwitch alloc] init];
+        }
+        else
+        {
+            // Force layout before reusing a cell (fix switch displayed outside the screen)
+            [notificationsCell layoutIfNeeded];
+        }
+        
+        [notificationsCell.mxkSwitch addTarget:self action:@selector(onButtonPressed:) forControlEvents:UIControlEventValueChanged];
+        
+        if (indexPath.row == enableInAppNotifRowIndex)
+        {
+            notificationsCell.mxkLabel.text = [MatrixKitL10n settingsEnableInappNotifications];
+            notificationsCell.mxkSwitch.on = _mxAccount.enableInAppNotifications;
+            inAppNotificationsSwitch = notificationsCell.mxkSwitch;
+        }
+        else /* enablePushNotifRowIndex */
+        {
+            notificationsCell.mxkLabel.text = [MatrixKitL10n settingsEnablePushNotifications];
+            notificationsCell.mxkSwitch.on = _mxAccount.pushNotificationServiceIsActive;
+            notificationsCell.mxkSwitch.enabled = YES;
+            apnsNotificationsSwitch = notificationsCell.mxkSwitch;
+        }
+        
+        cell = notificationsCell;
+    }
+    else if (indexPath.section == configurationSection)
+    {
+        if (indexPath.row == 0)
+        {
+            MXKTableViewCellWithTextView *configCell = [tableView dequeueReusableCellWithIdentifier:[MXKTableViewCellWithTextView defaultReuseIdentifier]];
+            if (!configCell)
+            {
+                configCell = [[MXKTableViewCellWithTextView alloc] init];
+            }
+            
+            configCell.mxkTextView.text = [NSString stringWithFormat:@"%@\n%@\n%@", [MatrixKitL10n settingsConfigHomeServer:_mxAccount.mxCredentials.homeServer], [MatrixKitL10n settingsConfigIdentityServer:_mxAccount.identityServerURL], [MatrixKitL10n settingsConfigUserId:_mxAccount.mxCredentials.userId]];
+            
+            cell = configCell;
+        }
+        else
+        {
+            MXKTableViewCellWithButton *logoutBtnCell = [tableView dequeueReusableCellWithIdentifier:[MXKTableViewCellWithButton defaultReuseIdentifier]];
+            if (!logoutBtnCell)
+            {
+                logoutBtnCell = [[MXKTableViewCellWithButton alloc] init];
+            }
+            [logoutBtnCell.mxkButton setTitle:[MatrixKitL10n actionLogout] forState:UIControlStateNormal];
+            [logoutBtnCell.mxkButton setTitle:[MatrixKitL10n actionLogout] forState:UIControlStateHighlighted];
+            [logoutBtnCell.mxkButton addTarget:self action:@selector(onButtonPressed:) forControlEvents:UIControlEventTouchUpInside];
+            
+            logoutButton = logoutBtnCell.mxkButton;
+            
+            cell = logoutBtnCell;
+        }
+        
+    }
+    else
+    {
+        // Return a fake cell to prevent app from crashing.
+        cell = [[UITableViewCell alloc] init];
+    }
+    
+    return cell;
+}
+
+#pragma mark - UITableView delegate
+
+- (CGFloat) tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
+{
+    return 30;
+}
+- (CGFloat) tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
+{
+    return 1;
+}
+
+- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
+{
+    UIView *sectionHeader = [[UIView alloc] initWithFrame:[tableView rectForHeaderInSection:section]];
+    sectionHeader.backgroundColor = [UIColor colorWithRed:0.9 green:0.9 blue:0.9 alpha:1.0];
+    UILabel *sectionLabel = [[UILabel alloc] initWithFrame:CGRectMake(5, 5, sectionHeader.frame.size.width - 10, sectionHeader.frame.size.height - 10)];
+    sectionLabel.font = [UIFont boldSystemFontOfSize:16];
+    sectionLabel.backgroundColor = [UIColor clearColor];
+    [sectionHeader addSubview:sectionLabel];
+    
+    if (section == linkedEmailsSection)
+    {
+        sectionLabel.text = [MatrixKitL10n accountLinkedEmails];
+    }
+    else if (section == notificationsSection)
+    {
+        sectionLabel.text = [MatrixKitL10n settingsTitleNotifications];
+    }
+    else if (section == configurationSection)
+    {
+        sectionLabel.text = [MatrixKitL10n settingsTitleConfig];
+    }
+    
+    return sectionHeader;
+}
+
+- (void)tableView:(UITableView *)aTableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    if (self.tableView == aTableView)
+    {
+        [aTableView deselectRowAtIndexPath:indexPath animated:YES];
+    }
+}
+
+# pragma mark - UIImagePickerControllerDelegate
+
+- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info
+{
+    UIImage *selectedImage = [info objectForKey:UIImagePickerControllerOriginalImage];
+    if (selectedImage)
+    {
+        [self updateUserPictureButton:selectedImage];
+        isAvatarUpdated = YES;
+        saveUserInfoButton.enabled = YES;
+    }
+    [self dismissMediaPicker];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKAccountDetailsViewController.xib b/Riot/Modules/MatrixKit/Controllers/MXKAccountDetailsViewController.xib
new file mode 100644
index 000000000..2d7cfd528
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKAccountDetailsViewController.xib
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MXKAccountDetailsViewController">
+            <connections>
+                <outlet property="profileActivityIndicator" destination="VAZ-Vd-dbs" id="Qia-8H-Opz"/>
+                <outlet property="profileActivityIndicatorBgView" destination="XNZ-KA-wLa" id="Ibb-Ru-b9S"/>
+                <outlet property="saveUserInfoButton" destination="Fcd-TW-6EN" id="iZF-7q-edr"/>
+                <outlet property="userDisplayName" destination="wTJ-d6-8LB" id="ney-e0-v1E"/>
+                <outlet property="userPictureButton" destination="Q5C-z0-PFC" id="inA-dL-Svu"/>
+                <outlet property="view" destination="ju7-p5-cp4" id="1a8-31-bad"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="ju7-p5-cp4">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <view key="tableHeaderView" contentMode="scaleToFill" id="gTa-z3-gJI" userLabel="TableHeader">
+                <rect key="frame" x="0.0" y="0.0" width="375" height="115"/>
+                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <subviews>
+                    <button opaque="NO" clipsSubviews="YES" contentMode="scaleAspectFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Q5C-z0-PFC" userLabel="PicturePickerButton">
+                        <rect key="frame" x="10" y="10" width="75" height="75"/>
+                        <color key="backgroundColor" red="0.89720267057418823" green="0.89720267057418823" blue="0.89720267057418823" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="75" id="h4a-sn-FGX"/>
+                            <constraint firstAttribute="height" constant="75" id="u5z-VM-exL"/>
+                        </constraints>
+                        <state key="normal">
+                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </state>
+                        <connections>
+                            <action selector="onButtonPressed:" destination="-1" eventType="touchUpInside" id="ISw-2O-K3S"/>
+                        </connections>
+                    </button>
+                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Display name" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="wTJ-d6-8LB">
+                        <rect key="frame" x="95" y="23" width="270" height="30"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                        <textInputTraits key="textInputTraits" returnKeyType="done"/>
+                        <connections>
+                            <action selector="textFieldEditingChanged:" destination="-1" eventType="editingChanged" id="ZaU-yY-z8l"/>
+                            <outlet property="delegate" destination="-1" id="sGO-pB-sxI"/>
+                        </connections>
+                    </textField>
+                    <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Fcd-TW-6EN">
+                        <rect key="frame" x="95" y="73" width="270" height="30"/>
+                        <state key="normal" title="Save changes">
+                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </state>
+                        <connections>
+                            <action selector="onButtonPressed:" destination="-1" eventType="touchUpInside" id="Krj-sL-BbO"/>
+                        </connections>
+                    </button>
+                    <view hidden="YES" alpha="0.5" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XNZ-KA-wLa" userLabel="Spinner background view">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="115"/>
+                        <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </view>
+                    <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="VAZ-Vd-dbs">
+                        <rect key="frame" x="169" y="39" width="37" height="37"/>
+                    </activityIndicatorView>
+                </subviews>
+                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                <constraints>
+                    <constraint firstItem="wTJ-d6-8LB" firstAttribute="top" secondItem="gTa-z3-gJI" secondAttribute="top" constant="23" id="4Nx-Aq-DGZ"/>
+                    <constraint firstItem="wTJ-d6-8LB" firstAttribute="trailing" secondItem="Fcd-TW-6EN" secondAttribute="trailing" id="9NO-pb-D26"/>
+                    <constraint firstAttribute="centerY" secondItem="VAZ-Vd-dbs" secondAttribute="centerY" id="DnG-yj-mD2"/>
+                    <constraint firstAttribute="trailing" secondItem="wTJ-d6-8LB" secondAttribute="trailing" constant="10" id="Ecb-G3-SzG"/>
+                    <constraint firstItem="XNZ-KA-wLa" firstAttribute="top" secondItem="gTa-z3-gJI" secondAttribute="top" id="QMw-Un-h4D"/>
+                    <constraint firstItem="Q5C-z0-PFC" firstAttribute="leading" secondItem="gTa-z3-gJI" secondAttribute="leading" constant="10" id="SBo-aU-k5D"/>
+                    <constraint firstItem="Fcd-TW-6EN" firstAttribute="top" secondItem="wTJ-d6-8LB" secondAttribute="bottom" constant="20" id="SuW-K1-Ccy"/>
+                    <constraint firstAttribute="centerX" secondItem="VAZ-Vd-dbs" secondAttribute="centerX" id="U9b-BV-8np"/>
+                    <constraint firstItem="wTJ-d6-8LB" firstAttribute="leading" secondItem="Q5C-z0-PFC" secondAttribute="trailing" constant="10" id="hb2-WV-ygv"/>
+                    <constraint firstItem="Q5C-z0-PFC" firstAttribute="top" secondItem="gTa-z3-gJI" secondAttribute="top" constant="10" id="mdK-nI-1Z6"/>
+                    <constraint firstAttribute="trailing" secondItem="XNZ-KA-wLa" secondAttribute="trailing" id="pGA-4n-1Sl"/>
+                    <constraint firstItem="XNZ-KA-wLa" firstAttribute="leading" secondItem="gTa-z3-gJI" secondAttribute="leading" id="sSy-en-QUN"/>
+                    <constraint firstAttribute="bottom" secondItem="XNZ-KA-wLa" secondAttribute="bottom" id="ttc-fP-z4n"/>
+                    <constraint firstItem="wTJ-d6-8LB" firstAttribute="leading" secondItem="Q5C-z0-PFC" secondAttribute="trailing" constant="10" id="tvA-Uj-PSe"/>
+                    <constraint firstItem="wTJ-d6-8LB" firstAttribute="leading" secondItem="Fcd-TW-6EN" secondAttribute="leading" id="xag-mS-lrx"/>
+                </constraints>
+            </view>
+            <connections>
+                <outlet property="dataSource" destination="-1" id="KAH-DP-g22"/>
+                <outlet property="delegate" destination="-1" id="Uz1-g8-Ykk"/>
+            </connections>
+        </tableView>
+    </objects>
+</document>
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageTextContent.swift b/Riot/Modules/MatrixKit/Controllers/MXKActivityHandlingViewController.h
similarity index 67%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageTextContent.swift
rename to Riot/Modules/MatrixKit/Controllers/MXKActivityHandlingViewController.h
index 4aeda448c..400b9cc3b 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageTextContent.swift
+++ b/Riot/Modules/MatrixKit/Controllers/MXKActivityHandlingViewController.h
@@ -1,5 +1,5 @@
 // 
-// Copyright 2021 New Vector Ltd
+// Copyright 2020 The Matrix.org Foundation C.I.C
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,12 +14,13 @@
 // limitations under the License.
 //
 
-import Foundation
+#import <UIKit/UIKit.h>
+#import "MXKViewControllerActivityHandling.h"
 
-/// The text content of a message sent by a user.
-struct TemplateRoomChatMessageTextContent {
-    var body: String
-}
+NS_ASSUME_NONNULL_BEGIN
 
+@interface MXKActivityHandlingViewController : UIViewController<MXKViewControllerActivityHandling>
 
-extension TemplateRoomChatMessageTextContent: Equatable { }
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKActivityHandlingViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKActivityHandlingViewController.m
new file mode 100644
index 000000000..5628c7396
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKActivityHandlingViewController.m
@@ -0,0 +1,83 @@
+// 
+// Copyright 2020 The Matrix.org Foundation C.I.C
+//
+// 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 "MXKActivityHandlingViewController.h"
+
+@interface MXKActivityHandlingViewController ()
+
+@end
+
+@implementation MXKActivityHandlingViewController
+@synthesize activityIndicator;
+
+#pragma mark -
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    // Add default activity indicator
+    activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite];
+    activityIndicator.backgroundColor = [UIColor colorWithRed:0.8 green:0.8 blue:0.8 alpha:1.0];
+    activityIndicator.autoresizingMask = UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin;
+    activityIndicator.hidesWhenStopped = YES;
+    
+    CGRect frame = activityIndicator.frame;
+    frame.size.width += 30;
+    frame.size.height += 30;
+    activityIndicator.bounds = frame;
+    [activityIndicator.layer setCornerRadius:5];
+    
+    activityIndicator.center = self.view.center;
+    [self.view addSubview:activityIndicator];
+}
+
+- (void)dealloc
+{
+    if (activityIndicator)
+    {
+        [activityIndicator removeFromSuperview];
+        activityIndicator = nil;
+    }
+}
+
+#pragma mark - Activity indicator
+
+- (void)startActivityIndicator
+{
+    if (activityIndicator)
+    {
+        [self.view bringSubviewToFront:activityIndicator];
+        [activityIndicator startAnimating];
+        
+        // Show the loading wheel after a delay so that if the caller calls stopActivityIndicator
+        // in a short future, the loading wheel will not be displayed to the end user.
+        activityIndicator.alpha = 0;
+        [UIView animateWithDuration:0.3 delay:0.3 options:UIViewAnimationOptionBeginFromCurrentState animations:^{
+            self->activityIndicator.alpha = 1;
+        } completion:^(BOOL finished)
+         {
+         }];
+    }
+}
+
+- (void)stopActivityIndicator
+{
+    [activityIndicator stopAnimating];
+}
+
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKAttachmentsViewController.h b/Riot/Modules/MatrixKit/Controllers/MXKAttachmentsViewController.h
new file mode 100644
index 000000000..60bfdf732
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKAttachmentsViewController.h
@@ -0,0 +1,123 @@
+/*
+Copyright 2015 OpenMarket 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 <MatrixSDK/MatrixSDK.h>
+
+#import "MXKViewController.h"
+#import "MXKAttachment.h"
+#import "MXKAttachmentAnimator.h"
+
+@protocol MXKAttachmentsViewControllerDelegate;
+
+/**
+ This view controller is used to display attachments of a room.
+ Only one attachment is displayed at once, the user is able to swipe one by one the attachment.
+ */
+@interface MXKAttachmentsViewController : MXKViewController <UICollectionViewDataSource, UICollectionViewDelegate, UICollectionViewDelegateFlowLayout, UIDocumentInteractionControllerDelegate, MXKDestinationAttachmentAnimatorDelegate>
+
+@property (nonatomic) IBOutlet UICollectionView *attachmentsCollection;
+@property (nonatomic) IBOutlet UINavigationBar *navigationBar;
+@property (unsafe_unretained, nonatomic) IBOutlet UIBarButtonItem *backButton;
+
+/**
+ The attachments array.
+ */
+@property (nonatomic, readonly) NSArray *attachments;
+
+/**
+ Tell whether all attachments have been retrieved from the room history (In that case no attachment can be added at the beginning of attachments array).
+ */
+@property (nonatomic) BOOL complete;
+
+/**
+ The delegate notified when inputs are ready.
+ */
+@property (nonatomic, weak) id<MXKAttachmentsViewControllerDelegate> delegate;
+
+#pragma mark - Class methods
+
+/**
+ Returns the `UINib` object initialized for a `MXKAttachmentsViewController`.
+
+ @return The initialized `UINib` object or `nil` if there were errors during initialization
+ or the nib file could not be located.
+ 
+ @discussion You may override this method to provide a customized nib. If you do,
+ you should also override `roomViewController` to return your
+ view controller loaded from your custom nib.
+ */
++ (UINib *)nib;
+
+/**
+ Creates and returns a new `MXKAttachmentsViewController` object.
+
+ @discussion This is the designated initializer for programmatic instantiation.
+ @return An initialized `MXKAttachmentsViewController` object if successful, `nil` otherwise.
+ */
++ (instancetype)attachmentsViewController;
+
+/**
+ Creates and returns a new `MXKAttachmentsViewController` object, also sets sets up environment for animated interactive transitions.
+ */
++ (instancetype)animatedAttachmentsViewControllerWithSourceViewController:(UIViewController <MXKSourceAttachmentAnimatorDelegate> *)sourceViewController;
+
+/**
+ Display attachments of a room.
+ 
+ The provided event id is used to select the attachment to display first. Use nil to unchange the current displayed attachment.
+ By default the first attachment is displayed.
+ If the back pagination spinner is currently displayed and provided event id is nil,
+ the viewer will display the first added attachment during back pagination.
+
+ @param attachmentArray the array of attachments (MXKAttachment instances).
+ @param eventId the identifier of the attachment to display first.
+ 
+ */
+- (void)displayAttachments:(NSArray*)attachmentArray focusOn:(NSString*)eventId;
+
+/**
+ Action used to handle the `backButton` in the navigation bar. 
+ */
+- (IBAction)onButtonPressed:(id)sender;
+
+@end
+
+@protocol MXKAttachmentsViewControllerDelegate <NSObject>
+
+/**
+ Ask the delegate for more attachments.
+ This method is called only if 'complete' is NO.
+ 
+ When some attachments are available, the delegate update the attachmnet list by using
+ [MXKAttachmentsViewController displayAttachments: focusOn:].
+ When no new attachment is available, the delegate must update the property 'complete'.
+ 
+ @param attachmentsViewController the attachments view controller.
+ @param eventId the event identifier of the current first attachment.
+ @return a boolean which tells whether some new attachments may be added or not.
+ */
+- (BOOL)attachmentsViewController:(MXKAttachmentsViewController*)attachmentsViewController paginateAttachmentBefore:(NSString*)eventId;
+
+@optional
+
+/**
+ Informs the delegate that a new attachment has been shown
+ the parameter eventId is used by the delegate to identify the attachment
+ */
+- (void)displayedNewAttachmentWithEventId:(NSString *)eventId;
+
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKAttachmentsViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKAttachmentsViewController.m
new file mode 100644
index 000000000..a21fbc396
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKAttachmentsViewController.m
@@ -0,0 +1,1439 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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 "MXKAttachmentsViewController.h"
+
+#import <WebKit/WebKit.h>
+
+@import MatrixSDK.MXMediaManager;
+
+#import "MXKMediaCollectionViewCell.h"
+
+#import "MXKPieChartView.h"
+
+#import "MXKConstants.h"
+
+#import "MXKTools.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKEventFormatter.h"
+
+#import "MXKAttachmentInteractionController.h"
+
+#import "MXKSwiftHeader.h"
+
+@interface MXKAttachmentsViewController () <UINavigationControllerDelegate, UIViewControllerTransitioningDelegate>
+{
+    /**
+     Current alert (if any).
+     */
+    UIAlertController *currentAlert;
+    
+    /**
+     Navigation bar handling
+     */
+    NSTimer *navigationBarDisplayTimer;
+    
+    /**
+     SplitViewController handling
+     */
+    BOOL shouldRestoreBottomBar;
+    UISplitViewControllerDisplayMode savedSplitViewControllerDisplayMode;
+    
+    /**
+     Audio session handling
+     */
+    NSString *savedAVAudioSessionCategory;
+    
+    /**
+     The attachments array (MXAttachment instances).
+     */
+    NSMutableArray *attachments;
+    
+    /**
+     The index of the current visible collection item
+     */
+    NSInteger currentVisibleItemIndex;
+    
+    /**
+     The document interaction Controller used to share attachment
+     */
+    UIDocumentInteractionController *documentInteractionController;
+    MXKAttachment *currentSharedAttachment;
+    
+    /**
+     Tells whether back pagination is in progress.
+     */
+    BOOL isBackPaginationInProgress;
+    
+    /**
+     A temporary file used to store decrypted attachments
+     */
+    NSString *tempFile;
+    
+    /**
+     Path to a file containing video data for the currently selected
+     attachment, if it's a video attachment and the data is
+     available.
+     */
+    NSString *videoFile;
+}
+
+//animations
+@property (nonatomic) MXKAttachmentInteractionController *interactionController;
+
+@property (nonatomic, weak) UIViewController <MXKSourceAttachmentAnimatorDelegate> *sourceViewController;
+
+@property (nonatomic) UIImageView *originalImageView;
+@property (nonatomic) CGRect convertedFrame;
+
+@property (nonatomic) BOOL customAnimationsEnabled;
+
+@end
+
+@implementation MXKAttachmentsViewController
+@synthesize attachments;
+
+#pragma mark - Class methods
+
++ (UINib *)nib
+{
+    return [UINib nibWithNibName:NSStringFromClass([MXKAttachmentsViewController class])
+                          bundle:[NSBundle bundleForClass:[MXKAttachmentsViewController class]]];
+}
+
++ (instancetype)attachmentsViewController
+{
+    return [[[self class] alloc] initWithNibName:NSStringFromClass([MXKAttachmentsViewController class])
+                                          bundle:[NSBundle bundleForClass:[MXKAttachmentsViewController class]]];
+}
+
++ (instancetype)animatedAttachmentsViewControllerWithSourceViewController:(UIViewController <MXKSourceAttachmentAnimatorDelegate> *)sourceViewController
+{
+    MXKAttachmentsViewController *attachmentsController = [[[self class] alloc] initWithNibName:NSStringFromClass([MXKAttachmentsViewController class])
+                                                                                         bundle:[NSBundle bundleForClass:[MXKAttachmentsViewController class]]];
+    
+    //create an interactionController for it to handle the gestue recognizer and control the interactions
+    attachmentsController.interactionController = [[MXKAttachmentInteractionController alloc] initWithDestinationViewController:attachmentsController sourceViewController:sourceViewController];
+    
+    //we use the animationsEnabled property to enable/disable animations. Instances created not using this method should use the default animations
+    attachmentsController.customAnimationsEnabled = YES;
+    
+    //this properties will be needed by animationControllers in order to perform the animations
+    attachmentsController.sourceViewController = sourceViewController;
+    
+    //setting transitioningDelegate and navigationController.delegate so that the animations will work for present/dismiss as well as push/pop
+    attachmentsController.transitioningDelegate = attachmentsController;
+    sourceViewController.navigationController.delegate = attachmentsController;
+    
+    
+    return attachmentsController;
+}
+
+#pragma mark -
+
+- (void)finalizeInit
+{
+    [super finalizeInit];
+    
+    tempFile = nil;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    // Check whether the view controller has been pushed via storyboard
+    if (!_attachmentsCollection)
+    {
+        // Instantiate view controller objects
+        [[[self class] nib] instantiateWithOwner:self options:nil];
+    }
+    
+    self.backButton.image = [NSBundle mxk_imageFromMXKAssetsBundleWithName:@"back_icon"];
+    
+    // Register collection view cell class
+    [self.attachmentsCollection registerClass:MXKMediaCollectionViewCell.class forCellWithReuseIdentifier:[MXKMediaCollectionViewCell defaultReuseIdentifier]];
+    
+    // Hide collection to hide first scrolling into the attachments.
+    _attachmentsCollection.hidden = YES;
+    
+    // Display collection cell in full screen
+    self.automaticallyAdjustsScrollViewInsets = NO;
+}
+
+- (BOOL)prefersStatusBarHidden
+{
+    // Hide status bar.
+    // Caution: Enable [UIViewController prefersStatusBarHidden] use at application level
+    // by turning on UIViewControllerBasedStatusBarAppearance in Info.plist.
+    return YES;
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    
+    videoFile = nil;
+    
+    savedAVAudioSessionCategory = [[AVAudioSession sharedInstance] category];
+    
+    // Hide navigation bar by default.
+    [self hideNavigationBar];
+    
+    // Hide status bar
+    // TODO: remove this [UIApplication statusBarHidden] use (deprecated since iOS 9).
+    // Note: setting statusBarHidden does nothing if your application is using the default UIViewController-based status bar system.
+    UIApplication *sharedApplication = [UIApplication performSelector:@selector(sharedApplication)];
+    if (sharedApplication)
+    {
+        sharedApplication.statusBarHidden = YES;
+    }
+    
+    // Handle here the case of splitviewcontroller use on iOS 8 and later.
+    if (self.splitViewController && [self.splitViewController respondsToSelector:@selector(displayMode)])
+    {
+        if (self.hidesBottomBarWhenPushed)
+        {
+            // This screen should be displayed without tabbar, but hidesBottomBarWhenPushed flag has no effect in case of splitviewcontroller use.
+            // Trick: on iOS 8 and later the tabbar is hidden manually
+            shouldRestoreBottomBar = YES;
+            self.tabBarController.tabBar.hidden = YES;
+        }
+        
+        // Hide the primary view controller to allow full screen display
+        savedSplitViewControllerDisplayMode = [self.splitViewController displayMode];
+        self.splitViewController.preferredDisplayMode = UISplitViewControllerDisplayModePrimaryHidden;
+        [self.splitViewController.view layoutIfNeeded];
+    }
+    
+    [_attachmentsCollection reloadData];
+}
+
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    
+    // Adjust content offset and make visible the attachmnet collections
+    [self refreshAttachmentCollectionContentOffset];
+    _attachmentsCollection.hidden = NO;
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+    if (tempFile)
+    {
+        NSError *err;
+        [[NSFileManager defaultManager] removeItemAtPath:tempFile error:&err];
+        tempFile = nil;
+    }
+    
+    if (currentAlert)
+    {
+        [currentAlert dismissViewControllerAnimated:NO completion:nil];
+        currentAlert = nil;
+    }
+    
+    // Stop playing any video
+    for (MXKMediaCollectionViewCell *cell in self.attachmentsCollection.visibleCells)
+    {
+        [cell.moviePlayer.player pause];
+        cell.moviePlayer.player = nil;
+    }
+    
+    // Restore audio category
+    if (savedAVAudioSessionCategory)
+    {
+        [[AVAudioSession sharedInstance] setCategory:savedAVAudioSessionCategory error:nil];
+        savedAVAudioSessionCategory = nil;
+    }
+    
+    [navigationBarDisplayTimer invalidate];
+    navigationBarDisplayTimer = nil;
+    
+    // Restore status bar
+    // TODO: remove this [UIApplication statusBarHidden] use (deprecated since iOS 9).
+    // Note: setting statusBarHidden does nothing if your application is using the default UIViewController-based status bar system.
+    UIApplication *sharedApplication = [UIApplication performSelector:@selector(sharedApplication)];
+    if (sharedApplication)
+    {
+        sharedApplication.statusBarHidden = NO;
+    }
+    
+    if (shouldRestoreBottomBar)
+    {
+        self.tabBarController.tabBar.hidden = NO;
+    }
+    
+    if (self.splitViewController && [self.splitViewController respondsToSelector:@selector(displayMode)])
+    {
+        self.splitViewController.preferredDisplayMode = savedSplitViewControllerDisplayMode;
+        [self.splitViewController.view layoutIfNeeded];
+    }
+    
+    [super viewWillDisappear:animated];
+}
+
+- (void)dealloc
+{
+    [self destroy];
+}
+
+- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id <UIViewControllerTransitionCoordinator>)coordinator
+{
+    [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
+    
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(coordinator.transitionDuration * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        
+        // Cell width will be updated, force collection layout refresh to take into account the changes
+        [self->_attachmentsCollection.collectionViewLayout invalidateLayout];
+        
+        // Refresh the current attachment display
+        [self refreshAttachmentCollectionContentOffset];
+        
+    });
+}
+
+#pragma mark - Override MXKViewController
+
+- (void)destroy
+{
+    if (documentInteractionController)
+    {
+        [documentInteractionController dismissPreviewAnimated:NO];
+        [documentInteractionController dismissMenuAnimated:NO];
+        documentInteractionController = nil;
+    }
+    
+    if (currentSharedAttachment)
+    {
+        [currentSharedAttachment onShareEnded];
+        currentSharedAttachment = nil;
+    }
+    
+    if (self.sourceViewController)
+    {
+        self.sourceViewController.navigationController.delegate = nil;
+        self.sourceViewController = nil;
+    }
+    
+    [super destroy];
+}
+
+#pragma mark - Public API
+
+- (void)displayAttachments:(NSArray*)attachmentArray focusOn:(NSString*)eventId
+{
+    NSString *currentAttachmentEventId = eventId;
+    NSString *currentAttachmentOriginalFileName = nil;
+    
+    if (currentAttachmentEventId.length == 0 && attachments)
+    {
+        if (isBackPaginationInProgress && currentVisibleItemIndex == 0)
+        {
+            // Here the spinner were displayed, we update the viewer by displaying the first added attachment
+            // (the one just added before the first item of the current attachments array).
+            if (attachments.count)
+            {
+                // Retrieve the event id of the first item in the current attachments array
+                MXKAttachment *attachment = attachments[0];
+                NSString *firstAttachmentEventId = attachment.eventId;
+                NSString *firstAttachmentOriginalFileName = nil;
+                
+                // The original file name is used when the attachment is a local echo.
+                // Indeed its event id may be replaced by the actual one in the new attachments array.
+                if ([firstAttachmentEventId hasPrefix:kMXEventLocalEventIdPrefix])
+                {
+                    firstAttachmentOriginalFileName = attachment.originalFileName;
+                }
+                
+                // Look for the attachment added before this attachment in new array.
+                for (attachment in attachmentArray)
+                {
+                    if (firstAttachmentOriginalFileName && [attachment.originalFileName isEqualToString:firstAttachmentOriginalFileName])
+                    {
+                        break;
+                    }
+                    else if ([attachment.eventId isEqualToString:firstAttachmentEventId])
+                    {
+                        break;
+                    }
+                    currentAttachmentEventId = attachment.eventId;
+                }
+            }
+        }
+        else if (currentVisibleItemIndex != NSNotFound)
+        {
+            // Compute the attachment index
+            NSUInteger currentAttachmentIndex = (isBackPaginationInProgress ? currentVisibleItemIndex - 1 : currentVisibleItemIndex);
+            
+            if (currentAttachmentIndex < attachments.count)
+            {
+                MXKAttachment *attachment = attachments[currentAttachmentIndex];
+                currentAttachmentEventId = attachment.eventId;
+                
+                // The original file name is used when the attachment is a local echo.
+                // Indeed its event id may be replaced by the actual one in the new attachments array.
+                if ([currentAttachmentEventId hasPrefix:kMXEventLocalEventIdPrefix])
+                {
+                    currentAttachmentOriginalFileName = attachment.originalFileName;
+                }
+            }
+        }
+    }
+    
+    // Stop back pagination (Do not call here 'stopBackPaginationActivity' because a full collection reload is planned at the end).
+    isBackPaginationInProgress = NO;
+    
+    // Set/reset the attachments array
+    attachments = [NSMutableArray arrayWithArray:attachmentArray];
+    
+    // Update the index of the current displayed attachment by looking for the
+    // current event id (or the current original file name, if any) in the new attachments array.
+    currentVisibleItemIndex = 0;
+    if (currentAttachmentEventId)
+    {
+        for (NSUInteger index = 0; index < attachments.count; index++)
+        {
+            MXKAttachment *attachment = attachments[index];
+            
+            // Check first the original filename if any.
+            if (currentAttachmentOriginalFileName && [attachment.originalFileName isEqualToString:currentAttachmentOriginalFileName])
+            {
+                currentVisibleItemIndex = index;
+                break;
+            }
+            // Check the event id then
+            else if ([attachment.eventId isEqualToString:currentAttachmentEventId])
+            {
+                currentVisibleItemIndex = index;
+                break;
+            }
+        }
+    }
+    
+    // Refresh
+    [_attachmentsCollection reloadData];
+    
+    // Adjust content offset
+    [self refreshAttachmentCollectionContentOffset];
+}
+
+- (void)setComplete:(BOOL)complete
+{
+    _complete = complete;
+    
+    if (complete)
+    {
+        [self stopBackPaginationActivity];
+    }
+}
+
+- (IBAction)onButtonPressed:(id)sender
+{
+    if (sender == self.backButton)
+    {
+        [self withdrawViewControllerAnimated:YES completion:nil];
+    }
+}
+
+#pragma mark - Privates
+
+- (IBAction)hideNavigationBar
+{
+    self.navigationBar.hidden = YES;
+    
+    [navigationBarDisplayTimer invalidate];
+    navigationBarDisplayTimer = nil;
+}
+
+- (void)refreshCurrentVisibleItemIndex
+{
+    // Check whether the collection is actually rendered
+    if (_attachmentsCollection.contentSize.width)
+    {
+        currentVisibleItemIndex = _attachmentsCollection.contentOffset.x / [[UIScreen mainScreen] bounds].size.width;
+    }
+    else
+    {
+        currentVisibleItemIndex = NSNotFound;
+    }
+}
+
+- (void)refreshAttachmentCollectionContentOffset
+{
+    if (currentVisibleItemIndex != NSNotFound && _attachmentsCollection)
+    {
+        // Set the content offset to display the current attachment
+        CGPoint contentOffset = _attachmentsCollection.contentOffset;
+        contentOffset.x = currentVisibleItemIndex * [[UIScreen mainScreen] bounds].size.width;
+        _attachmentsCollection.contentOffset = contentOffset;
+    }
+}
+
+- (void)refreshCurrentVisibleCell
+{
+    // In case of attached image, load here the high res image.
+    
+    [self refreshCurrentVisibleItemIndex];
+    
+    if (currentVisibleItemIndex == NSNotFound) {
+        // Tell the delegate that no attachment is displayed for the moment
+        if ([self.delegate respondsToSelector:@selector(displayedNewAttachmentWithEventId:)])
+        {
+            [self.delegate displayedNewAttachmentWithEventId:nil];
+        }
+    }
+    else
+    {
+        NSInteger item = currentVisibleItemIndex;
+        if (isBackPaginationInProgress)
+        {
+            if (item == 0)
+            {
+                // Tell the delegate that no attachment is displayed for the moment
+                if ([self.delegate respondsToSelector:@selector(displayedNewAttachmentWithEventId:)])
+                {
+                    [self.delegate displayedNewAttachmentWithEventId:nil];
+                }
+                
+                return;
+            }
+            
+            item --;
+        }
+        
+        if (item < attachments.count)
+        {
+            MXKAttachment *attachment = attachments[item];
+            NSString *mimeType = attachment.contentInfo[@"mimetype"];
+            
+            // Tell the delegate which attachment has been shown using its eventId
+            if ([self.delegate respondsToSelector:@selector(displayedNewAttachmentWithEventId:)])
+            {
+                [self.delegate displayedNewAttachmentWithEventId:attachment.eventId];
+            }
+            
+            // Check attachment type
+            if (attachment.type == MXKAttachmentTypeImage && attachment.contentURL && ![mimeType isEqualToString:@"image/gif"])
+            {
+                // Retrieve the related cell
+                UICollectionViewCell *cell = [_attachmentsCollection cellForItemAtIndexPath:[NSIndexPath indexPathForItem:currentVisibleItemIndex inSection:0]];
+                if ([cell isKindOfClass:[MXKMediaCollectionViewCell class]])
+                {
+                    MXKMediaCollectionViewCell *mediaCollectionViewCell = (MXKMediaCollectionViewCell*)cell;
+                    
+                    // Load high res image
+                    mediaCollectionViewCell.mxkImageView.stretchable = YES;
+                    mediaCollectionViewCell.mxkImageView.enableInMemoryCache = NO;
+                    
+                    [mediaCollectionViewCell.mxkImageView setAttachment:attachment];
+                }
+            }
+        }
+    }
+}
+
+- (void)stopBackPaginationActivity
+{
+    if (isBackPaginationInProgress)
+    {
+        isBackPaginationInProgress = NO;
+        
+        [self.attachmentsCollection deleteItemsAtIndexPaths:@[[NSIndexPath indexPathForItem:0 inSection:0]]];
+    }
+}
+
+- (void)prepareVideoForItem:(NSInteger)item success:(void(^)(void))success failure:(void(^)(NSError *))failure
+{
+    MXKAttachment *attachment = attachments[item];
+    if (attachment.isEncrypted)
+    {
+        [attachment decryptToTempFile:^(NSString *file) {
+            if (self->tempFile)
+            {
+                [[NSFileManager defaultManager] removeItemAtPath:self->tempFile error:nil];
+            }
+            self->tempFile = file;
+            self->videoFile = file;
+            success();
+        } failure:^(NSError *error) {
+            if (failure) failure(error);
+        }];
+    }
+    else
+    {
+        if ([[NSFileManager defaultManager] fileExistsAtPath:attachment.cacheFilePath])
+        {
+            videoFile = attachment.cacheFilePath;
+            success();
+        }
+        else
+        {
+            [attachment prepare:^{
+                self->videoFile = attachment.cacheFilePath;
+                success();
+            } failure:^(NSError *error) {
+                if (failure) failure(error);
+            }];
+        }
+    }
+}
+
+#pragma mark - UICollectionViewDataSource
+
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
+{
+    if (isBackPaginationInProgress)
+    {
+        return (attachments.count + 1);
+    }
+    
+    return attachments.count;
+}
+
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    MXKMediaCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:[MXKMediaCollectionViewCell defaultReuseIdentifier]
+                                                                                 forIndexPath:indexPath];
+    
+    NSInteger item = indexPath.item;
+    
+    if (isBackPaginationInProgress)
+    {
+        if (item == 0)
+        {
+            cell.mxkImageView.hidden = YES;
+            cell.customView.hidden = NO;
+            
+            // Add back pagination spinner
+            UIActivityIndicatorView* spinner  = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
+            spinner.autoresizingMask = (UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin);
+            spinner.hidesWhenStopped = NO;
+            spinner.backgroundColor = [UIColor clearColor];
+            [spinner startAnimating];
+            
+            spinner.center = cell.customView.center;
+            [cell.customView addSubview:spinner];
+            
+            return cell;
+        }
+        
+        item --;
+    }
+    
+    if (item < attachments.count)
+    {
+        MXKAttachment *attachment = attachments[item];
+        NSString *mimeType = attachment.contentInfo[@"mimetype"];
+        
+        // Use the cached thumbnail (if any) as preview
+        UIImage* preview = [attachment getCachedThumbnail];
+        
+        // Check attachment type
+        if ((attachment.type == MXKAttachmentTypeImage || attachment.type == MXKAttachmentTypeSticker) && attachment.contentURL)
+        {
+            if ([mimeType isEqualToString:@"image/gif"])
+            {
+                cell.mxkImageView.hidden = YES;
+                // Set the preview as the default image even if the image view is hidden. It will be used during zoom out animation.
+                cell.mxkImageView.image = preview;
+                
+                cell.customView.hidden = NO;
+                
+                // Animated gif is displayed in webview
+                CGFloat minSize = (cell.frame.size.width < cell.frame.size.height) ? cell.frame.size.width : cell.frame.size.height;
+                CGFloat width, height;
+                if (attachment.contentInfo[@"w"] && attachment.contentInfo[@"h"])
+                {
+                    width = [attachment.contentInfo[@"w"] integerValue];
+                    height = [attachment.contentInfo[@"h"] integerValue];
+                    if (width > minSize || height > minSize)
+                    {
+                        if (width > height)
+                        {
+                            height = (height * minSize) / width;
+                            height = floorf(height / 2) * 2;
+                            width = minSize;
+                        }
+                        else
+                        {
+                            width = (width * minSize) / height;
+                            width = floorf(width / 2) * 2;
+                            height = minSize;
+                        }
+                    }
+                    else
+                    {
+                        width = minSize;
+                        height = minSize;
+                    }
+                }
+                else
+                {
+                    width = minSize;
+                    height = minSize;
+                }
+                
+                WKWebView *animatedGifViewer = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, width, height)];
+                animatedGifViewer.center = cell.customView.center;
+                animatedGifViewer.opaque = NO;
+                animatedGifViewer.backgroundColor = cell.customView.backgroundColor;
+                animatedGifViewer.contentMode = UIViewContentModeScaleAspectFit;
+                animatedGifViewer.autoresizingMask = (UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin);
+                animatedGifViewer.userInteractionEnabled = NO;
+                [cell.customView addSubview:animatedGifViewer];
+                
+                UIImageView *previewImage = [[UIImageView alloc] initWithFrame:animatedGifViewer.frame];
+                previewImage.contentMode = animatedGifViewer.contentMode;
+                previewImage.autoresizingMask = animatedGifViewer.autoresizingMask;
+                previewImage.image = preview;
+                previewImage.center = cell.customView.center;
+                [cell.customView addSubview:previewImage];
+                
+                MXKPieChartView *pieChartView = [[MXKPieChartView alloc] initWithFrame:CGRectMake(0, 0, 40, 40)];
+                pieChartView.progress = 0;
+                pieChartView.progressColor = [UIColor colorWithRed:1 green:1 blue:1 alpha:0.25];
+                pieChartView.unprogressColor = [UIColor clearColor];
+                pieChartView.autoresizingMask = animatedGifViewer.autoresizingMask;
+                pieChartView.center = cell.customView.center;
+                [cell.customView addSubview:pieChartView];
+                
+                // Add download progress observer
+                NSString *downloadId = attachment.downloadId;
+                cell.notificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXMediaLoaderStateDidChangeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+                    
+                    MXMediaLoader *loader = (MXMediaLoader*)notif.object;
+                    if ([loader.downloadId isEqualToString:downloadId])
+                    {
+                        // update the image
+                        switch (loader.state) {
+                            case MXMediaLoaderStateDownloadInProgress:
+                            {
+                                NSNumber* progressNumber = [loader.statisticsDict valueForKey:kMXMediaLoaderProgressValueKey];
+                                if (progressNumber)
+                                {
+                                    pieChartView.progress = progressNumber.floatValue;
+                                }
+                                break;
+                            }
+                            default:
+                                break;
+                        }
+                    }
+                    
+                }];
+                
+                void (^onDownloaded)(NSData *) = ^(NSData *data){
+                    if (cell.notificationObserver)
+                    {
+                        [[NSNotificationCenter defaultCenter] removeObserver:cell.notificationObserver];
+                        cell.notificationObserver = nil;
+                    }
+                    
+                    if (animatedGifViewer.superview)
+                    {
+                        [animatedGifViewer loadData:data MIMEType:@"image/gif" characterEncodingName:@"UTF-8" baseURL:[NSURL URLWithString:@"http://"]];
+                        
+                        [pieChartView removeFromSuperview];
+                        [previewImage removeFromSuperview];
+                    }
+                };
+                
+                void (^onFailure)(NSError *) = ^(NSError *error){
+                    if (cell.notificationObserver)
+                    {
+                        [[NSNotificationCenter defaultCenter] removeObserver:cell.notificationObserver];
+                        cell.notificationObserver = nil;
+                    }
+                    
+                    MXLogDebug(@"[MXKAttachmentsVC] gif download failed");
+                    // Notify MatrixKit user
+                    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error];
+                };
+                
+                
+                [attachment getAttachmentData:^(NSData *data) {
+                    onDownloaded(data);
+                } failure:^(NSError *error) {
+                    onFailure(error);
+                }];
+            }
+            else if (indexPath.item == currentVisibleItemIndex)
+            {
+                // Load high res image
+                cell.mxkImageView.stretchable = YES;
+                [cell.mxkImageView setAttachment:attachment];
+            }
+            else
+            {
+                // Use the thumbnail here - Full res images should only be downloaded explicitly when requested (see [self refreshCurrentVisibleItemIndex])
+                cell.mxkImageView.stretchable = YES;
+                [cell.mxkImageView setAttachmentThumb:attachment];
+            }
+        }
+        else if (attachment.type == MXKAttachmentTypeVideo && attachment.contentURL)
+        {
+            cell.mxkImageView.mediaFolder = attachment.eventRoomId;
+            cell.mxkImageView.stretchable = NO;
+            cell.mxkImageView.enableInMemoryCache = YES;
+            // Display video thumbnail, the video is played only when user selects this cell
+            [cell.mxkImageView setAttachmentThumb:attachment];
+            
+            cell.centerIcon.image = [NSBundle mxk_imageFromMXKAssetsBundleWithName:@"play"];
+            cell.centerIcon.hidden = NO;
+        }
+        
+        // Add gesture recognizers on collection cell to handle tap and long press on collection cell.
+        // Note: tap gesture recognizer is required here because mxkImageView enables user interaction to allow image stretching.
+        // [collectionView:didSelectItemAtIndexPath] is not triggered when mxkImageView is displayed.
+        UITapGestureRecognizer *cellTapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onCollectionViewCellTap:)];
+        [cellTapGesture setNumberOfTouchesRequired:1];
+        [cellTapGesture setNumberOfTapsRequired:1];
+        cell.tag = item;
+        [cell addGestureRecognizer:cellTapGesture];
+        
+        UILongPressGestureRecognizer *cellLongPressGesture = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(onCollectionViewCellLongPress:)];
+        [cell addGestureRecognizer:cellLongPressGesture];
+    }
+    
+    return cell;
+}
+
+#pragma mark - UICollectionViewDelegate
+
+- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    NSInteger item = indexPath.item;
+    
+    BOOL navigationBarDisplayHandled = NO;
+    
+    if (isBackPaginationInProgress)
+    {
+        if (item == 0)
+        {
+            return;
+        }
+        
+        item --;
+    }
+    
+    // Check whether the selected attachment is a video
+    if (item < attachments.count)
+    {
+        MXKAttachment *attachment = attachments[item];
+        
+        if (attachment.type == MXKAttachmentTypeVideo && attachment.contentURL)
+        {
+            MXKMediaCollectionViewCell *selectedCell = (MXKMediaCollectionViewCell*)[collectionView cellForItemAtIndexPath:indexPath];
+            
+            // Add movie player if none
+            if (selectedCell.moviePlayer == nil)
+            {
+                [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayback error:nil];
+                
+                selectedCell.moviePlayer = [[AVPlayerViewController alloc] init];
+                if (selectedCell.moviePlayer != nil)
+                {
+                    // Switch in custom view
+                    selectedCell.mxkImageView.hidden = YES;
+                    selectedCell.customView.hidden = NO;
+                    
+                    // Report the video preview
+                    UIImageView *previewImage = [[UIImageView alloc] initWithFrame:selectedCell.customView.frame];
+                    previewImage.contentMode = UIViewContentModeScaleAspectFit;
+                    previewImage.autoresizingMask = (UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin);
+                    previewImage.image = selectedCell.mxkImageView.image;
+                    previewImage.center = selectedCell.customView.center;
+                    [selectedCell.customView addSubview:previewImage];
+                    
+                    selectedCell.moviePlayer.videoGravity = AVLayerVideoGravityResizeAspect;
+                    selectedCell.moviePlayer.view.frame = selectedCell.customView.frame;
+                    selectedCell.moviePlayer.view.center = selectedCell.customView.center;
+                    selectedCell.moviePlayer.view.hidden = YES;
+                    [selectedCell.customView addSubview:selectedCell.moviePlayer.view];
+
+                    // Force the video to stay in fullscreen
+                    NSLayoutConstraint* topConstraint = [NSLayoutConstraint constraintWithItem:selectedCell.moviePlayer.view
+                                                                                     attribute:NSLayoutAttributeTop
+                                                                                     relatedBy:NSLayoutRelationEqual
+                                                                                        toItem:selectedCell.customView
+                                                                                     attribute:NSLayoutAttributeTop
+                                                                                    multiplier:1.0f
+                                                                                      constant:0.0f];
+
+                    NSLayoutConstraint *leadingConstraint = [NSLayoutConstraint constraintWithItem:selectedCell.moviePlayer.view
+                                                                                          attribute:NSLayoutAttributeLeading
+                                                                                          relatedBy:0
+                                                                                             toItem:selectedCell.customView
+                                                                                          attribute:NSLayoutAttributeLeading
+                                                                                         multiplier:1.0
+                                                                                           constant:0];
+
+                    NSLayoutConstraint *bottomConstraint = [NSLayoutConstraint constraintWithItem:selectedCell.moviePlayer.view
+                                                                                        attribute:NSLayoutAttributeBottom
+                                                                                        relatedBy:0
+                                                                                           toItem:selectedCell.customView
+                                                                                        attribute:NSLayoutAttributeBottom
+                                                                                       multiplier:1
+                                                                                         constant:0];
+
+                    NSLayoutConstraint *trailingConstraint = [NSLayoutConstraint constraintWithItem:selectedCell.moviePlayer.view
+                                                                                         attribute:NSLayoutAttributeTrailing
+                                                                                         relatedBy:0
+                                                                                            toItem:selectedCell.customView
+                                                                                         attribute:NSLayoutAttributeTrailing
+                                                                                        multiplier:1.0
+                                                                                          constant:0];
+                    
+                    selectedCell.moviePlayer.view.translatesAutoresizingMaskIntoConstraints = NO;
+
+                    [NSLayoutConstraint activateConstraints:@[topConstraint, leadingConstraint, bottomConstraint, trailingConstraint]];
+                    [[NSNotificationCenter defaultCenter] addObserver:self
+                                                             selector:@selector(moviePlayerPlaybackDidFinishWithErrorNotification:)
+                                                                 name:AVPlayerItemFailedToPlayToEndTimeNotification
+                                                               object:nil];
+                }
+            }
+            
+            if (selectedCell.moviePlayer)
+            {
+                if (selectedCell.moviePlayer.player.status == AVPlayerStatusReadyToPlay)
+                {
+                    // Show or hide the navigation bar
+
+                    // The video controls bar display is automatically managed by MPMoviePlayerController.
+                    // We have no control on it and no notifications about its displays changes.
+                    // The following code synchronizes the display of the navigation bar with the
+                    // MPMoviePlayerController controls bar.
+
+                    // Check the MPMoviePlayerController controls bar display status by an hacky way
+                    BOOL controlsVisible = NO;
+                    for(id views in [[selectedCell.moviePlayer view] subviews])
+                    {
+                        for(id subViews in [views subviews])
+                        {
+                            for (id controlView in [subViews subviews])
+                            {
+                                if ([controlView isKindOfClass:[UIView class]] && ((UIView*)controlView).tag == 1004)
+                                {
+                                    UIView *subView = (UIView*)controlView;
+                                    
+                                    controlsVisible = (subView.alpha <= 0.0) ? NO : YES;
+                                }
+                            }
+                        }
+                    }
+                    
+                    // Apply the same display to the navigation bar
+                    self.navigationBar.hidden = !controlsVisible;
+                    
+                    navigationBarDisplayHandled = YES;
+                    if (!self.navigationBar.hidden)
+                    {
+                        // Automaticaly hide the nav bar after 5s. This is the same timer value that
+                        // MPMoviePlayerController uses for its controls bar
+                        [navigationBarDisplayTimer invalidate];
+                        navigationBarDisplayTimer = [NSTimer scheduledTimerWithTimeInterval:5 target:self selector:@selector(hideNavigationBar) userInfo:self repeats:NO];
+                    }
+                }
+                else
+                {
+                    MXKPieChartView *pieChartView = [[MXKPieChartView alloc] initWithFrame:CGRectMake(0, 0, 40, 40)];
+                    pieChartView.progress = 0;
+                    pieChartView.progressColor = [UIColor colorWithRed:1 green:1 blue:1 alpha:0.25];
+                    pieChartView.unprogressColor = [UIColor clearColor];
+                    pieChartView.autoresizingMask = (UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin);
+                    pieChartView.center = selectedCell.customView.center;
+                    [selectedCell.customView addSubview:pieChartView];
+                    
+                    // Add download progress observer
+                    NSString *downloadId = attachment.downloadId;
+                    selectedCell.notificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXMediaLoaderStateDidChangeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+                        
+                        MXMediaLoader *loader = (MXMediaLoader*)notif.object;
+                        if ([loader.downloadId isEqualToString:downloadId])
+                        {
+                            // update progress
+                            switch (loader.state) {
+                                case MXMediaLoaderStateDownloadInProgress:
+                                {
+                                    NSNumber* progressNumber = [loader.statisticsDict valueForKey:kMXMediaLoaderProgressValueKey];
+                                    if (progressNumber)
+                                    {
+                                        pieChartView.progress = progressNumber.floatValue;
+                                    }
+                                    break;
+                                }
+                                default:
+                                    break;
+                            }
+                        }
+                        
+                    }];
+                    
+                    [self prepareVideoForItem:item success:^{
+                        
+                        if (selectedCell.notificationObserver)
+                        {
+                            [[NSNotificationCenter defaultCenter] removeObserver:selectedCell.notificationObserver];
+                            selectedCell.notificationObserver = nil;
+                        }
+                        
+                        if (selectedCell.moviePlayer.view.superview)
+                        {
+                            selectedCell.moviePlayer.view.hidden = NO;
+                            selectedCell.centerIcon.hidden = YES;
+                            selectedCell.moviePlayer.player = [AVPlayer playerWithURL:[NSURL fileURLWithPath:self->videoFile]];
+                            [selectedCell.moviePlayer.player play];
+                            
+                            [pieChartView removeFromSuperview];
+                            
+                            [self hideNavigationBar];
+                        }
+                        
+                    } failure:^(NSError *error) {
+                        
+                        if (selectedCell.notificationObserver)
+                        {
+                            [[NSNotificationCenter defaultCenter] removeObserver:selectedCell.notificationObserver];
+                            selectedCell.notificationObserver = nil;
+                        }
+                        
+                        MXLogDebug(@"[MXKAttachmentsVC] video download failed");
+                        
+                        [pieChartView removeFromSuperview];
+                        
+                        // Display the navigation bar so that the user can leave this screen
+                        self.navigationBar.hidden = NO;
+                        
+                        // Notify MatrixKit user
+                        [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error];
+                        
+                    }];
+                    
+                    // Do not animate the navigation bar on video playback preparing
+                    return;
+                }
+            }
+        }
+    }
+    
+    // Animate navigation bar if it is has not been handled
+    if (!navigationBarDisplayHandled)
+    {
+        if (self.navigationBar.hidden)
+        {
+            self.navigationBar.hidden = NO;
+            [navigationBarDisplayTimer invalidate];
+            navigationBarDisplayTimer = [NSTimer scheduledTimerWithTimeInterval:3 target:self selector:@selector(hideNavigationBar) userInfo:self repeats:NO];
+        }
+        else
+        {
+            [self hideNavigationBar];
+        }
+    }
+}
+
+- (void)collectionView:(UICollectionView *)collectionView didEndDisplayingCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    // Here the cell is not displayed anymore, but it may be displayed again if the user swipes on it.
+    if ([cell isKindOfClass:[MXKMediaCollectionViewCell class]])
+    {
+        MXKMediaCollectionViewCell *mediaCollectionViewCell = (MXKMediaCollectionViewCell*)cell;
+        
+        // Check whether a video was playing in this cell.
+        if (mediaCollectionViewCell.moviePlayer)
+        {
+            // This cell concerns an attached video.
+            // We stop the player, and restore the default display based on the video thumbnail
+            [mediaCollectionViewCell.moviePlayer.player pause];
+            mediaCollectionViewCell.moviePlayer.player = nil;
+            mediaCollectionViewCell.moviePlayer = nil;
+            
+            mediaCollectionViewCell.mxkImageView.hidden = NO;
+            mediaCollectionViewCell.centerIcon.hidden = NO;
+            mediaCollectionViewCell.customView.hidden = YES;
+            
+            // Remove potential media download observer
+            if (mediaCollectionViewCell.notificationObserver)
+            {
+                [[NSNotificationCenter defaultCenter] removeObserver:mediaCollectionViewCell.notificationObserver];
+                mediaCollectionViewCell.notificationObserver = nil;
+            }
+        }
+    }
+}
+
+- (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset
+{
+    // Detect horizontal bounce at the beginning of the collection to trigger pagination
+    if (scrollView == self.attachmentsCollection && !isBackPaginationInProgress && !self.complete && self.delegate)
+    {
+        if (scrollView.contentOffset.x < -30)
+        {
+            isBackPaginationInProgress = YES;
+            [self.attachmentsCollection insertItemsAtIndexPaths:@[[NSIndexPath indexPathForItem:0 inSection:0]]];
+        }
+    }
+}
+
+- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
+{
+    if (scrollView == self.attachmentsCollection)
+    {
+        if (isBackPaginationInProgress)
+        {
+            MXKAttachment *attachment = self.attachments.firstObject;
+            self.complete = ![self.delegate attachmentsViewController:self paginateAttachmentBefore:attachment.eventId];
+        }
+        else
+        {
+            [self refreshCurrentVisibleCell];
+        }
+    }
+}
+
+#pragma mark - UICollectionViewDelegateFlowLayout
+
+- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    return [[UIScreen mainScreen] bounds].size;
+}
+
+#pragma mark - Movie Player
+
+- (void)moviePlayerPlaybackDidFinishWithErrorNotification:(NSNotification *)notification
+{
+    NSDictionary *notificationUserInfo = [notification userInfo];
+
+    NSError *mediaPlayerError = [notificationUserInfo objectForKey:AVPlayerItemFailedToPlayToEndTimeErrorKey];
+    if (mediaPlayerError)
+    {
+        MXLogDebug(@"[MXKAttachmentsVC] Playback failed with error description: %@", [mediaPlayerError localizedDescription]);
+
+        // Display the navigation bar so that the user can leave this screen
+        self.navigationBar.hidden = NO;
+
+        // Notify MatrixKit user
+        [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:mediaPlayerError];
+    }
+}
+
+#pragma mark - Gesture recognizer
+
+- (void)onCollectionViewCellTap:(UIGestureRecognizer*)gestureRecognizer
+{
+    MXKMediaCollectionViewCell *selectedCell;
+    
+    UIView *view = gestureRecognizer.view;
+    if ([view isKindOfClass:[MXKMediaCollectionViewCell class]])
+    {
+        selectedCell = (MXKMediaCollectionViewCell*)view;
+    }
+    
+    // Notify the collection view delegate a cell has been selected.
+    if (selectedCell && selectedCell.tag < attachments.count)
+    {
+        [self collectionView:self.attachmentsCollection didSelectItemAtIndexPath:[NSIndexPath indexPathForItem:(isBackPaginationInProgress ? selectedCell.tag + 1: selectedCell.tag) inSection:0]];
+    }
+}
+
+- (void)onCollectionViewCellLongPress:(UIGestureRecognizer*)gestureRecognizer
+{
+    MXKMediaCollectionViewCell *selectedCell;
+    
+    if (gestureRecognizer.state == UIGestureRecognizerStateBegan)
+    {
+        UIView *view = gestureRecognizer.view;
+        if ([view isKindOfClass:[MXKMediaCollectionViewCell class]])
+        {
+            selectedCell = (MXKMediaCollectionViewCell*)view;
+        }
+    }
+    
+    // Notify the collection view delegate a cell has been selected.
+    if (selectedCell && selectedCell.tag < attachments.count)
+    {
+        MXKAttachment *attachment = attachments[selectedCell.tag];
+        
+        if (currentAlert)
+        {
+            [currentAlert dismissViewControllerAnimated:NO completion:nil];
+        }
+        
+        __weak __typeof(self) weakSelf = self;
+        
+        currentAlert = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+        
+        if ([MXKAppSettings standardAppSettings].messageDetailsAllowSaving)
+        {
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n save]
+                                                             style:UIAlertActionStyleDefault
+                                                           handler:^(UIAlertAction * action) {
+                
+                typeof(self) self = weakSelf;
+                self->currentAlert = nil;
+                
+                [self startActivityIndicator];
+                
+                [attachment save:^{
+                    
+                    typeof(self) self = weakSelf;
+                    [self stopActivityIndicator];
+                    
+                } failure:^(NSError *error) {
+                    
+                    typeof(self) self = weakSelf;
+                    [self stopActivityIndicator];
+                    
+                    // Notify MatrixKit user
+                    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error];
+                    
+                }];
+                
+            }]];
+        }
+        
+        if ([MXKAppSettings standardAppSettings].messageDetailsAllowCopyingMedia)
+        {
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n copyButtonName]
+                                                             style:UIAlertActionStyleDefault
+                                                           handler:^(UIAlertAction * action) {
+                
+                typeof(self) self = weakSelf;
+                self->currentAlert = nil;
+                
+                [self startActivityIndicator];
+                
+                [attachment copy:^{
+                    
+                    typeof(self) self = weakSelf;
+                    [self stopActivityIndicator];
+                    
+                } failure:^(NSError *error) {
+                    
+                    typeof(self) self = weakSelf;
+                    [self stopActivityIndicator];
+                    
+                    // Notify MatrixKit user
+                    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error];
+                    
+                }];
+                
+            }]];
+        }
+        
+        if ([MXKAppSettings standardAppSettings].messageDetailsAllowSharing)
+        {
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n share]
+                                                             style:UIAlertActionStyleDefault
+                                                           handler:^(UIAlertAction * action) {
+                
+                MXWeakify(self);
+                
+                self->currentAlert = nil;
+                
+                [self startActivityIndicator];
+                
+                [attachment prepareShare:^(NSURL *fileURL) {
+                    
+                    MXStrongifyAndReturnIfNil(self);
+                    
+                    [self stopActivityIndicator];
+                    
+                    self->documentInteractionController = [UIDocumentInteractionController interactionControllerWithURL:fileURL];
+                    [self->documentInteractionController setDelegate:self];
+                    self->currentSharedAttachment = attachment;
+                    
+                    if (![self->documentInteractionController presentOptionsMenuFromRect:self.view.frame inView:self.view animated:YES])
+                    {
+                        self->documentInteractionController = nil;
+                        [attachment onShareEnded];
+                        self->currentSharedAttachment = nil;
+                    }
+                    
+                } failure:^(NSError *error) {
+                    
+                    MXStrongifyAndReturnIfNil(self);
+                    
+                    [self stopActivityIndicator];
+                    
+                    // Notify MatrixKit user
+                    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error];
+                    
+                }];
+                
+            }]];
+        }
+        
+        if ([MXMediaManager existingDownloaderWithIdentifier:attachment.downloadId])
+        {
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancelDownload]
+                                                             style:UIAlertActionStyleDefault
+                                                           handler:^(UIAlertAction * action) {
+                                                               
+                                                               typeof(self) self = weakSelf;
+                                                               self->currentAlert = nil;
+                                                               
+                                                               // Get again the loader
+                                                               MXMediaLoader *loader = [MXMediaManager existingDownloaderWithIdentifier:attachment.downloadId];
+                                                               if (loader)
+                                                               {
+                                                                   [loader cancel];
+                                                               }
+                                                               
+                                                           }]];
+        }
+        
+        if (currentAlert.actions.count)
+        {
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+                                                             style:UIAlertActionStyleCancel
+                                                           handler:^(UIAlertAction * action) {
+                                                               
+                                                               typeof(self) self = weakSelf;
+                                                               self->currentAlert = nil;
+                                                               
+                                                           }]];
+            
+            [currentAlert popoverPresentationController].sourceView = _attachmentsCollection;
+            [currentAlert popoverPresentationController].sourceRect = _attachmentsCollection.bounds;
+            [self presentViewController:currentAlert animated:YES completion:nil];
+        }
+        else
+        {
+            currentAlert = nil;
+        }
+    }
+}
+
+#pragma mark - UIDocumentInteractionControllerDelegate
+
+- (UIViewController *)documentInteractionControllerViewControllerForPreview: (UIDocumentInteractionController *) controller
+{
+    return self;
+}
+
+// Preview presented/dismissed on document.  Use to set up any HI underneath.
+- (void)documentInteractionControllerWillBeginPreview:(UIDocumentInteractionController *)controller
+{
+    documentInteractionController = controller;
+}
+
+- (void)documentInteractionControllerDidEndPreview:(UIDocumentInteractionController *)controller
+{
+    documentInteractionController = nil;
+    if (currentSharedAttachment)
+    {
+        [currentSharedAttachment onShareEnded];
+        currentSharedAttachment = nil;
+    }
+}
+
+- (void)documentInteractionControllerDidDismissOptionsMenu:(UIDocumentInteractionController *)controller
+{
+    documentInteractionController = nil;
+    if (currentSharedAttachment)
+    {
+        [currentSharedAttachment onShareEnded];
+        currentSharedAttachment = nil;
+    }
+}
+
+- (void)documentInteractionControllerDidDismissOpenInMenu:(UIDocumentInteractionController *)controller
+{
+    documentInteractionController = nil;
+    if (currentSharedAttachment)
+    {
+        [currentSharedAttachment onShareEnded];
+        currentSharedAttachment = nil;
+    }
+}
+
+- (UIImageView *)finalImageView
+{
+    MXKMediaCollectionViewCell *cell = (MXKMediaCollectionViewCell *)[self.attachmentsCollection.visibleCells firstObject];
+    return cell.mxkImageView.imageView;
+}
+
+#pragma mark - UIViewControllerTransitioningDelegate
+
+- (id <UIViewControllerAnimatedTransitioning>)animationControllerForPresentedController:(UIViewController *)presented presentingController:(UIViewController *)presenting sourceController:(UIViewController *)source
+{
+    if (self.customAnimationsEnabled)
+    {
+        return [[MXKAttachmentAnimator alloc] initWithAnimationType:PhotoBrowserZoomInAnimation sourceViewController:self.sourceViewController];
+    }
+    return nil;
+}
+
+- (id <UIViewControllerAnimatedTransitioning>)animationControllerForDismissedController:(UIViewController *)dismissed
+{
+    [self hideNavigationBar];
+    
+    if (self.customAnimationsEnabled)
+    {
+        return [[MXKAttachmentAnimator alloc] initWithAnimationType:PhotoBrowserZoomOutAnimation sourceViewController:self.sourceViewController];
+    }
+    return nil;
+}
+
+- (id<UIViewControllerInteractiveTransitioning>)interactionControllerForDismissal:(id<UIViewControllerAnimatedTransitioning>)animator
+{
+    //if there is an interaction, use the custom interaction controller to handle it
+    if (self.interactionController.interactionInProgress)
+    {
+        return self.interactionController;
+    }
+    return nil;
+}
+
+#pragma mark - UINavigationControllerDelegate
+
+- (id <UIViewControllerInteractiveTransitioning>)navigationController:(UINavigationController *)navigationController interactionControllerForAnimationController:(id <UIViewControllerAnimatedTransitioning>) animationController {
+    if (self.customAnimationsEnabled && self.interactionController.interactionInProgress)
+    {
+        return self.interactionController;
+    }
+    return nil;
+}
+
+- (id <UIViewControllerAnimatedTransitioning>)navigationController:(UINavigationController *)navigationController animationControllerForOperation:(UINavigationControllerOperation)operation
+                                                fromViewController:(UIViewController *)fromVC
+                                                  toViewController:(UIViewController *)toVC
+{
+    
+    if (self.customAnimationsEnabled)
+    {
+        if (operation == UINavigationControllerOperationPush)
+        {
+            return [[MXKAttachmentAnimator alloc] initWithAnimationType:PhotoBrowserZoomInAnimation sourceViewController:self.sourceViewController];
+        }
+        if (operation == UINavigationControllerOperationPop)
+        {
+            return [[MXKAttachmentAnimator alloc] initWithAnimationType:PhotoBrowserZoomOutAnimation sourceViewController:self.sourceViewController];
+        }
+        return nil;
+    }
+    
+    return nil;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKAttachmentsViewController.xib b/Riot/Modules/MatrixKit/Controllers/MXKAttachmentsViewController.xib
new file mode 100644
index 000000000..28409d2de
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKAttachmentsViewController.xib
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MXKAttachmentsViewController">
+            <connections>
+                <outlet property="attachmentsCollection" destination="LOp-cf-Sji" id="4Zx-KZ-fkh"/>
+                <outlet property="backButton" destination="VjO-K2-a0w" id="VlD-Iw-NT5"/>
+                <outlet property="navigationBar" destination="orb-yb-k6g" id="ILw-DO-IH2"/>
+                <outlet property="view" destination="iN0-l3-epB" id="ieV-u7-rXU"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" alwaysBounceHorizontal="YES" pagingEnabled="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="LOp-cf-Sji">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                    <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="RrA-v8-THJ">
+                        <size key="itemSize" width="600" height="600"/>
+                        <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                        <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                        <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                    </collectionViewFlowLayout>
+                    <connections>
+                        <outlet property="dataSource" destination="-1" id="gLX-KL-R8w"/>
+                        <outlet property="delegate" destination="-1" id="z1d-ep-n4n"/>
+                    </connections>
+                </collectionView>
+                <navigationBar contentMode="scaleToFill" translucent="NO" translatesAutoresizingMaskIntoConstraints="NO" id="orb-yb-k6g">
+                    <rect key="frame" x="0.0" y="20" width="375" height="44"/>
+                    <items>
+                        <navigationItem id="lP4-eZ-AQ8">
+                            <barButtonItem key="leftBarButtonItem" image="back_icon.png" style="plain" id="VjO-K2-a0w">
+                                <connections>
+                                    <action selector="onButtonPressed:" destination="-1" id="PEa-WB-Up1"/>
+                                </connections>
+                            </barButtonItem>
+                        </navigationItem>
+                    </items>
+                </navigationBar>
+            </subviews>
+            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="orb-yb-k6g" firstAttribute="top" secondItem="kHK-qN-rPN" secondAttribute="top" id="GGy-ix-LRO"/>
+                <constraint firstItem="LOp-cf-Sji" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="RQT-el-TH0"/>
+                <constraint firstAttribute="trailing" secondItem="LOp-cf-Sji" secondAttribute="trailing" id="Vgl-Wc-CI1"/>
+                <constraint firstAttribute="trailing" secondItem="orb-yb-k6g" secondAttribute="trailing" id="bFh-tc-Lub"/>
+                <constraint firstAttribute="bottom" secondItem="LOp-cf-Sji" secondAttribute="bottom" id="d22-2K-BEZ"/>
+                <constraint firstItem="LOp-cf-Sji" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="jEc-aG-zZn"/>
+                <constraint firstItem="orb-yb-k6g" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="toe-s8-clE"/>
+            </constraints>
+            <nil key="simulatedStatusBarMetrics"/>
+            <viewLayoutGuide key="safeArea" id="kHK-qN-rPN"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="back_icon.png" width="13.5" height="23"/>
+    </resources>
+</document>
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKAuthenticationViewController.h b/Riot/Modules/MatrixKit/Controllers/MXKAuthenticationViewController.h
new file mode 100644
index 000000000..ffb64afbe
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKAuthenticationViewController.h
@@ -0,0 +1,311 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2019 The Matrix.org Foundation C.I.C
+ 
+ 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/UIKit.h>
+
+#import "MXKViewController.h"
+
+#import "MXKAuthInputsView.h"
+#import "MXKAuthenticationFallbackWebView.h"
+
+@class MXKAuthenticationViewController;
+
+/**
+ `MXKAuthenticationViewController` delegate.
+ */
+@protocol MXKAuthenticationViewControllerDelegate <NSObject>
+
+/**
+ Tells the delegate the authentication process succeeded to add a new account.
+ 
+ @param authenticationViewController the `MXKAuthenticationViewController` instance.
+ @param userId the user id of the new added account.
+ */
+- (void)authenticationViewController:(MXKAuthenticationViewController *)authenticationViewController didLogWithUserId:(NSString*)userId;
+
+@end
+
+/**
+ This view controller should be used to manage registration or login flows with matrix homeserver.
+ 
+ Only the flow based on password is presently supported. Other flows should be added later.
+ 
+ You may add a delegate to be notified when a new account has been added successfully.
+ */
+@interface MXKAuthenticationViewController : MXKViewController <UITextFieldDelegate, MXKAuthInputsViewDelegate>
+{
+@protected
+    
+    /**
+     Reference to any opened alert view.
+     */
+    UIAlertController *alert;
+    
+    /**
+     Tell whether the password has been reseted with success.
+     Used to return on login screen on submit button pressed.
+     */
+    BOOL isPasswordReseted;
+}
+
+@property (weak, nonatomic) IBOutlet UIImageView *welcomeImageView;
+
+@property (strong, nonatomic) IBOutlet UIScrollView *authenticationScrollView;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *authScrollViewBottomConstraint;
+
+@property (weak, nonatomic) IBOutlet UIView *contentView;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *contentViewHeightConstraint;
+
+@property (weak, nonatomic) IBOutlet UILabel *subTitleLabel;
+
+@property (weak, nonatomic) IBOutlet UIView *authInputsContainerView;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *authInputContainerViewHeightConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *authInputContainerViewMinHeightConstraint;
+
+@property (weak, nonatomic) IBOutlet UILabel *homeServerLabel;
+@property (weak, nonatomic) IBOutlet UITextField *homeServerTextField;
+@property (weak, nonatomic) IBOutlet UILabel *homeServerInfoLabel;
+@property (weak, nonatomic) IBOutlet UIView *identityServerContainer;
+@property (weak, nonatomic) IBOutlet UILabel *identityServerLabel;
+@property (weak, nonatomic) IBOutlet UITextField *identityServerTextField;
+@property (weak, nonatomic) IBOutlet UILabel *identityServerInfoLabel;
+
+@property (weak, nonatomic) IBOutlet UIButton *submitButton;
+@property (weak, nonatomic) IBOutlet UIButton *authSwitchButton;
+
+@property (strong, nonatomic) IBOutlet UIActivityIndicatorView *authenticationActivityIndicator;
+@property (weak, nonatomic) IBOutlet UIView *authenticationActivityIndicatorContainerView;
+@property (weak, nonatomic) IBOutlet UILabel *noFlowLabel;
+@property (weak, nonatomic) IBOutlet UIButton *retryButton;
+
+@property (weak, nonatomic) IBOutlet UIView *authFallbackContentView;
+//  WKWebView is not available to be created from xib because of NSCoding support below iOS 11. So we're using a container view.
+// See this: https://stackoverflow.com/questions/46221577/xcode-9-gm-wkwebview-nscoding-support-was-broken-in-previous-versions
+@property (weak, nonatomic) IBOutlet UIView *authFallbackWebViewContainer;
+@property (strong, nonatomic) MXKAuthenticationFallbackWebView *authFallbackWebView;
+@property (weak, nonatomic) IBOutlet UIButton *cancelAuthFallbackButton;
+
+/**
+ The current authentication type (MXKAuthenticationTypeLogin by default).
+ */
+@property (nonatomic) MXKAuthenticationType authType;
+
+/**
+ The view in which authentication inputs are displayed (`MXKAuthInputsView-inherited` instance).
+ */
+@property (nonatomic) MXKAuthInputsView *authInputsView;
+
+/**
+ The default homeserver url (nil by default).
+ */
+@property (nonatomic) NSString *defaultHomeServerUrl;
+
+/**
+ The default identity server url (nil by default).
+ */
+@property (nonatomic) NSString *defaultIdentityServerUrl;
+
+/**
+ Force a registration process based on a predefined set of parameters.
+ Use this property to pursue a registration from the next_link sent in an email validation email.
+ */
+@property (nonatomic) NSDictionary* externalRegistrationParameters;
+
+/**
+ Use a login process based on the soft logout credentials.
+ */
+@property (nonatomic) MXCredentials *softLogoutCredentials;
+
+/**
+ Enable/disable overall the user interaction option.
+ It is used during authentication process to prevent multiple requests.
+ */
+@property(nonatomic,getter=isUserInteractionEnabled) BOOL userInteractionEnabled;
+
+/**
+ The device name used to display it in the user's devices list (nil by default).
+ If nil, the device display name field is filled with a default string: "Mobile", "Tablet"...
+ */
+@property (nonatomic) NSString *deviceDisplayName;
+
+/**
+ The delegate for the view controller.
+ */
+@property (nonatomic, weak) id<MXKAuthenticationViewControllerDelegate> delegate;
+
+/**
+ current ongoing MXHTTPOperation. Nil if none.
+ */
+@property (nonatomic, nullable, readonly) MXHTTPOperation *currentHttpOperation;
+
+/**
+ Returns the `UINib` object initialized for a `MXKAuthenticationViewController`.
+ 
+ @return The initialized `UINib` object or `nil` if there were errors during initialization
+ or the nib file could not be located.
+ 
+ @discussion You may override this method to provide a customized nib. If you do,
+ you should also override `authenticationViewController` to return your
+ view controller loaded from your custom nib.
+ */
++ (UINib *)nib;
+
+/**
+ Creates and returns a new `MXKAuthenticationViewController` object.
+ 
+ @discussion This is the designated initializer for programmatic instantiation.
+ 
+ @return An initialized `MXKAuthenticationViewController` object if successful, `nil` otherwise.
+ */
++ (instancetype)authenticationViewController;
+
+/**
+ Register the MXKAuthInputsView class that will be used to display inputs for an authentication type.
+ 
+ By default the 'MXKAuthInputsPasswordBasedView' class is registered for 'MXKAuthenticationTypeLogin' authentication.
+ No class is registered for 'MXKAuthenticationTypeRegister' type.
+ No class is registered for 'MXKAuthenticationTypeForgotPassword' type.
+ 
+ @param authInputsViewClass a MXKAuthInputsView-inherited class.
+ @param authType the concerned authentication type
+ */
+- (void)registerAuthInputsViewClass:(Class)authInputsViewClass forAuthType:(MXKAuthenticationType)authType;
+
+/**
+ Refresh login/register mechanism supported by the server and the application.
+ */
+- (void)refreshAuthenticationSession;
+
+/**
+ Handle supported flows and associated information returned by the homeserver.
+ */
+- (void)handleAuthenticationSession:(MXAuthenticationSession *)authSession;
+
+/**
+ Customize the MXHTTPClientOnUnrecognizedCertificate block that will be used to handle unrecognized certificate observed during authentication challenge from a server.
+ By default we prompt the user by displaying a fingerprint (SHA256) of the certificate. The user is then able to trust or not the certificate.
+ 
+ @param onUnrecognizedCertificateBlock the block that will be used to handle unrecognized certificate
+ */
+- (void)setOnUnrecognizedCertificateBlock:(MXHTTPClientOnUnrecognizedCertificate)onUnrecognizedCertificateBlock;
+
+/**
+ Check whether the current username is already in use.
+ 
+ @param callback A block object called when the operation is completed.
+ */
+- (void)isUserNameInUse:(void (^)(BOOL isUserNameInUse))callback;
+
+/**
+ Make a ping to the registration endpoint to detect a possible registration problem earlier.
+
+ @param callback A block object called when the operation is completed.
+                 It provides a MXError to check to verify if the user can be registered.
+ */
+- (void)testUserRegistration:(void (^)(MXError *mxError))callback;
+
+/**
+ Action registered on the following events:
+ - 'UIControlEventTouchUpInside' for each UIButton instance.
+ - 'UIControlEventValueChanged' for each UISwitch instance.
+ */
+- (IBAction)onButtonPressed:(id)sender;
+
+/**
+ Set the homeserver url and force a new authentication session.
+ The default homeserver url is used when the provided url is nil.
+ 
+ @param homeServerUrl the homeserver url to use
+ */
+- (void)setHomeServerTextFieldText:(NSString *)homeServerUrl;
+
+/**
+ Set the identity server url.
+ The default identity server url is used when the provided url is nil.
+ 
+ @param identityServerUrl the identity server url to use
+ */
+- (void)setIdentityServerTextFieldText:(NSString *)identityServerUrl;
+
+/**
+ Fetch the identity server from the wellknown API of the selected homeserver.
+ and check if the HS requires an identity server.
+ */
+- (void)checkIdentityServer;
+
+/**
+ Force dismiss keyboard
+ */
+- (void)dismissKeyboard;
+
+/**
+ Cancel the current operation, and return to the initial step
+ */
+- (void)cancel;
+
+/**
+ Handle the error received during an authentication request.
+ 
+ @param error the received error.
+ */
+- (void)onFailureDuringAuthRequest:(NSError *)error;
+
+
+/**
+ Display a kMXErrCodeStringResourceLimitExceeded error received during an authentication
+ request.
+
+ @param errorDict the error data.
+ @param onAdminContactTapped a callback indicating if the user wants to contact their admin.
+ */
+- (void)showResourceLimitExceededError:(NSDictionary *)errorDict onAdminContactTapped:(void (^)(NSURL *adminContact))onAdminContactTapped;
+
+/**
+ Handle the successful authentication request.
+ 
+ @param credentials the user's credentials.
+ */
+- (void)onSuccessfulLogin:(MXCredentials*)credentials;
+
+/// Login with custom parameters
+/// @param parameters Login parameters
+- (void)loginWithParameters:(NSDictionary*)parameters;
+
+/// Create an account with the given credentials
+/// @param credentials Account credentials
+- (void)createAccountWithCredentials:(MXCredentials *)credentials;
+
+#pragma mark - Authentication Fallback
+
+/**
+ Display the fallback URL within a webview.
+ */
+- (void)showAuthenticationFallBackView;
+
+#pragma mark - Device rehydration
+
+/**
+ Call this method at an appropriate time to attempt rehydrating from an existing dehydrated device
+ @param keyData Secret key data
+ @param credentials Account credentials
+ */
+
+- (void)attemptDeviceRehydrationWithKeyData:(NSData *)keyData credentials:(MXCredentials *)credentials;
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKAuthenticationViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKAuthenticationViewController.m
new file mode 100644
index 000000000..91a1eda04
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKAuthenticationViewController.m
@@ -0,0 +1,2150 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2019 The Matrix.org Foundation C.I.C
+
+ 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 "MXKAuthenticationViewController.h"
+
+#import "MXKAuthInputsEmailCodeBasedView.h"
+#import "MXKAuthInputsPasswordBasedView.h"
+
+#import "MXKAccountManager.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import <AFNetworking/AFNetworking.h>
+#import "MXKAppSettings.h"
+
+#import "MXKSwiftHeader.h"
+
+@interface MXKAuthenticationViewController ()
+{
+    /**
+     The matrix REST client used to make matrix API requests.
+     */
+    MXRestClient *mxRestClient;
+    
+    /**
+     Current request in progress.
+     */
+    MXHTTPOperation *mxCurrentOperation;
+    
+    /**
+     The MXKAuthInputsView class or a sub-class used when logging in.
+     */
+    Class loginAuthInputsViewClass;
+    
+    /**
+     The MXKAuthInputsView class or a sub-class used when registering.
+     */
+    Class registerAuthInputsViewClass;
+    
+    /**
+     The MXKAuthInputsView class or a sub-class used to handle forgot password case.
+     */
+    Class forgotPasswordAuthInputsViewClass;
+    
+    /**
+     Customized block used to handle unrecognized certificate (nil by default).
+     */
+    MXHTTPClientOnUnrecognizedCertificate onUnrecognizedCertificateCustomBlock;
+    
+    /**
+     The current authentication fallback URL (if any).
+     */
+    NSString *authenticationFallback;
+    
+    /**
+     The cancel button added in navigation bar when fallback page is opened.
+     */
+    UIBarButtonItem *cancelFallbackBarButton;
+    
+    /**
+     The timer used to postpone the registration when the authentication is pending (for example waiting for email validation)
+     */
+    NSTimer* registrationTimer;
+
+    /**
+     Identity server discovery.
+     */
+    MXAutoDiscovery *autoDiscovery;
+
+    MXHTTPOperation *checkIdentityServerOperation;
+}
+
+/**
+ The identity service used to make identity server API requests.
+ */
+@property (nonatomic) MXIdentityService *identityService;
+
+@end
+
+@implementation MXKAuthenticationViewController
+
+#pragma mark - Class methods
+
++ (UINib *)nib
+{
+    return [UINib nibWithNibName:NSStringFromClass([MXKAuthenticationViewController class])
+                          bundle:[NSBundle bundleForClass:[MXKAuthenticationViewController class]]];
+}
+
++ (instancetype)authenticationViewController
+{
+    return [[[self class] alloc] initWithNibName:NSStringFromClass([MXKAuthenticationViewController class])
+                                          bundle:[NSBundle bundleForClass:[MXKAuthenticationViewController class]]];
+}
+
+#pragma mark -
+
+- (void)finalizeInit
+{
+    [super finalizeInit];
+    
+    // Set initial auth type
+    _authType = MXKAuthenticationTypeLogin;
+    
+    _deviceDisplayName = nil;
+    
+    // Initialize authInputs view classes
+    loginAuthInputsViewClass = MXKAuthInputsPasswordBasedView.class;
+    registerAuthInputsViewClass = nil; // No registration flow is supported yet
+    forgotPasswordAuthInputsViewClass = nil;
+}
+
+#pragma mark -
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    // Do any additional setup after loading the view, typically from a nib.
+    
+    // Check whether the view controller has been pushed via storyboard
+    if (!_authenticationScrollView)
+    {
+        // Instantiate view controller objects
+        [[[self class] nib] instantiateWithOwner:self options:nil];
+    }
+    
+    self.authFallbackWebView = [[MXKAuthenticationFallbackWebView alloc] initWithFrame:self.authFallbackWebViewContainer.bounds];
+    [self.authFallbackWebViewContainer addSubview:self.authFallbackWebView];
+    [self.authFallbackWebView.leadingAnchor constraintEqualToAnchor:self.authFallbackWebViewContainer.leadingAnchor constant:0].active = YES;
+    [self.authFallbackWebView.trailingAnchor constraintEqualToAnchor:self.authFallbackWebViewContainer.trailingAnchor constant:0].active = YES;
+    [self.authFallbackWebView.topAnchor constraintEqualToAnchor:self.authFallbackWebViewContainer.topAnchor constant:0].active = YES;
+    [self.authFallbackWebView.bottomAnchor constraintEqualToAnchor:self.authFallbackWebViewContainer.bottomAnchor constant:0].active = YES;
+    
+    // Load welcome image from MatrixKit asset bundle
+    self.welcomeImageView.image = [NSBundle mxk_imageFromMXKAssetsBundleWithName:@"logoHighRes"];
+
+    _authenticationScrollView.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+    
+    _subTitleLabel.numberOfLines = 0;
+    
+    _submitButton.enabled = NO;
+    _authSwitchButton.enabled = YES;
+    
+    _homeServerTextField.text = _defaultHomeServerUrl;
+    _identityServerTextField.text = _defaultIdentityServerUrl;
+
+    // Hide the identity server by default
+    [self setIdentityServerHidden:YES];
+
+    // Create here REST client (if homeserver is defined)
+    [self updateRESTClient];
+    
+    // Localize labels
+    _homeServerLabel.text = [MatrixKitL10n loginHomeServerTitle];
+    _homeServerTextField.placeholder = [MatrixKitL10n loginServerUrlPlaceholder];
+    _homeServerInfoLabel.text = [MatrixKitL10n loginHomeServerInfo];
+    _identityServerLabel.text = [MatrixKitL10n loginIdentityServerTitle];
+    _identityServerTextField.placeholder = [MatrixKitL10n loginServerUrlPlaceholder];
+    _identityServerInfoLabel.text = [MatrixKitL10n loginIdentityServerInfo];
+    [_cancelAuthFallbackButton setTitle:[MatrixKitL10n cancel] forState:UIControlStateNormal];
+    [_cancelAuthFallbackButton setTitle:[MatrixKitL10n cancel] forState:UIControlStateHighlighted];
+}
+
+- (void)didReceiveMemoryWarning
+{
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onTextFieldChange:) name:UITextFieldTextDidChangeNotification object:nil];
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    
+    [self dismissKeyboard];
+    
+    // close any opened alert
+    if (alert)
+    {
+        [alert dismissViewControllerAnimated:NO completion:nil];
+        alert = nil;
+    }
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:AFNetworkingReachabilityDidChangeNotification object:nil];
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:UITextFieldTextDidChangeNotification object:nil];
+}
+
+#pragma mark - Override MXKViewController
+
+- (void)onKeyboardShowAnimationComplete
+{
+    // Report the keyboard view in order to track keyboard frame changes
+    // TODO define inputAccessoryView for each text input
+    // and report the inputAccessoryView.superview of the firstResponder in self.keyboardView.
+}
+
+- (void)setKeyboardHeight:(CGFloat)keyboardHeight
+{
+    // Deduce the bottom inset for the scroll view (Don't forget the potential tabBar)
+    CGFloat scrollViewInsetBottom = keyboardHeight - self.bottomLayoutGuide.length;
+    // Check whether the keyboard is over the tabBar
+    if (scrollViewInsetBottom < 0)
+    {
+        scrollViewInsetBottom = 0;
+    }
+    
+    UIEdgeInsets insets = self.authenticationScrollView.contentInset;
+    insets.bottom = scrollViewInsetBottom;
+    self.authenticationScrollView.contentInset = insets;
+}
+
+- (void)destroy
+{
+    self.authInputsView = nil;
+    
+    if (registrationTimer)
+    {
+        [registrationTimer invalidate];
+        registrationTimer = nil;
+    }
+    
+    if (mxCurrentOperation)
+    {
+        [mxCurrentOperation cancel];
+        mxCurrentOperation = nil;
+    }
+
+    [self cancelIdentityServerCheck];
+
+    [mxRestClient close];
+    mxRestClient = nil;
+
+    authenticationFallback = nil;
+    cancelFallbackBarButton = nil;
+    
+    [super destroy];
+}
+
+#pragma mark - Class methods
+
+- (void)registerAuthInputsViewClass:(Class)authInputsViewClass forAuthType:(MXKAuthenticationType)authType
+{
+    // Sanity check: accept only MXKAuthInputsView classes or sub-classes
+    NSParameterAssert([authInputsViewClass isSubclassOfClass:MXKAuthInputsView.class]);
+    
+    if (authType == MXKAuthenticationTypeLogin)
+    {
+        loginAuthInputsViewClass = authInputsViewClass;
+    }
+    else if (authType == MXKAuthenticationTypeRegister)
+    {
+        registerAuthInputsViewClass = authInputsViewClass;
+    }
+    else if (authType == MXKAuthenticationTypeForgotPassword)
+    {
+        forgotPasswordAuthInputsViewClass = authInputsViewClass;
+    }
+}
+
+- (void)setAuthType:(MXKAuthenticationType)authType
+{
+    if (_authType != authType)
+    {
+        _authType = authType;
+        
+        // Cancel external registration parameters if any
+        _externalRegistrationParameters = nil;
+        
+        // Remove the current inputs view
+        self.authInputsView = nil;
+        
+        isPasswordReseted = NO;
+        
+        [self.authInputsContainerView bringSubviewToFront: _authenticationActivityIndicator];
+        [_authenticationActivityIndicator startAnimating];
+    }
+    
+    // Restore user interaction
+    self.userInteractionEnabled = YES;
+    
+    if (authType == MXKAuthenticationTypeLogin)
+    {
+        _subTitleLabel.hidden = YES;
+        [_submitButton setTitle:[MatrixKitL10n login] forState:UIControlStateNormal];
+        [_submitButton setTitle:[MatrixKitL10n login] forState:UIControlStateHighlighted];
+        [_authSwitchButton setTitle:[MatrixKitL10n createAccount] forState:UIControlStateNormal];
+        [_authSwitchButton setTitle:[MatrixKitL10n createAccount] forState:UIControlStateHighlighted];
+        
+        // Update supported authentication flow and associated information (defined in authentication session)
+        [self refreshAuthenticationSession];
+    }
+    else if (authType == MXKAuthenticationTypeRegister)
+    {
+        _subTitleLabel.hidden = NO;
+        _subTitleLabel.text = [MatrixKitL10n loginCreateAccount];
+        [_submitButton setTitle:[MatrixKitL10n signUp] forState:UIControlStateNormal];
+        [_submitButton setTitle:[MatrixKitL10n signUp] forState:UIControlStateHighlighted];
+        [_authSwitchButton setTitle:[MatrixKitL10n back] forState:UIControlStateNormal];
+        [_authSwitchButton setTitle:[MatrixKitL10n back] forState:UIControlStateHighlighted];
+        
+        // Update supported authentication flow and associated information (defined in authentication session)
+        [self refreshAuthenticationSession];
+    }
+    else if (authType == MXKAuthenticationTypeForgotPassword)
+    {
+        _subTitleLabel.hidden = YES;
+        
+        if (isPasswordReseted)
+        {
+            [_submitButton setTitle:[MatrixKitL10n back] forState:UIControlStateNormal];
+            [_submitButton setTitle:[MatrixKitL10n back] forState:UIControlStateHighlighted];
+        }
+        else
+        {
+            [_submitButton setTitle:[MatrixKitL10n submit] forState:UIControlStateNormal];
+            [_submitButton setTitle:[MatrixKitL10n submit] forState:UIControlStateHighlighted];
+            
+            [self refreshForgotPasswordSession];
+        }
+        
+        [_authSwitchButton setTitle:[MatrixKitL10n back] forState:UIControlStateNormal];
+        [_authSwitchButton setTitle:[MatrixKitL10n back] forState:UIControlStateHighlighted];
+    }
+
+    [self checkIdentityServer];
+}
+
+- (void)setAuthInputsView:(MXKAuthInputsView *)authInputsView
+{
+    // Here a new view will be loaded, hide first subviews which depend on auth flow
+    _submitButton.hidden = YES;
+    _noFlowLabel.hidden = YES;
+    _retryButton.hidden = YES;
+    
+    if (_authInputsView)
+    {
+        [_authInputsView removeObserver:self forKeyPath:@"viewHeightConstraint.constant"];
+
+        [NSLayoutConstraint deactivateConstraints:_authInputsView.constraints];
+        [_authInputsView removeFromSuperview];
+        _authInputsView.delegate = nil;
+        [_authInputsView destroy];
+        _authInputsView = nil;
+    }
+    
+    _authInputsView = authInputsView;
+    
+    CGFloat previousInputsContainerViewHeight = _authInputContainerViewHeightConstraint.constant;
+    
+    if (_authInputsView)
+    {
+        _authInputsView.translatesAutoresizingMaskIntoConstraints = NO;
+        [_authInputsContainerView addSubview:_authInputsView];
+        
+        _authInputsView.delegate = self;
+        
+        _submitButton.hidden = NO;
+        _authInputsView.hidden = NO;
+        
+        _authInputContainerViewHeightConstraint.constant = _authInputsView.viewHeightConstraint.constant;
+        
+        NSLayoutConstraint* topConstraint = [NSLayoutConstraint constraintWithItem:_authInputsContainerView
+                                                                         attribute:NSLayoutAttributeTop
+                                                                         relatedBy:NSLayoutRelationEqual
+                                                                            toItem:_authInputsView
+                                                                         attribute:NSLayoutAttributeTop
+                                                                        multiplier:1.0f
+                                                                          constant:0.0f];
+        
+        
+        NSLayoutConstraint* leadingConstraint = [NSLayoutConstraint constraintWithItem:_authInputsContainerView
+                                                                             attribute:NSLayoutAttributeLeading
+                                                                             relatedBy:NSLayoutRelationEqual
+                                                                                toItem:_authInputsView
+                                                                             attribute:NSLayoutAttributeLeading
+                                                                            multiplier:1.0f
+                                                                              constant:0.0f];
+        
+        NSLayoutConstraint* trailingConstraint = [NSLayoutConstraint constraintWithItem:_authInputsContainerView
+                                                                              attribute:NSLayoutAttributeTrailing
+                                                                              relatedBy:NSLayoutRelationEqual
+                                                                                 toItem:_authInputsView
+                                                                              attribute:NSLayoutAttributeTrailing
+                                                                             multiplier:1.0f
+                                                                               constant:0.0f];
+        
+        
+        [NSLayoutConstraint activateConstraints:@[topConstraint, leadingConstraint, trailingConstraint]];
+        
+        [_authInputsView addObserver:self forKeyPath:@"viewHeightConstraint.constant" options:0 context:nil];
+    }
+    else
+    {
+        // No input fields are displayed
+        _authInputContainerViewHeightConstraint.constant = _authInputContainerViewMinHeightConstraint.constant;
+    }
+    
+    [self.view layoutIfNeeded];
+    
+    // Refresh content view height by considering the updated height of inputs container
+    _contentViewHeightConstraint.constant += (_authInputContainerViewHeightConstraint.constant - previousInputsContainerViewHeight);
+}
+
+- (void)setDefaultHomeServerUrl:(NSString *)defaultHomeServerUrl
+{
+    _defaultHomeServerUrl = defaultHomeServerUrl;
+    
+    if (!_homeServerTextField.text.length)
+    {
+        [self setHomeServerTextFieldText:defaultHomeServerUrl];
+    }
+}
+
+- (void)setDefaultIdentityServerUrl:(NSString *)defaultIdentityServerUrl
+{
+    _defaultIdentityServerUrl = defaultIdentityServerUrl;
+    
+    if (!_identityServerTextField.text.length)
+    {
+        [self setIdentityServerTextFieldText:defaultIdentityServerUrl];
+    }
+}
+
+- (void)setHomeServerTextFieldText:(NSString *)homeServerUrl
+{
+    if (!homeServerUrl.length)
+    {
+        // Force refresh with default value
+        homeServerUrl = _defaultHomeServerUrl;
+    }
+    
+    _homeServerTextField.text = homeServerUrl;
+    
+    if (!mxRestClient || ![mxRestClient.homeserver isEqualToString:homeServerUrl])
+    {
+        [self updateRESTClient];
+        
+        if (_authType == MXKAuthenticationTypeLogin || _authType == MXKAuthenticationTypeRegister)
+        {
+            // Restore default UI
+            self.authType = _authType;
+        }
+        else
+        {
+            // Refresh the IS anyway
+            [self checkIdentityServer];
+        }
+    }
+}
+
+- (void)setIdentityServerTextFieldText:(NSString *)identityServerUrl
+{    
+    _identityServerTextField.text = identityServerUrl;
+    
+    [self updateIdentityServerURL:identityServerUrl];
+}
+
+- (void)updateIdentityServerURL:(NSString*)url
+{
+    if (![self.identityService.identityServer isEqualToString:url])
+    {
+        if (url.length)
+        {
+            self.identityService = [[MXIdentityService alloc] initWithIdentityServer:url accessToken:nil andHomeserverRestClient:mxRestClient];
+        }
+        else
+        {
+            self.identityService = nil;
+        }
+    }
+    
+    [mxRestClient setIdentityServer:url.length ? url : nil];
+}
+
+- (void)setIdentityServerHidden:(BOOL)hidden
+{
+    _identityServerContainer.hidden = hidden;
+}
+
+- (void)checkIdentityServer
+{
+    [self cancelIdentityServerCheck];
+
+    // Hide the field while checking data
+    [self setIdentityServerHidden:YES];
+
+    NSString *homeserver = mxRestClient.homeserver;
+
+    // First, fetch the IS advertised by the HS
+    if (homeserver)
+    {
+        MXLogDebug(@"[MXKAuthenticationVC] checkIdentityServer for homeserver %@", homeserver);
+
+        autoDiscovery = [[MXAutoDiscovery alloc] initWithUrl:homeserver];
+
+        MXWeakify(self);
+        checkIdentityServerOperation = [autoDiscovery findClientConfig:^(MXDiscoveredClientConfig * _Nonnull discoveredClientConfig) {
+            MXStrongifyAndReturnIfNil(self);
+
+            NSString *identityServer = discoveredClientConfig.wellKnown.identityServer.baseUrl;
+            MXLogDebug(@"[MXKAuthenticationVC] checkIdentityServer: Identity server: %@", identityServer);
+
+            if (identityServer)
+            {
+                // Apply the provided IS
+                [self setIdentityServerTextFieldText:identityServer];
+            }
+
+            // Then, check if the HS needs an IS for running
+            MXWeakify(self);
+            MXHTTPOperation *operation = [self checkIdentityServerRequirementWithCompletion:^(BOOL identityServerRequired) {
+                
+                MXStrongifyAndReturnIfNil(self);
+
+                self->checkIdentityServerOperation = nil;
+
+                // Show the field only if an IS is required so that the user can customise it
+                [self setIdentityServerHidden:!identityServerRequired];
+            }];
+
+            if (operation)
+            {
+                [self->checkIdentityServerOperation mutateTo:operation];
+            }
+            else
+            {
+                self->checkIdentityServerOperation = nil;
+            }
+
+            self->autoDiscovery = nil;
+
+        } failure:^(NSError *error) {
+            MXStrongifyAndReturnIfNil(self);
+
+            // No need to report this error to the end user
+            // There will be already an error about failing to get the auth flow from the HS
+            MXLogDebug(@"[MXKAuthenticationVC] checkIdentityServer. Error: %@", error);
+
+            self->autoDiscovery = nil;
+        }];
+    }
+}
+
+- (void)cancelIdentityServerCheck
+{
+    if (checkIdentityServerOperation)
+    {
+        [checkIdentityServerOperation cancel];
+        checkIdentityServerOperation = nil;
+    }
+}
+
+- (MXHTTPOperation*)checkIdentityServerRequirementWithCompletion:(void (^)(BOOL identityServerRequired))completion
+{
+    MXHTTPOperation *operation;
+
+    if (_authType == MXKAuthenticationTypeLogin)
+    {
+        // The identity server is only required for registration and password reset
+        // It is then stored in the user account data
+        completion(NO);
+    }
+    else
+    {
+        operation = [mxRestClient supportedMatrixVersions:^(MXMatrixVersions *matrixVersions) {
+
+            MXLogDebug(@"[MXKAuthenticationVC] checkIdentityServerRequirement: %@", matrixVersions.doesServerRequireIdentityServerParam ? @"YES": @"NO");
+            completion(matrixVersions.doesServerRequireIdentityServerParam);
+
+        } failure:^(NSError *error) {
+            // No need to report this error to the end user
+            // There will be already an error about failing to get the auth flow from the HS
+            MXLogDebug(@"[MXKAuthenticationVC] checkIdentityServerRequirement. Error: %@", error);
+        }];
+    }
+
+    return operation;
+}
+
+- (void)setUserInteractionEnabled:(BOOL)userInteractionEnabled
+{
+    _submitButton.enabled = (userInteractionEnabled && _authInputsView.areAllRequiredFieldsSet);
+    _authSwitchButton.enabled = userInteractionEnabled;
+    
+    _homeServerTextField.enabled = userInteractionEnabled;
+    _identityServerTextField.enabled = userInteractionEnabled;
+    
+    _userInteractionEnabled = userInteractionEnabled;
+}
+
+- (void)refreshAuthenticationSession
+{
+    // Remove reachability observer
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:AFNetworkingReachabilityDidChangeNotification object:nil];
+    
+    // Cancel potential request in progress
+    [mxCurrentOperation cancel];
+    mxCurrentOperation = nil;
+    
+    // Reset potential authentication fallback url
+    authenticationFallback = nil;
+    
+    if (mxRestClient)
+    {
+        if (_authType == MXKAuthenticationTypeLogin)
+        {
+            mxCurrentOperation = [mxRestClient getLoginSession:^(MXAuthenticationSession* authSession) {
+                
+                [self handleAuthenticationSession:authSession];
+                
+            } failure:^(NSError *error) {
+                
+                [self onFailureDuringMXOperation:error];
+                
+            }];
+        }
+        else if (_authType == MXKAuthenticationTypeRegister)
+        {
+            mxCurrentOperation = [mxRestClient getRegisterSession:^(MXAuthenticationSession* authSession){
+                
+                [self handleAuthenticationSession:authSession];
+                
+            } failure:^(NSError *error){
+                
+                [self onFailureDuringMXOperation:error];
+                
+            }];
+        }
+        else
+        {
+            // Not supported for other types
+            MXLogDebug(@"[MXKAuthenticationVC] refreshAuthenticationSession is ignored");
+        }
+    }
+}
+
+- (void)handleAuthenticationSession:(MXAuthenticationSession *)authSession
+{
+    mxCurrentOperation = nil;
+    
+    [_authenticationActivityIndicator stopAnimating];
+    
+    // Check whether fallback is defined, and retrieve the right input view class.
+    Class authInputsViewClass;
+    if (_authType == MXKAuthenticationTypeLogin)
+    {
+        authenticationFallback = [mxRestClient loginFallback];
+        authInputsViewClass = loginAuthInputsViewClass;
+        
+    }
+    else if (_authType == MXKAuthenticationTypeRegister)
+    {
+        authenticationFallback = [mxRestClient registerFallback];
+        authInputsViewClass = registerAuthInputsViewClass;
+    }
+    else
+    {
+        // Not supported for other types
+        MXLogDebug(@"[MXKAuthenticationVC] handleAuthenticationSession is ignored");
+        return;
+    }
+    
+    MXKAuthInputsView *authInputsView = nil;
+    if (authInputsViewClass)
+    {
+        // Instantiate a new auth inputs view, except if the current one is already an instance of this class.
+        if (self.authInputsView && self.authInputsView.class == authInputsViewClass)
+        {
+            // Use the current view
+            authInputsView = self.authInputsView;
+        }
+        else
+        {
+            authInputsView = [authInputsViewClass authInputsView];
+        }
+    }
+    
+    if (authInputsView)
+    {
+        // Apply authentication session on inputs view
+        if ([authInputsView setAuthSession:authSession withAuthType:_authType] == NO)
+        {
+            MXLogDebug(@"[MXKAuthenticationVC] Received authentication settings are not supported");
+            authInputsView = nil;
+        }
+        else if (!_softLogoutCredentials)
+        {
+            // If all listed flows in this authentication session are not supported we suggest using the fallback page.
+            if (authenticationFallback.length && authInputsView.authSession.flows.count == 0)
+            {
+                MXLogDebug(@"[MXKAuthenticationVC] No supported flow, suggest using fallback page");
+                authInputsView = nil;
+            }
+            else if (authInputsView.authSession.flows.count != authSession.flows.count)
+            {
+                MXLogDebug(@"[MXKAuthenticationVC] The authentication session contains at least one unsupported flow");
+            }
+        }
+    }
+    
+    if (authInputsView)
+    {
+        // Check whether the current view must be replaced
+        if (self.authInputsView != authInputsView)
+        {
+            // Refresh layout
+            self.authInputsView = authInputsView;
+        }
+        
+        // Refresh user interaction
+        self.userInteractionEnabled = _userInteractionEnabled;
+        
+        // Check whether an external set of parameters have been defined to pursue a registration
+        if (self.externalRegistrationParameters)
+        {
+            if ([authInputsView setExternalRegistrationParameters:self.externalRegistrationParameters])
+            {
+                // Launch authentication now
+                [self onButtonPressed:_submitButton];
+            }
+            else
+            {
+                [self onFailureDuringAuthRequest:[NSError errorWithDomain:MXKAuthErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey:[MatrixKitL10n notSupportedYet]}]];
+                
+                _externalRegistrationParameters = nil;
+                
+                // Restore login screen on failure
+                self.authType = MXKAuthenticationTypeLogin;
+            }
+        }
+
+        if (_softLogoutCredentials)
+        {
+            [authInputsView setSoftLogoutCredentials:_softLogoutCredentials];
+        }
+    }
+    else
+    {
+        // Remove the potential auth inputs view
+        self.authInputsView = nil;
+        
+        // Cancel external registration parameters if any
+        _externalRegistrationParameters = nil;
+        
+        // Notify user that no flow is supported
+        if (_authType == MXKAuthenticationTypeLogin)
+        {
+            _noFlowLabel.text = [MatrixKitL10n loginErrorDoNotSupportLoginFlows];
+        }
+        else
+        {
+            _noFlowLabel.text = [MatrixKitL10n loginErrorRegistrationIsNotSupported];
+        }
+        MXLogDebug(@"[MXKAuthenticationVC] Warning: %@", _noFlowLabel.text);
+        
+        if (authenticationFallback.length)
+        {
+            [_retryButton setTitle:[MatrixKitL10n loginUseFallback] forState:UIControlStateNormal];
+            [_retryButton setTitle:[MatrixKitL10n loginUseFallback] forState:UIControlStateNormal];
+        }
+        else
+        {
+            [_retryButton setTitle:[MatrixKitL10n retry] forState:UIControlStateNormal];
+            [_retryButton setTitle:[MatrixKitL10n retry] forState:UIControlStateNormal];
+        }
+        
+        _noFlowLabel.hidden = NO;
+        _retryButton.hidden = NO;
+    }
+}
+
+- (void)setExternalRegistrationParameters:(NSDictionary*)parameters
+{
+    if (parameters.count)
+    {
+        MXLogDebug(@"[MXKAuthenticationVC] setExternalRegistrationParameters");
+        
+        // Cancel the current operation if any.
+        [self cancel];
+        
+        // Load the view controller’s view if it has not yet been loaded.
+        // This is required before updating view's textfields (homeserver url...)
+        [self loadViewIfNeeded];
+        
+        // Force register mode
+        self.authType = MXKAuthenticationTypeRegister;
+        
+        // Apply provided homeserver if any
+        id hs_url = parameters[@"hs_url"];
+        NSString *homeserverURL = nil;
+        if (hs_url && [hs_url isKindOfClass:NSString.class])
+        {
+            homeserverURL = hs_url;
+        }
+        [self setHomeServerTextFieldText:homeserverURL];
+        
+        // Apply provided identity server if any
+        id is_url = parameters[@"is_url"];
+        NSString *identityURL = nil;
+        if (is_url && [is_url isKindOfClass:NSString.class])
+        {
+            identityURL = is_url;
+        }
+        [self setIdentityServerTextFieldText:identityURL];
+        
+        // Disable user interaction
+        self.userInteractionEnabled = NO;
+        
+        // Cancel potential request in progress
+        [mxCurrentOperation cancel];
+        mxCurrentOperation = nil;
+        
+        // Remove the current auth inputs view
+        self.authInputsView = nil;
+        
+        // Set external parameters and trigger a refresh (the parameters will be taken into account during [handleAuthenticationSession:])
+        _externalRegistrationParameters = parameters;
+        [self refreshAuthenticationSession];
+    }
+    else
+    {
+        MXLogDebug(@"[MXKAuthenticationVC] reset externalRegistrationParameters");
+        _externalRegistrationParameters = nil;
+        
+        // Restore default UI
+        self.authType = _authType;
+    }
+}
+
+- (void)setSoftLogoutCredentials:(MXCredentials *)softLogoutCredentials
+{
+    MXLogDebug(@"[MXKAuthenticationVC] setSoftLogoutCredentials");
+
+    // Cancel the current operation if any.
+    [self cancel];
+
+    // Load the view controller’s view if it has not yet been loaded.
+    // This is required before updating view's textfields (homeserver url...)
+    [self loadViewIfNeeded];
+
+    // Force register mode
+    self.authType = MXKAuthenticationTypeLogin;
+
+    [self setHomeServerTextFieldText:softLogoutCredentials.homeServer];
+    [self setIdentityServerTextFieldText:softLogoutCredentials.identityServer];
+
+    // Cancel potential request in progress
+    [mxCurrentOperation cancel];
+    mxCurrentOperation = nil;
+
+    // Remove the current auth inputs view
+    self.authInputsView = nil;
+
+    // Set parameters and trigger a refresh (the parameters will be taken into account during [handleAuthenticationSession:])
+    _softLogoutCredentials = softLogoutCredentials;
+    [self refreshAuthenticationSession];
+}
+
+- (void)setOnUnrecognizedCertificateBlock:(MXHTTPClientOnUnrecognizedCertificate)onUnrecognizedCertificateBlock
+{
+    onUnrecognizedCertificateCustomBlock = onUnrecognizedCertificateBlock;
+}
+
+- (void)isUserNameInUse:(void (^)(BOOL isUserNameInUse))callback
+{
+    mxCurrentOperation = [mxRestClient isUserNameInUse:self.authInputsView.userId callback:^(BOOL isUserNameInUse) {
+        
+        self->mxCurrentOperation = nil;
+        
+        if (callback)
+        {
+            callback (isUserNameInUse);
+        }
+        
+    }];
+}
+
+- (void)testUserRegistration:(void (^)(MXError *mxError))callback
+{
+    mxCurrentOperation = [mxRestClient testUserRegistration:self.authInputsView.userId callback:callback];
+}
+
+- (IBAction)onButtonPressed:(id)sender
+{
+    [self dismissKeyboard];
+    
+    if (sender == _submitButton)
+    {
+        // Disable user interaction to prevent multiple requests
+        self.userInteractionEnabled = NO;
+        
+        // Check parameters validity
+        NSString *errorMsg = [self.authInputsView validateParameters];
+        if (errorMsg)
+        {
+            [self onFailureDuringAuthRequest:[NSError errorWithDomain:MXKAuthErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey:errorMsg}]];
+        }
+        else
+        {
+            [self.authInputsContainerView bringSubviewToFront: _authenticationActivityIndicator];
+            
+            // Launch the authentication according to its type
+            if (_authType == MXKAuthenticationTypeLogin)
+            {
+                // Prepare the parameters dict
+                [self.authInputsView prepareParameters:^(NSDictionary *parameters, NSError *error) {
+                    
+                    if (parameters && self->mxRestClient)
+                    {
+                        [self->_authenticationActivityIndicator startAnimating];
+                        [self loginWithParameters:parameters];
+                    }
+                    else
+                    {
+                        MXLogDebug(@"[MXKAuthenticationVC] Failed to prepare parameters");
+                        [self onFailureDuringAuthRequest:error];
+                    }
+                    
+                }];
+            }
+            else if (_authType == MXKAuthenticationTypeRegister)
+            {
+                // Check here the availability of the userId
+                if (self.authInputsView.userId.length)
+                {
+                    [_authenticationActivityIndicator startAnimating];
+                    
+                    if (self.authInputsView.password.length)
+                    {
+                        // Trigger here a register request in order to associate the filled userId and password to the current session id
+                        // This will check the availability of the userId at the same time
+                        NSDictionary *parameters = @{@"auth": @{},
+                                                     @"username": self.authInputsView.userId,
+                                                     @"password": self.authInputsView.password,
+                                                     @"bind_email": @(NO),
+                                                     @"initial_device_display_name":self.deviceDisplayName
+                                                     };
+                        
+                        mxCurrentOperation = [mxRestClient registerWithParameters:parameters success:^(NSDictionary *JSONResponse) {
+                            
+                            // Unexpected case where the registration succeeds without any other stages
+                            MXLoginResponse *loginResponse;
+                            MXJSONModelSetMXJSONModel(loginResponse, MXLoginResponse, JSONResponse);
+
+                            MXCredentials *credentials = [[MXCredentials alloc] initWithLoginResponse:loginResponse
+                                                                                andDefaultCredentials:self->mxRestClient.credentials];
+                            
+                            // Sanity check
+                            if (!credentials.userId || !credentials.accessToken)
+                            {
+                                [self onFailureDuringAuthRequest:[NSError errorWithDomain:MXKAuthErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey:[MatrixKitL10n notSupportedYet]}]];
+                            }
+                            else
+                            {
+                                MXLogDebug(@"[MXKAuthenticationVC] Registration succeeded");
+
+                                // Report the certificate trusted by user (if any)
+                                credentials.allowedCertificate = self->mxRestClient.allowedCertificate;
+                                
+                                [self onSuccessfulLogin:credentials];
+                            }
+                            
+                        } failure:^(NSError *error) {
+                            
+                            self->mxCurrentOperation = nil;
+                            
+                            // An updated authentication session should be available in response data in case of unauthorized request.
+                            NSDictionary *JSONResponse = nil;
+                            if (error.userInfo[MXHTTPClientErrorResponseDataKey])
+                            {
+                                JSONResponse = error.userInfo[MXHTTPClientErrorResponseDataKey];
+                            }
+                            
+                            if (JSONResponse)
+                            {
+                                MXAuthenticationSession *authSession = [MXAuthenticationSession modelFromJSON:JSONResponse];
+                                
+                                [self->_authenticationActivityIndicator stopAnimating];
+                                
+                                // Update session identifier
+                                self.authInputsView.authSession.session = authSession.session;
+                                
+                                // Launch registration by preparing parameters dict
+                                [self.authInputsView prepareParameters:^(NSDictionary *parameters, NSError *error) {
+                                    
+                                    if (parameters && self->mxRestClient)
+                                    {
+                                        [self->_authenticationActivityIndicator startAnimating];
+                                        [self registerWithParameters:parameters];
+                                    }
+                                    else
+                                    {
+                                        MXLogDebug(@"[MXKAuthenticationVC] Failed to prepare parameters");
+                                        [self onFailureDuringAuthRequest:error];
+                                    }
+                                    
+                                }];
+                            }
+                            else
+                            {
+                                [self onFailureDuringAuthRequest:error];
+                            }
+                        }];
+                    }
+                    else
+                    {
+                        [self isUserNameInUse:^(BOOL isUserNameInUse) {
+                            
+                            if (isUserNameInUse)
+                            {
+                                MXLogDebug(@"[MXKAuthenticationVC] User name is already use");
+                                [self onFailureDuringAuthRequest:[NSError errorWithDomain:MXKAuthErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey:[MatrixKitL10n authUsernameInUse]}]];
+                            }
+                            else
+                            {
+                                [self->_authenticationActivityIndicator stopAnimating];
+                               
+                                // Launch registration by preparing parameters dict
+                                [self.authInputsView prepareParameters:^(NSDictionary *parameters, NSError *error) {
+                                    
+                                    if (parameters && self->mxRestClient)
+                                    {
+                                        [self->_authenticationActivityIndicator startAnimating];
+                                        [self registerWithParameters:parameters];
+                                    }
+                                    else
+                                    {
+                                        MXLogDebug(@"[MXKAuthenticationVC] Failed to prepare parameters");
+                                        [self onFailureDuringAuthRequest:error];
+                                    }
+                                    
+                                }];
+                            }
+                            
+                        }];
+                    }
+                }
+                else if (self.externalRegistrationParameters)
+                {
+                    // Launch registration by preparing parameters dict
+                    [self.authInputsView prepareParameters:^(NSDictionary *parameters, NSError *error) {
+                        
+                        if (parameters && self->mxRestClient)
+                        {
+                            [self->_authenticationActivityIndicator startAnimating];
+                            [self registerWithParameters:parameters];
+                        }
+                        else
+                        {
+                            MXLogDebug(@"[MXKAuthenticationVC] Failed to prepare parameters");
+                            [self onFailureDuringAuthRequest:error];
+                        }
+                        
+                    }];
+                }
+                else
+                {
+                    MXLogDebug(@"[MXKAuthenticationVC] User name is missing");
+                    [self onFailureDuringAuthRequest:[NSError errorWithDomain:MXKAuthErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey:[MatrixKitL10n authInvalidUserName]}]];
+                }
+            }
+            else if (_authType == MXKAuthenticationTypeForgotPassword)
+            {
+                // Check whether the password has been reseted
+                if (isPasswordReseted)
+                {
+                    // Return to login screen
+                    self.authType = MXKAuthenticationTypeLogin;
+                }
+                else
+                {
+                    // Prepare the parameters dict
+                    [self.authInputsView prepareParameters:^(NSDictionary *parameters, NSError *error) {
+                        
+                        if (parameters && self->mxRestClient)
+                        {
+                            [self->_authenticationActivityIndicator startAnimating];
+                            [self resetPasswordWithParameters:parameters];
+                        }
+                        else
+                        {
+                            MXLogDebug(@"[MXKAuthenticationVC] Failed to prepare parameters");
+                            [self onFailureDuringAuthRequest:error];
+                        }
+                        
+                    }];
+                }
+            }
+        }
+    }
+    else if (sender == _authSwitchButton)
+    {
+        if (_authType == MXKAuthenticationTypeLogin)
+        {
+            self.authType = MXKAuthenticationTypeRegister;
+        }
+        else
+        {
+            self.authType = MXKAuthenticationTypeLogin;
+        }
+    }
+    else if (sender == _retryButton)
+    {
+        if (authenticationFallback)
+        {
+            [self showAuthenticationFallBackView:authenticationFallback];
+        }
+        else
+        {
+            [self refreshAuthenticationSession];
+        }
+    }
+    else if (sender == _cancelAuthFallbackButton)
+    {
+        // Hide fallback webview
+        [self hideRegistrationFallbackView];
+    }
+}
+
+- (void)cancel
+{
+    MXLogDebug(@"[MXKAuthenticationVC] cancel");
+    
+    // Cancel external registration parameters if any
+    _externalRegistrationParameters = nil;
+    
+    if (registrationTimer)
+    {
+        [registrationTimer invalidate];
+        registrationTimer = nil;
+    }
+    
+    // Cancel request in progress
+    if (mxCurrentOperation)
+    {
+        [mxCurrentOperation cancel];
+        mxCurrentOperation = nil;
+    }
+    
+    [_authenticationActivityIndicator stopAnimating];
+    self.userInteractionEnabled = YES;
+    
+    // Reset potential completed stages
+    self.authInputsView.authSession.completed = nil;
+    
+    // Update authentication inputs view to return in initial step
+    [self.authInputsView setAuthSession:self.authInputsView.authSession withAuthType:_authType];
+}
+
+- (void)onFailureDuringAuthRequest:(NSError *)error
+{
+    mxCurrentOperation = nil;
+    [_authenticationActivityIndicator stopAnimating];
+    self.userInteractionEnabled = YES;
+    
+    // Ignore connection cancellation error
+    if (([error.domain isEqualToString:NSURLErrorDomain] && error.code == NSURLErrorCancelled))
+    {
+        MXLogDebug(@"[MXKAuthenticationVC] Auth request cancelled");
+        return;
+    }
+    
+    MXLogDebug(@"[MXKAuthenticationVC] Auth request failed: %@", error);
+    
+    // Cancel external registration parameters if any
+    _externalRegistrationParameters = nil;
+    
+    // Translate the error code to a human message
+    NSString *title = error.localizedFailureReason;
+    if (!title)
+    {
+        if (self.authType == MXKAuthenticationTypeLogin)
+        {
+            title = [MatrixKitL10n loginErrorTitle];
+        }
+        else if (self.authType == MXKAuthenticationTypeRegister)
+        {
+            title = [MatrixKitL10n registerErrorTitle];
+        }
+        else
+        {
+            title = [MatrixKitL10n error];
+        }
+    }
+    NSString* message = error.localizedDescription;
+    NSDictionary* dict = error.userInfo;
+    
+    // detect if it is a Matrix SDK issue
+    if (dict)
+    {
+        NSString* localizedError = [dict valueForKey:@"error"];
+        NSString* errCode = [dict valueForKey:@"errcode"];
+        
+        if (localizedError.length > 0)
+        {
+            message = localizedError;
+        }
+        
+        if (errCode)
+        {
+            if ([errCode isEqualToString:kMXErrCodeStringForbidden])
+            {
+                message = [MatrixKitL10n loginErrorForbidden];
+            }
+            else if ([errCode isEqualToString:kMXErrCodeStringUnknownToken])
+            {
+                message = [MatrixKitL10n loginErrorUnknownToken];
+            }
+            else if ([errCode isEqualToString:kMXErrCodeStringBadJSON])
+            {
+                message = [MatrixKitL10n loginErrorBadJson];
+            }
+            else if ([errCode isEqualToString:kMXErrCodeStringNotJSON])
+            {
+                message = [MatrixKitL10n loginErrorNotJson];
+            }
+            else if ([errCode isEqualToString:kMXErrCodeStringLimitExceeded])
+            {
+                message = [MatrixKitL10n loginErrorLimitExceeded];
+            }
+            else if ([errCode isEqualToString:kMXErrCodeStringUserInUse])
+            {
+                message = [MatrixKitL10n loginErrorUserInUse];
+            }
+            else if ([errCode isEqualToString:kMXErrCodeStringLoginEmailURLNotYet])
+            {
+                message = [MatrixKitL10n loginErrorLoginEmailNotYet];
+            }
+            else if ([errCode isEqualToString:kMXErrCodeStringResourceLimitExceeded])
+            {
+                [self showResourceLimitExceededError:dict onAdminContactTapped:nil];
+                return;
+            }
+            else if (!message.length)
+            {
+                message = errCode;
+            }
+        }
+    }
+    
+    // Alert user
+    if (alert)
+    {
+        [alert dismissViewControllerAnimated:NO completion:nil];
+    }
+    
+    alert = [UIAlertController alertControllerWithTitle:title message:message preferredStyle:UIAlertControllerStyleAlert];
+    
+    [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
+                                              style:UIAlertActionStyleDefault
+                                            handler:^(UIAlertAction * action) {
+                                                
+                                                self->alert = nil;
+                                                
+                                            }]];
+    
+    
+    [self presentViewController:alert animated:YES completion:nil];
+    
+    // Update authentication inputs view to return in initial step
+    [self.authInputsView setAuthSession:self.authInputsView.authSession withAuthType:_authType];
+    if (self.softLogoutCredentials)
+    {
+        self.authInputsView.softLogoutCredentials = self.softLogoutCredentials;
+    }
+}
+
+- (void)showResourceLimitExceededError:(NSDictionary *)errorDict onAdminContactTapped:(void (^)(NSURL *adminContact))onAdminContactTapped
+{
+    mxCurrentOperation = nil;
+    [_authenticationActivityIndicator stopAnimating];
+    self.userInteractionEnabled = YES;
+
+    // Alert user
+    if (alert)
+    {
+        [alert dismissViewControllerAnimated:NO completion:nil];
+    }
+
+    // Parse error data
+    NSString *limitType, *adminContactString;
+    NSURL *adminContact;
+
+    MXJSONModelSetString(limitType, errorDict[kMXErrorResourceLimitExceededLimitTypeKey]);
+    MXJSONModelSetString(adminContactString, errorDict[kMXErrorResourceLimitExceededAdminContactKey]);
+
+    if (adminContactString)
+    {
+        adminContact = [NSURL URLWithString:adminContactString];
+    }
+
+    NSString *title = [MatrixKitL10n loginErrorResourceLimitExceededTitle];
+
+    // Build the message content
+    NSMutableString *message = [NSMutableString new];
+    if ([limitType isEqualToString:kMXErrorResourceLimitExceededLimitTypeMonthlyActiveUserValue])
+    {
+        [message appendString:[MatrixKitL10n loginErrorResourceLimitExceededMessageMonthlyActiveUser]];
+    }
+    else
+    {
+        [message appendString:[MatrixKitL10n loginErrorResourceLimitExceededMessageDefault]];
+    }
+
+    [message appendString:[MatrixKitL10n loginErrorResourceLimitExceededMessageContact]];
+
+    // Build the alert
+    alert = [UIAlertController alertControllerWithTitle:title message:message preferredStyle:UIAlertControllerStyleAlert];
+
+    MXWeakify(self);
+    if (adminContact && onAdminContactTapped)
+    {
+        [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n loginErrorResourceLimitExceededContactButton]
+                                                  style:UIAlertActionStyleDefault
+                                                handler:^(UIAlertAction * action)
+                          {
+                              MXStrongifyAndReturnIfNil(self);
+                              self->alert = nil;
+
+                              // Let the system handle the URI
+                              // It could be something like "mailto: server.admin@example.com"
+                              onAdminContactTapped(adminContact);
+                          }]];
+    }
+
+    [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+                                              style:UIAlertActionStyleDefault
+                                            handler:^(UIAlertAction * action)
+                      {
+                          MXStrongifyAndReturnIfNil(self);
+                          self->alert = nil;
+                      }]];
+
+    [self presentViewController:alert animated:YES completion:nil];
+
+    // Update authentication inputs view to return in initial step
+    [self.authInputsView setAuthSession:self.authInputsView.authSession withAuthType:_authType];
+}
+
+- (void)onSuccessfulLogin:(MXCredentials*)credentials
+{
+    mxCurrentOperation = nil;
+    [_authenticationActivityIndicator stopAnimating];
+    self.userInteractionEnabled = YES;
+
+    if (self.softLogoutCredentials)
+    {
+        // Hydrate the account with the new access token
+        MXKAccount *account = [[MXKAccountManager sharedManager] accountForUserId:self.softLogoutCredentials.userId];
+        [[MXKAccountManager sharedManager] hydrateAccount:account withCredentials:credentials];
+
+        if (_delegate)
+        {
+            [_delegate authenticationViewController:self didLogWithUserId:credentials.userId];
+        }
+    }
+    // Sanity check: check whether the user is not already logged in with this id
+    else if ([[MXKAccountManager sharedManager] accountForUserId:credentials.userId])
+    {
+        //Alert user
+        __weak typeof(self) weakSelf = self;
+        
+        if (alert)
+        {
+            [alert dismissViewControllerAnimated:NO completion:nil];
+        }
+        
+        alert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n loginErrorAlreadyLoggedIn] message:nil preferredStyle:UIAlertControllerStyleAlert];
+        
+        [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
+                                                  style:UIAlertActionStyleDefault
+                                                handler:^(UIAlertAction * action) {
+                                                    
+                                                    // We remove the authentication view controller.
+                                                    typeof(self) self = weakSelf;
+                                                    self->alert = nil;
+                                                    [self withdrawViewControllerAnimated:YES completion:nil];
+                                                    
+                                                }]];
+        
+        
+        [self presentViewController:alert animated:YES completion:nil];
+    }
+    else
+    {
+        // Report the new account in account manager
+        if (!credentials.identityServer)
+        {
+            credentials.identityServer = _identityServerTextField.text;
+        }
+        
+        [self createAccountWithCredentials:credentials];
+    }
+}
+
+- (MXHTTPOperation *)currentHttpOperation
+{
+    return mxCurrentOperation;
+}
+
+#pragma mark - Privates
+
+// Hook point for triggering device rehydration in subclasses
+// Avoid cycles by using a separate private method do to the actual work
+- (void)createAccountWithCredentials:(MXCredentials *)credentials
+{
+    [self _createAccountWithCredentials:credentials];
+}
+
+- (void)attemptDeviceRehydrationWithKeyData:(NSData *)keyData
+                                credentials:(MXCredentials *)credentials
+{
+    [self attemptDeviceRehydrationWithKeyData:keyData
+                                  credentials:credentials
+                                        retry:YES];
+}
+
+- (void)attemptDeviceRehydrationWithKeyData:(NSData *)keyData
+                                credentials:(MXCredentials *)credentials
+                                      retry:(BOOL)retry
+{
+    MXLogDebug(@"[MXKAuthenticationViewController] attemptDeviceRehydration: starting device rehydration");
+    
+    if (keyData == nil)
+    {
+        MXLogError(@"[MXKAuthenticationViewController] attemptDeviceRehydration: no key provided for device rehydration");
+        [self _createAccountWithCredentials:credentials];
+        return;
+    }
+    
+    MXRestClient *mxRestClient = [[MXRestClient alloc] initWithCredentials:credentials andOnUnrecognizedCertificateBlock:^BOOL(NSData *certificate) {
+        return NO;
+    }];
+    
+    MXWeakify(self);
+    [[MXKAccountManager sharedManager].dehydrationService rehydrateDeviceWithMatrixRestClient:mxRestClient dehydrationKey:keyData success:^(NSString * deviceId) {
+        MXStrongifyAndReturnIfNil(self);
+        
+        if (deviceId)
+        {
+            MXLogDebug(@"[MXKAuthenticationViewController] attemptDeviceRehydration: device %@ rehydrated successfully.", deviceId);
+            credentials.deviceId = deviceId;
+        }
+        else
+        {
+            MXLogDebug(@"[MXKAuthenticationViewController] attemptDeviceRehydration: device rehydration has been canceled.");
+        }
+        
+        [self _createAccountWithCredentials:credentials];
+    } failure:^(NSError *error) {
+        MXStrongifyAndReturnIfNil(self);
+        
+        if (retry)
+        {
+            MXLogError(@"[MXKAuthenticationViewController] attemptDeviceRehydration: device rehydration failed due to error: %@. Retrying", error);
+            [self attemptDeviceRehydrationWithKeyData:keyData credentials:credentials retry:NO];
+            return;
+        }
+        
+        MXLogError(@"[MXKAuthenticationViewController] attemptDeviceRehydration: device rehydration failed due to error: %@", error);
+        
+        [self _createAccountWithCredentials:credentials];
+    }];
+}
+
+- (void)_createAccountWithCredentials:(MXCredentials *)credentials
+{
+    MXKAccount *account = [[MXKAccount alloc] initWithCredentials:credentials];
+    account.identityServerURL = credentials.identityServer;
+    
+    [[MXKAccountManager sharedManager] addAccount:account andOpenSession:YES];
+    
+    if (_delegate)
+    {
+        [_delegate authenticationViewController:self didLogWithUserId:credentials.userId];
+    }
+}
+
+- (NSString *)deviceDisplayName
+{
+    if (_deviceDisplayName)
+    {
+        return _deviceDisplayName;
+    }
+    
+#if TARGET_OS_IPHONE
+    NSString *deviceName = [[UIDevice currentDevice].model isEqualToString:@"iPad"] ? [MatrixKitL10n loginTabletDevice] : [MatrixKitL10n loginMobileDevice];
+#elif TARGET_OS_OSX
+    NSString *deviceName = [MatrixKitL10n loginDesktopDevice];
+#endif
+    
+    return deviceName;
+}
+
+- (void)refreshForgotPasswordSession
+{
+    [_authenticationActivityIndicator stopAnimating];
+    
+    MXKAuthInputsView *authInputsView = nil;
+    if (forgotPasswordAuthInputsViewClass)
+    {
+        // Instantiate a new auth inputs view, except if the current one is already an instance of this class.
+        if (self.authInputsView && self.authInputsView.class == forgotPasswordAuthInputsViewClass)
+        {
+            // Use the current view
+            authInputsView = self.authInputsView;
+        }
+        else
+        {
+            authInputsView = [forgotPasswordAuthInputsViewClass authInputsView];
+        }
+    }
+    
+    if (authInputsView)
+    {
+        // Update authentication inputs view to return in initial step
+        [authInputsView setAuthSession:nil withAuthType:MXKAuthenticationTypeForgotPassword];
+        
+        // Check whether the current view must be replaced
+        if (self.authInputsView != authInputsView)
+        {
+            // Refresh layout
+            self.authInputsView = authInputsView;
+        }
+        
+        // Refresh user interaction
+        self.userInteractionEnabled = _userInteractionEnabled;
+    }
+    else
+    {
+        // Remove the potential auth inputs view
+        self.authInputsView = nil;
+        
+        _noFlowLabel.text = [MatrixKitL10n loginErrorForgotPasswordIsNotSupported];
+        
+        MXLogDebug(@"[MXKAuthenticationVC] Warning: %@", _noFlowLabel.text);
+        
+        _noFlowLabel.hidden = NO;
+    }
+}
+
+- (void)updateRESTClient
+{
+    NSString *homeserverURL = _homeServerTextField.text;
+    
+    if (homeserverURL.length)
+    {
+        // Check change
+        if ([homeserverURL isEqualToString:mxRestClient.homeserver] == NO)
+        {
+            mxRestClient = [[MXRestClient alloc] initWithHomeServer:homeserverURL andOnUnrecognizedCertificateBlock:^BOOL(NSData *certificate) {
+                
+                // Check first if the app developer provided its own certificate handler.
+                if (self->onUnrecognizedCertificateCustomBlock)
+                {
+                    return self->onUnrecognizedCertificateCustomBlock (certificate);
+                }
+                
+                // Else prompt the user by displaying a fingerprint (SHA256) of the certificate.
+                __block BOOL isTrusted;
+                dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+                
+                NSString *title = [MatrixKitL10n sslCouldNotVerify];
+                NSString *homeserverURLStr = [MatrixKitL10n sslHomeserverUrl:homeserverURL];
+                NSString *fingerprint = [MatrixKitL10n sslFingerprintHash:@"SHA256"];
+                NSString *certFingerprint = [certificate mx_SHA256AsHexString];
+                
+                NSString *msg = [NSString stringWithFormat:@"%@\n\n%@\n\n%@\n\n%@\n\n%@\n\n%@", [MatrixKitL10n sslCertNotTrust], [MatrixKitL10n sslCertNewAccountExpl], homeserverURLStr, fingerprint, certFingerprint, [MatrixKitL10n sslOnlyAccept]];
+                
+                if (self->alert)
+                {
+                    [self->alert dismissViewControllerAnimated:NO completion:nil];
+                }
+                
+                self->alert = [UIAlertController alertControllerWithTitle:title message:msg preferredStyle:UIAlertControllerStyleAlert];
+                
+                [self->alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+                                                          style:UIAlertActionStyleDefault
+                                                        handler:^(UIAlertAction * action) {
+                                                            
+                                                            self->alert = nil;
+                                                            isTrusted = NO;
+                                                            dispatch_semaphore_signal(semaphore);
+                                                            
+                                                        }]];
+                
+                [self->alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n sslTrust]
+                                                          style:UIAlertActionStyleDefault
+                                                        handler:^(UIAlertAction * action) {
+                                                            
+                                                            self->alert = nil;
+                                                            isTrusted = YES;
+                                                            dispatch_semaphore_signal(semaphore);
+                                                            
+                                                        }]];
+                
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    [self presentViewController:self->alert animated:YES completion:nil];
+                });
+                
+                dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+                
+                if (!isTrusted)
+                {
+                    // Cancel request in progress
+                    [self->mxCurrentOperation cancel];
+                    self->mxCurrentOperation = nil;
+                    [[NSNotificationCenter defaultCenter] removeObserver:self name:AFNetworkingReachabilityDidChangeNotification object:nil];
+
+                    [self->_authenticationActivityIndicator stopAnimating];
+                }
+                
+                return isTrusted;
+            }];
+            
+            if (_identityServerTextField.text.length)
+            {
+                [self updateIdentityServerURL:self.identityServerTextField.text];
+            }
+        }
+    }
+    else
+    {
+        [mxRestClient close];
+        mxRestClient = nil;
+    }
+}
+
+- (void)loginWithParameters:(NSDictionary*)parameters
+{
+    // Add the device name
+    NSMutableDictionary *theParameters = [NSMutableDictionary dictionaryWithDictionary:parameters];
+    theParameters[@"initial_device_display_name"] = self.deviceDisplayName;
+    
+    mxCurrentOperation = [mxRestClient login:theParameters success:^(NSDictionary *JSONResponse) {
+
+        MXLoginResponse *loginResponse;
+        MXJSONModelSetMXJSONModel(loginResponse, MXLoginResponse, JSONResponse);
+
+        MXCredentials *credentials = [[MXCredentials alloc] initWithLoginResponse:loginResponse
+                                                            andDefaultCredentials:self->mxRestClient.credentials];
+        
+        // Sanity check
+        if (!credentials.userId || !credentials.accessToken)
+        {
+            [self onFailureDuringAuthRequest:[NSError errorWithDomain:MXKAuthErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey:[MatrixKitL10n notSupportedYet]}]];
+        }
+        else
+        {
+            MXLogDebug(@"[MXKAuthenticationVC] Login process succeeded");
+
+            // Report the certificate trusted by user (if any)
+            credentials.allowedCertificate = self->mxRestClient.allowedCertificate;
+            
+            [self onSuccessfulLogin:credentials];
+        }
+        
+    } failure:^(NSError *error) {
+        
+        [self onFailureDuringAuthRequest:error];
+        
+    }];
+}
+
+- (void)registerWithParameters:(NSDictionary*)parameters
+{
+    if (registrationTimer)
+    {
+        [registrationTimer invalidate];
+        registrationTimer = nil;
+    }
+    
+    // Add the device name
+    NSMutableDictionary *theParameters = [NSMutableDictionary dictionaryWithDictionary:parameters];
+    theParameters[@"initial_device_display_name"] = self.deviceDisplayName;
+    
+    mxCurrentOperation = [mxRestClient registerWithParameters:theParameters success:^(NSDictionary *JSONResponse) {
+        
+        MXLoginResponse *loginResponse;
+        MXJSONModelSetMXJSONModel(loginResponse, MXLoginResponse, JSONResponse);
+
+        MXCredentials *credentials = [[MXCredentials alloc] initWithLoginResponse:loginResponse
+                                                            andDefaultCredentials:self->mxRestClient.credentials];
+        
+        // Sanity check
+        if (!credentials.userId || !credentials.accessToken)
+        {
+            [self onFailureDuringAuthRequest:[NSError errorWithDomain:MXKAuthErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey:[MatrixKitL10n notSupportedYet]}]];
+        }
+        else
+        {
+            MXLogDebug(@"[MXKAuthenticationVC] Registration succeeded");
+
+            // Report the certificate trusted by user (if any)
+            credentials.allowedCertificate = self->mxRestClient.allowedCertificate;
+            
+            [self onSuccessfulLogin:credentials];
+        }
+        
+    } failure:^(NSError *error) {
+        
+        self->mxCurrentOperation = nil;
+        
+        // Check whether the authentication is pending (for example waiting for email validation)
+        MXError *mxError = [[MXError alloc] initWithNSError:error];
+        if (mxError && [mxError.errcode isEqualToString:kMXErrCodeStringUnauthorized])
+        {
+            MXLogDebug(@"[MXKAuthenticationVC] Wait for email validation");
+            
+            // Postpone a new attempt in 10 sec
+            self->registrationTimer = [NSTimer scheduledTimerWithTimeInterval:10 target:self selector:@selector(registrationTimerFireMethod:) userInfo:parameters repeats:NO];
+        }
+        else
+        {
+            // The completed stages should be available in response data in case of unauthorized request.
+            NSDictionary *JSONResponse = nil;
+            if (error.userInfo[MXHTTPClientErrorResponseDataKey])
+            {
+                JSONResponse = error.userInfo[MXHTTPClientErrorResponseDataKey];
+            }
+            
+            if (JSONResponse)
+            {
+                MXAuthenticationSession *authSession = [MXAuthenticationSession modelFromJSON:JSONResponse];
+                
+                if (authSession.completed)
+                {
+                    [self->_authenticationActivityIndicator stopAnimating];
+                    
+                    // Update session identifier in case of change
+                    self.authInputsView.authSession.session = authSession.session;
+                    
+                    [self.authInputsView updateAuthSessionWithCompletedStages:authSession.completed didUpdateParameters:^(NSDictionary *parameters, NSError *error) {
+                        
+                        if (parameters)
+                        {
+                            MXLogDebug(@"[MXKAuthenticationVC] Pursue registration");
+                            
+                            [self->_authenticationActivityIndicator startAnimating];
+                            [self registerWithParameters:parameters];
+                        }
+                        else
+                        {
+                            MXLogDebug(@"[MXKAuthenticationVC] Failed to update parameters");
+                            
+                            [self onFailureDuringAuthRequest:error];
+                        }
+                        
+                    }];
+                    
+                    return;
+                }
+                
+                [self onFailureDuringAuthRequest:[NSError errorWithDomain:MXKAuthErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey:[MatrixKitL10n notSupportedYet]}]];
+            }
+            else
+            {
+                [self onFailureDuringAuthRequest:error];
+            }
+        }
+    }];
+}
+
+- (void)registrationTimerFireMethod:(NSTimer *)timer
+{
+    if (timer == registrationTimer && timer.isValid)
+    {
+        MXLogDebug(@"[MXKAuthenticationVC] Retry registration");
+        [self registerWithParameters:registrationTimer.userInfo];
+    }
+}
+
+- (void)resetPasswordWithParameters:(NSDictionary*)parameters
+{
+    mxCurrentOperation = [mxRestClient resetPasswordWithParameters:parameters success:^() {
+        
+        MXLogDebug(@"[MXKAuthenticationVC] Reset password succeeded");
+        
+        self->mxCurrentOperation = nil;
+        [self->_authenticationActivityIndicator stopAnimating];
+        
+        self->isPasswordReseted = YES;
+        
+        // Force UI update to refresh submit button title.
+        self.authType = self->_authType;
+        
+        // Refresh the authentication inputs view on success.
+        [self.authInputsView nextStep];
+        
+    } failure:^(NSError *error) {
+        
+        MXError *mxError = [[MXError alloc] initWithNSError:error];
+        if (mxError && [mxError.errcode isEqualToString:kMXErrCodeStringUnauthorized])
+        {
+            MXLogDebug(@"[MXKAuthenticationVC] Forgot Password: wait for email validation");
+            
+            self->mxCurrentOperation = nil;
+            [self->_authenticationActivityIndicator stopAnimating];
+            
+            if (self->alert)
+            {
+                [self->alert dismissViewControllerAnimated:NO completion:nil];
+            }
+            
+            self->alert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n error] message:[MatrixKitL10n authResetPasswordErrorUnauthorized] preferredStyle:UIAlertControllerStyleAlert];
+            
+            [self->alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
+                                                      style:UIAlertActionStyleDefault
+                                                    handler:^(UIAlertAction * action) {
+                                                        
+                                                        self->alert = nil;
+                                                        
+                                                    }]];
+            
+            
+            [self presentViewController:self->alert animated:YES completion:nil];
+        }
+        else if (mxError && [mxError.errcode isEqualToString:kMXErrCodeStringNotFound])
+        {
+            MXLogDebug(@"[MXKAuthenticationVC] Forgot Password: not found");
+            
+            NSMutableDictionary *userInfo;
+            if (error.userInfo)
+            {
+                userInfo = [NSMutableDictionary dictionaryWithDictionary:error.userInfo];
+            }
+            else
+            {
+                userInfo = [NSMutableDictionary dictionary];
+            }
+            userInfo[NSLocalizedDescriptionKey] = [MatrixKitL10n authResetPasswordErrorNotFound];
+            
+            [self onFailureDuringAuthRequest:[NSError errorWithDomain:kMXNSErrorDomain code:0 userInfo:userInfo]];
+        }
+        else
+        {
+            [self onFailureDuringAuthRequest:error];
+        }
+        
+    }];
+}
+
+- (void)onFailureDuringMXOperation:(NSError*)error
+{
+    mxCurrentOperation = nil;
+    
+    [_authenticationActivityIndicator stopAnimating];
+    
+    if ([error.domain isEqualToString:NSURLErrorDomain] && error.code == NSURLErrorCancelled)
+    {
+        // Ignore this error
+        MXLogDebug(@"[MXKAuthenticationVC] flows request cancelled");
+        return;
+    }
+    
+    MXLogDebug(@"[MXKAuthenticationVC] Failed to get %@ flows: %@", (_authType == MXKAuthenticationTypeLogin ? @"Login" : @"Register"), error);
+    
+    // Cancel external registration parameters if any
+    _externalRegistrationParameters = nil;
+    
+    // Alert user
+    NSString *title = [error.userInfo valueForKey:NSLocalizedFailureReasonErrorKey];
+    if (!title)
+    {
+        title = [MatrixKitL10n error];
+    }
+    NSString *msg = [error.userInfo valueForKey:NSLocalizedDescriptionKey];
+    
+    if (alert)
+    {
+        [alert dismissViewControllerAnimated:NO completion:nil];
+    }
+    
+    alert = [UIAlertController alertControllerWithTitle:title message:msg preferredStyle:UIAlertControllerStyleAlert];
+    
+    [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n dismiss]
+                                              style:UIAlertActionStyleDefault
+                                            handler:^(UIAlertAction * action) {
+                                                
+                                                self->alert = nil;
+                                                
+                                            }]];
+    
+    
+    [self presentViewController:alert animated:YES completion:nil];
+    
+    // Handle specific error code here
+    if ([error.domain isEqualToString:NSURLErrorDomain])
+    {
+        // Check network reachability
+        if (error.code == NSURLErrorNotConnectedToInternet)
+        {
+            // Add reachability observer in order to launch a new request when network will be available
+            [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onReachabilityStatusChange:) name:AFNetworkingReachabilityDidChangeNotification object:nil];
+        }
+        else if (error.code == kCFURLErrorTimedOut)
+        {
+            // Send a new request in 2 sec
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                [self refreshAuthenticationSession];
+            });
+        }
+        else
+        {
+            // Remove the potential auth inputs view
+            self.authInputsView = nil;
+        }
+    }
+    else
+    {
+        // Remove the potential auth inputs view
+        self.authInputsView = nil;
+    }
+    
+    if (!_authInputsView)
+    {
+        // Display failure reason
+        _noFlowLabel.hidden = NO;
+        _noFlowLabel.text = [error.userInfo valueForKey:NSLocalizedDescriptionKey];
+        if (!_noFlowLabel.text.length)
+        {
+            _noFlowLabel.text = [MatrixKitL10n loginErrorNoLoginFlow];
+        }
+        [_retryButton setTitle:[MatrixKitL10n retry] forState:UIControlStateNormal];
+        [_retryButton setTitle:[MatrixKitL10n retry] forState:UIControlStateNormal];
+        _retryButton.hidden = NO;
+    }
+}
+
+- (void)onReachabilityStatusChange:(NSNotification *)notif
+{
+    AFNetworkReachabilityManager *reachabilityManager = [AFNetworkReachabilityManager sharedManager];
+    AFNetworkReachabilityStatus status = reachabilityManager.networkReachabilityStatus;
+    
+    if (status == AFNetworkReachabilityStatusReachableViaWiFi || status == AFNetworkReachabilityStatusReachableViaWWAN)
+    {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self refreshAuthenticationSession];
+        });
+    }
+    else if (status == AFNetworkReachabilityStatusNotReachable)
+    {
+        _noFlowLabel.text = [MatrixKitL10n networkErrorNotReachable];
+    }
+}
+
+#pragma mark - Keyboard handling
+
+- (void)dismissKeyboard
+{
+    // Hide the keyboard
+    [_authInputsView dismissKeyboard];
+    [_homeServerTextField resignFirstResponder];
+    [_identityServerTextField resignFirstResponder];
+}
+
+#pragma mark - UITextField delegate
+
+- (void)onTextFieldChange:(NSNotification *)notif
+{
+    _submitButton.enabled = _authInputsView.areAllRequiredFieldsSet;
+
+    if (notif.object == _homeServerTextField)
+    {
+        // If any, the current request is obsolete
+        [self cancelIdentityServerCheck];
+
+        [self setIdentityServerHidden:YES];
+    }
+}
+
+- (BOOL)textFieldShouldBeginEditing:(UITextField *)textField
+{
+    if (textField == _homeServerTextField)
+    {
+        // Cancel supported AuthFlow refresh if a request is in progress
+        [[NSNotificationCenter defaultCenter] removeObserver:self name:AFNetworkingReachabilityDidChangeNotification object:nil];
+        
+        if (mxCurrentOperation)
+        {
+            // Cancel potential request in progress
+            [mxCurrentOperation cancel];
+            mxCurrentOperation = nil;
+        }
+    }
+
+    return YES;
+}
+
+- (void)textFieldDidEndEditing:(UITextField *)textField
+{
+    if (textField == _homeServerTextField)
+    {
+        [self setHomeServerTextFieldText:textField.text];
+    }
+    else if (textField == _identityServerTextField)
+    {
+        [self setIdentityServerTextFieldText:textField.text];
+    }
+}
+
+- (BOOL)textFieldShouldReturn:(UITextField*)textField
+{
+    if (textField.returnKeyType == UIReturnKeyDone)
+    {
+        // "Done" key has been pressed
+        [textField resignFirstResponder];
+    }
+    return YES;
+}
+
+#pragma mark - AuthInputsViewDelegate delegate
+
+- (void)authInputsView:(MXKAuthInputsView*)authInputsView presentAlertController:(UIAlertController*)inputsAlert
+{
+    [self dismissKeyboard];
+    [self presentViewController:inputsAlert animated:YES completion:nil];
+}
+
+- (void)authInputsViewDidPressDoneKey:(MXKAuthInputsView *)authInputsView
+{
+    if (_submitButton.isEnabled)
+    {
+        // Launch authentication now
+        [self onButtonPressed:_submitButton];
+    }
+}
+
+- (MXRestClient *)authInputsViewThirdPartyIdValidationRestClient:(MXKAuthInputsView *)authInputsView
+{
+    return mxRestClient;
+}
+
+- (MXIdentityService *)authInputsViewThirdPartyIdValidationIdentityService:(MXIdentityService *)authInputsView
+{
+    return self.identityService;
+}
+
+#pragma mark - Authentication Fallback
+
+- (void)showAuthenticationFallBackView
+{
+    [self showAuthenticationFallBackView:authenticationFallback];
+}
+
+- (void)showAuthenticationFallBackView:(NSString*)fallbackPage
+{
+    _authenticationScrollView.hidden = YES;
+    _authFallbackContentView.hidden = NO;
+    
+    // Add a cancel button in case of navigation controller use.
+    if (self.navigationController)
+    {
+        if (!cancelFallbackBarButton)
+        {
+            cancelFallbackBarButton = [[UIBarButtonItem alloc] initWithTitle:[MatrixKitL10n loginLeaveFallback] style:UIBarButtonItemStylePlain target:self action:@selector(hideRegistrationFallbackView)];
+        }
+        
+        // Add cancel button in right bar items
+        NSArray *rightBarButtonItems = self.navigationItem.rightBarButtonItems;
+        self.navigationItem.rightBarButtonItems = rightBarButtonItems ? [rightBarButtonItems arrayByAddingObject:cancelFallbackBarButton] : @[cancelFallbackBarButton];
+    }
+
+    if (self.softLogoutCredentials)
+    {
+        // Add device_id as query param of the fallback
+        NSURLComponents *components = [[NSURLComponents alloc] initWithString:fallbackPage];
+
+        NSMutableArray<NSURLQueryItem*> *queryItems = [components.queryItems mutableCopy];
+        if (!queryItems)
+        {
+            queryItems = [NSMutableArray array];
+        }
+
+        [queryItems addObject:[NSURLQueryItem queryItemWithName:@"device_id"
+                                                          value:self.softLogoutCredentials.deviceId]];
+
+        components.queryItems = queryItems;
+
+        fallbackPage = components.URL.absoluteString;
+    }
+
+    [_authFallbackWebView openFallbackPage:fallbackPage success:^(MXLoginResponse *loginResponse) {
+        
+        MXCredentials *credentials = [[MXCredentials alloc] initWithLoginResponse:loginResponse andDefaultCredentials:self->mxRestClient.credentials];
+        
+        // TODO handle unrecognized certificate (if any) during registration through fallback webview.
+        
+        [self onSuccessfulLogin:credentials];
+    }];
+}
+
+- (void)hideRegistrationFallbackView
+{
+    if (cancelFallbackBarButton)
+    {
+        NSMutableArray *rightBarButtonItems = [NSMutableArray arrayWithArray: self.navigationItem.rightBarButtonItems];
+        [rightBarButtonItems removeObject:cancelFallbackBarButton];
+        self.navigationItem.rightBarButtonItems = rightBarButtonItems;
+    }
+    
+    [_authFallbackWebView stopLoading];
+    _authenticationScrollView.hidden = NO;
+    _authFallbackContentView.hidden = YES;
+}
+
+#pragma mark - KVO
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
+{
+    if ([@"viewHeightConstraint.constant" isEqualToString:keyPath])
+    {
+        // Refresh the height of the auth inputs view container.
+        CGFloat previousInputsContainerViewHeight = _authInputContainerViewHeightConstraint.constant;
+        _authInputContainerViewHeightConstraint.constant = _authInputsView.viewHeightConstraint.constant;
+        
+        // Force to render the view
+        [self.view layoutIfNeeded];
+        
+        // Refresh content view height by considering the updated height of inputs container
+        _contentViewHeightConstraint.constant += (_authInputContainerViewHeightConstraint.constant - previousInputsContainerViewHeight);
+    }
+    else
+    {
+        [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKAuthenticationViewController.xib b/Riot/Modules/MatrixKit/Controllers/MXKAuthenticationViewController.xib
new file mode 100644
index 000000000..807f6382d
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKAuthenticationViewController.xib
@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MXKAuthenticationViewController">
+            <connections>
+                <outlet property="authFallbackContentView" destination="q1e-Wg-6t7" id="mR6-hS-5YB"/>
+                <outlet property="authFallbackWebViewContainer" destination="6Em-Jj-UPO" id="F5d-zg-2ED"/>
+                <outlet property="authInputContainerViewHeightConstraint" destination="e04-1Y-4gZ" id="5qa-cu-M8v"/>
+                <outlet property="authInputContainerViewMinHeightConstraint" destination="2s6-K4-8Vv" id="x5P-zJ-hA6"/>
+                <outlet property="authInputsContainerView" destination="xWb-IJ-v7F" id="DEo-Ji-wPT"/>
+                <outlet property="authScrollViewBottomConstraint" destination="g7o-eO-7Yr" id="kVv-Xp-aTT"/>
+                <outlet property="authSwitchButton" destination="FNe-kn-VlD" id="EhA-sr-kiZ"/>
+                <outlet property="authenticationActivityIndicator" destination="30E-gm-z6O" id="DDw-QJ-ND8"/>
+                <outlet property="authenticationScrollView" destination="OHV-KQ-Ww0" id="gyc-zq-fA1"/>
+                <outlet property="cancelAuthFallbackButton" destination="9qj-5c-Sfb" id="IH4-cc-kKx"/>
+                <outlet property="contentView" destination="rhx-dD-4EJ" id="XXc-2j-Gi6"/>
+                <outlet property="contentViewHeightConstraint" destination="6v6-fz-e8o" id="wHX-YX-3gE"/>
+                <outlet property="homeServerInfoLabel" destination="aLk-0i-Z0d" id="RRa-xP-oDQ"/>
+                <outlet property="homeServerLabel" destination="kHf-s1-cZa" id="nSI-4K-aQq"/>
+                <outlet property="homeServerTextField" destination="G8l-AP-iRs" id="F4s-Sf-TTZ"/>
+                <outlet property="identityServerInfoLabel" destination="NDg-U7-lEi" id="pLr-t8-MyU"/>
+                <outlet property="identityServerLabel" destination="5CT-Ht-Z3v" id="9h4-6J-n3X"/>
+                <outlet property="identityServerTextField" destination="PZC-Hd-Q6a" id="vKg-sd-dzJ"/>
+                <outlet property="noFlowLabel" destination="54b-4O-ip9" id="f18-H1-cQm"/>
+                <outlet property="retryButton" destination="wIH-Kd-r7q" id="42j-Ad-zVS"/>
+                <outlet property="subTitleLabel" destination="Bcs-TE-KZc" id="Gk1-7I-jnR"/>
+                <outlet property="submitButton" destination="k3J-Eg-itz" id="fiZ-wK-6YM"/>
+                <outlet property="view" destination="5rn-KE-plm" id="bFJ-yJ-vc0"/>
+                <outlet property="welcomeImageView" destination="d8r-TX-pwX" id="vzD-zK-EeC"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="5rn-KE-plm">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" keyboardDismissMode="onDrag" translatesAutoresizingMaskIntoConstraints="NO" id="OHV-KQ-Ww0">
+                    <rect key="frame" x="0.0" y="20" width="375" height="647"/>
+                    <subviews>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rhx-dD-4EJ" userLabel="Content View">
+                            <rect key="frame" x="0.0" y="0.0" width="600" height="640"/>
+                            <subviews>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="d8r-TX-pwX" userLabel="Welcome Image View">
+                                    <rect key="frame" x="180" y="33" width="240" height="102"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="102" id="1dJ-8w-oNT"/>
+                                        <constraint firstAttribute="width" constant="240" id="gA2-2L-JHF"/>
+                                    </constraints>
+                                </imageView>
+                                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Create account:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bcs-TE-KZc">
+                                    <rect key="frame" x="88" y="147" width="110" height="18"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xWb-IJ-v7F" userLabel="AuthInputsContainerView">
+                                    <rect key="frame" x="150" y="170" width="300" height="180"/>
+                                    <subviews>
+                                        <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="30E-gm-z6O">
+                                            <rect key="frame" x="140" y="80" width="20" height="20"/>
+                                        </activityIndicatorView>
+                                        <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Currently we do not support authentication flows defined by this homeserver" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="54b-4O-ip9" userLabel="noFlowLabel">
+                                            <rect key="frame" x="9" y="8" width="282" height="33.5"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                            <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                        <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wIH-Kd-r7q" userLabel="retryButton">
+                                            <rect key="frame" x="127.5" y="46.5" width="45" height="30"/>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="30" id="WtO-NT-ei8"/>
+                                                <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="45" id="YYb-6s-rgd"/>
+                                            </constraints>
+                                            <state key="normal" title="Retry">
+                                                <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            </state>
+                                            <connections>
+                                                <action selector="onButtonPressed:" destination="-1" eventType="touchUpInside" id="ZW9-lZ-tLj"/>
+                                            </connections>
+                                        </button>
+                                    </subviews>
+                                    <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <constraints>
+                                        <constraint firstAttribute="centerX" secondItem="54b-4O-ip9" secondAttribute="centerX" id="0bV-x1-MhX"/>
+                                        <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="80" id="2s6-K4-8Vv"/>
+                                        <constraint firstItem="54b-4O-ip9" firstAttribute="top" secondItem="xWb-IJ-v7F" secondAttribute="top" constant="8" id="Ddp-gU-nLY"/>
+                                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="54b-4O-ip9" secondAttribute="trailing" constant="8" id="VEQ-w9-9Ln"/>
+                                        <constraint firstAttribute="centerY" secondItem="30E-gm-z6O" secondAttribute="centerY" id="ctL-D3-bgP"/>
+                                        <constraint firstAttribute="height" constant="180" id="e04-1Y-4gZ"/>
+                                        <constraint firstItem="wIH-Kd-r7q" firstAttribute="top" secondItem="54b-4O-ip9" secondAttribute="bottom" constant="5" id="grf-0I-rwT"/>
+                                        <constraint firstAttribute="width" constant="300" id="lLi-9b-XMC"/>
+                                        <constraint firstItem="54b-4O-ip9" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="xWb-IJ-v7F" secondAttribute="leading" constant="8" id="phW-Yy-zN7"/>
+                                        <constraint firstAttribute="centerX" secondItem="wIH-Kd-r7q" secondAttribute="centerX" id="rTd-Qc-xrD"/>
+                                        <constraint firstAttribute="centerX" secondItem="30E-gm-z6O" secondAttribute="centerX" id="sSN-PO-Q6t"/>
+                                    </constraints>
+                                </view>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="k3J-Eg-itz" userLabel="SubmitBtn">
+                                    <rect key="frame" x="272.5" y="360" width="55" height="33"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                    <state key="normal" title="Submit">
+                                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    </state>
+                                    <connections>
+                                        <action selector="onButtonPressed:" destination="-1" eventType="touchUpInside" id="Ocd-Ag-6hf"/>
+                                    </connections>
+                                </button>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qYR-zu-cWD" userLabel="HomeServerView">
+                                    <rect key="frame" x="122" y="408" width="356" height="30"/>
+                                    <subviews>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Homeserver:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kHf-s1-cZa">
+                                            <rect key="frame" x="0.0" y="6" width="100" height="18"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" constant="100" id="sMT-6v-Bl2"/>
+                                            </constraints>
+                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="URL (e.g. https://matrix.org)" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="G8l-AP-iRs">
+                                            <rect key="frame" x="106" y="0.0" width="250" height="30"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" priority="750" constant="250" id="Bus-fe-qDE"/>
+                                                <constraint firstAttribute="height" constant="30" id="n0r-1Y-JVb"/>
+                                            </constraints>
+                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                            <textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="done"/>
+                                            <connections>
+                                                <outlet property="delegate" destination="-1" id="j11-Hz-zbw"/>
+                                            </connections>
+                                        </textField>
+                                    </subviews>
+                                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <constraints>
+                                        <constraint firstAttribute="bottom" secondItem="G8l-AP-iRs" secondAttribute="bottom" id="5IT-R0-LOI"/>
+                                        <constraint firstItem="G8l-AP-iRs" firstAttribute="top" secondItem="qYR-zu-cWD" secondAttribute="top" id="Buu-5d-k19"/>
+                                        <constraint firstItem="kHf-s1-cZa" firstAttribute="top" secondItem="qYR-zu-cWD" secondAttribute="top" constant="6" id="L7i-5Z-s2o"/>
+                                        <constraint firstAttribute="trailing" secondItem="G8l-AP-iRs" secondAttribute="trailing" id="PLA-Aw-Pzy"/>
+                                        <constraint firstItem="G8l-AP-iRs" firstAttribute="leading" secondItem="kHf-s1-cZa" secondAttribute="trailing" constant="6" id="Q5p-aO-t6v"/>
+                                        <constraint firstItem="kHf-s1-cZa" firstAttribute="leading" secondItem="qYR-zu-cWD" secondAttribute="leading" id="cc8-Fb-gFT"/>
+                                        <constraint firstAttribute="bottom" secondItem="kHf-s1-cZa" secondAttribute="bottom" constant="6" id="nAb-iy-C9m"/>
+                                    </constraints>
+                                </view>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Your homeserver stores all your conversations and account data" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="aLk-0i-Z0d" userLabel="HomeServerInfoLabel">
+                                    <rect key="frame" x="106" y="438" width="388" height="16"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wgD-7Z-30S" userLabel="IdentityServerView">
+                                    <rect key="frame" x="115" y="462" width="370" height="30"/>
+                                    <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">
+                                            <rect key="frame" x="0.0" y="6" width="114" height="18"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" constant="114" id="zee-RK-6DE"/>
+                                            </constraints>
+                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="URL (e.g. https://matrix.org)" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="PZC-Hd-Q6a">
+                                            <rect key="frame" x="120" y="0.0" width="250" height="30"/>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="30" id="9Mz-m5-EB9"/>
+                                                <constraint firstAttribute="width" priority="750" constant="250" id="Qaq-Ul-hve"/>
+                                            </constraints>
+                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                            <textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="done"/>
+                                            <connections>
+                                                <outlet property="delegate" destination="-1" id="nZF-by-6t6"/>
+                                            </connections>
+                                        </textField>
+                                    </subviews>
+                                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <constraints>
+                                        <constraint firstItem="PZC-Hd-Q6a" firstAttribute="leading" secondItem="5CT-Ht-Z3v" secondAttribute="trailing" constant="6" id="8JB-zn-QIC"/>
+                                        <constraint firstAttribute="trailing" secondItem="PZC-Hd-Q6a" secondAttribute="trailing" id="Jkm-DW-Ybe"/>
+                                        <constraint firstItem="5CT-Ht-Z3v" firstAttribute="leading" secondItem="wgD-7Z-30S" secondAttribute="leading" id="KVq-Db-bf1"/>
+                                        <constraint firstItem="5CT-Ht-Z3v" firstAttribute="top" secondItem="wgD-7Z-30S" secondAttribute="top" constant="6" id="NOf-dw-aCG"/>
+                                        <constraint firstAttribute="bottom" secondItem="5CT-Ht-Z3v" secondAttribute="bottom" constant="6" id="e1T-pC-1Hb"/>
+                                        <constraint firstAttribute="bottom" secondItem="PZC-Hd-Q6a" secondAttribute="bottom" id="nRU-cF-4sd"/>
+                                        <constraint firstItem="PZC-Hd-Q6a" firstAttribute="top" secondItem="wgD-7Z-30S" secondAttribute="top" id="wyY-ND-M2F"/>
+                                    </constraints>
+                                </view>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="NDg-U7-lEi" userLabel="IdentityServerInfoLabel">
+                                    <rect key="frame" x="24.5" y="492" width="551.5" height="31.5"/>
+                                    <string key="text">Matrix provides identity servers to track which emails etc. belong to which Matrix IDs. Only https://matrix.org currently exists.</string>
+                                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="FNe-kn-VlD" userLabel="authSwitchButton">
+                                    <rect key="frame" x="247.5" y="535.5" width="105" height="30"/>
+                                    <state key="normal" title="Create account">
+                                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    </state>
+                                    <connections>
+                                        <action selector="onButtonPressed:" destination="-1" eventType="touchUpInside" id="Wso-Up-84h"/>
+                                    </connections>
+                                </button>
+                            </subviews>
+                            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <constraints>
+                                <constraint firstAttribute="centerX" secondItem="k3J-Eg-itz" secondAttribute="centerX" id="16F-5a-sGz"/>
+                                <constraint firstItem="aLk-0i-Z0d" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="rhx-dD-4EJ" secondAttribute="leading" constant="8" id="1RP-D4-oSf"/>
+                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="NDg-U7-lEi" secondAttribute="trailing" constant="8" id="1wt-wg-IhV"/>
+                                <constraint firstItem="NDg-U7-lEi" firstAttribute="top" secondItem="wgD-7Z-30S" secondAttribute="bottom" id="2ET-PY-wrQ"/>
+                                <constraint firstAttribute="centerX" secondItem="aLk-0i-Z0d" secondAttribute="centerX" id="3A4-MZ-gtb"/>
+                                <constraint firstAttribute="centerX" secondItem="qYR-zu-cWD" secondAttribute="centerX" id="4YF-AE-oU7"/>
+                                <constraint firstAttribute="height" constant="640" id="6v6-fz-e8o"/>
+                                <constraint firstItem="wgD-7Z-30S" firstAttribute="top" secondItem="aLk-0i-Z0d" secondAttribute="bottom" constant="8" id="DQl-gU-L2D"/>
+                                <constraint firstItem="aLk-0i-Z0d" firstAttribute="top" secondItem="qYR-zu-cWD" secondAttribute="bottom" id="EwX-Q5-Hf9"/>
+                                <constraint firstItem="qYR-zu-cWD" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="rhx-dD-4EJ" secondAttribute="leading" constant="8" id="HYA-Wo-irB"/>
+                                <constraint firstAttribute="centerX" secondItem="xWb-IJ-v7F" secondAttribute="centerX" id="JWP-wi-ZDa"/>
+                                <constraint firstAttribute="centerX" secondItem="NDg-U7-lEi" secondAttribute="centerX" id="R0H-hs-7wv"/>
+                                <constraint firstItem="FNe-kn-VlD" firstAttribute="top" secondItem="NDg-U7-lEi" secondAttribute="bottom" constant="12" id="Uf5-oH-d3F"/>
+                                <constraint firstItem="xWb-IJ-v7F" firstAttribute="top" secondItem="Bcs-TE-KZc" secondAttribute="bottom" constant="5" id="VkP-Hy-on9"/>
+                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="qYR-zu-cWD" secondAttribute="trailing" constant="8" id="WKx-X9-rSk"/>
+                                <constraint firstItem="qYR-zu-cWD" firstAttribute="top" secondItem="k3J-Eg-itz" secondAttribute="bottom" constant="15" id="YyO-m7-k5N"/>
+                                <constraint firstItem="k3J-Eg-itz" firstAttribute="top" secondItem="xWb-IJ-v7F" secondAttribute="bottom" constant="10" id="ZWc-pM-S6Z"/>
+                                <constraint firstItem="wgD-7Z-30S" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="rhx-dD-4EJ" secondAttribute="leading" constant="8" id="bhG-JM-5OL"/>
+                                <constraint firstAttribute="centerX" secondItem="FNe-kn-VlD" secondAttribute="centerX" id="eY4-Si-CNK"/>
+                                <constraint firstItem="xWb-IJ-v7F" firstAttribute="top" secondItem="d8r-TX-pwX" secondAttribute="bottom" constant="35" id="h11-Ty-Pmd"/>
+                                <constraint firstAttribute="width" constant="600" placeholder="YES" id="hOT-Wn-hIb"/>
+                                <constraint firstItem="xWb-IJ-v7F" firstAttribute="top" secondItem="rhx-dD-4EJ" secondAttribute="top" constant="170" id="khR-Uj-OTH"/>
+                                <constraint firstAttribute="centerX" secondItem="Bcs-TE-KZc" secondAttribute="centerX" multiplier="2.1" id="ku1-W4-wTW"/>
+                                <constraint firstAttribute="centerX" secondItem="d8r-TX-pwX" secondAttribute="centerX" id="l6k-EH-Yb8"/>
+                                <constraint firstItem="NDg-U7-lEi" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="rhx-dD-4EJ" secondAttribute="leading" constant="8" id="n7a-Mq-ac1"/>
+                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="wgD-7Z-30S" secondAttribute="trailing" constant="8" id="pdt-ux-dSI"/>
+                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="aLk-0i-Z0d" secondAttribute="trailing" constant="8" id="szN-BO-i20"/>
+                                <constraint firstAttribute="centerX" secondItem="wgD-7Z-30S" secondAttribute="centerX" id="ysX-l7-PIY"/>
+                            </constraints>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <constraints>
+                        <constraint firstAttribute="bottom" secondItem="rhx-dD-4EJ" secondAttribute="bottom" id="0Ex-X9-7WC"/>
+                        <constraint firstAttribute="trailing" secondItem="rhx-dD-4EJ" secondAttribute="trailing" id="Ztq-8U-wlX"/>
+                        <constraint firstItem="rhx-dD-4EJ" firstAttribute="top" secondItem="OHV-KQ-Ww0" secondAttribute="top" id="ePD-me-ymh"/>
+                        <constraint firstItem="rhx-dD-4EJ" firstAttribute="leading" secondItem="OHV-KQ-Ww0" secondAttribute="leading" id="h1J-cn-QL1"/>
+                    </constraints>
+                </scrollView>
+                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="q1e-Wg-6t7" userLabel="Authentication Fallback ContentView">
+                    <rect key="frame" x="0.0" y="20" width="375" height="647"/>
+                    <subviews>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9qj-5c-Sfb">
+                            <rect key="frame" x="317" y="5" width="50" height="35"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="50" id="GMq-PF-fBv"/>
+                                <constraint firstAttribute="height" constant="35" id="KfQ-gX-IHF"/>
+                            </constraints>
+                            <state key="normal" title="Cancel">
+                                <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            </state>
+                            <connections>
+                                <action selector="onButtonPressed:" destination="-1" eventType="touchUpInside" id="Pxo-2q-AdE"/>
+                            </connections>
+                        </button>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6Em-Jj-UPO">
+                            <rect key="frame" x="0.0" y="40" width="375" height="607"/>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <constraints>
+                        <constraint firstItem="6Em-Jj-UPO" firstAttribute="top" secondItem="9qj-5c-Sfb" secondAttribute="bottom" id="1b1-7U-PeK"/>
+                        <constraint firstAttribute="trailing" secondItem="9qj-5c-Sfb" secondAttribute="trailing" constant="8" id="AUi-MV-V60"/>
+                        <constraint firstAttribute="bottom" secondItem="6Em-Jj-UPO" secondAttribute="bottom" id="PaB-bb-nat"/>
+                        <constraint firstItem="6Em-Jj-UPO" firstAttribute="leading" secondItem="q1e-Wg-6t7" secondAttribute="leading" id="TBi-7x-M9c"/>
+                        <constraint firstItem="9qj-5c-Sfb" firstAttribute="top" secondItem="q1e-Wg-6t7" secondAttribute="top" constant="5" id="ZKZ-pg-xzV"/>
+                        <constraint firstAttribute="trailing" secondItem="6Em-Jj-UPO" secondAttribute="trailing" id="e1s-Hg-1Fa"/>
+                    </constraints>
+                </view>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="OHV-KQ-Ww0" firstAttribute="leading" secondItem="5rn-KE-plm" secondAttribute="leading" id="1Rd-Il-6MW"/>
+                <constraint firstAttribute="bottom" secondItem="q1e-Wg-6t7" secondAttribute="bottom" id="8Bc-V7-iP3"/>
+                <constraint firstItem="q1e-Wg-6t7" firstAttribute="leading" secondItem="5rn-KE-plm" secondAttribute="leading" id="DiC-Ui-3Wk"/>
+                <constraint firstItem="OHV-KQ-Ww0" firstAttribute="top" secondItem="5rn-KE-plm" secondAttribute="top" constant="20" symbolic="YES" id="FGm-jm-8r0"/>
+                <constraint firstAttribute="trailing" secondItem="OHV-KQ-Ww0" secondAttribute="trailing" id="KAu-Wf-ojt"/>
+                <constraint firstAttribute="trailing" secondItem="q1e-Wg-6t7" secondAttribute="trailing" id="XIS-Jp-qZf"/>
+                <constraint firstAttribute="bottom" secondItem="OHV-KQ-Ww0" secondAttribute="bottom" id="g7o-eO-7Yr"/>
+                <constraint firstItem="q1e-Wg-6t7" firstAttribute="top" secondItem="5rn-KE-plm" secondAttribute="top" constant="20" id="sT2-HR-vou"/>
+            </constraints>
+            <nil key="simulatedStatusBarMetrics"/>
+            <point key="canvasLocation" x="138.40000000000001" y="152.47376311844079"/>
+        </view>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKCallViewController.h b/Riot/Modules/MatrixKit/Controllers/MXKCallViewController.h
new file mode 100644
index 000000000..7e8e8ad92
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKCallViewController.h
@@ -0,0 +1,243 @@
+/*
+ Copyright 2015 OpenMarket 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/UIKit.h>
+#import <AVFoundation/AVFoundation.h>
+
+#import <MatrixSDK/MatrixSDK.h>
+
+#import "MXKViewController.h"
+
+#import "MXKImageView.h"
+
+@class MXKCallViewController;
+
+/**
+ Delegate for `MXKCallViewController` object
+ */
+@protocol MXKCallViewControllerDelegate <NSObject>
+
+/**
+ Tells the delegate to dismiss the call view controller.
+ This callback is called when the user wants to go back into the app during a call or when the call is ended.
+ The delegate should check the state of the associated call to know the actual reason.
+ 
+ @param callViewController the call view controller.
+ @param completion the block to execute at the end of the operation.
+ */
+- (void)dismissCallViewController:(MXKCallViewController *)callViewController completion:(void (^)(void))completion;
+
+/**
+ Tells the delegate that user tapped on hold call.
+ @param callViewController the call view controller.
+ */
+- (void)callViewControllerDidTapOnHoldCall:(MXKCallViewController *)callViewController;
+
+@end
+
+extern NSString *const kMXKCallViewControllerWillAppearNotification;
+extern NSString *const kMXKCallViewControllerAppearedNotification;
+extern NSString *const kMXKCallViewControllerWillDisappearNotification;
+extern NSString *const kMXKCallViewControllerDisappearedNotification;
+extern NSString *const kMXKCallViewControllerBackToAppNotification;
+
+/**
+ 'MXKCallViewController' instance displays a call. Only one matrix session is supported by this view controller.
+ */
+@interface MXKCallViewController : MXKViewController <MXCallDelegate, AVAudioPlayerDelegate>
+
+@property (weak, nonatomic) IBOutlet MXKImageView *backgroundImageView;
+
+@property (weak, nonatomic, readonly) IBOutlet UIView *localPreviewContainerView;
+@property (weak, nonatomic, readonly) IBOutlet UIView *localPreviewVideoView;
+@property (weak, nonatomic) IBOutlet UIActivityIndicatorView *localPreviewActivityView;
+
+@property (weak, nonatomic, readonly) IBOutlet UIView *onHoldCallContainerView;
+@property (weak, nonatomic) IBOutlet MXKImageView *onHoldCallerImageView;
+
+@property (weak, nonatomic, readonly) IBOutlet UIView *remotePreviewContainerView;
+
+@property (weak, nonatomic) IBOutlet UIView *overlayContainerView;
+@property (weak, nonatomic) IBOutlet UIView *callContainerView;
+@property (weak, nonatomic) IBOutlet MXKImageView *callerImageView;
+@property (weak, nonatomic) IBOutlet UIImageView *pausedIcon;
+@property (weak, nonatomic) IBOutlet UILabel *callerNameLabel;
+@property (weak, nonatomic) IBOutlet UILabel *callStatusLabel;
+@property (weak, nonatomic) IBOutlet UIButton *resumeButton;
+
+@property (weak, nonatomic) IBOutlet UIView *callToolBar;
+@property (weak, nonatomic) IBOutlet UIButton *rejectCallButton;
+@property (weak, nonatomic) IBOutlet UIButton *answerCallButton;
+@property (weak, nonatomic) IBOutlet UIButton *endCallButton;
+
+@property (weak, nonatomic) IBOutlet UIView *callControlContainerView;
+@property (weak, nonatomic) IBOutlet UIButton *speakerButton;
+@property (weak, nonatomic) IBOutlet UIButton *audioMuteButton;
+@property (weak, nonatomic) IBOutlet UIButton *videoMuteButton;
+@property (weak, nonatomic) IBOutlet UIButton *moreButtonForVoice;
+@property (weak, nonatomic) IBOutlet UIButton *moreButtonForVideo;
+
+@property (weak, nonatomic) IBOutlet UIButton *backToAppButton;
+@property (weak, nonatomic) IBOutlet UIButton *cameraSwitchButton;
+
+@property (unsafe_unretained, nonatomic) IBOutlet NSLayoutConstraint *localPreviewContainerViewLeadingConstraint;
+@property (unsafe_unretained, nonatomic) IBOutlet NSLayoutConstraint *localPreviewContainerViewTopConstraint;
+@property (unsafe_unretained, nonatomic) IBOutlet NSLayoutConstraint *localPreviewContainerViewHeightConstraint;
+@property (unsafe_unretained, nonatomic) IBOutlet NSLayoutConstraint *localPreviewContainerViewWidthConstraint;
+
+@property (weak, nonatomic) IBOutlet UIButton *transferButton;
+
+/**
+ The default picture displayed when no picture is available.
+ */
+@property (nonatomic) UIImage *picturePlaceholder;
+
+/**
+ The call status bar displayed on the top of the app during a call.
+ */
+@property (nonatomic, readonly) UIWindow *backToAppStatusWindow;
+
+/**
+ Flag whether this call screen is displaying an alert right now.
+ */
+@property (nonatomic, readonly, getter=isDisplayingAlert) BOOL displayingAlert;
+
+/**
+ The current call
+ */
+@property (nonatomic) MXCall *mxCall;
+
+/**
+ The current call on hold
+ */
+@property (nonatomic) MXCall *mxCallOnHold;
+
+/**
+ The current peer
+ */
+@property (nonatomic, readonly) MXUser *peer;
+
+/**
+ The current peer of the call on hold
+ */
+@property (nonatomic, readonly) MXUser *peerOnHold;
+
+/**
+ The delegate.
+ */
+@property (nonatomic, weak) id<MXKCallViewControllerDelegate> delegate;
+
+/*
+ Specifies whether a ringtone must be played on incoming call.
+ It's important to set this value before you will set `mxCall` otherwise value of this property can has no effect.
+ 
+ Defaults to YES.
+ */
+@property (nonatomic) BOOL playRingtone;
+
+#pragma mark - Class methods
+
+/**
+ Returns the `UINib` object initialized for a `MXKCallViewController`.
+ 
+ @return The initialized `UINib` object or `nil` if there were errors during initialization
+ or the nib file could not be located.
+ 
+ @discussion You may override this method to provide a customized nib. If you do,
+ you should also override `roomViewController` to return your
+ view controller loaded from your custom nib.
+ */
++ (UINib *)nib;
+
+/**
+ Creates and returns a new `MXKCallViewController` object.
+ 
+ @discussion This is the designated initializer for programmatic instantiation.
+ 
+ @param call a MXCall instance.
+ @return An initialized `MXKRoomViewController` object if successful, `nil` otherwise.
+ */
++ (instancetype)callViewController:(MXCall *)call;
+
+/**
+ Return an audio file url based on the provided name.
+ 
+ @param soundName audio file name without extension.
+ @return a NSURL instance.
+ */
+- (NSURL*)audioURLWithName:(NSString *)soundName;
+
+/**
+ Refresh the peer information in the call viewcontroller's view.
+ */
+- (void)updatePeerInfoDisplay;
+
+/**
+ Adjust the layout of the preview container.
+ */
+- (void)updateLocalPreviewLayout;
+
+/**
+ Show/Hide the overlay view.
+ 
+ @param isShown tell whether the overlay is shown or not.
+ */
+- (void)showOverlayContainer:(BOOL)isShown;
+
+/**
+ Set up or teardown the promixity monitoring and enable/disable the idle timer according to call type, state & audio route.
+ */
+- (void)updateProximityAndSleep;
+
+/**
+ Prepare and return the optional view displayed during incoming call notification.
+ Return nil by default
+ 
+ Subclasses may override this method to provide appropriate for their app view.
+ When this method is called peer and mxCall are valid so you can use them.
+ */
+- (UIView *)createIncomingCallView;
+
+/**
+ Action registered on the event 'UIControlEventTouchUpInside' for each UIButton instance.
+ */
+- (IBAction)onButtonPressed:(id)sender;
+
+/**
+ Default implementation presents an action sheet with proper options. Override to change the user interface.
+ */
+- (void)showAudioDeviceOptions;
+
+/**
+ Default implementation makes the button selected for loud speakers and external device options, non-selected for built-in device.
+ */
+- (void)configureSpeakerButton;
+
+#pragma mark - DTMF
+
+/**
+ Default implementation does nothing. Override to show a dial pad and then use MXCall methods to send DTMF tones.
+ */
+- (void)openDialpad;
+
+#pragma mark - Call Transfer
+
+/**
+ Default implementation does nothing. Override to show a contact selection screen and then use MXCallManager methods to start the transfer.
+ */
+- (void)openCallTransfer;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKCallViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKCallViewController.m
new file mode 100644
index 000000000..55781b106
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKCallViewController.m
@@ -0,0 +1,1547 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2018 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 "MXKCallViewController.h"
+
+@import MatrixSDK;
+
+#import "MXKAppSettings.h"
+#import "MXKSoundPlayer.h"
+#import "MXKTools.h"
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKSwiftHeader.h"
+
+NSString *const kMXKCallViewControllerWillAppearNotification = @"kMXKCallViewControllerWillAppearNotification";
+NSString *const kMXKCallViewControllerAppearedNotification = @"kMXKCallViewControllerAppearedNotification";
+NSString *const kMXKCallViewControllerWillDisappearNotification = @"kMXKCallViewControllerWillDisappearNotification";
+NSString *const kMXKCallViewControllerDisappearedNotification = @"kMXKCallViewControllerDisappearedNotification";
+NSString *const kMXKCallViewControllerBackToAppNotification = @"kMXKCallViewControllerBackToAppNotification";
+
+static const CGFloat kLocalPreviewMargin = 20;
+
+@interface MXKCallViewController ()
+{
+    NSTimer *hideOverlayTimer;
+    NSTimer *updateStatusTimer;
+    
+    Boolean isMovingLocalPreview;
+    Boolean isSelectingLocalPreview;
+    
+    CGPoint startNewLocalMove;
+
+    /**
+     The popup showed in case of call stack error.
+     */
+    UIAlertController *errorAlert;
+    
+    // the room events listener
+    id roomListener;
+    
+    // Observe kMXRoomDidFlushDataNotification to take into account the updated room members when the room history is flushed.
+    id roomDidFlushDataNotificationObserver;
+    
+    // Observe AVAudioSessionRouteChangeNotification
+    id audioSessionRouteChangeNotificationObserver;
+    
+    // Current alert (if any).
+    UIAlertController *currentAlert;
+    
+    //  Current peer display name
+    NSString *peerDisplayName;
+}
+
+@property (nonatomic, assign) Boolean isRinging;
+
+@property (nonatomic, nullable) UIView *incomingCallView;
+
+@property (nonatomic, strong) UITapGestureRecognizer *onHoldCallContainerTapRecognizer;
+
+@end
+
+@implementation MXKCallViewController
+@synthesize backgroundImageView;
+@synthesize localPreviewContainerView, localPreviewVideoView, localPreviewActivityView, remotePreviewContainerView;
+@synthesize overlayContainerView, callContainerView, callerImageView, callerNameLabel, callStatusLabel;
+@synthesize callToolBar, rejectCallButton, answerCallButton, endCallButton;
+@synthesize callControlContainerView, speakerButton, audioMuteButton, videoMuteButton;
+@synthesize backToAppButton, cameraSwitchButton;
+@synthesize backToAppStatusWindow;
+@synthesize mxCall;
+@synthesize mxCallOnHold;
+@synthesize onHoldCallerImageView;
+@synthesize onHoldCallContainerView;
+
+#pragma mark - Class methods
+
++ (UINib *)nib
+{
+    return [UINib nibWithNibName:NSStringFromClass(self.class)
+                          bundle:[NSBundle bundleForClass:self.class]];
+}
+
++ (instancetype)callViewController:(MXCall*)call
+{
+    MXKCallViewController *instance = [[[self class] alloc] initWithNibName:NSStringFromClass(self.class)
+                                                                     bundle:[NSBundle bundleForClass:self.class]];
+    
+    // Load the view controller's view now (buttons and views will then be available).
+    if ([instance respondsToSelector:@selector(loadViewIfNeeded)])
+    {
+        // iOS 9 and later
+        [instance loadViewIfNeeded];
+    }
+    else if (instance.view)
+    {
+        // Patch: on iOS < 9.0, we load the view by calling its getter.
+    }
+    
+    instance.mxCall = call;
+    
+    return instance;
+}
+
+#pragma mark -
+
+- (void)finalizeInit
+{
+    [super finalizeInit];
+    
+    _playRingtone = YES;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    updateStatusTimer = [NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(updateTimeStatusLabel) userInfo:nil repeats:YES];
+    
+    self.callerImageView.defaultBackgroundColor = [UIColor clearColor];
+    self.backToAppButton.backgroundColor = [UIColor clearColor];
+    self.audioMuteButton.backgroundColor = [UIColor clearColor];
+    self.videoMuteButton.backgroundColor = [UIColor clearColor];
+    self.resumeButton.backgroundColor = [UIColor clearColor];
+    self.moreButton.backgroundColor = [UIColor clearColor];
+    self.speakerButton.backgroundColor = [UIColor clearColor];
+    self.transferButton.backgroundColor = [UIColor clearColor];
+    
+    [self.backToAppButton setImage:[NSBundle mxk_imageFromMXKAssetsBundleWithName:@"icon_backtoapp"] forState:UIControlStateNormal];
+    [self.backToAppButton setImage:[NSBundle mxk_imageFromMXKAssetsBundleWithName:@"icon_backtoapp"] forState:UIControlStateHighlighted];
+    [self.audioMuteButton setImage:[NSBundle mxk_imageFromMXKAssetsBundleWithName:@"icon_audio_unmute"] forState:UIControlStateNormal];
+    [self.audioMuteButton setImage:[NSBundle mxk_imageFromMXKAssetsBundleWithName:@"icon_audio_mute"] forState:UIControlStateSelected];
+    [self.videoMuteButton setImage:[NSBundle mxk_imageFromMXKAssetsBundleWithName:@"icon_video_unmute"] forState:UIControlStateNormal];
+    [self.videoMuteButton setImage:[NSBundle mxk_imageFromMXKAssetsBundleWithName:@"icon_video_mute"] forState:UIControlStateSelected];
+    [self.moreButton setImage:[NSBundle mxk_imageFromMXKAssetsBundleWithName:@"icon_call_more"] forState:UIControlStateNormal];
+    [self.moreButton setImage:[NSBundle mxk_imageFromMXKAssetsBundleWithName:@"icon_call_more"] forState:UIControlStateSelected];
+    [self.speakerButton setImage:[NSBundle mxk_imageFromMXKAssetsBundleWithName:@"icon_speaker_off"] forState:UIControlStateNormal];
+    [self.speakerButton setImage:[NSBundle mxk_imageFromMXKAssetsBundleWithName:@"icon_speaker_on"] forState:UIControlStateSelected];
+    
+    // Localize string
+    [answerCallButton setTitle:[MatrixKitL10n answerCall] forState:UIControlStateNormal];
+    [answerCallButton setTitle:[MatrixKitL10n answerCall] forState:UIControlStateHighlighted];
+    [rejectCallButton setTitle:[MatrixKitL10n rejectCall] forState:UIControlStateNormal];
+    [rejectCallButton setTitle:[MatrixKitL10n rejectCall] forState:UIControlStateHighlighted];
+    [endCallButton setTitle:[MatrixKitL10n endCall] forState:UIControlStateNormal];
+    [endCallButton setTitle:[MatrixKitL10n endCall] forState:UIControlStateHighlighted];
+    [_resumeButton setTitle:[MatrixKitL10n resumeCall] forState:UIControlStateNormal];
+    [_resumeButton setTitle:[MatrixKitL10n resumeCall] forState:UIControlStateHighlighted];
+    
+    // Refresh call information
+    self.mxCall = mxCall;
+    
+    // Listen to AVAudioSession activation notification if CallKit is available and enabled
+    BOOL isCallKitAvailable = [MXCallKitAdapter callKitAvailable] && [MXKAppSettings standardAppSettings].isCallKitEnabled;
+    if (isCallKitAvailable)
+    {
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(handleAudioSessionActivationNotification)
+                                                     name:kMXCallKitAdapterAudioSessionDidActive
+                                                   object:nil];
+    }
+}
+
+- (void)didReceiveMemoryWarning
+{
+    [super didReceiveMemoryWarning];
+}
+
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXCallKitAdapterAudioSessionDidActive object:nil];
+
+    [self removeObservers];
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKCallViewControllerWillAppearNotification object:nil];
+    
+    [self updateLocalPreviewLayout];
+    [self showOverlayContainer:YES];
+    
+    if (mxCall)
+    {
+        // Refresh call display according to the call room state.
+        [self callRoomStateDidChange:^{
+            // Refresh call status
+            [self call:self->mxCall stateDidChange:self->mxCall.state reason:nil];
+        }];
+
+    }
+    
+    if (_delegate)
+    {
+        backToAppButton.hidden = NO;
+    }
+    else
+    {
+        backToAppButton.hidden = YES;
+    }
+}
+
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKCallViewControllerAppearedNotification object:nil];
+    
+    // trick to hide the volume at launch
+    // as the mininum volume is forced by the application
+    // the volume popup can be displayed
+    //    volumeView = [[MPVolumeView alloc] initWithFrame: CGRectMake(5000, 5000, 0, 0)];
+    //    [self.view addSubview: volumeView];
+    //
+    //    dispatch_after(dispatch_walltime(DISPATCH_TIME_NOW, 0.5 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+    //        [volumeView removeFromSuperview];
+    //    });
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKCallViewControllerWillDisappearNotification object:nil];
+}
+
+- (void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear:animated];
+    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKCallViewControllerDisappearedNotification object:nil];
+}
+
+- (void)dismiss
+{
+    if (_delegate)
+    {
+        [_delegate dismissCallViewController:self completion:nil];
+    }
+    else
+    {
+        // Auto dismiss after few seconds
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [self dismissViewControllerAnimated:YES completion:nil];
+        });
+    }
+}
+
+#pragma mark - override MXKViewController
+
+- (void)destroy
+{
+    self.peer = nil;
+    
+    self.mxCall = nil;
+    
+    _delegate = nil;
+    
+    self.isRinging = NO;
+    
+    [hideOverlayTimer invalidate];
+    [updateStatusTimer invalidate];
+    
+    _incomingCallView = nil;
+    
+    _onHoldCallContainerTapRecognizer = nil;
+    
+    [super destroy];
+}
+
+#pragma mark - Properties
+
+- (UIImage *)picturePlaceholder
+{
+    return [NSBundle mxk_imageFromMXKAssetsBundleWithName:@"default-profile"];
+}
+
+- (void)setMxCall:(MXCall *)call
+{
+    // Remove previous call (if any)
+    if (mxCall)
+    {
+        mxCall.delegate = nil;
+        mxCall.selfVideoView = nil;
+        mxCall.remoteVideoView = nil;
+        [self removeMatrixSession:self.mainSession];
+        
+        [self removeObservers];
+        
+        mxCall = nil;
+    }
+    
+    if (call && call.room)
+    {
+        mxCall = call;
+        
+        [self addMatrixSession:mxCall.room.mxSession];
+
+        MXWeakify(self);
+
+        // Register a listener to handle messages related to room name, members...
+        roomListener = [mxCall.room listenToEventsOfTypes:@[kMXEventTypeStringRoomName, kMXEventTypeStringRoomTopic, kMXEventTypeStringRoomAliases, kMXEventTypeStringRoomAvatar, kMXEventTypeStringRoomCanonicalAlias, kMXEventTypeStringRoomMember] onEvent:^(MXEvent *event, MXTimelineDirection direction, MXRoomState *roomState) {
+            MXStrongifyAndReturnIfNil(self);
+
+            // Consider only live events
+            if (self->mxCall && direction == MXTimelineDirectionForwards)
+            {
+                // The room state has been changed
+                [self callRoomStateDidChange:nil];
+            }
+        }];
+        
+        // Observe room history flush (sync with limited timeline, or state event redaction)
+        roomDidFlushDataNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXRoomDidFlushDataNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+            MXStrongifyAndReturnIfNil(self);
+            
+            MXRoom *room = notif.object;
+            if (self->mxCall && self.mainSession == room.mxSession && [self->mxCall.room.roomId isEqualToString:room.roomId])
+            {
+                // The existing room history has been flushed during server sync.
+                // Take into account the updated room state
+                [self callRoomStateDidChange:nil];
+            }
+            
+        }];
+        
+        audioSessionRouteChangeNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:AVAudioSessionRouteChangeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+            
+            [self updateProximityAndSleep];
+            
+        }];
+        
+        // Hide video mute on voice call
+        self.videoMuteButton.hidden = !call.isVideoCall;
+        
+        // Hide camera switch on voice call
+        self.cameraSwitchButton.hidden = !call.isVideoCall;
+        
+        _moreButtonForVideo.hidden = !call.isVideoCall;
+        _moreButtonForVoice.hidden = call.isVideoCall;
+        
+        // Observe call state change
+        call.delegate = self;
+
+        // Display room call information
+        [self callRoomStateDidChange:^{
+            [self call:call stateDidChange:call.state reason:nil];
+        }];
+        
+        if (call.isVideoCall && localPreviewContainerView)
+        {
+            // Access to the camera is mandatory to display the self view
+            // Check the permission right now
+            NSString *appDisplayName = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleDisplayName"];
+            [MXKTools checkAccessForMediaType:AVMediaTypeVideo
+                          manualChangeMessage:[MatrixKitL10n cameraAccessNotGrantedForCall:appDisplayName]
+
+                    showPopUpInViewController:self completionHandler:^(BOOL granted) {
+
+                   if (granted)
+                   {
+                       self->localPreviewContainerView.hidden = NO;
+                       self->remotePreviewContainerView.hidden = NO;
+
+                       call.selfVideoView = self->localPreviewVideoView;
+                       call.remoteVideoView = self->remotePreviewContainerView;
+                       [self applyDeviceOrientation:YES];
+
+                       [[NSNotificationCenter defaultCenter] addObserver:self
+                                                                selector:@selector(deviceOrientationDidChange)
+                                                                    name:UIDeviceOrientationDidChangeNotification
+                                                                  object:nil];
+                   }
+               }];
+        }
+        else
+        {
+            localPreviewContainerView.hidden = YES;
+            remotePreviewContainerView.hidden = YES;
+        }
+    }
+}
+
+- (void)setMxCallOnHold:(MXCall *)callOnHold
+{
+    if (mxCallOnHold == callOnHold)
+    {
+        //  setting same property, return
+        return;
+    }
+    
+    mxCallOnHold = callOnHold;
+    
+    if (mxCallOnHold)
+    {
+        self.onHoldCallContainerView.hidden = NO;
+        [self.onHoldCallContainerView addGestureRecognizer:self.onHoldCallContainerTapRecognizer];
+        [self.onHoldCallContainerView setUserInteractionEnabled:YES];
+        
+        // Handle peer here
+        if (mxCallOnHold.isIncoming)
+        {
+            self.peerOnHold = [mxCallOnHold.room.mxSession getOrCreateUser:mxCallOnHold.callerId];
+        }
+        else
+        {
+            // For 1:1 call, find the other peer
+            // Else, the room information will be used to display information about the call
+            MXWeakify(self);
+            [mxCallOnHold.room state:^(MXRoomState *roomState) {
+                MXStrongifyAndReturnIfNil(self);
+            
+                MXUser *theMember = nil;
+                NSArray *members = roomState.members.joinedMembers;
+                for (MXUser *member in members)
+                {
+                    if (![member.userId isEqualToString:self->mxCallOnHold.callerId])
+                    {
+                        theMember = member;
+                        break;
+                    }
+                }
+
+                self.peerOnHold = theMember;
+            }];
+        }
+    }
+    else
+    {
+        [self.onHoldCallContainerView removeGestureRecognizer:self.onHoldCallContainerTapRecognizer];
+        [self.onHoldCallContainerView setUserInteractionEnabled:NO];
+        self.onHoldCallContainerView.hidden = YES;
+        self.peerOnHold = nil;
+    }
+}
+
+- (void)setPeer:(MXUser *)peer
+{
+    _peer = peer;
+    
+    [self updatePeerInfoDisplay];
+}
+
+- (void)setPeerOnHold:(MXUser *)peerOnHold
+{
+    _peerOnHold = peerOnHold;
+    
+    NSString *peerAvatarURL;
+    
+    if (_peerOnHold)
+    {
+        peerAvatarURL = _peerOnHold.avatarUrl;
+    }
+    else if (mxCall.isConferenceCall)
+    {
+        peerAvatarURL = mxCallOnHold.room.summary.avatar;
+    }
+    
+    onHoldCallerImageView.imageView.contentMode = UIViewContentModeScaleAspectFill;
+    
+    if (peerAvatarURL)
+    {
+        // Suppose avatar url is a matrix content uri, we use SDK to get the well adapted thumbnail from server
+        onHoldCallerImageView.mediaFolder = kMXMediaManagerAvatarThumbnailFolder;
+        onHoldCallerImageView.enableInMemoryCache = YES;
+        [onHoldCallerImageView setImageURI:peerAvatarURL
+                                  withType:nil
+                       andImageOrientation:UIImageOrientationUp
+                             toFitViewSize:onHoldCallerImageView.frame.size
+                                withMethod:MXThumbnailingMethodCrop
+                              previewImage:self.picturePlaceholder
+                              mediaManager:self.mainSession.mediaManager];
+    }
+    else
+    {
+        onHoldCallerImageView.image = self.picturePlaceholder;
+    }
+}
+
+- (void)updatePeerInfoDisplay
+{
+    NSString *peerAvatarURL;
+    
+    if (_peer)
+    {
+        peerDisplayName = [_peer displayname];
+        if (!peerDisplayName.length)
+        {
+            peerDisplayName = _peer.userId;
+        }
+        peerAvatarURL = _peer.avatarUrl;
+    }
+    else if (mxCall.isConferenceCall)
+    {
+        peerDisplayName = mxCall.room.summary.displayname;
+        peerAvatarURL = mxCall.room.summary.avatar;
+    }
+    
+    if (mxCall.isConsulting)
+    {
+        callerNameLabel.text = [MatrixKitL10n callConsultingWithUser:peerDisplayName];
+    }
+    else
+    {
+        if (mxCall.isVideoCall)
+        {
+            callerNameLabel.text = [MatrixKitL10n callVideoWithUser:peerDisplayName];
+        }
+        else
+        {
+            callerNameLabel.text = [MatrixKitL10n callVoiceWithUser:peerDisplayName];
+        }
+    }
+    
+    if (peerAvatarURL)
+    {
+        // Suppose avatar url is a matrix content uri, we use SDK to get the well adapted thumbnail from server
+        callerImageView.mediaFolder = kMXMediaManagerAvatarThumbnailFolder;
+        callerImageView.enableInMemoryCache = YES;
+        [callerImageView setImageURI:peerAvatarURL
+                            withType:nil
+                 andImageOrientation:UIImageOrientationUp
+                       toFitViewSize:callerImageView.frame.size
+                          withMethod:MXThumbnailingMethodCrop
+                        previewImage:self.picturePlaceholder
+                        mediaManager:self.mainSession.mediaManager];
+    }
+    else
+    {
+        callerImageView.image = self.picturePlaceholder;
+    }
+    
+    // Round caller image view
+    [callerImageView.layer setCornerRadius:callerImageView.frame.size.width / 2];
+    callerImageView.clipsToBounds = YES;
+}
+
+- (void)setIsRinging:(Boolean)isRinging
+{
+    if (_isRinging != isRinging)
+    {
+        if (isRinging)
+        {
+            NSURL *audioUrl;
+            if (mxCall.isIncoming)
+            {
+                if (self.playRingtone)
+                    audioUrl = [self audioURLWithName:@"ring"];
+            }
+            else
+            {
+                audioUrl = [self audioURLWithName:@"ringback"];
+            }
+            
+            if (audioUrl)
+            {
+                [[MXKSoundPlayer sharedInstance] playSoundAt:audioUrl repeat:YES vibrate:mxCall.isIncoming routeToBuiltInReceiver:!mxCall.isIncoming];
+            }
+        }
+        else
+        {
+            [[MXKSoundPlayer sharedInstance] stopPlayingWithAudioSessionDeactivation:NO];
+        }
+        
+        _isRinging = isRinging;
+    }
+}
+
+- (void)setDelegate:(id<MXKCallViewControllerDelegate>)delegate
+{
+    _delegate = delegate;
+    
+    if (_delegate)
+    {
+        backToAppButton.hidden = NO;
+    }
+    else
+    {
+        backToAppButton.hidden = YES;
+    }
+}
+
+- (UITapGestureRecognizer *)onHoldCallContainerTapRecognizer
+{
+    if (_onHoldCallContainerTapRecognizer == nil)
+    {
+        _onHoldCallContainerTapRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self
+                                                                                    action:@selector(onHoldCallContainerTapped:)];
+    }
+    return _onHoldCallContainerTapRecognizer;
+}
+
+- (BOOL)isDisplayingAlert
+{
+    return errorAlert != nil;
+}
+
+- (UIButton *)moreButton
+{
+    if (mxCall.isVideoCall)
+    {
+        return _moreButtonForVideo;
+    }
+    return _moreButtonForVoice;
+}
+
+#pragma mark - Sounds
+
+- (NSURL *)audioURLWithName:(NSString *)soundName
+{
+    return [NSBundle mxk_audioURLFromMXKAssetsBundleWithName:soundName];
+}
+
+#pragma mark - Actions
+
+- (void)onHoldCallContainerTapped:(UITapGestureRecognizer *)recognizer
+{
+    if ([self.delegate respondsToSelector:@selector(callViewControllerDidTapOnHoldCall:)])
+    {
+        [self.delegate callViewControllerDidTapOnHoldCall:self];
+    }
+}
+
+- (IBAction)onButtonPressed:(id)sender
+{
+    if (sender == answerCallButton)
+    {
+        // If we are here, we have access to the camera
+        // The following check is mainly to check microphone access permission
+        NSString *appDisplayName = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleDisplayName"];
+
+        [MXKTools checkAccessForCall:mxCall.isVideoCall
+         manualChangeMessageForAudio:[MatrixKitL10n microphoneAccessNotGrantedForCall:appDisplayName]
+         manualChangeMessageForVideo:[MatrixKitL10n cameraAccessNotGrantedForCall:appDisplayName]
+           showPopUpInViewController:self completionHandler:^(BOOL granted) {
+
+               if (granted)
+               {
+                   [self->mxCall answer];
+               }
+           }];
+    }
+    else if (sender == rejectCallButton || sender == endCallButton)
+    {
+        if (mxCall.state != MXCallStateEnded)
+        {
+            [mxCall hangup];
+        }
+        else
+        {
+            [self dismiss];
+        }
+    }
+    else if (sender == audioMuteButton)
+    {
+        mxCall.audioMuted = !mxCall.audioMuted;
+        audioMuteButton.selected = mxCall.audioMuted;
+    }
+    else if (sender == videoMuteButton)
+    {
+        mxCall.videoMuted = !mxCall.videoMuted;
+        videoMuteButton.selected = mxCall.videoMuted;
+    }
+    else if (sender == _resumeButton)
+    {
+        [mxCall hold:NO];
+    }
+    else if (sender == self.moreButton)
+    {
+        [currentAlert dismissViewControllerAnimated:NO completion:nil];
+        
+        MXWeakify(self);
+        
+        NSMutableArray<UIAlertAction *> *actions = [NSMutableArray arrayWithCapacity:4];
+        
+        if (self.speakerButton == nil)
+        {
+            //  audio device action
+            UIAlertAction *audioDeviceAction = [UIAlertAction actionWithTitle:[MatrixKitL10n callMoreActionsChangeAudioDevice]
+                                                                        style:UIAlertActionStyleDefault
+                                                                      handler:^(UIAlertAction * action) {
+                
+                MXStrongifyAndReturnIfNil(self);
+                self->currentAlert = nil;
+                [self showAudioDeviceOptions];
+                
+            }];
+            
+            [actions addObject:audioDeviceAction];
+        }
+        
+        //  check the call can be up/downgraded
+        
+        //  check the call can send DTMF tones
+        if (self.mxCall.supportsDTMF)
+        {
+            UIAlertAction *dialpadAction = [UIAlertAction actionWithTitle:[MatrixKitL10n callMoreActionsDialpad]
+                                                                    style:UIAlertActionStyleDefault
+                                                                  handler:^(UIAlertAction * action) {
+                
+                MXStrongifyAndReturnIfNil(self);
+                self->currentAlert = nil;
+                [self openDialpad];
+                
+            }];
+            
+            [actions addObject:dialpadAction];
+        }
+        
+        //  check the call be holded/unholded
+        if (mxCall.supportsHolding)
+        {
+            NSString *actionLocKey = (mxCall.state == MXCallStateOnHold) ? [MatrixKitL10n callMoreActionsUnhold] : [MatrixKitL10n callMoreActionsHold];
+            
+            UIAlertAction *holdAction = [UIAlertAction actionWithTitle:actionLocKey
+                                                                 style:UIAlertActionStyleDefault
+                                                               handler:^(UIAlertAction * action) {
+                
+                MXStrongifyAndReturnIfNil(self);
+                self->currentAlert = nil;
+                [self->mxCall hold:(self.mxCall.state != MXCallStateOnHold)];
+                
+            }];
+            
+            [actions addObject:holdAction];
+        }
+        
+        //  check the call be transferred
+        if (mxCall.supportsTransferring && self.peer)
+        {
+            UIAlertAction *transferAction = [UIAlertAction actionWithTitle:[MatrixKitL10n callMoreActionsTransfer]
+                                                                     style:UIAlertActionStyleDefault
+                                                                   handler:^(UIAlertAction * action) {
+                
+                MXStrongifyAndReturnIfNil(self);
+                self->currentAlert = nil;
+                
+                [self openCallTransfer];
+            }];
+            
+            [actions addObject:transferAction];
+        }
+        
+        if (actions.count > 0)
+        {
+            //  create the alert
+            currentAlert = [UIAlertController alertControllerWithTitle:nil
+                                                               message:nil
+                                                        preferredStyle:UIAlertControllerStyleActionSheet];
+            
+            //  add actions
+            [actions enumerateObjectsUsingBlock:^(UIAlertAction * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+                [currentAlert addAction:obj];
+            }];
+            
+            //  add cancel action always
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+                                                             style:UIAlertActionStyleCancel
+                                                           handler:^(UIAlertAction * action) {
+                
+                MXStrongifyAndReturnIfNil(self);
+                self->currentAlert = nil;
+                
+            }]];
+            
+            [currentAlert popoverPresentationController].sourceView = self.moreButton;
+            [currentAlert popoverPresentationController].sourceRect = self.moreButton.bounds;
+            [self presentViewController:currentAlert animated:YES completion:nil];
+        }
+    }
+    else if (sender == speakerButton)
+    {
+        [self showAudioDeviceOptions];
+    }
+    else if (sender == cameraSwitchButton)
+    {
+        switch (mxCall.cameraPosition)
+        {
+            case AVCaptureDevicePositionFront:
+                mxCall.cameraPosition = AVCaptureDevicePositionBack;
+                break;
+                
+            default:
+                mxCall.cameraPosition = AVCaptureDevicePositionFront;
+                break;
+        }
+    }
+    else if (sender == backToAppButton)
+    {
+        if (_delegate)
+        {
+            // Dismiss the view controller whereas the call is still running
+            [_delegate dismissCallViewController:self completion:nil];
+        }
+    }
+    else if (sender == _transferButton)
+    {
+        //  actually transfer the call without consulting
+        [self.mainSession.callManager transferCall:mxCall.callWithTransferee
+                                                to:mxCall.transferTarget
+                                    withTransferee:mxCall.transferee
+                                      consultFirst:NO
+                                           success:^(NSString * _Nullable newCallId) {
+            
+        }
+                                           failure:^(NSError * _Nullable error) {
+            
+        }];
+    }
+    
+    [self updateProximityAndSleep];
+}
+
+- (void)showAudioDeviceOptions
+{
+    NSMutableArray<UIAlertAction *> *actions = [NSMutableArray new];
+    NSArray<MXiOSAudioOutputRoute *> *availableRoutes = mxCall.audioOutputRouter.availableOutputRoutes;
+    
+    for (MXiOSAudioOutputRoute *route in availableRoutes)
+    {
+        //  route action
+        NSString *name = route.name;
+        if (route.routeType == MXiOSAudioOutputRouteTypeLoudSpeakers)
+        {
+            name = [MatrixKitL10n callMoreActionsAudioUseDevice];
+        }
+        MXWeakify(self);
+        UIAlertAction *routeAction = [UIAlertAction actionWithTitle:name
+                                                              style:UIAlertActionStyleDefault
+                                                            handler:^(UIAlertAction * action) {
+            
+            MXStrongifyAndReturnIfNil(self);
+            self->currentAlert = nil;
+            [self->mxCall.audioOutputRouter changeCurrentRouteTo:route];
+            
+        }];
+        
+        [actions addObject:routeAction];
+    }
+    
+    if (actions.count > 0)
+    {
+        //  create the alert
+        currentAlert = [UIAlertController alertControllerWithTitle:nil
+                                                           message:nil
+                                                    preferredStyle:UIAlertControllerStyleActionSheet];
+        
+        for (UIAlertAction *action in actions)
+        {
+            [currentAlert addAction:action];
+        }
+        
+        //  add cancel action
+        MXWeakify(self);
+        [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+                                                         style:UIAlertActionStyleCancel
+                                                       handler:^(UIAlertAction * action) {
+            
+            MXStrongifyAndReturnIfNil(self);
+            self->currentAlert = nil;
+            
+        }]];
+        
+        [currentAlert popoverPresentationController].sourceView = self.moreButton;
+        [currentAlert popoverPresentationController].sourceRect = self.moreButton.bounds;
+        [self presentViewController:currentAlert animated:YES completion:nil];
+    }
+}
+    
+#pragma mark - DTMF
+
+- (void)openDialpad
+{
+    //  no-op
+}
+
+#pragma mark - Call Transfer
+
+- (void)openCallTransfer
+{
+    //  no-op
+}
+
+#pragma mark - MXCallDelegate
+
+- (void)call:(MXCall *)call stateDidChange:(MXCallState)state reason:(MXEvent *)event
+{
+    // Set default configuration of bottom bar
+    endCallButton.hidden = NO;
+    rejectCallButton.hidden = YES;
+    answerCallButton.hidden = YES;
+    self.moreButton.enabled = YES;
+    _resumeButton.hidden = state != MXCallStateOnHold;
+    _pausedIcon.hidden = state != MXCallStateOnHold && state != MXCallStateRemotelyOnHold;
+    _transferButton.hidden = YES;
+    
+    [localPreviewActivityView stopAnimating];
+    
+    switch (state)
+    {
+        case MXCallStateFledgling:
+            self.isRinging = NO;
+            callStatusLabel.text = [MatrixKitL10n callConnecting];
+            break;
+        case MXCallStateWaitLocalMedia:
+            self.isRinging = NO;
+            [self configureSpeakerButton];
+            [localPreviewActivityView startAnimating];
+            
+            // Try to show a special view for incoming view
+            [self configureIncomingCallViewIfRequiredWith:call];
+            
+            break;
+        case MXCallStateCreateOffer:
+        {
+            // When CallKit is enabled and we have an outgoing call, we need to start playing ringback sound
+            // only after AVAudioSession will be activated by the system otherwise the sound will be gone.
+            // We always receive signal about MXCallStateCreateOffer earlier than the system activates AVAudioSession
+            // so we start playing ringback sound only on AVAudioSession activation in handleAudioSessionActivationNotification
+            BOOL isCallKitAvailable = [MXCallKitAdapter callKitAvailable] && [MXKAppSettings standardAppSettings].isCallKitEnabled;
+            if (!isCallKitAvailable)
+            {
+                self.isRinging = YES;
+            }
+            
+            callStatusLabel.text = [MatrixKitL10n callConnecting];
+            break;
+        }
+        case MXCallStateInviteSent:
+        {
+            callStatusLabel.text = [MatrixKitL10n callRinging];
+            break;
+        }
+        case MXCallStateRinging:
+            self.isRinging = YES;
+            [self configureSpeakerButton];
+            if (call.isVideoCall)
+            {
+                callStatusLabel.text = [MatrixKitL10n incomingVideoCall];
+            }
+            else
+            {
+                callStatusLabel.text = [MatrixKitL10n incomingVoiceCall];
+            }
+            // Update bottom bar
+            endCallButton.hidden = YES;
+            rejectCallButton.hidden = NO;
+            answerCallButton.hidden = NO;
+            
+            // Try to show a special view for incoming view
+            [self configureIncomingCallViewIfRequiredWith:call];
+            
+            break;
+        case MXCallStateConnecting:
+            self.isRinging = NO;
+            
+            // User has accepted the call and we can remove incomingCallView
+            if (self.incomingCallView)
+            {
+                [UIView transitionWithView:self.view
+                                  duration:0.33
+                                   options:UIViewAnimationOptionTransitionCrossDissolve | UIViewAnimationOptionCurveEaseOut
+                                animations:^{
+                                    [self.incomingCallView removeFromSuperview];
+                                }
+                                completion:^(BOOL finished) {
+                                    self.incomingCallView = nil;
+                                }];
+            }
+            
+            break;
+        case MXCallStateConnected:
+            self.isRinging = NO;
+            [self updateTimeStatusLabel];
+
+            if (call.isVideoCall)
+            {
+                self.callerImageView.hidden = YES;
+                
+                if (call.isConferenceCall)
+                {
+                    // Do not show self view anymore because it is returned by the conference bridge
+                    self.localPreviewContainerView.hidden = YES;
+
+                    // Well, hide does not work. So, shrink the view to nil
+                    self.localPreviewContainerView.frame = CGRectZero;
+                }
+            }
+            audioMuteButton.enabled = YES;
+            videoMuteButton.enabled = YES;
+            speakerButton.enabled = YES;
+            cameraSwitchButton.enabled = YES;
+            if (call.isConsulting)
+            {
+                _transferButton.hidden = NO;
+            }
+
+            break;
+        case MXCallStateOnHold:
+            callStatusLabel.text = [MatrixKitL10n callHolded];
+            
+            break;
+        case MXCallStateRemotelyOnHold:
+            audioMuteButton.enabled = NO;
+            videoMuteButton.enabled = NO;
+            speakerButton.enabled = NO;
+            cameraSwitchButton.enabled = NO;
+            self.moreButton.enabled = NO;
+            callStatusLabel.text = [MatrixKitL10n callRemoteHolded:peerDisplayName];
+            
+            break;
+        case MXCallStateInviteExpired:
+            // MXCallStateInviteExpired state is sent as an notification
+            // MXCall will move quickly to the MXCallStateEnded state
+            self.isRinging = NO;
+            callStatusLabel.text = [MatrixKitL10n callInviteExpired];
+            
+            break;
+        case MXCallStateEnded:
+        {
+            self.isRinging = NO;
+            callStatusLabel.text = [MatrixKitL10n callEnded];
+            
+            NSString *soundName = [self soundNameForCallEnding];
+            if (soundName)
+            {
+                NSURL *audioUrl = [self audioURLWithName:soundName];
+                [[MXKSoundPlayer sharedInstance] playSoundAt:audioUrl repeat:NO vibrate:NO routeToBuiltInReceiver:YES];
+            }
+            else
+            {
+                [[MXKSoundPlayer sharedInstance] stopPlayingWithAudioSessionDeactivation:YES];
+            }
+            
+            // Except in case of call error, quit the screen right now
+            if (!errorAlert)
+            {
+                [self dismiss];
+            }
+
+            break;
+        }
+        default:
+            break;
+    }
+    
+    [self updateProximityAndSleep];
+}
+
+- (void)call:(MXCall *)call didEncounterError:(NSError *)error reason:(MXCallHangupReason)reason
+{
+    MXLogDebug(@"[MXKCallViewController] didEncounterError. mxCall.state: %tu. Stop call due to error: %@", mxCall.state, error);
+
+    if (mxCall.state != MXCallStateEnded)
+    {
+        // Popup the error to the user
+        NSString *title = [error.userInfo valueForKey:NSLocalizedFailureReasonErrorKey];
+        if (!title)
+        {
+            title = [MatrixKitL10n error];
+        }
+        NSString *msg = [error.userInfo valueForKey:NSLocalizedDescriptionKey];
+        if (!msg)
+        {
+            msg = [MatrixKitL10n errorCommonMessage];
+        }
+
+        MXWeakify(self);
+        errorAlert = [UIAlertController alertControllerWithTitle:title message:msg preferredStyle:UIAlertControllerStyleAlert];
+        
+        [errorAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
+                                                       style:UIAlertActionStyleDefault
+                                                     handler:^(UIAlertAction * action) {
+            
+            MXStrongifyAndReturnIfNil(self);
+            self->errorAlert = nil;
+            [self dismiss];
+            
+        }]];
+        
+        [self presentViewController:errorAlert animated:YES completion:nil];
+        
+        // And interrupt the call
+        [mxCall hangupWithReason:reason];
+    }
+}
+
+- (void)callConsultingStatusDidChange:(MXCall *)call
+{
+    [self updatePeerInfoDisplay];
+    
+    if (call.isConsulting)
+    {
+        NSString *title = [MatrixKitL10n callTransferToUser:call.transferee.displayname];
+        [_transferButton setTitle:title forState:UIControlStateNormal];
+        _transferButton.hidden = call.state != MXCallStateConnected;
+    }
+    else
+    {
+        _transferButton.hidden = YES;
+    }
+}
+
+- (void)callAssertedIdentityDidChange:(MXCall *)call
+{
+    MXAssertedIdentityModel *assertedIdentity = call.assertedIdentity;
+    
+    if (assertedIdentity)
+    {
+        //  update caller display name and avatar with the asserted identity
+        NSString *peerAvatarURL = assertedIdentity.avatarUrl;
+        
+        if (assertedIdentity.displayname)
+        {
+            peerDisplayName = assertedIdentity.displayname;
+        }
+        else if (assertedIdentity.userId)
+        {
+            peerDisplayName = assertedIdentity.userId;
+        }
+        
+        if (mxCall.isVideoCall)
+        {
+            callerNameLabel.text = [MatrixKitL10n callVideoWithUser:peerDisplayName];
+        }
+        else
+        {
+            callerNameLabel.text = [MatrixKitL10n callVoiceWithUser:peerDisplayName];
+        }
+        
+        if (peerAvatarURL)
+        {
+            // Suppose avatar url is a matrix content uri, we use SDK to get the well adapted thumbnail from server
+            callerImageView.mediaFolder = kMXMediaManagerAvatarThumbnailFolder;
+            callerImageView.enableInMemoryCache = YES;
+            [callerImageView setImageURI:peerAvatarURL
+                                withType:nil
+                     andImageOrientation:UIImageOrientationUp
+                           toFitViewSize:callerImageView.frame.size
+                              withMethod:MXThumbnailingMethodCrop
+                            previewImage:self.picturePlaceholder
+                            mediaManager:self.mainSession.mediaManager];
+        }
+        else
+        {
+            callerImageView.image = self.picturePlaceholder;
+        }
+        
+        [updateStatusTimer fire];
+    }
+    else
+    {
+        //  go back to the original display name and avatar
+        [self updatePeerInfoDisplay];
+    }
+}
+
+- (void)callAudioOutputRouteTypeDidChange:(MXCall *)call
+{
+    [self configureSpeakerButton];
+}
+
+- (void)callAvailableAudioOutputsDidChange:(MXCall *)call
+{
+    
+}
+
+#pragma mark - Internal
+
+- (void)removeObservers
+{
+    if (roomDidFlushDataNotificationObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:roomDidFlushDataNotificationObserver];
+        roomDidFlushDataNotificationObserver = nil;
+    }
+    
+    if (audioSessionRouteChangeNotificationObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:audioSessionRouteChangeNotificationObserver];
+        audioSessionRouteChangeNotificationObserver = nil;
+    }
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    
+    if (roomListener && mxCall.room)
+    {
+        MXWeakify(self);
+        [mxCall.room liveTimeline:^(MXEventTimeline *liveTimeline) {
+            MXStrongifyAndReturnIfNil(self);
+
+            [liveTimeline removeListener:self->roomListener];
+            self->roomListener = nil;
+        }];
+    }
+}
+
+- (void)callRoomStateDidChange:(dispatch_block_t)onComplete
+{
+    // Handle peer here
+    if (mxCall.isIncoming)
+    {
+        self.peer = [mxCall.room.mxSession getOrCreateUser:mxCall.callerId];
+        if (onComplete)
+        {
+            onComplete();
+        }
+    }
+    else
+    {
+        // For 1:1 call, find the other peer
+        // Else, the room information will be used to display information about the call
+        if (!mxCall.isConferenceCall)
+        {
+            MXWeakify(self);
+            [mxCall.room state:^(MXRoomState *roomState) {
+                MXStrongifyAndReturnIfNil(self);
+            
+                MXUser *theMember = nil;
+                NSArray *members = roomState.members.joinedMembers;
+                for (MXUser *member in members)
+                {
+                    if (![member.userId isEqualToString:self->mxCall.callerId])
+                    {
+                        theMember = member;
+                        break;
+                    }
+                }
+
+                self.peer = theMember;
+                if (onComplete)
+                {
+                    onComplete();
+                }
+            }];
+        }
+        else
+        {
+            self.peer = nil;
+            if (onComplete)
+            {
+                onComplete();
+            }
+        }
+    }
+}
+
+- (BOOL)isBuiltInReceiverAudioOuput
+{
+#if TARGET_IPHONE_SIMULATOR
+    return YES;
+#endif
+    BOOL isBuiltInReceiverUsed = NO;
+    
+    // Check whether the audio output is the built-in receiver
+    AVAudioSessionRouteDescription *audioRoute = [[AVAudioSession sharedInstance] currentRoute];
+    if (audioRoute.outputs.count)
+    {
+        // TODO: handle the case where multiple outputs are returned
+        AVAudioSessionPortDescription *audioOutputs = audioRoute.outputs.firstObject;
+        isBuiltInReceiverUsed = ([audioOutputs.portType isEqualToString:AVAudioSessionPortBuiltInReceiver]);
+    }
+    
+    return isBuiltInReceiverUsed;
+}
+
+- (NSString *)soundNameForCallEnding
+{
+    if (mxCall.endReason == MXCallEndReasonUnknown)
+        return nil;
+    
+    if (mxCall.isEstablished)
+        return @"callend";
+    
+    if (mxCall.endReason == MXCallEndReasonBusy || (!mxCall.isIncoming && mxCall.endReason == MXCallEndReasonMissed))
+        return @"busy";
+    
+    return nil;
+}
+
+- (void)handleAudioSessionActivationNotification
+{
+    // It's only relevant for outgoing calls which aren't in connected state
+    if (self.mxCall.state >= MXCallStateCreateOffer && self.mxCall.state != MXCallStateConnected && self.mxCall.state != MXCallStateEnded)
+    {
+        self.isRinging = YES;
+    }
+}
+
+#pragma mark - UI methods
+
+- (void)configureSpeakerButton
+{
+    switch (mxCall.audioOutputRouter.currentRoute.routeType)
+    {
+        case MXiOSAudioOutputRouteTypeBuiltIn:
+            self.speakerButton.selected = NO;
+            break;
+        case MXiOSAudioOutputRouteTypeLoudSpeakers:
+        case MXiOSAudioOutputRouteTypeExternalWired:
+        case MXiOSAudioOutputRouteTypeExternalBluetooth:
+        case MXiOSAudioOutputRouteTypeExternalCar:
+            self.speakerButton.selected = YES;
+            break;
+    }
+}
+
+- (void)configureIncomingCallViewIfRequiredWith:(MXCall *)call
+{
+    if (call.isIncoming && !self.incomingCallView)
+    {
+        UIView *incomingCallView = [self createIncomingCallView];
+        if (incomingCallView)
+        {
+            self.incomingCallView = incomingCallView;
+            [self.view addSubview:incomingCallView];
+            
+            incomingCallView.translatesAutoresizingMaskIntoConstraints = NO;
+            [incomingCallView.topAnchor constraintEqualToAnchor:self.view.topAnchor constant:0].active = YES;
+            [incomingCallView.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor constant:0].active = YES;
+            [incomingCallView.bottomAnchor constraintEqualToAnchor:self.view.bottomAnchor constant:0].active = YES;
+            [incomingCallView.trailingAnchor constraintEqualToAnchor:self.view.trailingAnchor constant:0].active = YES;
+        }
+    }
+}
+
+- (void)updateLocalPreviewLayout
+{
+    // On IOS 8 and later, the screen size is oriented.
+    CGRect bounds = [[UIScreen mainScreen] bounds];
+    BOOL isLandscapeOriented = (bounds.size.width > bounds.size.height);
+    
+    CGFloat maxPreviewFrameSize, minPreviewFrameSize;
+    
+    if (_localPreviewContainerViewWidthConstraint.constant < _localPreviewContainerViewHeightConstraint.constant)
+    {
+        maxPreviewFrameSize = _localPreviewContainerViewHeightConstraint.constant;
+        minPreviewFrameSize = _localPreviewContainerViewWidthConstraint.constant;
+    }
+    else
+    {
+        minPreviewFrameSize = _localPreviewContainerViewHeightConstraint.constant;
+        maxPreviewFrameSize = _localPreviewContainerViewWidthConstraint.constant;
+    }
+    
+    if (isLandscapeOriented)
+    {
+        _localPreviewContainerViewHeightConstraint.constant = minPreviewFrameSize;
+        _localPreviewContainerViewWidthConstraint.constant = maxPreviewFrameSize;
+    }
+    else
+    {
+        _localPreviewContainerViewHeightConstraint.constant = maxPreviewFrameSize;
+        _localPreviewContainerViewWidthConstraint.constant = minPreviewFrameSize;
+    }
+    
+    CGPoint previewOrigin = self.localPreviewContainerView.frame.origin;
+    
+    if (previewOrigin.x != (bounds.size.width - _localPreviewContainerViewWidthConstraint.constant - kLocalPreviewMargin))
+    {
+        CGFloat posX = (bounds.size.width - _localPreviewContainerViewWidthConstraint.constant - kLocalPreviewMargin);
+        _localPreviewContainerViewLeadingConstraint.constant = posX;
+    }
+    
+    if (previewOrigin.y != kLocalPreviewMargin)
+    {
+        CGFloat posY = (bounds.size.height - _localPreviewContainerViewHeightConstraint.constant - kLocalPreviewMargin);
+        _localPreviewContainerViewTopConstraint.constant = posY;
+    }
+}
+
+- (void)showOverlayContainer:(BOOL)isShown
+{
+    if (mxCall && !mxCall.isVideoCall) isShown = YES;
+    if (mxCall.state != MXCallStateConnected) isShown = YES;
+    
+    if (isShown)
+    {
+        overlayContainerView.hidden = NO;
+        if (mxCall && mxCall.isVideoCall)
+        {
+            [hideOverlayTimer invalidate];
+            hideOverlayTimer = [NSTimer scheduledTimerWithTimeInterval:5.0 target:self selector:@selector(hideOverlay:) userInfo:nil repeats:NO];
+        }
+    }
+    else
+    {
+        overlayContainerView.hidden = YES;
+    }
+}
+
+- (void)toggleOverlay
+{
+    [self showOverlayContainer:overlayContainerView.isHidden];
+}
+
+- (void)hideOverlay:(NSTimer*)theTimer
+{
+    [self showOverlayContainer:NO];
+    hideOverlayTimer = nil;
+}
+
+- (void)updateTimeStatusLabel
+{
+    if (mxCall.state == MXCallStateConnected)
+    {
+        NSUInteger duration = mxCall.duration / 1000;
+        NSUInteger secs = duration % 60;
+        NSUInteger mins = (duration - secs) / 60;
+        callStatusLabel.text = [NSString stringWithFormat:@"%02tu:%02tu", mins, secs];
+    }
+}
+
+- (void)updateProximityAndSleep
+{
+    BOOL inCall = (mxCall.state == MXCallStateConnected || mxCall.state == MXCallStateRinging || mxCall.state == MXCallStateInviteSent || mxCall.state == MXCallStateConnecting || mxCall.state == MXCallStateCreateOffer || mxCall.state == MXCallStateCreateAnswer);
+    
+    if (inCall)
+    {
+        BOOL isBuiltInReceiverUsed = self.isBuiltInReceiverAudioOuput;
+        
+        // Enable the proximity monitoring when the built in receiver is used as the audio output.
+        BOOL enableProxMonitoring = isBuiltInReceiverUsed;
+        [[UIDevice currentDevice] setProximityMonitoringEnabled:enableProxMonitoring];
+        
+        // Disable the idle timer during a video call, or during a voice call which is performed with the built-in receiver.
+        // Note: if the device is locked, VoIP calling get dropped if an incoming GSM call is received.
+        BOOL disableIdleTimer = mxCall.isVideoCall || isBuiltInReceiverUsed;
+        
+        UIApplication *sharedApplication = [UIApplication performSelector:@selector(sharedApplication)];
+        if (sharedApplication)
+        {
+            sharedApplication.idleTimerDisabled = disableIdleTimer;
+        }
+    }
+}
+
+- (UIView *)createIncomingCallView
+{
+    return nil;
+}
+
+#pragma mark - UIResponder Touch Events
+
+- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
+{
+    UITouch *touch = [touches anyObject];
+    CGPoint point = [touch locationInView:self.view];
+    if ((!self.localPreviewContainerView.hidden) && CGRectContainsPoint(self.localPreviewContainerView.frame, point))
+    {
+        // Starting to move the local preview view
+        if (mxCallOnHold)
+        {
+            //  if there is a call on hold, do not move local preview for now
+            //  TODO: Instead of wholly avoiding mobility of local preview, just avoid the on hold call's corner here
+            return;
+        }
+        isSelectingLocalPreview = YES;
+    }
+}
+
+- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
+{
+    isMovingLocalPreview = NO;
+    isSelectingLocalPreview = NO;
+}
+
+- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
+{
+    if (isMovingLocalPreview)
+    {
+        UITouch *touch = [touches anyObject];
+        CGPoint point = [touch locationInView:self.view];
+        
+        CGRect bounds = self.view.bounds;
+        CGFloat midX = bounds.size.width / 2.0;
+        CGFloat midY = bounds.size.height / 2.0;
+        
+        CGFloat posX = (point.x < midX) ? 20.0 : (bounds.size.width - _localPreviewContainerViewWidthConstraint.constant - 20.0);
+        CGFloat posY = (point.y < midY) ? 20.0 : (bounds.size.height - _localPreviewContainerViewHeightConstraint.constant - 20.0);
+        
+        _localPreviewContainerViewLeadingConstraint.constant = posX;
+        _localPreviewContainerViewTopConstraint.constant = posY;
+        
+        [self.view setNeedsUpdateConstraints];
+    }
+    else
+    {
+        [self toggleOverlay];
+    }
+    isMovingLocalPreview = NO;
+    isSelectingLocalPreview = NO;
+}
+
+- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
+{
+    UITouch *touch = [touches anyObject];
+    CGPoint point = [touch locationInView:self.view];
+    
+    if (isSelectingLocalPreview)
+    {
+        isMovingLocalPreview = YES;
+        self.localPreviewContainerView.center = point;
+    }
+}
+
+#pragma mark - UIDeviceOrientationDidChangeNotification
+
+- (void)deviceOrientationDidChange
+{
+    [self applyDeviceOrientation:NO];
+    
+    [self showOverlayContainer:YES];
+}
+
+- (void)applyDeviceOrientation:(BOOL)forcePortrait
+{
+    if (mxCall)
+    {
+        UIDeviceOrientation deviceOrientation = [[UIDevice currentDevice] orientation];
+        
+        // Set the camera orientation according to the orientation supported by the app
+        if (UIDeviceOrientationPortrait == deviceOrientation || UIDeviceOrientationLandscapeLeft == deviceOrientation || UIDeviceOrientationLandscapeRight == deviceOrientation)
+        {
+            mxCall.selfOrientation = deviceOrientation;
+            [self updateLocalPreviewLayout];
+        }
+        else if (forcePortrait)
+        {
+            mxCall.selfOrientation = UIDeviceOrientationPortrait;
+            [self updateLocalPreviewLayout];
+        }        
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKCallViewController.xib b/Riot/Modules/MatrixKit/Controllers/MXKCallViewController.xib
new file mode 100644
index 000000000..52d4fc0ed
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKCallViewController.xib
@@ -0,0 +1,423 @@
+<?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" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MXKCallViewController">
+            <connections>
+                <outlet property="answerCallButton" destination="0DL-0m-uZo" id="iYW-vl-A5W"/>
+                <outlet property="audioMuteButton" destination="fxP-zM-kfT" id="J6M-is-5me"/>
+                <outlet property="backToAppButton" destination="nff-fB-sTq" id="UEn-bg-xuA"/>
+                <outlet property="backgroundImageView" destination="v1I-LH-wvv" id="HvS-WI-vnb"/>
+                <outlet property="callContainerView" destination="W2P-Hy-nV2" id="b0q-Lj-daE"/>
+                <outlet property="callControlContainerView" destination="nk9-Un-LVP" id="ZV3-qr-BtW"/>
+                <outlet property="callStatusLabel" destination="29y-MK-OWH" id="Kcn-MX-MUH"/>
+                <outlet property="callToolBar" destination="4h9-hF-BH8" id="2JU-Od-PBy"/>
+                <outlet property="callerImageView" destination="ImL-3N-2CJ" id="nkr-M1-2Be"/>
+                <outlet property="callerNameLabel" destination="IW8-8P-mS3" id="eaa-oo-l01"/>
+                <outlet property="endCallButton" destination="lVK-d8-Dqf" id="zgE-Go-bo6"/>
+                <outlet property="localPreviewActivityView" destination="Bhz-hS-5B6" id="2yA-xn-ITf"/>
+                <outlet property="localPreviewContainerView" destination="6gQ-zo-2Zw" id="6Ba-YZ-OmX"/>
+                <outlet property="localPreviewContainerViewHeightConstraint" destination="dZW-ZL-5rV" id="0qv-ne-6vn"/>
+                <outlet property="localPreviewContainerViewLeadingConstraint" destination="3Fs-0f-Aws" id="s4D-aK-1qx"/>
+                <outlet property="localPreviewContainerViewTopConstraint" destination="3kN-Qi-Klq" id="zT0-lf-noP"/>
+                <outlet property="localPreviewContainerViewWidthConstraint" destination="gyu-kv-SLy" id="h6P-sv-f69"/>
+                <outlet property="localPreviewVideoView" destination="Y9q-YD-ke6" id="X9G-e6-lDE"/>
+                <outlet property="moreButtonForVideo" destination="XCC-Xd-83F" id="exV-fE-Fcs"/>
+                <outlet property="moreButtonForVoice" destination="gp0-z0-MpD" id="Ksf-ku-aCv"/>
+                <outlet property="onHoldCallContainerView" destination="gYL-ur-SUZ" id="sWc-c5-84F"/>
+                <outlet property="overlayContainerView" destination="JAR-tn-sGN" id="09u-3G-1UA"/>
+                <outlet property="rejectCallButton" destination="cst-tR-uHV" id="Ust-PL-R6A"/>
+                <outlet property="remotePreviewContainerView" destination="Tjb-57-yB1" id="MaR-IC-ZKw"/>
+                <outlet property="resumeButton" destination="LXK-mz-xQl" id="FkJ-Ix-NuL"/>
+                <outlet property="speakerButton" destination="UHM-u9-ODN" id="PFN-R6-3b3"/>
+                <outlet property="transferButton" destination="WDH-nE-sZ3" id="ema-6K-xPO"/>
+                <outlet property="videoMuteButton" destination="QWZ-Xg-1VM" id="kbc-Ut-yse"/>
+                <outlet property="view" destination="iN0-l3-epB" id="JDF-cz-roW"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="v1I-LH-wvv" userLabel="Background Image View" customClass="MXKImageView">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                    <color key="backgroundColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                </view>
+                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Tjb-57-yB1" userLabel="Remote Preview Container View">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                    <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                </view>
+                <view hidden="YES" opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6gQ-zo-2Zw" userLabel="Local Preview Container View">
+                    <rect key="frame" x="20" y="20" width="100" height="120"/>
+                    <subviews>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Y9q-YD-ke6" userLabel="Local Preview Video View">
+                            <rect key="frame" x="0.0" y="0.0" width="100" height="120"/>
+                            <color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        </view>
+                        <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" hidesWhenStopped="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="Bhz-hS-5B6">
+                            <rect key="frame" x="31.5" y="41.5" width="37" height="37"/>
+                        </activityIndicatorView>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <accessibility key="accessibilityConfiguration">
+                        <accessibilityTraits key="traits" notEnabled="YES"/>
+                    </accessibility>
+                    <constraints>
+                        <constraint firstAttribute="trailing" secondItem="Y9q-YD-ke6" secondAttribute="trailing" id="Vmf-vR-uO0"/>
+                        <constraint firstAttribute="bottom" secondItem="Y9q-YD-ke6" secondAttribute="bottom" id="XkV-Gc-mGJ"/>
+                        <constraint firstItem="Bhz-hS-5B6" firstAttribute="centerY" secondItem="6gQ-zo-2Zw" secondAttribute="centerY" id="dBH-9m-51R"/>
+                        <constraint firstAttribute="height" constant="120" id="dZW-ZL-5rV"/>
+                        <constraint firstAttribute="width" constant="100" id="gyu-kv-SLy"/>
+                        <constraint firstItem="Y9q-YD-ke6" firstAttribute="leading" secondItem="6gQ-zo-2Zw" secondAttribute="leading" id="n2F-7p-0NR"/>
+                        <constraint firstItem="Bhz-hS-5B6" firstAttribute="centerX" secondItem="6gQ-zo-2Zw" secondAttribute="centerX" id="vRe-Km-hqC"/>
+                        <constraint firstItem="Y9q-YD-ke6" firstAttribute="top" secondItem="6gQ-zo-2Zw" secondAttribute="top" id="x3l-4B-yhP"/>
+                    </constraints>
+                </view>
+                <view hidden="YES" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gYL-ur-SUZ" userLabel="OnHold Call Container View">
+                    <rect key="frame" x="255" y="20" width="100" height="120"/>
+                    <subviews>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BnO-XU-rbO">
+                            <rect key="frame" x="0.0" y="0.0" width="100" height="120"/>
+                            <subviews>
+                                <view contentMode="scaleAspectFill" translatesAutoresizingMaskIntoConstraints="NO" id="Yi0-Kz-f8n" userLabel="Caller Image View" customClass="MXKImageView">
+                                    <rect key="frame" x="0.0" y="0.0" width="100" height="120"/>
+                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                </view>
+                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="call_paused_icon" translatesAutoresizingMaskIntoConstraints="NO" id="tDd-nl-o66">
+                                    <rect key="frame" x="40" y="50" width="20" height="20"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="20" id="4ZR-gY-TFU"/>
+                                        <constraint firstAttribute="height" constant="20" id="VOl-de-wx3"/>
+                                    </constraints>
+                                </imageView>
+                            </subviews>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <constraints>
+                                <constraint firstItem="tDd-nl-o66" firstAttribute="centerY" secondItem="BnO-XU-rbO" secondAttribute="centerY" id="0WW-DK-ikE"/>
+                                <constraint firstItem="Yi0-Kz-f8n" firstAttribute="top" secondItem="BnO-XU-rbO" secondAttribute="top" id="ATS-v3-un5"/>
+                                <constraint firstAttribute="trailing" secondItem="Yi0-Kz-f8n" secondAttribute="trailing" id="Ems-Vb-x8T"/>
+                                <constraint firstItem="tDd-nl-o66" firstAttribute="centerX" secondItem="BnO-XU-rbO" secondAttribute="centerX" id="KI3-Lj-zWM"/>
+                                <constraint firstAttribute="bottom" secondItem="Yi0-Kz-f8n" secondAttribute="bottom" id="u9w-k7-Tu4"/>
+                                <constraint firstItem="Yi0-Kz-f8n" firstAttribute="leading" secondItem="BnO-XU-rbO" secondAttribute="leading" id="yTR-nN-6l2"/>
+                            </constraints>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                    <accessibility key="accessibilityConfiguration">
+                        <accessibilityTraits key="traits" notEnabled="YES"/>
+                    </accessibility>
+                    <constraints>
+                        <constraint firstItem="BnO-XU-rbO" firstAttribute="leading" secondItem="gYL-ur-SUZ" secondAttribute="leading" id="2tc-aB-SHR"/>
+                        <constraint firstAttribute="width" constant="100" id="Wuk-6q-X0l"/>
+                        <constraint firstAttribute="trailing" secondItem="BnO-XU-rbO" secondAttribute="trailing" id="YIx-kL-fSQ"/>
+                        <constraint firstAttribute="height" constant="120" id="eQ5-RY-39A"/>
+                        <constraint firstAttribute="bottom" secondItem="BnO-XU-rbO" secondAttribute="bottom" id="rRV-2N-Wrr"/>
+                        <constraint firstItem="BnO-XU-rbO" firstAttribute="top" secondItem="gYL-ur-SUZ" secondAttribute="top" id="rlC-LI-TF2"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                            <integer key="value" value="8"/>
+                        </userDefinedRuntimeAttribute>
+                    </userDefinedRuntimeAttributes>
+                </view>
+                <view opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JAR-tn-sGN" userLabel="Overlay Container View">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                    <subviews>
+                        <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nff-fB-sTq" userLabel="BackToApp">
+                            <rect key="frame" x="20" y="5" width="40" height="28"/>
+                            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="28" id="U4K-iA-Ca2"/>
+                                <constraint firstAttribute="width" constant="40" id="yAh-Gb-GtB"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="13"/>
+                            <color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                            <inset key="titleEdgeInsets" minX="-69" minY="61" maxX="0.0" maxY="0.0"/>
+                            <state key="normal">
+                                <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            </state>
+                            <state key="highlighted">
+                                <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            </state>
+                            <connections>
+                                <action selector="onButtonPressed:" destination="-1" eventType="touchUpInside" id="yKw-Aj-XkE"/>
+                            </connections>
+                        </button>
+                        <view opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nk9-Un-LVP" userLabel="Call Control Container View">
+                            <rect key="frame" x="0.0" y="329" width="375" height="55"/>
+                            <subviews>
+                                <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fxP-zM-kfT" userLabel="Audio Mute Btn">
+                                    <rect key="frame" x="16" y="0.0" width="56" height="55"/>
+                                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="13"/>
+                                    <inset key="titleEdgeInsets" minX="-69" minY="61" maxX="0.0" maxY="0.0"/>
+                                    <state key="normal">
+                                        <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    </state>
+                                    <state key="highlighted">
+                                        <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    </state>
+                                    <connections>
+                                        <action selector="onButtonPressed:" destination="-1" eventType="touchUpInside" id="CgE-f8-nPS"/>
+                                    </connections>
+                                </button>
+                                <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QWZ-Xg-1VM" userLabel="Video Mute Btn">
+                                    <rect key="frame" x="88" y="0.0" width="55.5" height="55"/>
+                                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="13"/>
+                                    <inset key="titleEdgeInsets" minX="-69" minY="61" maxX="0.0" maxY="0.0"/>
+                                    <state key="normal">
+                                        <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    </state>
+                                    <state key="highlighted">
+                                        <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    </state>
+                                    <connections>
+                                        <action selector="onButtonPressed:" destination="-1" eventType="touchUpInside" id="yRT-8e-Sed"/>
+                                    </connections>
+                                </button>
+                                <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UHM-u9-ODN" userLabel="Speaker Btn">
+                                    <rect key="frame" x="159.5" y="0.0" width="56" height="55"/>
+                                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="13"/>
+                                    <inset key="contentEdgeInsets" minX="0.0" minY="0.0" maxX="4" maxY="0.0"/>
+                                    <inset key="titleEdgeInsets" minX="-74" minY="61" maxX="0.0" maxY="0.0"/>
+                                    <state key="normal">
+                                        <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    </state>
+                                    <state key="highlighted">
+                                        <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    </state>
+                                    <connections>
+                                        <action selector="onButtonPressed:" destination="-1" eventType="touchUpInside" id="9Jd-Wv-foD"/>
+                                    </connections>
+                                </button>
+                                <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XCC-Xd-83F" userLabel="More Btn Video">
+                                    <rect key="frame" x="231.5" y="0.0" width="55.5" height="55"/>
+                                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="13"/>
+                                    <inset key="titleEdgeInsets" minX="-69" minY="61" maxX="0.0" maxY="0.0"/>
+                                    <state key="normal">
+                                        <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    </state>
+                                    <state key="highlighted">
+                                        <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    </state>
+                                    <connections>
+                                        <action selector="onButtonPressed:" destination="-1" eventType="touchUpInside" id="eev-cq-bkD"/>
+                                    </connections>
+                                </button>
+                                <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gp0-z0-MpD" userLabel="More Btn Voice">
+                                    <rect key="frame" x="303" y="0.0" width="56" height="55"/>
+                                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="13"/>
+                                    <inset key="titleEdgeInsets" minX="-69" minY="61" maxX="0.0" maxY="0.0"/>
+                                    <state key="normal">
+                                        <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    </state>
+                                    <state key="highlighted">
+                                        <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    </state>
+                                    <connections>
+                                        <action selector="onButtonPressed:" destination="-1" eventType="touchUpInside" id="lJr-dI-K66"/>
+                                    </connections>
+                                </button>
+                            </subviews>
+                            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                            <constraints>
+                                <constraint firstItem="XCC-Xd-83F" firstAttribute="leading" secondItem="UHM-u9-ODN" secondAttribute="trailing" constant="16" id="4qI-5H-xme"/>
+                                <constraint firstItem="UHM-u9-ODN" firstAttribute="leading" secondItem="QWZ-Xg-1VM" secondAttribute="trailing" constant="16" id="4vU-TE-eHI"/>
+                                <constraint firstItem="gp0-z0-MpD" firstAttribute="width" secondItem="fxP-zM-kfT" secondAttribute="width" id="65z-cx-uPN"/>
+                                <constraint firstItem="gp0-z0-MpD" firstAttribute="top" secondItem="nk9-Un-LVP" secondAttribute="top" id="6Hn-cf-yrt"/>
+                                <constraint firstItem="UHM-u9-ODN" firstAttribute="top" secondItem="nk9-Un-LVP" secondAttribute="top" id="9WM-jp-uJ2"/>
+                                <constraint firstAttribute="bottom" secondItem="XCC-Xd-83F" secondAttribute="bottom" id="Mmc-f0-E3b"/>
+                                <constraint firstItem="UHM-u9-ODN" firstAttribute="width" secondItem="fxP-zM-kfT" secondAttribute="width" id="QT2-3D-Rea"/>
+                                <constraint firstAttribute="bottom" secondItem="fxP-zM-kfT" secondAttribute="bottom" id="Qly-U3-yZz"/>
+                                <constraint firstAttribute="trailing" secondItem="gp0-z0-MpD" secondAttribute="trailing" constant="16" id="QnE-37-ZsF"/>
+                                <constraint firstItem="QWZ-Xg-1VM" firstAttribute="leading" secondItem="fxP-zM-kfT" secondAttribute="trailing" constant="16" id="Tfa-tC-stW"/>
+                                <constraint firstItem="gp0-z0-MpD" firstAttribute="leading" secondItem="XCC-Xd-83F" secondAttribute="trailing" constant="16" id="VFm-PI-KyK"/>
+                                <constraint firstAttribute="bottom" secondItem="gp0-z0-MpD" secondAttribute="bottom" id="Y8l-mj-pQv"/>
+                                <constraint firstItem="XCC-Xd-83F" firstAttribute="top" secondItem="nk9-Un-LVP" secondAttribute="top" id="daf-rp-QYh"/>
+                                <constraint firstItem="XCC-Xd-83F" firstAttribute="width" secondItem="fxP-zM-kfT" secondAttribute="width" id="dfm-XQ-cI6"/>
+                                <constraint firstAttribute="height" constant="55" id="eS5-qj-HTc"/>
+                                <constraint firstAttribute="bottom" secondItem="UHM-u9-ODN" secondAttribute="bottom" id="g18-gQ-ckj"/>
+                                <constraint firstItem="QWZ-Xg-1VM" firstAttribute="top" secondItem="nk9-Un-LVP" secondAttribute="top" id="g1k-AA-jae"/>
+                                <constraint firstItem="QWZ-Xg-1VM" firstAttribute="width" secondItem="fxP-zM-kfT" secondAttribute="width" id="mrH-wc-BUa"/>
+                                <constraint firstItem="fxP-zM-kfT" firstAttribute="leading" secondItem="nk9-Un-LVP" secondAttribute="leading" constant="16" id="ukn-jV-42y"/>
+                                <constraint firstItem="fxP-zM-kfT" firstAttribute="top" secondItem="nk9-Un-LVP" secondAttribute="top" id="xKI-k3-zBC"/>
+                                <constraint firstAttribute="bottom" secondItem="QWZ-Xg-1VM" secondAttribute="bottom" id="ygd-qE-SAS"/>
+                            </constraints>
+                        </view>
+                        <view opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4h9-hF-BH8" userLabel="Call Bottom Bar View">
+                            <rect key="frame" x="0.0" y="594" width="375" height="58"/>
+                            <subviews>
+                                <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lVK-d8-Dqf" userLabel="End Call Button">
+                                    <rect key="frame" x="15" y="4" width="345" height="50"/>
+                                    <color key="backgroundColor" red="0.75051294189999995" green="0.0078581154179999998" blue="0.015402332100000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <state key="normal" title="End Call">
+                                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    </state>
+                                    <connections>
+                                        <action selector="onButtonPressed:" destination="-1" eventType="touchUpInside" id="ZTw-gz-mwM"/>
+                                    </connections>
+                                </button>
+                                <button contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="cst-tR-uHV" userLabel="Reject Call Button">
+                                    <rect key="frame" x="15" y="4" width="157.5" height="50"/>
+                                    <color key="backgroundColor" red="0.75051294191919193" green="0.0078581154183767592" blue="0.015402332100907003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                    <state key="normal" title="Reject Call">
+                                        <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    </state>
+                                    <state key="highlighted">
+                                        <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    </state>
+                                    <connections>
+                                        <action selector="onButtonPressed:" destination="-1" eventType="touchUpInside" id="njS-hU-ZzM"/>
+                                    </connections>
+                                </button>
+                                <button contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="0DL-0m-uZo" userLabel="Answer Call Button">
+                                    <rect key="frame" x="202.5" y="4" width="157.5" height="50"/>
+                                    <color key="backgroundColor" red="0.0" green="0.72547743055555558" blue="0.0041503219763194587" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                    <state key="normal" title="Answer Call">
+                                        <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    </state>
+                                    <state key="highlighted">
+                                        <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    </state>
+                                    <connections>
+                                        <action selector="onButtonPressed:" destination="-1" eventType="touchUpInside" id="gBy-fV-8DU"/>
+                                    </connections>
+                                </button>
+                            </subviews>
+                            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                            <constraints>
+                                <constraint firstAttribute="trailing" secondItem="0DL-0m-uZo" secondAttribute="trailing" constant="15" id="8eS-wa-FjD"/>
+                                <constraint firstItem="cst-tR-uHV" firstAttribute="top" secondItem="4h9-hF-BH8" secondAttribute="top" constant="4" id="8pa-OC-zyD"/>
+                                <constraint firstAttribute="trailing" secondItem="lVK-d8-Dqf" secondAttribute="trailing" constant="15" id="EBB-PZ-ed6"/>
+                                <constraint firstItem="0DL-0m-uZo" firstAttribute="top" secondItem="4h9-hF-BH8" secondAttribute="top" constant="4" id="RKq-zI-hBT"/>
+                                <constraint firstItem="0DL-0m-uZo" firstAttribute="width" secondItem="cst-tR-uHV" secondAttribute="width" id="TuN-vE-uBt"/>
+                                <constraint firstAttribute="bottom" secondItem="lVK-d8-Dqf" secondAttribute="bottom" constant="4" id="VQY-sr-2n1"/>
+                                <constraint firstItem="lVK-d8-Dqf" firstAttribute="top" secondItem="4h9-hF-BH8" secondAttribute="top" constant="4" id="YKN-2x-fGu"/>
+                                <constraint firstItem="lVK-d8-Dqf" firstAttribute="leading" secondItem="4h9-hF-BH8" secondAttribute="leading" constant="15" id="bIh-wJ-4Ax"/>
+                                <constraint firstAttribute="centerY" secondItem="cst-tR-uHV" secondAttribute="centerY" id="byx-9k-bCx"/>
+                                <constraint firstItem="0DL-0m-uZo" firstAttribute="leading" secondItem="cst-tR-uHV" secondAttribute="trailing" constant="30" id="hPu-76-1fr"/>
+                                <constraint firstItem="cst-tR-uHV" firstAttribute="leading" secondItem="4h9-hF-BH8" secondAttribute="leading" constant="15" id="vUc-cr-gcl"/>
+                                <constraint firstAttribute="height" constant="58" id="wE4-9n-mDx"/>
+                                <constraint firstAttribute="centerY" secondItem="0DL-0m-uZo" secondAttribute="centerY" id="ydY-us-83K"/>
+                            </constraints>
+                        </view>
+                        <view opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="W2P-Hy-nV2" userLabel="Call Container View">
+                            <rect key="frame" x="0.0" y="40" width="375" height="259"/>
+                            <subviews>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ImL-3N-2CJ" userLabel="Caller Image View" customClass="MXKImageView">
+                                    <rect key="frame" x="135.5" y="25" width="104" height="104"/>
+                                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="104" id="QfH-Wv-g9v"/>
+                                        <constraint firstAttribute="width" constant="104" id="vTq-Bb-ooO"/>
+                                    </constraints>
+                                </view>
+                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" text="Name" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="IW8-8P-mS3" userLabel="Caller Name Label">
+                                    <rect key="frame" x="0.0" y="134" width="375" height="32"/>
+                                    <fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="27"/>
+                                    <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" text="-" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="29y-MK-OWH" userLabel="Call Status Label">
+                                    <rect key="frame" x="0.0" y="171" width="375" height="15"/>
+                                    <fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="13"/>
+                                    <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LXK-mz-xQl">
+                                    <rect key="frame" x="160" y="191" width="55" height="30"/>
+                                    <state key="normal" title="Resume"/>
+                                    <connections>
+                                        <action selector="onButtonPressed:" destination="-1" eventType="touchUpInside" id="Ibj-GN-9lW"/>
+                                    </connections>
+                                </button>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WDH-nE-sZ3" userLabel="Transfer">
+                                    <rect key="frame" x="159" y="229" width="57" height="30"/>
+                                    <state key="normal" title="Transfer"/>
+                                    <connections>
+                                        <action selector="onButtonPressed:" destination="-1" eventType="touchUpInside" id="ZXg-sM-pdt"/>
+                                    </connections>
+                                </button>
+                            </subviews>
+                            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                            <constraints>
+                                <constraint firstItem="LXK-mz-xQl" firstAttribute="top" secondItem="29y-MK-OWH" secondAttribute="bottom" constant="5" id="4o3-Dw-noW"/>
+                                <constraint firstItem="WDH-nE-sZ3" firstAttribute="top" secondItem="LXK-mz-xQl" secondAttribute="bottom" constant="8" id="DB6-wD-Btp"/>
+                                <constraint firstItem="WDH-nE-sZ3" firstAttribute="centerX" secondItem="W2P-Hy-nV2" secondAttribute="centerX" id="IvV-zm-1J1"/>
+                                <constraint firstItem="ImL-3N-2CJ" firstAttribute="top" secondItem="W2P-Hy-nV2" secondAttribute="top" constant="25" id="LYw-15-z57"/>
+                                <constraint firstAttribute="trailing" secondItem="IW8-8P-mS3" secondAttribute="trailing" id="PsD-gD-a0S"/>
+                                <constraint firstAttribute="trailing" secondItem="29y-MK-OWH" secondAttribute="trailing" id="Uo1-tj-IFA"/>
+                                <constraint firstAttribute="centerX" secondItem="ImL-3N-2CJ" secondAttribute="centerX" id="XTc-Dz-fC7"/>
+                                <constraint firstAttribute="height" constant="259" id="ZLw-UO-oa4"/>
+                                <constraint firstItem="29y-MK-OWH" firstAttribute="top" secondItem="IW8-8P-mS3" secondAttribute="bottom" constant="5" id="af8-pz-JKx"/>
+                                <constraint firstItem="IW8-8P-mS3" firstAttribute="top" secondItem="ImL-3N-2CJ" secondAttribute="bottom" constant="5" id="b1K-8G-BZc"/>
+                                <constraint firstItem="29y-MK-OWH" firstAttribute="leading" secondItem="W2P-Hy-nV2" secondAttribute="leading" id="cOy-mL-qOS"/>
+                                <constraint firstItem="LXK-mz-xQl" firstAttribute="centerX" secondItem="W2P-Hy-nV2" secondAttribute="centerX" id="ftJ-ZG-ZFw"/>
+                                <constraint firstItem="IW8-8P-mS3" firstAttribute="leading" secondItem="W2P-Hy-nV2" secondAttribute="leading" id="peb-77-Gi5"/>
+                            </constraints>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                    <constraints>
+                        <constraint firstItem="nk9-Un-LVP" firstAttribute="leading" secondItem="JAR-tn-sGN" secondAttribute="leading" id="9wq-Y2-kZa"/>
+                        <constraint firstItem="nff-fB-sTq" firstAttribute="top" secondItem="JAR-tn-sGN" secondAttribute="top" constant="5" id="C4F-59-09O"/>
+                        <constraint firstItem="W2P-Hy-nV2" firstAttribute="leading" secondItem="JAR-tn-sGN" secondAttribute="leading" id="Dow-OM-vNZ"/>
+                        <constraint firstItem="4h9-hF-BH8" firstAttribute="leading" secondItem="JAR-tn-sGN" secondAttribute="leading" id="Foo-x4-bMq"/>
+                        <constraint firstItem="nk9-Un-LVP" firstAttribute="top" secondItem="W2P-Hy-nV2" secondAttribute="bottom" constant="30" id="NRK-rN-4S3"/>
+                        <constraint firstAttribute="trailing" secondItem="W2P-Hy-nV2" secondAttribute="trailing" id="hPw-CT-hcl"/>
+                        <constraint firstAttribute="trailing" secondItem="4h9-hF-BH8" secondAttribute="trailing" id="hi7-v3-bw5"/>
+                        <constraint firstAttribute="bottom" secondItem="4h9-hF-BH8" secondAttribute="bottom" constant="15" id="hkd-BJ-xRf"/>
+                        <constraint firstItem="nff-fB-sTq" firstAttribute="leading" secondItem="JAR-tn-sGN" secondAttribute="leading" constant="20" id="ubP-7v-uDn"/>
+                        <constraint firstAttribute="trailing" secondItem="nk9-Un-LVP" secondAttribute="trailing" id="yES-yI-i3m"/>
+                        <constraint firstItem="W2P-Hy-nV2" firstAttribute="top" secondItem="JAR-tn-sGN" secondAttribute="top" constant="40" id="yj4-Vr-mIA"/>
+                    </constraints>
+                </view>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="gYL-ur-SUZ" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="20" id="2Vf-YX-syR"/>
+                <constraint firstItem="6gQ-zo-2Zw" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" id="3Fs-0f-Aws"/>
+                <constraint firstItem="6gQ-zo-2Zw" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="20" id="3kN-Qi-Klq"/>
+                <constraint firstAttribute="trailing" secondItem="JAR-tn-sGN" secondAttribute="trailing" id="IGf-YS-JEj"/>
+                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="6gQ-zo-2Zw" secondAttribute="trailing" id="IZd-Uv-ucs"/>
+                <constraint firstAttribute="bottom" secondItem="JAR-tn-sGN" secondAttribute="bottom" id="KDu-Kr-vji"/>
+                <constraint firstAttribute="trailing" secondItem="gYL-ur-SUZ" secondAttribute="trailing" constant="20" id="TbF-td-23k"/>
+                <constraint firstItem="v1I-LH-wvv" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="VF9-js-1ub"/>
+                <constraint firstItem="JAR-tn-sGN" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Z6W-gz-KKT"/>
+                <constraint firstItem="Tjb-57-yB1" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="aKy-Ol-bhc"/>
+                <constraint firstAttribute="bottom" secondItem="Tjb-57-yB1" secondAttribute="bottom" id="akt-pO-kWM"/>
+                <constraint firstItem="v1I-LH-wvv" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="cq1-0k-TFN"/>
+                <constraint firstAttribute="trailing" secondItem="v1I-LH-wvv" secondAttribute="trailing" id="eL2-a4-lJd"/>
+                <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="6gQ-zo-2Zw" secondAttribute="bottom" id="hS1-8y-3t8"/>
+                <constraint firstItem="Tjb-57-yB1" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="mW3-RA-hx2"/>
+                <constraint firstAttribute="bottom" secondItem="v1I-LH-wvv" secondAttribute="bottom" id="o10-x3-vgo"/>
+                <constraint firstItem="JAR-tn-sGN" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="pei-Ab-VHX"/>
+                <constraint firstAttribute="trailing" secondItem="Tjb-57-yB1" secondAttribute="trailing" id="rXn-dm-69F"/>
+            </constraints>
+            <point key="canvasLocation" x="-215.19999999999999" y="129.98500749625188"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="call_paused_icon" width="24" height="24"/>
+    </resources>
+</document>
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKContactDetailsViewController.h b/Riot/Modules/MatrixKit/Controllers/MXKContactDetailsViewController.h
new file mode 100644
index 000000000..417f586a7
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKContactDetailsViewController.h
@@ -0,0 +1,90 @@
+/*
+ Copyright 2015 OpenMarket 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/UIKit.h>
+
+#import "MXKTableViewController.h"
+
+#import "MXKContact.h"
+
+@class MXKContactDetailsViewController;
+
+/**
+ `MXKContactDetailsViewController` delegate.
+ */
+@protocol MXKContactDetailsViewControllerDelegate <NSObject>
+
+/**
+ Tells the delegate that the user wants to start chat with the contact by using the selected matrix id.
+ 
+ @param contactDetailsViewController the `MXKContactDetailsViewController` instance.
+ @param matrixId the selected matrix id of the contact.
+ @param completion the block to execute at the end of the operation (independently if it succeeded or not).
+ */
+- (void)contactDetailsViewController:(MXKContactDetailsViewController *)contactDetailsViewController startChatWithMatrixId:(NSString*)matrixId completion:(void (^)(void))completion;
+
+@end
+
+@interface MXKContactDetailsViewController : MXKTableViewController
+
+@property (weak, nonatomic) IBOutlet UIButton *contactThumbnail;
+@property (weak, nonatomic) IBOutlet UITextView *contactDisplayName;
+
+/**
+ The default account picture displayed when no picture is defined.
+ */
+@property (nonatomic) UIImage *picturePlaceholder;
+
+/**
+ The displayed contact
+ */
+@property (strong, nonatomic) MXKContact* contact;
+
+/**
+ The delegate for the view controller.
+ */
+@property (nonatomic, weak) id<MXKContactDetailsViewControllerDelegate> delegate;
+
+#pragma mark - Class methods
+
+/**
+ Returns the `UINib` object initialized for a `MXKContactDetailsViewController`.
+ 
+ @return The initialized `UINib` object or `nil` if there were errors during initialization
+ or the nib file could not be located.
+ 
+ @discussion You may override this method to provide a customized nib. If you do,
+ you should also override `contactDetailsViewController` to return your
+ view controller loaded from your custom nib.
+ */
++ (UINib *)nib;
+
+/**
+ Creates and returns a new `MXKContactDetailsViewController` object.
+ 
+ @discussion This is the designated initializer for programmatic instantiation.
+ @return An initialized `MXKContactDetailsViewController` object if successful, `nil` otherwise.
+ */
++ (instancetype)contactDetailsViewController;
+
+/**
+ The contact's thumbnail is displayed inside a button. The following action is registered on
+ `UIControlEventTouchUpInside` event of this button.
+ */
+- (IBAction)onContactThumbnailPressed:(id)sender;
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKContactDetailsViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKContactDetailsViewController.m
new file mode 100644
index 000000000..6f181b059
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKContactDetailsViewController.m
@@ -0,0 +1,207 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKContactDetailsViewController.h"
+
+#import "MXKTableViewCellWithLabelAndButton.h"
+
+#import "NSBundle+MatrixKit.h"
+#import "MXKSwiftHeader.h"
+
+@interface MXKContactDetailsViewController ()
+{
+    NSArray* matrixIDs;
+}
+
+@end
+
+@implementation MXKContactDetailsViewController
+
++ (UINib *)nib
+{
+    return [UINib nibWithNibName:NSStringFromClass([MXKContactDetailsViewController class])
+                          bundle:[NSBundle bundleForClass:[MXKContactDetailsViewController class]]];
+}
+
++ (instancetype)contactDetailsViewController
+{
+    return [[[self class] alloc] initWithNibName:NSStringFromClass([MXKContactDetailsViewController class])
+                                          bundle:[NSBundle bundleForClass:[MXKContactDetailsViewController class]]];
+}
+
+- (void)finalizeInit
+{
+    [super finalizeInit];
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    // Check whether the view controller has been pushed via storyboard
+    if (!_contactThumbnail)
+    {
+        // Instantiate view controller objects
+        [[[self class] nib] instantiateWithOwner:self options:nil];
+    }
+    
+    [self updatePictureButton:self.picturePlaceholder];
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onThumbnailUpdate:) name:kMXKContactThumbnailUpdateNotification object:nil];
+    
+    // Force refresh
+    self.contact = _contact;
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (void)destroy
+{
+    matrixIDs = nil;
+    
+    self.delegate = nil;
+    
+    [super destroy];
+}
+
+#pragma mark -
+
+- (void)setContact:(MXKContact *)contact
+{
+    _contact = contact;
+    
+    self.contactDisplayName.text = _contact.displayName;
+    
+    // set the thumbnail info
+    [self.contactThumbnail.imageView setContentMode: UIViewContentModeScaleAspectFill];
+    [self.contactThumbnail.imageView setClipsToBounds:YES];
+    
+    if (_contact.thumbnail)
+    {
+        [self updatePictureButton:_contact.thumbnail];
+    }
+    else
+    {
+        [self updatePictureButton:self.picturePlaceholder];
+    }
+}
+
+- (UIImage*)picturePlaceholder
+{
+    return [NSBundle mxk_imageFromMXKAssetsBundleWithName:@"default-profile"];
+}
+
+- (IBAction)onContactThumbnailPressed:(id)sender
+{
+    // Do nothing by default
+}
+
+#pragma mark - UITableView datasource
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+    return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    matrixIDs = _contact.matrixIdentifiers;
+    return matrixIDs.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    NSInteger row = indexPath.row;
+    
+    MXKTableViewCellWithLabelAndButton *cell = [tableView dequeueReusableCellWithIdentifier:[MXKTableViewCellWithLabelAndButton defaultReuseIdentifier]];
+    if (!cell)
+    {
+        cell = [[MXKTableViewCellWithLabelAndButton alloc] init];
+    }
+    
+    if (row < matrixIDs.count)
+    {
+        cell.mxkLabel.text = [matrixIDs objectAtIndex:row];
+    }
+    else
+    {
+        // should never happen
+        cell.mxkLabel.text = @"";
+    }
+    
+    [cell.mxkButton setTitle:[MatrixKitL10n startChat] forState:UIControlStateNormal];
+    [cell.mxkButton setTitle:[MatrixKitL10n startChat] forState:UIControlStateHighlighted];
+    cell.mxkButton.tag = row;
+    [cell.mxkButton addTarget:self action:@selector(startChat:) forControlEvents:UIControlEventTouchUpInside];
+    
+    return cell;
+}
+
+#pragma mark - Internals
+
+- (void)updatePictureButton:(UIImage*)image
+{
+    [self.contactThumbnail setImage:image forState:UIControlStateNormal];
+    [self.contactThumbnail setImage:image forState:UIControlStateHighlighted];
+    [self.contactThumbnail setImage:image forState:UIControlStateDisabled];
+}
+
+- (void)startChat:(UIButton*)sender
+{
+    if (self.delegate && sender.tag < matrixIDs.count)
+    {
+        sender.enabled = NO;
+        
+        [self.delegate contactDetailsViewController:self startChatWithMatrixId:[matrixIDs objectAtIndex:sender.tag] completion:^{
+            
+            sender.enabled = YES;
+            
+        }];
+    }
+}
+
+- (void)onThumbnailUpdate:(NSNotification *)notif
+{
+    // sanity check
+    if ([notif.object isKindOfClass:[NSString class]])
+    {
+        NSString* contactID = notif.object;
+        
+        if ([contactID isEqualToString:self.contact.contactID])
+        {
+            if (_contact.thumbnail)
+            {
+                [self updatePictureButton:_contact.thumbnail];
+            }
+            else
+            {
+                [self updatePictureButton:self.picturePlaceholder];
+            }
+        }
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKContactDetailsViewController.xib b/Riot/Modules/MatrixKit/Controllers/MXKContactDetailsViewController.xib
new file mode 100644
index 000000000..d202e2856
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKContactDetailsViewController.xib
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MXKContactDetailsViewController">
+            <connections>
+                <outlet property="contactDisplayName" destination="j7K-fD-zCi" id="YCz-xN-r7s"/>
+                <outlet property="contactThumbnail" destination="Q5C-z0-PFC" id="fmX-T6-ees"/>
+                <outlet property="view" destination="ju7-p5-cp4" id="1a8-31-bad"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" style="plain" separatorStyle="none" allowsSelection="NO" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="ju7-p5-cp4">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <view key="tableHeaderView" contentMode="scaleToFill" id="gTa-z3-gJI" userLabel="TableHeader">
+                <rect key="frame" x="0.0" y="0.0" width="375" height="115"/>
+                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <subviews>
+                    <button opaque="NO" clipsSubviews="YES" contentMode="scaleAspectFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Q5C-z0-PFC" userLabel="contact picture Button">
+                        <rect key="frame" x="10" y="10" width="75" height="75"/>
+                        <color key="backgroundColor" red="0.89720267057418823" green="0.89720267057418823" blue="0.89720267057418823" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="75" id="h4a-sn-FGX"/>
+                            <constraint firstAttribute="height" constant="75" id="u5z-VM-exL"/>
+                        </constraints>
+                        <state key="normal">
+                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </state>
+                        <connections>
+                            <action selector="onContactThumbnailPressed:" destination="-1" eventType="touchUpInside" id="7Xc-a3-N46"/>
+                        </connections>
+                    </button>
+                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" bounces="NO" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" editable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j7K-fD-zCi" userLabel="contact displayName">
+                        <rect key="frame" x="95" y="10" width="270" height="95"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
+                        <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                        <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                    </textView>
+                </subviews>
+                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                <constraints>
+                    <constraint firstItem="Q5C-z0-PFC" firstAttribute="leading" secondItem="gTa-z3-gJI" secondAttribute="leading" constant="10" id="SBo-aU-k5D"/>
+                    <constraint firstItem="j7K-fD-zCi" firstAttribute="leading" secondItem="Q5C-z0-PFC" secondAttribute="trailing" constant="10" id="Tyv-6p-V4Q"/>
+                    <constraint firstAttribute="trailing" secondItem="j7K-fD-zCi" secondAttribute="trailing" constant="10" id="Uc5-Z1-ISb"/>
+                    <constraint firstAttribute="bottom" secondItem="j7K-fD-zCi" secondAttribute="bottom" constant="10" id="WPd-8P-yk2"/>
+                    <constraint firstItem="Q5C-z0-PFC" firstAttribute="top" secondItem="gTa-z3-gJI" secondAttribute="top" constant="10" id="mdK-nI-1Z6"/>
+                    <constraint firstItem="j7K-fD-zCi" firstAttribute="top" secondItem="gTa-z3-gJI" secondAttribute="top" constant="10" id="r1j-GD-Wko"/>
+                </constraints>
+            </view>
+            <connections>
+                <outlet property="dataSource" destination="-1" id="KAH-DP-g22"/>
+                <outlet property="delegate" destination="-1" id="Uz1-g8-Ykk"/>
+            </connections>
+        </tableView>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKContactListViewController.h b/Riot/Modules/MatrixKit/Controllers/MXKContactListViewController.h
new file mode 100644
index 000000000..e516aa15d
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKContactListViewController.h
@@ -0,0 +1,122 @@
+/*
+ Copyright 2015 OpenMarket 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 <MatrixSDK/MatrixSDK.h>
+
+#import "MXKTableViewController.h"
+
+#import "MXKContactManager.h"
+#import "MXKContact.h"
+#import "MXKContactTableCell.h"
+
+@class MXKContactListViewController;
+
+/**
+ `MXKContactListViewController` delegate.
+ */
+@protocol MXKContactListViewControllerDelegate <NSObject>
+
+/**
+ Tells the delegate that the user selected a contact.
+ 
+ @param contactListViewController the `MXKContactListViewController` instance.
+ @param contactId the id of the selected contact.
+ */
+- (void)contactListViewController:(MXKContactListViewController *)contactListViewController didSelectContact:(NSString*)contactId;
+
+/**
+ Tells the delegate that the user tapped a contact thumbnail.
+ 
+ @param contactListViewController the `MXKContactListViewController` instance.
+ @param contactId the id of the tapped contact.
+ */
+- (void)contactListViewController:(MXKContactListViewController *)contactListViewController didTapContactThumbnail:(NSString*)contactId;
+
+@end
+
+/**
+ 'MXKContactListViewController' instance displays constact list.
+ This view controller support multi sessions by collecting all matrix users (only one occurrence is kept by user).
+ */
+@interface MXKContactListViewController : MXKTableViewController <UINavigationControllerDelegate, UISearchBarDelegate, UIGestureRecognizerDelegate, MXKCellRenderingDelegate>
+
+/**
+ The segmented control used to handle separatly matrix users and local contacts.
+ User's actions are handled by [MXKContactListViewController onSegmentValueChange:].
+ */
+@property (weak, nonatomic) IBOutlet UISegmentedControl* contactsControls;
+
+/**
+ The delegate for the view controller.
+ */
+@property (nonatomic, weak) id<MXKContactListViewControllerDelegate> delegate;
+
+/**
+ Enable the search option by adding a navigation item in the navigation bar (YES by default).
+ Set NO this property to disable this option and hide the related bar button.
+ */
+@property (nonatomic) BOOL enableBarButtonSearch;
+
+/**
+ Tell whether an action is already in progress.
+ */
+@property (nonatomic, readonly) BOOL hasPendingAction;
+
+/**
+ The class used in creating new contact table cells.
+ Only MXKContactTableCell classes or sub-classes are accepted.
+ */
+@property (nonatomic) Class contactTableViewCellClass;
+
+#pragma mark - Class methods
+
+/**
+ Returns the `UINib` object initialized for a `MXKContactListViewController`.
+ 
+ @return The initialized `UINib` object or `nil` if there were errors during initialization
+ or the nib file could not be located.
+ 
+ @discussion You may override this method to provide a customized nib. If you do,
+ you should also override `contactListViewController` to return your
+ view controller loaded from your custom nib.
+ */
++ (UINib *)nib;
+
+/**
+ Creates and returns a new `MXKContactListViewController` object.
+ 
+ @discussion This is the designated initializer for programmatic instantiation.
+ @return An initialized `MXKContactListViewController` object if successful, `nil` otherwise.
+ */
++ (instancetype)contactListViewController;
+
+/**
+ The action registered on 'value changed' event of the 'UISegmentedControl' contactControls.
+ */
+- (IBAction)onSegmentValueChange:(id)sender;
+
+/**
+ Add a mask in overlay to prevent a new contact selection (used when an action is on progress).
+ */
+- (void)addPendingActionMask;
+
+/**
+ Remove the potential overlay mask 
+ */
+- (void)removePendingActionMask;
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKContactListViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKContactListViewController.m
new file mode 100644
index 000000000..6bcb30b42
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKContactListViewController.m
@@ -0,0 +1,663 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKContactListViewController.h"
+
+#import "MXKSectionedContacts.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKSwiftHeader.h"
+
+@interface MXKContactListViewController ()
+{
+    // YES -> only matrix users
+    // NO -> display local contacts
+    BOOL displayMatrixUsers;
+    
+    // screenshot of the local contacts
+    NSArray* localContactsArray;
+    MXKSectionedContacts* sectionedLocalContacts;
+    
+    // screenshot of the matrix users
+    NSArray* matrixContactsArray;
+    MXKSectionedContacts* sectionedMatrixContacts;
+    
+    // Search
+    UIBarButtonItem *searchButton;
+    UISearchBar     *contactsSearchBar;
+    NSMutableArray  *filteredContacts;
+    MXKSectionedContacts* sectionedFilteredContacts;
+    BOOL             searchBarShouldEndEditing;
+    BOOL             ignoreSearchRequest;
+    NSString* latestSearchedPattern;
+    
+    NSArray* collationTitles;
+    
+    // mask view while processing a request
+    UIActivityIndicatorView * pendingMaskSpinnerView;
+}
+
+@end
+
+@implementation MXKContactListViewController
+
+#pragma mark - Class methods
+
++ (UINib *)nib
+{
+    return [UINib nibWithNibName:NSStringFromClass([MXKContactListViewController class])
+                          bundle:[NSBundle bundleForClass:[MXKContactListViewController class]]];
+}
+
++ (instancetype)contactListViewController
+{
+    return [[[self class] alloc] initWithNibName:NSStringFromClass([MXKContactListViewController class])
+                                          bundle:[NSBundle bundleForClass:[MXKContactListViewController class]]];
+}
+
+- (void)finalizeInit
+{
+    [super finalizeInit];
+    
+    _enableBarButtonSearch = YES;
+    
+    // get the system collation titles
+    collationTitles = [[UILocalizedIndexedCollation currentCollation] sectionTitles];
+}
+
+- (void)dealloc
+{
+    searchButton = nil;
+}
+
+- (void)destroy
+{
+    [self removePendingActionMask];
+    
+    [super destroy];
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    // Check whether the view controller has been pushed via storyboard
+    if (!_contactsControls)
+    {
+        // Instantiate view controller objects
+        [[[self class] nib] instantiateWithOwner:self options:nil];
+    }
+    
+    // global init
+    displayMatrixUsers = (0 == self.contactsControls.selectedSegmentIndex);
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onContactsRefresh:) name:kMXKContactManagerDidUpdateMatrixContactsNotification object:nil];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onContactsRefresh:) name:kMXKContactManagerDidUpdateLocalContactsNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onContactsRefresh:) name:kMXKContactManagerDidUpdateLocalContactMatrixIDsNotification object:nil];
+    
+    if (!_contactTableViewCellClass)
+    {
+        // Set default table view cell class
+        self.contactTableViewCellClass = [MXKContactTableCell class];
+    }
+    
+    // Localize string
+    [_contactsControls setTitle:[MatrixKitL10n contactMxUsers] forSegmentAtIndex:0];
+    [_contactsControls setTitle:[MatrixKitL10n contactLocalContacts] forSegmentAtIndex:1];
+    
+    // Apply search option in navigation bar
+    self.enableBarButtonSearch = _enableBarButtonSearch;
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    
+    // Restore search mechanism (if enabled)
+    ignoreSearchRequest = NO;
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    
+    // The user may still press search button whereas the view disappears
+    ignoreSearchRequest = YES;
+    
+    // Leave potential search session
+    if (contactsSearchBar)
+    {
+        [self searchBarCancelButtonClicked:contactsSearchBar];
+    }
+}
+
+- (void)scrollToTop
+{
+    // stop any scrolling effect
+    [UIView setAnimationsEnabled:NO];
+    // before scrolling to the tableview top
+    self.tableView.contentOffset = CGPointMake(-self.tableView.adjustedContentInset.left, -self.tableView.adjustedContentInset.top);
+    [UIView setAnimationsEnabled:YES];
+}
+
+#pragma mark -
+
+-(void)setContactTableViewCellClass:(Class)contactTableViewCellClass
+{
+    // Sanity check: accept only MXKContactTableCell classes or sub-classes
+    NSParameterAssert([contactTableViewCellClass isSubclassOfClass:MXKContactTableCell.class]);
+    
+    _contactTableViewCellClass = contactTableViewCellClass;
+    [self.tableView registerClass:contactTableViewCellClass forCellReuseIdentifier:[contactTableViewCellClass defaultReuseIdentifier]];
+}
+
+- (void)setEnableBarButtonSearch:(BOOL)enableBarButtonSearch
+{
+    _enableBarButtonSearch = enableBarButtonSearch;
+    
+    if (enableBarButtonSearch)
+    {
+        if (!searchButton)
+        {
+            searchButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSearch target:self action:@selector(search:)];
+        }
+        
+        // Add it in right bar items
+        NSArray *rightBarButtonItems = self.navigationItem.rightBarButtonItems;
+        self.navigationItem.rightBarButtonItems = rightBarButtonItems ? [rightBarButtonItems arrayByAddingObject:searchButton] : @[searchButton];
+    }
+    else
+    {
+        NSMutableArray *rightBarButtonItems = [NSMutableArray arrayWithArray: self.navigationItem.rightBarButtonItems];
+        [rightBarButtonItems removeObject:searchButton];
+        self.navigationItem.rightBarButtonItems = rightBarButtonItems;
+    }
+}
+
+#pragma mark - Internals
+
+- (void)updateSectionedLocalContacts:(BOOL)force
+{
+    [self stopActivityIndicator];
+    
+    MXKContactManager* sharedManager = [MXKContactManager sharedManager];
+    
+    if (force || !localContactsArray)
+    {
+        localContactsArray = sharedManager.localContacts;
+        sectionedLocalContacts = [sharedManager getSectionedContacts:localContactsArray];
+    }
+}
+
+- (void)updateSectionedMatrixContacts:(BOOL)force
+{
+    [self stopActivityIndicator];
+    
+    MXKContactManager* sharedManager = [MXKContactManager sharedManager];
+    
+    if (force || !matrixContactsArray)
+    {
+        matrixContactsArray = sharedManager.matrixContacts;
+        sectionedMatrixContacts = [sharedManager getSectionedContacts:matrixContactsArray];
+    }
+}
+
+- (BOOL)hasPendingAction
+{
+    return nil != pendingMaskSpinnerView;
+}
+
+- (void)addPendingActionMask
+{
+    // add a spinner above the tableview to avoid that the user tap on any other button
+    pendingMaskSpinnerView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
+    pendingMaskSpinnerView.backgroundColor = [UIColor colorWithRed:0.5 green:0.5 blue:0.5 alpha:0.5];
+    pendingMaskSpinnerView.frame = self.tableView.frame;
+    pendingMaskSpinnerView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleTopMargin;
+    
+    // append it
+    [self.tableView.superview addSubview:pendingMaskSpinnerView];
+    
+    // animate it
+    [pendingMaskSpinnerView startAnimating];
+}
+
+- (void)removePendingActionMask
+{
+    if (pendingMaskSpinnerView)
+    {
+        [pendingMaskSpinnerView removeFromSuperview];
+        pendingMaskSpinnerView = nil;
+        [self.tableView reloadData];
+    }
+}
+
+#pragma mark - UITableView dataSource
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+    NSInteger sectionNb;
+    
+    // search in progress
+    if (contactsSearchBar)
+    {
+        sectionNb = sectionedFilteredContacts.sectionedContacts.count;
+        if (!sectionNb)
+        {
+            // Keep at least one section to display the search bar
+            sectionNb = 1;
+        }
+    }
+    else if (displayMatrixUsers)
+    {
+        [self updateSectionedMatrixContacts:NO];
+        sectionNb = sectionedMatrixContacts.sectionedContacts.count;
+        
+    }
+    else
+    {
+        [self updateSectionedLocalContacts:NO];
+        sectionNb = sectionedLocalContacts.sectionedContacts.count;
+    }
+    
+    return sectionNb;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    MXKSectionedContacts* sectionedContacts = contactsSearchBar ? sectionedFilteredContacts : (displayMatrixUsers ? sectionedMatrixContacts : sectionedLocalContacts);
+    
+    if (section < sectionedContacts.sectionedContacts.count)
+    {
+        return [sectionedContacts.sectionedContacts[section] count];
+    }
+    return 0;
+}
+
+- (NSString *)tableView:(UITableView *)aTableView titleForHeaderInSection:(NSInteger)section
+{
+    if (contactsSearchBar)
+    {
+        // Hide section titles during search session
+        return nil;
+    }
+    
+    MXKSectionedContacts* sectionedContacts = displayMatrixUsers ? sectionedMatrixContacts : sectionedLocalContacts;
+    if (section < sectionedContacts.sectionTitles.count)
+    {
+        return (NSString*)[sectionedContacts.sectionTitles objectAtIndex:section];
+    }
+    
+    return nil;
+}
+
+- (NSArray *)sectionIndexTitlesForTableView:(UITableView *)aTableView
+{
+    // do not display the collation during a search
+    if (contactsSearchBar)
+    {
+        return nil;
+    }
+    
+    return [[UILocalizedIndexedCollation currentCollation] sectionIndexTitles];
+}
+
+- (NSInteger)tableView:(UITableView *)aTableView sectionForSectionIndexTitle:(NSString *)title atIndex:(NSInteger)index
+{
+    MXKSectionedContacts* sectionedContacts = displayMatrixUsers ? sectionedMatrixContacts : sectionedLocalContacts;
+    NSInteger section = [sectionedContacts.sectionTitles indexOfObject:title];
+    
+    // undefined title -> jump to the first valid non empty section
+    if (NSNotFound == section)
+    {
+        NSInteger systemCollationIndex = [collationTitles indexOfObject:title];
+        
+        // find in the system collation
+        if (NSNotFound != systemCollationIndex)
+        {
+            systemCollationIndex--;
+            
+            while ((systemCollationIndex >= 0) && (NSNotFound == section))
+            {
+                NSString* systemTitle = [collationTitles objectAtIndex:systemCollationIndex];
+                section = [sectionedContacts.sectionTitles indexOfObject:systemTitle];
+                systemCollationIndex--;
+            }
+        }
+    }
+    
+    return section;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    MXKContactTableCell* cell = [tableView dequeueReusableCellWithIdentifier:[_contactTableViewCellClass defaultReuseIdentifier] forIndexPath:indexPath];
+    cell.thumbnailDisplayBoxType = MXKTableViewCellDisplayBoxTypeCircle;
+    
+    MXKSectionedContacts* sectionedContacts = contactsSearchBar ? sectionedFilteredContacts : (displayMatrixUsers ? sectionedMatrixContacts : sectionedLocalContacts);
+    
+    MXKContact* contact = nil;
+    
+    if (indexPath.section < sectionedContacts.sectionedContacts.count)
+    {
+        NSArray *thisSection = [sectionedContacts.sectionedContacts objectAtIndex:indexPath.section];
+        
+        if (indexPath.row < thisSection.count)
+        {
+            contact = [thisSection objectAtIndex:indexPath.row];
+        }
+    }
+    
+    if (contact)
+    {
+        cell.contactAccessoryViewType = MXKContactTableCellAccessoryMatrixIcon;
+        [cell render:contact];
+        cell.delegate = self;
+    }
+    
+    return cell;
+}
+
+#pragma mark - UITableView delegate
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    MXKSectionedContacts* sectionedContacts = contactsSearchBar ? sectionedFilteredContacts : (displayMatrixUsers ? sectionedMatrixContacts : sectionedLocalContacts);
+    
+    MXKContact* contact = nil;
+    
+    if (indexPath.section < sectionedContacts.sectionedContacts.count)
+    {
+        NSArray *thisSection = [sectionedContacts.sectionedContacts objectAtIndex:indexPath.section];
+        
+        if (indexPath.row < thisSection.count)
+        {
+            contact = [thisSection objectAtIndex:indexPath.row];
+        }
+    }
+    
+    return [((Class<MXKCellRendering>)_contactTableViewCellClass) heightForCellData:contact withMaximumWidth:tableView.frame.size.width];
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
+{
+    // In case of search, the section titles are hidden and the search bar is displayed in first section header.
+    if (contactsSearchBar)
+    {
+        if (section == 0)
+        {
+            return contactsSearchBar.frame.size.height;
+        }
+        return 0;
+    }
+    
+    // Default section header height
+    return 22;
+}
+
+- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
+{
+    if (contactsSearchBar && section == 0)
+    {
+        return contactsSearchBar;
+    }
+    return nil;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    [tableView deselectRowAtIndexPath:indexPath animated:YES];
+    
+    MXKSectionedContacts* sectionedContacts = contactsSearchBar ? sectionedFilteredContacts : (displayMatrixUsers ? sectionedMatrixContacts : sectionedLocalContacts);
+    
+    MXKContact* contact = nil;
+    
+    if (indexPath.section < sectionedContacts.sectionedContacts.count)
+    {
+        NSArray *thisSection = [sectionedContacts.sectionedContacts objectAtIndex:indexPath.section];
+        
+        if (indexPath.row < thisSection.count)
+        {
+            contact = [thisSection objectAtIndex:indexPath.row];
+        }
+    }
+    
+    if (self.delegate) {
+        [self.delegate contactListViewController:self didSelectContact:contact.contactID];
+    }
+}
+
+- (void)tableView:(UITableView *)tableView didEndDisplayingCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath*)indexPath
+{
+    // Release here resources, and restore reusable cells
+    if ([cell respondsToSelector:@selector(didEndDisplay)])
+    {
+        [(id<MXKCellRendering>)cell didEndDisplay];
+    }
+}
+
+#pragma mark - Actions
+
+- (void)onContactsRefresh:(NSNotification *)notif
+{
+    if ([notif.name isEqualToString:kMXKContactManagerDidUpdateMatrixContactsNotification])
+    {
+        [self updateSectionedMatrixContacts:YES];
+    }
+    else if ([notif.name isEqualToString:kMXKContactManagerDidUpdateLocalContactsNotification])
+    {
+        [self updateSectionedLocalContacts:YES];
+    }
+    else //if ([notif.name isEqualToString:kMXKContactManagerDidUpdateLocalContactMatrixIDsNotification])
+    {
+        // Consider here only global notifications, ignore notifications related to a specific contact.
+        if (notif.object)
+        {
+            return;
+        }
+        
+        [self updateSectionedLocalContacts:YES];
+    }
+    
+    if (contactsSearchBar)
+    {
+        latestSearchedPattern = nil;
+        [self searchBar:contactsSearchBar textDidChange:contactsSearchBar.text];
+    }
+    else
+    {
+        [self.tableView reloadData];
+    }
+}
+
+- (IBAction)onSegmentValueChange:(id)sender
+{
+    if (sender == self.contactsControls)
+    {
+        displayMatrixUsers = (0 == self.contactsControls.selectedSegmentIndex);
+        
+        // Leave potential search session
+        if (contactsSearchBar)
+        {
+            [self searchBarCancelButtonClicked:contactsSearchBar];
+        }
+        
+        [self.tableView reloadData];
+    }
+}
+
+#pragma mark Search management
+
+- (void)search:(id)sender
+{
+    // The user may have pressed search button whereas the view controller was disappearing
+    if (ignoreSearchRequest)
+    {
+        return;
+    }
+    
+    if (!contactsSearchBar)
+    {
+        MXKSectionedContacts* sectionedContacts = displayMatrixUsers ? sectionedMatrixContacts : sectionedLocalContacts;
+        
+        // Check whether there are data in which search
+        if (sectionedContacts.sectionedContacts.count > 0)
+        {
+            // Create search bar
+            contactsSearchBar = [[UISearchBar alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, 44)];
+            contactsSearchBar.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+            contactsSearchBar.showsCancelButton = YES;
+            contactsSearchBar.returnKeyType = UIReturnKeyDone;
+            contactsSearchBar.delegate = self;
+            searchBarShouldEndEditing = NO;
+            
+            // init the table content
+            latestSearchedPattern = @"";
+            filteredContacts = [(displayMatrixUsers ? matrixContactsArray : localContactsArray) mutableCopy];
+            sectionedFilteredContacts = [[MXKContactManager sharedManager] getSectionedContacts:filteredContacts];
+            
+            [self.tableView reloadData];
+            
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [self->contactsSearchBar becomeFirstResponder];
+            });
+        }
+    }
+    else
+    {
+        [self searchBarCancelButtonClicked:contactsSearchBar];
+    }
+}
+
+#pragma mark - UISearchBarDelegate
+
+- (BOOL)searchBarShouldBeginEditing:(UISearchBar *)searchBar
+{
+    searchBarShouldEndEditing = NO;
+    return YES;
+}
+
+- (BOOL)searchBarShouldEndEditing:(UISearchBar *)searchBar
+{
+    return searchBarShouldEndEditing;
+}
+
+- (NSArray*)patternsFromText:(NSString*)text
+{
+    NSArray* items = [text componentsSeparatedByString:@" "];
+    
+    if (items.count <= 1)
+    {
+        return items;
+    }
+    
+    NSMutableArray* patterns = [[NSMutableArray alloc] init];
+    
+    for (NSString* item in items)
+    {
+        if (item.length > 0)
+        {
+            [patterns addObject:item];
+        }
+    }
+    
+    return patterns;
+}
+
+- (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText
+{
+    if ((contactsSearchBar == searchBar) && (![latestSearchedPattern isEqualToString:searchText]))
+    {
+        latestSearchedPattern = searchText;
+        
+        // contacts
+        NSArray* contacts = displayMatrixUsers ? matrixContactsArray : localContactsArray;
+        
+        // Update filtered list
+        if (searchText.length && contacts.count)
+        {
+            filteredContacts = [[NSMutableArray alloc] init];
+            
+            NSArray* patterns = [self patternsFromText:searchText];
+            for(MXKContact* contact in contacts)
+            {
+                if ([contact matchedWithPatterns:patterns])
+                {
+                    [filteredContacts addObject:contact];
+                }
+            }
+        }
+        else
+        {
+            filteredContacts = [contacts mutableCopy];
+        }
+        
+        sectionedFilteredContacts = [[MXKContactManager sharedManager] getSectionedContacts:filteredContacts];
+        
+        // Refresh display
+        [self.tableView reloadData];
+        [self scrollToTop];
+    }
+}
+
+- (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar
+{
+    if (contactsSearchBar == searchBar)
+    {
+        // "Done" key has been pressed
+        searchBarShouldEndEditing = YES;
+        [contactsSearchBar resignFirstResponder];
+    }
+}
+
+- (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar
+{
+    if (contactsSearchBar == searchBar)
+    {
+        // Leave search
+        searchBarShouldEndEditing = YES;
+        [contactsSearchBar resignFirstResponder];
+        [contactsSearchBar removeFromSuperview];
+        contactsSearchBar = nil;
+        filteredContacts = nil;
+        sectionedFilteredContacts = nil;
+        latestSearchedPattern = nil;
+        [self.tableView reloadData];
+        [self scrollToTop];
+    }
+}
+
+#pragma mark - MXKCellRendering delegate
+
+- (void)cell:(id<MXKCellRendering>)cell didRecognizeAction:(NSString*)actionIdentifier userInfo:(NSDictionary *)userInfo
+{
+    if ([actionIdentifier isEqualToString:kMXKContactCellTapOnThumbnailView])
+    { 
+        if (self.delegate) {
+            [self.delegate contactListViewController:self didTapContactThumbnail:userInfo[kMXKContactCellContactIdKey]];
+        }
+    }
+}
+
+- (BOOL)cell:(id<MXKCellRendering>)cell shouldDoAction:(NSString *)actionIdentifier userInfo:(NSDictionary *)userInfo defaultValue:(BOOL)defaultValue
+{
+    // No such action yet on contacts
+    return defaultValue;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKContactListViewController.xib b/Riot/Modules/MatrixKit/Controllers/MXKContactListViewController.xib
new file mode 100644
index 000000000..6d638f106
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKContactListViewController.xib
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MXKContactListViewController">
+            <connections>
+                <outlet property="contactsControls" destination="75L-rc-grT" id="ocP-jP-5yq"/>
+                <outlet property="view" destination="bSe-Sh-aQf" id="4es-L5-nel"/>
+            </connections>
+        </placeholder>
+        <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="bSe-Sh-aQf">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <view key="tableHeaderView" contentMode="scaleToFill" id="jGj-32-rtx">
+                <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <subviews>
+                    <segmentedControl opaque="NO" contentMode="scaleToFill" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="75L-rc-grT">
+                        <rect key="frame" x="82" y="8" width="211" height="29"/>
+                        <segments>
+                            <segment title="Matrix Users"/>
+                            <segment title="Local Contacts"/>
+                        </segments>
+                        <connections>
+                            <action selector="onSegmentValueChange:" destination="-1" eventType="valueChanged" id="hSC-ZI-SSu"/>
+                        </connections>
+                    </segmentedControl>
+                </subviews>
+                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                <constraints>
+                    <constraint firstItem="75L-rc-grT" firstAttribute="top" secondItem="jGj-32-rtx" secondAttribute="top" constant="8" id="KTm-E6-bIU"/>
+                    <constraint firstAttribute="centerX" secondItem="75L-rc-grT" secondAttribute="centerX" id="chL-eY-CYt"/>
+                </constraints>
+            </view>
+            <connections>
+                <outlet property="dataSource" destination="-1" id="nhc-tM-1py"/>
+                <outlet property="delegate" destination="-1" id="9uq-Pc-RpB"/>
+            </connections>
+        </tableView>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKCountryPickerViewController.h b/Riot/Modules/MatrixKit/Controllers/MXKCountryPickerViewController.h
new file mode 100644
index 000000000..83e92f2ae
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKCountryPickerViewController.h
@@ -0,0 +1,81 @@
+/*
+ Copyright 2017 Vector Creations 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 <MatrixSDK/MatrixSDK.h>
+
+#import "MXKTableViewController.h"
+
+@class MXKCountryPickerViewController;
+
+/**
+ `MXKCountryPickerViewController` delegate.
+ */
+@protocol MXKCountryPickerViewControllerDelegate <NSObject>
+
+/**
+ Tells the delegate that the user selected a country.
+ 
+ @param countryPickerViewController the `MXKCountryPickerViewController` instance.
+ @param isoCountryCode the ISO 3166-1 country code representation.
+ */
+- (void)countryPickerViewController:(MXKCountryPickerViewController*)countryPickerViewController didSelectCountry:(NSString*)isoCountryCode;
+
+@end
+
+/**
+ 'MXKCountryPickerViewController' instance displays the list of supported countries. 
+ */
+@interface MXKCountryPickerViewController : MXKTableViewController <UISearchResultsUpdating>
+
+/**
+The searchController used to manage search.
+*/
+@property (nonatomic, strong) UISearchController *searchController;
+
+/**
+ The delegate for the view controller.
+ */
+@property (nonatomic, weak) id<MXKCountryPickerViewControllerDelegate> delegate;
+
+#pragma mark - Class methods
+
+/**
+ Returns the `UINib` object initialized for a `MXKCountryPickerViewController`.
+ 
+ @return The initialized `UINib` object or `nil` if there were errors during initialization
+ or the nib file could not be located.
+ 
+ @discussion You may override this method to provide a customized nib. If you do,
+ you should also override `countryPickerViewController` to return your
+ view controller loaded from your custom nib.
+ */
++ (UINib *)nib;
+
+/**
+ Creates and returns a new `MXKCountryPickerViewController` object.
+ 
+ @discussion This is the designated initializer for programmatic instantiation.
+ @return An initialized `MXKCountryPickerViewController` object if successful, `nil` otherwise.
+ */
++ (instancetype)countryPickerViewController;
+
+/**
+ Show/Hide the international dialing code for each country (NO by default).
+ */
+@property (nonatomic) BOOL showCountryCallingCode;
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKCountryPickerViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKCountryPickerViewController.m
new file mode 100644
index 000000000..273046244
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKCountryPickerViewController.m
@@ -0,0 +1,299 @@
+/*
+ Copyright 2017 Vector Creations 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 "MXKCountryPickerViewController.h"
+
+@import libPhoneNumber_iOS;
+
+#import "NSBundle+MatrixKit.h"
+#import "MXKSwiftHeader.h"
+
+
+NSString* const kMXKCountryPickerViewControllerCountryCellId = @"kMXKCountryPickerViewControllerCountryCellId";
+
+@interface MXKCountryPickerViewController ()
+{
+    NSMutableDictionary<NSString*, NSString*> *isoCountryCodesByCountryName;
+    
+    NSArray<NSString*> *countryNames;
+    NSMutableArray<NSString*> *filteredCountryNames;
+    
+    NSString *previousSearchPattern;
+    
+    NSMutableDictionary<NSString*, NSNumber*> *callingCodesByCountryName;
+}
+
+@end
+
+@implementation MXKCountryPickerViewController
+
+#pragma mark - Class methods
+
++ (UINib *)nib
+{
+    return [UINib nibWithNibName:NSStringFromClass([MXKCountryPickerViewController class])
+                          bundle:[NSBundle bundleForClass:[MXKCountryPickerViewController class]]];
+}
+
++ (instancetype)countryPickerViewController
+{
+    return [[[self class] alloc] initWithNibName:NSStringFromClass([MXKCountryPickerViewController class])
+                                          bundle:[NSBundle bundleForClass:[MXKCountryPickerViewController class]]];
+}
+
+- (void)finalizeInit
+{
+    [super finalizeInit];
+    
+    NSArray *isoCountryCodes = [NSLocale ISOCountryCodes];
+    NSMutableArray<NSString*> *countries;
+    
+    isoCountryCodesByCountryName = [NSMutableDictionary dictionaryWithCapacity:isoCountryCodes.count];
+    countries = [NSMutableArray arrayWithCapacity:isoCountryCodes.count];
+    
+    NSLocale *local = [[NSLocale alloc] initWithLocaleIdentifier:[[[NSBundle mainBundle] preferredLocalizations] objectAtIndex:0]];
+    
+    for (NSString *isoCountryCode in isoCountryCodes)
+    {
+        NSString *country = [local displayNameForKey:NSLocaleCountryCode value:isoCountryCode];
+        if (country)
+        {
+            [countries addObject: country];
+            isoCountryCodesByCountryName[country] = isoCountryCode;
+        }
+    }
+    
+    countryNames = [countries sortedArrayUsingSelector:@selector(localizedCaseInsensitiveCompare:)];
+    
+    previousSearchPattern = nil;
+    filteredCountryNames = nil;
+    
+    _showCountryCallingCode = NO;
+}
+
+- (void)destroy
+{
+    [super destroy];
+    
+    isoCountryCodesByCountryName = nil;
+    
+    countryNames = nil;
+    filteredCountryNames = nil;
+    
+    callingCodesByCountryName = nil;
+    
+    previousSearchPattern = nil;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    // Check whether the view controller has been pushed via storyboard
+    if (!self.tableView)
+    {
+        // Instantiate view controller objects
+        [[[self class] nib] instantiateWithOwner:self options:nil];
+    }
+    
+    self.navigationItem.title = [MatrixKitL10n countryPickerTitle];
+    
+    [self setupSearchController];
+}
+
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    
+    self.navigationItem.hidesSearchBarWhenScrolling = YES;
+}
+
+#pragma mark - 
+
+- (void)setShowCountryCallingCode:(BOOL)showCountryCallingCode
+{
+    if (_showCountryCallingCode != showCountryCallingCode)
+    {
+        _showCountryCallingCode = showCountryCallingCode;
+        
+        if (_showCountryCallingCode && !callingCodesByCountryName)
+        {
+            callingCodesByCountryName = [NSMutableDictionary dictionary];
+            
+            for (NSString *countryName in countryNames)
+            {
+                NSString *isoCountryCode = isoCountryCodesByCountryName[countryName];
+                NSNumber *callingCode = [[NBPhoneNumberUtil sharedInstance] getCountryCodeForRegion:isoCountryCode];
+                
+                callingCodesByCountryName[countryName] = callingCode;
+            }
+        }
+        
+        [self.tableView reloadData];
+    }
+}
+
+#pragma mark - Private
+
+- (void)setupSearchController
+{
+    UISearchController *searchController = [[UISearchController alloc]
+     initWithSearchResultsController:nil];
+    searchController.dimsBackgroundDuringPresentation = NO;
+    searchController.hidesNavigationBarDuringPresentation = NO;
+    searchController.searchResultsUpdater = self;
+    
+    self.navigationItem.searchController = searchController;
+    // Make the search bar visible on first view appearance
+    self.navigationItem.hidesSearchBarWhenScrolling = NO;
+    
+    self.definesPresentationContext = YES;
+    
+    self.searchController = searchController;
+}
+
+#pragma mark - UITableView dataSource
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    if (filteredCountryNames)
+    {
+        return filteredCountryNames.count;
+    }
+    return countryNames.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    UITableViewCell* cell = [tableView dequeueReusableCellWithIdentifier:kMXKCountryPickerViewControllerCountryCellId];
+    if (!cell)
+    {
+        cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:kMXKCountryPickerViewControllerCountryCellId];
+    }
+    
+    NSInteger index = indexPath.row;
+    NSString *countryName;
+    
+    if (filteredCountryNames)
+    {
+        if (index < filteredCountryNames.count)
+        {
+            countryName = filteredCountryNames[index];
+        }
+    }
+    else if (index < countryNames.count)
+    {
+        countryName = countryNames[index];
+    }
+    
+    if (countryName)
+    {
+        cell.textLabel.text = countryName;
+        
+        if (self.showCountryCallingCode)
+        {
+            cell.detailTextLabel.text = [NSString stringWithFormat:@"+%@", [callingCodesByCountryName[countryName] stringValue]];
+        }
+    }
+    
+    return cell;
+}
+
+#pragma mark - UITableView delegate
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    [tableView deselectRowAtIndexPath:indexPath animated:YES];
+    
+    if (self.delegate)
+    {
+        NSInteger index = indexPath.row;
+        NSString *countryName;
+        
+        if (filteredCountryNames)
+        {
+            if (index < filteredCountryNames.count)
+            {
+                countryName = filteredCountryNames[index];
+            }
+        }
+        else if (index < countryNames.count)
+        {
+            countryName = countryNames[index];
+        }
+        
+        if (countryName)
+        {
+            NSString *isoCountryCode = isoCountryCodesByCountryName[countryName];
+            
+            [self.delegate countryPickerViewController:self didSelectCountry:isoCountryCode];
+        }
+    }
+}
+
+#pragma mark - UISearchResultsUpdating
+
+- (void)updateSearchResultsForSearchController:(UISearchController *)searchController
+{
+    NSString *searchText = searchController.searchBar.text;
+    
+    if (searchText.length)
+    {
+        searchText = [searchText lowercaseString];
+        
+        if (previousSearchPattern && [searchText hasPrefix:previousSearchPattern])
+        {
+            for (NSUInteger index = 0; index < filteredCountryNames.count;)
+            {
+                NSString *countryName = [filteredCountryNames[index] lowercaseString];
+                
+                if ([countryName hasPrefix:searchText] == NO)
+                {
+                    [filteredCountryNames removeObjectAtIndex:index];
+                }
+                else
+                {
+                    index++;
+                }
+            }
+        }
+        else
+        {
+            filteredCountryNames = [NSMutableArray array];
+            
+            for (NSUInteger index = 0; index < countryNames.count; index++)
+            {
+                NSString *countryName = [countryNames[index] lowercaseString];
+                
+                if ([countryName hasPrefix:searchText])
+                {
+                    [filteredCountryNames addObject:countryNames[index]];
+                }
+            }
+        }
+        
+        previousSearchPattern = searchText;
+    }
+    else
+    {
+        previousSearchPattern = nil;
+        filteredCountryNames = nil;
+    }
+    
+    [self.tableView reloadData];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKCountryPickerViewController.xib b/Riot/Modules/MatrixKit/Controllers/MXKCountryPickerViewController.xib
new file mode 100644
index 000000000..a9349f0b2
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKCountryPickerViewController.xib
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MXKCountryPickerViewController">
+            <connections>
+                <outlet property="view" destination="bSe-Sh-aQf" id="4es-L5-nel"/>
+            </connections>
+        </placeholder>
+        <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="bSe-Sh-aQf">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <connections>
+                <outlet property="dataSource" destination="-1" id="nhc-tM-1py"/>
+                <outlet property="delegate" destination="-1" id="9uq-Pc-RpB"/>
+            </connections>
+            <point key="canvasLocation" x="-206" y="152"/>
+        </tableView>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKGroupListViewController.h b/Riot/Modules/MatrixKit/Controllers/MXKGroupListViewController.h
new file mode 100644
index 000000000..020f78549
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKGroupListViewController.h
@@ -0,0 +1,118 @@
+/*
+ Copyright 2017 Vector Creations 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/UIKit.h>
+
+#import "MXKViewController.h"
+#import "MXKSessionGroupsDataSource.h"
+
+@class MXKGroupListViewController;
+
+/**
+ `MXKGroupListViewController` delegate.
+ */
+@protocol MXKGroupListViewControllerDelegate <NSObject>
+
+/**
+ Tells the delegate that the user selected a group.
+
+ @param groupListViewController the `MXKGroupListViewController` instance.
+ @param group the selected group.
+ @param mxSession the matrix session in which the group is defined.
+ */
+- (void)groupListViewController:(MXKGroupListViewController *)groupListViewController didSelectGroup:(MXGroup*)group inMatrixSession:(MXSession*)mxSession;
+
+@end
+
+
+/**
+ This view controller displays a group list.
+ */
+@interface MXKGroupListViewController : MXKViewController <MXKDataSourceDelegate, UITableViewDelegate, UISearchBarDelegate>
+{
+@protected
+    
+    /**
+     The fake top view displayed in case of vertical bounce.
+     */
+    __weak UIView *topview;
+}
+
+@property (weak, nonatomic) IBOutlet UISearchBar *groupsSearchBar;
+@property (weak, nonatomic) IBOutlet UITableView *groupsTableView;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *groupsSearchBarTopConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *groupsSearchBarHeightConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *groupsTableViewBottomConstraint;
+
+/**
+ The current data source associated to the view controller.
+ */
+@property (nonatomic, readonly) MXKSessionGroupsDataSource *dataSource;
+
+/**
+ The delegate for the view controller.
+ */
+@property (nonatomic, weak) id<MXKGroupListViewControllerDelegate> delegate;
+
+/**
+ Enable the search option by adding a navigation item in the navigation bar (YES by default).
+ Set NO this property to disable this option and hide the related bar button.
+ */
+@property (nonatomic) BOOL enableBarButtonSearch;
+
+#pragma mark - Class methods
+
+/**
+ Returns the `UINib` object initialized for a `MXKGroupListViewController`.
+ 
+ @return The initialized `UINib` object or `nil` if there were errors during initialization
+ or the nib file could not be located.
+ 
+ @discussion You may override this method to provide a customized nib. If you do,
+ you should also override `groupListViewController` to return your
+ view controller loaded from your custom nib.
+ */
++ (UINib *)nib;
+
+/**
+ Creates and returns a new `MXKGroupListViewController` object.
+ 
+ @discussion This is the designated initializer for programmatic instantiation.
+ @return An initialized `MXKGroupListViewController` object if successful, `nil` otherwise.
+ */
++ (instancetype)groupListViewController;
+
+/**
+ Display the groups described in the provided data source.
+ 
+ Note: The provided data source will replace the current data source if any. The caller
+ should dispose properly this data source if it is not used anymore.
+
+ @param listDataSource the data source providing the groups list.
+ */
+- (void)displayList:(MXKSessionGroupsDataSource*)listDataSource;
+
+/**
+ Refresh the groups table display.
+ */
+- (void)refreshGroupsTable;
+
+/**
+ Hide/show the search bar at the top of the groups table view.
+ */
+- (void)hideSearchBar:(BOOL)hidden;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKGroupListViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKGroupListViewController.m
new file mode 100644
index 000000000..e9950fa3f
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKGroupListViewController.m
@@ -0,0 +1,608 @@
+/*
+ Copyright 2017 Vector Creations 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 "MXKGroupListViewController.h"
+
+#import "MXKGroupTableViewCell.h"
+#import "MXKTableViewHeaderFooterWithLabel.h"
+
+@interface MXKGroupListViewController ()
+{
+    /**
+     The data source providing UITableViewCells
+     */
+    MXKSessionGroupsDataSource *dataSource;
+    
+    /**
+     Search handling
+     */
+    UIBarButtonItem *searchButton;
+    BOOL ignoreSearchRequest;
+    
+    /**
+     The reconnection animated view.
+     */
+    UIView* reconnectingView;
+    
+    /**
+     The current table view header if any.
+     */
+    UIView* tableViewHeaderView;
+    
+    /**
+     The latest server sync date
+     */
+    NSDate* latestServerSync;
+    
+    /**
+     The restart the event connnection
+     */
+    BOOL restartConnection;
+}
+
+@end
+
+@implementation MXKGroupListViewController
+@synthesize dataSource;
+
+#pragma mark - Class methods
+
++ (UINib *)nib
+{
+    return [UINib nibWithNibName:NSStringFromClass([MXKGroupListViewController class])
+                          bundle:[NSBundle bundleForClass:[MXKGroupListViewController class]]];
+}
+
++ (instancetype)groupListViewController
+{
+    return [[[self class] alloc] initWithNibName:NSStringFromClass([MXKGroupListViewController class])
+                                          bundle:[NSBundle bundleForClass:[MXKGroupListViewController class]]];
+}
+
+#pragma mark -
+
+- (void)finalizeInit
+{
+    [super finalizeInit];
+    
+    _enableBarButtonSearch = YES;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    // Check whether the view controller has been pushed via storyboard
+    if (!_groupsTableView)
+    {
+        // Instantiate view controller objects
+        [[[self class] nib] instantiateWithOwner:self options:nil];
+    }
+    
+    // Adjust search bar Top constraint to take into account potential navBar.
+    if (_groupsSearchBarTopConstraint)
+    {
+        [NSLayoutConstraint deactivateConstraints:@[_groupsSearchBarTopConstraint]];
+        
+        _groupsSearchBarTopConstraint = [NSLayoutConstraint constraintWithItem:self.topLayoutGuide
+                                                                      attribute:NSLayoutAttributeBottom
+                                                                      relatedBy:NSLayoutRelationEqual
+                                                                         toItem:self.groupsSearchBar
+                                                                      attribute:NSLayoutAttributeTop
+                                                                     multiplier:1.0f
+                                                                       constant:0.0f];
+        
+        [NSLayoutConstraint activateConstraints:@[_groupsSearchBarTopConstraint]];
+    }
+    
+    // Adjust table view Bottom constraint to take into account tabBar.
+    if (_groupsTableViewBottomConstraint)
+    {
+        [NSLayoutConstraint deactivateConstraints:@[_groupsTableViewBottomConstraint]];
+        
+        _groupsTableViewBottomConstraint = [NSLayoutConstraint constraintWithItem:self.bottomLayoutGuide
+                                                                         attribute:NSLayoutAttributeTop
+                                                                         relatedBy:NSLayoutRelationEqual
+                                                                            toItem:self.groupsTableView
+                                                                         attribute:NSLayoutAttributeBottom
+                                                                        multiplier:1.0f
+                                                                          constant:0.0f];
+        
+        [NSLayoutConstraint activateConstraints:@[_groupsTableViewBottomConstraint]];
+    }
+    
+    // Hide search bar by default
+    [self hideSearchBar:YES];
+    
+    // Apply search option in navigation bar
+    self.enableBarButtonSearch = _enableBarButtonSearch;
+    
+    // Add an accessory view to the search bar in order to retrieve keyboard view.
+    self.groupsSearchBar.inputAccessoryView = [[UIView alloc] initWithFrame:CGRectZero];
+    
+    // Finalize table view configuration
+    // Note: self-sizing cells and self-sizing section headers are enabled from the nib file.
+    self.groupsTableView.delegate = self;
+    self.groupsTableView.dataSource = dataSource; // Note: dataSource may be nil here
+    self.groupsTableView.estimatedSectionHeaderHeight = 30; // The value set in the nib seems not available for iOS version < 10.
+    
+    // Set up classes to use for the cells and the section headers.
+    [self.groupsTableView registerNib:MXKGroupTableViewCell.nib forCellReuseIdentifier:MXKGroupTableViewCell.defaultReuseIdentifier];
+    [self.groupsTableView registerNib:MXKTableViewHeaderFooterWithLabel.nib forHeaderFooterViewReuseIdentifier:MXKTableViewHeaderFooterWithLabel.defaultReuseIdentifier];
+    
+    // Add a top view which will be displayed in case of vertical bounce.
+    CGFloat height = self.groupsTableView.frame.size.height;
+    UIView *topview = [[UIView alloc] initWithFrame:CGRectMake(0,-height,self.groupsTableView.frame.size.width,height)];
+    topview.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+    topview.backgroundColor = [UIColor groupTableViewBackgroundColor];
+    [self.groupsTableView addSubview:topview];
+    self->topview = topview;
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+
+    // Restore search mechanism (if enabled)
+    ignoreSearchRequest = NO;
+
+    // Observe the server sync
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onSyncNotification) name:kMXSessionDidSyncNotification object:nil];
+    
+    // Do a full reload
+    [self refreshGroupsTable];
+    
+    // Refresh all groups summary
+    [self.dataSource refreshGroupsSummary:nil];
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+
+    // The user may still press search button whereas the view disappears
+    ignoreSearchRequest = YES;
+
+    // Leave potential search session
+    if (!self.groupsSearchBar.isHidden)
+    {
+        [self searchBarCancelButtonClicked:self.groupsSearchBar];
+    }
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionDidSyncNotification object:nil];
+    
+    [self removeReconnectingView];
+}
+
+- (void)dealloc
+{
+    self.groupsSearchBar.inputAccessoryView = nil;
+    
+    searchButton = nil;
+}
+
+- (void)didReceiveMemoryWarning
+{
+    [super didReceiveMemoryWarning];
+    
+    // Dispose of any resources that can be recreated.
+}
+
+#pragma mark - Override MXKViewController
+
+- (void)onKeyboardShowAnimationComplete
+{
+    // Report the keyboard view in order to track keyboard frame changes
+    self.keyboardView = _groupsSearchBar.inputAccessoryView.superview;
+}
+
+- (void)setKeyboardHeight:(CGFloat)keyboardHeight
+{
+    // Deduce the bottom constraint for the table view (Don't forget the potential tabBar)
+    CGFloat tableViewBottomConst = keyboardHeight - self.bottomLayoutGuide.length;
+    // Check whether the keyboard is over the tabBar
+    if (tableViewBottomConst < 0)
+    {
+        tableViewBottomConst = 0;
+    }
+    
+    // Update constraints
+    _groupsTableViewBottomConstraint.constant = tableViewBottomConst;
+    
+    // Force layout immediately to take into account new constraint
+    [self.view layoutIfNeeded];
+}
+
+- (void)destroy
+{
+    self.groupsTableView.dataSource = nil;
+    self.groupsTableView.delegate = nil;
+    self.groupsTableView = nil;
+    
+    dataSource.delegate = nil;
+    dataSource = nil;
+    
+    _delegate = nil;
+    
+    [topview removeFromSuperview];
+    topview = nil;
+    
+    [super destroy];
+}
+
+#pragma mark -
+
+- (void)setEnableBarButtonSearch:(BOOL)enableBarButtonSearch
+{
+    _enableBarButtonSearch = enableBarButtonSearch;
+    
+    if (enableBarButtonSearch)
+    {
+        if (!searchButton)
+        {
+            searchButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSearch target:self action:@selector(search:)];
+        }
+        
+        // Add it in right bar items
+        NSArray *rightBarButtonItems = self.navigationItem.rightBarButtonItems;
+        self.navigationItem.rightBarButtonItems = rightBarButtonItems ? [rightBarButtonItems arrayByAddingObject:searchButton] : @[searchButton];
+    }
+    else
+    {
+        NSMutableArray *rightBarButtonItems = [NSMutableArray arrayWithArray: self.navigationItem.rightBarButtonItems];
+        [rightBarButtonItems removeObject:searchButton];
+        self.navigationItem.rightBarButtonItems = rightBarButtonItems;
+    }
+}
+
+- (void)displayList:(MXKSessionGroupsDataSource *)listDataSource
+{
+    // Cancel registration on existing dataSource if any
+    if (dataSource)
+    {
+        dataSource.delegate = nil;
+        
+        // Remove associated matrix sessions
+        NSArray *mxSessions = self.mxSessions;
+        for (MXSession *mxSession in mxSessions)
+        {
+            [self removeMatrixSession:mxSession];
+        }
+    }
+    
+    dataSource = listDataSource;
+    dataSource.delegate = self;
+    
+    // Report the matrix session at view controller level to update UI according to session state
+    [self addMatrixSession:listDataSource.mxSession];
+    
+    if (self.groupsTableView)
+    {
+        // Set up table data source
+        self.groupsTableView.dataSource = dataSource;
+    }
+}
+
+- (void)refreshGroupsTable
+{
+    // For now, do a simple full reload
+    [self.groupsTableView reloadData];
+}
+
+- (void)hideSearchBar:(BOOL)hidden
+{
+    self.groupsSearchBar.hidden = hidden;
+    self.groupsSearchBarHeightConstraint.constant = hidden ? 0 : 44;
+    [self.view setNeedsUpdateConstraints];
+}
+
+#pragma mark - Action
+
+- (IBAction)search:(id)sender
+{
+    // The user may have pressed search button whereas the view controller was disappearing
+    if (ignoreSearchRequest)
+    {
+        return;
+    }
+    
+    if (self.groupsSearchBar.isHidden)
+    {
+        // Check whether there are data in which search
+        if ([self.dataSource numberOfSectionsInTableView:self.groupsTableView])
+        {
+            [self hideSearchBar:NO];
+            
+            // Create search bar
+            [self.groupsSearchBar becomeFirstResponder];
+        }
+    }
+    else
+    {
+        [self searchBarCancelButtonClicked: self.groupsSearchBar];
+    }
+}
+
+#pragma mark - MXKDataSourceDelegate
+
+- (Class<MXKCellRendering>)cellViewClassForCellData:(MXKCellData*)cellData
+{
+    // Return the default group table view cell
+    return MXKGroupTableViewCell.class;
+}
+
+- (NSString *)cellReuseIdentifierForCellData:(MXKCellData*)cellData
+{
+    // Return the default group table view cell
+    return MXKGroupTableViewCell.defaultReuseIdentifier;
+}
+
+- (void)dataSource:(MXKDataSource *)dataSource didCellChange:(id)changes
+{
+    // For now, do a simple full reload
+    [self refreshGroupsTable];
+}
+
+- (void)dataSource:(MXKDataSource *)dataSource didAddMatrixSession:(MXSession *)mxSession
+{
+    [self addMatrixSession:mxSession];
+}
+
+- (void)dataSource:(MXKDataSource *)dataSource didRemoveMatrixSession:(MXSession *)mxSession
+{
+    [self removeMatrixSession:mxSession];
+}
+
+#pragma mark - UITableView delegate
+
+- (CGFloat)tableView:(UITableView *)tableView estimatedHeightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return tableView.estimatedRowHeight;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView estimatedHeightForHeaderInSection:(NSInteger)section
+{
+    if (tableView.numberOfSections > 1)
+    {
+        return tableView.estimatedSectionHeaderHeight;
+    }
+    
+    return 0;
+}
+
+- (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    // Refresh here the estimated row height
+    tableView.estimatedRowHeight = cell.frame.size.height;
+}
+
+- (void)tableView:(UITableView *)tableView willDisplayHeaderView:(nonnull UIView *)view forSection:(NSInteger)section
+{
+    // Refresh here the estimated header height
+    tableView.estimatedSectionHeaderHeight = view.frame.size.height;
+}
+
+- (nullable UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
+{
+    MXKTableViewHeaderFooterWithLabel *sectionHeader;
+    
+    if (tableView.numberOfSections > 1)
+    {
+        sectionHeader = [tableView dequeueReusableHeaderFooterViewWithIdentifier:MXKTableViewHeaderFooterWithLabel.defaultReuseIdentifier];
+        
+        sectionHeader.mxkLabel.text = [self.dataSource tableView:tableView titleForHeaderInSection:section];
+    }
+    
+    return sectionHeader;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    if (_delegate)
+    {
+        UITableViewCell *selectedCell = [tableView cellForRowAtIndexPath:indexPath];
+        
+        if ([selectedCell conformsToProtocol:@protocol(MXKCellRendering)])
+        {
+            id<MXKCellRendering> cell = (id<MXKCellRendering>)selectedCell;
+            
+            if ([cell respondsToSelector:@selector(renderedCellData)])
+            {
+                MXKCellData *cellData = cell.renderedCellData;
+                if ([cellData conformsToProtocol:@protocol(MXKGroupCellDataStoring)])
+                {
+                    id<MXKGroupCellDataStoring> groupCellData = (id<MXKGroupCellDataStoring>)cellData;
+                    [_delegate groupListViewController:self didSelectGroup:groupCellData.group inMatrixSession:self.mainSession];
+                }
+            }
+        }
+    }
+    
+    // Hide the keyboard when user select a room
+    // do not hide the searchBar until the view controller disappear
+    // on tablets / iphone 6+, the user could expect to search again while looking at a room
+    [self.groupsSearchBar resignFirstResponder];
+}
+
+- (void)tableView:(UITableView *)tableView didEndDisplayingCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath*)indexPath
+{
+    // Release here resources, and restore reusable cells
+    if ([cell respondsToSelector:@selector(didEndDisplay)])
+    {
+        [(id<MXKCellRendering>)cell didEndDisplay];
+    }
+}
+
+- (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset
+{
+    // Detect vertical bounce at the top of the tableview to trigger reconnection.
+    if (scrollView == _groupsTableView)
+    {
+        [self detectPullToKick:scrollView];
+    }
+}
+
+- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
+{
+    if (scrollView == _groupsTableView)
+    {
+        [self managePullToKick:scrollView];
+    }
+}
+
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView
+{
+    if (scrollView == _groupsTableView)
+    {
+        if (scrollView.contentOffset.y + scrollView.adjustedContentInset.top == 0)
+        {
+            [self managePullToKick:scrollView];
+        }
+    }
+}
+
+#pragma mark - UISearchBarDelegate
+
+- (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText
+{
+    // Apply filter
+    if (searchText.length)
+    {
+        [self.dataSource searchWithPatterns:@[searchText]];
+    }
+    else
+    {
+        [self.dataSource searchWithPatterns:nil];
+    }
+}
+
+- (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar
+{
+    // "Done" key has been pressed
+    [searchBar resignFirstResponder];
+}
+
+- (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar
+{
+    // Leave search
+    [searchBar resignFirstResponder];
+    
+    [self hideSearchBar:YES];
+    
+    self.groupsSearchBar.text = nil;
+    
+    // Refresh display
+    [self.dataSource searchWithPatterns:nil];
+}
+
+#pragma mark - resync management
+
+- (void)onSyncNotification
+{
+    latestServerSync = [NSDate date];
+    
+    MXWeakify(self);
+    
+    // Refresh all groups summary
+    [self.dataSource refreshGroupsSummary:^{
+        
+        MXStrongifyAndReturnIfNil(self);
+        
+        [self removeReconnectingView];
+    }];
+}
+
+- (BOOL)canReconnect
+{
+    // avoid restarting connection if some data has been received within 1 second (1000 : latestServerSync is null)
+    NSTimeInterval interval = latestServerSync ? [[NSDate date] timeIntervalSinceDate:latestServerSync] : 1000;
+    return  (interval > 1) && [self.mainSession reconnect];
+}
+
+- (void)addReconnectingView
+{
+    if (!reconnectingView)
+    {
+        UIActivityIndicatorView* spinner  = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
+        spinner.transform = CGAffineTransformMakeScale(0.75f, 0.75f);
+        CGRect frame = spinner.frame;
+        frame.size.height = 80; // 80 * 0.75 = 60
+        spinner.bounds = frame;
+        spinner.color = [UIColor darkGrayColor];
+        spinner.hidesWhenStopped = NO;
+        spinner.backgroundColor = _groupsTableView.backgroundColor;
+        [spinner startAnimating];
+        
+        // no need to manage constraints here, IOS defines them.
+        tableViewHeaderView = _groupsTableView.tableHeaderView;
+        _groupsTableView.tableHeaderView = reconnectingView = spinner;
+    }
+}
+
+- (void)removeReconnectingView
+{
+    if (reconnectingView && !restartConnection)
+    {
+        _groupsTableView.tableHeaderView = tableViewHeaderView;
+        reconnectingView = nil;
+    }
+}
+
+/**
+ Detect if the current connection must be restarted.
+ The spinner is displayed until the overscroll ends (and scrollViewDidEndDecelerating is called).
+ */
+- (void)detectPullToKick:(UIScrollView *)scrollView
+{
+    if (!reconnectingView)
+    {
+        // detect if the user scrolls over the tableview top
+        restartConnection = (scrollView.contentOffset.y + scrollView.adjustedContentInset.top < -128);
+        
+        if (restartConnection)
+        {
+            // wait that list decelerate to display / hide it
+            [self addReconnectingView];
+        }
+    }
+}
+
+/**
+ Restarts the current connection if it is required.
+ The 0.3s delay is added to avoid flickering if the connection does not require to be restarted.
+ */
+- (void)managePullToKick:(UIScrollView *)scrollView
+{
+    // the current connection must be restarted
+    if (restartConnection)
+    {
+        // display at least 0.3s the spinner to show to the user that something is pending
+        // else the UI is flickering
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.3 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+            self->restartConnection = NO;
+            
+            if (![self canReconnect])
+            {
+                // if the event stream has not been restarted
+                // hide the spinner
+                [self removeReconnectingView];
+            }
+            // else wait that onSyncNotification is called.
+        });
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKGroupListViewController.xib b/Riot/Modules/MatrixKit/Controllers/MXKGroupListViewController.xib
new file mode 100644
index 000000000..fad906339
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKGroupListViewController.xib
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MXKGroupListViewController">
+            <connections>
+                <outlet property="groupsSearchBar" destination="Zbr-9e-VZh" id="lBZ-hu-yJo"/>
+                <outlet property="groupsSearchBarHeightConstraint" destination="jCU-cq-2OA" id="Nl4-Wn-L98"/>
+                <outlet property="groupsSearchBarTopConstraint" destination="aRg-Nz-enq" id="mDZ-YB-gRX"/>
+                <outlet property="groupsTableView" destination="orV-HH-88x" id="pZt-dT-XPy"/>
+                <outlet property="groupsTableViewBottomConstraint" destination="m4x-32-odR" id="4hx-dQ-8aj"/>
+                <outlet property="view" destination="iN0-l3-epB" id="NUQ-LI-M61"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <searchBar contentMode="redraw" showsCancelButton="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Zbr-9e-VZh">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="44" id="jCU-cq-2OA"/>
+                    </constraints>
+                    <textInputTraits key="textInputTraits" returnKeyType="done"/>
+                    <connections>
+                        <outlet property="delegate" destination="-1" id="ejZ-kN-jKv"/>
+                    </connections>
+                </searchBar>
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="70" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="30" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="orV-HH-88x">
+                    <rect key="frame" x="0.0" y="44" width="375" height="623"/>
+                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                </tableView>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="orV-HH-88x" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="NaR-eJ-WMj"/>
+                <constraint firstItem="Zbr-9e-VZh" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="aRg-Nz-enq"/>
+                <constraint firstItem="Zbr-9e-VZh" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="fty-XB-tTr"/>
+                <constraint firstItem="orV-HH-88x" firstAttribute="top" secondItem="Zbr-9e-VZh" secondAttribute="bottom" id="lBa-P2-Vnx"/>
+                <constraint firstAttribute="bottom" secondItem="orV-HH-88x" secondAttribute="bottom" id="m4x-32-odR"/>
+                <constraint firstAttribute="trailing" secondItem="Zbr-9e-VZh" secondAttribute="trailing" id="rKb-TZ-sap"/>
+                <constraint firstAttribute="trailing" secondItem="orV-HH-88x" secondAttribute="trailing" id="yBp-63-kZi"/>
+            </constraints>
+        </view>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKLanguagePickerViewController.h b/Riot/Modules/MatrixKit/Controllers/MXKLanguagePickerViewController.h
new file mode 100644
index 000000000..f30cd3d79
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKLanguagePickerViewController.h
@@ -0,0 +1,104 @@
+/*
+ Copyright 2017 Vector Creations 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 "MXKTableViewController.h"
+
+@class MXKLanguagePickerViewController;
+
+ /**
+  `MXKLanguagePickerViewController` delegate.
+  */
+ @protocol MXKLanguagePickerViewControllerDelegate <NSObject>
+
+ /**
+  Tells the delegate that the user has selected a language.
+
+  @param languagePickerViewController the `MXKLanguagePickerViewController` instance.
+  @param language the ISO language code. nil means use the language chosen by the OS.
+  */
+ - (void)languagePickerViewController:(MXKLanguagePickerViewController*)languagePickerViewController didSelectLangugage:(NSString*)language;
+
+ @end
+
+/**
+ 'MXKLanguagePickerViewController' instance displays the list of languages.
+ For the moment, it displays only languages available in the application bundle.
+ */
+@interface MXKLanguagePickerViewController : MXKTableViewController <UISearchResultsUpdating>
+
+/**
+The searchController used to manage search.
+*/
+@property (nonatomic, strong) UISearchController *searchController;
+
+/**
+ The delegate for the view controller.
+ */
+@property (nonatomic, weak) id<MXKLanguagePickerViewControllerDelegate> delegate;
+
+/**
+ The language marked in the list.
+ @"" by default.
+ */
+@property (nonatomic) NSString *selectedLanguage;
+
+#pragma mark - Class methods
+
+/**
+ Returns the `UINib` object initialized for a `MXKLanguagePickerViewController`.
+ 
+ @return The initialized `UINib` object or `nil` if there were errors during initialization
+ or the nib file could not be located.
+ 
+ @discussion You may override this method to provide a customized nib. If you do,
+ you should also override `listViewController` to return your
+ view controller loaded from your custom nib.
+ */
++ (UINib *)nib;
+
+/**
+ Creates and returns a new `MXKLanguagePickerViewController` object.
+ 
+ @discussion This is the designated initializer for programmatic instantiation.
+ @return An initialized `MXKLanguagePickerViewController` object if successful, `nil` otherwise.
+ */
++ (instancetype)languagePickerViewController;
+
+/**
+ Get the description string of a language defined by its ISO country code.
+ The description is localised in this language.
+ 
+ @param language the ISO country code of the language (ex: "en").
+ @return its description (ex: "English").
+ */
++ (NSString *)languageDescription:(NSString*)language;
+
+/**
+ Get the localised description string of a language defined by its ISO country code.
+
+ @param language the ISO country code of the language (ex: "en").
+ @return its localised description (ex: "Anglais" on a device running in French).
+ */
++ (NSString *)languageLocalisedDescription:(NSString *)language;
+
+/**
+ Get the ISO country code of the language selected by the OS according to
+ the device language and languages available in the app bundle.
+ */
++ (NSString *)defaultLanguage;
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKLanguagePickerViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKLanguagePickerViewController.m
new file mode 100644
index 000000000..92d1a065c
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKLanguagePickerViewController.m
@@ -0,0 +1,308 @@
+/*
+ Copyright 2017 Vector Creations 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 "MXKLanguagePickerViewController.h"
+
+@import libPhoneNumber_iOS;
+
+#import "NSBundle+MatrixKit.h"
+#import "MXKSwiftHeader.h"
+
+NSString* const kMXKLanguagePickerViewControllerCellId = @"kMXKLanguagePickerViewControllerCellId";
+
+NSString* const kMXKLanguagePickerCellDataKeyText = @"text";
+NSString* const kMXKLanguagePickerCellDataKeyDetailText = @"detailText";
+NSString* const kMXKLanguagePickerCellDataKeyLanguage = @"language";
+
+@interface MXKLanguagePickerViewController ()
+{
+    NSMutableArray<NSDictionary*> *cellDataArray;
+    NSMutableArray<NSDictionary*> *filteredCellDataArray;
+    
+    NSString *previousSearchPattern;
+}
+
+@end
+
+@implementation MXKLanguagePickerViewController
+
+#pragma mark - Class methods
+
++ (UINib *)nib
+{
+    return [UINib nibWithNibName:NSStringFromClass([MXKLanguagePickerViewController class])
+                          bundle:[NSBundle bundleForClass:[MXKLanguagePickerViewController class]]];
+}
+
++ (instancetype)languagePickerViewController
+{
+    return [[[self class] alloc] initWithNibName:NSStringFromClass([MXKLanguagePickerViewController class])
+                                          bundle:[NSBundle bundleForClass:[MXKLanguagePickerViewController class]]];
+}
+
++ (NSString *)languageDescription:(NSString *)language
+{
+    NSLocale *locale = [[NSLocale alloc] initWithLocaleIdentifier:language];
+
+    return [locale displayNameForKey:NSLocaleIdentifier value:language];
+}
+
++ (NSString *)languageLocalisedDescription:(NSString *)language
+{
+    NSLocale *locale = [[NSLocale alloc] initWithLocaleIdentifier:[NSBundle mainBundle].preferredLocalizations.firstObject];
+
+    return [locale displayNameForKey:NSLocaleIdentifier value:language];
+}
+
++ (NSString *)defaultLanguage
+{
+    return [NSBundle mainBundle].preferredLocalizations.firstObject;
+}
+
+- (void)finalizeInit
+{
+    [super finalizeInit];
+
+    cellDataArray = [NSMutableArray array];
+    filteredCellDataArray = nil;
+
+    previousSearchPattern = nil;
+
+    // Populate cellDataArray
+    // Start by the default language chosen by the OS
+    NSString *defaultLanguage = [MXKLanguagePickerViewController defaultLanguage];
+    NSString *languageDescription = [MatrixKitL10n languagePickerDefaultLanguage:[MXKLanguagePickerViewController languageDescription:defaultLanguage]];
+
+    [cellDataArray addObject:@{
+                               kMXKLanguagePickerCellDataKeyText:languageDescription
+                               }];
+
+    // Then, add languages available in the app bundle
+    NSArray<NSString *> *localizations = [[NSBundle mainBundle] localizations];
+    for (NSString *language in localizations)
+    {
+        // Do not duplicate the default lang
+        if (![language isEqualToString:defaultLanguage])
+        {
+            languageDescription = [MXKLanguagePickerViewController languageDescription:language];
+            NSString *localisedLanguageDescription = [MXKLanguagePickerViewController languageLocalisedDescription:language];
+
+            // Capitalise the description in the language locale
+            NSLocale *locale = [[NSLocale alloc] initWithLocaleIdentifier:language];
+            languageDescription = [languageDescription capitalizedStringWithLocale:locale];
+            localisedLanguageDescription = [localisedLanguageDescription capitalizedStringWithLocale:locale];
+
+            if (languageDescription)
+            {
+                [cellDataArray addObject:@{
+                                           kMXKLanguagePickerCellDataKeyText: languageDescription,
+                                           kMXKLanguagePickerCellDataKeyDetailText: localisedLanguageDescription,
+                                           kMXKLanguagePickerCellDataKeyLanguage: language
+                                           }];
+            }
+        }
+    }
+
+    // Default to "" in order to differentiate it from nil
+    _selectedLanguage = @"";
+}
+
+- (void)destroy
+{
+    [super destroy];
+
+    cellDataArray = nil;
+    filteredCellDataArray = nil;
+
+    previousSearchPattern = nil;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    // Check whether the view controller has been pushed via storyboard
+    if (!self.tableView)
+    {
+        // Instantiate view controller objects
+        [[[self class] nib] instantiateWithOwner:self options:nil];
+    }
+
+    [self setupSearchController];
+
+    self.navigationItem.title = [MatrixKitL10n languagePickerTitle];
+        
+}
+
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    
+    self.navigationItem.hidesSearchBarWhenScrolling = YES;
+}
+
+#pragma mark - Private
+
+- (void)setupSearchController
+{
+    UISearchController *searchController = [[UISearchController alloc]
+     initWithSearchResultsController:nil];
+    searchController.dimsBackgroundDuringPresentation = NO;
+    searchController.hidesNavigationBarDuringPresentation = NO;
+    searchController.searchResultsUpdater = self;
+    
+    // Search bar is hidden for the moment, uncomment following line to enable it.
+    // TODO: Enable it once we have enough translations to fill pages and pages
+    //        self.navigationItem.searchController = searchController;
+    // Make the search bar visible on first view appearance
+    self.navigationItem.hidesSearchBarWhenScrolling = NO;
+    
+    self.definesPresentationContext = YES;
+    
+    self.searchController = searchController;
+}
+
+#pragma mark - UITableView dataSource
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    if (filteredCellDataArray)
+    {
+        return filteredCellDataArray.count;
+    }
+    return cellDataArray.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    UITableViewCell* cell = [tableView dequeueReusableCellWithIdentifier:kMXKLanguagePickerViewControllerCellId];
+    if (!cell)
+    {
+        cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:kMXKLanguagePickerViewControllerCellId];
+    }
+    
+    NSInteger index = indexPath.row;
+    NSDictionary *itemCellData;
+    
+    if (filteredCellDataArray)
+    {
+        if (index < filteredCellDataArray.count)
+        {
+            itemCellData = filteredCellDataArray[index];
+        }
+    }
+    else if (index < cellDataArray.count)
+    {
+        itemCellData = cellDataArray[index];
+    }
+    
+    if (itemCellData)
+    {
+        cell.textLabel.text = itemCellData[kMXKLanguagePickerCellDataKeyText];
+        cell.detailTextLabel.text = itemCellData[kMXKLanguagePickerCellDataKeyDetailText];
+
+        // Mark the cell with the selected language
+        if (_selectedLanguage == itemCellData[kMXKLanguagePickerCellDataKeyLanguage] || [_selectedLanguage isEqualToString:itemCellData[kMXKLanguagePickerCellDataKeyLanguage]])
+        {
+            cell.accessoryType = UITableViewCellAccessoryCheckmark;
+        }
+        else
+        {
+            cell.accessoryType = UITableViewCellAccessoryNone;
+        }
+    }
+    
+    return cell;
+}
+
+#pragma mark - UITableView delegate
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    [tableView deselectRowAtIndexPath:indexPath animated:YES];
+
+    if (self.delegate)
+    {
+        NSInteger index = indexPath.row;
+        NSString *language;
+        
+        if (filteredCellDataArray)
+        {
+            if (index < filteredCellDataArray.count)
+            {
+                language = filteredCellDataArray[index][kMXKLanguagePickerCellDataKeyLanguage];
+            }
+        }
+        else if (index < cellDataArray.count)
+        {
+            language = cellDataArray[index][kMXKLanguagePickerCellDataKeyLanguage];
+        }
+
+        [self.delegate languagePickerViewController:self didSelectLangugage:language];
+    }
+}
+
+#pragma mark - UISearchResultsUpdating
+
+- (void)updateSearchResultsForSearchController:(UISearchController *)searchController
+{
+    NSString *searchText = searchController.searchBar.text;
+    
+    if (searchText.length)
+    {
+        searchText = [searchText lowercaseString];
+        
+        if (previousSearchPattern && [searchText hasPrefix:previousSearchPattern])
+        {
+            for (NSUInteger index = 0; index < filteredCellDataArray.count;)
+            {
+                NSString *text = [filteredCellDataArray[index][kMXKLanguagePickerCellDataKeyText] lowercaseString];
+                
+                if ([text hasPrefix:searchText] == NO)
+                {
+                    [filteredCellDataArray removeObjectAtIndex:index];
+                }
+                else
+                {
+                    index++;
+                }
+            }
+        }
+        else
+        {
+            filteredCellDataArray = [NSMutableArray array];
+            
+            for (NSUInteger index = 0; index < cellDataArray.count; index++)
+            {
+                NSString *text = [cellDataArray[index][kMXKLanguagePickerCellDataKeyText] lowercaseString];
+                
+                if ([text hasPrefix:searchText])
+                {
+                    [filteredCellDataArray addObject:cellDataArray[index]];
+                }
+            }
+        }
+        
+        previousSearchPattern = searchText;
+    }
+    else
+    {
+        previousSearchPattern = nil;
+        filteredCellDataArray = nil;
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKLanguagePickerViewController.xib b/Riot/Modules/MatrixKit/Controllers/MXKLanguagePickerViewController.xib
new file mode 100644
index 000000000..2261ee450
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKLanguagePickerViewController.xib
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MXKLanguagePickerViewController">
+            <connections>
+                <outlet property="view" destination="bSe-Sh-aQf" id="4es-L5-nel"/>
+            </connections>
+        </placeholder>
+        <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="bSe-Sh-aQf">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <connections>
+                <outlet property="dataSource" destination="-1" id="nhc-tM-1py"/>
+                <outlet property="delegate" destination="-1" id="9uq-Pc-RpB"/>
+            </connections>
+            <point key="canvasLocation" x="140" y="154"/>
+        </tableView>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKNotificationSettingsViewController.h b/Riot/Modules/MatrixKit/Controllers/MXKNotificationSettingsViewController.h
new file mode 100644
index 000000000..e8ff33015
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKNotificationSettingsViewController.h
@@ -0,0 +1,34 @@
+/*
+ Copyright 2015 OpenMarket 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 <MatrixSDK/MatrixSDK.h>
+
+#import "MXKTableViewController.h"
+#import "MXKAccount.h"
+
+/**
+ 'MXKNotificationSettingsViewController' instance may be used to display the notification settings (account's push rules).
+ Presently only the Global notification settings are supported.
+ */
+@interface MXKNotificationSettingsViewController : MXKTableViewController
+
+/**
+ The account who owns the displayed notification settings.
+ */
+@property (nonatomic) MXKAccount *mxAccount;
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKNotificationSettingsViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKNotificationSettingsViewController.m
new file mode 100644
index 000000000..156b0c9c3
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKNotificationSettingsViewController.m
@@ -0,0 +1,637 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2018 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 "MXKNotificationSettingsViewController.h"
+
+#import "MXKTableViewCellWithButton.h"
+#import "MXKPushRuleTableViewCell.h"
+#import "MXKPushRuleCreationTableViewCell.h"
+#import "MXKTableViewCellWithTextView.h"
+
+#import "MXKConstants.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKSwiftHeader.h"
+
+#define MXKNOTIFICATIONSETTINGS_SECTION_INTRO_INDEX      0
+#define MXKNOTIFICATIONSETTINGS_SECTION_PER_WORD_INDEX   1
+#define MXKNOTIFICATIONSETTINGS_SECTION_PER_ROOM_INDEX   2
+#define MXKNOTIFICATIONSETTINGS_SECTION_PER_SENDER_INDEX 3
+#define MXKNOTIFICATIONSETTINGS_SECTION_OTHERS_INDEX     4
+#define MXKNOTIFICATIONSETTINGS_SECTION_DEFAULT_INDEX    5
+#define MXKNOTIFICATIONSETTINGS_SECTION_COUNT            6
+
+@interface MXKNotificationSettingsViewController ()
+{
+    /**
+     Handle master rule state
+     */
+    UIButton *ruleMasterButton;
+    BOOL      areAllDisabled;
+    
+    /**
+     */
+    NSInteger contentRuleCreationIndex;
+    NSInteger roomRuleCreationIndex;
+    NSInteger senderRuleCreationIndex;
+    
+    /**
+     Predefined rules index
+     */
+    NSInteger ruleContainsUserNameIndex;
+    NSInteger ruleContainsDisplayNameIndex;
+    NSInteger ruleOneToOneRoomIndex;
+    NSInteger ruleInviteForMeIndex;
+    NSInteger ruleMemberEventIndex;
+    NSInteger ruleCallIndex;
+    NSInteger ruleSuppressBotsNotificationsIndex;
+    
+    /**
+     Notification center observers
+     */
+    id notificationCenterWillUpdateObserver;
+    id notificationCenterDidUpdateObserver;
+    id notificationCenterDidFailObserver;
+}
+
+@end
+
+@implementation MXKNotificationSettingsViewController
+
+- (void)finalizeInit
+{
+    [super finalizeInit];
+}
+
+- (void)dealloc
+{
+    ruleMasterButton = nil;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    // Do any additional setup after loading the view, typically from a nib.
+}
+
+- (void)didReceiveMemoryWarning
+{
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+- (void)destroy
+{
+    if (notificationCenterWillUpdateObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:notificationCenterWillUpdateObserver];
+        notificationCenterWillUpdateObserver = nil;
+    }
+    
+    if (notificationCenterDidUpdateObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:notificationCenterDidUpdateObserver];
+        notificationCenterDidUpdateObserver = nil;
+    }
+    
+    if (notificationCenterDidFailObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:notificationCenterDidFailObserver];
+        notificationCenterDidFailObserver = nil;
+    }
+    
+    [super destroy];
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    
+    if (_mxAccount)
+    {
+        [self startActivityIndicator];
+        
+        // Refresh existing notification rules
+        [_mxAccount.mxSession.notificationCenter refreshRules:^{
+            
+            [self stopActivityIndicator];
+            [self.tableView reloadData];
+            
+        } failure:^(NSError *error) {
+            
+            [self stopActivityIndicator];
+            
+        }];
+        
+        notificationCenterWillUpdateObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXNotificationCenterWillUpdateRules object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
+            [self startActivityIndicator];
+        }];
+        
+        notificationCenterDidUpdateObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXNotificationCenterDidUpdateRules object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
+            [self stopActivityIndicator];
+            [self.tableView reloadData];
+        }];
+        
+        notificationCenterDidFailObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXNotificationCenterDidFailRulesUpdate object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
+            [self stopActivityIndicator];
+            
+            // Notify MatrixKit user
+            NSString *myUserId = self.mxAccount.mxCredentials.userId;
+            [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:note.userInfo[kMXNotificationCenterErrorKey] userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+        }];
+    }
+    
+    // Refresh display
+    [self.tableView reloadData];
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    
+    if (notificationCenterWillUpdateObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:notificationCenterWillUpdateObserver];
+        notificationCenterWillUpdateObserver = nil;
+    }
+    
+    if (notificationCenterDidUpdateObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:notificationCenterDidUpdateObserver];
+        notificationCenterDidUpdateObserver = nil;
+    }
+    
+    if (notificationCenterDidFailObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:notificationCenterDidFailObserver];
+        notificationCenterDidFailObserver = nil;
+    }
+}
+
+#pragma mark - Actions
+
+- (IBAction)onButtonPressed:(id)sender
+{
+    if (sender == ruleMasterButton)
+    {
+        // Swap enable state for all noticiations
+        MXPushRule *pushRule = [_mxAccount.mxSession.notificationCenter ruleById:kMXNotificationCenterDisableAllNotificationsRuleID];
+        if (pushRule)
+        {
+            [_mxAccount.mxSession.notificationCenter enableRule:pushRule isEnabled:!areAllDisabled];
+        }
+    }
+}
+
+#pragma mark - UITableView data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+    // Check master rule state
+    MXPushRule *pushRule = [_mxAccount.mxSession.notificationCenter ruleById:kMXNotificationCenterDisableAllNotificationsRuleID];
+    if (pushRule.enabled)
+    {
+        areAllDisabled = YES;
+        return 1;
+    }
+    else
+    {
+        areAllDisabled = NO;
+        return MXKNOTIFICATIONSETTINGS_SECTION_COUNT;
+    }
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    NSInteger count = 0;
+    
+    if (section == MXKNOTIFICATIONSETTINGS_SECTION_INTRO_INDEX)
+    {
+        count = 2;
+    }
+    else if (section == MXKNOTIFICATIONSETTINGS_SECTION_PER_WORD_INDEX)
+    {
+        // A first cell will display a user information
+        count = 1;
+        
+        // Only removable content rules are listed in this section (we ignore here predefined rules)
+        for (MXPushRule *pushRule in _mxAccount.mxSession.notificationCenter.rules.global.content)
+        {
+            if (!pushRule.isDefault)
+            {
+                count++;
+            }
+        }
+        
+        // Add one item to suggest new rule creation
+        contentRuleCreationIndex = count ++;
+    }
+    else if (section == MXKNOTIFICATIONSETTINGS_SECTION_PER_ROOM_INDEX)
+    {
+        count = _mxAccount.mxSession.notificationCenter.rules.global.room.count;
+        
+        // Add one item to suggest new rule creation
+        roomRuleCreationIndex = count ++;
+    }
+    else if (section == MXKNOTIFICATIONSETTINGS_SECTION_PER_SENDER_INDEX)
+    {
+        count = _mxAccount.mxSession.notificationCenter.rules.global.sender.count;
+        
+        // Add one item to suggest new rule creation
+        senderRuleCreationIndex = count ++;
+    }
+    else if (section == MXKNOTIFICATIONSETTINGS_SECTION_OTHERS_INDEX)
+    {
+        ruleContainsUserNameIndex = ruleContainsDisplayNameIndex = ruleOneToOneRoomIndex = ruleInviteForMeIndex = ruleMemberEventIndex = ruleCallIndex = ruleSuppressBotsNotificationsIndex = -1;
+        
+        // Check whether each predefined rule is supported
+        if ([_mxAccount.mxSession.notificationCenter ruleById:kMXNotificationCenterContainUserNameRuleID])
+        {
+            ruleContainsUserNameIndex = count++;
+        }
+        if ([_mxAccount.mxSession.notificationCenter ruleById:kMXNotificationCenterContainDisplayNameRuleID])
+        {
+            ruleContainsDisplayNameIndex = count++;
+        }
+        if ([_mxAccount.mxSession.notificationCenter ruleById:kMXNotificationCenterOneToOneRoomRuleID])
+        {
+            ruleOneToOneRoomIndex = count++;
+        }
+        if ([_mxAccount.mxSession.notificationCenter ruleById:kMXNotificationCenterInviteMeRuleID])
+        {
+            ruleInviteForMeIndex = count++;
+        }
+        if ([_mxAccount.mxSession.notificationCenter ruleById:kMXNotificationCenterMemberEventRuleID])
+        {
+            ruleMemberEventIndex = count++;
+        }
+        if ([_mxAccount.mxSession.notificationCenter ruleById:kMXNotificationCenterCallRuleID])
+        {
+            ruleCallIndex = count++;
+        }
+        if ([_mxAccount.mxSession.notificationCenter ruleById:kMXNotificationCenterSuppressBotsNotificationsRuleID])
+        {
+            ruleSuppressBotsNotificationsIndex = count++;
+        }
+    }
+    else if (section == MXKNOTIFICATIONSETTINGS_SECTION_DEFAULT_INDEX)
+    {
+        if ([_mxAccount.mxSession.notificationCenter ruleById:kMXNotificationCenterAllOtherRoomMessagesRuleID])
+        {
+            count = 1;
+        }
+    }
+    
+    return count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    UITableViewCell *cell = nil;
+    NSInteger rowIndex = indexPath.row;
+    
+    if (indexPath.section == MXKNOTIFICATIONSETTINGS_SECTION_INTRO_INDEX)
+    {
+        if (indexPath.row == 0)
+        {
+            MXKTableViewCellWithButton *masterBtnCell = [tableView dequeueReusableCellWithIdentifier:[MXKTableViewCellWithButton defaultReuseIdentifier]];
+            if (!masterBtnCell)
+            {
+                masterBtnCell = [[MXKTableViewCellWithButton alloc] init];
+            }
+            
+            if (areAllDisabled)
+            {
+                [masterBtnCell.mxkButton setTitle:[MatrixKitL10n notificationSettingsEnableNotifications] forState:UIControlStateNormal];
+                [masterBtnCell.mxkButton setTitle:[MatrixKitL10n notificationSettingsEnableNotifications] forState:UIControlStateHighlighted];
+            }
+            else
+            {
+                [masterBtnCell.mxkButton setTitle:[MatrixKitL10n notificationSettingsDisableAll] forState:UIControlStateNormal];
+                [masterBtnCell.mxkButton setTitle:[MatrixKitL10n notificationSettingsDisableAll] forState:UIControlStateHighlighted];
+            }
+            
+            [masterBtnCell.mxkButton addTarget:self action:@selector(onButtonPressed:) forControlEvents:UIControlEventTouchUpInside];
+            
+            ruleMasterButton = masterBtnCell.mxkButton;
+            
+            cell = masterBtnCell;
+        }
+        else
+        {
+            MXKTableViewCellWithTextView *introCell = [tableView dequeueReusableCellWithIdentifier:[MXKTableViewCellWithTextView defaultReuseIdentifier]];
+            if (!introCell)
+            {
+                introCell = [[MXKTableViewCellWithTextView alloc] init];
+            }
+            
+            if (areAllDisabled)
+            {
+                introCell.mxkTextView.text = [MatrixKitL10n notificationSettingsEnableNotificationsWarning];
+                introCell.mxkTextView.backgroundColor = [UIColor redColor];
+            }
+            else
+            {
+                introCell.mxkTextView.text = [MatrixKitL10n notificationSettingsGlobalInfo];
+                introCell.mxkTextView.backgroundColor = [UIColor clearColor];
+            }
+            
+            introCell.mxkTextView.font = [UIFont systemFontOfSize:14];
+            
+            cell = introCell;
+        }
+    }
+    else if (indexPath.section == MXKNOTIFICATIONSETTINGS_SECTION_PER_WORD_INDEX)
+    {
+        if (rowIndex == 0)
+        {
+            MXKTableViewCellWithTextView *introCell = [tableView dequeueReusableCellWithIdentifier:[MXKTableViewCellWithTextView defaultReuseIdentifier]];
+            if (!introCell)
+            {
+                introCell = [[MXKTableViewCellWithTextView alloc] init];
+            }
+            introCell.mxkTextView.text = [MatrixKitL10n notificationSettingsPerWordInfo];
+            introCell.mxkTextView.font = [UIFont systemFontOfSize:14];
+             
+             cell = introCell;
+        }
+        else if (rowIndex == contentRuleCreationIndex)
+        {
+            MXKPushRuleCreationTableViewCell *pushRuleCreationCell = [tableView dequeueReusableCellWithIdentifier:[MXKPushRuleCreationTableViewCell defaultReuseIdentifier]];
+            if (!pushRuleCreationCell)
+            {
+                pushRuleCreationCell = [[MXKPushRuleCreationTableViewCell alloc] init];
+            }
+            
+            pushRuleCreationCell.mxSession = _mxAccount.mxSession;
+            pushRuleCreationCell.mxPushRuleKind = MXPushRuleKindContent;
+            cell = pushRuleCreationCell;
+        }
+        else
+        {
+            // Only removable content rules are listed in this section
+            NSInteger count = 0;
+            for (MXPushRule *pushRule in _mxAccount.mxSession.notificationCenter.rules.global.content)
+            {
+                if (!pushRule.isDefault)
+                {
+                    count++;
+                    
+                    if (count == rowIndex)
+                    {
+                        MXKPushRuleTableViewCell *pushRuleCell = [tableView dequeueReusableCellWithIdentifier:[MXKPushRuleTableViewCell defaultReuseIdentifier]];
+                        if (!pushRuleCell)
+                        {
+                            pushRuleCell = [[MXKPushRuleTableViewCell alloc] init];
+                        }
+                        
+                        pushRuleCell.mxSession = _mxAccount.mxSession;
+                        pushRuleCell.mxPushRule = pushRule;
+                        
+                        cell = pushRuleCell;
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    else if (indexPath.section == MXKNOTIFICATIONSETTINGS_SECTION_PER_ROOM_INDEX)
+    {
+        if (rowIndex == roomRuleCreationIndex)
+        {
+            MXKPushRuleCreationTableViewCell *pushRuleCreationCell = [tableView dequeueReusableCellWithIdentifier:[MXKPushRuleCreationTableViewCell defaultReuseIdentifier]];
+            if (!pushRuleCreationCell)
+            {
+                pushRuleCreationCell = [[MXKPushRuleCreationTableViewCell alloc] init];
+            }
+            
+            pushRuleCreationCell.mxSession = _mxAccount.mxSession;
+            pushRuleCreationCell.mxPushRuleKind = MXPushRuleKindRoom;
+            cell = pushRuleCreationCell;
+        }
+        else if (rowIndex < _mxAccount.mxSession.notificationCenter.rules.global.room.count)
+        {
+            MXKPushRuleTableViewCell *pushRuleCell = [tableView dequeueReusableCellWithIdentifier:[MXKPushRuleTableViewCell defaultReuseIdentifier]];
+            if (!pushRuleCell)
+            {
+                pushRuleCell = [[MXKPushRuleTableViewCell alloc] init];
+            }
+            
+            pushRuleCell.mxSession = _mxAccount.mxSession;
+            pushRuleCell.mxPushRule = [_mxAccount.mxSession.notificationCenter.rules.global.room objectAtIndex:rowIndex];
+            
+            cell = pushRuleCell;
+        }
+    }
+    else if (indexPath.section == MXKNOTIFICATIONSETTINGS_SECTION_PER_SENDER_INDEX)
+    {
+        if (rowIndex == senderRuleCreationIndex)
+        {
+            MXKPushRuleCreationTableViewCell *pushRuleCreationCell = [tableView dequeueReusableCellWithIdentifier:[MXKPushRuleCreationTableViewCell defaultReuseIdentifier]];
+            if (!pushRuleCreationCell)
+            {
+                pushRuleCreationCell = [[MXKPushRuleCreationTableViewCell alloc] init];
+            }
+            
+            pushRuleCreationCell.mxSession = _mxAccount.mxSession;
+            pushRuleCreationCell.mxPushRuleKind = MXPushRuleKindSender;
+            cell = pushRuleCreationCell;
+        }
+        else if (rowIndex  < _mxAccount.mxSession.notificationCenter.rules.global.sender.count)
+        {
+            MXKPushRuleTableViewCell *pushRuleCell = [tableView dequeueReusableCellWithIdentifier:[MXKPushRuleTableViewCell defaultReuseIdentifier]];
+            if (!pushRuleCell)
+            {
+                pushRuleCell = [[MXKPushRuleTableViewCell alloc] init];
+            }
+            
+            pushRuleCell.mxSession = _mxAccount.mxSession;
+            pushRuleCell.mxPushRule = [_mxAccount.mxSession.notificationCenter.rules.global.sender objectAtIndex:rowIndex];
+
+            cell = pushRuleCell;
+        }
+    }
+    else if (indexPath.section == MXKNOTIFICATIONSETTINGS_SECTION_OTHERS_INDEX)
+    {
+        MXPushRule *pushRule;
+        NSString *ruleDescription;
+        
+        if (rowIndex == ruleContainsUserNameIndex)
+        {
+            pushRule = [_mxAccount.mxSession.notificationCenter ruleById:kMXNotificationCenterContainUserNameRuleID];
+            ruleDescription = [MatrixKitL10n notificationSettingsContainMyUserName];
+        }
+        if (rowIndex == ruleContainsDisplayNameIndex)
+        {
+            pushRule = [_mxAccount.mxSession.notificationCenter ruleById:kMXNotificationCenterContainDisplayNameRuleID];
+            ruleDescription = [MatrixKitL10n notificationSettingsContainMyDisplayName];
+        }
+        if (rowIndex == ruleOneToOneRoomIndex)
+        {
+            pushRule = [_mxAccount.mxSession.notificationCenter ruleById:kMXNotificationCenterOneToOneRoomRuleID];
+            ruleDescription = [MatrixKitL10n notificationSettingsJustSentToMe];
+        }
+        if (rowIndex == ruleInviteForMeIndex)
+        {
+            pushRule = [_mxAccount.mxSession.notificationCenter ruleById:kMXNotificationCenterInviteMeRuleID];
+            ruleDescription = [MatrixKitL10n notificationSettingsInviteToANewRoom];
+        }
+        if (rowIndex == ruleMemberEventIndex)
+        {
+            pushRule = [_mxAccount.mxSession.notificationCenter ruleById:kMXNotificationCenterMemberEventRuleID];
+            ruleDescription = [MatrixKitL10n notificationSettingsPeopleJoinLeaveRooms];
+        }
+        if (rowIndex == ruleCallIndex)
+        {
+            pushRule = [_mxAccount.mxSession.notificationCenter ruleById:kMXNotificationCenterCallRuleID];
+            ruleDescription = [MatrixKitL10n notificationSettingsReceiveACall];
+        }
+        if (rowIndex == ruleSuppressBotsNotificationsIndex)
+        {
+            pushRule = [_mxAccount.mxSession.notificationCenter ruleById:kMXNotificationCenterSuppressBotsNotificationsRuleID];
+            ruleDescription = [MatrixKitL10n notificationSettingsSuppressFromBots];
+        }
+        
+        if (pushRule)
+        {
+            MXKPushRuleTableViewCell *pushRuleCell = [tableView dequeueReusableCellWithIdentifier:[MXKPushRuleTableViewCell defaultReuseIdentifier]];
+            if (!pushRuleCell)
+            {
+                pushRuleCell = [[MXKPushRuleTableViewCell alloc] init];
+            }
+            
+            pushRuleCell.mxSession = _mxAccount.mxSession;
+            pushRuleCell.mxPushRule = pushRule;
+            pushRuleCell.ruleDescription.text = ruleDescription;
+            
+            cell = pushRuleCell;
+        }
+    }
+    else if (indexPath.section == MXKNOTIFICATIONSETTINGS_SECTION_DEFAULT_INDEX)
+    {
+        MXPushRule *pushRule = [_mxAccount.mxSession.notificationCenter ruleById:kMXNotificationCenterAllOtherRoomMessagesRuleID];
+        
+        if (pushRule)
+        {
+            MXKPushRuleTableViewCell *pushRuleCell = [tableView dequeueReusableCellWithIdentifier:[MXKPushRuleTableViewCell defaultReuseIdentifier]];
+            if (!pushRuleCell)
+            {
+                pushRuleCell = [[MXKPushRuleTableViewCell alloc] init];
+            }
+            
+            pushRuleCell.mxSession = _mxAccount.mxSession;
+            pushRuleCell.mxPushRule = pushRule;
+            pushRuleCell.ruleDescription.text = [MatrixKitL10n notificationSettingsNotifyAllOther];
+
+            cell = pushRuleCell;
+        }
+    }
+    else
+    {
+        // Return a fake cell to prevent app from crashing.
+        cell = [[UITableViewCell alloc] init];
+    }
+    
+    return cell;
+}
+
+#pragma mark - UITableView delegate
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    if (indexPath.section == MXKNOTIFICATIONSETTINGS_SECTION_INTRO_INDEX && indexPath.row == 1)
+    {
+        UITextView *textView = [[UITextView alloc] initWithFrame:CGRectMake(0, 0, tableView.frame.size.width, MAXFLOAT)];
+        textView.font = [UIFont systemFontOfSize:14];
+        textView.text = areAllDisabled ? [MatrixKitL10n notificationSettingsEnableNotificationsWarning] : [MatrixKitL10n notificationSettingsGlobalInfo];
+        CGSize contentSize = [textView sizeThatFits:textView.frame.size];
+        return contentSize.height + 1;
+    }
+    
+    if (indexPath.section == MXKNOTIFICATIONSETTINGS_SECTION_PER_WORD_INDEX)
+    {
+        if (indexPath.row == 0)
+        {
+            UITextView *textView = [[UITextView alloc] initWithFrame:CGRectMake(0, 0, tableView.frame.size.width, MAXFLOAT)];
+            textView.font = [UIFont systemFontOfSize:14];
+            textView.text = [MatrixKitL10n notificationSettingsPerWordInfo];
+            CGSize contentSize = [textView sizeThatFits:textView.frame.size];
+            return contentSize.height + 1;
+        }
+        else if (indexPath.row == contentRuleCreationIndex)
+        {
+            return 120;
+        }
+    }
+    
+    if (indexPath.section == MXKNOTIFICATIONSETTINGS_SECTION_PER_ROOM_INDEX && indexPath.row == roomRuleCreationIndex)
+    {
+        return 120;
+    }
+    
+    if (indexPath.section == MXKNOTIFICATIONSETTINGS_SECTION_PER_SENDER_INDEX && indexPath.row == senderRuleCreationIndex)
+    {
+        return 120;
+    }
+    
+    return 50;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
+{
+    if (section != MXKNOTIFICATIONSETTINGS_SECTION_INTRO_INDEX)
+    {
+        return 30;
+    }
+    return 0;
+}
+
+- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
+{
+    UIView *sectionHeader = [[UIView alloc] initWithFrame:[tableView rectForHeaderInSection:section]];
+    sectionHeader.backgroundColor = [UIColor colorWithRed:0.9 green:0.9 blue:0.9 alpha:1.0];
+    UILabel *sectionLabel = [[UILabel alloc] initWithFrame:CGRectMake(5, 5, sectionHeader.frame.size.width - 10, sectionHeader.frame.size.height - 10)];
+    sectionLabel.font = [UIFont boldSystemFontOfSize:16];
+    sectionLabel.backgroundColor = [UIColor clearColor];
+    [sectionHeader addSubview:sectionLabel];
+    
+    if (section == MXKNOTIFICATIONSETTINGS_SECTION_PER_WORD_INDEX)
+    {
+        sectionLabel.text = [MatrixKitL10n notificationSettingsPerWordNotifications];
+    }
+    else if (section == MXKNOTIFICATIONSETTINGS_SECTION_PER_ROOM_INDEX)
+    {
+        sectionLabel.text = [MatrixKitL10n notificationSettingsPerRoomNotifications];
+    }
+    else if (section == MXKNOTIFICATIONSETTINGS_SECTION_PER_SENDER_INDEX)
+    {
+        sectionLabel.text = [MatrixKitL10n notificationSettingsPerSenderNotifications];
+    }
+    else if (section == MXKNOTIFICATIONSETTINGS_SECTION_OTHERS_INDEX)
+    {
+        sectionLabel.text = [MatrixKitL10n notificationSettingsOtherAlerts];
+    }
+    else if (section == MXKNOTIFICATIONSETTINGS_SECTION_DEFAULT_INDEX)
+    {
+        sectionLabel.text = [MatrixKitL10n notificationSettingsByDefault];
+    }
+    
+    return sectionHeader;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKPreviewViewController.h b/Riot/Modules/MatrixKit/Controllers/MXKPreviewViewController.h
new file mode 100644
index 000000000..127baaa9b
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKPreviewViewController.h
@@ -0,0 +1,74 @@
+/*
+ Copyright 2020 The Matrix.org Foundation C.I.C
+ 
+ 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/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol MXKPreviewViewControllerDelegate;
+
+/**
+ @brief A view controller that previews, opens, or prints files whose file format cannot be handled directly by your app.
+ 
+ Use this class to present an appropriate user interface for previewing, opening, copying, or printing a specified file. For example, an email program might use this class to allow the user to preview attachments and open them in other apps.
+ 
+ After presenting its user interface, a document interaction controller handles all interactions needed to support file preview and menu display.
+ 
+ Unlike UIDocumentInteractionController, this view controller aims to be modal presented.
+ */
+@interface MXKPreviewViewController : UINavigationController
+
+/**
+ @brief presents a new instance of MXKPreviewViewController as modal.
+ 
+ @param presenting view controller that presents the MXKPreviewViewController
+ @param fileUrl URL of the file. This URL should point to a local file.
+ @param allowActions YES to display actions Button. NO otherwise
+ @param delegate delegate (optional) that receives some events about the lifecycle of the MXKPreviewViewController
+ 
+ @return the instance of MXKPreviewViewController
+ */
++ (MXKPreviewViewController *)presentFrom:(nonnull UIViewController *)presenting
+            fileUrl: (nonnull NSURL *)fileUrl
+       allowActions: (BOOL)allowActions
+           delegate: (nullable id<MXKPreviewViewControllerDelegate>)delegate;
+
+@end
+
+/**
+ A set of methods you can implement to respond to messages from a preview controller.
+ */
+@protocol MXKPreviewViewControllerDelegate <NSObject>
+
+@optional
+
+/**
+ The MXKPreviewViewController will present the preview
+ 
+ @param controller the instance of MXKPreviewViewController
+ */
+- (void)previewViewControllerWillBeginPreview:(MXKPreviewViewController *)controller;
+
+/**
+ The MXKPreviewViewController did end presenting the preview
+ 
+ @param controller the instance of MXKPreviewViewController
+ */
+- (void)previewViewControllerDidEndPreview:(MXKPreviewViewController *)controller;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKPreviewViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKPreviewViewController.m
new file mode 100644
index 000000000..214ea6c17
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKPreviewViewController.m
@@ -0,0 +1,104 @@
+/*
+ Copyright 2020 Vector Creations 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 "MXKPreviewViewController.h"
+@import QuickLook;
+
+@interface MXKPreviewViewController () <QLPreviewControllerDataSource>
+
+/// A specialized view controller for previewing an item.
+@property (nonatomic, weak) QLPreviewController *previewController;
+
+/// URL of the file to preview
+@property (nonatomic, strong) NSURL *fileURL;
+
+/// YES to display actions Button. NO otherwise
+@property (nonatomic) BOOL allowActions;
+
+@property (nonatomic, weak) id<MXKPreviewViewControllerDelegate> previewDelegate;
+
+@end
+
+@implementation MXKPreviewViewController
+
++ (MXKPreviewViewController *)presentFrom:(UIViewController *)presenting fileUrl:(NSURL *)fileUrl allowActions:(BOOL)allowActions delegate:(nullable id<MXKPreviewViewControllerDelegate>)delegate
+{
+    MXKPreviewViewController *previewController = [[MXKPreviewViewController alloc] initWithFileUrl: fileUrl allowActions: allowActions];
+    previewController.previewDelegate = delegate;
+    if ([delegate respondsToSelector:@selector(previewViewControllerWillBeginPreview:)]) {
+        [delegate previewViewControllerWillBeginPreview:previewController];
+    }
+    [presenting presentViewController:previewController animated:YES completion:^{
+    }];
+    
+    return previewController;
+}
+
+- (instancetype)initWithFileUrl: (NSURL *)fileUrl allowActions: (BOOL)allowActions
+{
+    QLPreviewController *previewController = [[QLPreviewController alloc] init];
+    self = [super initWithRootViewController:previewController];
+    self.previewController = previewController;
+    
+    if (self)
+    {
+        self.modalPresentationStyle = UIModalPresentationFullScreen;
+        self.fileURL = fileUrl;
+        self.allowActions = allowActions;
+        self.previewController.dataSource = self;
+        self.previewController.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(doneAction:)];
+    }
+    
+    return self;
+}
+
+- (void)viewDidLayoutSubviews
+{
+    [super viewDidLayoutSubviews];
+    
+    if (!self.allowActions)
+    {
+        NSMutableArray *items = [NSMutableArray arrayWithArray: self.previewController.navigationItem.rightBarButtonItems];
+        if (items.count > 0)
+        {
+            [items removeObjectAtIndex:0];
+        }
+        self.previewController.navigationItem.rightBarButtonItems = items;
+    }
+}
+
+- (IBAction)doneAction:(id)sender
+{
+    [self dismissViewControllerAnimated:YES completion:^{
+        if ([self.previewDelegate respondsToSelector:@selector(previewViewControllerDidEndPreview:)]) {
+            [self.previewDelegate previewViewControllerDidEndPreview:self];
+        }
+    }];
+}
+
+#pragma mark - QLPreviewControllerDataSource
+
+- (NSInteger)numberOfPreviewItemsInPreviewController:(nonnull QLPreviewController *)controller
+{
+    return self.fileURL ? 1 : 0;
+}
+
+- (nonnull id<QLPreviewItem>)previewController:(nonnull QLPreviewController *)controller previewItemAtIndex:(NSInteger)index
+{
+    return self.fileURL;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKRecentListViewController.h b/Riot/Modules/MatrixKit/Controllers/MXKRecentListViewController.h
new file mode 100644
index 000000000..da8d193f3
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKRecentListViewController.h
@@ -0,0 +1,129 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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/UIKit.h>
+
+#import "MXKViewController.h"
+#import "MXKRecentsDataSource.h"
+
+@class MXKRecentListViewController;
+
+/**
+ `MXKRecentListViewController` delegate.
+ */
+@protocol MXKRecentListViewControllerDelegate <NSObject>
+
+/**
+ Tells the delegate that the user selected a room.
+
+ @param recentListViewController the `MXKRecentListViewController` instance.
+ @param roomId the id of the selected room.
+ @param mxSession the matrix session in which the room is defined.
+ */
+- (void)recentListViewController:(MXKRecentListViewController *)recentListViewController didSelectRoom:(NSString*)roomId inMatrixSession:(MXSession*)mxSession;
+
+/**
+ Tells the delegate that the user selected a suggested room.
+
+ @param recentListViewController the `MXKRecentListViewController` instance.
+ @param childInfo the `MXSpaceChildInfo` instance that describes the selected room.
+ */
+-(void)recentListViewController:(MXKRecentListViewController *)recentListViewController didSelectSuggestedRoom:(MXSpaceChildInfo *)childInfo;
+
+@end
+
+
+/**
+ This view controller displays a room list.
+ */
+@interface MXKRecentListViewController : MXKViewController <MXKDataSourceDelegate, UITableViewDelegate, UISearchBarDelegate>
+{
+@protected
+    
+    /**
+     The fake top view displayed in case of vertical bounce.
+     */
+    __weak UIView *topview;
+}
+
+@property (weak, nonatomic) IBOutlet UISearchBar *recentsSearchBar;
+@property (weak, nonatomic) IBOutlet UITableView *recentsTableView;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *recentsSearchBarTopConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *recentsSearchBarHeightConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *recentsTableViewBottomConstraint;
+
+/**
+ The current data source associated to the view controller.
+ */
+@property (nonatomic, readonly) MXKRecentsDataSource *dataSource;
+
+/**
+ The delegate for the view controller.
+ */
+@property (nonatomic, weak) id<MXKRecentListViewControllerDelegate> delegate;
+
+/**
+ Enable the search option by adding a navigation item in the navigation bar (YES by default).
+ Set NO this property to disable this option and hide the related bar button.
+ */
+@property (nonatomic) BOOL enableBarButtonSearch;
+
+#pragma mark - Class methods
+
+/**
+ Returns the `UINib` object initialized for a `MXKRecentListViewController`.
+ 
+ @return The initialized `UINib` object or `nil` if there were errors during initialization
+ or the nib file could not be located.
+ 
+ @discussion You may override this method to provide a customized nib. If you do,
+ you should also override `recentListViewController` to return your
+ view controller loaded from your custom nib.
+ */
++ (UINib *)nib;
+
+/**
+ Creates and returns a new `MXKRecentListViewController` object.
+ 
+ @discussion This is the designated initializer for programmatic instantiation.
+ @return An initialized `MXKRecentListViewController` object if successful, `nil` otherwise.
+ */
++ (instancetype)recentListViewController;
+
+/**
+ Display the recents described in the provided data source.
+ 
+ Note1: The provided data source will replace the current data source if any. The caller
+ should dispose properly this data source if it is not used anymore.
+ 
+ Note2: You may provide here a MXKInterleavedRecentsDataSource instance to display interleaved recents.
+
+ @param listDataSource the data source providing the recents list.
+ */
+- (void)displayList:(MXKRecentsDataSource*)listDataSource;
+
+/**
+ Refresh the recents table display.
+ */
+- (void)refreshRecentsTable;
+
+/**
+ Hide/show the search bar at the top of the recents table view.
+ */
+- (void)hideSearchBar:(BOOL)hidden;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKRecentListViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKRecentListViewController.m
new file mode 100644
index 000000000..828f84825
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKRecentListViewController.m
@@ -0,0 +1,624 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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 "MXKRecentListViewController.h"
+
+#import "MXKRoomDataSourceManager.h"
+
+#import "MXKInterleavedRecentsDataSource.h"
+#import "MXKInterleavedRecentTableViewCell.h"
+
+#import "MXKSwiftHeader.h"
+
+@interface MXKRecentListViewController ()
+{
+    /**
+     The data source providing UITableViewCells
+     */
+    MXKRecentsDataSource *dataSource;
+    
+    /**
+     Search handling
+     */
+    UIBarButtonItem *searchButton;
+    BOOL ignoreSearchRequest;
+    
+    /**
+     The reconnection animated view.
+     */
+    __weak UIView* reconnectingView;
+    
+    /**
+     The current table view header if any.
+     */
+    UIView* tableViewHeaderView;
+    
+    /**
+     The latest server sync date
+     */
+    NSDate* latestServerSync;
+    
+    /**
+     The restart the event connnection
+     */
+    BOOL restartConnection;
+}
+
+@end
+
+@implementation MXKRecentListViewController
+@synthesize dataSource;
+
+#pragma mark - Class methods
+
++ (UINib *)nib
+{
+    return [UINib nibWithNibName:NSStringFromClass([MXKRecentListViewController class])
+                          bundle:[NSBundle bundleForClass:[MXKRecentListViewController class]]];
+}
+
++ (instancetype)recentListViewController
+{
+    return [[[self class] alloc] initWithNibName:NSStringFromClass([MXKRecentListViewController class])
+                                          bundle:[NSBundle bundleForClass:[MXKRecentListViewController class]]];
+}
+
+#pragma mark -
+
+- (void)finalizeInit
+{
+    [super finalizeInit];
+    
+    _enableBarButtonSearch = YES;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    // Check whether the view controller has been pushed via storyboard
+    if (!_recentsTableView)
+    {
+        // Instantiate view controller objects
+        [[[self class] nib] instantiateWithOwner:self options:nil];
+    }
+    
+    // Adjust search bar Top constraint to take into account potential navBar.
+    if (_recentsSearchBarTopConstraint)
+    {
+        _recentsSearchBarTopConstraint.active = NO;
+        _recentsSearchBarTopConstraint = [NSLayoutConstraint constraintWithItem:self.topLayoutGuide
+                                                                      attribute:NSLayoutAttributeBottom
+                                                                      relatedBy:NSLayoutRelationEqual
+                                                                         toItem:self.recentsSearchBar
+                                                                      attribute:NSLayoutAttributeTop
+                                                                     multiplier:1.0f
+                                                                       constant:0.0f];
+
+        _recentsSearchBarTopConstraint.active = YES;
+    }
+    
+    // Adjust table view Bottom constraint to take into account tabBar.
+    if (_recentsTableViewBottomConstraint)
+    {
+        _recentsTableViewBottomConstraint.active = NO;
+        _recentsTableViewBottomConstraint = [NSLayoutConstraint constraintWithItem:self.bottomLayoutGuide
+                                                                         attribute:NSLayoutAttributeTop
+                                                                         relatedBy:NSLayoutRelationEqual
+                                                                            toItem:self.recentsTableView
+                                                                         attribute:NSLayoutAttributeBottom
+                                                                        multiplier:1.0f
+                                                                          constant:0.0f];
+
+        _recentsTableViewBottomConstraint.active = YES;
+    }
+    
+    // Hide search bar by default
+    [self hideSearchBar:YES];
+    
+    // Apply search option in navigation bar
+    self.enableBarButtonSearch = _enableBarButtonSearch;
+    
+    // Add an accessory view to the search bar in order to retrieve keyboard view.
+    self.recentsSearchBar.inputAccessoryView = [[UIView alloc] initWithFrame:CGRectZero];
+    
+    // Finalize table view configuration
+    self.recentsTableView.delegate = self;
+    self.recentsTableView.dataSource = dataSource; // Note: dataSource may be nil here
+    
+    // Set up classes to use for cells
+    [self.recentsTableView registerNib:MXKRecentTableViewCell.nib forCellReuseIdentifier:MXKRecentTableViewCell.defaultReuseIdentifier];
+    // Consider here the specific case where interleaved recents are supported
+    [self.recentsTableView registerNib:MXKInterleavedRecentTableViewCell.nib forCellReuseIdentifier:MXKInterleavedRecentTableViewCell.defaultReuseIdentifier];
+    
+    // Add a top view which will be displayed in case of vertical bounce.
+    CGFloat height = self.recentsTableView.frame.size.height;
+    UIView *topview = [[UIView alloc] initWithFrame:CGRectMake(0,-height,self.recentsTableView.frame.size.width,height)];
+    topview.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+    topview.backgroundColor = [UIColor groupTableViewBackgroundColor];
+    [self.recentsTableView addSubview:topview];
+    self->topview = topview;
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+
+    // Restore search mechanism (if enabled)
+    ignoreSearchRequest = NO;
+
+    // Observe server sync at room data source level too
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onMatrixSessionChange) name:kMXKRoomDataSourceSyncStatusChanged object:nil];
+    
+    // Observe the server sync
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onSyncNotification) name:kMXSessionDidSyncNotification object:nil];
+    
+    // Do a full reload
+    [self refreshRecentsTable];
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+
+    // The user may still press search button whereas the view disappears
+    ignoreSearchRequest = YES;
+
+    // Leave potential search session
+    if (!self.recentsSearchBar.isHidden)
+    {
+        [self searchBarCancelButtonClicked:self.recentsSearchBar];
+    }
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXKRoomDataSourceSyncStatusChanged object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionDidSyncNotification object:nil];
+    
+    [self removeReconnectingView];
+}
+
+- (void)dealloc
+{
+    self.recentsSearchBar.inputAccessoryView = nil;
+    
+    searchButton = nil;
+}
+
+- (void)didReceiveMemoryWarning
+{
+    [super didReceiveMemoryWarning];
+    
+    // Dispose of any resources that can be recreated.
+}
+
+#pragma mark - Override MXKViewController
+
+- (void)onMatrixSessionChange
+{
+    [super onMatrixSessionChange];
+    
+    // Check whether no server sync is in progress in room data sources
+    NSArray *mxSessions = self.mxSessions;
+    for (MXSession *mxSession in mxSessions)
+    {
+        if ([MXKRoomDataSourceManager sharedManagerForMatrixSession:mxSession].isServerSyncInProgress)
+        {
+            // sync is in progress for at least one data source, keep running the loading wheel
+            [self.activityIndicator startAnimating];
+            break;
+        }
+    }
+}
+
+- (void)onKeyboardShowAnimationComplete
+{
+    // Report the keyboard view in order to track keyboard frame changes
+    self.keyboardView = _recentsSearchBar.inputAccessoryView.superview;
+}
+
+- (void)setKeyboardHeight:(CGFloat)keyboardHeight
+{
+    // Deduce the bottom constraint for the table view (Don't forget the potential tabBar)
+    CGFloat tableViewBottomConst = keyboardHeight - self.bottomLayoutGuide.length;
+    // Check whether the keyboard is over the tabBar
+    if (tableViewBottomConst < 0)
+    {
+        tableViewBottomConst = 0;
+    }
+    
+    // Update constraints
+    _recentsTableViewBottomConstraint.constant = tableViewBottomConst;
+    
+    // Force layout immediately to take into account new constraint
+    [self.view layoutIfNeeded];
+}
+
+- (void)destroy
+{
+    self.recentsTableView.dataSource = nil;
+    self.recentsTableView.delegate = nil;
+    self.recentsTableView = nil;
+    
+    dataSource.delegate = nil;
+    dataSource = nil;
+    
+    _delegate = nil;
+    
+    [topview removeFromSuperview];
+    topview = nil;
+    
+    [super destroy];
+}
+
+#pragma mark -
+
+- (void)setEnableBarButtonSearch:(BOOL)enableBarButtonSearch
+{
+    _enableBarButtonSearch = enableBarButtonSearch;
+    
+    if (enableBarButtonSearch)
+    {
+        if (!searchButton)
+        {
+            searchButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSearch target:self action:@selector(search:)];
+        }
+        
+        // Add it in right bar items
+        NSArray *rightBarButtonItems = self.navigationItem.rightBarButtonItems;
+        self.navigationItem.rightBarButtonItems = rightBarButtonItems ? [rightBarButtonItems arrayByAddingObject:searchButton] : @[searchButton];
+    }
+    else
+    {
+        NSMutableArray *rightBarButtonItems = [NSMutableArray arrayWithArray: self.navigationItem.rightBarButtonItems];
+        [rightBarButtonItems removeObject:searchButton];
+        self.navigationItem.rightBarButtonItems = rightBarButtonItems;
+    }
+}
+
+- (void)displayList:(MXKRecentsDataSource *)listDataSource
+{
+    // Cancel registration on existing dataSource if any
+    if (dataSource)
+    {
+        dataSource.delegate = nil;
+        
+        // Remove associated matrix sessions
+        NSArray *mxSessions = self.mxSessions;
+        for (MXSession *mxSession in mxSessions)
+        {
+            [self removeMatrixSession:mxSession];
+        }
+    }
+    
+    dataSource = listDataSource;
+    dataSource.delegate = self;
+    
+    // Report all matrix sessions at view controller level to update UI according to sessions state
+    NSArray *mxSessions = listDataSource.mxSessions;
+    for (MXSession *mxSession in mxSessions)
+    {
+        [self addMatrixSession:mxSession];
+    }
+    
+    if (self.recentsTableView)
+    {
+        // Set up table data source
+        self.recentsTableView.dataSource = dataSource;
+    }
+}
+
+- (void)refreshRecentsTable
+{
+    // For now, do a simple full reload
+    [self.recentsTableView reloadData];
+}
+
+- (void)hideSearchBar:(BOOL)hidden
+{
+    self.recentsSearchBar.hidden = hidden;
+    self.recentsSearchBarHeightConstraint.constant = hidden ? 0 : 44;
+    [self.view setNeedsUpdateConstraints];
+}
+
+#pragma mark - Action
+
+- (IBAction)search:(id)sender
+{
+    // The user may have pressed search button whereas the view controller was disappearing
+    if (ignoreSearchRequest)
+    {
+        return;
+    }
+    
+    if (self.recentsSearchBar.isHidden)
+    {
+        // Check whether there are data in which search
+        if ([self.dataSource numberOfSectionsInTableView:self.recentsTableView])
+        {
+            [self hideSearchBar:NO];
+            
+            // Create search bar
+            [self.recentsSearchBar becomeFirstResponder];
+        }
+    }
+    else
+    {
+        [self searchBarCancelButtonClicked: self.recentsSearchBar];
+    }
+}
+
+#pragma mark - MXKDataSourceDelegate
+
+- (Class<MXKCellRendering>)cellViewClassForCellData:(MXKCellData*)cellData
+{
+    // Consider here the specific case where interleaved recents are supported
+    if ([dataSource isKindOfClass:MXKInterleavedRecentsDataSource.class])
+    {
+        return MXKInterleavedRecentTableViewCell.class;
+    }
+    
+    // Return the default recent table view cell
+    return MXKRecentTableViewCell.class;
+}
+
+- (NSString *)cellReuseIdentifierForCellData:(MXKCellData*)cellData
+{
+    // Consider here the specific case where interleaved recents are supported
+    if ([dataSource isKindOfClass:MXKInterleavedRecentsDataSource.class])
+    {
+        return MXKInterleavedRecentTableViewCell.defaultReuseIdentifier;
+    }
+    
+    // Return the default recent table view cell
+    return MXKRecentTableViewCell.defaultReuseIdentifier;
+}
+
+- (void)dataSource:(MXKDataSource *)dataSource didCellChange:(id)changes
+{
+    // For now, do a simple full reload
+    [self refreshRecentsTable];
+}
+
+- (void)dataSource:(MXKDataSource *)dataSource didAddMatrixSession:(MXSession *)mxSession
+{
+    [self addMatrixSession:mxSession];
+}
+
+- (void)dataSource:(MXKDataSource *)dataSource didRemoveMatrixSession:(MXSession *)mxSession
+{
+    [self removeMatrixSession:mxSession];
+}
+
+#pragma mark - UITableView delegate
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return [dataSource cellHeightAtIndexPath:indexPath];
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
+{
+    // Section header is required only when several recent lists are displayed.
+    if (self.dataSource.displayedRecentsDataSourcesCount > 1)
+    {
+        return 35;
+    }
+    return 0;
+}
+
+- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
+{
+    // Let dataSource provide the section header.
+    return [dataSource viewForHeaderInSection:section withFrame:[tableView rectForHeaderInSection:section]];
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    if (_delegate)
+    {
+        UITableViewCell *selectedCell = [tableView cellForRowAtIndexPath:indexPath];
+        
+        if ([selectedCell conformsToProtocol:@protocol(MXKCellRendering)])
+        {
+            id<MXKCellRendering> cell = (id<MXKCellRendering>)selectedCell;
+            
+            if ([cell respondsToSelector:@selector(renderedCellData)])
+            {
+                MXKCellData *cellData = cell.renderedCellData;
+                if ([cellData conformsToProtocol:@protocol(MXKRecentCellDataStoring)])
+                {
+                    id<MXKRecentCellDataStoring> recentCellData = (id<MXKRecentCellDataStoring>)cellData;
+                    if (recentCellData.isSuggestedRoom)
+                    {
+                        [_delegate recentListViewController:self
+                                     didSelectSuggestedRoom:recentCellData.roomSummary.spaceChildInfo];
+                    }
+                    else
+                    {
+                        [_delegate recentListViewController:self
+                                              didSelectRoom:recentCellData.roomIdentifier
+                                            inMatrixSession:recentCellData.mxSession];
+                    }
+                }
+            }
+        }
+    }
+    
+    // Hide the keyboard when user select a room
+    // do not hide the searchBar until the view controller disappear
+    // on tablets / iphone 6+, the user could expect to search again while looking at a room
+    [self.recentsSearchBar resignFirstResponder];
+}
+
+- (void)tableView:(UITableView *)tableView didEndDisplayingCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath*)indexPath
+{
+    // Release here resources, and restore reusable cells
+    if ([cell respondsToSelector:@selector(didEndDisplay)])
+    {
+        [(id<MXKCellRendering>)cell didEndDisplay];
+    }
+}
+
+- (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset
+{
+    // Detect vertical bounce at the top of the tableview to trigger reconnection.
+    if (scrollView == _recentsTableView)
+    {
+        [self detectPullToKick:scrollView];
+    }
+}
+
+- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
+{
+    if (scrollView == _recentsTableView)
+    {
+        [self managePullToKick:scrollView];
+    }
+}
+
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView
+{
+    if (scrollView == _recentsTableView)
+    {
+        if (scrollView.contentOffset.y + scrollView.adjustedContentInset.top == 0)
+        {
+            [self managePullToKick:scrollView];
+        }
+    }
+}
+
+#pragma mark - UISearchBarDelegate
+
+- (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText
+{
+    // Apply filter
+    if (searchText.length)
+    {
+        [self.dataSource searchWithPatterns:@[searchText]];
+    }
+    else
+    {
+        [self.dataSource searchWithPatterns:nil];
+    }
+}
+
+- (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar
+{
+    // "Done" key has been pressed
+    [searchBar resignFirstResponder];
+}
+
+- (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar
+{
+    // Leave search
+    [searchBar resignFirstResponder];
+    
+    [self hideSearchBar:YES];
+    
+    self.recentsSearchBar.text = nil;
+    
+    // Refresh display
+    [self.dataSource searchWithPatterns:nil];
+}
+
+#pragma mark - resync management
+
+- (void)onSyncNotification
+{
+    latestServerSync = [NSDate date];
+    [self removeReconnectingView];
+}
+
+- (BOOL)canReconnect
+{
+    // avoid restarting connection if some data has been received within 1 second (1000 : latestServerSync is null)
+    NSTimeInterval interval = latestServerSync ? [[NSDate date] timeIntervalSinceDate:latestServerSync] : 1000;
+    return  (interval > 1) && [self.mainSession reconnect];
+}
+
+- (void)addReconnectingView
+{
+    if (!reconnectingView)
+    {
+        UIActivityIndicatorView* spinner  = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
+        spinner.transform = CGAffineTransformMakeScale(0.75f, 0.75f);
+        CGRect frame = spinner.frame;
+        frame.size.height = 80; // 80 * 0.75 = 60
+        spinner.bounds = frame;
+        spinner.color = [UIColor darkGrayColor];
+        spinner.hidesWhenStopped = NO;
+        spinner.backgroundColor = _recentsTableView.backgroundColor;
+        [spinner startAnimating];
+        
+        // no need to manage constraints here, IOS defines them.
+        tableViewHeaderView = _recentsTableView.tableHeaderView;
+        _recentsTableView.tableHeaderView = reconnectingView = spinner;
+    }
+}
+
+- (void)removeReconnectingView
+{
+    if (reconnectingView && !restartConnection)
+    {
+        _recentsTableView.tableHeaderView = tableViewHeaderView;
+        reconnectingView = nil;
+    }
+}
+
+/**
+ Detect if the current connection must be restarted.
+ The spinner is displayed until the overscroll ends (and scrollViewDidEndDecelerating is called).
+ */
+- (void)detectPullToKick:(UIScrollView *)scrollView
+{
+    if (!reconnectingView)
+    {
+        // detect if the user scrolls over the tableview top
+        restartConnection = (scrollView.contentOffset.y + scrollView.adjustedContentInset.top < -128);
+        
+        if (restartConnection)
+        {
+            // wait that list decelerate to display / hide it
+            [self addReconnectingView];
+        }
+    }
+}
+
+/**
+ Restarts the current connection if it is required.
+ The 0.3s delay is added to avoid flickering if the connection does not require to be restarted.
+ */
+- (void)managePullToKick:(UIScrollView *)scrollView
+{
+    // the current connection must be restarted
+    if (restartConnection)
+    {
+        // display at least 0.3s the spinner to show to the user that something is pending
+        // else the UI is flickering
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.3 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+            self->restartConnection = NO;
+            
+            if (![self canReconnect])
+            {
+                // if the event stream has not been restarted
+                // hide the spinner
+                [self removeReconnectingView];
+            }
+            // else wait that onSyncNotification is called.
+        });
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKRecentListViewController.xib b/Riot/Modules/MatrixKit/Controllers/MXKRecentListViewController.xib
new file mode 100644
index 000000000..441694c1f
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKRecentListViewController.xib
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MXKRecentListViewController">
+            <connections>
+                <outlet property="recentsSearchBar" destination="Zbr-9e-VZh" id="AvH-q6-dOM"/>
+                <outlet property="recentsSearchBarHeightConstraint" destination="jCU-cq-2OA" id="w76-xb-0xq"/>
+                <outlet property="recentsSearchBarTopConstraint" destination="aRg-Nz-enq" id="gI4-54-oEm"/>
+                <outlet property="recentsTableView" destination="orV-HH-88x" id="lgA-2k-pXJ"/>
+                <outlet property="recentsTableViewBottomConstraint" destination="m4x-32-odR" id="8JQ-c9-1Tq"/>
+                <outlet property="view" destination="iN0-l3-epB" id="NUQ-LI-M61"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <searchBar contentMode="redraw" showsCancelButton="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Zbr-9e-VZh">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="44" id="jCU-cq-2OA"/>
+                    </constraints>
+                    <textInputTraits key="textInputTraits" returnKeyType="done"/>
+                    <connections>
+                        <outlet property="delegate" destination="-1" id="ejZ-kN-jKv"/>
+                    </connections>
+                </searchBar>
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="orV-HH-88x">
+                    <rect key="frame" x="0.0" y="44" width="375" height="623"/>
+                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                </tableView>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="orV-HH-88x" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="NaR-eJ-WMj"/>
+                <constraint firstItem="Zbr-9e-VZh" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="aRg-Nz-enq"/>
+                <constraint firstItem="Zbr-9e-VZh" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="fty-XB-tTr"/>
+                <constraint firstItem="orV-HH-88x" firstAttribute="top" secondItem="Zbr-9e-VZh" secondAttribute="bottom" id="lBa-P2-Vnx"/>
+                <constraint firstAttribute="bottom" secondItem="orV-HH-88x" secondAttribute="bottom" id="m4x-32-odR"/>
+                <constraint firstAttribute="trailing" secondItem="Zbr-9e-VZh" secondAttribute="trailing" id="rKb-TZ-sap"/>
+                <constraint firstAttribute="trailing" secondItem="orV-HH-88x" secondAttribute="trailing" id="yBp-63-kZi"/>
+            </constraints>
+        </view>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberDetailsViewController.h b/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberDetailsViewController.h
new file mode 100644
index 000000000..6724f6998
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberDetailsViewController.h
@@ -0,0 +1,212 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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/UIKit.h>
+
+#import "MXKViewController.h"
+#import "MXKImageView.h"
+
+/**
+ Available actions on room member
+ */
+typedef enum : NSUInteger
+{
+    MXKRoomMemberDetailsActionInvite,
+    MXKRoomMemberDetailsActionLeave,
+    MXKRoomMemberDetailsActionKick,
+    MXKRoomMemberDetailsActionBan,
+    MXKRoomMemberDetailsActionUnban,
+    MXKRoomMemberDetailsActionIgnore,
+    MXKRoomMemberDetailsActionUnignore,
+    MXKRoomMemberDetailsActionSetDefaultPowerLevel,
+    MXKRoomMemberDetailsActionSetModerator,
+    MXKRoomMemberDetailsActionSetAdmin,
+    MXKRoomMemberDetailsActionSetCustomPowerLevel,
+    MXKRoomMemberDetailsActionStartChat,
+    MXKRoomMemberDetailsActionStartVoiceCall,
+    MXKRoomMemberDetailsActionStartVideoCall,
+    MXKRoomMemberDetailsActionMention,
+    MXKRoomMemberDetailsActionSecurity,
+    MXKRoomMemberDetailsActionSecurityInformation
+    
+} MXKRoomMemberDetailsAction;
+
+@class MXKRoomMemberDetailsViewController;
+
+/**
+ `MXKRoomMemberDetailsViewController` delegate.
+ */
+@protocol MXKRoomMemberDetailsViewControllerDelegate <NSObject>
+
+/**
+ Tells the delegate that the user wants to start a one-to-one chat with the room member.
+ 
+ @param roomMemberDetailsViewController the `MXKRoomMemberDetailsViewController` instance.
+ @param matrixId the member's matrix id
+ @param completion the block to execute at the end of the operation (independently if it succeeded or not).
+ */
+- (void)roomMemberDetailsViewController:(MXKRoomMemberDetailsViewController *)roomMemberDetailsViewController startChatWithMemberId:(NSString*)matrixId completion:(void (^)(void))completion;
+
+@optional
+/**
+ Tells the delegate that the user wants to mention the room member.
+ 
+ @discussion the `MXKRoomMemberDetailsViewController` instance is withdrawn automatically.
+ 
+ @param roomMemberDetailsViewController the `MXKRoomMemberDetailsViewController` instance.
+ @param member the room member to mention.
+ */
+- (void)roomMemberDetailsViewController:(MXKRoomMemberDetailsViewController *)roomMemberDetailsViewController mention:(MXRoomMember*)member;
+
+/**
+ Tells the delegate that the user wants to place a voip call with the room member.
+ 
+ @param roomMemberDetailsViewController the `MXKRoomMemberDetailsViewController` instance.
+ @param matrixId the member's matrix id
+ @param isVideoCall the type of the call: YES for video call / NO for voice call.
+ */
+- (void)roomMemberDetailsViewController:(MXKRoomMemberDetailsViewController *)roomMemberDetailsViewController placeVoipCallWithMemberId:(NSString*)matrixId andVideo:(BOOL)isVideoCall;
+
+@end
+
+/**
+ Whereas the main item of this view controller is a table view, the 'MXKRoomMemberDetailsViewController' class inherits
+ from 'MXKViewController' instead of 'MXKTableViewController' in order to ease the customization.
+ Indeed some items like header may be added at the same level than the table.
+ */
+@interface MXKRoomMemberDetailsViewController : MXKViewController <UITableViewDelegate, UITableViewDataSource>
+{
+@protected
+    /**
+     Current alert (if any).
+     */
+    UIAlertController *currentAlert;
+    
+    /**
+     List of the allowed actions on this member.
+     */
+    NSMutableArray<NSNumber*> *actionsArray;
+}
+
+@property (weak, nonatomic) IBOutlet UITableView *tableView;
+
+@property (weak, nonatomic) IBOutlet MXKImageView *memberThumbnail;
+@property (weak, nonatomic) IBOutlet UITextView *roomMemberMatrixInfo;
+
+/**
+ The default account picture displayed when no picture is defined.
+ */
+@property (nonatomic) UIImage *picturePlaceholder;
+
+/**
+ The displayed member and the corresponding room
+ */
+@property (nonatomic, readonly) MXRoomMember *mxRoomMember;
+@property (nonatomic, readonly) MXRoom *mxRoom;
+@property (nonatomic, readonly) MXEventTimeline *mxRoomLiveTimeline;
+
+/**
+ Enable mention option. NO by default
+ */
+@property (nonatomic) BOOL enableMention;
+
+/**
+ Enable voip call (voice/video). NO by default
+ */
+@property (nonatomic) BOOL enableVoipCall;
+
+/**
+ Enable leave this room. YES by default
+ */
+@property (nonatomic) BOOL enableLeave;
+
+/**
+ Tell whether an action is already in progress.
+ */
+@property (nonatomic, readonly) BOOL hasPendingAction;
+
+/**
+ The delegate for the view controller.
+ */
+@property (nonatomic, weak) id<MXKRoomMemberDetailsViewControllerDelegate> delegate;
+
+#pragma mark - Class methods
+
+/**
+ Returns the `UINib` object initialized for a `MXKRoomMemberDetailsViewController`.
+ 
+ @return The initialized `UINib` object or `nil` if there were errors during initialization
+ or the nib file could not be located.
+ 
+ @discussion You may override this method to provide a customized nib. If you do,
+ you should also override `roomMemberDetailsViewController` to return your
+ view controller loaded from your custom nib.
+ */
++ (UINib *)nib;
+
+/**
+ Creates and returns a new `MXKRoomMemberDetailsViewController` object.
+ 
+ @discussion This is the designated initializer for programmatic instantiation.
+ @return An initialized `MXKRoomMemberDetailsViewController` object if successful, `nil` otherwise.
+ */
++ (instancetype)roomMemberDetailsViewController;
+
+/**
+ Set the room member to display. Provide the actual room in order to handle member changes.
+ 
+ @param roomMember the matrix room member
+ @param room the matrix room to which this member belongs.
+ */
+- (void)displayRoomMember:(MXRoomMember*)roomMember withMatrixRoom:(MXRoom*)room;
+
+/**
+ Refresh the member information.
+ */
+- (void)updateMemberInfo;
+
+/**
+ The following method is registered on `UIControlEventTouchUpInside` event for all displayed action buttons.
+ 
+ The start chat and mention options are transferred to the delegate.
+ All the other actions are handled by the current implementation.
+ 
+ If the delegate responds to selector: @selector(roomMemberDetailsViewController:placeVoipCallWithMemberId:andVideo:), the voip options
+ are transferred to the delegate.
+ */
+- (IBAction)onActionButtonPressed:(id)sender;
+
+/**
+ Set the power level of the room member
+ 
+ @param value the value to set.
+ @param promptUser prompt the user if they ops a member with the same power level.
+ */
+- (void)setPowerLevel:(NSInteger)value promptUser:(BOOL)promptUser;
+
+/**
+ Add a mask in overlay to prevent a new contact selection (used when an action is on progress).
+ */
+- (void)addPendingActionMask;
+
+/**
+ Remove the potential overlay mask
+ */
+- (void)removePendingActionMask;
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberDetailsViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberDetailsViewController.m
new file mode 100644
index 000000000..67623bc18
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberDetailsViewController.m
@@ -0,0 +1,1037 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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 "MXKRoomMemberDetailsViewController.h"
+
+@import MatrixSDK.MXMediaManager;
+
+#import "MXKTableViewCellWithButtons.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKAppSettings.h"
+
+#import "MXKConstants.h"
+
+#import "MXKSwiftHeader.h"
+
+@interface MXKRoomMemberDetailsViewController ()
+{
+    id membersListener;
+    
+    // mask view while processing a request
+    UIActivityIndicatorView * pendingMaskSpinnerView;
+    
+    // Observe left rooms
+    id leaveRoomNotificationObserver;
+    
+    // Observe kMXRoomDidFlushDataNotification to take into account the updated room members when the room history is flushed.
+    id roomDidFlushDataNotificationObserver;
+
+    // Cache for the room live timeline
+    MXEventTimeline *mxRoomLiveTimeline;
+}
+
+@end
+
+@implementation MXKRoomMemberDetailsViewController
+@synthesize mxRoom;
+
++ (UINib *)nib
+{
+    return [UINib nibWithNibName:NSStringFromClass([MXKRoomMemberDetailsViewController class])
+                          bundle:[NSBundle bundleForClass:[MXKRoomMemberDetailsViewController class]]];
+}
+
++ (instancetype)roomMemberDetailsViewController
+{
+    return [[[self class] alloc] initWithNibName:NSStringFromClass([MXKRoomMemberDetailsViewController class])
+                                          bundle:[NSBundle bundleForClass:[MXKRoomMemberDetailsViewController class]]];
+}
+
+- (void)finalizeInit
+{
+    [super finalizeInit];
+    
+    actionsArray = [[NSMutableArray alloc] init];
+    _enableLeave = YES;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    // Check whether the view controller has been pushed via storyboard
+    if (!self.tableView)
+    {
+        // Instantiate view controller objects
+        [[[self class] nib] instantiateWithOwner:self options:nil];
+    }
+    
+    // ignore useless update
+    if (_mxRoomMember)
+    {
+        [self initObservers];
+    }
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    
+    [self initObservers];
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    
+    [self removeObservers];
+}
+
+- (void)destroy
+{
+    // close any pending actionsheet
+    if (currentAlert)
+    {
+        [currentAlert dismissViewControllerAnimated:NO completion:nil];
+        currentAlert = nil;
+    }
+    
+    [self removePendingActionMask];
+    
+    [self removeObservers];
+    
+    _delegate = nil;
+    _mxRoomMember = nil;
+    
+    actionsArray = nil;
+    
+    [super destroy];
+}
+
+#pragma mark -
+
+- (void)displayRoomMember:(MXRoomMember*)roomMember withMatrixRoom:(MXRoom*)room
+{
+    [self removeObservers];
+    
+    mxRoom = room;
+
+    MXWeakify(self);
+    [mxRoom liveTimeline:^(MXEventTimeline *liveTimeline) {
+        MXStrongifyAndReturnIfNil(self);
+
+        self->mxRoomLiveTimeline = liveTimeline;
+
+        // Update matrix session associated to the view controller
+        NSArray *mxSessions = self.mxSessions;
+        for (MXSession *mxSession in mxSessions) {
+            [self removeMatrixSession:mxSession];
+        }
+        [self addMatrixSession:room.mxSession];
+
+        self->_mxRoomMember = roomMember;
+
+        [self initObservers];
+    }];
+}
+
+- (MXEventTimeline *)mxRoomLiveTimeline
+{
+    // @TODO(async-state): Just here for dev
+    NSAssert(mxRoomLiveTimeline, @"[MXKRoomMemberDetailsViewController] Room live timeline must be preloaded before accessing to MXKRoomMemberDetailsViewController.mxRoomLiveTimeline");
+    return mxRoomLiveTimeline;
+}
+
+- (UIImage*)picturePlaceholder
+{
+    return [NSBundle mxk_imageFromMXKAssetsBundleWithName:@"default-profile"];
+}
+
+- (void)setEnableMention:(BOOL)enableMention
+{
+    if (_enableMention != enableMention)
+    {
+        _enableMention = enableMention;
+        
+        [self updateMemberInfo];
+    }
+}
+
+- (void)setEnableVoipCall:(BOOL)enableVoipCall
+{
+    if (_enableVoipCall != enableVoipCall)
+    {
+        _enableVoipCall = enableVoipCall;
+        
+        [self updateMemberInfo];
+    }
+}
+
+- (void)setEnableLeave:(BOOL)enableLeave
+{
+    if (_enableLeave != enableLeave)
+    {
+        _enableLeave = enableLeave;
+        
+        [self updateMemberInfo];
+    }
+}
+
+- (IBAction)onActionButtonPressed:(id)sender
+{
+    if ([sender isKindOfClass:[UIButton class]])
+    {
+        // Check whether an action is already in progress
+        if ([self hasPendingAction])
+        {
+            return;
+        }
+        
+        UIButton *button = (UIButton*)sender;
+        
+        switch (button.tag)
+        {
+            case MXKRoomMemberDetailsActionInvite:
+            {
+                [self addPendingActionMask];
+                [mxRoom inviteUser:_mxRoomMember.userId
+                           success:^{
+                               
+                               [self removePendingActionMask];
+                               
+                           } failure:^(NSError *error) {
+                               
+                               [self removePendingActionMask];
+                               MXLogDebug(@"[MXKRoomMemberDetailsVC] Invite %@ failed", self->_mxRoomMember.userId);
+                               // Notify MatrixKit user
+                               NSString *myUserId = self.mainSession.myUser.userId;
+                               [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+                               
+                           }];
+                break;
+            }
+            case MXKRoomMemberDetailsActionLeave:
+            {
+                [self addPendingActionMask];
+                [self.mxRoom leave:^{
+                    
+                    [self removePendingActionMask];
+                    [self withdrawViewControllerAnimated:YES completion:nil];
+                    
+                } failure:^(NSError *error) {
+                    
+                    [self removePendingActionMask];
+                    MXLogDebug(@"[MXKRoomMemberDetailsVC] Leave room %@ failed", self->mxRoom.roomId);
+                    // Notify MatrixKit user
+                    NSString *myUserId = self.mainSession.myUser.userId;
+                    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+                    
+                }];
+                break;
+            }
+            case MXKRoomMemberDetailsActionKick:
+            {
+                [self addPendingActionMask];
+                [mxRoom kickUser:_mxRoomMember.userId
+                          reason:nil
+                         success:^{
+                             
+                             [self removePendingActionMask];
+                             // Pop/Dismiss the current view controller if the left members are hidden
+                             if (![[MXKAppSettings standardAppSettings] showLeftMembersInRoomMemberList])
+                             {
+                                 [self withdrawViewControllerAnimated:YES completion:nil];
+                             }
+                             
+                         } failure:^(NSError *error) {
+                             
+                             [self removePendingActionMask];
+                             MXLogDebug(@"[MXKRoomMemberDetailsVC] Kick %@ failed", self->_mxRoomMember.userId);
+                             // Notify MatrixKit user
+                             NSString *myUserId = self.mainSession.myUser.userId;
+                             [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+                             
+                         }];
+                break;
+            }
+            case MXKRoomMemberDetailsActionBan:
+            {
+                [self addPendingActionMask];
+                [mxRoom banUser:_mxRoomMember.userId
+                         reason:nil
+                        success:^{
+                            
+                            [self removePendingActionMask];
+                            
+                        } failure:^(NSError *error) {
+                            
+                            [self removePendingActionMask];
+                            MXLogDebug(@"[MXKRoomMemberDetailsVC] Ban %@ failed", self->_mxRoomMember.userId);
+                            // Notify MatrixKit user
+                            NSString *myUserId = self.mainSession.myUser.userId;
+                            [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+                            
+                        }];
+                break;
+            }
+            case MXKRoomMemberDetailsActionUnban:
+            {
+                [self addPendingActionMask];
+                [mxRoom unbanUser:_mxRoomMember.userId
+                          success:^{
+                              
+                              [self removePendingActionMask];
+                              
+                          } failure:^(NSError *error) {
+                              
+                              [self removePendingActionMask];
+                              MXLogDebug(@"[MXKRoomMemberDetailsVC] Unban %@ failed", self->_mxRoomMember.userId);
+                              // Notify MatrixKit user
+                              NSString *myUserId = self.mainSession.myUser.userId;
+                              [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+                              
+                          }];
+                break;
+            }
+            case MXKRoomMemberDetailsActionIgnore:
+            {
+                // Prompt user to ignore content from this user
+                MXWeakify(self);
+                
+                if (currentAlert)
+                {
+                    [currentAlert dismissViewControllerAnimated:NO completion:nil];
+                }
+                
+                currentAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n roomMemberIgnorePrompt] message:nil preferredStyle:UIAlertControllerStyleAlert];
+                
+                [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n yes]
+                                                                 style:UIAlertActionStyleDefault
+                                                               handler:^(UIAlertAction * action) {
+                                                                   
+                                                                   MXStrongifyAndReturnIfNil(self);
+                                                                   
+                                                                   self->currentAlert = nil;
+                                                                   
+                                                                   // Add the user to the blacklist: ignored users
+                                                                   [self addPendingActionMask];
+                                                                   
+                                                                   MXWeakify(self);
+                                                                   
+                                                                   [self.mainSession ignoreUsers:@[self.mxRoomMember.userId]
+                                                                                         success:^{
+                                                                                             
+                                                                                             MXStrongifyAndReturnIfNil(self);
+                                                                                             
+                                                                                             [self removePendingActionMask];
+                                                                                             
+                                                                                         } failure:^(NSError *error) {
+                                                                                             
+                                                                                             MXStrongifyAndReturnIfNil(self);
+                                                                                             
+                                                                                             [self removePendingActionMask];
+                                                                                             MXLogDebug(@"[MXKRoomMemberDetailsVC] Ignore %@ failed", self.mxRoomMember.userId);
+                                                                                             
+                                                                                             // Notify MatrixKit user
+                                                                                             NSString *myUserId = self.mainSession.myUser.userId;
+                                                                                             [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+                                                                                             
+                                                                                         }];
+                                                                   
+                                                               }]];
+                
+                [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n no]
+                                                                 style:UIAlertActionStyleDefault
+                                                               handler:^(UIAlertAction * action) {
+                                                                   
+                                                                   MXStrongifyAndReturnIfNil(self);
+                                                                   
+                                                                   self->currentAlert = nil;
+                                                               }]];
+                
+                [self presentViewController:currentAlert animated:YES completion:nil];
+                break;
+            }
+            case MXKRoomMemberDetailsActionUnignore:
+            {
+                // Remove the member from the ignored user list.
+                [self addPendingActionMask];
+                
+                MXWeakify(self);
+                
+                [self.mainSession unIgnoreUsers:@[self.mxRoomMember.userId]
+                                            success:^{
+                                                
+                                                MXStrongifyAndReturnIfNil(self);
+                                                [self removePendingActionMask];
+
+                                            } failure:^(NSError *error) {
+
+                                                MXStrongifyAndReturnIfNil(self);
+                                                
+                                                [self removePendingActionMask];
+                                                MXLogDebug(@"[MXKRoomMemberDetailsVC] Unignore %@ failed", self.mxRoomMember.userId);
+
+                                                // Notify MatrixKit user
+                                                NSString *myUserId = self.mainSession.myUser.userId;
+                                                [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+
+                                            }];
+                break;
+            }
+            case MXKRoomMemberDetailsActionSetDefaultPowerLevel:
+            {
+                break;
+            }
+            case MXKRoomMemberDetailsActionSetModerator:
+            {
+                break;
+            }
+            case MXKRoomMemberDetailsActionSetAdmin:
+            {
+                break;
+            }
+            case MXKRoomMemberDetailsActionSetCustomPowerLevel:
+            {
+                [self updateUserPowerLevel];
+                break;
+            }
+            case MXKRoomMemberDetailsActionStartChat:
+            {
+                if (self.delegate)
+                {
+                    [self addPendingActionMask];
+                    
+                    [self.delegate roomMemberDetailsViewController:self startChatWithMemberId:_mxRoomMember.userId completion:^{
+                        
+                        [self removePendingActionMask];
+                    }];
+                }
+                break;
+            }
+            case MXKRoomMemberDetailsActionStartVoiceCall:
+            case MXKRoomMemberDetailsActionStartVideoCall:
+            {
+                BOOL isVideoCall = (button.tag == MXKRoomMemberDetailsActionStartVideoCall);
+                
+                if (self.delegate && [self.delegate respondsToSelector:@selector(roomMemberDetailsViewController:placeVoipCallWithMemberId:andVideo:)])
+                {
+                    [self addPendingActionMask];
+                    
+                    [self.delegate roomMemberDetailsViewController:self placeVoipCallWithMemberId:_mxRoomMember.userId andVideo:isVideoCall];
+                    
+                    [self removePendingActionMask];
+                }
+                else
+                {
+                    [self addPendingActionMask];
+                    
+                    MXRoom* directRoom = [self.mainSession directJoinedRoomWithUserId:_mxRoomMember.userId];
+                    
+                    // Place the call directly if the room exists
+                    if (directRoom)
+                    {
+                        [directRoom placeCallWithVideo:isVideoCall success:nil failure:nil];
+                        [self removePendingActionMask];
+                    }
+                    else
+                    {
+                        // Create a new room
+                        MXRoomCreationParameters *roomCreationParameters = [MXRoomCreationParameters parametersForDirectRoomWithUser:_mxRoomMember.userId];
+                        [self.mainSession createRoomWithParameters:roomCreationParameters success:^(MXRoom *room) {
+
+                            // Delay the call in order to be sure that the room is ready
+                            dispatch_async(dispatch_get_main_queue(), ^{
+                                [room placeCallWithVideo:isVideoCall success:nil failure:nil];
+                                [self removePendingActionMask];
+                            });
+
+                        } failure:^(NSError *error) {
+
+                            MXLogDebug(@"[MXKRoomMemberDetailsVC] Create room failed");
+                            [self removePendingActionMask];
+                            // Notify MatrixKit user
+                            NSString *myUserId = self.mainSession.myUser.userId;
+                            [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+
+                        }];
+                    }
+                }
+                break;
+            }
+            case MXKRoomMemberDetailsActionMention:
+            {
+                // Sanity check
+                if (_delegate && [_delegate respondsToSelector:@selector(roomMemberDetailsViewController:mention:)])
+                {
+                    id<MXKRoomMemberDetailsViewControllerDelegate> delegate = _delegate;
+                    MXRoomMember *member = _mxRoomMember;
+                    
+                    // Withdraw the current view controller, and let the delegate mention the member
+                    [self withdrawViewControllerAnimated:YES completion:^{
+                        
+                        [delegate roomMemberDetailsViewController:self mention:member];
+
+                    }];
+                }
+                break;
+            }
+            default:
+                break;
+        }
+    }
+}
+
+#pragma mark - Internals
+
+- (void)initObservers
+{
+    // Remove any pending observers
+    [self removeObservers];
+    
+    if (mxRoom)
+    {
+        // Observe room's members update
+        NSArray *mxMembersEvents = @[kMXEventTypeStringRoomMember, kMXEventTypeStringRoomPowerLevels];
+        self->membersListener = [mxRoom listenToEventsOfTypes:mxMembersEvents onEvent:^(MXEvent *event, MXTimelineDirection direction, id customObject) {
+
+            // consider only live event
+            if (direction == MXTimelineDirectionForwards)
+            {
+                [self refreshRoomMember];
+            }
+        }];
+
+        // Observe kMXSessionWillLeaveRoomNotification to be notified if the user leaves the current room.
+        leaveRoomNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXSessionWillLeaveRoomNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+            
+            // Check whether the user will leave the room related to the displayed member
+            if (notif.object == self.mainSession)
+            {
+                NSString *roomId = notif.userInfo[kMXSessionNotificationRoomIdKey];
+                if (roomId && [roomId isEqualToString:self->mxRoom.roomId])
+                {
+                    // We must remove the current view controller.
+                    [self withdrawViewControllerAnimated:YES completion:nil];
+                }
+            }
+        }];
+        
+        // Observe room history flush (sync with limited timeline, or state event redaction)
+        roomDidFlushDataNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXRoomDidFlushDataNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+            
+            MXRoom *room = notif.object;
+            if (self.mainSession == room.mxSession && [self->mxRoom.roomId isEqualToString:room.roomId])
+            {
+                // The existing room history has been flushed during server sync.
+                // Take into account the updated room members list by updating the room member instance
+                [self refreshRoomMember];
+            }
+            
+        }];
+    }
+    
+    [self updateMemberInfo];
+}
+
+- (void)removeObservers
+{
+    if (leaveRoomNotificationObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:leaveRoomNotificationObserver];
+        leaveRoomNotificationObserver = nil;
+    }
+    if (roomDidFlushDataNotificationObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:roomDidFlushDataNotificationObserver];
+        roomDidFlushDataNotificationObserver = nil;
+    }
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    
+    if (membersListener && mxRoom)
+    {
+        MXWeakify(self);
+        [mxRoom liveTimeline:^(MXEventTimeline *liveTimeline) {
+            MXStrongifyAndReturnIfNil(self);
+
+            [liveTimeline removeListener:self->membersListener];
+            self->membersListener = nil;
+        }];
+    }
+}
+
+- (void)refreshRoomMember
+{
+    // Hide potential action sheet
+    if (currentAlert)
+    {
+        [currentAlert dismissViewControllerAnimated:NO completion:nil];
+        currentAlert = nil;
+    }
+    
+    MXRoomMember* nextRoomMember = nil;
+    
+    // get the updated memmber
+    NSArray<MXRoomMember *> *membersList = self.mxRoomLiveTimeline.state.members.members;
+    for (MXRoomMember* member in membersList)
+    {
+        if ([member.userId isEqualToString:_mxRoomMember.userId])
+        {
+            nextRoomMember = member;
+            break;
+        }
+    }
+    
+    // does the member still exist ?
+    if (nextRoomMember)
+    {
+        // Refresh member
+        _mxRoomMember = nextRoomMember;
+        [self updateMemberInfo];
+    }
+    else
+    {
+        [self withdrawViewControllerAnimated:YES completion:nil];
+    }
+}
+
+- (void)updateMemberInfo
+{
+    self.title = _mxRoomMember.displayname ? _mxRoomMember.displayname : _mxRoomMember.userId;
+    
+    // set the thumbnail info
+    self.memberThumbnail.contentMode = UIViewContentModeScaleAspectFill;
+    self.memberThumbnail.defaultBackgroundColor = [UIColor clearColor];
+    [self.memberThumbnail.layer setCornerRadius:self.memberThumbnail.frame.size.width / 2];
+    [self.memberThumbnail setClipsToBounds:YES];
+    
+    self.memberThumbnail.mediaFolder = kMXMediaManagerAvatarThumbnailFolder;
+    self.memberThumbnail.enableInMemoryCache = YES;
+    [self.memberThumbnail setImageURI:_mxRoomMember.avatarUrl
+                             withType:nil
+                  andImageOrientation:UIImageOrientationUp
+                        toFitViewSize:self.memberThumbnail.frame.size
+                           withMethod:MXThumbnailingMethodCrop
+                         previewImage:self.picturePlaceholder
+                           mediaManager:self.mainSession.mediaManager];
+    
+    self.roomMemberMatrixInfo.text = _mxRoomMember.userId;
+    
+    [self.tableView reloadData];
+}
+
+#pragma mark - Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+    return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    // Check user's power level before allowing an action (kick, ban, ...)
+    MXRoomPowerLevels *powerLevels = [self.mxRoomLiveTimeline.state powerLevels];
+    NSInteger memberPowerLevel = [powerLevels powerLevelOfUserWithUserID:_mxRoomMember.userId];
+    NSInteger oneSelfPowerLevel = [powerLevels powerLevelOfUserWithUserID:self.mainSession.myUser.userId];
+    
+    [actionsArray removeAllObjects];
+    
+    // Consider the case of the user himself
+    if ([_mxRoomMember.userId isEqualToString:self.mainSession.myUser.userId])
+    {
+        if (_enableLeave)
+        {
+            [actionsArray addObject:@(MXKRoomMemberDetailsActionLeave)];
+        }
+        
+        if (oneSelfPowerLevel >= [powerLevels minimumPowerLevelForSendingEventAsStateEvent:kMXEventTypeStringRoomPowerLevels])
+        {
+            [actionsArray addObject:@(MXKRoomMemberDetailsActionSetCustomPowerLevel)];
+        }
+    }
+    else if (_mxRoomMember)
+    {
+        if (_enableVoipCall)
+        {
+            // Offer voip call options
+            [actionsArray addObject:@(MXKRoomMemberDetailsActionStartVoiceCall)];
+            [actionsArray addObject:@(MXKRoomMemberDetailsActionStartVideoCall)];
+        }
+        
+        // Consider membership of the selected member
+        switch (_mxRoomMember.membership)
+        {
+            case MXMembershipInvite:
+            case MXMembershipJoin:
+            {
+                // Check conditions to be able to kick someone
+                if (oneSelfPowerLevel >= [powerLevels kick] && oneSelfPowerLevel > memberPowerLevel)
+                {
+                    [actionsArray addObject:@(MXKRoomMemberDetailsActionKick)];
+                }
+                // Check conditions to be able to ban someone
+                if (oneSelfPowerLevel >= [powerLevels ban] && oneSelfPowerLevel > memberPowerLevel)
+                {
+                    [actionsArray addObject:@(MXKRoomMemberDetailsActionBan)];
+                }
+                
+                // Check whether the option Ignore may be presented
+                if (_mxRoomMember.membership == MXMembershipJoin)
+                {
+                    // is he already ignored ?
+                    if (![self.mainSession isUserIgnored:_mxRoomMember.userId])
+                    {
+                        [actionsArray addObject:@(MXKRoomMemberDetailsActionIgnore)];
+                    }
+                    else
+                    {
+                        [actionsArray addObject:@(MXKRoomMemberDetailsActionUnignore)];
+                    }
+                }
+                break;
+            }
+            case MXMembershipLeave:
+            {
+                // Check conditions to be able to invite someone
+                if (oneSelfPowerLevel >= [powerLevels invite])
+                {
+                    [actionsArray addObject:@(MXKRoomMemberDetailsActionInvite)];
+                }
+                // Check conditions to be able to ban someone
+                if (oneSelfPowerLevel >= [powerLevels ban] && oneSelfPowerLevel > memberPowerLevel)
+                {
+                    [actionsArray addObject:@(MXKRoomMemberDetailsActionBan)];
+                }
+                break;
+            }
+            case MXMembershipBan:
+            {
+                // Check conditions to be able to unban someone
+                if (oneSelfPowerLevel >= [powerLevels ban] && oneSelfPowerLevel > memberPowerLevel)
+                {
+                    [actionsArray addObject:@(MXKRoomMemberDetailsActionUnban)];
+                }
+                break;
+            }
+            default:
+            {
+                break;
+            }
+        }
+        
+        // update power level
+        if (oneSelfPowerLevel >= [powerLevels minimumPowerLevelForSendingEventAsStateEvent:kMXEventTypeStringRoomPowerLevels] && oneSelfPowerLevel > memberPowerLevel)
+        {
+            [actionsArray addObject:@(MXKRoomMemberDetailsActionSetCustomPowerLevel)];
+        }
+        
+        // offer to start a new chat only if the room is not the first direct chat with this user
+        // it does not make sense : it would open the same room
+        MXRoom* directRoom = [self.mainSession directJoinedRoomWithUserId:_mxRoomMember.userId];
+        if (!directRoom || (![directRoom.roomId isEqualToString:mxRoom.roomId]))
+        {
+            [actionsArray addObject:@(MXKRoomMemberDetailsActionStartChat)];
+        }
+    }
+    
+    if (_enableMention)
+    {
+        // Add mention option
+        [actionsArray addObject:@(MXKRoomMemberDetailsActionMention)];
+    }
+    
+    return (actionsArray.count + 1) / 2;
+}
+
+- (NSString*)actionButtonTitle:(MXKRoomMemberDetailsAction)action
+{
+    NSString *title;
+    
+    switch (action)
+    {
+        case MXKRoomMemberDetailsActionInvite:
+            title = [MatrixKitL10n invite];
+            break;
+        case MXKRoomMemberDetailsActionLeave:
+            title = [MatrixKitL10n leave];
+            break;
+        case MXKRoomMemberDetailsActionKick:
+            title = [MatrixKitL10n kick];
+            break;
+        case MXKRoomMemberDetailsActionBan:
+            title = [MatrixKitL10n ban];
+            break;
+        case MXKRoomMemberDetailsActionUnban:
+            title = [MatrixKitL10n unban];
+            break;
+        case MXKRoomMemberDetailsActionIgnore:
+            title = [MatrixKitL10n ignore];
+            break;
+        case MXKRoomMemberDetailsActionUnignore:
+            title = [MatrixKitL10n unignore];
+            break;
+        case MXKRoomMemberDetailsActionSetDefaultPowerLevel:
+            title = [MatrixKitL10n setDefaultPowerLevel];
+            break;
+        case MXKRoomMemberDetailsActionSetModerator:
+            title = [MatrixKitL10n setModerator];
+            break;
+        case MXKRoomMemberDetailsActionSetAdmin:
+            title = [MatrixKitL10n setAdmin];
+            break;
+        case MXKRoomMemberDetailsActionSetCustomPowerLevel:
+            title = [MatrixKitL10n setPowerLevel];
+            break;
+        case MXKRoomMemberDetailsActionStartChat:
+            title = [MatrixKitL10n startChat];
+            break;
+        case MXKRoomMemberDetailsActionStartVoiceCall:
+            title = [MatrixKitL10n startVoiceCall];
+            break;
+        case MXKRoomMemberDetailsActionStartVideoCall:
+            title = [MatrixKitL10n startVideoCall];
+            break;
+        case MXKRoomMemberDetailsActionMention:
+            title = [MatrixKitL10n mention];
+            break;
+        default:
+            break;
+    }
+    
+    return title;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    if (self.tableView == tableView)
+    {
+        NSInteger row = indexPath.row;
+        
+        MXKTableViewCellWithButtons *cell = [tableView dequeueReusableCellWithIdentifier:[MXKTableViewCellWithButtons defaultReuseIdentifier]];
+        if (!cell)
+        {
+            cell = [[MXKTableViewCellWithButtons alloc] init];
+        }
+        
+        cell.mxkButtonNumber = 2;
+        NSArray *buttons = cell.mxkButtons;
+        NSInteger index = row * 2;
+        NSString *text = nil;
+        for (UIButton *button in buttons)
+        {
+            NSNumber *actionNumber;
+            if (index < actionsArray.count)
+            {
+                actionNumber = [actionsArray objectAtIndex:index];
+            }
+            
+            text = (actionNumber ? [self actionButtonTitle:actionNumber.unsignedIntegerValue] : nil);
+            
+            button.hidden = (text.length == 0);
+            
+            button.layer.borderColor = button.tintColor.CGColor;
+            button.layer.borderWidth = 1;
+            button.layer.cornerRadius = 5;
+            
+            [button setTitle:text forState:UIControlStateNormal];
+            [button setTitle:text forState:UIControlStateHighlighted];
+            
+            [button addTarget:self action:@selector(onActionButtonPressed:) forControlEvents:UIControlEventTouchUpInside];
+            
+            button.tag = (actionNumber ? actionNumber.unsignedIntegerValue : -1);
+            
+            index ++;
+        }
+        
+        return cell;
+    }
+    
+    // Return a fake cell to prevent app from crashing.
+    return [[UITableViewCell alloc] init];
+}
+
+
+#pragma mark - button management
+
+- (BOOL)hasPendingAction
+{
+    return nil != pendingMaskSpinnerView;
+}
+
+- (void)addPendingActionMask
+{
+    // add a spinner above the tableview to avoid that the user tap on any other button
+    pendingMaskSpinnerView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
+    pendingMaskSpinnerView.backgroundColor = [UIColor colorWithRed:0.5 green:0.5 blue:0.5 alpha:0.5];
+    pendingMaskSpinnerView.frame = self.tableView.frame;
+    pendingMaskSpinnerView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleTopMargin;
+    
+    // append it
+    [self.tableView.superview addSubview:pendingMaskSpinnerView];
+    
+    // animate it
+    [pendingMaskSpinnerView startAnimating];
+}
+
+- (void)removePendingActionMask
+{
+    if (pendingMaskSpinnerView)
+    {
+        [pendingMaskSpinnerView removeFromSuperview];
+        pendingMaskSpinnerView = nil;
+        [self.tableView reloadData];
+    }
+}
+
+- (void)setPowerLevel:(NSInteger)value promptUser:(BOOL)promptUser
+{
+    NSInteger currentPowerLevel = [self.mxRoomLiveTimeline.state.powerLevels powerLevelOfUserWithUserID:_mxRoomMember.userId];
+    
+    // check if the power level has not yet been set to 0
+    if (value != currentPowerLevel)
+    {
+        __weak typeof(self) weakSelf = self;
+
+        if (promptUser && value == [self.mxRoomLiveTimeline.state.powerLevels powerLevelOfUserWithUserID:self.mainSession.myUser.userId])
+        {
+            // If the user is setting the same power level as his to another user, ask him for a confirmation
+            if (currentAlert)
+            {
+                [currentAlert dismissViewControllerAnimated:NO completion:nil];
+            }
+            
+            currentAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n roomMemberPowerLevelPrompt] message:nil preferredStyle:UIAlertControllerStyleAlert];
+            
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n no]
+                                                             style:UIAlertActionStyleDefault
+                                                           handler:^(UIAlertAction * action) {
+                                                               
+                                                               if (weakSelf)
+                                                               {
+                                                                   typeof(self) self = weakSelf;
+                                                                   self->currentAlert = nil;
+                                                               }
+                                                               
+                                                           }]];
+            
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n yes]
+                                                             style:UIAlertActionStyleDefault
+                                                           handler:^(UIAlertAction * action) {
+                                                               
+                                                               if (weakSelf)
+                                                               {
+                                                                   typeof(self) self = weakSelf;
+                                                                   self->currentAlert = nil;
+                                                                   
+                                                                   // The user confirms. Apply the power level
+                                                                   [self setPowerLevel:value promptUser:NO];
+                                                               }
+                                                               
+                                                           }]];
+            
+            [self presentViewController:currentAlert animated:YES completion:nil];
+        }
+        else
+        {
+            [self addPendingActionMask];
+
+            // Reset user power level
+            [self.mxRoom setPowerLevelOfUserWithUserID:_mxRoomMember.userId powerLevel:value success:^{
+
+                __strong __typeof(weakSelf)strongSelf = weakSelf;
+                [strongSelf removePendingActionMask];
+
+            } failure:^(NSError *error) {
+
+                __strong __typeof(weakSelf)strongSelf = weakSelf;
+                [strongSelf removePendingActionMask];
+                MXLogDebug(@"[MXKRoomMemberDetailsVC] Set user power (%@) failed", strongSelf.mxRoomMember.userId);
+
+                // Notify MatrixKit user
+                NSString *myUserId = strongSelf.mainSession.myUser.userId;
+                [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+                
+            }];
+        }
+    }
+}
+
+- (void)updateUserPowerLevel
+{
+    __weak typeof(self) weakSelf = self;
+    
+    if (currentAlert)
+    {
+        [currentAlert dismissViewControllerAnimated:NO completion:nil];
+    }
+    
+    currentAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n powerLevel] message:nil preferredStyle:UIAlertControllerStyleAlert];
+    
+    
+    if (![self.mainSession.myUser.userId isEqualToString:_mxRoomMember.userId])
+    {
+        [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n resetToDefault]
+                                                         style:UIAlertActionStyleDefault
+                                                       handler:^(UIAlertAction * action) {
+                                                           
+                                                           if (weakSelf)
+                                                           {
+                                                               typeof(self) self = weakSelf;
+                                                               self->currentAlert = nil;
+                                                               
+                                                               [self setPowerLevel:self.mxRoomLiveTimeline.state.powerLevels.usersDefault promptUser:YES];
+                                                           }
+                                                           
+                                                       }]];
+    }
+    
+    [currentAlert addTextFieldWithConfigurationHandler:^(UITextField *textField)
+    {
+        typeof(self) self = weakSelf;
+        
+        textField.secureTextEntry = NO;
+        textField.text = [NSString stringWithFormat:@"%ld", (long)[self.mxRoomLiveTimeline.state.powerLevels powerLevelOfUserWithUserID:self.mxRoomMember.userId]];
+        textField.placeholder = nil;
+        textField.keyboardType = UIKeyboardTypeDecimalPad;
+    }];
+    
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
+                                                     style:UIAlertActionStyleDefault
+                                                   handler:^(UIAlertAction * action) {
+                                                       
+                                                       if (weakSelf)
+                                                       {
+                                                           typeof(self) self = weakSelf;
+                                                           NSString *text = [self->currentAlert textFields].firstObject.text;
+                                                           self->currentAlert = nil;
+                                                           
+                                                           if (text.length > 0)
+                                                           {
+                                                               [self setPowerLevel:[text integerValue] promptUser:YES];
+                                                           }
+                                                       }
+                                                       
+                                                   }]];
+    
+    [self presentViewController:currentAlert animated:YES completion:nil];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberDetailsViewController.xib b/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberDetailsViewController.xib
new file mode 100644
index 000000000..238c3d370
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberDetailsViewController.xib
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MXKRoomMemberDetailsViewController">
+            <connections>
+                <outlet property="memberThumbnail" destination="aCC-Nn-76o" id="gyJ-vS-syH"/>
+                <outlet property="roomMemberMatrixInfo" destination="j7K-fD-zCi" id="2o5-bf-JBu"/>
+                <outlet property="tableView" destination="hJP-2r-QxY" id="XZr-oR-4yU"/>
+                <outlet property="view" destination="Df0-2N-edY" id="SKP-AJ-qf0"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="Df0-2N-edY">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <subviews>
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="none" allowsSelection="NO" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="hJP-2r-QxY">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <view key="tableHeaderView" contentMode="scaleToFill" id="OcA-Yr-ljR" userLabel="TableHeader">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="115"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aCC-Nn-76o" customClass="MXKImageView">
+                                <rect key="frame" x="10" y="10" width="75" height="75"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="75" id="MrR-4z-5Ya"/>
+                                    <constraint firstAttribute="width" secondItem="aCC-Nn-76o" secondAttribute="height" multiplier="1:1" id="lwc-Yc-EDh"/>
+                                </constraints>
+                            </view>
+                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" bounces="NO" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" editable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j7K-fD-zCi" userLabel="member matrix info">
+                                <rect key="frame" x="95" y="10" width="270" height="95"/>
+                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                                <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                            </textView>
+                        </subviews>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="trailing" secondItem="j7K-fD-zCi" secondAttribute="trailing" constant="10" id="1bD-6F-bvn"/>
+                            <constraint firstItem="j7K-fD-zCi" firstAttribute="leading" secondItem="aCC-Nn-76o" secondAttribute="trailing" constant="10" id="OJB-qV-vae"/>
+                            <constraint firstItem="aCC-Nn-76o" firstAttribute="top" secondItem="OcA-Yr-ljR" secondAttribute="top" constant="10" id="XHc-5o-3sR"/>
+                            <constraint firstItem="aCC-Nn-76o" firstAttribute="leading" secondItem="OcA-Yr-ljR" secondAttribute="leading" constant="10" id="Xb5-Q8-eer"/>
+                            <constraint firstItem="j7K-fD-zCi" firstAttribute="top" secondItem="OcA-Yr-ljR" secondAttribute="top" constant="10" id="hyH-j6-iVj"/>
+                            <constraint firstAttribute="bottom" secondItem="j7K-fD-zCi" secondAttribute="bottom" constant="10" id="iP9-p3-Fgv"/>
+                        </constraints>
+                    </view>
+                    <connections>
+                        <outlet property="dataSource" destination="-1" id="rmb-eW-4fJ"/>
+                        <outlet property="delegate" destination="-1" id="3xv-qb-1cH"/>
+                    </connections>
+                </tableView>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="hJP-2r-QxY" secondAttribute="trailing" id="8EI-re-vO2"/>
+                <constraint firstItem="hJP-2r-QxY" firstAttribute="leading" secondItem="Df0-2N-edY" secondAttribute="leading" id="Az3-yV-wXV"/>
+                <constraint firstItem="hJP-2r-QxY" firstAttribute="top" secondItem="Df0-2N-edY" secondAttribute="top" id="DHS-BM-205"/>
+                <constraint firstAttribute="bottom" secondItem="hJP-2r-QxY" secondAttribute="bottom" id="Dih-o9-6aN"/>
+            </constraints>
+        </view>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberListViewController.h b/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberListViewController.h
new file mode 100644
index 000000000..d35eb497b
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberListViewController.h
@@ -0,0 +1,116 @@
+/*
+ Copyright 2015 OpenMarket 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/UIKit.h>
+
+#import "MXKViewController.h"
+#import "MXKRoomMemberListDataSource.h"
+
+@class MXKRoomMemberListViewController;
+
+/**
+ `MXKRoomMemberListViewController` delegate.
+ */
+@protocol MXKRoomMemberListViewControllerDelegate <NSObject>
+
+/**
+ Tells the delegate that the user selected a member.
+
+ @param roomMemberListViewController the `MXKRoomMemberListViewController` instance.
+ @param member the selected member.
+ */
+- (void)roomMemberListViewController:(MXKRoomMemberListViewController *)roomMemberListViewController didSelectMember:(MXRoomMember*)member;
+
+@end
+
+
+/**
+ This view controller displays members of a room. Only one matrix session is handled by this view controller.
+ */
+@interface MXKRoomMemberListViewController : MXKViewController <MXKDataSourceDelegate, UITableViewDelegate, UISearchBarDelegate>
+{
+@protected    
+    /**
+     Used to auto scroll at the top when search session is started or cancelled.
+     */
+    BOOL shouldScrollToTopOnRefresh;
+}
+
+@property (weak, nonatomic) IBOutlet UISearchBar *membersSearchBar;
+@property (weak, nonatomic) IBOutlet UITableView *membersTableView;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *membersSearchBarTopConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *membersSearchBarHeightConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *membersTableViewBottomConstraint;
+
+/**
+ The current data source associated to the view controller.
+ */
+@property (nonatomic, readonly) MXKRoomMemberListDataSource *dataSource;
+
+/**
+ The delegate for the view controller.
+ */
+@property (nonatomic, weak) id<MXKRoomMemberListViewControllerDelegate> delegate;
+
+/**
+ Enable the search in room members list according to the member's display name (YES by default).
+ Set NO this property to disable this option and hide the related bar button.
+ */
+@property (nonatomic) BOOL enableMemberSearch;
+
+/**
+ Enable the invitation of a new member (YES by default).
+ Set NO this property to disable this option and hide the related bar button.
+ */
+@property (nonatomic) BOOL enableMemberInvitation;
+
+#pragma mark - Class methods
+
+/**
+ Returns the `UINib` object initialized for a `MXKRoomMemberListViewController`.
+ 
+ @return The initialized `UINib` object or `nil` if there were errors during initialization
+ or the nib file could not be located.
+ 
+ @discussion You may override this method to provide a customized nib. If you do,
+ you should also override `roomMemberListViewController` to return your
+ view controller loaded from your custom nib.
+ */
++ (UINib *)nib;
+
+/**
+ Creates and returns a new `MXKRoomMemberListViewController` object.
+ 
+ @discussion This is the designated initializer for programmatic instantiation.
+ @return An initialized `MXKRoomMemberListViewController` object if successful, `nil` otherwise.
+ */
++ (instancetype)roomMemberListViewController;
+
+/**
+ Display the members list.
+
+ @param listDataSource the data source providing the members list.
+ */
+- (void)displayList:(MXKRoomMemberListDataSource*)listDataSource;
+
+/**
+ Scroll the members list to the top.
+ 
+ @param animated YES to animate the transition at a constant velocity to the new offset, NO to make the transition immediate.
+ */
+- (void)scrollToTop:(BOOL)animated;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberListViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberListViewController.m
new file mode 100644
index 000000000..217fb4758
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberListViewController.m
@@ -0,0 +1,571 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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 "MXKRoomMemberListViewController.h"
+
+#import "MXKRoomMemberTableViewCell.h"
+
+#import "MXKConstants.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKSwiftHeader.h"
+
+@interface MXKRoomMemberListViewController ()
+{
+    /**
+     The data source providing UITableViewCells
+     */
+    MXKRoomMemberListDataSource *dataSource;
+    
+    /**
+     Timer used to update members presence
+     */
+    NSTimer* presenceUpdateTimer;
+    
+    /**
+     Optional bar buttons
+     */
+    UIBarButtonItem *searchBarButton;
+    UIBarButtonItem *addBarButton;
+    
+    /**
+     The current displayed alert (if any).
+     */
+    UIAlertController *currentAlert;
+    
+    /**
+     Search bar
+     */
+    BOOL ignoreSearchRequest;
+    
+    /**
+     Observe kMXSessionWillLeaveRoomNotification to be notified if the user leaves the current room.
+     */
+    id leaveRoomNotificationObserver;
+}
+
+@end
+
+@implementation MXKRoomMemberListViewController
+@synthesize dataSource;
+
+#pragma mark - Class methods
+
++ (UINib *)nib
+{
+    return [UINib nibWithNibName:NSStringFromClass([MXKRoomMemberListViewController class])
+                          bundle:[NSBundle bundleForClass:[MXKRoomMemberListViewController class]]];
+}
+
++ (instancetype)roomMemberListViewController
+{
+    return [[[self class] alloc] initWithNibName:NSStringFromClass([MXKRoomMemberListViewController class])
+                                          bundle:[NSBundle bundleForClass:[MXKRoomMemberListViewController class]]];
+}
+
+
+#pragma mark -
+
+- (void)finalizeInit
+{
+    [super finalizeInit];
+    
+    // Enable both bar button by default.
+    _enableMemberInvitation = YES;
+    _enableMemberSearch = YES;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    // Check whether the view controller has been pushed via storyboard
+    if (!self.membersTableView)
+    {
+        // Instantiate view controller objects
+        [[[self class] nib] instantiateWithOwner:self options:nil];
+    }
+    
+    // Adjust Top and Bottom constraints to take into account potential navBar and tabBar.
+    [NSLayoutConstraint deactivateConstraints:@[_membersSearchBarTopConstraint, _membersTableViewBottomConstraint]];
+    
+    _membersSearchBarTopConstraint = [NSLayoutConstraint constraintWithItem:self.topLayoutGuide
+                                                                  attribute:NSLayoutAttributeBottom
+                                                                  relatedBy:NSLayoutRelationEqual
+                                                                     toItem:self.membersSearchBar
+                                                                  attribute:NSLayoutAttributeTop
+                                                                 multiplier:1.0f
+                                                                   constant:0.0f];
+    
+    _membersTableViewBottomConstraint = [NSLayoutConstraint constraintWithItem:self.bottomLayoutGuide
+                                                                     attribute:NSLayoutAttributeTop
+                                                                     relatedBy:NSLayoutRelationEqual
+                                                                        toItem:self.membersTableView
+                                                                     attribute:NSLayoutAttributeBottom
+                                                                    multiplier:1.0f
+                                                                      constant:0.0f];
+    
+    [NSLayoutConstraint activateConstraints:@[_membersSearchBarTopConstraint, _membersTableViewBottomConstraint]];
+    
+    // Hide search bar by default
+    self.membersSearchBar.hidden = YES;
+    self.membersSearchBarHeightConstraint.constant = 0;
+    [self.view setNeedsUpdateConstraints];
+    
+    searchBarButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSearch target:self action:@selector(search:)];
+    addBarButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAdd target:self action:@selector(inviteNewMember:)];
+    
+    // Refresh bar button display.
+    [self refreshUIBarButtons];
+    
+    // Add an accessory view to the search bar in order to retrieve keyboard view.
+    self.membersSearchBar.inputAccessoryView = [[UIView alloc] initWithFrame:CGRectZero];
+    
+    // Finalize table view configuration
+    self.membersTableView.delegate = self;
+    self.membersTableView.dataSource = dataSource; // Note datasource may be nil here.
+    
+    // Set up default table view cell class
+    [self.membersTableView registerNib:MXKRoomMemberTableViewCell.nib forCellReuseIdentifier:MXKRoomMemberTableViewCell.defaultReuseIdentifier];
+}
+
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    
+    // Check whether the user still belongs to the room's members.
+    if (self.dataSource && [self.mainSession roomWithRoomId:self.dataSource.roomId])
+    {
+        [self refreshUIBarButtons];
+        
+        // Observe kMXSessionWillLeaveRoomNotification to be notified if the user leaves the current room.
+        leaveRoomNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXSessionWillLeaveRoomNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif)
+        {
+            
+            // Check whether the user will leave the room related to the displayed member list
+            if (notif.object == self.mainSession)
+            {
+                NSString *roomId = notif.userInfo[kMXSessionNotificationRoomIdKey];
+                if (roomId && [roomId isEqualToString:self.dataSource.roomId])
+                {
+                    // We remove the current view controller.
+                    [self withdrawViewControllerAnimated:YES completion:nil];
+                }
+            }
+        }];
+    }
+    else
+    {
+        // We remove the current view controller.
+        [self withdrawViewControllerAnimated:YES completion:nil];
+    }
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    
+    // Restore search mechanism (if enabled)
+    ignoreSearchRequest = NO;
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    
+    // The user may still press search button whereas the view disappears
+    ignoreSearchRequest = YES;
+    
+    if (leaveRoomNotificationObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:leaveRoomNotificationObserver];
+        leaveRoomNotificationObserver = nil;
+    }
+    
+    // Leave potential search session
+    if (!self.membersSearchBar.isHidden)
+    {
+        [self searchBarCancelButtonClicked:self.membersSearchBar];
+    }
+}
+
+- (void)dealloc
+{
+    self.membersSearchBar.inputAccessoryView = nil;
+}
+
+- (void)didReceiveMemoryWarning
+{
+    [super didReceiveMemoryWarning];
+    
+    // Dispose of any resources that can be recreated.
+}
+
+#pragma mark - Override MXKTableViewController
+
+- (void)onKeyboardShowAnimationComplete
+{
+    // Report the keyboard view in order to track keyboard frame changes
+    self.keyboardView = _membersSearchBar.inputAccessoryView.superview;
+}
+
+- (void)setKeyboardHeight:(CGFloat)keyboardHeight
+{
+    // Deduce the bottom constraint for the table view (Don't forget the potential tabBar)
+    CGFloat tableViewBottomConst = keyboardHeight - self.bottomLayoutGuide.length;
+    // Check whether the keyboard is over the tabBar
+    if (tableViewBottomConst < 0)
+    {
+        tableViewBottomConst = 0;
+    }
+    
+    // Update constraints
+    _membersTableViewBottomConstraint.constant = tableViewBottomConst;
+    
+    // Force layout immediately to take into account new constraint
+    [self.view layoutIfNeeded];
+}
+
+- (void)destroy
+{
+    if (presenceUpdateTimer)
+    {
+        [presenceUpdateTimer invalidate];
+        presenceUpdateTimer = nil;
+    }
+    
+    self.membersTableView.dataSource = nil;
+    self.membersTableView.delegate = nil;
+    self.membersTableView = nil;
+    dataSource.delegate = nil;
+    dataSource = nil;
+    
+    if (currentAlert)
+    {
+        [currentAlert dismissViewControllerAnimated:NO completion:nil];
+        currentAlert = nil;
+    }
+    
+    searchBarButton = nil;
+    addBarButton = nil;
+    
+    _delegate = nil;
+    
+    [super destroy];
+}
+
+#pragma mark - Internal methods
+
+- (void)updateMembersActivityInfo
+{
+    for (id memberCell in self.membersTableView.visibleCells)
+    {
+        if ([memberCell respondsToSelector:@selector(updateActivityInfo)])
+        {
+            [memberCell updateActivityInfo];
+        }
+    }
+}
+
+#pragma mark - UIBarButton handling
+
+- (void)setEnableMemberSearch:(BOOL)enableMemberSearch
+{
+    _enableMemberSearch = enableMemberSearch;
+    [self refreshUIBarButtons];
+}
+
+- (void)setEnableMemberInvitation:(BOOL)enableMemberInvitation
+{
+    _enableMemberInvitation = enableMemberInvitation;
+    [self refreshUIBarButtons];
+}
+
+- (void)refreshUIBarButtons
+{
+    MXRoom *mxRoom = [self.mainSession roomWithRoomId:dataSource.roomId];
+
+    MXWeakify(self);
+    [mxRoom state:^(MXRoomState *roomState) {
+        MXStrongifyAndReturnIfNil(self);
+
+        BOOL showInvitationOption = self.enableMemberInvitation;
+
+        if (showInvitationOption && self->dataSource)
+        {
+            // Check conditions to be able to invite someone
+            NSInteger oneSelfPowerLevel = [roomState.powerLevels powerLevelOfUserWithUserID:self.mainSession.myUser.userId];
+            if (oneSelfPowerLevel < [roomState.powerLevels invite])
+            {
+                showInvitationOption = NO;
+            }
+        }
+
+        if (showInvitationOption)
+        {
+            if (self.enableMemberSearch)
+            {
+                self.navigationItem.rightBarButtonItems = @[self->searchBarButton, self->addBarButton];
+            }
+            else
+            {
+                self.navigationItem.rightBarButtonItems = @[self->addBarButton];
+            }
+        }
+        else if (self.enableMemberSearch)
+        {
+            self.navigationItem.rightBarButtonItems = @[self->searchBarButton];
+        }
+        else
+        {
+            self.navigationItem.rightBarButtonItems = nil;
+        }
+    }];
+}
+
+#pragma mark -
+- (void)displayList:(MXKRoomMemberListDataSource *)listDataSource
+{
+    if (dataSource)
+    {
+        dataSource.delegate = nil;
+        dataSource = nil;
+        [self removeMatrixSession:self.mainSession];
+    }
+    
+    dataSource = listDataSource;
+    dataSource.delegate = self;
+    
+    // Report the matrix session at view controller level to update UI according to session state
+    [self addMatrixSession:dataSource.mxSession];
+    
+    if (self.membersTableView)
+    {
+        // Set up table data source
+        self.membersTableView.dataSource = dataSource;
+    }
+}
+
+- (void)scrollToTop:(BOOL)animated
+{
+    [self.membersTableView setContentOffset:CGPointMake(-self.membersTableView.adjustedContentInset.left, -self.membersTableView.adjustedContentInset.top) animated:animated];
+}
+
+#pragma mark - MXKDataSourceDelegate
+
+- (Class<MXKCellRendering>)cellViewClassForCellData:(MXKCellData*)cellData
+{
+    // Return the default member table view cell
+    return MXKRoomMemberTableViewCell.class;
+}
+
+- (NSString *)cellReuseIdentifierForCellData:(MXKCellData*)cellData
+{
+    // Consider the default member table view cell
+    return MXKRoomMemberTableViewCell.defaultReuseIdentifier;
+}
+
+- (void)dataSource:(MXKDataSource *)dataSource didCellChange:(id)changes
+{
+    if (presenceUpdateTimer)
+    {
+        [presenceUpdateTimer invalidate];
+        presenceUpdateTimer = nil;
+    }
+    
+    // For now, do a simple full reload
+    [self.membersTableView reloadData];
+    
+    if (shouldScrollToTopOnRefresh)
+    {
+        [self scrollToTop:NO];
+        shouldScrollToTopOnRefresh = NO;
+    }
+    
+    // Place a timer to update members's activity information
+    presenceUpdateTimer = [NSTimer scheduledTimerWithTimeInterval:5 target:self selector:@selector(updateMembersActivityInfo) userInfo:self repeats:YES];
+}
+
+#pragma mark - UITableView delegate
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return [dataSource cellHeightAtIndex:indexPath.row];
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    if (_delegate)
+    {
+        id<MXKRoomMemberCellDataStoring> cellData = [dataSource cellDataAtIndex:indexPath.row];
+        
+        [_delegate roomMemberListViewController:self didSelectMember:cellData.roomMember];
+    }
+    [tableView deselectRowAtIndexPath:indexPath animated:NO];
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
+{
+    return 0;
+}
+
+- (void)tableView:(UITableView *)tableView didEndDisplayingCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath*)indexPath
+{
+    // Release here resources, and restore reusable cells
+    if ([cell respondsToSelector:@selector(didEndDisplay)])
+    {
+        [(id<MXKCellRendering>)cell didEndDisplay];
+    }
+}
+
+#pragma mark - UISearchBarDelegate
+
+- (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText
+{
+    // Apply filter
+    shouldScrollToTopOnRefresh = YES;
+    if (searchText.length)
+    {
+        [self.dataSource searchWithPatterns:@[searchText]];
+    }
+    else
+    {
+        [self.dataSource searchWithPatterns:nil];
+    }
+}
+
+- (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar
+{
+    // "Done" key has been pressed
+    [searchBar resignFirstResponder];
+}
+
+- (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar
+{
+    // Leave search
+    [searchBar resignFirstResponder];
+    
+    self.membersSearchBar.hidden = YES;
+    self.membersSearchBarHeightConstraint.constant = 0;
+    [self.view setNeedsUpdateConstraints];
+    
+    self.membersSearchBar.text = nil;
+    
+    // Refresh display
+    shouldScrollToTopOnRefresh = YES;
+    [self.dataSource searchWithPatterns:nil];
+}
+
+#pragma mark - Actions
+
+- (void)search:(id)sender
+{
+    // The user may have pressed search button whereas the view controller was disappearing
+    if (ignoreSearchRequest)
+    {
+        return;
+    }
+    
+    if (self.membersSearchBar.isHidden)
+    {
+        // Check whether there are data in which search
+        if ([self.dataSource tableView:self.membersTableView numberOfRowsInSection:0])
+        {
+            self.membersSearchBar.hidden = NO;
+            self.membersSearchBarHeightConstraint.constant = 44;
+            [self.view setNeedsUpdateConstraints];
+            
+            // Create search bar
+            [self.membersSearchBar becomeFirstResponder];
+        }
+    }
+    else
+    {
+        [self searchBarCancelButtonClicked: self.membersSearchBar];
+    }
+}
+
+- (void)inviteNewMember:(id)sender
+{
+    __weak typeof(self) weakSelf = self;
+    
+    if (currentAlert)
+    {
+        [currentAlert dismissViewControllerAnimated:NO completion:nil];
+    }
+    
+    // Ask for userId to invite
+    currentAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n userIdTitle] message:nil preferredStyle:UIAlertControllerStyleAlert];
+    
+    
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+                                                     style:UIAlertActionStyleDefault
+                                                   handler:^(UIAlertAction * action) {
+                                                       
+                                                       if (weakSelf)
+                                                       {
+                                                           typeof(self) self = weakSelf;
+                                                           self->currentAlert = nil;
+                                                       }
+                                                       
+                                                   }]];
+    
+    
+    [currentAlert addTextFieldWithConfigurationHandler:^(UITextField *textField)
+    {
+        textField.secureTextEntry = NO;
+        textField.placeholder = [MatrixKitL10n userIdPlaceholder];
+    }];
+    
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n invite]
+                                                     style:UIAlertActionStyleDefault
+                                                   handler:^(UIAlertAction * action) {
+                                                       
+                                                       if (weakSelf)
+                                                       {
+                                                           typeof(self) self = weakSelf;
+                                                           
+                                                           NSString *userId = [self->currentAlert textFields].firstObject.text;
+                                                           
+                                                           self->currentAlert = nil;
+                                                           
+                                                           if (userId.length)
+                                                           {
+                                                               MXRoom *mxRoom = [self.mainSession roomWithRoomId:self.dataSource.roomId];
+                                                               if (mxRoom)
+                                                               {
+                                                                   [mxRoom inviteUser:userId success:^{
+                                                                       
+                                                                   } failure:^(NSError *error) {
+                                                                       
+                                                                       MXLogDebug(@"[MXKRoomVC] Invite %@ failed", userId);
+                                                                       // Notify MatrixKit user
+                                                                       NSString *myUserId = self.mainSession.myUser.userId;
+                                                                       [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+                                                                       
+                                                                   }];
+                                                               }
+                                                           }
+                                                       }
+                                                       
+                                                   }]];
+    
+    [self presentViewController:currentAlert animated:YES completion:nil];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberListViewController.xib b/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberListViewController.xib
new file mode 100644
index 000000000..4a339bdad
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberListViewController.xib
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MXKRoomMemberListViewController">
+            <connections>
+                <outlet property="membersSearchBar" destination="Zbr-9e-VZh" id="cnj-ol-yU0"/>
+                <outlet property="membersSearchBarHeightConstraint" destination="jCU-cq-2OA" id="xFA-RP-Mdl"/>
+                <outlet property="membersSearchBarTopConstraint" destination="aRg-Nz-enq" id="cKu-YM-PQP"/>
+                <outlet property="membersTableView" destination="orV-HH-88x" id="G7I-A9-ZjX"/>
+                <outlet property="membersTableViewBottomConstraint" destination="m4x-32-odR" id="F7E-uT-fJX"/>
+                <outlet property="view" destination="iN0-l3-epB" id="NUQ-LI-M61"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <searchBar contentMode="redraw" showsCancelButton="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Zbr-9e-VZh">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="44" id="jCU-cq-2OA"/>
+                    </constraints>
+                    <textInputTraits key="textInputTraits" returnKeyType="done"/>
+                    <connections>
+                        <outlet property="delegate" destination="-1" id="BNF-PO-yKJ"/>
+                    </connections>
+                </searchBar>
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="orV-HH-88x">
+                    <rect key="frame" x="0.0" y="44" width="375" height="623"/>
+                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                </tableView>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="orV-HH-88x" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="NaR-eJ-WMj"/>
+                <constraint firstItem="Zbr-9e-VZh" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="aRg-Nz-enq"/>
+                <constraint firstItem="Zbr-9e-VZh" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="fty-XB-tTr"/>
+                <constraint firstItem="orV-HH-88x" firstAttribute="top" secondItem="Zbr-9e-VZh" secondAttribute="bottom" id="lBa-P2-Vnx"/>
+                <constraint firstAttribute="bottom" secondItem="orV-HH-88x" secondAttribute="bottom" id="m4x-32-odR"/>
+                <constraint firstAttribute="trailing" secondItem="Zbr-9e-VZh" secondAttribute="trailing" id="rKb-TZ-sap"/>
+                <constraint firstAttribute="trailing" secondItem="orV-HH-88x" secondAttribute="trailing" id="yBp-63-kZi"/>
+            </constraints>
+        </view>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKRoomSettingsViewController.h b/Riot/Modules/MatrixKit/Controllers/MXKRoomSettingsViewController.h
new file mode 100644
index 000000000..663101028
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKRoomSettingsViewController.h
@@ -0,0 +1,81 @@
+/*
+ Copyright 2015 OpenMarket 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 <MatrixSDK/MatrixSDK.h>
+
+#import "MXKTableViewController.h"
+
+/**
+ This view controller displays the room settings.
+ */
+@interface MXKRoomSettingsViewController : MXKTableViewController
+{
+@protected
+    // the dedicated room
+    MXRoom* mxRoom;
+    
+    // the room state
+    MXRoomState* mxRoomState;
+}
+
+/**
+ The dedicated roomId.
+ */
+@property (nonatomic, readonly) NSString *roomId;
+
+
+#pragma mark - Class methods
+
+/**
+ Returns the `UINib` object initialized for a `MXKRoomSettingsViewController`.
+ 
+ @return The initialized `UINib` object or `nil` if there were errors during initialization
+ or the nib file could not be located.
+ 
+ @discussion You may override this method to provide a customized nib. If you do,
+ you should also override `roomViewController` to return your
+ view controller loaded from your custom nib.
+ */
++ (UINib *)nib;
+
+/**
+ Creates and returns a new `MXKRoomSettingsViewController` object.
+ 
+ @discussion This is the designated initializer for programmatic instantiation.
+ @return An initialized `MXKRoomSettingsViewController` object if successful, `nil` otherwise.
+ */
++ (instancetype)roomSettingsViewController;
+
+/**
+ Set the dedicated session and the room Id
+ */
+- (void)initWithSession:(MXSession*)session andRoomId:(NSString*)roomId;
+
+/**
+ Refresh the displayed room settings. By default this method reload the table view.
+ 
+ @discusion You may override this method to handle the table refresh.
+ */
+- (void)refreshRoomSettings;
+
+/**
+ Updates the display with a new room state.
+ 
+ @param newRoomState the new room state.
+ */
+- (void)updateRoomState:(MXRoomState*)newRoomState;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKRoomSettingsViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKRoomSettingsViewController.m
new file mode 100644
index 000000000..8f729e9b9
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKRoomSettingsViewController.m
@@ -0,0 +1,215 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomSettingsViewController.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKSwiftHeader.h"
+
+@interface MXKRoomSettingsViewController()
+{    
+    // the room events listener
+    id roomListener;
+    
+    // Observe kMXSessionWillLeaveRoomNotification to be notified if the user leaves the current room.
+    id leaveRoomNotificationObserver;
+    
+    // Observe kMXRoomDidFlushDataNotification to take into account the updated room state when the room history is flushed.
+    id roomDidFlushDataNotificationObserver;
+}
+@end
+
+@implementation MXKRoomSettingsViewController
+
+#pragma mark - Class methods
+
++ (UINib *)nib
+{
+    return [UINib nibWithNibName:NSStringFromClass([MXKRoomSettingsViewController class])
+                          bundle:[NSBundle bundleForClass:[MXKRoomSettingsViewController class]]];
+}
+
++ (instancetype)roomSettingsViewController
+{
+    return [[[self class] alloc] initWithNibName:NSStringFromClass([MXKRoomSettingsViewController class])
+                                          bundle:[NSBundle bundleForClass:[MXKRoomSettingsViewController class]]];
+}
+
+#pragma mark -
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    
+    [self refreshRoomSettings];
+}
+
+#pragma mark - Override MXKTableViewController
+
+- (void)finalizeInit
+{
+    [super finalizeInit];
+}
+
+- (void)destroy
+{
+    if (roomListener)
+    {
+        MXWeakify(self);
+        [mxRoom liveTimeline:^(MXEventTimeline *liveTimeline) {
+            MXStrongifyAndReturnIfNil(self);
+
+            [liveTimeline removeListener:self->roomListener];
+            self->roomListener = nil;
+        }];
+    }
+    
+    if (leaveRoomNotificationObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:leaveRoomNotificationObserver];
+        leaveRoomNotificationObserver = nil;
+    }
+    
+    if (roomDidFlushDataNotificationObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:roomDidFlushDataNotificationObserver];
+        roomDidFlushDataNotificationObserver = nil;
+    }
+    
+    mxRoom = nil;
+    mxRoomState = nil;
+    
+    [super destroy];
+}
+
+- (void)onMatrixSessionStateDidChange:(NSNotification *)notif;
+{
+    // Check this is our Matrix session that has changed
+    if (notif.object == self.mainSession)
+    {
+        [super onMatrixSessionStateDidChange:notif];
+        
+        // refresh when the session sync is done.
+        if (MXSessionStateRunning == self.mainSession.state)
+        {
+            [self refreshRoomSettings];
+        }
+    }
+}
+
+#pragma mark - Public API
+
+/**
+ Set the dedicated session and the room Id
+ */
+- (void)initWithSession:(MXSession*)mxSession andRoomId:(NSString*)roomId
+{
+    // Update the matrix session
+    if (self.mainSession)
+    {
+        [self removeMatrixSession:self.mainSession];
+    }
+    mxRoom = nil;
+    
+    // Sanity checks
+    if (mxSession && roomId)
+    {
+        [self addMatrixSession:mxSession];
+        
+        // Report the room identifier
+        _roomId = roomId;
+        mxRoom = [mxSession roomWithRoomId:roomId];
+    }
+    
+    if (mxRoom)
+    {
+        // Register a listener to handle messages related to room name, topic...
+        MXWeakify(self);
+        [mxRoom liveTimeline:^(MXEventTimeline *liveTimeline) {
+            MXStrongifyAndReturnIfNil(self);
+
+            self->roomListener = [liveTimeline listenToEventsOfTypes:@[kMXEventTypeStringRoomName, kMXEventTypeStringRoomTopic, kMXEventTypeStringRoomAliases, kMXEventTypeStringRoomAvatar, kMXEventTypeStringRoomPowerLevels, kMXEventTypeStringRoomCanonicalAlias, kMXEventTypeStringRoomJoinRules, kMXEventTypeStringRoomGuestAccess, kMXEventTypeStringRoomHistoryVisibility] onEvent:^(MXEvent *event, MXTimelineDirection direction, MXRoomState *roomState) {
+
+                // Consider only live events
+                if (direction == MXTimelineDirectionForwards)
+                {
+                    [self updateRoomState:liveTimeline.state];
+                }
+            }];
+        
+            // Observe kMXSessionWillLeaveRoomNotification to be notified if the user leaves the current room.
+            self->leaveRoomNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXSessionWillLeaveRoomNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+
+                // Check whether the user will leave the room related to the displayed participants
+                if (notif.object == self.mainSession)
+                {
+                    NSString *roomId = notif.userInfo[kMXSessionNotificationRoomIdKey];
+                    if (roomId && [roomId isEqualToString:self.roomId])
+                    {
+                        // We remove the current view controller.
+                        [self withdrawViewControllerAnimated:YES completion:nil];
+                    }
+                }
+            }];
+
+            // Observe room history flush (sync with limited timeline, or state event redaction)
+            self->roomDidFlushDataNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXRoomDidFlushDataNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+
+                MXRoom *room = notif.object;
+                if (self.mainSession == room.mxSession && [self.roomId isEqualToString:room.roomId])
+                {
+                    // The existing room history has been flushed during server sync. Take into account the updated room state.
+                    [self updateRoomState:liveTimeline.state];
+                }
+
+            }];
+
+            [self updateRoomState:liveTimeline.state];
+        }];
+    }
+    
+    self.title = [MatrixKitL10n roomDetailsTitle];
+}
+
+- (void)refreshRoomSettings
+{
+    [self.tableView reloadData];
+}
+
+- (void)updateRoomState:(MXRoomState*)newRoomState
+{
+    mxRoomState = newRoomState.copy;
+    
+    [self refreshRoomSettings];
+}
+
+#pragma mark - UITableViewDataSource
+
+// empty by default
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return 0;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    // Return a fake cell to prevent app from crashing.
+    return [[UITableViewCell alloc] init];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKRoomSettingsViewController.xib b/Riot/Modules/MatrixKit/Controllers/MXKRoomSettingsViewController.xib
new file mode 100644
index 000000000..4dbf0f338
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKRoomSettingsViewController.xib
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MXKRoomSettingsViewController">
+            <connections>
+                <outlet property="view" destination="ju7-p5-cp4" id="eNV-3R-aIp"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="24" sectionFooterHeight="24" id="ju7-p5-cp4">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <connections>
+                <outlet property="dataSource" destination="-1" id="BWQ-3I-rCG"/>
+                <outlet property="delegate" destination="-1" id="lmH-mW-1fL"/>
+            </connections>
+        </tableView>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKRoomViewController.h b/Riot/Modules/MatrixKit/Controllers/MXKRoomViewController.h
new file mode 100644
index 000000000..8ae86eccb
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKRoomViewController.h
@@ -0,0 +1,440 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2019 The Matrix.org Foundation C.I.C
+
+ 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 <MatrixSDK/MatrixSDK.h>
+
+#import "MXKViewController.h"
+#import "MXKRoomDataSource.h"
+#import "MXKRoomTitleView.h"
+#import "MXKRoomInputToolbarView.h"
+#import "MXKRoomActivitiesView.h"
+#import "MXKEventDetailsView.h"
+
+#import "MXKAttachmentsViewController.h"
+#import "MXKAttachmentAnimator.h"
+
+typedef NS_ENUM(NSUInteger, MXKRoomViewControllerJoinRoomResult) {
+    MXKRoomViewControllerJoinRoomResultSuccess,
+    MXKRoomViewControllerJoinRoomResultFailureRoomEmpty,
+    MXKRoomViewControllerJoinRoomResultFailureJoinInProgress,
+    MXKRoomViewControllerJoinRoomResultFailureGeneric
+};
+
+/**
+ This view controller displays messages of a room. Only one matrix session is handled by this view controller.
+ */
+@interface MXKRoomViewController : MXKViewController <MXKDataSourceDelegate, MXKRoomTitleViewDelegate, MXKRoomInputToolbarViewDelegate, UITableViewDelegate, UIDocumentInteractionControllerDelegate, MXKAttachmentsViewControllerDelegate, MXKRoomActivitiesViewDelegate, MXKSourceAttachmentAnimatorDelegate>
+{
+@protected
+    /**
+     The identifier of the current event displayed at the bottom of the table (just above the toolbar).
+     Use to anchor the message displayed at the bottom during table refresh.
+     */
+    NSString *currentEventIdAtTableBottom;
+    
+    /**
+     Boolean value used to scroll to bottom the bubble history after refresh.
+     */
+    BOOL shouldScrollToBottomOnTableRefresh;
+    
+    /**
+     Potential event details view.
+     */
+    __weak MXKEventDetailsView *eventDetailsView;
+    
+    /**
+     Current alert (if any).
+     */
+    __weak UIAlertController *currentAlert;
+    
+    /**
+     The document interaction Controller used to share attachment
+     */
+    UIDocumentInteractionController *documentInteractionController;
+    
+    /**
+     The current shared attachment.
+     */
+    MXKAttachment *currentSharedAttachment;
+    
+    /**
+     The potential text input placeholder is saved when it is replaced temporarily
+     */
+    NSString *savedInputToolbarPlaceholder;
+    
+    /**
+     Tell whether the input toolbar required to run an animation indicator.
+     */
+    BOOL isInputToolbarProcessing;
+    
+    /**
+     Tell whether a device rotation is in progress
+     */
+    BOOL isSizeTransitionInProgress;
+    
+    /**
+     The current visibility of the status bar in this view controller.
+     */
+    BOOL isStatusBarHidden;
+    
+    /**
+     YES to prevent `bubblesTableView` scrolling when calling -[setBubbleTableViewContentOffset:animated:]
+     */
+    BOOL preventBubblesTableViewScroll;
+}
+
+/**
+ The current data source associated to the view controller.
+ */
+@property (nonatomic, readonly) MXKRoomDataSource *roomDataSource;
+
+/**
+ Flag indicating if this instance has the memory ownership of its `roomDataSource`.
+ If YES, it will release it on [self destroy] call;
+ Default is NO.
+ */
+@property (nonatomic) BOOL hasRoomDataSourceOwnership;
+
+/**
+ Tell whether the bubbles table view display is in transition. Its display is not warranty during the transition.
+ */
+@property (nonatomic, getter=isBubbleTableViewDisplayInTransition) BOOL bubbleTableViewDisplayInTransition;
+
+/**
+ Tell whether the automatic events acknowledgement (based on read receipt) is enabled.
+ Default is YES.
+ */
+@property (nonatomic, getter=isEventsAcknowledgementEnabled) BOOL eventsAcknowledgementEnabled;
+
+/**
+ Tell whether the room read marker must be updated when an event is acknowledged with a read receipt.
+ Default is NO.
+ */
+@property (nonatomic) BOOL updateRoomReadMarker;
+
+/**
+ When the room view controller displays a room data source based on a timeline with an initial event,
+ the bubble table view content is scrolled by default to display the top of this event at the center of the screen
+ the first time it appears.
+ Use this property to force the table view to center its content on the bottom part of the event.
+ Default is NO.
+ */
+@property (nonatomic) BOOL centerBubblesTableViewContentOnTheInitialEventBottom;
+
+/**
+ The current title view defined into the view controller.
+ */
+@property (nonatomic, weak, readonly) MXKRoomTitleView* titleView;
+
+/**
+ The current input toolbar view defined into the view controller.
+ */
+@property (nonatomic, weak, readonly) MXKRoomInputToolbarView* inputToolbarView;
+
+/**
+ The current extra info view defined into the view controller.
+ */
+@property (nonatomic, readonly) MXKRoomActivitiesView* activitiesView;
+
+/**
+ The threshold used to trigger inconspicuous back pagination, or forwards pagination
+ for non live timeline. A pagination is triggered when the vertical content offset
+ is lower this threshold.
+ Default is 300.
+ */
+@property (nonatomic) NSUInteger paginationThreshold;
+
+/**
+ The maximum number of messages to retrieve during a pagination. Default is 30.
+ */
+@property (nonatomic) NSUInteger paginationLimit;
+
+/**
+ Enable/disable saving of the current typed text in message composer when view disappears.
+ The message composer is prefilled with this text when the room is opened again.
+ This property value is YES by default.
+ */
+@property BOOL saveProgressTextInput;
+
+/**
+ The invited rooms can be automatically joined when the data source is ready.
+ This property enable/disable this option. Its value is YES by default.
+ */
+@property BOOL autoJoinInvitedRoom;
+
+/**
+ Tell whether the room history is automatically scrolled to the most recent messages
+ when a keyboard is presented. YES by default.
+ This option is ignored when an alert is presented.
+ */
+@property BOOL scrollHistoryToTheBottomOnKeyboardPresentation;
+
+/**
+ YES (default) to show actions button in document preview. NO otherwise.
+ */
+@property BOOL allowActionsInDocumentPreview;
+
+/**
+ Duration of the animation in case of the composer needs to be resized (default 0.3s)
+ */
+@property NSTimeInterval resizeComposerAnimationDuration;
+
+/**
+ This object is defined when the displayed room is left. It is added into the bubbles table header.
+ This label is used to display the reason why the room has been left.
+ */
+@property (nonatomic, weak, readonly) UILabel *leftRoomReasonLabel;
+
+@property (weak, nonatomic) IBOutlet UITableView *bubblesTableView;
+@property (weak, nonatomic) IBOutlet UIView *roomTitleViewContainer;
+@property (weak, nonatomic) IBOutlet UIView *roomInputToolbarContainer;
+@property (weak, nonatomic) IBOutlet UIView *roomActivitiesContainer;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *bubblesTableViewTopConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *bubblesTableViewBottomConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *roomActivitiesContainerHeightConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *roomInputToolbarContainerHeightConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *roomInputToolbarContainerBottomConstraint;
+
+#pragma mark - Class methods
+
+/**
+ Returns the `UINib` object initialized for a `MXKRoomViewController`.
+
+ @return The initialized `UINib` object or `nil` if there were errors during initialization
+ or the nib file could not be located.
+ 
+ @discussion You may override this method to provide a customized nib. If you do,
+ you should also override `roomViewController` to return your
+ view controller loaded from your custom nib.
+ */
++ (UINib *)nib;
+
+/**
+ Creates and returns a new `MXKRoomViewController` object.
+
+ @discussion This is the designated initializer for programmatic instantiation.
+ @return An initialized `MXKRoomViewController` object if successful, `nil` otherwise.
+ */
++ (instancetype)roomViewController;
+
+/**
+ Display a room.
+ 
+ @param dataSource the data source .
+ */
+- (void)displayRoom:(MXKRoomDataSource*)dataSource;
+
+/**
+ This method is called when the associated data source is ready.
+ 
+ By default this operation triggers the initial back pagination when the user is an actual
+ member of the room (membership = join).
+ 
+ The invited rooms are automatically joined during this operation if 'autoJoinInvitedRoom' is YES.
+ When the room is successfully joined, an initial back pagination is triggered too.
+ Else nothing is done for the invited rooms.
+ 
+ Override it to customize the view controller behavior when the data source is ready.
+ */
+- (void)onRoomDataSourceReady;
+
+/**
+ Update view controller appearance according to the state of its associated data source.
+ This method is called in the following use cases:
+ - on data source change (see `[MXKRoomViewController displayRoom:]`).
+ - on data source state change (see `[MXKDataSourceDelegate dataSource:didStateChange:]`)
+ - when view did appear.
+ 
+ The default implementation:
+ - show input toolbar view if the dataSource is defined and ready (`MXKDataSourceStateReady`), hide toolbar in others use cases.
+ - stop activity indicator if the dataSource is defined and ready (`MXKDataSourceStateReady`).
+ - update view controller title with room information.
+ 
+ Override it to customize view appearance according to data source state.
+ */
+- (void)updateViewControllerAppearanceOnRoomDataSourceState;
+
+/**
+ This method is called when the associated data source has encountered an error on the timeline.
+
+ Override it to customize the view controller behavior.
+
+ @param notif the notification data sent with kMXKRoomDataSourceTimelineError notif.
+ */
+- (void)onTimelineError:(NSNotification *)notif;
+
+/**
+ Join the current displayed room.
+ 
+ This operation fails if the user has already joined the room, or if the data source is not ready.
+ It fails if a join request is already running too.
+ 
+ @param completion the block to execute at the end of the operation.
+ You may specify nil for this parameter.
+ */
+- (void)joinRoom:(void(^)(MXKRoomViewControllerJoinRoomResult result))completion;
+
+/**
+ Join a room with a room id or an alias.
+
+ This operation fails if the user has already joined the room, or if the data source is not ready,
+ or if the access to the room is forbidden to the user.
+ It fails if a join request is already running too.
+ 
+ @param roomIdOrAlias the id or the alias of the room to join.
+ @param viaServers The server names to try and join through in addition to those that are automatically chosen. It is optional and can be nil.
+ @param signUrl the signurl paramater passed with a 3PID invitation. It is optional and can be nil.
+
+ @param completion the block to execute at the end of the operation.
+ You may specify nil for this parameter.
+ */
+- (void)joinRoomWithRoomIdOrAlias:(NSString*)roomIdOrAlias
+                       viaServers:(NSArray<NSString*>*)viaServers
+                       andSignUrl:(NSString*)signUrl
+                       completion:(void(^)(MXKRoomViewControllerJoinRoomResult result))completion;
+
+/**
+ Update view controller appearance when the user is about to leave the displayed room.
+ This method is called when the user will leave the current room (see `kMXSessionWillLeaveRoomNotification`).
+ 
+ The default implementation:
+ - discard `roomDataSource`
+ - hide input toolbar view
+ - freeze the room title display
+ - add a label (`leftRoomReasonLabel`) in bubbles table header to display the reason why the room has been left.
+ 
+ Override it to customize view appearance, or to withdraw the view controller.
+ 
+ @param event the MXEvent responsible for the leaving.
+ */
+- (void)leaveRoomOnEvent:(MXEvent*)event;
+
+/**
+ Register the class used to instantiate the title view which will handle the room name display.
+ 
+ The resulting view is added into 'roomTitleViewContainer' view, which must be defined before calling this method.
+ 
+ Note: By default the room name is displayed by using 'navigationItem.title' field of the view controller.
+ 
+ @param roomTitleViewClass a MXKRoomTitleView-inherited class.
+ */
+- (void)setRoomTitleViewClass:(Class)roomTitleViewClass;
+
+/**
+ Register the class used to instantiate the input toolbar view which will handle message composer
+ and attachments selection for the room.
+ 
+ The resulting view is added into 'roomInputToolbarContainer' view, which must be defined before calling this method.
+ 
+ @param roomInputToolbarViewClass a MXKRoomInputToolbarView-inherited class, or nil to remove the current view.
+ */
+- (void)setRoomInputToolbarViewClass:(Class)roomInputToolbarViewClass;
+
+/**
+ Register the class used to instantiate the extra info view.
+ 
+ The resulting view is added into 'roomActivitiesContainer' view, which must be defined before calling this method.
+ 
+ @param roomActivitiesViewClass a MXKRoomActivitiesViewClass-inherited class, or nil to remove the current view.
+ */
+- (void)setRoomActivitiesViewClass:(Class)roomActivitiesViewClass;
+
+/**
+ Register the class used to instantiate the viewer dedicated to the attachments with thumbnail.
+ By default 'MXKAttachmentsViewController' class is used.
+ 
+ @param attachmentsViewerClass a MXKAttachmentsViewController-inherited class, or nil to restore the default class.
+ */
+- (void)setAttachmentsViewerClass:(Class)attachmentsViewerClass;
+
+/**
+ Register the view class used to display the details of an event.
+ MXKEventDetailsView is used by default.
+ 
+ @param eventDetailsViewClass a MXKEventDetailsView-inherited class.
+ */
+- (void)setEventDetailsViewClass:(Class)eventDetailsViewClass;
+
+/**
+ Detect and process potential IRC command in provided string.
+ 
+ @param string to analyse
+ @return YES if IRC style command has been detected and interpreted.
+ */
+- (BOOL)isIRCStyleCommand:(NSString*)string;
+
+/**
+ Mention the member display name in the current text of the message composer.
+ The message composer becomes then the first responder.
+ */
+- (void)mention:(MXRoomMember*)roomMember;
+
+/**
+ Force to dismiss keyboard if any
+ */
+- (void)dismissKeyboard;
+
+/**
+ Tell whether the most recent message of the room history is visible.
+ */
+- (BOOL)isBubblesTableScrollViewAtTheBottom;
+
+/**
+ Scroll the room history until the most recent message.
+ */
+- (void)scrollBubblesTableViewToBottomAnimated:(BOOL)animated;
+
+/**
+ Dismiss the keyboard and all the potential subviews.
+ */
+- (void)dismissTemporarySubViews;
+
+/**
+ Display a popup with the event detais.
+ 
+ @param event the event to inspect.
+ */
+- (void)showEventDetails:(MXEvent *)event;
+
+/**
+ Present the attachments viewer by displaying the attachment of the provided cell.
+ 
+ @param cell the table view cell with attachment
+ */
+- (void)showAttachmentInCell:(UITableViewCell*)cell;
+
+/**
+ Force a refresh of the room history display.
+ 
+ You should not call this method directly.
+ You may override it in inherited 'MXKRoomViewController' class.
+ 
+ @param useBottomAnchor tells whether the updated history must keep display the same event at the bottom.
+ @return a boolean value which tells whether the table has been scrolled to the bottom.
+ */
+- (BOOL)reloadBubblesTable:(BOOL)useBottomAnchor;
+
+/**
+ Sets the offset from the content `bubblesTableView`'s origin. Take into account `preventBubblesTableViewScroll` value.
+
+ @param contentOffset Offset from the content `bubblesTableView`’s origin.
+ @param animated YES to animate the transition.
+ */
+- (void)setBubbleTableViewContentOffset:(CGPoint)contentOffset animated:(BOOL)animated;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKRoomViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKRoomViewController.m
new file mode 100644
index 000000000..f29b59ee7
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKRoomViewController.m
@@ -0,0 +1,4068 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 New Vector Ltd
+ Copyright 2019 The Matrix.org Foundation C.I.C
+
+ 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.
+ */
+
+#define MXKROOMVIEWCONTROLLER_DEFAULT_TYPING_TIMEOUT_SEC 10
+#define MXKROOMVIEWCONTROLLER_MESSAGES_TABLE_MINIMUM_HEIGHT 50
+
+#import "MXKRoomViewController.h"
+
+#import <MediaPlayer/MediaPlayer.h>
+
+#import "MXKRoomBubbleTableViewCell.h"
+#import "MXKSearchTableViewCell.h"
+#import "MXKImageView.h"
+
+#import "MXKRoomDataSourceManager.h"
+
+#import "MXKRoomInputToolbarViewWithSimpleTextView.h"
+
+#import "MXKConstants.h"
+
+#import "MXKRoomBubbleCellData.h"
+
+#import "MXKRoomIncomingTextMsgBubbleCell.h"
+#import "MXKRoomIncomingTextMsgWithoutSenderInfoBubbleCell.h"
+#import "MXKRoomIncomingAttachmentBubbleCell.h"
+#import "MXKRoomIncomingAttachmentWithoutSenderInfoBubbleCell.h"
+
+#import "MXKRoomOutgoingTextMsgBubbleCell.h"
+#import "MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h"
+#import "MXKRoomOutgoingAttachmentBubbleCell.h"
+#import "MXKRoomOutgoingAttachmentWithoutSenderInfoBubbleCell.h"
+
+#import "MXKEncryptionKeysImportView.h"
+
+#import "NSBundle+MatrixKit.h"
+#import "MXKSlashCommands.h"
+#import "MXKSwiftHeader.h"
+
+#import "MXKPreviewViewController.h"
+
+@interface MXKRoomViewController () <MXKPreviewViewControllerDelegate>
+{
+    /**
+     YES once the view has appeared
+     */
+    BOOL hasAppearedOnce;
+    
+    /**
+     YES if scrolling to bottom is in progress
+     */
+    BOOL isScrollingToBottom;
+    
+    /**
+     Date of the last observed typing
+     */
+    NSDate *lastTypingDate;
+    
+    /**
+     Local typing timout
+     */
+    NSTimer *typingTimer;
+    
+    /**
+     YES when pagination is in progress.
+     */
+    BOOL isPaginationInProgress;
+    
+    /**
+     The back pagination spinner view.
+     */
+    UIView* backPaginationActivityView;
+    
+    /**
+     Store the height of the first bubble before back pagination.
+     */
+    CGFloat backPaginationSavedFirstBubbleHeight;
+    
+    /**
+     Potential request in progress to join the selected room
+     */
+    MXHTTPOperation *joinRoomRequest;
+    
+    /**
+     Text selection
+     */
+    NSString *selectedText;
+    
+    /**
+     The class used to instantiate attachments viewer for image and video..
+     */
+    Class attachmentsViewerClass;
+    
+    /**
+     The class used to display event details.
+     */
+    Class customEventDetailsViewClass;
+    
+    /**
+     The reconnection animated view.
+     */
+    UIView* reconnectingView;
+    
+    /**
+     The view to import e2e keys.
+     */
+    MXKEncryptionKeysImportView *importView;
+
+    /**
+     The latest server sync date
+     */
+    NSDate* latestServerSync;
+    
+    /**
+     The restart the event connnection
+     */
+    BOOL restartConnection;
+}
+
+/**
+ The eventId of the Attachment that was used to open the Attachments ViewController
+ */
+@property (nonatomic) NSString *openedAttachmentEventId;
+
+/**
+ The eventId of the Attachment from which the Attachments ViewController was closed
+ */
+@property (nonatomic) NSString *closedAttachmentEventId;
+
+@property (nonatomic) UIImageView *openedAttachmentImageView;
+
+/**
+ Observe kMXSessionWillLeaveRoomNotification to be notified if the user leaves the current room.
+ */
+@property (nonatomic, weak) id mxSessionWillLeaveRoomNotificationObserver;
+
+/**
+ Observe UIApplicationDidBecomeActiveNotification to refresh bubbles when app leaves the background state.
+ */
+@property (nonatomic, weak) id uiApplicationDidBecomeActiveNotificationObserver;
+
+/**
+ Observe UIMenuControllerDidHideMenuNotification to cancel text selection
+ */
+@property (nonatomic, weak) id uiMenuControllerDidHideMenuNotificationObserver;
+
+/**
+ The attachments viewer for image and video.
+ */
+@property (nonatomic, weak) MXKAttachmentsViewController *attachmentsViewer;
+
+@end
+
+@implementation MXKRoomViewController
+@synthesize roomDataSource, titleView, inputToolbarView, activitiesView;
+
+#pragma mark - Class methods
+
++ (UINib *)nib
+{
+    return [UINib nibWithNibName:NSStringFromClass([MXKRoomViewController class])
+                          bundle:[NSBundle bundleForClass:[MXKRoomViewController class]]];
+}
+
++ (instancetype)roomViewController
+{
+    return [[[self class] alloc] initWithNibName:NSStringFromClass([MXKRoomViewController class])
+                                          bundle:[NSBundle bundleForClass:[MXKRoomViewController class]]];
+}
+
+#pragma mark -
+
+- (void)finalizeInit
+{
+    [super finalizeInit];
+    
+    // Scroll to bottom the bubble history at first display
+    shouldScrollToBottomOnTableRefresh = YES;
+    
+    // Default pagination settings
+    _paginationThreshold = 300;
+    _paginationLimit = 30;
+    
+    // Save progress text input by default
+    _saveProgressTextInput = YES;
+    
+    // Enable auto join option by default
+    _autoJoinInvitedRoom = YES;
+    
+    // Do not take ownership of room data source by default
+    _hasRoomDataSourceOwnership = NO;
+    
+    // Turn on the automatic events acknowledgement.
+    _eventsAcknowledgementEnabled = YES;
+    
+    // Do not update the read marker by default.
+    _updateRoomReadMarker = NO;
+    
+    // Center the table content on the initial event top by default.
+    _centerBubblesTableViewContentOnTheInitialEventBottom = NO;
+    
+    // Scroll to the bottom when a keyboard is presented
+    _scrollHistoryToTheBottomOnKeyboardPresentation = YES;
+    
+    // Keep visible the status bar by default.
+    isStatusBarHidden = NO;
+    
+    // By default actions button is shown in document preview
+    _allowActionsInDocumentPreview = YES;
+    
+    // By default the duration of the composer resizing is 0.3s
+    _resizeComposerAnimationDuration = 0.3;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    // Check whether the view controller has been pushed via storyboard
+    if (!_bubblesTableView)
+    {
+        // Instantiate view controller objects
+        [[[self class] nib] instantiateWithOwner:self options:nil];
+    }
+    
+    // Adjust bottom constraint of the input toolbar container in order to take into account potential tabBar
+    _roomInputToolbarContainerBottomConstraint.active = NO;
+    _roomInputToolbarContainerBottomConstraint = [NSLayoutConstraint constraintWithItem:self.bottomLayoutGuide
+                                                                              attribute:NSLayoutAttributeTop
+                                                                              relatedBy:NSLayoutRelationEqual
+                                                                                 toItem:self.roomInputToolbarContainer
+                                                                              attribute:NSLayoutAttributeBottom
+                                                                             multiplier:1.0f
+                                                                               constant:0.0f];
+    _roomInputToolbarContainerBottomConstraint.active = YES;
+    [self.view setNeedsUpdateConstraints];
+    
+    // Hide bubbles table by default in order to hide initial scrolling to the bottom
+    _bubblesTableView.hidden = YES;
+    
+    // Ensure that the titleView will be scaled when it will be required
+    // during a screen rotation for example.
+    _roomTitleViewContainer.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+    
+    // Set default input toolbar view
+    [self setRoomInputToolbarViewClass:MXKRoomInputToolbarViewWithSimpleTextView.class];
+    
+    // set the default extra
+    [self setRoomActivitiesViewClass:MXKRoomActivitiesView.class];
+    
+    // Finalize table view configuration
+    [self configureBubblesTableView];
+    
+    // Observe UIApplicationDidBecomeActiveNotification to refresh bubbles when app leaves the background state.
+    MXWeakify(self);
+    _uiApplicationDidBecomeActiveNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationDidBecomeActiveNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+        
+        MXStrongifyAndReturnIfNil(self);
+        if (self->roomDataSource.state == MXKDataSourceStateReady && [self->roomDataSource tableView:self->_bubblesTableView numberOfRowsInSection:0])
+        {
+            // Reload the full table
+            self.bubbleTableViewDisplayInTransition = YES;
+            [self reloadBubblesTable:YES];
+            self.bubbleTableViewDisplayInTransition = NO;
+        }
+    }];
+    
+    if ([MXKAppSettings standardAppSettings].outboundGroupSessionKeyPreSharingStrategy == MXKKeyPreSharingWhenEnteringRoom)
+    {
+        [self shareEncryptionKeys];
+    }
+}
+
+- (BOOL)prefersStatusBarHidden
+{
+    // Return the current status bar visibility.
+    // Caution: Enable [UIViewController prefersStatusBarHidden] use at application level
+    // by turning on UIViewControllerBasedStatusBarAppearance in Info.plist.
+    return isStatusBarHidden;
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    
+    // Observe server sync process at room data source level too
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onMatrixSessionChange) name:kMXKRoomDataSourceSyncStatusChanged object:nil];
+
+    // Observe timeline failure
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onTimelineError:) name:kMXKRoomDataSourceTimelineError object:nil];
+
+    // Observe the server sync
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onSyncNotification) name:kMXSessionDidSyncNotification object:nil];
+    
+    // Be sure to display the activity indicator during back pagination
+    if (isPaginationInProgress)
+    {
+        [self startActivityIndicator];
+    }
+    
+    // Finalize view controller appearance
+    [self updateViewControllerAppearanceOnRoomDataSourceState];
+    
+    // no need to reload the tableview at this stage
+    // IOS is going to load it after calling this method
+    // so give a breath to scroll to the bottom if required
+    if (shouldScrollToBottomOnTableRefresh)
+    {
+        self.bubbleTableViewDisplayInTransition = YES;
+        
+        dispatch_async(dispatch_get_main_queue(), ^{
+            
+            [self scrollBubblesTableViewToBottomAnimated:NO];
+            
+            // Show bubbles table after initial scrolling to the bottom
+            // Patch: We need to delay this operation to wait for the end of scrolling.
+            dispatch_after(dispatch_walltime(DISPATCH_TIME_NOW, 0.3 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+                
+                self->_bubblesTableView.hidden = NO;
+                self.bubbleTableViewDisplayInTransition = NO;
+                
+            });
+            
+        });
+    }
+    else
+    {
+        _bubblesTableView.hidden = NO;
+    }
+}
+
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    
+    // Remove the rounded bottom unsafe area of the iPhone X
+    _bubblesTableViewBottomConstraint.constant += self.view.safeAreaInsets.bottom;
+
+    if (_saveProgressTextInput && roomDataSource)
+    {
+        // Retrieve the potential message partially typed during last room display.
+        // Note: We have to wait for viewDidAppear before updating growingTextView (viewWillAppear is too early)
+        inputToolbarView.textMessage = roomDataSource.partialTextMessage;
+    }
+    
+    if (!hasAppearedOnce)
+    {
+        hasAppearedOnce = YES;
+    }
+    
+    //  Mark all messages as read when the room is displayed
+    [self.roomDataSource.room.summary markAllAsReadLocally];
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXKRoomDataSourceSyncStatusChanged object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXKRoomDataSourceTimelineError object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionDidSyncNotification object:nil];
+    
+    [self removeReconnectingView];
+}
+
+- (void)dealloc
+{
+    if (_mxSessionWillLeaveRoomNotificationObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:_mxSessionWillLeaveRoomNotificationObserver];
+    }
+    
+    if (_uiApplicationDidBecomeActiveNotificationObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:_uiApplicationDidBecomeActiveNotificationObserver];
+    }
+    
+    if (_uiMenuControllerDidHideMenuNotificationObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:_uiMenuControllerDidHideMenuNotificationObserver];
+    }
+    
+    [self destroy];
+}
+
+- (void)didReceiveMemoryWarning
+{
+    [super didReceiveMemoryWarning];
+    
+    // Dispose of any resources that can be recreated.
+}
+
+- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id <UIViewControllerTransitionCoordinator>)coordinator
+{
+    isSizeTransitionInProgress = YES;
+    shouldScrollToBottomOnTableRefresh = [self isBubblesTableScrollViewAtTheBottom];
+    
+    [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
+    
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(coordinator.transitionDuration * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        
+        if (!self.keyboardView)
+        {
+            [self updateMessageTextViewFrame];
+        }
+        
+        // Force full table refresh to take into account cell width change.
+        self.bubbleTableViewDisplayInTransition = YES;
+        [self reloadBubblesTable:YES invalidateBubblesCellDataCache:YES];
+        self.bubbleTableViewDisplayInTransition = NO;
+        
+        self->shouldScrollToBottomOnTableRefresh = NO;
+        self->isSizeTransitionInProgress = NO;
+    });
+}
+
+// The 2 following methods are deprecated since iOS 8
+- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
+{
+    isSizeTransitionInProgress = YES;
+    shouldScrollToBottomOnTableRefresh = [self isBubblesTableScrollViewAtTheBottom];
+    
+    [super willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
+}
+- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
+{
+    [super didRotateFromInterfaceOrientation:fromInterfaceOrientation];
+    
+    if (!self.keyboardView)
+    {
+        [self updateMessageTextViewFrame];
+    }
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        // Force full table refresh to take into account cell width change.
+        self.bubbleTableViewDisplayInTransition = YES;
+        [self reloadBubblesTable:YES];
+        self.bubbleTableViewDisplayInTransition = NO;
+        
+        self->shouldScrollToBottomOnTableRefresh = NO;
+        self->isSizeTransitionInProgress = NO;
+    });
+}
+
+- (void)viewDidLayoutSubviews
+{
+    [super viewDidLayoutSubviews];
+    
+    CGFloat bubblesTableViewBottomConst = self.roomInputToolbarContainerBottomConstraint.constant + self.roomInputToolbarContainerHeightConstraint.constant + self.roomActivitiesContainerHeightConstraint.constant;
+
+    if (self.bubblesTableViewBottomConstraint.constant != bubblesTableViewBottomConst)
+    {
+        self.bubblesTableViewBottomConstraint.constant = bubblesTableViewBottomConst;
+    }
+
+}
+
+#pragma mark - Override MXKViewController
+
+- (void)onMatrixSessionChange
+{
+    [super onMatrixSessionChange];
+    
+    // Check dataSource state
+    if (self.roomDataSource && (self.roomDataSource.state == MXKDataSourceStatePreparing || self.roomDataSource.serverSyncEventCount))
+    {
+        // dataSource is not ready, keep running the loading wheel
+        [self startActivityIndicator];
+    }
+}
+
+- (void)onKeyboardShowAnimationComplete
+{
+    // Check first if the first responder belongs to title view
+    UIView *keyboardView = titleView.inputAccessoryView.superview;
+    if (!keyboardView)
+    {
+        // Check whether the first responder is the input tool bar text composer
+        keyboardView = inputToolbarView.inputAccessoryView.superview;
+    }
+    
+    // Report the keyboard view in order to track keyboard frame changes
+    self.keyboardView = keyboardView;
+}
+
+- (void)setKeyboardHeight:(CGFloat)keyboardHeight
+{
+    // Deduce the bottom constraint for the input toolbar view (Don't forget the potential tabBar)
+    CGFloat inputToolbarViewBottomConst = keyboardHeight - self.bottomLayoutGuide.length;
+    // Check whether the keyboard is over the tabBar
+    if (inputToolbarViewBottomConst < 0)
+    {
+        inputToolbarViewBottomConst = 0;
+    }
+    
+    // Update constraints
+    _roomInputToolbarContainerBottomConstraint.constant = inputToolbarViewBottomConst;
+    _bubblesTableViewBottomConstraint.constant = inputToolbarViewBottomConst + _roomInputToolbarContainerHeightConstraint.constant + _roomActivitiesContainerHeightConstraint.constant;
+    
+    // Remove the rounded bottom unsafe area of the iPhone X
+    _bubblesTableViewBottomConstraint.constant += self.view.safeAreaInsets.bottom;
+
+    // Invalidate the current layout to take into account the new constraints in the next update cycle.
+    [self.view setNeedsLayout];
+    
+    // Compute the visible area (tableview + toolbar) at the end of animation
+    CGFloat visibleArea = self.view.frame.size.height - _bubblesTableView.adjustedContentInset.top - keyboardHeight;
+    // Deduce max height of the message text input by considering the minimum height of the table view.
+    inputToolbarView.maxHeight = visibleArea - MXKROOMVIEWCONTROLLER_MESSAGES_TABLE_MINIMUM_HEIGHT;
+    
+    // Check conditions before scrolling the tableview content when a new keyboard is presented.
+    if ((_scrollHistoryToTheBottomOnKeyboardPresentation || [self isBubblesTableScrollViewAtTheBottom]) && !super.keyboardHeight && keyboardHeight && !currentAlert)
+    {
+        self.bubbleTableViewDisplayInTransition = YES;
+        
+        // Force here the layout update to scroll correctly the table content.
+        [self.view layoutIfNeeded];
+        [self scrollBubblesTableViewToBottomAnimated:NO];
+        
+        self.bubbleTableViewDisplayInTransition = NO;
+    }
+    else
+    {
+        [self updateCurrentEventIdAtTableBottom:NO];
+    }
+    
+    super.keyboardHeight = keyboardHeight;
+}
+
+- (void)destroy
+{
+    if (documentInteractionController)
+    {
+        [documentInteractionController dismissPreviewAnimated:NO];
+        [documentInteractionController dismissMenuAnimated:NO];
+        documentInteractionController = nil;
+    }
+    
+    if (currentSharedAttachment)
+    {
+        [currentSharedAttachment onShareEnded];
+        currentSharedAttachment = nil;
+    }
+    
+    [self dismissTemporarySubViews];
+    
+    _bubblesTableView.dataSource = nil;
+    _bubblesTableView.delegate = nil;
+    _bubblesTableView = nil;
+    
+    if (roomDataSource.delegate == self)
+    {
+        roomDataSource.delegate = nil;
+    }
+    
+    if (_hasRoomDataSourceOwnership)
+    {
+        // Release the room data source
+        [roomDataSource destroy];
+    }
+    roomDataSource = nil;
+    
+    if (titleView)
+    {
+        [titleView removeFromSuperview];
+        [titleView destroy];
+        titleView = nil;
+    }
+    
+    if (inputToolbarView)
+    {
+        [inputToolbarView removeFromSuperview];
+        [inputToolbarView destroy];
+        inputToolbarView = nil;
+    }
+    
+    if (activitiesView)
+    {
+        [activitiesView removeFromSuperview];
+        [activitiesView destroy];
+        activitiesView = nil;
+    }
+    
+    [typingTimer invalidate];
+    typingTimer = nil;
+    
+    if (joinRoomRequest)
+    {
+        [joinRoomRequest cancel];
+        joinRoomRequest = nil;
+    }
+
+    [super destroy];
+}
+
+#pragma mark -
+
+- (void)configureBubblesTableView
+{
+    // Set up table delegates
+    _bubblesTableView.delegate = self;
+    _bubblesTableView.dataSource = roomDataSource; // Note: data source may be nil here, it will be set during [displayRoom:] call.
+    
+    // Set up default classes to use for cells
+    [_bubblesTableView registerClass:MXKRoomIncomingTextMsgBubbleCell.class forCellReuseIdentifier:MXKRoomIncomingTextMsgBubbleCell.defaultReuseIdentifier];
+    [_bubblesTableView registerClass:MXKRoomIncomingTextMsgWithoutSenderInfoBubbleCell.class forCellReuseIdentifier:MXKRoomIncomingTextMsgWithoutSenderInfoBubbleCell.defaultReuseIdentifier];
+    [_bubblesTableView registerClass:MXKRoomIncomingAttachmentBubbleCell.class forCellReuseIdentifier:MXKRoomIncomingAttachmentBubbleCell.defaultReuseIdentifier];
+    [_bubblesTableView registerClass:MXKRoomIncomingAttachmentWithoutSenderInfoBubbleCell.class forCellReuseIdentifier:MXKRoomIncomingAttachmentWithoutSenderInfoBubbleCell.defaultReuseIdentifier];
+    
+    [_bubblesTableView registerClass:MXKRoomOutgoingTextMsgBubbleCell.class forCellReuseIdentifier:MXKRoomOutgoingTextMsgBubbleCell.defaultReuseIdentifier];
+    [_bubblesTableView registerClass:MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.class forCellReuseIdentifier:MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.defaultReuseIdentifier];
+    [_bubblesTableView registerClass:MXKRoomOutgoingAttachmentBubbleCell.class forCellReuseIdentifier:MXKRoomOutgoingAttachmentBubbleCell.defaultReuseIdentifier];
+    [_bubblesTableView registerClass:MXKRoomOutgoingAttachmentWithoutSenderInfoBubbleCell.class forCellReuseIdentifier:MXKRoomOutgoingAttachmentWithoutSenderInfoBubbleCell.defaultReuseIdentifier];
+    
+    // Observe kMXSessionWillLeaveRoomNotification to be notified if the user leaves the current room.
+    MXWeakify(self);
+    _mxSessionWillLeaveRoomNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXSessionWillLeaveRoomNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+        
+        MXStrongifyAndReturnIfNil(self);
+        // Check whether the user will leave the current room
+        if (notif.object == self.mainSession)
+        {
+            NSString *roomId = notif.userInfo[kMXSessionNotificationRoomIdKey];
+            if (roomId && [roomId isEqualToString:self->roomDataSource.roomId])
+            {
+                // Update view controller appearance
+                [self leaveRoomOnEvent:notif.userInfo[kMXSessionNotificationEventKey]];
+            }
+        }
+    }];
+}
+
+- (void)updateMessageTextViewFrame
+{
+    if (!self.keyboardView)
+    {
+        // Compute the visible area (tableview + toolbar)
+        CGFloat visibleArea = self.view.frame.size.height - _bubblesTableView.adjustedContentInset.top;
+        // Deduce max height of the message text input by considering the minimum height of the table view.
+        inputToolbarView.maxHeight = visibleArea - MXKROOMVIEWCONTROLLER_MESSAGES_TABLE_MINIMUM_HEIGHT;
+    }
+}
+
+- (CGFloat)tableViewSafeAreaWidth
+{
+    CGFloat safeAreaInsetsWidth;
+    
+    // Take safe area into account
+    safeAreaInsetsWidth = self.bubblesTableView.safeAreaInsets.left + self.bubblesTableView.safeAreaInsets.right;
+    
+    return self.bubblesTableView.frame.size.width - safeAreaInsetsWidth;
+}
+
+#pragma mark - Public API
+
+- (void)displayRoom:(MXKRoomDataSource *)dataSource
+{
+    if (roomDataSource)
+    {
+        if (self.hasRoomDataSourceOwnership)
+        {
+            // Release the room data source
+            [roomDataSource destroy];
+        }
+        else if (roomDataSource.delegate == self)
+        {
+            roomDataSource.delegate = nil;
+        }
+        roomDataSource = nil;
+        
+        [self removeMatrixSession:self.mainSession];
+    }
+    
+    // Reset the current event id
+    currentEventIdAtTableBottom = nil;
+    
+    if (dataSource)
+    {
+        if (!dataSource.isLive || dataSource.isPeeking)
+        {
+            // Remove the input toolbar if the displayed timeline is not a live one or in case of peeking.
+            // We do not let the user type message in this case.
+            [self setRoomInputToolbarViewClass:nil];
+        }
+        
+        roomDataSource = dataSource;
+        roomDataSource.delegate = self;
+        roomDataSource.paginationLimitAroundInitialEvent = _paginationLimit;
+        
+        // Report the matrix session at view controller level to update UI according to session state
+        [self addMatrixSession:roomDataSource.mxSession];
+        
+        if (_bubblesTableView)
+        {
+            [self dismissTemporarySubViews];
+            
+            // Set up table data source
+            _bubblesTableView.dataSource = roomDataSource;
+        }
+        
+        // When ready, do the initial back pagination
+        if (roomDataSource.state == MXKDataSourceStateReady)
+        {
+            [self onRoomDataSourceReady];
+        }
+    }
+    
+    [self updateViewControllerAppearanceOnRoomDataSourceState];
+}
+
+- (void)onRoomDataSourceReady
+{
+    // If the user is only invited, auto-join the room if this option is enabled
+    if (roomDataSource.room.summary.membership == MXMembershipInvite)
+    {
+        if (_autoJoinInvitedRoom)
+        {
+            [self joinRoom:nil];
+        }
+    }
+    else
+    {
+        [self triggerInitialBackPagination];
+    }
+}
+
+- (void)updateViewControllerAppearanceOnRoomDataSourceState
+{
+    // Update UI by considering dataSource state
+    if (roomDataSource && roomDataSource.state == MXKDataSourceStateReady)
+    {
+        [self stopActivityIndicator];
+        
+        if (titleView)
+        {
+            titleView.mxRoom = roomDataSource.room;
+            titleView.editable = YES;
+            titleView.hidden = NO;
+        }
+        else
+        {
+            // set default title
+            self.navigationItem.title = roomDataSource.room.summary.displayname;
+        }
+        
+        // Show input tool bar
+        inputToolbarView.hidden = NO;
+    }
+    else
+    {
+        // Update the title except if the room has just been left
+        if (!_leftRoomReasonLabel)
+        {
+            if (roomDataSource && roomDataSource.state == MXKDataSourceStatePreparing)
+            {
+                if (titleView)
+                {
+                    titleView.mxRoom = roomDataSource.room;
+                    titleView.hidden = (!titleView.mxRoom);
+                }
+                else
+                {
+                    self.navigationItem.title = roomDataSource.room.summary.displayname;
+                }
+            }
+            else
+            {
+                if (titleView)
+                {
+                    titleView.mxRoom = nil;
+                    titleView.hidden = NO;
+                }
+                else
+                {
+                    self.navigationItem.title = nil;
+                }
+            }
+        }
+        titleView.editable = NO;
+        
+        // Hide input tool bar
+        inputToolbarView.hidden = YES;
+    }
+    
+    // Finalize room title refresh
+    [titleView refreshDisplay];
+    
+    if (activitiesView)
+    {
+        // Hide by default the activity view when no room is displayed
+        activitiesView.hidden = (roomDataSource == nil);
+    }
+}
+
+- (void)onTimelineError:(NSNotification *)notif
+{
+    if (notif.object == roomDataSource)
+    {
+        [self stopActivityIndicator];
+
+        // Compute the message to display to the end user
+        NSString *errorTitle;
+        NSString *errorMessage;
+
+        NSError *error = notif.userInfo[kMXKRoomDataSourceTimelineErrorErrorKey];
+        if ([MXError isMXError:error])
+        {
+            MXError *mxError = [[MXError alloc] initWithNSError:error];
+            if ([mxError.errcode isEqualToString:kMXErrCodeStringNotFound])
+            {
+                errorTitle = [MatrixKitL10n roomErrorTimelineEventNotFoundTitle];
+                errorMessage = [MatrixKitL10n roomErrorTimelineEventNotFound];
+            }
+            else
+            {
+                errorTitle = [MatrixKitL10n roomErrorCannotLoadTimeline];
+                errorMessage = mxError.error;
+            }
+        }
+        else
+        {
+            errorTitle = [MatrixKitL10n roomErrorCannotLoadTimeline];
+        }
+
+        // And show it
+        [currentAlert dismissViewControllerAnimated:NO completion:nil];
+
+        __weak typeof(self) weakSelf = self;
+        UIAlertController *errorAlert = [UIAlertController alertControllerWithTitle:errorTitle
+                                                                            message:errorMessage
+                                                                     preferredStyle:UIAlertControllerStyleAlert];
+        
+        [errorAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
+                                                       style:UIAlertActionStyleDefault
+                                                     handler:^(UIAlertAction * action) {
+                                                    
+                                                    typeof(self) self = weakSelf;
+                                                    self->currentAlert = nil;
+                                                    
+                                                }]];
+
+        [self presentViewController:errorAlert animated:YES completion:nil];
+        currentAlert = errorAlert;
+    }
+}
+
+- (void)joinRoom:(void(^)(MXKRoomViewControllerJoinRoomResult result))completion
+{
+    if (joinRoomRequest != nil)
+    {
+        if (completion)
+        {
+            completion(MXKRoomViewControllerJoinRoomResultFailureJoinInProgress);
+        }
+        return;
+    }
+    
+    [self startActivityIndicator];
+    
+    joinRoomRequest = [roomDataSource.room join:^{
+        
+        self->joinRoomRequest = nil;
+        [self stopActivityIndicator];
+        
+        [self triggerInitialBackPagination];
+        
+        if (completion)
+        {
+            completion(MXKRoomViewControllerJoinRoomResultSuccess);
+        }
+        
+    } failure:^(NSError *error) {
+        MXLogDebug(@"[MXKRoomVC] Failed to join room (%@)", self->roomDataSource.room.summary.displayname);
+        [self processRoomJoinFailureWithError:error completion:completion];
+    }];
+}
+
+- (void)joinRoomWithRoomIdOrAlias:(NSString*)roomIdOrAlias
+                       viaServers:(NSArray<NSString*>*)viaServers
+                       andSignUrl:(NSString*)signUrl
+                       completion:(void(^)(MXKRoomViewControllerJoinRoomResult result))completion
+{
+    if (joinRoomRequest != nil)
+    {
+        if (completion)
+        {
+            completion(MXKRoomViewControllerJoinRoomResultFailureJoinInProgress);
+        }
+        
+        return;
+    }
+    
+    [self startActivityIndicator];
+    
+    void (^success)(MXRoom *room) = ^(MXRoom *room) {
+        
+        self->joinRoomRequest = nil;
+        [self stopActivityIndicator];
+        
+        MXWeakify(self);
+        
+        // The room is now part of the user's room
+        MXKRoomDataSourceManager *roomDataSourceManager = [MXKRoomDataSourceManager sharedManagerForMatrixSession:self.mainSession];
+        
+        [roomDataSourceManager roomDataSourceForRoom:room.roomId create:YES onComplete:^(MXKRoomDataSource *newRoomDataSource) {
+            
+            MXStrongifyAndReturnIfNil(self);
+            
+            // And can be displayed
+            [self displayRoom:newRoomDataSource];
+            
+            if (completion)
+            {
+                completion(MXKRoomViewControllerJoinRoomResultSuccess);
+            }
+        }];
+    };
+    
+    void (^failure)(NSError *error) = ^(NSError *error) {
+        MXLogDebug(@"[MXKRoomVC] Failed to join room (%@)", roomIdOrAlias);
+        [self processRoomJoinFailureWithError:error completion:completion];
+    };
+    
+    // Does the join need to be validated before?
+    if (signUrl)
+    {
+        joinRoomRequest = [self.mainSession joinRoom:roomIdOrAlias viaServers:viaServers withSignUrl:signUrl success:success failure:failure];
+    }
+    else
+    {
+        joinRoomRequest = [self.mainSession joinRoom:roomIdOrAlias viaServers:viaServers success:success failure:failure];
+    }
+}
+
+- (void)processRoomJoinFailureWithError:(NSError *)error completion:(void(^)(MXKRoomViewControllerJoinRoomResult result))completion
+{
+    self->joinRoomRequest = nil;
+    [self stopActivityIndicator];
+    
+    // Show the error to the end user
+    NSString *msg = [error.userInfo valueForKey:NSLocalizedDescriptionKey];
+    
+    // FIXME: We should hide this inside the SDK and expose it as a domain specific error
+    BOOL isRoomEmpty = [msg isEqualToString:@"No known servers"];
+    if (isRoomEmpty)
+    {
+        // 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 = [MatrixKitL10n roomErrorJoinFailedEmptyRoom];
+    }
+    
+    MXWeakify(self);
+    [self->currentAlert dismissViewControllerAnimated:NO completion:nil];
+    
+    UIAlertController *errorAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n roomErrorJoinFailedTitle]
+                                                                        message:msg
+                                                                 preferredStyle:UIAlertControllerStyleAlert];
+    
+    [errorAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
+                                                   style:UIAlertActionStyleDefault
+                                                 handler:^(UIAlertAction * action) {
+        
+        MXStrongifyAndReturnIfNil(self);
+        self->currentAlert = nil;
+        
+        if (completion)
+        {
+            completion((isRoomEmpty ? MXKRoomViewControllerJoinRoomResultFailureRoomEmpty : MXKRoomViewControllerJoinRoomResultFailureGeneric));
+        }
+    }]];
+    
+    [self presentViewController:errorAlert animated:YES completion:nil];
+    currentAlert = errorAlert;
+}
+
+- (void)leaveRoomOnEvent:(MXEvent*)event
+{
+    [self dismissTemporarySubViews];
+    
+    NSString *reason = nil;
+    if (event)
+    {
+        MXKEventFormatterError error;
+        reason = [roomDataSource.eventFormatter stringFromEvent:event withRoomState:roomDataSource.roomState error:&error];
+        if (error != MXKEventFormatterErrorNone)
+        {
+            reason = nil;
+        }
+    }
+    
+    if (!reason.length)
+    {
+        if (self.roomDataSource.room.isDirect)
+        {
+            reason = [MatrixKitL10n roomLeftForDm];
+        }
+        else
+        {
+            reason = [MatrixKitL10n roomLeft];
+        }
+    }
+    
+    
+    _bubblesTableView.dataSource = nil;
+    _bubblesTableView.delegate = nil;
+    
+    if (self.hasRoomDataSourceOwnership)
+    {
+        // Release the room data source
+        [roomDataSource destroy];
+    }
+    else if (roomDataSource.delegate == self)
+    {
+        roomDataSource.delegate = nil;
+    }
+    roomDataSource = nil;
+    
+    // Add reason label
+    UILabel *leftRoomReasonLabel = [[UILabel alloc] initWithFrame:CGRectMake(10, 5, self.view.frame.size.width - 20, 70)];
+    leftRoomReasonLabel.numberOfLines = 0;
+    leftRoomReasonLabel.text = reason;
+    leftRoomReasonLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+    _bubblesTableView.tableHeaderView = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, 80)];
+    [_bubblesTableView.tableHeaderView addSubview:leftRoomReasonLabel];
+    [_bubblesTableView reloadData];
+    
+    _leftRoomReasonLabel = leftRoomReasonLabel;
+    
+    [self updateViewControllerAppearanceOnRoomDataSourceState];
+}
+
+- (void)setPaginationLimit:(NSUInteger)paginationLimit
+{
+    _paginationLimit = paginationLimit;
+
+    // Use the same value when loading messages around the initial event
+    roomDataSource.paginationLimitAroundInitialEvent = _paginationLimit;
+}
+
+- (void)setRoomTitleViewClass:(Class)roomTitleViewClass
+{
+    // Sanity check: accept only MXKRoomTitleView classes or sub-classes
+    NSParameterAssert([roomTitleViewClass isSubclassOfClass:MXKRoomTitleView.class]);
+    
+    // Remove potential title view
+    if (titleView)
+    {
+        [NSLayoutConstraint deactivateConstraints:titleView.constraints];
+        
+        [titleView dismissKeyboard];
+        [titleView removeFromSuperview];
+        [titleView destroy];
+    }
+    
+    titleView = self.navigationItem.titleView = [roomTitleViewClass roomTitleView];
+    titleView.delegate = self;
+    
+    // Define directly the navigation titleView with the custom title view instance. Do not use anymore a container.
+    self.navigationItem.titleView = titleView;
+    
+    [self updateViewControllerAppearanceOnRoomDataSourceState];
+}
+
+- (void)setRoomInputToolbarViewClass:(Class)roomInputToolbarViewClass
+{
+    if (!_roomInputToolbarContainer)
+    {
+        MXLogDebug(@"[MXKRoomVC] Set roomInputToolbarViewClass failed: container is missing");
+        return;
+    }
+
+    // Remove potential toolbar
+    if (inputToolbarView)
+    {
+        MXLogDebug(@"[MXKRoomVC] setRoomInputToolbarViewClass: Set inputToolbarView with class %@ to nil", [self.inputToolbarView class]);
+        
+        [NSLayoutConstraint deactivateConstraints:inputToolbarView.constraints];
+        [inputToolbarView dismissKeyboard];
+        [inputToolbarView removeFromSuperview];
+        [inputToolbarView destroy];
+        inputToolbarView = nil;
+    }
+    
+    if (roomDataSource && (!roomDataSource.isLive || roomDataSource.isPeeking))
+    {
+        // Do not show the input toolbar if the displayed timeline is not a live one, or in case of peeking.
+        // We do not let the user type message in this case.
+        roomInputToolbarViewClass = nil;
+    }
+    
+    if (roomInputToolbarViewClass)
+    {
+        // Sanity check: accept only MXKRoomInputToolbarView classes or sub-classes
+        NSParameterAssert([roomInputToolbarViewClass isSubclassOfClass:MXKRoomInputToolbarView.class]);
+        
+        MXLogDebug(@"[MXKRoomVC] setRoomInputToolbarViewClass: Set inputToolbarView to class %@", roomInputToolbarViewClass);
+        
+        id inputToolbarView = [roomInputToolbarViewClass roomInputToolbarView];
+        self->inputToolbarView = inputToolbarView;
+        self->inputToolbarView.delegate = self;
+        
+        // Add the input toolbar view and define edge constraints
+        [_roomInputToolbarContainer addSubview:inputToolbarView];
+        [_roomInputToolbarContainer addConstraint:[NSLayoutConstraint constraintWithItem:_roomInputToolbarContainer
+                                                                               attribute:NSLayoutAttributeBottom
+                                                                               relatedBy:NSLayoutRelationEqual
+                                                                                  toItem:inputToolbarView
+                                                                               attribute:NSLayoutAttributeBottom
+                                                                              multiplier:1.0f
+                                                                                constant:0.0f]];
+        [_roomInputToolbarContainer addConstraint:[NSLayoutConstraint constraintWithItem:_roomInputToolbarContainer
+                                                                               attribute:NSLayoutAttributeTop
+                                                                               relatedBy:NSLayoutRelationEqual
+                                                                                  toItem:inputToolbarView
+                                                                               attribute:NSLayoutAttributeTop
+                                                                              multiplier:1.0f
+                                                                                constant:0.0f]];
+        [_roomInputToolbarContainer addConstraint:[NSLayoutConstraint constraintWithItem:_roomInputToolbarContainer
+                                                                               attribute:NSLayoutAttributeLeading
+                                                                               relatedBy:NSLayoutRelationEqual
+                                                                                  toItem:inputToolbarView
+                                                                               attribute:NSLayoutAttributeLeading
+                                                                              multiplier:1.0f
+                                                                                constant:0.0f]];
+        [_roomInputToolbarContainer addConstraint:[NSLayoutConstraint constraintWithItem:_roomInputToolbarContainer
+                                                                               attribute:NSLayoutAttributeTrailing
+                                                                               relatedBy:NSLayoutRelationEqual
+                                                                                  toItem:inputToolbarView
+                                                                               attribute:NSLayoutAttributeTrailing
+                                                                              multiplier:1.0f
+                                                                                constant:0.0f]];
+    }
+    
+    [_roomInputToolbarContainer setNeedsUpdateConstraints];
+}
+
+
+- (void)setRoomActivitiesViewClass:(Class)roomActivitiesViewClass
+{
+    if (!_roomActivitiesContainer)
+    {
+        MXLogDebug(@"[MXKRoomVC] Set RoomActivitiesViewClass failed: container is missing");
+        return;
+    }
+
+    // Remove potential toolbar
+    if (activitiesView)
+    {
+        [NSLayoutConstraint deactivateConstraints:activitiesView.constraints];
+        [activitiesView removeFromSuperview];
+        [activitiesView destroy];
+        activitiesView = nil;
+    }
+    
+    if (roomActivitiesViewClass)
+    {
+        // Sanity check: accept only MXKRoomExtraInfoView classes or sub-classes
+        NSParameterAssert([roomActivitiesViewClass isSubclassOfClass:MXKRoomActivitiesView.class]);
+        
+        activitiesView = [roomActivitiesViewClass roomActivitiesView];
+        
+        // Add the view and define edge constraints
+        activitiesView.translatesAutoresizingMaskIntoConstraints = NO;
+        [_roomActivitiesContainer addSubview:activitiesView];
+        
+        NSLayoutConstraint* topConstraint = [NSLayoutConstraint constraintWithItem:_roomActivitiesContainer
+                                                                         attribute:NSLayoutAttributeTop
+                                                                         relatedBy:NSLayoutRelationEqual
+                                                                            toItem:activitiesView
+                                                                         attribute:NSLayoutAttributeTop
+                                                                        multiplier:1.0f
+                                                                          constant:0.0f];
+        
+        
+        NSLayoutConstraint* leadingConstraint = [NSLayoutConstraint constraintWithItem:_roomActivitiesContainer
+                                                                             attribute:NSLayoutAttributeLeading
+                                                                             relatedBy:NSLayoutRelationEqual
+                                                                                toItem:activitiesView
+                                                                             attribute:NSLayoutAttributeLeading
+                                                                            multiplier:1.0f
+                                                                              constant:0.0f];
+        
+        NSLayoutConstraint* widthConstraint = [NSLayoutConstraint constraintWithItem:_roomActivitiesContainer
+                                                                           attribute:NSLayoutAttributeWidth
+                                                                           relatedBy:NSLayoutRelationEqual
+                                                                              toItem:activitiesView
+                                                                           attribute:NSLayoutAttributeWidth
+                                                                          multiplier:1.0f
+                                                                            constant:0.0f];
+        
+        NSLayoutConstraint* heightConstraint = [NSLayoutConstraint constraintWithItem:_roomActivitiesContainer
+                                                                            attribute:NSLayoutAttributeHeight
+                                                                            relatedBy:NSLayoutRelationEqual
+                                                                               toItem:activitiesView
+                                                                            attribute:NSLayoutAttributeHeight
+                                                                           multiplier:1.0f
+                                                                             constant:0.0f];
+        
+
+        [NSLayoutConstraint activateConstraints:@[topConstraint, leadingConstraint, widthConstraint, heightConstraint]];
+        
+        // let the provide view to define a height.
+        // it could have no constrainst if there is no defined xib
+        _roomActivitiesContainerHeightConstraint.constant = activitiesView.height;
+
+        // Listen to activities view change
+        activitiesView.delegate = self;
+    }
+    else
+    {
+        _roomActivitiesContainerHeightConstraint.constant = 0;
+    }
+    
+    _bubblesTableViewBottomConstraint.constant = _roomInputToolbarContainerBottomConstraint.constant + _roomInputToolbarContainerHeightConstraint.constant +_roomActivitiesContainerHeightConstraint.constant;
+
+    [_roomActivitiesContainer setNeedsUpdateConstraints];
+}
+
+- (void)setAttachmentsViewerClass:(Class)theAttachmentsViewerClass
+{
+    if (theAttachmentsViewerClass)
+    {
+        // Sanity check: accept only MXKAttachmentsViewController classes or sub-classes
+        NSParameterAssert([theAttachmentsViewerClass isSubclassOfClass:MXKAttachmentsViewController.class]);
+    }
+    
+    attachmentsViewerClass = theAttachmentsViewerClass;
+}
+
+- (void)setEventDetailsViewClass:(Class)eventDetailsViewClass
+{
+    if (eventDetailsViewClass)
+    {
+        // Sanity check: accept only MXKEventDetailsView classes or sub-classes
+        NSParameterAssert([eventDetailsViewClass isSubclassOfClass:MXKEventDetailsView.class]);
+    }
+    
+    customEventDetailsViewClass = eventDetailsViewClass;
+}
+
+- (BOOL)isIRCStyleCommand:(NSString*)string
+{
+    // Check whether the provided text may be an IRC-style command
+    if ([string hasPrefix:@"/"] == NO || [string hasPrefix:@"//"] == YES)
+    {
+        return NO;
+    }
+    
+    // Parse command line
+    NSArray *components = [string componentsSeparatedByString:@" "];
+    NSString *cmd = [components objectAtIndex:0];
+    NSUInteger index = 1;
+    
+    // TODO: display an alert with the cmd usage in case of error or unrecognized cmd.
+    NSString *cmdUsage;
+    
+    if ([cmd isEqualToString:kMXKSlashCmdEmote])
+    {
+        // send message as an emote
+        [self sendTextMessage:string];
+    }
+    else if ([string hasPrefix:kMXKSlashCmdChangeDisplayName])
+    {
+        // Change display name
+        NSString *displayName;
+        
+        // Sanity check
+        if (string.length > kMXKSlashCmdChangeDisplayName.length)
+        {
+            displayName = [string substringFromIndex:kMXKSlashCmdChangeDisplayName.length + 1];
+            
+            // Remove white space from both ends
+            displayName = [displayName stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+        }
+        
+        if (displayName.length)
+        {
+            [roomDataSource.mxSession.matrixRestClient setDisplayName:displayName success:^{
+                
+            } failure:^(NSError *error) {
+                
+                MXLogDebug(@"[MXKRoomVC] Set displayName failed");
+                // Notify MatrixKit user
+                NSString *myUserId = self->roomDataSource.mxSession.myUser.userId;
+                [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+                
+            }];
+        }
+        else
+        {
+            // Display cmd usage in text input as placeholder
+            cmdUsage = @"Usage: /nick <display_name>";
+        }
+    }
+    else if ([string hasPrefix:kMXKSlashCmdJoinRoom])
+    {
+        // Join a room
+        NSString *roomAlias;
+        
+        // Sanity check
+        if (string.length > kMXKSlashCmdJoinRoom.length)
+        {
+            roomAlias = [string substringFromIndex:kMXKSlashCmdJoinRoom.length + 1];
+            
+            // Remove white space from both ends
+            roomAlias = [roomAlias stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+        }
+        
+        // Check
+        if (roomAlias.length)
+        {
+            // TODO: /join command does not support via parameters yet
+            [roomDataSource.mxSession joinRoom:roomAlias viaServers:nil success:^(MXRoom *room) {
+                // Do nothing by default when we succeed to join the room
+            } failure:^(NSError *error) {
+                
+                MXLogDebug(@"[MXKRoomVC] Join roomAlias (%@) failed", roomAlias);
+                // Notify MatrixKit user
+                NSString *myUserId = self->roomDataSource.mxSession.myUser.userId;
+                [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+                
+            }];
+        }
+        else
+        {
+            // Display cmd usage in text input as placeholder
+            cmdUsage = @"Usage: /join <room_alias>";
+        }
+    }
+    else if ([string hasPrefix:kMXKSlashCmdPartRoom])
+    {
+        // Leave this room or another one
+        NSString *roomId;
+        NSString *roomIdOrAlias;
+        
+        // Sanity check
+        if (string.length > kMXKSlashCmdPartRoom.length)
+        {
+            roomIdOrAlias = [string substringFromIndex:kMXKSlashCmdPartRoom.length + 1];
+            
+            // Remove white space from both ends
+            roomIdOrAlias = [roomIdOrAlias stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+        }
+
+        // Check
+        if (roomIdOrAlias.length)
+        {
+            // Leave another room
+            if ([MXTools isMatrixRoomAlias:roomIdOrAlias])
+            {
+                // Convert the alias to a room ID
+                MXRoom *room = [roomDataSource.mxSession roomWithAlias:roomIdOrAlias];
+                if (room)
+                {
+                    roomId = room.roomId;
+                }
+            }
+            else if ([MXTools isMatrixRoomIdentifier:roomIdOrAlias])
+            {
+                roomId = roomIdOrAlias;
+            }
+        }
+        else
+        {
+            // Leave the current room
+            roomId = roomDataSource.roomId;
+        }
+
+        if (roomId.length)
+        {
+            [roomDataSource.mxSession leaveRoom:roomId success:^{
+
+            } failure:^(NSError *error) {
+
+                MXLogDebug(@"[MXKRoomVC] Part room_alias (%@ / %@) failed", roomIdOrAlias, roomId);
+                // Notify MatrixKit user
+                NSString *myUserId = self->roomDataSource.mxSession.myUser.userId;
+                [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+                
+            }];
+        }
+        else
+        {
+            // Display cmd usage in text input as placeholder
+            cmdUsage = @"Usage: /part [<room_alias>]";
+        }
+    }
+    else if ([string hasPrefix:kMXKSlashCmdChangeRoomTopic])
+    {
+        // Change topic
+        NSString *topic;
+        
+        // Sanity check
+        if (string.length > kMXKSlashCmdChangeRoomTopic.length)
+        {
+            topic = [string substringFromIndex:kMXKSlashCmdChangeRoomTopic.length + 1];
+            // Remove white space from both ends
+            topic = [topic stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+        }
+
+        if (topic.length)
+        {
+            [roomDataSource.room setTopic:topic success:^{
+                
+            } failure:^(NSError *error) {
+
+                MXLogDebug(@"[MXKRoomVC] Set topic failed");
+                // Notify MatrixKit user
+                NSString *myUserId = self->roomDataSource.mxSession.myUser.userId;
+                [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+
+            }];
+        }
+        else
+        {
+            // Display cmd usage in text input as placeholder
+            cmdUsage = @"Usage: /topic <topic>";
+        }
+    }
+    else
+    {
+        // Retrieve userId
+        NSString *userId = nil;
+        while (index < components.count)
+        {
+            userId = [components objectAtIndex:index++];
+            if (userId.length)
+            {
+                // done
+                break;
+            }
+            // reset
+            userId = nil;
+        }
+        
+        if ([cmd isEqualToString:kMXKSlashCmdInviteUser])
+        {
+            if (userId)
+            {
+                // Invite the user
+                [roomDataSource.room inviteUser:userId success:^{
+
+                } failure:^(NSError *error) {
+
+                    MXLogDebug(@"[MXKRoomVC] Invite user (%@) failed", userId);
+                    // Notify MatrixKit user
+                    NSString *myUserId = self->roomDataSource.mxSession.myUser.userId;
+                    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+
+                }];
+            }
+            else
+            {
+                // Display cmd usage in text input as placeholder
+                cmdUsage = @"Usage: /invite <userId>";
+            }
+        }
+        else if ([cmd isEqualToString:kMXKSlashCmdKickUser])
+        {
+            if (userId)
+            {
+                // Retrieve potential reason
+                NSString *reason = nil;
+                while (index < components.count)
+                {
+                    if (reason)
+                    {
+                        reason = [NSString stringWithFormat:@"%@ %@", reason, [components objectAtIndex:index++]];
+                    }
+                    else
+                    {
+                        reason = [components objectAtIndex:index++];
+                    }
+                }
+                // Kick the user
+                [roomDataSource.room kickUser:userId reason:reason success:^{
+                    
+                } failure:^(NSError *error) {
+                    
+                    MXLogDebug(@"[MXKRoomVC] Kick user (%@) failed", userId);
+                    // Notify MatrixKit user
+                    NSString *myUserId = self->roomDataSource.mxSession.myUser.userId;
+                    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+                    
+                }];
+            }
+            else
+            {
+                // Display cmd usage in text input as placeholder
+                cmdUsage = @"Usage: /kick <userId> [<reason>]";
+            }
+        }
+        else if ([cmd isEqualToString:kMXKSlashCmdBanUser])
+        {
+            if (userId)
+            {
+                // Retrieve potential reason
+                NSString *reason = nil;
+                while (index < components.count)
+                {
+                    if (reason)
+                    {
+                        reason = [NSString stringWithFormat:@"%@ %@", reason, [components objectAtIndex:index++]];
+                    }
+                    else
+                    {
+                        reason = [components objectAtIndex:index++];
+                    }
+                }
+                // Ban the user
+                [roomDataSource.room banUser:userId reason:reason success:^{
+                    
+                } failure:^(NSError *error) {
+                    
+                    MXLogDebug(@"[MXKRoomVC] Ban user (%@) failed", userId);
+                    // Notify MatrixKit user
+                    NSString *myUserId = self->roomDataSource.mxSession.myUser.userId;
+                    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+                    
+                }];
+            }
+            else
+            {
+                // Display cmd usage in text input as placeholder
+                cmdUsage = @"Usage: /ban <userId> [<reason>]";
+            }
+        }
+        else if ([cmd isEqualToString:kMXKSlashCmdUnbanUser])
+        {
+            if (userId)
+            {
+                // Unban the user
+                [roomDataSource.room unbanUser:userId success:^{
+                    
+                } failure:^(NSError *error) {
+                    
+                    MXLogDebug(@"[MXKRoomVC] Unban user (%@) failed", userId);
+                    // Notify MatrixKit user
+                    NSString *myUserId = self->roomDataSource.mxSession.myUser.userId;
+                    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+                    
+                }];
+            }
+            else
+            {
+                // Display cmd usage in text input as placeholder
+                cmdUsage = @"Usage: /unban <userId>";
+            }
+        }
+        else if ([cmd isEqualToString:kMXKSlashCmdSetUserPowerLevel])
+        {
+            // Retrieve power level
+            NSString *powerLevel = nil;
+            while (index < components.count)
+            {
+                powerLevel = [components objectAtIndex:index++];
+                if (powerLevel.length)
+                {
+                    // done
+                    break;
+                }
+                // reset
+                powerLevel = nil;
+            }
+            // Set power level
+            if (userId && powerLevel)
+            {
+                // Set user power level
+                [roomDataSource.room setPowerLevelOfUserWithUserID:userId powerLevel:[powerLevel integerValue] success:^{
+                    
+                } failure:^(NSError *error) {
+                    
+                    MXLogDebug(@"[MXKRoomVC] Set user power (%@) failed", userId);
+                    // Notify MatrixKit user
+                    NSString *myUserId = self->roomDataSource.mxSession.myUser.userId;
+                    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+                    
+                }];
+            }
+            else
+            {
+                // Display cmd usage in text input as placeholder
+                cmdUsage = @"Usage: /op <userId> <power level>";
+            }
+        }
+        else if ([cmd isEqualToString:kMXKSlashCmdResetUserPowerLevel])
+        {
+            if (userId)
+            {
+                // Reset user power level
+                [roomDataSource.room setPowerLevelOfUserWithUserID:userId powerLevel:0 success:^{
+
+                } failure:^(NSError *error) {
+
+                    MXLogDebug(@"[MXKRoomVC] Reset user power (%@) failed", userId);
+                    // Notify MatrixKit user
+                    NSString *myUserId = self->roomDataSource.mxSession.myUser.userId;
+                    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+
+                }];
+            }
+            else
+            {
+                // Display cmd usage in text input as placeholder
+                cmdUsage = @"Usage: /deop <userId>";
+            }
+        }
+        else
+        {
+            MXLogDebug(@"[MXKRoomVC] Unrecognised IRC-style command: %@", string);
+//            cmdUsage = [NSString stringWithFormat:@"Unrecognised IRC-style command: %@", cmd];
+            return NO;
+        }
+    }
+    return YES;
+}
+
+- (void)mention:(MXRoomMember*)roomMember
+{
+    NSString *memberName = roomMember.displayname.length ? roomMember.displayname : roomMember.userId;
+
+    if (inputToolbarView.textMessage.length)
+    {
+        [inputToolbarView pasteText:memberName];
+    }
+    else if ([roomMember.userId isEqualToString:self.mainSession.myUser.userId])
+    {
+        // Prepare emote
+        inputToolbarView.textMessage = @"/me ";
+    }
+    else
+    {
+        // Bing the member
+        inputToolbarView.textMessage = [NSString stringWithFormat:@"%@: ", memberName];
+    }
+    
+    [inputToolbarView becomeFirstResponder];
+}
+
+- (void)dismissKeyboard
+{
+    [titleView dismissKeyboard];
+    [inputToolbarView dismissKeyboard];
+}
+
+- (BOOL)isBubblesTableScrollViewAtTheBottom
+{
+    if (_bubblesTableView.contentSize.height)
+    {
+        // Check whether the most recent message is visible.
+        // Compute the max vertical position visible according to contentOffset
+        CGFloat maxPositionY = _bubblesTableView.contentOffset.y + (_bubblesTableView.frame.size.height - _bubblesTableView.adjustedContentInset.bottom);
+        // Be a bit less retrictive, consider the table view at the bottom even if the most recent message is partially hidden
+        maxPositionY += 44;
+        BOOL isScrolledToBottom = (maxPositionY >= _bubblesTableView.contentSize.height);
+
+        // Consider the table view at the bottom if a scrolling to bottom is in progress too
+        return (isScrolledToBottom || isScrollingToBottom);
+    }
+    
+    // Consider empty table view as at the bottom. Only do this after it has appeared.
+    // Returning YES here before the view has appeared allows calls to scrollBubblesTableViewToBottomAnimated
+    // before the view knows its final size, resulting in a position offset the second time a room is shown (#4524).
+    return hasAppearedOnce;
+}
+
+- (void)scrollBubblesTableViewToBottomAnimated:(BOOL)animated
+{
+    if (_bubblesTableView.contentSize.height)
+    {
+        CGFloat visibleHeight = _bubblesTableView.frame.size.height - _bubblesTableView.adjustedContentInset.top - _bubblesTableView.adjustedContentInset.bottom;
+        if (visibleHeight < _bubblesTableView.contentSize.height)
+        {
+            CGFloat wantedOffsetY = _bubblesTableView.contentSize.height - visibleHeight - _bubblesTableView.adjustedContentInset.top;
+            CGFloat currentOffsetY = _bubblesTableView.contentOffset.y;
+            if (wantedOffsetY != currentOffsetY)
+            {
+                isScrollingToBottom = YES;
+                BOOL savedBubbleTableViewDisplayInTransition = self.isBubbleTableViewDisplayInTransition;
+                self.bubbleTableViewDisplayInTransition = YES;
+                [self setBubbleTableViewContentOffset:CGPointMake(0, wantedOffsetY) animated:animated];
+                self.bubbleTableViewDisplayInTransition = savedBubbleTableViewDisplayInTransition;
+            }
+            else
+            {
+                // upateCurrentEventIdAtTableBottom must be called here (it is usually called by the scrollview delegate at the end of scrolling).
+                [self updateCurrentEventIdAtTableBottom:YES];
+            }
+        }
+        else
+        {
+            [self setBubbleTableViewContentOffset:CGPointMake(0, -_bubblesTableView.adjustedContentInset.top) animated:animated];            
+        }
+        
+        shouldScrollToBottomOnTableRefresh = NO;
+    }
+}
+
+- (void)dismissTemporarySubViews
+{
+    [self dismissKeyboard];
+    
+    if (currentAlert)
+    {
+        [currentAlert dismissViewControllerAnimated:NO completion:nil];
+        currentAlert = nil;
+    }
+    
+    if (eventDetailsView)
+    {
+        [eventDetailsView removeFromSuperview];
+        eventDetailsView = nil;
+    }
+    
+    if (_leftRoomReasonLabel)
+    {
+        [_leftRoomReasonLabel removeFromSuperview];
+        _leftRoomReasonLabel = nil;
+        _bubblesTableView.tableHeaderView = nil;
+    }
+    
+    // Dispose potential keyboard view
+    self.keyboardView = nil;
+}
+
+- (void)setBubbleTableViewContentOffset:(CGPoint)contentOffset animated:(BOOL)animated
+{
+    if (preventBubblesTableViewScroll)
+    {
+        return;
+    }
+    
+    [self.bubblesTableView setContentOffset:contentOffset animated:animated];
+}
+
+#pragma mark - properties
+
+- (void)setBubbleTableViewDisplayInTransition:(BOOL)bubbleTableViewDisplayInTransition
+{
+    if (_bubbleTableViewDisplayInTransition != bubbleTableViewDisplayInTransition)
+    {
+        _bubbleTableViewDisplayInTransition = bubbleTableViewDisplayInTransition;
+        
+        [self updateCurrentEventIdAtTableBottom:YES];
+    }
+}
+
+- (void)setUpdateRoomReadMarker:(BOOL)updateRoomReadMarker
+{
+    if (_updateRoomReadMarker != updateRoomReadMarker)
+    {
+        _updateRoomReadMarker = updateRoomReadMarker;
+        
+        if (updateRoomReadMarker == YES)
+        {
+            if (currentEventIdAtTableBottom)
+            {
+                [self.roomDataSource.room moveReadMarkerToEventId:currentEventIdAtTableBottom];
+            }
+            else
+            {
+                // Look for the last displayed event.
+                [self updateCurrentEventIdAtTableBottom:YES];
+            }
+        }
+    }
+}
+
+#pragma mark - activity indicator
+
+- (void)stopActivityIndicator
+{
+    // Keep the loading wheel displayed while we are joining the room
+    if (joinRoomRequest)
+    {
+        return;
+    }
+    
+    // Check internal processes before stopping the loading wheel
+    if (isPaginationInProgress || isInputToolbarProcessing)
+    {
+        // Keep activity indicator running
+        return;
+    }
+    
+    // Leave super decide
+    [super stopActivityIndicator];
+}
+
+#pragma mark - Pagination
+
+- (void)triggerInitialBackPagination
+{
+    // Trigger back pagination to fill all the screen
+    CGRect frame = [[UIScreen mainScreen] bounds];
+    
+    MXWeakify(self);
+    
+    isPaginationInProgress = YES;
+    [self startActivityIndicator];
+    [roomDataSource paginateToFillRect:frame
+                             direction:MXTimelineDirectionBackwards
+           withMinRequestMessagesCount:_paginationLimit
+                               success:^{
+        
+                                   MXStrongifyAndReturnIfNil(self);
+
+                                   // Stop spinner
+                                   self->isPaginationInProgress = NO;
+                                   [self stopActivityIndicator];
+                                   
+                                   self.bubbleTableViewDisplayInTransition = YES;
+
+                                   // Reload table
+                                   [self reloadBubblesTable:YES];
+
+                                   if (self->roomDataSource.timeline.initialEventId)
+                                   {
+                                       // Center the table view to the cell that contains this event
+                                       NSInteger index = [self->roomDataSource indexOfCellDataWithEventId:self->roomDataSource.timeline.initialEventId];
+                                       if (index != NSNotFound)
+                                       {
+                                           // Let iOS put the cell at the top of the table view
+                                           [self.bubblesTableView scrollToRowAtIndexPath: [NSIndexPath indexPathForRow:index inSection:0] atScrollPosition:UITableViewScrollPositionTop animated:NO];
+                                           
+                                           // Apply an offset to move the targeted component at the center of the screen.
+                                           UITableViewCell *cell = [self->_bubblesTableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:index inSection:0]];
+                                           
+                                           CGPoint contentOffset = self->_bubblesTableView.contentOffset;
+                                           CGFloat firstVisibleContentRowOffset = self->_bubblesTableView.contentOffset.y + self->_bubblesTableView.adjustedContentInset.top;
+                                           CGFloat lastVisibleContentRowOffset = self->_bubblesTableView.frame.size.height - self->_bubblesTableView.adjustedContentInset.bottom;
+                                           
+                                           CGFloat localPositionOfEvent = 0.0;
+                                           
+                                           if ([cell isKindOfClass:MXKRoomBubbleTableViewCell.class])
+                                           {
+                                               MXKRoomBubbleTableViewCell *roomBubbleTableViewCell = (MXKRoomBubbleTableViewCell *)cell;
+                                               
+                                               if (self->_centerBubblesTableViewContentOnTheInitialEventBottom)
+                                               {
+                                                   localPositionOfEvent = [roomBubbleTableViewCell bottomPositionOfEvent:self->roomDataSource.timeline.initialEventId];
+                                               }
+                                               else
+                                               {
+                                                   localPositionOfEvent = [roomBubbleTableViewCell topPositionOfEvent:self->roomDataSource.timeline.initialEventId];
+                                               }
+                                           }
+                                           
+                                           contentOffset.y += localPositionOfEvent - (lastVisibleContentRowOffset / 2 - (cell.frame.origin.y - firstVisibleContentRowOffset));
+                                           
+                                           // Sanity check
+                                           if (contentOffset.y + lastVisibleContentRowOffset > self->_bubblesTableView.contentSize.height)
+                                           {
+                                               contentOffset.y = self->_bubblesTableView.contentSize.height - lastVisibleContentRowOffset;
+                                           }
+                                           
+                                           [self setBubbleTableViewContentOffset:contentOffset animated:NO];
+                                           
+                                           
+                                           // Update the read receipt and potentially the read marker.
+                                           [self updateCurrentEventIdAtTableBottom:YES];
+                                       }
+                                   }
+                                   
+                                   self.bubbleTableViewDisplayInTransition = NO;
+                               }
+                               failure:^(NSError *error) {
+        
+                                   MXStrongifyAndReturnIfNil(self);
+
+                                   // Stop spinner
+                                   self->isPaginationInProgress = NO;
+                                   [self stopActivityIndicator];
+                                   
+                                   self.bubbleTableViewDisplayInTransition = YES;
+
+                                   // Reload table
+                                   [self reloadBubblesTable:YES];
+                                   
+                                   self.bubbleTableViewDisplayInTransition = NO;
+
+                               }];
+}
+
+/**
+ Trigger an inconspicuous pagination.
+ The retrieved history is added discretely to the top or the bottom of bubbles table without change the current display.
+
+ @param limit the maximum number of messages to retrieve.
+ @param direction backwards or forwards.
+ */
+- (void)triggerPagination:(NSUInteger)limit direction:(MXTimelineDirection)direction
+{
+    // Paginate only if possible
+    if (isPaginationInProgress || roomDataSource.state != MXKDataSourceStateReady || NO == [roomDataSource.timeline canPaginate:direction])
+    {
+        return;
+    }
+    
+    // Store the current height of the first bubble (if any)
+    backPaginationSavedFirstBubbleHeight = 0;
+    if (direction == MXTimelineDirectionBackwards && [roomDataSource tableView:_bubblesTableView numberOfRowsInSection:0])
+    {
+        NSIndexPath *indexPath = [NSIndexPath indexPathForRow:0 inSection:0];
+        backPaginationSavedFirstBubbleHeight = [self tableView:_bubblesTableView heightForRowAtIndexPath:indexPath];
+    }
+    
+    isPaginationInProgress = YES;
+    
+    MXWeakify(self);
+    
+    // Trigger pagination
+    [roomDataSource paginate:limit direction:direction onlyFromStore:NO success:^(NSUInteger addedCellNumber) {
+        
+        MXStrongifyAndReturnIfNil(self);
+        
+        // We will adjust the vertical offset in order to unchange the current display (pagination should be inconspicuous)
+        CGFloat verticalOffset = 0;
+
+        if (direction == MXTimelineDirectionBackwards)
+        {
+            // Compute the cumulative height of the added messages
+            for (NSUInteger index = 0; index < addedCellNumber; index++)
+            {
+                NSIndexPath *indexPath = [NSIndexPath indexPathForRow:index inSection:0];
+                verticalOffset += [self tableView:self->_bubblesTableView heightForRowAtIndexPath:indexPath];
+            }
+
+            // Add delta of the height of the previous first cell (if any)
+            if (addedCellNumber < [self->roomDataSource tableView:self->_bubblesTableView numberOfRowsInSection:0])
+            {
+                NSIndexPath *indexPath = [NSIndexPath indexPathForRow:addedCellNumber inSection:0];
+                verticalOffset += ([self tableView:self->_bubblesTableView heightForRowAtIndexPath:indexPath] - self->backPaginationSavedFirstBubbleHeight);
+            }
+
+            self->_bubblesTableView.tableHeaderView = self->backPaginationActivityView = nil;
+        }
+        else
+        {
+            self->_bubblesTableView.tableFooterView = self->reconnectingView = nil;
+        }
+
+        // Trigger a full table reload. We could not only insert new cells related to pagination,
+        // because some other changes may have been ignored during pagination (see[dataSource:didCellChange:]).
+        self.bubbleTableViewDisplayInTransition = YES;
+
+        // Disable temporarily scrolling and hide the scroll indicator during refresh to prevent flickering
+        [self.bubblesTableView setShowsVerticalScrollIndicator:NO];
+        [self.bubblesTableView setScrollEnabled:NO];
+
+        CGPoint contentOffset = self.bubblesTableView.contentOffset;
+
+        BOOL hasBeenScrolledToBottom = [self reloadBubblesTable:NO];
+
+        if (direction == MXTimelineDirectionBackwards)
+        {
+            // Backwards pagination adds cells at the top of the tableview content.
+            // Vertical content offset needs to be updated (except if the table has been scrolled to bottom)
+            if ((!hasBeenScrolledToBottom && verticalOffset > 0) || direction == MXTimelineDirectionForwards)
+            {
+                // Adjust vertical offset in order to compensate scrolling
+                contentOffset.y += verticalOffset;
+                [self setBubbleTableViewContentOffset:contentOffset animated:NO];
+            }
+        }
+        else
+        {
+            [self setBubbleTableViewContentOffset:contentOffset animated:NO];
+        }
+
+        // Restore scrolling and the scroll indicator
+        [self.bubblesTableView setShowsVerticalScrollIndicator:YES];
+        [self.bubblesTableView setScrollEnabled:YES];
+
+        self.bubbleTableViewDisplayInTransition = NO;
+        self->isPaginationInProgress = NO;
+
+        // Force the update of the current visual position
+        // Else there is a scroll jump on incoming message (see https://github.com/vector-im/vector-ios/issues/79)
+        if (direction == MXTimelineDirectionBackwards)
+        {
+            [self updateCurrentEventIdAtTableBottom:NO];
+        }
+
+    } failure:^(NSError *error) {
+        
+        MXStrongifyAndReturnIfNil(self);
+        
+        self.bubbleTableViewDisplayInTransition = YES;
+        
+        // Reload table on failure because some changes may have been ignored during pagination (see[dataSource:didCellChange:])
+        self->isPaginationInProgress = NO;
+        self->_bubblesTableView.tableHeaderView = self->backPaginationActivityView = nil;
+        
+        [self reloadBubblesTable:NO];
+        
+        self.bubbleTableViewDisplayInTransition = NO;
+        
+    }];
+}
+
+- (void)triggerAttachmentBackPagination:(NSString*)eventId
+{
+    // Paginate only if possible
+    if (NO == [roomDataSource.timeline canPaginate:MXTimelineDirectionBackwards] && self.attachmentsViewer)
+    {
+        return;
+    }
+    
+    isPaginationInProgress = YES;
+    
+    MXWeakify(self);
+    
+    // Trigger back pagination to find previous attachments
+    [roomDataSource paginate:_paginationLimit direction:MXTimelineDirectionBackwards onlyFromStore:NO success:^(NSUInteger addedCellNumber) {
+        
+        MXStrongifyAndReturnIfNil(self);
+        
+        // Check whether attachments viewer is still visible
+        if (self.attachmentsViewer)
+        {
+            // Check whether some older attachments have been added.
+            // Note: the stickers are excluded from the attachments list returned by the room datasource.
+            BOOL isDone = NO;
+            NSArray *attachmentsWithThumbnail = self.roomDataSource.attachmentsWithThumbnail;
+            if (attachmentsWithThumbnail.count)
+            {
+                MXKAttachment *attachment = attachmentsWithThumbnail.firstObject;
+                isDone = ![attachment.eventId isEqualToString:eventId];
+            }
+            
+            // Check whether pagination is still available
+            self.attachmentsViewer.complete = ([self->roomDataSource.timeline canPaginate:MXTimelineDirectionBackwards] == NO);
+            
+            if (isDone || self.attachmentsViewer.complete)
+            {
+                // Refresh the current attachments list.
+                [self.attachmentsViewer displayAttachments:attachmentsWithThumbnail focusOn:nil];
+                
+                // Trigger a full table reload without scrolling. We could not only insert new cells related to back pagination,
+                // because some other changes may have been ignored during back pagination (see[dataSource:didCellChange:]).
+                self.bubbleTableViewDisplayInTransition = YES;
+                self->isPaginationInProgress = NO;
+                [self reloadBubblesTable:YES];
+                self.bubbleTableViewDisplayInTransition = NO;
+                
+                // Done
+                return;
+            }
+            
+            // Here a new back pagination is required
+            [self triggerAttachmentBackPagination:eventId];
+        }
+        else
+        {
+            // Trigger a full table reload without scrolling. We could not only insert new cells related to back pagination,
+            // because some other changes may have been ignored during back pagination (see[dataSource:didCellChange:]).
+            self.bubbleTableViewDisplayInTransition = YES;
+            self->isPaginationInProgress = NO;
+            [self reloadBubblesTable:YES];
+            self.bubbleTableViewDisplayInTransition = NO;
+        }
+        
+    } failure:^(NSError *error) {
+        
+        MXStrongifyAndReturnIfNil(self);
+        
+        // Reload table on failure because some changes may have been ignored during back pagination (see[dataSource:didCellChange:])
+        self.bubbleTableViewDisplayInTransition = YES;
+        self->isPaginationInProgress = NO;
+        [self reloadBubblesTable:YES];
+        self.bubbleTableViewDisplayInTransition = NO;
+        
+        if (self.attachmentsViewer)
+        {
+            // Force attachments update to cancel potential loading wheel
+            [self.attachmentsViewer displayAttachments:self.attachmentsViewer.attachments focusOn:nil];
+        }
+        
+    }];
+}
+
+#pragma mark - Post messages
+
+- (void)sendTextMessage:(NSString*)msgTxt
+{
+    // Let the datasource send it and manage the local echo
+    [roomDataSource sendTextMessage:msgTxt success:nil failure:^(NSError *error)
+    {
+        // Just log the error. The message will be displayed in red in the room history
+        MXLogDebug(@"[MXKRoomViewController] sendTextMessage failed.");
+    }];
+}
+
+# pragma mark - Event handling
+
+- (void)showEventDetails:(MXEvent *)event
+{
+    [self dismissKeyboard];
+    
+    // Remove potential existing subviews
+    [self dismissTemporarySubViews];
+    
+    MXKEventDetailsView *eventDetailsView;
+    
+    if (customEventDetailsViewClass)
+    {
+        eventDetailsView = [[customEventDetailsViewClass alloc] initWithEvent:event andMatrixSession:roomDataSource.mxSession];
+    }
+    else
+    {
+        eventDetailsView = [[MXKEventDetailsView alloc] initWithEvent:event andMatrixSession:roomDataSource.mxSession];
+    }    
+    
+    // Add shadow on event details view
+    eventDetailsView.layer.cornerRadius = 5;
+    eventDetailsView.layer.shadowOffset = CGSizeMake(0, 1);
+    eventDetailsView.layer.shadowOpacity = 0.5f;
+    
+    // Add the view and define edge constraints
+    [self.view addSubview:eventDetailsView];
+    
+    self->eventDetailsView = eventDetailsView;
+    
+    [self.view addConstraint:[NSLayoutConstraint constraintWithItem:eventDetailsView
+                                                          attribute:NSLayoutAttributeTop
+                                                          relatedBy:NSLayoutRelationEqual
+                                                             toItem:self.topLayoutGuide
+                                                          attribute:NSLayoutAttributeBottom
+                                                         multiplier:1.0f
+                                                           constant:10.0f]];
+    
+    [self.view addConstraint:[NSLayoutConstraint constraintWithItem:eventDetailsView
+                                                          attribute:NSLayoutAttributeBottom
+                                                          relatedBy:NSLayoutRelationEqual
+                                                             toItem:self.bottomLayoutGuide
+                                                          attribute:NSLayoutAttributeTop
+                                                         multiplier:1.0f
+                                                           constant:-10.0f]];
+    
+    [self.view addConstraint:[NSLayoutConstraint constraintWithItem:self.view
+                                                          attribute:NSLayoutAttributeLeading
+                                                          relatedBy:NSLayoutRelationEqual
+                                                             toItem:eventDetailsView
+                                                          attribute:NSLayoutAttributeLeading
+                                                         multiplier:1.0f
+                                                           constant:-10.0f]];
+    
+    [self.view addConstraint:[NSLayoutConstraint constraintWithItem:self.view
+                                                          attribute:NSLayoutAttributeTrailing
+                                                          relatedBy:NSLayoutRelationEqual
+                                                             toItem:eventDetailsView
+                                                          attribute:NSLayoutAttributeTrailing
+                                                         multiplier:1.0f
+                                                           constant:10.0f]];
+    [self.view setNeedsUpdateConstraints];
+}
+
+- (void)promptUserToResendEvent:(NSString *)eventId
+{
+    MXEvent *event = [roomDataSource eventWithEventId:eventId];
+    
+    MXLogDebug(@"[MXKRoomViewController] promptUserToResendEvent: %@", event);
+    
+    if (event && event.eventType == MXEventTypeRoomMessage)
+    {
+        NSString *msgtype = event.content[@"msgtype"];
+        
+        NSString* textMessage;
+        if ([msgtype isEqualToString:kMXMessageTypeText])
+        {
+            textMessage = event.content[@"body"];
+        }
+        
+        // Show a confirmation popup to the end user
+        if (currentAlert)
+        {
+            [currentAlert dismissViewControllerAnimated:NO completion:nil];
+        }
+        
+        __weak typeof(self) weakSelf = self;
+        
+        UIAlertController *resendAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n resendMessage]
+                                                                             message:textMessage
+                                                                      preferredStyle:UIAlertControllerStyleAlert];
+        
+        [resendAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+                                                        style:UIAlertActionStyleDefault
+                                                      handler:^(UIAlertAction * action) {
+                                                           
+                                                           typeof(self) self = weakSelf;
+                                                           self->currentAlert = nil;
+                                                           
+                                                       }]];
+        
+        [resendAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
+                                                        style:UIAlertActionStyleDefault
+                                                      handler:^(UIAlertAction * action) {
+                                                           
+                                                           typeof(self) self = weakSelf;
+                                                           self->currentAlert = nil;
+                                                           
+                                                           // Let the datasource resend. It will manage local echo, etc.
+                                                           [self->roomDataSource resendEventWithEventId:eventId success:nil failure:nil];
+                                                           
+                                                       }]];
+        
+        [self presentViewController:resendAlert animated:YES completion:nil];
+        currentAlert = resendAlert;
+    }
+}
+
+#pragma mark - bubbles table
+
+- (BOOL)reloadBubblesTable:(BOOL)useBottomAnchor
+{
+    return [self reloadBubblesTable:useBottomAnchor invalidateBubblesCellDataCache:NO];
+}
+
+- (BOOL)reloadBubblesTable:(BOOL)useBottomAnchor invalidateBubblesCellDataCache:(BOOL)invalidateBubblesCellDataCache
+{
+    BOOL shouldScrollToBottom = shouldScrollToBottomOnTableRefresh;
+    
+    // When no size transition is in progress, check if the bottom of the content is currently visible.
+    // If this is the case, we will scroll automatically to the bottom after table refresh.
+    if (!isSizeTransitionInProgress && !shouldScrollToBottom)
+    {
+        shouldScrollToBottom = [self isBubblesTableScrollViewAtTheBottom];
+    }
+    
+    // Force bubblesCellData message recalculation if requested
+    if (invalidateBubblesCellDataCache)
+    {
+        [self.roomDataSource invalidateBubblesCellDataCache];
+    }
+    
+    // When scroll to bottom is not active, check whether we should keep the current event displayed at the bottom of the table
+    if (!shouldScrollToBottom && useBottomAnchor && currentEventIdAtTableBottom)
+    {
+        // Update content offset after refresh in order to keep visible the current event displayed at the bottom
+        
+        [_bubblesTableView reloadData];
+        
+        // Retrieve the new cell index of the event displayed previously at the bottom of table
+        NSInteger rowIndex = [roomDataSource indexOfCellDataWithEventId:currentEventIdAtTableBottom];
+        if (rowIndex != NSNotFound)
+        {
+            // Retrieve the corresponding cell
+            UITableViewCell *cell = [_bubblesTableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:rowIndex inSection:0]];
+            UITableViewCell *cellTmp;
+            if (!cell)
+            {
+                NSString *reuseIdentifier = [self cellReuseIdentifierForCellData:[roomDataSource cellDataAtIndex:rowIndex]];
+                // Create temporarily the cell (this cell will released at the end, to be reusable)
+                // Do not pass in the indexPath when creating this cell, as there is a possible crash by dequeuing
+                // multiple cells for the same index path if rotating the device coincides with reloading the data.
+                cellTmp = [_bubblesTableView dequeueReusableCellWithIdentifier:reuseIdentifier];
+                cell = cellTmp;
+            }
+            
+            if (cell)
+            {
+                CGFloat eventTopPosition = cell.frame.origin.y;
+                CGFloat eventBottomPosition = eventTopPosition + cell.frame.size.height;
+                
+                // Compute accurate event positions in case of bubble with multiple components
+                if ([cell isKindOfClass:MXKRoomBubbleTableViewCell.class])
+                {
+                    MXKRoomBubbleTableViewCell *roomBubbleTableViewCell = (MXKRoomBubbleTableViewCell *)cell;
+                    NSArray *bubbleComponents = roomBubbleTableViewCell.bubbleData.bubbleComponents;
+                    
+                    if (bubbleComponents.count > 1)
+                    {
+                        // Check and update each component position
+                        [roomBubbleTableViewCell.bubbleData prepareBubbleComponentsPosition];
+                        
+                        NSInteger index = bubbleComponents.count - 1;
+                        MXKRoomBubbleComponent *component = bubbleComponents[index];
+                        
+                        if ([component.event.eventId isEqualToString:currentEventIdAtTableBottom])
+                        {
+                            eventTopPosition += roomBubbleTableViewCell.msgTextViewTopConstraint.constant + component.position.y;
+                        }
+                        else
+                        {
+                            while (index--)
+                            {
+                                MXKRoomBubbleComponent *previousComponent = bubbleComponents[index];
+                                if ([previousComponent.event.eventId isEqualToString:currentEventIdAtTableBottom])
+                                {
+                                    // Update top position if this is not the first component
+                                    if (index)
+                                    {
+                                        eventTopPosition += roomBubbleTableViewCell.msgTextViewTopConstraint.constant + previousComponent.position.y;
+                                    }
+                                    
+                                    eventBottomPosition = cell.frame.origin.y + roomBubbleTableViewCell.msgTextViewTopConstraint.constant + component.position.y;
+                                    break;
+                                }
+                                
+                                component = previousComponent;
+                            }
+                        }
+                    }
+                }
+                
+                // Compute the offset of the content displayed at the bottom.
+                CGFloat contentBottomOffsetY = _bubblesTableView.contentOffset.y + (_bubblesTableView.frame.size.height - _bubblesTableView.adjustedContentInset.bottom);
+                if (contentBottomOffsetY > _bubblesTableView.contentSize.height)
+                {
+                    contentBottomOffsetY = _bubblesTableView.contentSize.height;
+                }
+                
+                // Check whether this event is no more displayed at the bottom
+                if ((contentBottomOffsetY <= eventTopPosition ) || (eventBottomPosition < contentBottomOffsetY))
+                {
+                    // Compute the top content offset to display again this event at the table bottom
+                    CGFloat contentOffsetY = eventBottomPosition - (_bubblesTableView.frame.size.height - _bubblesTableView.adjustedContentInset.bottom);
+                    
+                    // Check if there are enought data to fill the top
+                    if (contentOffsetY < -_bubblesTableView.adjustedContentInset.top)
+                    {
+                        // Scroll to the top
+                        contentOffsetY = -_bubblesTableView.adjustedContentInset.top;
+                    }
+                    
+                    CGPoint contentOffset = _bubblesTableView.contentOffset;
+                    contentOffset.y = contentOffsetY;
+                    [self setBubbleTableViewContentOffset:contentOffset animated:NO];
+                }
+                
+                if (cellTmp && [cellTmp conformsToProtocol:@protocol(MXKCellRendering)] && [cellTmp respondsToSelector:@selector(didEndDisplay)])
+                {
+                    // Release here resources, and restore reusable cells
+                    [(id<MXKCellRendering>)cellTmp didEndDisplay];
+                }
+            }
+        }
+    }
+    else
+    {
+        // Do a full reload
+        [_bubblesTableView reloadData];
+    }
+    
+    if (shouldScrollToBottom)
+    {
+        [self scrollBubblesTableViewToBottomAnimated:NO];
+    }
+    
+    return shouldScrollToBottom;
+}
+
+- (void)updateCurrentEventIdAtTableBottom:(BOOL)acknowledge
+{
+    // Update the identifier of the event displayed at the bottom of the table, except if a rotation or other size transition is in progress.
+    if (!isSizeTransitionInProgress && !self.isBubbleTableViewDisplayInTransition)
+    {
+        // Compute the content offset corresponding to the line displayed at the table bottom (just above the toolbar).
+        CGFloat contentBottomOffsetY = _bubblesTableView.contentOffset.y + (_bubblesTableView.frame.size.height - _bubblesTableView.adjustedContentInset.bottom);
+        if (contentBottomOffsetY > _bubblesTableView.contentSize.height)
+        {
+            contentBottomOffsetY = _bubblesTableView.contentSize.height;
+        }
+        // Be a bit less retrictive, consider visible an event at the bottom even if is partially hidden.
+        contentBottomOffsetY += 8;
+        
+        // Reset the current event id
+        currentEventIdAtTableBottom = nil;
+        
+        // Consider the visible cells (starting by those displayed at the bottom)
+        NSArray *visibleCells = [_bubblesTableView visibleCells];
+        NSInteger index = visibleCells.count;
+        UITableViewCell *cell;
+        while (index--)
+        {
+            cell = visibleCells[index];
+            
+            // Check whether the cell is actually visible
+            if (cell && (cell.frame.origin.y < contentBottomOffsetY))
+            {
+                if (![cell isKindOfClass:MXKTableViewCell.class])
+                {
+                    continue;
+                }
+                
+                MXKCellData *cellData = ((MXKTableViewCell *)cell).mxkCellData;
+                
+                // Only 'MXKRoomBubbleCellData' is supported here for the moment.
+                if (![cellData isKindOfClass:MXKRoomBubbleCellData.class])
+                {
+                    continue;
+                }
+
+                MXKRoomBubbleCellData *bubbleData = (MXKRoomBubbleCellData*)cellData;
+                
+                // Check which bubble component is displayed at the bottom.
+                // For that update each component position.
+                [bubbleData prepareBubbleComponentsPosition];
+                
+                NSArray *bubbleComponents = bubbleData.bubbleComponents;
+                NSInteger componentIndex = bubbleComponents.count;
+                
+                CGFloat bottomPositionY = cell.frame.size.height;
+                
+                MXKRoomBubbleComponent *component;
+                
+                while (componentIndex --)
+                {
+                    component = bubbleComponents[componentIndex];
+                    if (![cell isKindOfClass:MXKRoomBubbleTableViewCell.class])
+                    {
+                        continue;
+                    }
+
+                    MXKRoomBubbleTableViewCell *roomBubbleTableViewCell = (MXKRoomBubbleTableViewCell *)cell;
+                    
+                    // Check whether the bottom part of the component is visible.
+                    CGFloat pos = cell.frame.origin.y + bottomPositionY;
+                    if (pos <= contentBottomOffsetY)
+                    {
+                        // We found the component
+                        currentEventIdAtTableBottom = component.event.eventId;
+                        break;
+                    }
+                    
+                    // Prepare the bottom position for the next component
+                    bottomPositionY = roomBubbleTableViewCell.msgTextViewTopConstraint.constant + component.position.y;
+                }
+                
+                if (currentEventIdAtTableBottom)
+                {
+                    if (acknowledge && self.isEventsAcknowledgementEnabled)
+                    {
+                        // Indicate to the homeserver that the user has read this event.
+                        
+                        // Check whether the read marker must be updated.
+                        BOOL updateReadMarker = _updateRoomReadMarker;
+                        if (updateReadMarker && roomDataSource.room.accountData.readMarkerEventId)
+                        {
+                            MXEvent *currentReadMarkerEvent = [roomDataSource.mxSession.store eventWithEventId:roomDataSource.room.accountData.readMarkerEventId inRoom:roomDataSource.roomId];
+                            if (!currentReadMarkerEvent)
+                            {
+                                currentReadMarkerEvent = [roomDataSource eventWithEventId:roomDataSource.room.accountData.readMarkerEventId];
+                            }
+                            
+                            // Update the read marker only if the current event is available, and the new event is posterior to it.
+                            updateReadMarker = (currentReadMarkerEvent && (currentReadMarkerEvent.originServerTs <= component.event.originServerTs));
+                        }
+                        
+                        [roomDataSource.room acknowledgeEvent:component.event andUpdateReadMarker:updateReadMarker];
+                    }
+                    break;
+                }
+                // else we consider the previous cell.
+            }
+        }
+    }
+}
+
+#pragma mark - MXKDataSourceDelegate
+
+- (Class<MXKCellRendering>)cellViewClassForCellData:(MXKCellData*)cellData
+{
+    Class cellViewClass = nil;
+    
+    // Sanity check
+    if ([cellData conformsToProtocol:@protocol(MXKRoomBubbleCellDataStoring)])
+    {
+        id<MXKRoomBubbleCellDataStoring> bubbleData = (id<MXKRoomBubbleCellDataStoring>)cellData;
+        
+        // Select the suitable table view cell class
+        if (bubbleData.isIncoming)
+        {
+            if (bubbleData.isAttachmentWithThumbnail)
+            {
+                if (bubbleData.shouldHideSenderInformation)
+                {
+                    cellViewClass = MXKRoomIncomingAttachmentWithoutSenderInfoBubbleCell.class;
+                }
+                else
+                {
+                    cellViewClass = MXKRoomIncomingAttachmentBubbleCell.class;
+                }
+            }
+            else
+            {
+                if (bubbleData.shouldHideSenderInformation)
+                {
+                    cellViewClass = MXKRoomIncomingTextMsgWithoutSenderInfoBubbleCell.class;
+                }
+                else
+                {
+                    cellViewClass = MXKRoomIncomingTextMsgBubbleCell.class;
+                }
+            }
+        }
+        else if (bubbleData.isAttachmentWithThumbnail)
+        {
+            if (bubbleData.shouldHideSenderInformation)
+            {
+                cellViewClass = MXKRoomOutgoingAttachmentWithoutSenderInfoBubbleCell.class;
+            }
+            else
+            {
+                cellViewClass = MXKRoomOutgoingAttachmentBubbleCell.class;
+            }
+        }
+        else
+        {
+            if (bubbleData.shouldHideSenderInformation)
+            {
+                cellViewClass = MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.class;
+            }
+            else
+            {
+                cellViewClass = MXKRoomOutgoingTextMsgBubbleCell.class;
+            }
+        }
+    }
+    
+    return cellViewClass;
+}
+
+- (NSString *)cellReuseIdentifierForCellData:(MXKCellData*)cellData
+{
+    Class class = [self cellViewClassForCellData:cellData];
+    
+    if ([class respondsToSelector:@selector(defaultReuseIdentifier)])
+    {
+        return [class defaultReuseIdentifier];
+    }
+    
+    return nil;
+}
+
+- (void)dataSource:(MXKDataSource *)dataSource didCellChange:(id)changes
+{
+    UIApplication *sharedApplication = [UIApplication performSelector:@selector(sharedApplication)];
+    if (sharedApplication && sharedApplication.applicationState != UIApplicationStateActive)
+    {
+        // Do nothing at the UI level if the application do a sync in background
+        return;
+    }
+
+    if (isPaginationInProgress)
+    {
+        // Ignore these changes, the table will be full updated at the end of pagination.
+        return;
+    }
+    
+    if (self.attachmentsViewer)
+    {
+        // Refresh the current attachments list without changing the current displayed attachment (see focus = nil).
+        NSArray *attachmentsWithThumbnail = self.roomDataSource.attachmentsWithThumbnail;
+        [self.attachmentsViewer displayAttachments:attachmentsWithThumbnail focusOn:nil];
+    }
+    
+    self.bubbleTableViewDisplayInTransition = YES;
+
+    CGPoint contentOffset = self.bubblesTableView.contentOffset;
+
+    BOOL hasScrolledToTheBottom = [self reloadBubblesTable:YES];
+
+    // If the user is scrolling while we reload the data for a new incoming message for example,
+    // there will be a jump in the table view display.
+    // Resetting the contentOffset after the reload fixes the issue.
+    if (hasScrolledToTheBottom == NO)
+    {
+        [self setBubbleTableViewContentOffset:contentOffset animated:NO];
+    }
+    
+    self.bubbleTableViewDisplayInTransition = NO;
+}
+
+- (void)dataSource:(MXKDataSource *)dataSource didStateChange:(MXKDataSourceState)state
+{
+    [self updateViewControllerAppearanceOnRoomDataSourceState];
+    
+    if (state == MXKDataSourceStateReady)
+    {
+        [self onRoomDataSourceReady];
+    }
+}
+
+- (void)dataSource:(MXKDataSource *)dataSource didRecognizeAction:(NSString *)actionIdentifier inCell:(id<MXKCellRendering>)cell userInfo:(NSDictionary *)userInfo
+{
+    MXLogDebug(@"Gesture %@ has been recognized in %@. UserInfo: %@", actionIdentifier, cell, userInfo);
+    
+    if ([actionIdentifier isEqualToString:kMXKRoomBubbleCellTapOnMessageTextView])
+    {
+        MXLogDebug(@"    -> A message has been tapped");
+    }
+    else if ([actionIdentifier isEqualToString:kMXKRoomBubbleCellTapOnSenderNameLabel] || [actionIdentifier isEqualToString:kMXKRoomBubbleCellTapOnAvatarView])
+    {
+//        MXLogDebug(@"    -> Name or avatar of %@ has been tapped", userInfo[kMXKRoomBubbleCellUserIdKey]);
+        
+        // Add the member display name in text input
+        MXRoomMember *selectedRoomMember = [roomDataSource.roomState.members memberWithUserId:userInfo[kMXKRoomBubbleCellUserIdKey]];
+        if (selectedRoomMember)
+        {
+            [self mention:selectedRoomMember];
+        }
+    }
+    else if ([actionIdentifier isEqualToString:kMXKRoomBubbleCellTapOnDateTimeContainer])
+    {
+        roomDataSource.showBubblesDateTime = !roomDataSource.showBubblesDateTime;
+        MXLogDebug(@"    -> Turn %@ cells date", roomDataSource.showBubblesDateTime ? @"ON" : @"OFF");
+    }
+    else if ([actionIdentifier isEqualToString:kMXKRoomBubbleCellTapOnAttachmentView] && [cell isKindOfClass:MXKRoomBubbleTableViewCell.class])
+    {
+        [self showAttachmentInCell:(MXKRoomBubbleTableViewCell *)cell];
+    }
+    else if ([actionIdentifier isEqualToString:kMXKRoomBubbleCellLongPressOnProgressView] && [cell isKindOfClass:MXKRoomBubbleTableViewCell.class])
+    {
+        MXKRoomBubbleTableViewCell *roomBubbleTableViewCell = (MXKRoomBubbleTableViewCell *)cell;
+        
+        // Check if there is a download in progress, then offer to cancel it
+        NSString *downloadId = roomBubbleTableViewCell.bubbleData.attachment.downloadId;
+        if ([MXMediaManager existingDownloaderWithIdentifier:downloadId])
+        {
+            if (currentAlert)
+            {
+                [currentAlert dismissViewControllerAnimated:NO completion:nil];
+            }
+            
+            __weak __typeof(self) weakSelf = self;
+            UIAlertController *cancelAlert = [UIAlertController alertControllerWithTitle:nil
+                                                                                 message:[MatrixKitL10n attachmentCancelDownload]
+                                                                          preferredStyle:UIAlertControllerStyleAlert];
+            
+            [cancelAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n no]
+                                                            style:UIAlertActionStyleDefault
+                                                          handler:^(UIAlertAction * action) {
+                                                               
+                                                               typeof(self) self = weakSelf;
+                                                               self->currentAlert = nil;
+                                                               
+                                                           }]];
+            
+            [cancelAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n yes]
+                                                            style:UIAlertActionStyleDefault
+                                                          handler:^(UIAlertAction * action) {
+                                                               
+                                                               typeof(self) self = weakSelf;
+                                                               self->currentAlert = nil;
+                                                               
+                                                               // Get again the loader
+                                                               MXMediaLoader *loader = [MXMediaManager existingDownloaderWithIdentifier:downloadId];
+                                                               if (loader)
+                                                               {
+                                                                   [loader cancel];
+                                                               }
+                                                               
+                                                               // Hide the progress animation
+                                                               roomBubbleTableViewCell.progressView.hidden = YES;
+                                                               
+                                                           }]];
+            
+            [self presentViewController:cancelAlert animated:YES completion:nil];
+            currentAlert = cancelAlert;
+        }
+        else if (roomBubbleTableViewCell.bubbleData.attachment.eventSentState == MXEventSentStatePreparing ||
+                 roomBubbleTableViewCell.bubbleData.attachment.eventSentState == MXEventSentStateEncrypting ||
+                 roomBubbleTableViewCell.bubbleData.attachment.eventSentState == MXEventSentStateUploading)
+        {
+            // Offer to cancel the upload in progress
+            // Upload id is stored in attachment url (nasty trick)
+            NSString *uploadId = roomBubbleTableViewCell.bubbleData.attachment.contentURL;
+            if ([MXMediaManager existingUploaderWithId:uploadId])
+            {
+                if (currentAlert)
+                {
+                    [currentAlert dismissViewControllerAnimated:NO completion:nil];
+                }
+                
+                __weak __typeof(self) weakSelf = self;
+                UIAlertController *cancelAlert = [UIAlertController alertControllerWithTitle:nil
+                                                                                     message:[MatrixKitL10n attachmentCancelUpload]
+                                                                              preferredStyle:UIAlertControllerStyleAlert];
+                
+                [cancelAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n no]
+                                                                style:UIAlertActionStyleDefault
+                                                              handler:^(UIAlertAction * action) {
+                                                                   
+                                                                   typeof(self) self = weakSelf;
+                                                                   self->currentAlert = nil;
+                                                                   
+                                                               }]];
+                
+                [cancelAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n yes]
+                                                                style:UIAlertActionStyleDefault
+                                                              handler:^(UIAlertAction * action) {
+                                                                   
+                                                                   // TODO cancel the attachment encryption if it is in progress.
+                                                                   
+                                                                   // Get again the loader
+                                                                   MXMediaLoader *loader = [MXMediaManager existingUploaderWithId:uploadId];
+                                                                   if (loader)
+                                                                   {
+                                                                       [loader cancel];
+                                                                   }
+                                                                   
+                                                                   // Hide the progress animation
+                                                                   roomBubbleTableViewCell.progressView.hidden = YES;
+                                                                   
+                                                                   if (weakSelf)
+                                                                   {
+                                                                       typeof(self) self = weakSelf;
+                                                                       self->currentAlert = nil;
+                                                                       
+                                                                       // Remove the outgoing message and its related cached file.
+                                                                       [[NSFileManager defaultManager] removeItemAtPath:roomBubbleTableViewCell.bubbleData.attachment.cacheFilePath error:nil];
+                                                                       [[NSFileManager defaultManager] removeItemAtPath:roomBubbleTableViewCell.bubbleData.attachment.thumbnailCachePath error:nil];
+                                                                       [self.roomDataSource removeEventWithEventId:roomBubbleTableViewCell.bubbleData.attachment.eventId];
+                                                                   }
+                                                                   
+                                                               }]];
+                
+                [self presentViewController:cancelAlert animated:YES completion:nil];
+                currentAlert = cancelAlert;
+            }
+        }
+    }
+    else if ([actionIdentifier isEqualToString:kMXKRoomBubbleCellLongPressOnEvent] && [cell isKindOfClass:MXKRoomBubbleTableViewCell.class])
+    {
+        [self dismissKeyboard];
+        
+        MXEvent *selectedEvent = userInfo[kMXKRoomBubbleCellEventKey];
+        MXKRoomBubbleTableViewCell *roomBubbleTableViewCell = (MXKRoomBubbleTableViewCell *)cell;
+        MXKAttachment *attachment = roomBubbleTableViewCell.bubbleData.attachment;
+        
+        if (selectedEvent)
+        {
+            if (currentAlert)
+            {
+                [currentAlert dismissViewControllerAnimated:NO completion:nil];
+                currentAlert = nil;
+                
+                // Cancel potential text selection in other bubbles
+                for (MXKRoomBubbleTableViewCell *bubble in self.bubblesTableView.visibleCells)
+                {
+                    [bubble highlightTextMessageForEvent:nil];
+                }
+            }
+            
+            __weak __typeof(self) weakSelf = self;
+            UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+            
+            // Add actions for a failed event
+            if (selectedEvent.sentState == MXEventSentStateFailed)
+            {
+                [actionSheet addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n resend]
+                                                                style:UIAlertActionStyleDefault
+                                                              handler:^(UIAlertAction * action) {
+                                                                   
+                                                                   typeof(self) self = weakSelf;
+                                                                   self->currentAlert = nil;
+                                                                   
+                                                                   // Let the datasource resend. It will manage local echo, etc.
+                                                                   [self.roomDataSource resendEventWithEventId:selectedEvent.eventId success:nil failure:nil];
+                                                                   
+                                                               }]];
+                
+                [actionSheet addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n delete]
+                                                                style:UIAlertActionStyleDefault
+                                                              handler:^(UIAlertAction * action) {
+                                                                   
+                                                                   typeof(self) self = weakSelf;
+                                                                   self->currentAlert = nil;
+                                                                   
+                                                                   [self.roomDataSource removeEventWithEventId:selectedEvent.eventId];
+                                                                   
+                                                               }]];
+            }
+            
+            // Add actions for text message
+            if (!attachment)
+            {
+                // Highlight the select event
+                [roomBubbleTableViewCell highlightTextMessageForEvent:selectedEvent.eventId];
+                
+                // Retrieved data related to the selected event
+                NSArray *components = roomBubbleTableViewCell.bubbleData.bubbleComponents;
+                MXKRoomBubbleComponent *selectedComponent;
+                for (selectedComponent in components)
+                {
+                    if ([selectedComponent.event.eventId isEqualToString:selectedEvent.eventId])
+                    {
+                        break;
+                    }
+                    selectedComponent = nil;
+                }
+                
+                [actionSheet addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n copy]
+                                                                style:UIAlertActionStyleDefault
+                                                              handler:^(UIAlertAction * action) {
+                                                                   
+                                                                   typeof(self) self = weakSelf;
+                                                                   self->currentAlert = nil;
+                                                                   
+                                                                   // Cancel event highlighting
+                                                                   [roomBubbleTableViewCell highlightTextMessageForEvent:nil];
+                                                                   
+                                                                   NSString *textMessage = selectedComponent.textMessage;
+                                                                   
+                                                                   if (textMessage)
+                                                                   {
+                                                                       MXKPasteboardManager.shared.pasteboard.string = textMessage;
+                                                                   }
+                                                                   else
+                                                                   {
+                                                                       MXLogDebug(@"[MXKRoomViewController] Copy text failed. Text is nil for room id/event id: %@/%@", selectedComponent.event.roomId, selectedComponent.event.eventId);
+                                                                   }
+                                                               }]];
+                
+                if ([MXKAppSettings standardAppSettings].messageDetailsAllowSharing)
+                {
+                    [actionSheet addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n share]
+                                                                    style:UIAlertActionStyleDefault
+                                                                  handler:^(UIAlertAction * action) {
+                        
+                        typeof(self) self = weakSelf;
+                        self->currentAlert = nil;
+                        
+                        // Cancel event highlighting
+                        [roomBubbleTableViewCell highlightTextMessageForEvent:nil];
+                        
+                        NSArray *activityItems = [NSArray arrayWithObjects:selectedComponent.textMessage, nil];
+                        
+                        UIActivityViewController *activityViewController = [[UIActivityViewController alloc] initWithActivityItems:activityItems applicationActivities:nil];
+                        if (activityViewController)
+                        {
+                            activityViewController.modalTransitionStyle = UIModalTransitionStyleCoverVertical;
+                            activityViewController.popoverPresentationController.sourceView = roomBubbleTableViewCell;
+                            activityViewController.popoverPresentationController.sourceRect = roomBubbleTableViewCell.bounds;
+                            
+                            [self presentViewController:activityViewController animated:YES completion:nil];
+                        }
+                        
+                    }]];
+                }
+                
+                if (components.count > 1)
+                {
+                    [actionSheet addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n selectAll]
+                                                                    style:UIAlertActionStyleDefault
+                                                                  handler:^(UIAlertAction * action) {
+                                                                       
+                                                                       typeof(self) self = weakSelf;
+                                                                       self->currentAlert = nil;
+                                                                       
+                                                                       [self selectAllTextMessageInCell:cell];
+                                                                       
+                                                                   }]];
+                }
+            }
+            else // Add action for attachment
+            {
+                if (attachment.type == MXKAttachmentTypeImage || attachment.type == MXKAttachmentTypeVideo)
+                {
+                    if ([MXKAppSettings standardAppSettings].messageDetailsAllowSaving)
+                    {
+                        [actionSheet addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n save]
+                                                                        style:UIAlertActionStyleDefault
+                                                                      handler:^(UIAlertAction * action) {
+                            
+                            typeof(self) self = weakSelf;
+                            self->currentAlert = nil;
+                            
+                            [self startActivityIndicator];
+                            
+                            [attachment save:^{
+                                
+                                typeof(self) self = weakSelf;
+                                [self stopActivityIndicator];
+                                
+                            } failure:^(NSError *error) {
+                                
+                                typeof(self) self = weakSelf;
+                                [self stopActivityIndicator];
+                                
+                                // Notify MatrixKit user
+                                [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error];
+                                
+                            }];
+                            
+                            // Start animation in case of download during attachment preparing
+                            [roomBubbleTableViewCell startProgressUI];
+                            
+                        }]];
+                    }
+                }
+                
+                if (attachment.type != MXKAttachmentTypeSticker)
+                {
+                    [actionSheet addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n copyButtonName]
+                                                                    style:UIAlertActionStyleDefault
+                                                                  handler:^(UIAlertAction * action) {
+                                                                       
+                                                                       typeof(self) self = weakSelf;
+                                                                       self->currentAlert = nil;
+                                                                       
+                                                                       [self startActivityIndicator];
+                                                                       
+                                                                       [attachment copy:^{
+                                                                           
+                                                                           typeof(self) self = weakSelf;
+                                                                           [self stopActivityIndicator];
+                                                                           
+                                                                       } failure:^(NSError *error) {
+                                                                           
+                                                                           typeof(self) self = weakSelf;
+                                                                           [self stopActivityIndicator];
+                                                                           
+                                                                           // Notify MatrixKit user
+                                                                           [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error];
+                                                                           
+                                                                       }];
+                                                                       
+                                                                       // Start animation in case of download during attachment preparing
+                                                                       [roomBubbleTableViewCell startProgressUI];
+                                                                       
+                                                                   }]];
+                    
+                    if ([MXKAppSettings standardAppSettings].messageDetailsAllowSharing)
+                    {
+                        [actionSheet addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n share]
+                                                                        style:UIAlertActionStyleDefault
+                                                                      handler:^(UIAlertAction * action) {
+                            
+                            typeof(self) self = weakSelf;
+                            self->currentAlert = nil;
+                            
+                            [attachment prepareShare:^(NSURL *fileURL) {
+                                
+                                typeof(self) self = weakSelf;
+                                self->documentInteractionController = [UIDocumentInteractionController interactionControllerWithURL:fileURL];
+                                [self->documentInteractionController setDelegate:self];
+                                self->currentSharedAttachment = attachment;
+                                
+                                if (![self->documentInteractionController presentOptionsMenuFromRect:self.view.frame inView:self.view animated:YES])
+                                {
+                                    self->documentInteractionController = nil;
+                                    [attachment onShareEnded];
+                                    self->currentSharedAttachment = nil;
+                                }
+                                
+                            } failure:^(NSError *error) {
+                                
+                                // Notify MatrixKit user
+                                [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error];
+                                
+                            }];
+                            
+                            // Start animation in case of download during attachment preparing
+                            [roomBubbleTableViewCell startProgressUI];
+                            
+                        }]];
+                    }
+                }
+                
+                // Check status of the selected event
+                if (selectedEvent.sentState == MXEventSentStatePreparing ||
+                    selectedEvent.sentState == MXEventSentStateEncrypting ||
+                    selectedEvent.sentState == MXEventSentStateUploading)
+                {
+                    // Upload id is stored in attachment url (nasty trick)
+                    NSString *uploadId = roomBubbleTableViewCell.bubbleData.attachment.contentURL;
+                    if ([MXMediaManager existingUploaderWithId:uploadId])
+                    {
+                        [actionSheet addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancelUpload]
+                                                                        style:UIAlertActionStyleDefault
+                                                                      handler:^(UIAlertAction * action) {
+                                                                           
+                                                                           // TODO cancel the attachment encryption if it is in progress.
+                                                                           
+                                                                           // Cancel the loader
+                                                                           MXMediaLoader *loader = [MXMediaManager existingUploaderWithId:uploadId];
+                                                                           if (loader)
+                                                                           {
+                                                                               [loader cancel];
+                                                                           }
+                                                                           
+                                                                           // Hide the progress animation
+                                                                           roomBubbleTableViewCell.progressView.hidden = YES;
+                                                                           
+                                                                           if (weakSelf)
+                                                                           {
+                                                                               typeof(self) self = weakSelf;
+                                                                               self->currentAlert = nil;
+                                                                               
+                                                                               // Remove the outgoing message and its related cached file.
+                                                                               [[NSFileManager defaultManager] removeItemAtPath:roomBubbleTableViewCell.bubbleData.attachment.cacheFilePath error:nil];
+                                                                               [[NSFileManager defaultManager] removeItemAtPath:roomBubbleTableViewCell.bubbleData.attachment.thumbnailCachePath error:nil];
+                                                                               [self.roomDataSource removeEventWithEventId:selectedEvent.eventId];
+                                                                           }
+                                                                           
+                                                                       }]];
+                    }
+                }
+            }
+            
+            // Check status of the selected event
+            if (selectedEvent.sentState == MXEventSentStateSent)
+            {
+                // Check whether download is in progress
+                if (selectedEvent.isMediaAttachment)
+                {
+                    NSString *downloadId = roomBubbleTableViewCell.bubbleData.attachment.downloadId;
+                    if ([MXMediaManager existingDownloaderWithIdentifier:downloadId])
+                    {
+                        [actionSheet addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancelDownload]
+                                                                        style:UIAlertActionStyleDefault
+                                                                      handler:^(UIAlertAction * action) {
+                                                                           
+                                                                           typeof(self) self = weakSelf;
+                                                                           self->currentAlert = nil;
+                                                                           
+                                                                           // Get again the loader
+                                                                           MXMediaLoader *loader = [MXMediaManager existingDownloaderWithIdentifier:downloadId];
+                                                                           if (loader)
+                                                                           {
+                                                                               [loader cancel];
+                                                                           }
+                                                                           // Hide the progress animation
+                                                                           roomBubbleTableViewCell.progressView.hidden = YES;
+                                                                           
+                                                                       }]];
+                    }
+                }
+                
+                [actionSheet addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n showDetails]
+                                                                style:UIAlertActionStyleDefault
+                                                              handler:^(UIAlertAction * action) {
+                                                                   
+                                                                   typeof(self) self = weakSelf;
+                                                                   self->currentAlert = nil;
+                                                                   
+                                                                   // Cancel event highlighting (if any)
+                                                                   [roomBubbleTableViewCell highlightTextMessageForEvent:nil];
+                                                                   
+                                                                   // Display event details
+                                                                   [self showEventDetails:selectedEvent];
+                                                                   
+                                                               }]];
+            }
+            
+            [actionSheet addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+                                                            style:UIAlertActionStyleCancel
+                                                          handler:^(UIAlertAction * action) {
+                                                               
+                                                               typeof(self) self = weakSelf;
+                                                               self->currentAlert = nil;
+                                                               
+                                                               // Cancel event highlighting (if any)
+                                                               [roomBubbleTableViewCell highlightTextMessageForEvent:nil];
+                                                               
+                                                           }]];
+            
+            // Do not display empty action sheet
+            if (actionSheet.actions.count > 1)
+            {
+                [actionSheet popoverPresentationController].sourceView = roomBubbleTableViewCell;
+                [actionSheet popoverPresentationController].sourceRect = roomBubbleTableViewCell.bounds;
+                [self presentViewController:actionSheet animated:YES completion:nil];
+                currentAlert = actionSheet;
+            }
+        }
+    }
+    else if ([actionIdentifier isEqualToString:kMXKRoomBubbleCellLongPressOnAvatarView])
+    {
+        MXLogDebug(@"    -> Avatar of %@ has been long pressed", userInfo[kMXKRoomBubbleCellUserIdKey]);
+    }
+    else if ([actionIdentifier isEqualToString:kMXKRoomBubbleCellUnsentButtonPressed])
+    {
+        MXEvent *selectedEvent = userInfo[kMXKRoomBubbleCellEventKey];
+        if (selectedEvent)
+        {
+            // The user may want to resend it
+            [self promptUserToResendEvent:selectedEvent.eventId];
+        }
+    }
+}
+
+#pragma mark - Clipboard
+
+- (void)selectAllTextMessageInCell:(id<MXKCellRendering>)cell
+{
+    if (![MXKAppSettings standardAppSettings].messageDetailsAllowSharing)
+    {
+        return;
+    }
+    
+    if ([cell isKindOfClass:MXKRoomBubbleTableViewCell.class])
+    {
+        MXKRoomBubbleTableViewCell *roomBubbleTableViewCell = (MXKRoomBubbleTableViewCell *)cell;
+        selectedText = roomBubbleTableViewCell.bubbleData.textMessage;
+        roomBubbleTableViewCell.allTextHighlighted = YES;
+        
+        // Display Menu (dispatch is required here, else the attributed text change hides the menu)
+        dispatch_async(dispatch_get_main_queue(), ^{
+            MXWeakify(self);
+            self.uiMenuControllerDidHideMenuNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:UIMenuControllerDidHideMenuNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+                
+                MXStrongifyAndReturnIfNil(self);
+                // Deselect text
+                roomBubbleTableViewCell.allTextHighlighted = NO;
+                self->selectedText = nil;
+                
+                [UIMenuController sharedMenuController].menuItems = nil;
+                
+                [[NSNotificationCenter defaultCenter] removeObserver:self.uiMenuControllerDidHideMenuNotificationObserver];
+            }];
+            
+            [self becomeFirstResponder];
+            UIMenuController *menu = [UIMenuController sharedMenuController];
+            menu.menuItems = @[[[UIMenuItem alloc] initWithTitle:[MatrixKitL10n share] action:@selector(share:)]];
+            [menu setTargetRect:roomBubbleTableViewCell.messageTextView.frame inView:roomBubbleTableViewCell];
+            [menu setMenuVisible:YES animated:YES];
+        });
+    }
+}
+
+- (void)copy:(id)sender
+{
+    if (selectedText)
+    {
+        MXKPasteboardManager.shared.pasteboard.string = selectedText;
+    }
+    else
+    {
+        MXLogDebug(@"[MXKRoomViewController] Selected text copy failed. Selected text is nil");
+    }
+}
+
+- (void)share:(id)sender
+{
+    if (selectedText)
+    {
+        NSArray *activityItems = [NSArray arrayWithObjects:selectedText, nil];
+        
+        UIActivityViewController *activityViewController = [[UIActivityViewController alloc] initWithActivityItems:activityItems applicationActivities:nil];
+        if (activityViewController)
+        {
+            activityViewController.modalTransitionStyle = UIModalTransitionStyleCoverVertical;
+            activityViewController.popoverPresentationController.sourceView = self.view;
+            activityViewController.popoverPresentationController.sourceRect = self.view.bounds;
+            
+            [self presentViewController:activityViewController animated:YES completion:nil];
+        }
+    }
+}
+
+- (BOOL)canPerformAction:(SEL)action withSender:(id)sender
+{
+    if (selectedText.length && (action == @selector(copy:) || action == @selector(share:)))
+    {
+        return YES;
+    }
+    return NO;
+}
+
+- (BOOL)canBecomeFirstResponder
+{
+    return (selectedText.length != 0);
+}
+
+#pragma mark - UITableView delegate
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    if (tableView == _bubblesTableView)
+    {
+        return [roomDataSource cellHeightAtIndex:indexPath.row withMaximumWidth:self.tableViewSafeAreaWidth];
+    }
+    
+    return 0;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    if (tableView == _bubblesTableView)
+    {
+        // Dismiss keyboard when user taps on messages table view content
+        [self dismissKeyboard];
+    }
+}
+
+- (void)tableView:(UITableView *)tableView didEndDisplayingCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath*)indexPath
+{
+    // Release here resources, and restore reusable cells
+    if ([cell respondsToSelector:@selector(didEndDisplay)])
+    {
+        [(id<MXKCellRendering>)cell didEndDisplay];
+    }
+}
+
+- (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset
+{
+    // Detect vertical bounce at the top of the tableview to trigger pagination
+    if (scrollView == _bubblesTableView)
+    {
+        // Detect top bounce
+        if (scrollView.contentOffset.y < -scrollView.adjustedContentInset.top)
+        {
+            // Shall we add back pagination spinner?
+            if (isPaginationInProgress && !backPaginationActivityView)
+            {
+                UIActivityIndicatorView* spinner  = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
+                spinner.hidesWhenStopped = NO;
+                spinner.backgroundColor = [UIColor clearColor];
+                [spinner startAnimating];
+                
+                // no need to manage constraints here
+                // IOS defines them.
+                // since IOS7 the spinner is centered so need to create a background and add it.
+                _bubblesTableView.tableHeaderView = backPaginationActivityView = spinner;
+            }
+        }
+        else
+        {
+            // Shall we add forward pagination spinner?
+            if (!roomDataSource.isLive && isPaginationInProgress && scrollView.contentOffset.y + scrollView.frame.size.height > scrollView.contentSize.height + 64 && !reconnectingView)
+            {
+                [self addReconnectingView];
+            }
+            else
+            {
+                [self detectPullToKick:scrollView];
+            }
+        }
+    }
+}
+
+- (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate
+{
+    if (scrollView == _bubblesTableView)
+    {
+        // if the user scrolls the history content without animation
+        // upateCurrentEventIdAtTableBottom must be called here (without dispatch).
+        // else it will be done in scrollViewDidEndDecelerating
+        if (!decelerate)
+        {
+            [self updateCurrentEventIdAtTableBottom:YES];
+        }
+    }
+}
+
+- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
+{
+    if (scrollView == _bubblesTableView)
+    {
+        // do not dispatch the upateCurrentEventIdAtTableBottom call
+        // else it might triggers weird UI lags.
+        [self updateCurrentEventIdAtTableBottom:YES];
+        [self managePullToKick:scrollView];
+    }
+}
+
+- (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView
+{
+    if (scrollView == _bubblesTableView)
+    {
+        // do not dispatch the upateCurrentEventIdAtTableBottom call
+        // else it might triggers weird UI lags.
+        [self updateCurrentEventIdAtTableBottom:YES];
+    }
+}
+
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView
+{
+    if (scrollView == _bubblesTableView)
+    {
+        BOOL wasScrollingToBottom = isScrollingToBottom;
+
+        // Consider this callback to reset scrolling to bottom flag
+        isScrollingToBottom = NO;
+        
+        // shouldScrollToBottomOnTableRefresh is used to inhibit false detection of
+        // scrolling action from the user when the viewVC appears or rotates
+        if (scrollView == _bubblesTableView && scrollView.contentSize.height && !shouldScrollToBottomOnTableRefresh)
+        {
+            // when the content size if smaller that the frame
+            // scrollViewDidEndDecelerating is not called
+            // so test it when the content offset goes back to the screen top.
+            if ((scrollView.contentSize.height < scrollView.frame.size.height) && (-scrollView.contentOffset.y == scrollView.adjustedContentInset.top))
+            {
+                [self managePullToKick:scrollView];
+            }
+            
+            // Trigger inconspicuous pagination when user scrolls toward the top
+            if (scrollView.contentOffset.y < _paginationThreshold)
+            {
+                [self triggerPagination:_paginationLimit direction:MXTimelineDirectionBackwards];
+            }
+            // Enable forwards pagination when displaying non live timeline
+            else if (!roomDataSource.isLive && !wasScrollingToBottom && ((scrollView.contentSize.height - scrollView.contentOffset.y - scrollView.frame.size.height) < _paginationThreshold))
+            {
+                [self triggerPagination:_paginationLimit direction:MXTimelineDirectionForwards];
+            }
+        }
+        
+        if (wasScrollingToBottom)
+        {
+            // When scrolling to the bottom is performed without animation, 'scrollViewDidEndScrollingAnimation' is not called.
+            // upateCurrentEventIdAtTableBottom must be called here (without dispatch).
+            [self updateCurrentEventIdAtTableBottom:YES];
+        }
+    }
+}
+
+#pragma mark - MXKRoomTitleViewDelegate
+
+- (void)roomTitleView:(MXKRoomTitleView*)titleView presentAlertController:(UIAlertController *)alertController
+{
+    [self dismissKeyboard];
+    [self presentViewController:alertController animated:YES completion:nil];
+}
+
+- (BOOL)roomTitleViewShouldBeginEditing:(MXKRoomTitleView*)titleView
+{
+    return YES;
+}
+
+- (void)roomTitleView:(MXKRoomTitleView*)titleView isSaving:(BOOL)saving
+{
+    if (saving)
+    {
+        [self startActivityIndicator];
+    }
+    else
+    {
+        [self stopActivityIndicator];
+    }
+}
+
+#pragma mark - MXKRoomInputToolbarViewDelegate
+
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView *)toolbarView hideStatusBar:(BOOL)isHidden
+{
+    isStatusBarHidden = isHidden;
+    
+    // Trigger status bar update
+    [self setNeedsStatusBarAppearanceUpdate];
+    
+    // Handle status bar with the historical method.
+    // TODO: remove this [UIApplication statusBarHidden] use (deprecated since iOS 9).
+    // Note: setting statusBarHidden does nothing if your application is using the default UIViewController-based status bar system.
+    UIApplication *sharedApplication = [UIApplication performSelector:@selector(sharedApplication)];
+    if (sharedApplication)
+    {
+        sharedApplication.statusBarHidden = isHidden;
+    }
+}
+
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView isTyping:(BOOL)typing
+{
+    if (_saveProgressTextInput && roomDataSource)
+    {
+        // Store the potential message partially typed in text input
+        roomDataSource.partialTextMessage = inputToolbarView.textMessage;
+    }
+    
+    [self handleTypingNotification:typing];
+}
+
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView heightDidChanged:(CGFloat)height completion:(void (^)(BOOL finished))completion
+{
+    _roomInputToolbarContainerHeightConstraint.constant = height;
+    
+    // Update layout with animation
+    [UIView animateWithDuration:self.resizeComposerAnimationDuration delay:0 options:UIViewAnimationOptionBeginFromCurrentState | UIViewAnimationOptionCurveEaseIn
+                     animations:^{
+                         // We will scroll to bottom if the bottom of the table is currently visible
+                         BOOL shouldScrollToBottom = [self isBubblesTableScrollViewAtTheBottom];
+                         
+                         CGFloat bubblesTableViewBottomConst = self->_roomInputToolbarContainerBottomConstraint.constant + self->_roomInputToolbarContainerHeightConstraint.constant + self->_roomActivitiesContainerHeightConstraint.constant;
+                         
+                        self->_bubblesTableViewBottomConstraint.constant = bubblesTableViewBottomConst;
+                        
+                        // Force to render the view
+                        [self.view layoutIfNeeded];
+                        
+                        if (shouldScrollToBottom)
+                        {
+                            [self scrollBubblesTableViewToBottomAnimated:NO];
+                        }
+                     }
+                     completion:^(BOOL finished){
+                         if (completion)
+                         {
+                             completion(finished);
+                         }
+                     }];
+}
+
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView sendTextMessage:(NSString*)textMessage
+{
+    // Handle potential IRC commands in typed string
+    if ([self isIRCStyleCommand:textMessage] == NO)
+    {
+        // Send text message in the current room
+        [self sendTextMessage:textMessage];
+    }
+}
+
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView sendImage:(UIImage*)image
+{
+    // Let the datasource send it and manage the local echo
+    [roomDataSource sendImage:image success:nil failure:^(NSError *error)
+    {
+        // Nothing to do. The image is marked as unsent in the room history by the datasource
+        MXLogDebug(@"[MXKRoomViewController] sendImage failed.");
+    }];
+}
+
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView sendImage:(NSData*)imageData withMimeType:(NSString*)mimetype
+{
+    // Let the datasource send it and manage the local echo
+    [roomDataSource sendImage:imageData mimeType:mimetype success:nil failure:^(NSError *error)
+    {
+        // Nothing to do. The image is marked as unsent in the room history by the datasource
+        MXLogDebug(@"[MXKRoomViewController] sendImage with mimetype failed.");
+    }];
+}
+
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView sendVideo:(NSURL*)videoLocalURL withThumbnail:(UIImage*)videoThumbnail
+{
+    AVURLAsset *videoAsset = [AVURLAsset assetWithURL:videoLocalURL];
+    [self roomInputToolbarView:toolbarView sendVideoAsset:videoAsset withThumbnail:videoThumbnail];
+}
+
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView sendVideoAsset:(AVAsset*)videoAsset withThumbnail:(UIImage*)videoThumbnail
+{
+    // Let the datasource send it and manage the local echo
+    [roomDataSource sendVideoAsset:videoAsset withThumbnail:videoThumbnail success:nil failure:^(NSError *error)
+    {
+        // Nothing to do. The video is marked as unsent in the room history by the datasource
+        MXLogDebug(@"[MXKRoomViewController] sendVideo failed.");
+    }];
+}
+
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView sendFile:(NSURL *)fileLocalURL withMimeType:(NSString*)mimetype
+{
+    // Let the datasource send it and manage the local echo
+    [roomDataSource sendFile:fileLocalURL mimeType:mimetype success:nil failure:^(NSError *error)
+     {
+         // Nothing to do. The file is marked as unsent in the room history by the datasource
+         MXLogDebug(@"[MXKRoomViewController] sendFile failed.");
+     }];
+}
+
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView presentAlertController:(UIAlertController *)alertController
+{
+    [self dismissKeyboard];
+    [self presentViewController:alertController animated:YES completion:nil];
+}
+
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView presentViewController:(UIViewController*)viewControllerToPresent
+{
+    [self dismissKeyboard];
+    [self presentViewController:viewControllerToPresent animated:YES completion:nil];
+}
+
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView dismissViewControllerAnimated:(BOOL)flag completion:(void (^)(void))completion
+{
+    [self dismissViewControllerAnimated:flag completion:completion];
+}
+
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView updateActivityIndicator:(BOOL)isAnimating
+{
+    isInputToolbarProcessing = isAnimating;
+    
+    if (isAnimating)
+    {
+        [self startActivityIndicator];
+    }
+    else
+    {
+        [self stopActivityIndicator];
+    }
+}
+# pragma mark - Typing notification
+
+- (void)handleTypingNotification:(BOOL)typing
+{
+    NSUInteger notificationTimeoutMS = -1;
+    if (typing)
+    {
+        // Check whether a typing event has been already reported to server (We wait for the end of the local timout before considering this new event)
+        if (typingTimer)
+        {
+            // Refresh date of the last observed typing
+            lastTypingDate = [[NSDate alloc] init];
+            return;
+        }
+        
+        // No typing event has been yet reported -> share encryption keys if requested
+        if ([MXKAppSettings standardAppSettings].outboundGroupSessionKeyPreSharingStrategy == MXKKeyPreSharingWhenTyping)
+        {
+            [self shareEncryptionKeys];
+        }
+        
+        // Launch a timer to prevent sending multiple typing notifications
+        NSTimeInterval timerTimeout = MXKROOMVIEWCONTROLLER_DEFAULT_TYPING_TIMEOUT_SEC;
+        if (lastTypingDate)
+        {
+            NSTimeInterval lastTypingAge = -[lastTypingDate timeIntervalSinceNow];
+            if (lastTypingAge < timerTimeout)
+            {
+                // Subtract the time interval since last typing from the timer timeout
+                timerTimeout -= lastTypingAge;
+            }
+            else
+            {
+                timerTimeout = 0;
+            }
+        }
+        else
+        {
+            // Keep date of this typing event
+            lastTypingDate = [[NSDate alloc] init];
+        }
+        
+        if (timerTimeout)
+        {
+            typingTimer = [NSTimer scheduledTimerWithTimeInterval:timerTimeout target:self selector:@selector(typingTimeout:) userInfo:self repeats:NO];
+            // Compute the notification timeout in ms (consider the double of the local typing timeout)
+            notificationTimeoutMS = 2000 * MXKROOMVIEWCONTROLLER_DEFAULT_TYPING_TIMEOUT_SEC;
+        }
+        else
+        {
+            // This typing event is too old, we will ignore it
+            typing = NO;
+            MXLogDebug(@"[MXKRoomVC] Ignore typing event (too old)");
+        }
+    }
+    else
+    {
+        // Cancel any typing timer
+        [typingTimer invalidate];
+        typingTimer = nil;
+        // Reset last typing date
+        lastTypingDate = nil;
+    }
+    
+    MXWeakify(self);
+    
+    // Send typing notification to server
+    [roomDataSource.room sendTypingNotification:typing
+                                        timeout:notificationTimeoutMS
+                                        success:^{
+        
+        MXStrongifyAndReturnIfNil(self);
+                                            // Reset last typing date
+                                            self->lastTypingDate = nil;
+                                        } failure:^(NSError *error)
+    {
+        MXStrongifyAndReturnIfNil(self);
+        
+        MXLogDebug(@"[MXKRoomVC] Failed to send typing notification (%d)", typing);
+        
+        // Cancel timer (if any)
+        [self->typingTimer invalidate];
+        self->typingTimer = nil;
+    }];
+}
+
+- (IBAction)typingTimeout:(id)sender
+{
+    [typingTimer invalidate];
+    typingTimer = nil;
+    
+    // Check whether a new typing event has been observed
+    BOOL typing = (lastTypingDate != nil);
+    // Post a new typing notification
+    [self handleTypingNotification:typing];
+}
+
+
+# pragma mark - Attachment handling
+
+- (void)showAttachmentInCell:(UITableViewCell*)cell
+{
+    [self dismissKeyboard];
+
+    // Retrieve the attachment information from the associated cell data
+    if ([cell isKindOfClass:MXKTableViewCell.class])
+    {
+        MXKCellData *cellData = ((MXKTableViewCell*)cell).mxkCellData;
+
+        // Only 'MXKRoomBubbleCellData' is supported here for the moment.
+        if ([cellData isKindOfClass:MXKRoomBubbleCellData.class])
+        {
+            MXKRoomBubbleCellData *bubbleData = (MXKRoomBubbleCellData*)cellData;
+            
+            MXKAttachment *selectedAttachment = bubbleData.attachment;
+            
+            if (bubbleData.isAttachmentWithThumbnail)
+            {
+                // The attachments viewer is opened only on a valid attachment. It does not display the stickers.
+                if (selectedAttachment.eventSentState == MXEventSentStateSent && selectedAttachment.type != MXKAttachmentTypeSticker)
+                {
+                    // Note: the stickers are presently excluded from the attachments list returned by the room dataSource.
+                    NSArray *attachmentsWithThumbnail = self.roomDataSource.attachmentsWithThumbnail;
+                    
+                    MXKAttachmentsViewController *attachmentsViewer;
+                    
+                    // Present an attachment viewer
+                    if (attachmentsViewerClass)
+                    {
+                        attachmentsViewer = [attachmentsViewerClass animatedAttachmentsViewControllerWithSourceViewController:self];
+                    }
+                    else
+                    {
+                        attachmentsViewer = [MXKAttachmentsViewController animatedAttachmentsViewControllerWithSourceViewController:self];
+                    }
+                    
+                    attachmentsViewer.delegate = self;
+                    attachmentsViewer.complete = ([roomDataSource.timeline canPaginate:MXTimelineDirectionBackwards] == NO);
+                    attachmentsViewer.hidesBottomBarWhenPushed = YES;
+                    [attachmentsViewer displayAttachments:attachmentsWithThumbnail focusOn:selectedAttachment.eventId];
+                    
+                    // Keep here the image view used to display the attachment in the selected cell.
+                    // Note: Only `MXKRoomBubbleTableViewCell` and `MXKSearchTableViewCell` are supported for the moment.
+                    if ([cell isKindOfClass:MXKRoomBubbleTableViewCell.class])
+                    {
+                        self.openedAttachmentImageView = ((MXKRoomBubbleTableViewCell *)cell).attachmentView.imageView;
+                    }
+                    else if ([cell isKindOfClass:MXKSearchTableViewCell.class])
+                    {
+                        self.openedAttachmentImageView = ((MXKSearchTableViewCell *)cell).attachmentImageView.imageView;
+                    }
+                    
+                    self.openedAttachmentEventId = selectedAttachment.eventId;
+                    
+                    // "Initializing" closedAttachmentEventId so it is equal to openedAttachmentEventId at the beginning
+                    self.closedAttachmentEventId = self.openedAttachmentEventId;
+                    
+                    if (@available(iOS 13.0, *))
+                    {
+                        attachmentsViewer.modalPresentationStyle = UIModalPresentationFullScreen;
+                    }
+                    
+                    [self presentViewController:attachmentsViewer animated:YES completion:nil];
+                    
+                    self.attachmentsViewer = attachmentsViewer;
+                }
+                else
+                {
+                    // Let's the application do something
+                    MXLogDebug(@"[MXKRoomVC] showAttachmentInCell on an unsent media");
+                }
+            }
+            else if (selectedAttachment.type == MXKAttachmentTypeLocation)
+            {
+            }
+            else if (selectedAttachment.type == MXKAttachmentTypeFile || selectedAttachment.type == MXKAttachmentTypeAudio)
+            {
+                // Start activity indicator as feedback on file selection.
+                [self startActivityIndicator];
+                
+                [selectedAttachment prepareShare:^(NSURL *fileURL) {
+                    
+                    [self stopActivityIndicator];
+
+                    MXWeakify(self);
+                    void(^viewAttachment)(void) = ^() {
+                        
+                        MXStrongifyAndReturnIfNil(self);
+                        
+                        if (![self canPreviewFileAttachment:selectedAttachment withLocalFileURL:fileURL])
+                        {
+                            // When we don't support showing a preview for a file, show a share
+                            // sheet if allowed, otherwise display an error to inform the user.
+                            if (self.allowActionsInDocumentPreview)
+                            {
+                                UIActivityViewController *shareSheet = [[UIActivityViewController alloc] initWithActivityItems:@[fileURL]
+                                                                                                         applicationActivities:nil];
+                                MXWeakify(self);
+                                shareSheet.completionWithItemsHandler = ^(UIActivityType activityType, BOOL completed, NSArray *returnedItems, NSError *activityError) {
+                                    MXStrongifyAndReturnIfNil(self);
+                                    [selectedAttachment onShareEnded];
+                                    self->currentSharedAttachment = nil;
+                                };
+                                
+                                self->currentSharedAttachment = selectedAttachment;
+                                [self presentViewController:shareSheet animated:YES completion:nil];
+                            }
+                            else
+                            {
+                                UIAlertController *alert = [UIAlertController alertControllerWithTitle:MatrixKitL10n.attachmentUnsupportedPreviewTitle
+                                                                                               message:MatrixKitL10n.attachmentUnsupportedPreviewMessage
+                                                                                        preferredStyle:UIAlertControllerStyleAlert];
+                                MXWeakify(self);
+                                [alert addAction:[UIAlertAction actionWithTitle:MatrixKitL10n.ok style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
+                                    MXStrongifyAndReturnIfNil(self);
+                                    [selectedAttachment onShareEnded];
+                                    self->currentAlert = nil;
+                                }]];
+
+                                [self presentViewController:alert animated:YES completion:nil];
+                                self->currentAlert = alert;
+                            }
+                            
+                            return;
+                        }
+
+                        if (self.allowActionsInDocumentPreview)
+                        {
+                            // We could get rid of this part of code and use only a MXKPreviewViewController
+                            // Nevertheless, MXKRoomViewController is compliant to UIDocumentInteractionControllerDelegate
+                            // and remove all this code could have effect on some custom implementations.
+                            self->documentInteractionController = [UIDocumentInteractionController interactionControllerWithURL:fileURL];
+                            [self->documentInteractionController setDelegate:self];
+                            self->currentSharedAttachment = selectedAttachment;
+
+                            if (![self->documentInteractionController presentPreviewAnimated:YES])
+                            {
+                                if (![self->documentInteractionController presentOptionsMenuFromRect:self.view.frame inView:self.view animated:YES])
+                                {
+                                    self->documentInteractionController = nil;
+                                    [selectedAttachment onShareEnded];
+                                    self->currentSharedAttachment = nil;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            self->currentSharedAttachment = selectedAttachment;
+                            [MXKPreviewViewController presentFrom:self fileUrl:fileURL allowActions:self.allowActionsInDocumentPreview delegate:self];
+                        }
+                    };
+
+                    if (self->roomDataSource.mxSession.crypto
+                        && [selectedAttachment.contentInfo[@"mimetype"] isEqualToString:@"text/plain"]
+                        && [MXMegolmExportEncryption isMegolmKeyFile:fileURL])
+                    {
+                        // The file is a megolm key file
+                        // Ask the user if they wants to view the file as a classic file attachment
+                        // or open an import process
+                        [self->currentAlert dismissViewControllerAnimated:NO completion:nil];
+
+                        __weak typeof(self) weakSelf = self;
+                        UIAlertController *keysPrompt = [UIAlertController alertControllerWithTitle:@""
+                                                                                            message:[MatrixKitL10n attachmentE2eKeysFilePrompt]
+                                                                                     preferredStyle:UIAlertControllerStyleAlert];
+                        
+                        [keysPrompt addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n view]
+                                                                       style:UIAlertActionStyleDefault
+                                                                     handler:^(UIAlertAction * action) {
+                                                                           
+                                                                           // View file content
+                                                                           if (weakSelf)
+                                                                           {
+                                                                               typeof(self) self = weakSelf;
+                                                                               self->currentAlert = nil;
+                                                                               
+                                                                               viewAttachment();
+                                                                           }
+                                                                           
+                                                                       }]];
+                        
+                        [keysPrompt addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n attachmentE2eKeysImport]
+                                                                       style:UIAlertActionStyleDefault
+                                                                     handler:^(UIAlertAction * action) {
+                                                                           
+                                                                           if (weakSelf)
+                                                                           {
+                                                                               typeof(self) self = weakSelf;
+                                                                               self->currentAlert = nil;
+                                                                               
+                                                                               // Show the keys import dialog
+                                                                               self->importView = [[MXKEncryptionKeysImportView alloc] initWithMatrixSession:self->roomDataSource.mxSession];
+                                                                               self->currentAlert = self->importView.alertController;
+                                                                               [self->importView showInViewController:self toImportKeys:fileURL onComplete:^{
+                                                                                   
+                                                                                   if (weakSelf)
+                                                                                   {
+                                                                                       typeof(self) self = weakSelf;
+                                                                                       self->currentAlert = nil;
+                                                                                       self->importView = nil;
+                                                                                   }
+                                                                                   
+                                                                               }];
+                                                                           }
+                                                                           
+                                                                       }]];
+                        
+                        [self presentViewController:keysPrompt animated:YES completion:nil];
+                        self->currentAlert = keysPrompt;
+                    }
+                    else
+                    {
+                        viewAttachment();
+                    }
+
+                } failure:^(NSError *error) {
+                    
+                    [self stopActivityIndicator];
+                    
+                    // Notify MatrixKit user
+                    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error];
+                    
+                }];
+                
+                if ([cell isKindOfClass:MXKRoomBubbleTableViewCell.class])
+                {
+                    // Start animation in case of download
+                    MXKRoomBubbleTableViewCell *roomBubbleTableViewCell = (MXKRoomBubbleTableViewCell *)cell;
+                    [roomBubbleTableViewCell startProgressUI];
+                }
+            }
+        }
+    }
+}
+
+- (BOOL)canPreviewFileAttachment:(MXKAttachment *)attachment withLocalFileURL:(NSURL *)localFileURL
+{
+    // Sanity check.
+    if (![NSFileManager.defaultManager isReadableFileAtPath:localFileURL.path])
+    {
+        return NO;
+    }
+    
+    if (UIDevice.currentDevice.systemVersion.floatValue >= 13)
+    {
+        return YES;
+    }
+    
+    MXKUTI *attachmentUTI = attachment.uti;
+    MXKUTI *fileUTI = [[MXKUTI alloc] initWithLocalFileURL:localFileURL];
+    if (!attachmentUTI || !fileUTI)
+    {
+        return NO;
+    }
+    
+    NSArray<MXKUTI *> *unsupportedUTIs = @[MXKUTI.html, MXKUTI.xml, MXKUTI.svg];
+    if ([attachmentUTI conformsToAnyOf:unsupportedUTIs] || [fileUTI conformsToAnyOf:unsupportedUTIs])
+    {
+        return NO;
+    }
+    
+    return YES;
+}
+
+#pragma mark - MXKAttachmentsViewControllerDelegate
+
+- (BOOL)attachmentsViewController:(MXKAttachmentsViewController*)attachmentsViewController paginateAttachmentBefore:(NSString*)eventId
+{
+    [self triggerAttachmentBackPagination:eventId];
+    
+    return [self.roomDataSource.timeline canPaginate:MXTimelineDirectionBackwards];
+}
+
+- (void)displayedNewAttachmentWithEventId:(NSString *)eventId {
+    self.closedAttachmentEventId = eventId;
+}
+
+#pragma mark - MXKRoomActivitiesViewDelegate
+
+- (void)didChangeHeight:(MXKRoomActivitiesView *)roomActivitiesView oldHeight:(CGFloat)oldHeight newHeight:(CGFloat)newHeight
+{
+    // We will scroll to bottom if the bottom of the table is currently visible
+    BOOL shouldScrollToBottom = [self isBubblesTableScrollViewAtTheBottom];
+
+    // Apply height change to constraints 
+    _roomActivitiesContainerHeightConstraint.constant = newHeight;
+    _bubblesTableViewBottomConstraint.constant += newHeight - oldHeight;
+
+    // Force to render the view
+    [self.view layoutIfNeeded];
+
+    if (shouldScrollToBottom)
+    {
+        [self scrollBubblesTableViewToBottomAnimated:YES];
+    }
+}
+
+#pragma mark - MXKPreviewViewControllerDelegate
+
+- (void)previewViewControllerDidEndPreview:(MXKPreviewViewController *)controller
+{
+    if (currentSharedAttachment)
+    {
+        [currentSharedAttachment onShareEnded];
+        currentSharedAttachment = nil;
+    }
+}
+
+#pragma mark - UIDocumentInteractionControllerDelegate
+
+- (UIViewController *)documentInteractionControllerViewControllerForPreview: (UIDocumentInteractionController *) controller
+{
+    return self;
+}
+
+// Preview presented/dismissed on document.  Use to set up any HI underneath.
+- (void)documentInteractionControllerWillBeginPreview:(UIDocumentInteractionController *)controller
+{
+    documentInteractionController = controller;
+}
+
+- (void)documentInteractionControllerDidEndPreview:(UIDocumentInteractionController *)controller
+{
+    documentInteractionController = nil;
+    if (currentSharedAttachment)
+    {
+        [currentSharedAttachment onShareEnded];
+        currentSharedAttachment = nil;
+    }
+}
+
+- (void)documentInteractionControllerDidDismissOptionsMenu:(UIDocumentInteractionController *)controller
+{
+    documentInteractionController = nil;
+    if (currentSharedAttachment)
+    {
+        [currentSharedAttachment onShareEnded];
+        currentSharedAttachment = nil;
+    }
+}
+
+- (void)documentInteractionControllerDidDismissOpenInMenu:(UIDocumentInteractionController *)controller
+{
+    documentInteractionController = nil;
+    if (currentSharedAttachment)
+    {
+        [currentSharedAttachment onShareEnded];
+        currentSharedAttachment = nil;
+    }
+}
+
+#pragma mark - resync management
+
+- (void)onSyncNotification
+{
+    latestServerSync = [NSDate date];
+    [self removeReconnectingView];
+}
+
+- (BOOL)canReconnect
+{
+    // avoid restarting connection if some data has been received within 1 second (1000 : latestServerSync is null)
+    NSTimeInterval interval = latestServerSync ? [[NSDate date] timeIntervalSinceDate:latestServerSync] : 1000;
+    return  (interval > 1) && [self.mainSession reconnect];
+}
+
+- (void)addReconnectingView
+{
+    if (!reconnectingView)
+    {
+        UIActivityIndicatorView* spinner  = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
+        [spinner sizeToFit];
+        spinner.hidesWhenStopped = NO;
+        spinner.backgroundColor = [UIColor clearColor];
+        [spinner startAnimating];
+        
+        // no need to manage constraints here
+        // IOS defines them.
+        // since IOS7 the spinner is centered so need to create a background and add it.
+        _bubblesTableView.tableFooterView = reconnectingView = spinner;
+    }
+}
+
+- (void)removeReconnectingView
+{
+    if (reconnectingView && !restartConnection)
+    {
+        _bubblesTableView.tableFooterView = reconnectingView = nil;
+    }
+}
+
+/**
+ Detect if the current connection must be restarted.
+ The spinner is displayed until the overscroll ends (and scrollViewDidEndDecelerating is called).
+ */
+- (void)detectPullToKick:(UIScrollView *)scrollView
+{
+    if (roomDataSource.isLive && !reconnectingView)
+    {
+        // detect if the user scrolls over the tableview bottom
+        restartConnection = (
+                             ((scrollView.contentSize.height < scrollView.frame.size.height) && (scrollView.contentOffset.y > 128))
+                             ||
+                             ((scrollView.contentSize.height > scrollView.frame.size.height) &&  (scrollView.contentOffset.y + scrollView.frame.size.height) > (scrollView.contentSize.height + 128)));
+        
+        if (restartConnection)
+        {
+            // wait that list decelerate to display / hide it
+            [self addReconnectingView];
+        }
+    }
+}
+
+
+/**
+ Restarts the current connection if it is required.
+ The 0.3s delay is added to avoid flickering if the connection does not require to be restarted.
+ */
+- (void)managePullToKick:(UIScrollView *)scrollView
+{
+    // the current connection must be restarted
+    if (roomDataSource.isLive && restartConnection)
+    {
+        // display at least 0.3s the spinner to show to the user that something is pending
+        // else the UI is flickering
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.3 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+            self->restartConnection = NO;
+            
+            if (![self canReconnect])
+            {
+                // if the event stream has not been restarted
+                // hide the spinner
+                [self removeReconnectingView];
+            }
+            // else wait that onSyncNotification is called.
+        });
+    }
+}
+
+#pragma mark - MXKSourceAttachmentAnimatorDelegate
+
+- (UIImageView *)originalImageView {
+    if ([self.openedAttachmentEventId isEqualToString:self.closedAttachmentEventId]) {
+        return self.openedAttachmentImageView;
+    }
+    return nil;
+}
+
+
+- (CGRect)convertedFrameForOriginalImageView {
+    if ([self.openedAttachmentEventId isEqualToString:self.closedAttachmentEventId]) {
+        return [self.openedAttachmentImageView convertRect:self.openedAttachmentImageView.frame toView:nil];
+    }
+    //default frame which will be used if the user scrolls to other attachments in MXKAttachmentsViewController
+    return CGRectMake(CGRectGetWidth(self.view.frame)/2, 0.0, 0.0, 0.0);
+}
+
+#pragma mark - Encryption key sharing
+
+- (void)shareEncryptionKeys
+{
+    __block NSString *roomId = roomDataSource.roomId;
+    [roomDataSource.mxSession.crypto ensureEncryptionInRoom:roomId success:^{
+        MXLogDebug(@"[MXKRoomViewController] Key shared for room: %@", roomId);
+    } failure:^(NSError *error) {
+        MXLogDebug(@"[MXKRoomViewController] Failed to share key for room %@: %@", roomId, error);
+    }];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKRoomViewController.xib b/Riot/Modules/MatrixKit/Controllers/MXKRoomViewController.xib
new file mode 100644
index 000000000..1ad5d0650
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKRoomViewController.xib
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MXKRoomViewController">
+            <connections>
+                <outlet property="bubblesTableView" destination="BGD-sd-SQR" id="OG4-Tw-Ovt"/>
+                <outlet property="bubblesTableViewBottomConstraint" destination="Ksk-39-kfi" id="CTo-Ux-4NP"/>
+                <outlet property="bubblesTableViewTopConstraint" destination="X14-4s-uGM" id="Hic-6h-N05"/>
+                <outlet property="roomActivitiesContainer" destination="XX4-n6-hCm" id="uD0-ab-8s8"/>
+                <outlet property="roomActivitiesContainerHeightConstraint" destination="E8v-l2-8eV" id="ebD-oV-ttx"/>
+                <outlet property="roomInputToolbarContainer" destination="nLd-BP-JAE" id="1dp-P1-0js"/>
+                <outlet property="roomInputToolbarContainerBottomConstraint" destination="kQ6-Cg-FMi" id="nHr-fR-XnV"/>
+                <outlet property="roomInputToolbarContainerHeightConstraint" destination="5eD-Fm-RDb" id="6ny-5w-1UA"/>
+                <outlet property="view" destination="iN0-l3-epB" id="ieV-u7-rXU"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" style="plain" separatorStyle="none" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="BGD-sd-SQR">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="626"/>
+                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                </tableView>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XX4-n6-hCm" userLabel="Activities Container">
+                    <rect key="frame" x="0.0" y="606" width="375" height="20"/>
+                    <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="20" id="E8v-l2-8eV"/>
+                    </constraints>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nLd-BP-JAE" userLabel="Room Input Toolbar Container">
+                    <rect key="frame" x="0.0" y="626" width="375" height="41"/>
+                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="41" id="5eD-Fm-RDb"/>
+                    </constraints>
+                </view>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="BGD-sd-SQR" secondAttribute="trailing" id="0la-ok-MBr"/>
+                <constraint firstItem="nLd-BP-JAE" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="4Q7-hr-rqi"/>
+                <constraint firstAttribute="bottom" secondItem="BGD-sd-SQR" secondAttribute="bottom" constant="41" id="Ksk-39-kfi"/>
+                <constraint firstItem="XX4-n6-hCm" firstAttribute="bottom" secondItem="nLd-BP-JAE" secondAttribute="top" id="QO8-nF-xys"/>
+                <constraint firstItem="XX4-n6-hCm" firstAttribute="width" secondItem="iN0-l3-epB" secondAttribute="width" id="WhE-lH-ZtR"/>
+                <constraint firstItem="BGD-sd-SQR" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="X14-4s-uGM"/>
+                <constraint firstAttribute="trailing" secondItem="nLd-BP-JAE" secondAttribute="trailing" id="YAu-gd-ItG"/>
+                <constraint firstItem="XX4-n6-hCm" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="csl-KT-4s9"/>
+                <constraint firstItem="BGD-sd-SQR" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="haP-Kv-OLI"/>
+                <constraint firstAttribute="bottom" secondItem="nLd-BP-JAE" secondAttribute="bottom" id="kQ6-Cg-FMi"/>
+            </constraints>
+            <nil key="simulatedStatusBarMetrics"/>
+        </view>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKSearchViewController.h b/Riot/Modules/MatrixKit/Controllers/MXKSearchViewController.h
new file mode 100644
index 000000000..b07abb50d
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKSearchViewController.h
@@ -0,0 +1,75 @@
+/*
+Copyright 2015 OpenMarket 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/UIKit.h>
+
+#import "MXKViewController.h"
+
+#import "MXKSearchDataSource.h"
+
+/**
+ This view controller handles search server side. Only one matrix session is handled by this view controller.
+ 
+ According to its dataSource configuration the search can be done all user's rooms or a set of rooms.
+ */
+@interface MXKSearchViewController : MXKViewController <UITableViewDelegate, MXKDataSourceDelegate, UISearchBarDelegate>
+
+@property (weak, nonatomic) IBOutlet UISearchBar *searchSearchBar;
+@property (weak, nonatomic) IBOutlet UITableView *searchTableView;
+@property (weak, nonatomic) IBOutlet UILabel *noResultsLabel;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *searchSearchBarTopConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *searchSearchBarHeightConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *searchTableViewBottomConstraint;
+
+/**
+ The current data source associated to the view controller.
+ */
+@property (nonatomic, readonly) MXKSearchDataSource *dataSource;
+
+/**
+ Enable the search option by adding a navigation item in the navigation bar (YES by default).
+ Set NO this property to disable this option and hide the related bar button.
+ */
+@property (nonatomic) BOOL enableBarButtonSearch;
+
+/**
+ If YES, the table view will scroll at the bottom on the next data source refresh.
+ It comes back to NO after each refresh.
+ */
+@property (nonatomic) BOOL shouldScrollToBottomOnRefresh;
+
+
+#pragma mark - Class methods
+
+/**
+ Creates and returns a new `MXKSearchViewController` object.
+ 
+ @discussion This is the designated initializer for programmatic instantiation.
+ @return An initialized `MXKSearchViewController` object if successful, `nil` otherwise.
+ */
++ (instancetype)searchViewController;
+
+/**
+ Display the search results described in the provided data source.
+ 
+ Note: The provided data source replaces the current data source if any. The current
+ data source is released.
+
+ @param searchDataSource the data source providing the search results.
+ */
+- (void)displaySearch:(MXKSearchDataSource*)searchDataSource;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKSearchViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKSearchViewController.m
new file mode 100644
index 000000000..7ac637b33
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKSearchViewController.m
@@ -0,0 +1,423 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKSearchViewController.h"
+
+#import "MXKSearchTableViewCell.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKSwiftHeader.h"
+
+@interface MXKSearchViewController ()
+{
+    /**
+     Optional bar buttons
+     */
+    UIBarButtonItem *searchBarButton;
+
+    /**
+     Search handling
+     */
+    BOOL ignoreSearchRequest;
+}
+@end
+
+@implementation MXKSearchViewController
+@synthesize dataSource, shouldScrollToBottomOnRefresh;
+
+#pragma mark - Class methods
+
++ (UINib *)nib
+{
+    return [UINib nibWithNibName:NSStringFromClass([MXKSearchViewController class])
+                          bundle:[NSBundle bundleForClass:[MXKSearchViewController class]]];
+}
+
++ (instancetype)searchViewController
+{
+    return [[[self class] alloc] initWithNibName:NSStringFromClass([MXKSearchViewController class])
+                                          bundle:[NSBundle bundleForClass:[MXKSearchViewController class]]];
+}
+
+#pragma mark -
+
+- (void)finalizeInit
+{
+    [super finalizeInit];
+    
+    _enableBarButtonSearch = YES;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    // Check whether the view controller has been pushed via storyboard
+    if (!_searchTableView)
+    {
+        // Instantiate view controller objects
+        [[[self class] nib] instantiateWithOwner:self options:nil];
+    }
+
+    // Adjust Top and Bottom constraints to take into account potential navBar and tabBar.
+    [NSLayoutConstraint deactivateConstraints:@[_searchSearchBarTopConstraint, _searchTableViewBottomConstraint]];
+
+    _searchSearchBarTopConstraint = [NSLayoutConstraint constraintWithItem:self.topLayoutGuide
+                                                                  attribute:NSLayoutAttributeBottom
+                                                                  relatedBy:NSLayoutRelationEqual
+                                                                     toItem:self.searchSearchBar
+                                                                  attribute:NSLayoutAttributeTop
+                                                                 multiplier:1.0f
+                                                                   constant:0.0f];
+
+    _searchTableViewBottomConstraint = [NSLayoutConstraint constraintWithItem:self.bottomLayoutGuide
+                                                                     attribute:NSLayoutAttributeTop
+                                                                     relatedBy:NSLayoutRelationEqual
+                                                                        toItem:self.searchTableView
+                                                                     attribute:NSLayoutAttributeBottom
+                                                                    multiplier:1.0f
+                                                                      constant:0.0f];
+
+    [NSLayoutConstraint activateConstraints:@[_searchSearchBarTopConstraint, _searchTableViewBottomConstraint]];
+
+    // Hide search bar by default
+    self.searchSearchBar.hidden = YES;
+    self.searchSearchBarHeightConstraint.constant = 0;
+    [self.view setNeedsUpdateConstraints];
+
+    self.noResultsLabel.text = [MatrixKitL10n searchNoResults];
+    self.noResultsLabel.hidden = YES;
+
+    searchBarButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSearch target:self action:@selector(showSearchBar:)];
+
+    // Apply search option in navigation bar
+    self.enableBarButtonSearch = _enableBarButtonSearch;
+
+    // Finalize table view configuration
+    _searchTableView.delegate = self;
+    _searchTableView.dataSource = dataSource; // Note: dataSource may be nil here
+
+    // Set up classes to use for cells
+    [self.searchTableView registerNib:MXKSearchTableViewCell.nib forCellReuseIdentifier:MXKSearchTableViewCell.defaultReuseIdentifier];
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+
+    // Restore search mechanism (if enabled)
+    ignoreSearchRequest = NO;
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+
+    // The user may still press search button whereas the view disappears
+    ignoreSearchRequest = YES;
+}
+
+
+#pragma mark - Override MXKViewController
+
+- (void)onKeyboardShowAnimationComplete
+{
+    // Report the keyboard view in order to track keyboard frame changes
+    self.keyboardView = _searchSearchBar.inputAccessoryView.superview;
+}
+
+- (void)setKeyboardHeight:(CGFloat)keyboardHeight
+{
+    // Deduce the bottom constraint for the table view (Don't forget the potential tabBar)
+    CGFloat tableViewBottomConst = keyboardHeight - self.bottomLayoutGuide.length;
+    // Check whether the keyboard is over the tabBar
+    if (tableViewBottomConst < 0)
+    {
+        tableViewBottomConst = 0;
+    }
+
+    // Update constraints
+    _searchTableViewBottomConstraint.constant = tableViewBottomConst;
+
+    // Force layout immediately to take into account new constraint
+    [self.view layoutIfNeeded];
+}
+
+- (void)destroy
+{
+    _searchTableView.dataSource = nil;
+    _searchTableView.delegate = nil;
+    _searchTableView = nil;
+
+    dataSource.delegate = nil;
+    [dataSource destroy];
+    dataSource = nil;
+    
+    [super destroy];
+}
+
+#pragma mark -
+
+- (void)displaySearch:(MXKSearchDataSource*)searchDataSource
+{
+    // Cancel registration on existing dataSource if any
+    if (dataSource)
+    {
+        dataSource.delegate = nil;
+        
+        // Remove associated matrix sessions
+        [self removeMatrixSession:dataSource.mxSession];
+        
+        [dataSource destroy];
+    }
+
+    dataSource = searchDataSource;
+    dataSource.delegate = self;
+    
+    // Report the related matrix sessions at view controller level to update UI according to sessions state
+    [self addMatrixSession:searchDataSource.mxSession];
+
+    if (_searchTableView)
+    {
+        // Set up table data source
+        _searchTableView.dataSource = dataSource;
+    }
+}
+
+
+#pragma mark - UIBarButton handling
+
+- (void)setEnableBarButtonSearch:(BOOL)enableBarButtonSearch
+{
+    _enableBarButtonSearch = enableBarButtonSearch;
+    [self refreshUIBarButtons];
+}
+
+- (void)refreshUIBarButtons
+{
+    if (_enableBarButtonSearch)
+    {
+        self.navigationItem.rightBarButtonItems = @[searchBarButton];
+    }
+    else
+    {
+        self.navigationItem.rightBarButtonItems = nil;
+    }
+}
+
+#pragma mark - MXKDataSourceDelegate
+
+- (Class<MXKCellRendering>)cellViewClassForCellData:(MXKCellData*)cellData
+{
+    return MXKSearchTableViewCell.class;
+}
+
+- (NSString *)cellReuseIdentifierForCellData:(MXKCellData*)cellData
+{
+    return MXKSearchTableViewCell.defaultReuseIdentifier;
+}
+
+- (void)dataSource:(MXKDataSource *)dataSource didCellChange:(id)changes
+{
+    __block CGPoint tableViewOffset;
+    
+    if (!shouldScrollToBottomOnRefresh)
+    {
+        // Store current tableview scrolling point to restore it after [UITableView reloadData]
+        // This avoids unexpected scrolling for the user
+        tableViewOffset = _searchTableView.contentOffset;
+    }
+
+    [_searchTableView reloadData];
+
+    if (shouldScrollToBottomOnRefresh)
+    {
+        [self scrollToBottomAnimated:NO];
+        shouldScrollToBottomOnRefresh = NO;
+    }
+    else
+    {
+        // Restore the user scrolling point by computing the offset introduced by new cells
+        // New cells are always introduced at the top of the table
+        NSIndexSet *insertedIndexes = (NSIndexSet*)changes;
+
+        // Get each new cell height
+        [insertedIndexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL * _Nonnull stop) {
+
+            MXKCellData* cellData = [self.dataSource cellDataAtIndex:idx];
+            Class<MXKCellRendering> class = [self cellViewClassForCellData:cellData];
+
+            tableViewOffset.y += [class heightForCellData:cellData withMaximumWidth:self->_searchTableView.frame.size.width];
+
+        }];
+
+        [_searchTableView setContentOffset:tableViewOffset animated:NO];
+    }
+
+    self.title = [NSString stringWithFormat:@"%@ (%tu)", self.dataSource.searchText, self.dataSource.serverCount];
+}
+
+- (void)dataSource:(MXKDataSource*)dataSource2 didStateChange:(MXKDataSourceState)state
+{
+    // MXKSearchDataSource comes back to the `MXKDataSourceStatePreparing` when searching
+    if (state == MXKDataSourceStatePreparing)
+    {
+        _noResultsLabel.hidden = YES;
+        [self startActivityIndicator];
+    }
+    else
+    {
+        [self stopActivityIndicator];
+
+        // Display "No Results" if a search is active with an empty result
+        if (dataSource.searchText.length && ![dataSource tableView:_searchTableView numberOfRowsInSection:0])
+        {
+            _noResultsLabel.hidden = NO;
+            _searchTableView.hidden = YES;
+        }
+        else
+        {
+            _noResultsLabel.hidden = YES;
+            _searchTableView.hidden = NO;
+        }
+    }
+}
+
+#pragma mark - UITableView delegate
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    MXKCellData *cellData = [dataSource cellDataAtIndex:indexPath.row];
+
+    Class<MXKCellRendering> class = [self cellViewClassForCellData:cellData];
+    return [class heightForCellData:cellData withMaximumWidth:tableView.frame.size.width];
+}
+
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    // Must be implemented at app level
+}
+
+- (void)tableView:(UITableView *)tableView didEndDisplayingCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath*)indexPath
+{
+    // Release here resources, and restore reusable cells
+    if ([cell respondsToSelector:@selector(didEndDisplay)])
+    {
+        [(id<MXKCellRendering>)cell didEndDisplay];
+    }
+}
+
+- (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset
+{
+    // Detect vertical bounce at the top of the tableview to trigger pagination
+    if (scrollView == _searchTableView)
+    {
+        // paginate ?
+        if (scrollView.contentOffset.y < -64)
+        {
+            [self triggerBackPagination];
+        }
+    }
+}
+
+#pragma mark - UISearchBarDelegate
+
+- (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar
+{
+    // "Done" key has been pressed
+    [searchBar resignFirstResponder];
+
+    // Apply filter
+    if (searchBar.text.length)
+    {
+        shouldScrollToBottomOnRefresh = YES;
+        [dataSource searchMessages:searchBar.text force:NO];
+    }
+}
+
+- (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar
+{
+    // Leave search
+    [searchBar resignFirstResponder];
+
+    self.searchSearchBar.hidden = YES;
+    self.searchSearchBarHeightConstraint.constant = 0;
+    [self.view setNeedsUpdateConstraints];
+
+    self.searchSearchBar.text = nil;
+}
+
+#pragma mark - Actions
+
+- (void)showSearchBar:(id)sender
+{
+    // The user may have pressed search button whereas the view controller was disappearing
+    if (ignoreSearchRequest)
+    {
+        return;
+    }
+
+    if (self.searchSearchBar.isHidden)
+    {
+        self.searchSearchBar.hidden = NO;
+        self.searchSearchBarHeightConstraint.constant = 44;
+        [self.view setNeedsUpdateConstraints];
+
+        [self.searchSearchBar becomeFirstResponder];
+    }
+    else
+    {
+        [self searchBarCancelButtonClicked: self.searchSearchBar];
+    }
+}
+
+#pragma mark - Private methods
+
+- (void)triggerBackPagination
+{
+    // Paginate only if possible
+    if (NO == dataSource.canPaginate)
+    {
+        return;
+    }
+
+    [dataSource paginateBack];
+}
+
+- (void)scrollToBottomAnimated:(BOOL)animated
+{
+    if (_searchTableView.contentSize.height)
+    {
+        CGFloat visibleHeight = _searchTableView.frame.size.height - _searchTableView.adjustedContentInset.top - _searchTableView.adjustedContentInset.bottom;
+        if (visibleHeight < _searchTableView.contentSize.height)
+        {
+            CGFloat wantedOffsetY = _searchTableView.contentSize.height - visibleHeight - _searchTableView.adjustedContentInset.top;
+            CGFloat currentOffsetY = _searchTableView.contentOffset.y;
+            if (wantedOffsetY != currentOffsetY)
+            {
+                [_searchTableView setContentOffset:CGPointMake(0, wantedOffsetY) animated:animated];
+            }
+        }
+        else
+        {
+            _searchTableView.contentOffset = CGPointMake(0, - _searchTableView.adjustedContentInset.top);
+        }
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKSearchViewController.xib b/Riot/Modules/MatrixKit/Controllers/MXKSearchViewController.xib
new file mode 100644
index 000000000..77a7c29f6
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKSearchViewController.xib
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MXKSearchViewController">
+            <connections>
+                <outlet property="noResultsLabel" destination="R0k-Za-T1q" id="B08-vF-6Fy"/>
+                <outlet property="searchSearchBar" destination="Zbr-9e-VZh" id="cnj-ol-yU0"/>
+                <outlet property="searchSearchBarHeightConstraint" destination="jCU-cq-2OA" id="xFA-RP-Mdl"/>
+                <outlet property="searchSearchBarTopConstraint" destination="aRg-Nz-enq" id="cKu-YM-PQP"/>
+                <outlet property="searchTableView" destination="orV-HH-88x" id="G7I-A9-ZjX"/>
+                <outlet property="searchTableViewBottomConstraint" destination="m4x-32-odR" id="F7E-uT-fJX"/>
+                <outlet property="view" destination="iN0-l3-epB" id="NUQ-LI-M61"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <searchBar contentMode="redraw" showsCancelButton="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Zbr-9e-VZh">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="44" id="jCU-cq-2OA"/>
+                    </constraints>
+                    <textInputTraits key="textInputTraits" returnKeyType="done"/>
+                    <connections>
+                        <outlet property="delegate" destination="-1" id="BNF-PO-yKJ"/>
+                    </connections>
+                </searchBar>
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="orV-HH-88x">
+                    <rect key="frame" x="0.0" y="44" width="375" height="623"/>
+                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                </tableView>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No Results" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="R0k-Za-T1q">
+                    <rect key="frame" x="15" y="60" width="375" height="21"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="21" id="RRM-CN-Pq2"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <nil key="highlightedColor"/>
+                </label>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="orV-HH-88x" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="NaR-eJ-WMj"/>
+                <constraint firstItem="R0k-Za-T1q" firstAttribute="top" secondItem="Zbr-9e-VZh" secondAttribute="bottom" constant="16" id="UC4-55-9yg"/>
+                <constraint firstItem="Zbr-9e-VZh" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="aRg-Nz-enq"/>
+                <constraint firstItem="R0k-Za-T1q" firstAttribute="trailing" secondItem="Zbr-9e-VZh" secondAttribute="trailing" constant="15" id="bvY-5p-dck"/>
+                <constraint firstItem="Zbr-9e-VZh" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="fty-XB-tTr"/>
+                <constraint firstItem="orV-HH-88x" firstAttribute="top" secondItem="Zbr-9e-VZh" secondAttribute="bottom" id="lBa-P2-Vnx"/>
+                <constraint firstAttribute="bottom" secondItem="orV-HH-88x" secondAttribute="bottom" id="m4x-32-odR"/>
+                <constraint firstItem="R0k-Za-T1q" firstAttribute="leading" secondItem="Zbr-9e-VZh" secondAttribute="leading" constant="15" id="oCw-HZ-Aqi"/>
+                <constraint firstAttribute="trailing" secondItem="Zbr-9e-VZh" secondAttribute="trailing" id="rKb-TZ-sap"/>
+                <constraint firstAttribute="trailing" secondItem="orV-HH-88x" secondAttribute="trailing" id="yBp-63-kZi"/>
+            </constraints>
+        </view>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKTableViewController.h b/Riot/Modules/MatrixKit/Controllers/MXKTableViewController.h
new file mode 100644
index 000000000..76f196626
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKTableViewController.h
@@ -0,0 +1,27 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKViewControllerHandling.h"
+
+/**
+ MXKViewController extends UITableViewController to handle requirements for
+ any matrixKit table view controllers (see MXKViewControllerHandling protocol).
+ */
+
+@interface MXKTableViewController : UITableViewController <MXKViewControllerHandling>
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKTableViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKTableViewController.m
new file mode 100644
index 000000000..383672543
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKTableViewController.m
@@ -0,0 +1,574 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2018 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 "MXKTableViewController.h"
+
+#import "UIViewController+MatrixKit.h"
+#import "MXSession+MatrixKit.h"
+
+@interface MXKTableViewController ()
+{
+    /**
+     Array of `MXSession` instances.
+     */
+    NSMutableArray *mxSessionArray;
+    
+    /**
+     Keep reference on the pushed view controllers to release them correctly
+     */
+    NSMutableArray *childViewControllers;
+}
+@end
+
+@implementation MXKTableViewController
+@synthesize defaultBarTintColor, enableBarTintColorStatusChange;
+@synthesize barTitleColor;
+@synthesize mainSession;
+@synthesize activityIndicator, rageShakeManager;
+@synthesize childViewControllers;
+
+#pragma mark -
+
+- (instancetype)initWithNibName:(nullable NSString *)nibNameOrNil bundle:(nullable NSBundle *)nibBundleOrNil
+{
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self)
+    {
+        [self finalizeInit];
+    }
+    
+    return self;
+}
+
+- (nullable instancetype)initWithCoder:(NSCoder *)aDecoder
+{
+    self = [super initWithCoder:aDecoder];
+    if (self)
+    {
+        [self finalizeInit];
+    }
+    
+    return self;
+}
+
+- (void)finalizeInit
+{
+    // Set default properties values
+    defaultBarTintColor = nil;
+    barTitleColor = nil;
+    enableBarTintColorStatusChange = YES;
+    rageShakeManager = nil;
+    
+    mxSessionArray = [NSMutableArray array];
+    childViewControllers = [NSMutableArray array];
+}
+
+#pragma mark -
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    // Add default activity indicator
+    activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite];
+    activityIndicator.backgroundColor = [UIColor colorWithRed:0.8 green:0.8 blue:0.8 alpha:1.0];
+    activityIndicator.autoresizingMask = UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin;
+    
+    CGRect frame = activityIndicator.frame;
+    frame.size.width += 30;
+    frame.size.height += 30;
+    activityIndicator.bounds = frame;
+    [activityIndicator.layer setCornerRadius:5];
+    
+    activityIndicator.center = self.view.center;
+    [self.view addSubview:activityIndicator];
+}
+
+- (void)dealloc
+{
+    if (activityIndicator)
+    {
+        [activityIndicator removeFromSuperview];
+        activityIndicator = nil;
+    }
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    
+    if (self.rageShakeManager)
+    {
+        [self.rageShakeManager cancel:self];
+    }
+    
+    // Update UI according to mxSession state, and add observer (if need)
+    if (mxSessionArray.count)
+    {
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onMatrixSessionStateDidChange:) name:kMXSessionStateDidChangeNotification object:nil];
+    }
+    [self onMatrixSessionChange];
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionStateDidChangeNotification object:nil];
+    
+    [activityIndicator stopAnimating];
+    
+    if (self.rageShakeManager)
+    {
+        [self.rageShakeManager cancel:self];
+    }
+}
+
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+
+    MXLogDebug(@"[MXKTableViewController] %@ viewDidAppear", self.class);
+
+    // Release properly pushed and/or presented view controller
+    if (childViewControllers.count)
+    {
+        for (id viewController in childViewControllers)
+        {
+            if ([viewController isKindOfClass:[UINavigationController class]])
+            {
+                UINavigationController *navigationController = (UINavigationController*)viewController;
+                for (id subViewController in navigationController.viewControllers)
+                {
+                    if ([subViewController respondsToSelector:@selector(destroy)])
+                    {
+                        [subViewController destroy];
+                    }
+                }
+            }
+            else if ([viewController respondsToSelector:@selector(destroy)])
+            {
+                [viewController destroy];
+            }
+        }
+        
+        [childViewControllers removeAllObjects];
+    }
+}
+
+- (void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear:animated];
+
+    MXLogDebug(@"[MXKTableViewController] %@ viewDidDisappear", self.class);
+}
+
+- (void)setEnableBarTintColorStatusChange:(BOOL)enable
+{
+    if (enableBarTintColorStatusChange != enable)
+    {
+        enableBarTintColorStatusChange = enable;
+        
+        [self onMatrixSessionChange];
+    }
+}
+
+- (void)setDefaultBarTintColor:(UIColor *)barTintColor
+{
+    defaultBarTintColor = barTintColor;
+    
+    if (enableBarTintColorStatusChange)
+    {
+        // Force update by taking into account the matrix session state.
+        [self onMatrixSessionChange];
+    }
+    else
+    {
+        // Set default tintColor
+        self.navigationController.navigationBar.barTintColor = defaultBarTintColor;
+        self.mxk_mainNavigationController.navigationBar.barTintColor = defaultBarTintColor;
+    }
+}
+
+- (void)setBarTitleColor:(UIColor *)titleColor
+{
+    barTitleColor = titleColor;
+    
+    // Retrieve the main navigation controller if the current view controller is embedded inside a split view controller.
+    UINavigationController *mainNavigationController = self.mxk_mainNavigationController;
+    
+    // Set navigation bar title color
+    NSDictionary<NSString *,id> *titleTextAttributes = self.navigationController.navigationBar.titleTextAttributes;
+    if (titleTextAttributes)
+    {
+        NSMutableDictionary *textAttributes = [NSMutableDictionary dictionaryWithDictionary:titleTextAttributes];
+        textAttributes[NSForegroundColorAttributeName] = barTitleColor;
+        self.navigationController.navigationBar.titleTextAttributes = textAttributes;
+    }
+    else if (barTitleColor)
+    {
+        self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName: barTitleColor};
+    }
+    
+    if (mainNavigationController)
+    {
+        titleTextAttributes = mainNavigationController.navigationBar.titleTextAttributes;
+        if (titleTextAttributes)
+        {
+            NSMutableDictionary *textAttributes = [NSMutableDictionary dictionaryWithDictionary:titleTextAttributes];
+            textAttributes[NSForegroundColorAttributeName] = barTitleColor;
+            mainNavigationController.navigationBar.titleTextAttributes = textAttributes;
+        }
+        else if (barTitleColor)
+        {
+            mainNavigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName: barTitleColor};
+        }
+    }
+}
+
+- (void)setView:(UIView *)view
+{
+    [super setView:view];
+    
+    // Keep the activity indicator (if any)
+    if (view && activityIndicator)
+    {
+        [self.view addSubview:activityIndicator];
+    }
+}
+
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender
+{
+    // Keep ref on destinationViewController
+    [childViewControllers addObject:segue.destinationViewController];
+}
+
+- (void)presentViewController:(UIViewController *)viewControllerToPresent animated:(BOOL)flag completion:(void (^)(void))completion
+{
+    // Keep ref on presented view controller
+    [childViewControllers addObject:viewControllerToPresent];
+    
+    [super presentViewController:viewControllerToPresent animated:flag completion:completion];
+}
+
+#pragma mark -
+
+- (void)addMatrixSession:(MXSession*)mxSession
+{
+    if (!mxSession || mxSession.state == MXSessionStateClosed)
+    {
+        return;
+    }
+    
+    if (!mxSessionArray.count)
+    {
+        [mxSessionArray addObject:mxSession];
+        
+        // Add matrix sessions observer on first added session
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onMatrixSessionStateDidChange:) name:kMXSessionStateDidChangeNotification object:nil];
+    }
+    else if ([mxSessionArray indexOfObject:mxSession] == NSNotFound)
+    {
+        [mxSessionArray addObject:mxSession];
+    }
+    
+    // Force update
+    [self onMatrixSessionChange];
+}
+
+- (void)removeMatrixSession:(MXSession*)mxSession
+{
+    if (!mxSession)
+    {
+        return;
+    }
+    
+    NSUInteger index = [mxSessionArray indexOfObject:mxSession];
+    if (index != NSNotFound)
+    {
+        [mxSessionArray removeObjectAtIndex:index];
+        
+        if (!mxSessionArray.count)
+        {
+            // Remove matrix sessions observer
+            [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionStateDidChangeNotification object:nil];
+        }
+    }
+    
+    // Force update
+    [self onMatrixSessionChange];
+}
+
+- (NSArray*)mxSessions
+{
+    return [NSArray arrayWithArray:mxSessionArray];
+}
+
+- (MXSession*)mainSession
+{
+    // We consider the first added session as the main one.
+    if (mxSessionArray.count)
+    {
+        return [mxSessionArray firstObject];
+    }
+    return nil;
+}
+
+#pragma mark -
+
+- (void)withdrawViewControllerAnimated:(BOOL)animated completion:(void (^)(void))completion
+{
+    // Check whether the view controller is embedded inside a navigation controller.
+    if (self.navigationController)
+    {
+        [self popViewController:self navigationController:self.navigationController animated:animated completion:completion];
+    }
+    else
+    {
+        // Suppose here the view controller has been presented modally. We dismiss it
+        [self dismissViewControllerAnimated:animated completion:completion];
+    }
+}
+
+- (void)popViewController:(UIViewController*)viewController navigationController:(UINavigationController*)navigationController animated:(BOOL)animated completion:(void (^)(void))completion
+{
+    // We pop the view controller (except if it is the root view controller).
+    NSUInteger index = [navigationController.viewControllers indexOfObject:viewController];
+    if (index != NSNotFound)
+    {
+        if (index > 0)
+        {
+            UIViewController *previousViewController = [navigationController.viewControllers objectAtIndex:(index - 1)];
+            [navigationController popToViewController:previousViewController animated:animated];
+            
+            if (completion)
+            {
+                completion();
+            }
+        }
+        else
+        {
+            // Check whether the navigation controller is embedded inside a navigation controller, to pop it.
+            if (navigationController.navigationController)
+            {
+                [self popViewController:navigationController navigationController:navigationController.navigationController animated:animated completion:completion];
+            }
+            else
+            {
+                // Remove the root view controller
+                navigationController.viewControllers = @[];
+                // Suppose here the navigation controller has been presented modally. We dismiss it
+                [navigationController dismissViewControllerAnimated:animated completion:completion];
+            }
+        }
+    }
+}
+
+- (void)destroy
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    
+    mxSessionArray = nil;
+    childViewControllers = nil;
+}
+
+#pragma mark - Sessions handling
+
+- (void)onMatrixSessionStateDidChange:(NSNotification *)notif
+{
+    MXSession *mxSession = notif.object;
+    
+    NSUInteger index = [mxSessionArray indexOfObject:mxSession];
+    if (index != NSNotFound)
+    {
+        if (mxSession.state == MXSessionStateClosed)
+        {
+            // Call here the dedicated method which may be overridden
+            [self removeMatrixSession:mxSession];
+        }
+        else
+        {
+            [self onMatrixSessionChange];
+        }
+    }
+}
+
+- (void)onMatrixSessionChange
+{
+    // This method is called to refresh view controller appearance on session state change,
+    // It is called when the view will appear to update session array by removing closed sessions.
+    // Indeed 'kMXSessionStateDidChangeNotification' are observed only when the view controller is visible.
+    
+    // Retrieve the main navigation controller if the current view controller is embedded inside a split view controller.
+    UINavigationController *mainNavigationController = self.mxk_mainNavigationController;
+    
+    if (mxSessionArray.count)
+    {
+        // Check each session state
+        UIColor *barTintColor = defaultBarTintColor;
+        BOOL allHomeserverNotReachable = YES;
+        BOOL isActivityInProgress = NO;
+        for (NSUInteger index = 0; index < mxSessionArray.count;)
+        {
+            MXSession *mxSession = mxSessionArray[index];
+            
+            // Remove here closed sessions
+            if (mxSession.state == MXSessionStateClosed)
+            {
+                // Call here the dedicated method which may be overridden.
+                // This method will call again [onMatrixSessionChange] when session is removed.
+                [self removeMatrixSession:mxSession];
+                return;
+            }
+            else
+            {
+                if (mxSession.state == MXSessionStateHomeserverNotReachable)
+                {
+                    barTintColor = [UIColor orangeColor];
+                }
+                else
+                {
+                    allHomeserverNotReachable = NO;
+                    isActivityInProgress = mxSession.shouldShowActivityIndicator;
+                }
+                
+                index ++;
+            }
+        }
+        
+        // Check whether the navigation bar color depends on homeserver reachability.
+        if (enableBarTintColorStatusChange)
+        {
+            // The navigation bar tintColor reflects the matrix homeserver reachability status.
+            if (allHomeserverNotReachable)
+            {
+                self.navigationController.navigationBar.barTintColor = [UIColor redColor];
+                if (mainNavigationController)
+                {
+                    mainNavigationController.navigationBar.barTintColor = [UIColor redColor];
+                }
+            }
+            else
+            {
+                self.navigationController.navigationBar.barTintColor = barTintColor;
+                if (mainNavigationController)
+                {
+                    mainNavigationController.navigationBar.barTintColor = barTintColor;
+                }
+            }
+        }
+        
+        // Run activity indicator if need
+        if (isActivityInProgress)
+        {
+            [self startActivityIndicator];
+        }
+        else
+        {
+            [self stopActivityIndicator];
+        }
+    }
+    else
+    {
+        // Hide potential activity indicator
+        [self stopActivityIndicator];
+        
+        // Check whether the navigation bar color depends on homeserver reachability.
+        if (enableBarTintColorStatusChange)
+        {
+            // Restore default tintColor
+            self.navigationController.navigationBar.barTintColor = defaultBarTintColor;
+            if (mainNavigationController)
+            {
+                mainNavigationController.navigationBar.barTintColor = defaultBarTintColor;
+            }
+        }
+    }
+}
+
+#pragma mark - Activity indicator
+
+- (void)startActivityIndicator
+{
+    if (activityIndicator)
+    {
+        // Keep centering the loading wheel
+        CGPoint center = self.view.center;
+        center.y +=  self.tableView.contentOffset.y - self.tableView.adjustedContentInset.top;
+        activityIndicator.center = center;
+        [self.view bringSubviewToFront:activityIndicator];
+        
+        [activityIndicator startAnimating];
+        
+        // Show the loading wheel after a delay so that if the caller calls stopActivityIndicator
+        // in a short future, the loading wheel will not be displayed to the end user.
+        activityIndicator.alpha = 0;
+        [UIView animateWithDuration:0.3 delay:0.3 options:UIViewAnimationOptionBeginFromCurrentState animations:^{
+            self->activityIndicator.alpha = 1;
+        } completion:^(BOOL finished)
+         {
+         }];
+    }
+}
+
+- (void)stopActivityIndicator
+{
+    // Check whether all conditions are satisfied before stopping loading wheel
+    BOOL isActivityInProgress = NO;
+    for (MXSession *mxSession in mxSessionArray)
+    {
+        if (mxSession.shouldShowActivityIndicator)
+        {
+            isActivityInProgress = YES;
+        }
+    }
+    if (!isActivityInProgress)
+    {
+        [activityIndicator stopAnimating];
+    }
+}
+
+#pragma mark - Shake handling
+
+- (void)motionBegan:(UIEventSubtype)motion withEvent:(UIEvent *)event
+{
+    if (motion == UIEventSubtypeMotionShake && self.rageShakeManager)
+    {
+        [self.rageShakeManager startShaking:self];
+    }
+}
+
+- (void)motionCancelled:(UIEventSubtype)motion withEvent:(UIEvent *)event
+{
+    [self motionEnded:motion withEvent:event];
+}
+
+- (void)motionEnded:(UIEventSubtype)motion withEvent:(UIEvent *)event
+{
+    if (self.rageShakeManager)
+    {
+        [self.rageShakeManager stopShaking:self];
+    }
+}
+
+- (BOOL)canBecomeFirstResponder
+{
+    return (self.rageShakeManager != nil);
+}
+
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKViewController.h b/Riot/Modules/MatrixKit/Controllers/MXKViewController.h
new file mode 100644
index 000000000..e75d42e11
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKViewController.h
@@ -0,0 +1,52 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKViewControllerHandling.h"
+#import "MXKActivityHandlingViewController.h"
+
+/**
+ MXKViewController extends UIViewController to handle requirements for
+ any matrixKit view controllers (see MXKViewControllerHandling protocol).
+ 
+ This class provides some methods to ease keyboard handling. 
+ */
+
+@interface MXKViewController : MXKActivityHandlingViewController <MXKViewControllerHandling>
+
+
+#pragma mark - Keyboard handling
+
+/**
+ Call when keyboard display animation is complete.
+ 
+ Override this method to set the actual keyboard view in 'keyboardView' property.
+ The 'MXKViewController' instance will then observe the keyboard frame changes, and update 'keyboardHeight' property.
+ */
+- (void)onKeyboardShowAnimationComplete;
+
+/**
+ The current keyboard view (This field is nil when keyboard is dismissed).
+ This property should be set when keyboard display animation is complete to track keyboard frame changes.
+ */
+@property (nonatomic) UIView *keyboardView;
+
+/**
+ The current keyboard height (This field is 0 when keyboard is dismissed).
+ */
+@property CGFloat keyboardHeight;
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKViewController.m
new file mode 100644
index 000000000..a4e559b4c
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKViewController.m
@@ -0,0 +1,657 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2018 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 "MXKViewController.h"
+
+#import "UIViewController+MatrixKit.h"
+#import "MXSession+MatrixKit.h"
+
+const CGFloat MXKViewControllerMaxExternalKeyboardHeight = 80;
+
+@interface MXKViewController ()
+{
+    /**
+     Array of `MXSession` instances.
+     */
+    NSMutableArray *mxSessionArray;
+    
+    /**
+     Keep reference on the pushed view controllers to release them correctly
+     */
+    NSMutableArray *childViewControllers;
+}
+@end
+
+@implementation MXKViewController
+@synthesize defaultBarTintColor, enableBarTintColorStatusChange;
+@synthesize barTitleColor;
+@synthesize mainSession;
+@synthesize rageShakeManager;
+@synthesize childViewControllers;
+
+#pragma mark -
+
+- (instancetype)initWithNibName:(nullable NSString *)nibNameOrNil bundle:(nullable NSBundle *)nibBundleOrNil
+{
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self)
+    {
+        [self finalizeInit];
+    }
+    
+    return self;
+}
+
+- (nullable instancetype)initWithCoder:(NSCoder *)aDecoder
+{
+    self = [super initWithCoder:aDecoder];
+    if (self)
+    {
+        [self finalizeInit];
+    }
+    
+    return self;
+}
+
+- (void)finalizeInit
+{
+    // Set default properties values
+    defaultBarTintColor = nil;
+    barTitleColor = nil;
+    enableBarTintColorStatusChange = YES;
+    rageShakeManager = nil;
+    
+    mxSessionArray = [NSMutableArray array];
+    childViewControllers = [NSMutableArray array];
+}
+
+#pragma mark -
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    
+    if (self.rageShakeManager)
+    {
+        [self.rageShakeManager cancel:self];
+    }
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onKeyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onKeyboardWillHide:) name:UIKeyboardWillHideNotification object:nil];
+    
+    // Update UI according to mxSession state, and add observer (if need)
+    if (mxSessionArray.count)
+    {
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onMatrixSessionStateDidChange:) name:kMXSessionStateDidChangeNotification object:nil];
+    }
+    [self onMatrixSessionChange];
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillHideNotification object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillShowNotification object:nil];
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionStateDidChangeNotification object:nil];
+    
+    [self.activityIndicator stopAnimating];
+    
+    if (self.rageShakeManager)
+    {
+        [self.rageShakeManager cancel:self];
+    }
+
+    // Remove keyboard view (if any)
+    self.keyboardView = nil;
+    self.keyboardHeight = 0;
+}
+
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+
+    MXLogDebug(@"[MXKViewController] %@ viewDidAppear", self.class);
+
+    // Release properly pushed and/or presented view controller
+    if (childViewControllers.count)
+    {
+        for (id viewController in childViewControllers)
+        {
+            if ([viewController isKindOfClass:[UINavigationController class]])
+            {
+                UINavigationController *navigationController = (UINavigationController*)viewController;
+                for (id subViewController in navigationController.viewControllers)
+                {
+                    if ([subViewController respondsToSelector:@selector(destroy)])
+                    {
+                        [subViewController destroy];
+                    }
+                }
+            }
+            else if ([viewController respondsToSelector:@selector(destroy)])
+            {
+                [viewController destroy];
+            }
+        }
+        
+        [childViewControllers removeAllObjects];
+    }
+}
+
+- (void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear:animated];
+
+    MXLogDebug(@"[MXKViewController] %@ viewDidDisappear", self.class);
+}
+
+- (void)setEnableBarTintColorStatusChange:(BOOL)enable
+{
+    if (enableBarTintColorStatusChange != enable)
+    {
+        enableBarTintColorStatusChange = enable;
+        
+        [self onMatrixSessionChange];
+    }
+}
+
+- (void)setDefaultBarTintColor:(UIColor *)barTintColor
+{
+    defaultBarTintColor = barTintColor;
+    
+    if (enableBarTintColorStatusChange)
+    {
+        // Force update by taking into account the matrix session state.
+        [self onMatrixSessionChange];
+    }
+    else
+    {
+        // Set default tintColor
+        self.navigationController.navigationBar.barTintColor = defaultBarTintColor;
+        self.mxk_mainNavigationController.navigationBar.barTintColor = defaultBarTintColor;
+    }
+}
+
+- (void)setBarTitleColor:(UIColor *)titleColor
+{
+    barTitleColor = titleColor;
+    
+    // Retrieve the main navigation controller if the current view controller is embedded inside a split view controller.
+    UINavigationController *mainNavigationController = self.mxk_mainNavigationController;
+    
+    // Set navigation bar title color
+    NSDictionary<NSString *,id> *titleTextAttributes = self.navigationController.navigationBar.titleTextAttributes;
+    if (titleTextAttributes)
+    {
+        NSMutableDictionary *textAttributes = [NSMutableDictionary dictionaryWithDictionary:titleTextAttributes];
+        textAttributes[NSForegroundColorAttributeName] = barTitleColor;
+        self.navigationController.navigationBar.titleTextAttributes = textAttributes;
+    }
+    else if (barTitleColor)
+    {
+        self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName: barTitleColor};
+    }
+    
+    if (mainNavigationController)
+    {
+        titleTextAttributes = mainNavigationController.navigationBar.titleTextAttributes;
+        if (titleTextAttributes)
+        {
+            NSMutableDictionary *textAttributes = [NSMutableDictionary dictionaryWithDictionary:titleTextAttributes];
+            textAttributes[NSForegroundColorAttributeName] = barTitleColor;
+            mainNavigationController.navigationBar.titleTextAttributes = textAttributes;
+        }
+        else if (barTitleColor)
+        {
+            mainNavigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName: barTitleColor};
+        }
+    }
+}
+
+- (void)setView:(UIView *)view
+{
+    [super setView:view];
+    
+    // Keep the activity indicator (if any)
+    if (self.activityIndicator)
+    {
+        self.activityIndicator.center = self.view.center;
+        [self.view addSubview:self.activityIndicator];
+    }
+}
+
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender
+{
+    // Keep ref on destinationViewController
+    [childViewControllers addObject:segue.destinationViewController];
+}
+
+- (void)presentViewController:(UIViewController *)viewControllerToPresent animated:(BOOL)flag completion:(void (^)(void))completion
+{
+    // Keep ref on presented view controller
+    [childViewControllers addObject:viewControllerToPresent];
+    
+    [super presentViewController:viewControllerToPresent animated:flag completion:completion];
+}
+
+#pragma mark -
+
+- (void)addMatrixSession:(MXSession*)mxSession
+{
+    if (!mxSession || mxSession.state == MXSessionStateClosed)
+    {
+        return;
+    }
+    
+    if (!mxSessionArray.count)
+    {
+        [mxSessionArray addObject:mxSession];
+        
+        // Add matrix sessions observer on first added session
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onMatrixSessionStateDidChange:) name:kMXSessionStateDidChangeNotification object:nil];
+    }
+    else if ([mxSessionArray indexOfObject:mxSession] == NSNotFound)
+    {
+        [mxSessionArray addObject:mxSession];
+    }
+    
+    // Force update
+    [self onMatrixSessionChange];
+}
+
+- (void)removeMatrixSession:(MXSession*)mxSession
+{
+    if (!mxSession)
+    {
+        return;
+    }
+    
+    NSUInteger index = [mxSessionArray indexOfObject:mxSession];
+    if (index != NSNotFound)
+    {
+        [mxSessionArray removeObjectAtIndex:index];
+        
+        if (!mxSessionArray.count)
+        {
+            // Remove matrix sessions observer
+            [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionStateDidChangeNotification object:nil];
+        }
+    }
+    
+    // Force update
+    [self onMatrixSessionChange];
+}
+
+- (NSArray*)mxSessions
+{
+    return [NSArray arrayWithArray:mxSessionArray];
+}
+
+- (MXSession*)mainSession
+{
+    // We consider the first added session as the main one.
+    if (mxSessionArray.count)
+    {
+        return [mxSessionArray firstObject];
+    }
+    return nil;
+}
+
+#pragma mark -
+
+- (void)withdrawViewControllerAnimated:(BOOL)animated completion:(void (^)(void))completion
+{
+    // Check whether the view controller is embedded inside a navigation controller.
+    if (self.navigationController)
+    {
+        [self popViewController:self navigationController:self.navigationController animated:animated completion:completion];
+    }
+    else
+    {
+        // Suppose here the view controller has been presented modally. We dismiss it
+        [self dismissViewControllerAnimated:animated completion:completion];
+    }
+}
+
+- (void)popViewController:(UIViewController*)viewController navigationController:(UINavigationController*)navigationController animated:(BOOL)animated completion:(void (^)(void))completion
+{
+    // We pop the view controller (except if it is the root view controller).
+    NSUInteger index = [navigationController.viewControllers indexOfObject:viewController];
+    if (index != NSNotFound)
+    {
+        if (index > 0)
+        {
+            UIViewController *previousViewController = [navigationController.viewControllers objectAtIndex:(index - 1)];
+            [navigationController popToViewController:previousViewController animated:animated];
+            
+            if (completion)
+            {
+                completion();
+            }
+        }
+        else
+        {
+            // Check whether the navigation controller is embedded inside a navigation controller, to pop it.
+            if (navigationController.navigationController)
+            {
+                [self popViewController:navigationController navigationController:navigationController.navigationController animated:animated completion:completion];
+            }
+            else
+            {
+                // Remove the root view controller
+                navigationController.viewControllers = @[];
+                // Suppose here the navigation controller has been presented modally. We dismiss it
+                [navigationController dismissViewControllerAnimated:animated completion:completion];
+            }
+        }
+    }
+}
+
+- (void)destroy
+{
+    // Remove properly keyboard view (remove related key observers)
+    self.keyboardView = nil;
+    
+    // Remove observers
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    
+    mxSessionArray = nil;
+    childViewControllers = nil;
+}
+
+#pragma mark - Sessions handling
+
+- (void)onMatrixSessionStateDidChange:(NSNotification *)notif
+{
+    MXSession *mxSession = notif.object;
+    
+    NSUInteger index = [mxSessionArray indexOfObject:mxSession];
+    if (index != NSNotFound)
+    {
+        if (mxSession.state == MXSessionStateClosed)
+        {
+            // Call here the dedicated method which may be overridden
+            [self removeMatrixSession:mxSession];
+        }
+        else
+        {
+            [self onMatrixSessionChange];
+        }
+    }
+}
+
+- (void)onMatrixSessionChange
+{
+    // This method is called to refresh view controller appearance on session state change,
+    // It is called when the view will appear to update session array by removing closed sessions.
+    // Indeed 'kMXSessionStateDidChangeNotification' are observed only when the view controller is visible.
+
+    // Retrieve the main navigation controller if the current view controller is embedded inside a split view controller.
+    UINavigationController *mainNavigationController = self.mxk_mainNavigationController;
+
+    if (mxSessionArray.count)
+    {
+        // Check each session state.
+        UIColor *barTintColor = defaultBarTintColor;
+        BOOL allHomeserverNotReachable = YES;
+        BOOL isActivityInProgress = NO;
+        for (NSUInteger index = 0; index < mxSessionArray.count;)
+        {
+            MXSession *mxSession = mxSessionArray[index];
+            
+            // Remove here closed sessions
+            if (mxSession.state == MXSessionStateClosed)
+            {
+                // Call here the dedicated method which may be overridden.
+                // This method will call again [onMatrixSessionChange] when session is removed.
+                [self removeMatrixSession:mxSession];
+                return;
+            }
+            else
+            {
+                if (mxSession.state == MXSessionStateHomeserverNotReachable)
+                {
+                    barTintColor = [UIColor orangeColor];
+                }
+                else
+                {
+                    allHomeserverNotReachable = NO;
+                    isActivityInProgress = mxSession.shouldShowActivityIndicator;
+                }
+                
+                index++;
+            }
+        }
+        
+        // Check whether the navigation bar color depends on homeserver reachability.
+        if (enableBarTintColorStatusChange)
+        {
+            // The navigation bar tintColor reflects the matrix homeserver reachability status.
+            if (allHomeserverNotReachable)
+            {
+                self.navigationController.navigationBar.barTintColor = [UIColor redColor];
+                if (mainNavigationController)
+                {
+                    mainNavigationController.navigationBar.barTintColor = [UIColor redColor];
+                }
+            }
+            else
+            {
+                self.navigationController.navigationBar.barTintColor = barTintColor;
+                if (mainNavigationController)
+                {
+                    mainNavigationController.navigationBar.barTintColor = barTintColor;
+                }
+            }
+        }
+        
+        // Run activity indicator if need
+        if (isActivityInProgress)
+        {
+            [self startActivityIndicator];
+        }
+        else
+        {
+            [self stopActivityIndicator];
+        }
+    }
+    else
+    {
+        // Hide potential activity indicator
+        [self stopActivityIndicator];
+        
+        // Check whether the navigation bar color depends on homeserver reachability.
+        if (enableBarTintColorStatusChange)
+        {
+            // Restore default tintColor
+            self.navigationController.navigationBar.barTintColor = defaultBarTintColor;
+            if (mainNavigationController)
+            {
+                mainNavigationController.navigationBar.barTintColor = defaultBarTintColor;
+            }
+            
+        }
+    }
+}
+
+#pragma mark - Activity indicator
+
+- (void)stopActivityIndicator
+{
+    // Check whether all conditions are satisfied before stopping loading wheel
+    BOOL isActivityInProgress = NO;
+    for (MXSession *mxSession in mxSessionArray)
+    {
+        if (mxSession.shouldShowActivityIndicator)
+        {
+            isActivityInProgress = YES;
+        }
+    }
+    if (!isActivityInProgress)
+    {
+        [super stopActivityIndicator];
+    }
+}
+
+#pragma mark - Shake handling
+
+- (void)motionBegan:(UIEventSubtype)motion withEvent:(UIEvent *)event
+{
+    if (motion == UIEventSubtypeMotionShake && self.rageShakeManager)
+    {
+        [self.rageShakeManager startShaking:self];
+    }
+}
+
+- (void)motionCancelled:(UIEventSubtype)motion withEvent:(UIEvent *)event
+{
+    [self motionEnded:motion withEvent:event];
+}
+
+- (void)motionEnded:(UIEventSubtype)motion withEvent:(UIEvent *)event
+{
+    if (self.rageShakeManager)
+    {
+        [self.rageShakeManager stopShaking:self];
+    }
+}
+
+- (BOOL)canBecomeFirstResponder
+{
+    return (self.rageShakeManager != nil);
+}
+
+#pragma mark - Keyboard handling
+
+- (void)onKeyboardShowAnimationComplete
+{
+    // Do nothing here - `MXKViewController-inherited` instance must override this method.
+}
+
+- (void)setKeyboardView:(UIView *)keyboardView
+{  
+    // Remove previous keyboardView if any
+    if (_keyboardView)
+    {
+        // Restore UIKeyboardWillShowNotification observer
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onKeyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
+        
+        // Remove keyboard view observers
+        [_keyboardView removeObserver:self forKeyPath:NSStringFromSelector(@selector(frame))];
+        [_keyboardView removeObserver:self forKeyPath:NSStringFromSelector(@selector(center))];
+        
+        _keyboardView = nil;
+    }
+    
+    if (keyboardView)
+    {
+        // Add observers to detect keyboard drag down
+        [keyboardView addObserver:self forKeyPath:NSStringFromSelector(@selector(frame)) options:0 context:nil];
+        [keyboardView addObserver:self forKeyPath:NSStringFromSelector(@selector(center)) options:0 context:nil];
+        
+        // Remove UIKeyboardWillShowNotification observer to ignore this notification until keyboard is dismissed.
+        // Note: UIKeyboardWillShowNotification may be triggered several times before keyboard is dismissed,
+        // because the keyboard height is updated (switch to a Chinese keyboard for example).
+        [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillShowNotification object:nil];
+        
+        _keyboardView = keyboardView;
+    }
+}
+
+- (void)onKeyboardWillShow:(NSNotification *)notif
+{
+    MXLogDebug(@"[MXKViewController] %@ onKeyboardWillShow", self.class);
+    
+    // Get the keyboard size
+    NSValue *rectVal = notif.userInfo[UIKeyboardFrameEndUserInfoKey];
+    CGRect endRect = rectVal.CGRectValue;
+    
+    // IOS 8 triggers some unexpected keyboard events
+    if ((endRect.size.height == 0) || (endRect.size.width == 0))
+    {
+        return;
+    }
+
+    // Detect if an external keyboard is used
+    CGRect keyboard = [self.view convertRect:endRect fromView:self.view.window];
+    CGFloat height = self.view.frame.size.height;
+    BOOL hasExternalKeyboard = keyboard.size.height <= MXKViewControllerMaxExternalKeyboardHeight;
+
+    // Get the animation info
+    NSNumber *curveValue = [[notif userInfo] objectForKey:UIKeyboardAnimationCurveUserInfoKey];
+    UIViewAnimationCurve animationCurve = curveValue.intValue;
+    // The duration is ignored but it is better to define it
+    double animationDuration = [[[notif userInfo] objectForKey:UIKeyboardAnimationDurationUserInfoKey] doubleValue];
+    
+    // Apply keyboard animation
+    [UIView animateWithDuration:animationDuration delay:0 options:UIViewAnimationOptionBeginFromCurrentState | (animationCurve << 16) animations:^{
+        if (!hasExternalKeyboard)
+        {
+            // Set the new virtual keyboard height by checking screen orientation
+            self.keyboardHeight = (endRect.origin.y == 0) ? endRect.size.width : endRect.size.height;
+        }
+        else
+        {
+            // The virtual keyboard is not shown on the screen but its toolbar is still displayed.
+            // Manage the height of this one
+            self.keyboardHeight =  height - keyboard.origin.y;
+        }
+    } completion:^(BOOL finished)
+    {
+        [self onKeyboardShowAnimationComplete];
+    }];
+}
+
+- (void)onKeyboardWillHide:(NSNotification *)notif
+{
+    MXLogDebug(@"[MXKViewController] %@ onKeyboardWillHide", self.class);
+    
+    // Remove keyboard view
+    self.keyboardView = nil;
+    
+    // Get the animation info
+    NSNumber *curveValue = [[notif userInfo] objectForKey:UIKeyboardAnimationCurveUserInfoKey];
+    UIViewAnimationCurve animationCurve = curveValue.intValue;
+    // the duration is ignored but it is better to define it
+    double animationDuration = [[[notif userInfo] objectForKey:UIKeyboardAnimationDurationUserInfoKey] doubleValue];
+    
+    // Apply keyboard animation
+    [UIView animateWithDuration:animationDuration delay:0 options:UIViewAnimationOptionBeginFromCurrentState | (animationCurve << 16) animations:^{
+        self.keyboardHeight = 0;
+    } completion:^(BOOL finished)
+    {
+    }];
+}
+
+#pragma mark - KVO
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
+{
+    if ((object == _keyboardView) && ([keyPath isEqualToString:NSStringFromSelector(@selector(frame))] || [keyPath isEqualToString:NSStringFromSelector(@selector(center))]))
+    {
+        
+        // The keyboard view has been modified (Maybe the user drag it down), we update the input toolbar bottom constraint to adjust layout.
+        
+        // Compute keyboard height (on IOS 8 and later, the screen size is oriented)
+        CGSize screenSize = [[UIScreen mainScreen] bounds].size;
+        self.keyboardHeight = screenSize.height - _keyboardView.frame.origin.y;
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKViewControllerActivityHandling.h b/Riot/Modules/MatrixKit/Controllers/MXKViewControllerActivityHandling.h
new file mode 100644
index 000000000..299071230
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKViewControllerActivityHandling.h
@@ -0,0 +1,50 @@
+// 
+// Copyright 2021 The Matrix.org Foundation C.I.C
+//
+// 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.
+//
+
+#ifndef MXKViewControllerActivityHandling_h
+#define MXKViewControllerActivityHandling_h
+
+/**
+ `MXKViewControllerActivityHandling` defines a protocol to handle requirements for
+ all matrixKit view controllers and table view controllers.
+ 
+ It manages the following points:
+ - stop/start activity indicator according to the state of the associated matrix sessions.
+ */
+@protocol MXKViewControllerActivityHandling <NSObject>
+
+/**
+ Activity indicator view.
+ By default this activity indicator is centered inside the view controller view. It automatically
+ starts if `shouldShowActivityIndicator `returns true for the session.
+ It is stopped on other states.
+ Set nil to disable activity indicator animation.
+ */
+@property (nonatomic) UIActivityIndicatorView *activityIndicator;
+
+/**
+ Bring the activity indicator to the front and start it.
+ */
+- (void)startActivityIndicator;
+
+/**
+ Stop the activity indicator if all conditions are satisfied.
+ */
+- (void)stopActivityIndicator;
+
+@end
+
+#endif /* MXKViewControllerActivityHandling_h */
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKViewControllerHandling.h b/Riot/Modules/MatrixKit/Controllers/MXKViewControllerHandling.h
new file mode 100644
index 000000000..ee9143508
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKViewControllerHandling.h
@@ -0,0 +1,148 @@
+/*
+ Copyright 2015 OpenMarket 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/Foundation.h>
+
+#import <MatrixSDK/MatrixSDK.h>
+
+#import "MXKResponderRageShaking.h"
+#import "MXKViewControllerActivityHandling.h"
+
+/**
+ `MXKViewControllerHandling` defines a protocol to handle requirements for
+ all matrixKit view controllers and table view controllers.
+ 
+ It manages the following points:
+ - matrix sessions handling, one or more sessions are supported.
+ - stop/start activity indicator according to the state of the associated matrix sessions.
+ - update view appearance on matrix session state change.
+ - support rage shake mechanism (depend on `rageShakeManager` property).
+ */
+@protocol MXKViewControllerHandling <MXKViewControllerActivityHandling>
+
+/**
+ The default navigation bar tint color (nil by default).
+ */
+@property (nonatomic) UIColor *defaultBarTintColor;
+
+/**
+ The color of the title in the navigation bar (nil by default).
+ */
+@property (nonatomic) UIColor *barTitleColor;
+
+/**
+ Enable the change of the navigation bar tint color according to the matrix homeserver reachability status (YES by default).
+ Set NO this property to disable navigation tint color change.
+ */
+@property (nonatomic) BOOL enableBarTintColorStatusChange;
+
+/**
+ List of associated matrix sessions (empty by default).
+ This property is used to update view appearance according to the session(s) state.
+ */
+@property (nonatomic, readonly) NSArray* mxSessions;
+
+/**
+ The first associated matrix session is considered as the main session (nil by default).
+ */
+@property (nonatomic, readonly) MXSession *mainSession;
+
+/**
+ Keep reference on the pushed and/or presented view controllers.
+ */
+@property (nonatomic, readonly) NSArray *childViewControllers;
+
+/**
+ An object implementing the `MXKResponderRageShaking` protocol.
+ The view controller uses this object (if any) to report beginning and end of potential
+ rage shake when it is the first responder.
+ 
+ This property is nil by default.
+ */
+@property (nonatomic) id<MXKResponderRageShaking> rageShakeManager;
+
+/**
+ Called during UIViewController initialization to set the default
+ properties values (see [initWithNibName:bundle:] and [initWithCoder:]).
+ 
+ You should not call this method directly.
+ 
+ Subclasses can override this method as needed to customize the initialization.
+ */
+- (void)finalizeInit;
+
+/**
+ Add a matrix session in the list of associated sessions (see 'mxSessions' property).
+ 
+ The session is ignored if its state is 'MXSessionStateClosed'.
+ In other case, the session is stored, and an observer on 'kMXSessionStateDidChangeNotification' is added if it's not already done.
+ A session is automatically removed when its state returns to 'MXSessionStateClosed'.
+ 
+ @param mxSession a Matrix session.
+ */
+- (void)addMatrixSession:(MXSession*)mxSession;
+
+/**
+ Remove a matrix session from the list of associated sessions (see 'mxSessions' property).
+ 
+ Remove the session. The 'kMXSessionStateDidChangeNotification' observer is removed if there is no more matrix session.
+ 
+ @param mxSession a Matrix session.
+ */
+- (void)removeMatrixSession:(MXSession*)mxSession;
+
+/**
+ The method specified as notification selector during 'kMXSessionStateDidChangeNotification' observer creation.
+ 
+ By default this method consider ONLY notifications related to associated sessions (see 'mxSessions' property).
+ A session is automatically removed from the list when its state is 'MXSessionStateClosed'. Else [self onMatrixSessionChange] is called.
+ 
+ Override it to handle state change on associated sessions AND others.
+ */
+- (void)onMatrixSessionStateDidChange:(NSNotification *)notif;
+
+/**
+ This method is called on the following matrix session changes:
+ - a new session is added.
+ - a session is removed.
+ - the state of an associated session changed (according to `MXSessionStateDidChangeNotification`).
+ 
+ This method is called to refresh the display when the view controller will appear too.
+ 
+ By default view controller appearance is updated according to the state of associated sessions:
+ - starts activity indicator as soon as when `shouldShowActivityIndicator `returns true for the session.
+ - switches in red the navigation bar tintColor when all sessions are in `MXSessionStateHomeserverNotReachable` state.
+ - switches in orange the navigation bar tintColor when at least one session is in `MXSessionStateHomeserverNotReachable` state.
+ 
+ Override it to customize view appearance according to associated session(s).
+ */
+- (void)onMatrixSessionChange;
+
+/**
+ Pop or dismiss the view controller. It depends if the view controller is embedded inside a navigation controller or not.
+ 
+ @param animated YES to animate the transition.
+ @param completion the block to execute after the view controller is popped or dismissed. This block has no return value and takes no parameters. You may specify nil for this parameter.
+ */
+- (void)withdrawViewControllerAnimated:(BOOL)animated completion:(void (^)(void))completion;
+
+/**
+ Dispose of any resources, and remove event observers.
+ */
+- (void)destroy;
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKWebViewViewController.h b/Riot/Modules/MatrixKit/Controllers/MXKWebViewViewController.h
new file mode 100644
index 000000000..30306e024
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKWebViewViewController.h
@@ -0,0 +1,69 @@
+/*
+ Copyright 2016 OpenMarket Ltd
+ Copyright 2018 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 "MXKViewController.h"
+#import <WebKit/WebKit.h>
+
+/**
+ 'MXKWebViewViewController' instance is used to display a webview.
+ */
+@interface MXKWebViewViewController : MXKViewController <WKNavigationDelegate, WKUIDelegate, WKScriptMessageHandler>
+{
+@protected
+    /**
+     The back button displayed as the right bar button item.
+     */
+    UIBarButtonItem *backButton;
+    
+@public
+    /**
+     The content of this screen is fully displayed by this webview
+     */
+    WKWebView *webView;
+}
+
+/**
+ Init 'MXKWebViewViewController' instance with a web content url.
+ 
+ @param URL the url to open
+ */
+- (id)initWithURL:(NSString*)URL;
+
+/**
+ Init 'MXKWebViewViewController' instance with a local HTML file path.
+ 
+ @param localHTMLFile The path of the local HTML file.
+ */
+- (id)initWithLocalHTMLFile:(NSString*)localHTMLFile;
+
+/**
+ Route javascript logs to NSLog.
+ */
+- (void)enableDebug;
+
+/**
+ Define the web content url to open
+ Don’t use this property to load local HTML files, instead use 'localHTMLFile'.
+ */
+@property (nonatomic) NSString *URL;
+
+/**
+ Define the local HTML file path to load
+ */
+@property (nonatomic) NSString *localHTMLFile;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKWebViewViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKWebViewViewController.m
new file mode 100644
index 000000000..07c23b452
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Controllers/MXKWebViewViewController.m
@@ -0,0 +1,349 @@
+/*
+ Copyright 2016 OpenMarket Ltd
+ Copyright 2018 New Vector Ltd
+ Copyright 2019 The Matrix.org Foundation C.I.C
+
+ 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 "MXKWebViewViewController.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import <JavaScriptCore/JavaScriptCore.h>
+
+#import "MXKSwiftHeader.h"
+
+NSString *const kMXKWebViewViewControllerPostMessageJSLog = @"jsLog";
+
+// Override console.* logs methods to send WebKit postMessage events to native code.
+// Note: this code has a minimal support of multiple parameters in console.log()
+NSString *const kMXKWebViewViewControllerJavaScriptEnableLog =
+@"console.debug = console.log; console.info = console.log; console.warn = console.log; console.error = console.log;" \
+@"console.log = function() {" \
+@"    var msg = arguments[0];" \
+@"    for (var i = 1; i < arguments.length; i++) {" \
+@"        msg += ' ' + arguments[i];" \
+@"    }" \
+@"    window.webkit.messageHandlers.%@.postMessage(msg);" \
+@"};";
+
+@interface MXKWebViewViewController ()
+{
+    BOOL enableDebug;
+
+    //  Right buttons bar state before loading the webview
+    NSArray<UIBarButtonItem *> *originalRightBarButtonItems;
+}
+
+@end
+
+@implementation MXKWebViewViewController
+
+- (instancetype)init
+{
+    self = [super init];
+    if (self)
+    {
+        enableDebug = NO;
+    }
+    return self;
+}
+
+- (id)initWithURL:(NSString*)URL
+{
+    self = [self init];
+    if (self)
+    {
+        _URL = URL;
+    }
+    return self;
+}
+
+- (id)initWithLocalHTMLFile:(NSString*)localHTMLFile
+{
+    self = [self init];
+    if (self)
+    {
+        _localHTMLFile = localHTMLFile;
+    }
+    return self;
+}
+
+- (void)enableDebug
+{
+    // We can only call addScriptMessageHandler on a given message only once
+    if (enableDebug)
+    {
+        return;
+    }
+    enableDebug = YES;
+
+    // Redirect all console.* logging methods into a WebKit postMessage event with name "jsLog"
+    [webView.configuration.userContentController addScriptMessageHandler:self name:kMXKWebViewViewControllerPostMessageJSLog];
+
+    NSString *javaScriptString = [NSString stringWithFormat:kMXKWebViewViewControllerJavaScriptEnableLog, kMXKWebViewViewControllerPostMessageJSLog];
+
+    [webView evaluateJavaScript:javaScriptString completionHandler:nil];
+}
+
+- (void)finalizeInit
+{
+    [super finalizeInit];
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+
+    originalRightBarButtonItems = self.navigationItem.rightBarButtonItems;
+    
+    // Init the webview
+    webView = [[WKWebView alloc] initWithFrame:self.view.frame];
+    webView.backgroundColor= [UIColor whiteColor];
+    webView.navigationDelegate = self;
+    webView.UIDelegate = self;
+
+    [webView setTranslatesAutoresizingMaskIntoConstraints:NO];
+    [self.view addSubview:webView];
+    
+    // Force webview in full width (to handle auto-layout in case of screen rotation)
+    NSLayoutConstraint *leftConstraint = [NSLayoutConstraint constraintWithItem:webView
+                                                                      attribute:NSLayoutAttributeLeading
+                                                                      relatedBy:NSLayoutRelationEqual
+                                                                         toItem:self.view
+                                                                      attribute:NSLayoutAttributeLeading
+                                                                     multiplier:1.0
+                                                                       constant:0];
+    NSLayoutConstraint *rightConstraint = [NSLayoutConstraint constraintWithItem:webView
+                                                                       attribute:NSLayoutAttributeTrailing
+                                                                       relatedBy:NSLayoutRelationEqual
+                                                                          toItem:self.view
+                                                                       attribute:NSLayoutAttributeTrailing
+                                                                      multiplier:1.0
+                                                                        constant:0];
+    // Force webview in full height
+    NSLayoutConstraint *topConstraint = [NSLayoutConstraint constraintWithItem:webView
+                                                                     attribute:NSLayoutAttributeTop
+                                                                     relatedBy:NSLayoutRelationEqual
+                                                                        toItem:self.topLayoutGuide
+                                                                     attribute:NSLayoutAttributeBottom
+                                                                    multiplier:1.0
+                                                                      constant:0];
+    NSLayoutConstraint *bottomConstraint = [NSLayoutConstraint constraintWithItem:webView
+                                                                        attribute:NSLayoutAttributeBottom
+                                                                        relatedBy:NSLayoutRelationEqual
+                                                                           toItem:self.bottomLayoutGuide
+                                                                        attribute:NSLayoutAttributeTop
+                                                                       multiplier:1.0
+                                                                         constant:0];
+    
+    [NSLayoutConstraint activateConstraints:@[leftConstraint, rightConstraint, topConstraint, bottomConstraint]];
+    
+    backButton = [[UIBarButtonItem alloc] initWithTitle:[MatrixKitL10n back] style:UIBarButtonItemStylePlain target:self action:@selector(goBack)];
+    
+    if (_URL.length)
+    {
+        self.URL = _URL;
+    }
+    else if (_localHTMLFile.length)
+    {
+        self.localHTMLFile = _localHTMLFile;
+    }
+}
+
+- (void)destroy
+{
+    if (webView)
+    {
+        webView.navigationDelegate = nil;
+        [webView stopLoading];
+        [webView removeFromSuperview];
+        webView = nil;
+    }
+    
+    backButton = nil;
+    
+    _URL = nil;
+    _localHTMLFile = nil;
+
+    [super destroy];
+}
+
+- (void)dealloc
+{
+    [self destroy];
+}
+
+- (void)setURL:(NSString *)URL
+{
+    [webView stopLoading];
+    
+    _URL = URL;
+    _localHTMLFile = nil;
+    
+    if (URL.length)
+    {
+        NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:URL]];
+        [webView loadRequest:request];
+    }
+}
+
+- (void)setLocalHTMLFile:(NSString *)localHTMLFile
+{
+    [webView stopLoading];
+    
+    _localHTMLFile = localHTMLFile;
+    _URL = nil;
+    
+    if (localHTMLFile.length)
+    {
+        NSString* htmlString = [NSString stringWithContentsOfFile:localHTMLFile encoding:NSUTF8StringEncoding error:nil];
+        [webView loadHTMLString:htmlString baseURL:nil];
+    }
+}
+
+- (void)goBack
+{
+    if (webView.canGoBack)
+    {
+        [webView goBack];
+    }
+    else if (_localHTMLFile.length)
+    {
+        // Reload local html file
+        self.localHTMLFile = _localHTMLFile;
+    }
+}
+
+#pragma mark - WKNavigationDelegate
+
+- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation
+{
+    // Handle back button visibility here
+    BOOL canGoBack = webView.canGoBack;
+
+    if (_localHTMLFile.length && !canGoBack)
+    {
+        // Check whether the current content is not the local html file
+        canGoBack = (![webView.URL.absoluteString isEqualToString:@"about:blank"]);
+    }
+
+    if (canGoBack)
+    {
+        self.navigationItem.rightBarButtonItem = backButton;
+    }
+    else
+    {
+        // Reset the original state
+        self.navigationItem.rightBarButtonItems = originalRightBarButtonItems;
+    }
+}
+
+- (void)webView:(WKWebView *)webView didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential * _Nullable credential))completionHandler
+{
+    NSURLProtectionSpace *protectionSpace = [challenge protectionSpace];
+    
+    // We handle here only the server trust authentication.
+    // We fallback to the default logic for other cases.
+    if (protectionSpace.authenticationMethod != NSURLAuthenticationMethodServerTrust || !protectionSpace.serverTrust)
+    {
+        completionHandler(NSURLSessionAuthChallengePerformDefaultHandling, nil);
+        return;
+    }
+    
+    SecTrustRef serverTrust = [protectionSpace serverTrust];
+    
+    // Check first whether there are some pinned certificates (certificate included in the bundle).
+    NSArray *paths = [[NSBundle mainBundle] pathsForResourcesOfType:@"cer" inDirectory:@"."];
+    if (paths.count)
+    {
+        NSMutableArray *pinnedCertificates = [NSMutableArray array];
+        for (NSString *path in paths)
+        {
+            NSData *certificateData = [NSData dataWithContentsOfFile:path];
+            [pinnedCertificates addObject:(__bridge_transfer id)SecCertificateCreateWithData(NULL, (__bridge CFDataRef)certificateData)];
+        }
+        // Only use these certificates to pin against, and do not trust the built-in anchor certificates.
+        SecTrustSetAnchorCertificates(serverTrust, (__bridge CFArrayRef)pinnedCertificates);
+    }
+    else
+    {
+        // Check whether some certificates have been trusted by the user (self-signed certificates support).
+        NSSet<NSData *> *certificates = [MXAllowedCertificates sharedInstance].certificates;
+        if (certificates.count)
+        {
+            NSMutableArray *allowedCertificates = [NSMutableArray array];
+            for (NSData *certificateData in certificates)
+            {
+                [allowedCertificates addObject:(__bridge_transfer id)SecCertificateCreateWithData(NULL, (__bridge CFDataRef)certificateData)];
+            }
+            // Add all the allowed certificates to the chain of trust
+            SecTrustSetAnchorCertificates(serverTrust, (__bridge CFArrayRef)allowedCertificates);
+            // Reenable trusting the built-in anchor certificates in addition to those passed in via the SecTrustSetAnchorCertificates API.
+            SecTrustSetAnchorCertificatesOnly(serverTrust, false);
+        }
+    }
+    
+    // Re-evaluate the trust policy
+    SecTrustResultType secresult = kSecTrustResultInvalid;
+    if (SecTrustEvaluate(serverTrust, &secresult) != errSecSuccess)
+    {
+        // Reject the server auth if an error occurs
+        completionHandler(NSURLSessionAuthChallengeRejectProtectionSpace, nil);
+    }
+    else
+    {
+        switch (secresult)
+        {
+            case kSecTrustResultUnspecified:    // The OS trusts this certificate implicitly.
+            case kSecTrustResultProceed:        // The user explicitly told the OS to trust it.
+            {
+                NSURLCredential *credential = [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust];
+                completionHandler(NSURLSessionAuthChallengeUseCredential, credential);
+                break;
+            }
+                
+            default:
+            {
+                completionHandler(NSURLSessionAuthChallengeCancelAuthenticationChallenge, nil);
+                break;
+            }
+        }
+    }
+}
+
+#pragma mark - WKUIDelegate
+
+- (WKWebView *)webView:(WKWebView *)webView createWebViewWithConfiguration:(nonnull WKWebViewConfiguration *)configuration forNavigationAction:(nonnull WKNavigationAction *)navigationAction windowFeatures:(nonnull WKWindowFeatures *)windowFeatures
+{
+    // Make sure we open links with `target="_blank"` within this webview
+    if (!navigationAction.targetFrame.isMainFrame)
+    {
+        [webView loadRequest:navigationAction.request];
+    }
+
+    return nil;
+}
+
+#pragma mark - WKScriptMessageHandler
+
+- (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message
+{
+    if ([message.name isEqualToString:kMXKWebViewViewControllerPostMessageJSLog])
+    {
+        MXLogDebug(@"-- JavaScript: %@", message.body);
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Libs/SwiftUTI/LICENSE b/Riot/Modules/MatrixKit/Libs/SwiftUTI/LICENSE
new file mode 100644
index 000000000..a0bf476a7
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Libs/SwiftUTI/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/Riot/Modules/MatrixKit/Libs/SwiftUTI/SWIFT_UTI_README.md b/Riot/Modules/MatrixKit/Libs/SwiftUTI/SWIFT_UTI_README.md
new file mode 100644
index 000000000..d23bf7763
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Libs/SwiftUTI/SWIFT_UTI_README.md
@@ -0,0 +1,4 @@
+Original source:
+https://github.com/mkeiser/SwiftUTI
+
+The pod of this library is no more maintained. At the time of writing this README, the official pod version is 1.0.6 whereas the last release of the library is 2.0.3. This last release has a podspec that points to 2.0.2.
diff --git a/Riot/Modules/MatrixKit/Libs/SwiftUTI/UTI.swift b/Riot/Modules/MatrixKit/Libs/SwiftUTI/UTI.swift
new file mode 100644
index 000000000..c3d66c481
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Libs/SwiftUTI/UTI.swift
@@ -0,0 +1,517 @@
+//
+//  UTI.swift
+//  fseventstool
+//
+//  Created by Matthias Keiser on 09.01.17.
+//  Copyright © 2017 Tristan Inc. All rights reserved.
+//
+
+import Foundation
+
+#if os(iOS) || os(watchOS)
+	import MobileCoreServices
+#elseif os(macOS)
+	import CoreServices
+#endif
+
+/// Instances of the UTI class represent a specific Universal Type Identifier, e.g. kUTTypeMPEG4.
+
+public class UTI: RawRepresentable, Equatable {
+
+	/**
+	The TagClass enum represents the supported tag classes.
+	
+	- fileExtension: kUTTagClassFilenameExtension
+	- mimeType: kUTTagClassMIMEType
+	- pbType: kUTTagClassNSPboardType
+	- osType: kUTTagClassOSType
+	*/
+	public enum TagClass: String {
+
+		/// Equivalent to kUTTagClassFilenameExtension
+		case fileExtension = "public.filename-extension"
+
+		/// Equivalent to kUTTagClassMIMEType
+		case mimeType = "public.mime-type"
+
+		#if os (macOS)
+
+		/// Equivalent to kUTTagClassNSPboardType
+		case pbType =  "com.apple.nspboard-type"
+
+		/// Equivalent to kUTTagClassOSType
+		case osType =  "com.apple.ostype"
+		#endif
+
+		/// Convenience variable for internal use.
+		
+		fileprivate var rawCFValue: CFString {
+			return self.rawValue as CFString
+		}
+	}
+
+	public typealias RawValue = String
+	public let rawValue: String
+
+
+	/// Convenience variable for internal use.
+
+	private var rawCFValue: CFString {
+
+		return self.rawValue as CFString
+	}
+
+	// MARK: Initialization
+
+
+	/**
+	
+	This is the designated initializer of the UTI class.
+	
+	 - Parameters:
+			- rawValue: A string that is a Universal Type Identifier, i.e. "com.foobar.baz" or a constant like kUTTypeMP3.
+	 - Returns:
+			An UTI instance representing the specified rawValue.
+	 - Note:
+			You should rarely use this method. The preferred way to initialize a known UTI is to use its static variable (i.e. UTI.pdf). You should make an extension to make your own types available as static variables.
+	
+	*/
+
+	public required init(rawValue: UTI.RawValue) {
+
+		self.rawValue = rawValue
+	}
+
+	/**
+
+	Initialize an UTI with a tag of a specified class.
+
+	- Parameters:
+		- tagClass: The class of the tag.
+		- value: The value of the tag.
+		- conformingTo: If specified, the returned UTI must conform to this UTI. If nil is specified, this parameter is ignored. The default is nil.
+	- Returns:
+		An UTI instance representing the specified rawValue. If no known UTI with the specified tags is found, a dynamic UTI is created.
+	- Note:
+		You should rarely need this method. It's usually simpler to use one of the specialized initialzers like
+		```convenience init?(withExtension fileExtension: String, conformingTo conforming: UTI? = nil)```
+	*/
+
+	public convenience init(withTagClass tagClass: TagClass, value: String, conformingTo conforming: UTI? = nil) {
+
+		let unmanagedIdentifier = UTTypeCreatePreferredIdentifierForTag(tagClass.rawCFValue, value as CFString, conforming?.rawCFValue)
+
+		// UTTypeCreatePreferredIdentifierForTag only returns nil if the tag class is unknwown, which can't happen to us since we use an
+		// enum of known values. Hence we can force-cast the result.
+
+        let identifier = (unmanagedIdentifier?.takeRetainedValue() as String?)!
+
+		self.init(rawValue: identifier)
+	}
+
+	/**
+
+	Initialize an UTI with a file extension.
+	
+	- Parameters:
+		- withExtension: The file extension (e.g. "txt").
+		- conformingTo: If specified, the returned UTI must conform to this UTI. If nil is specified, this parameter is ignored. The default is nil.
+	- Returns: 
+		An UTI corresponding to the specified values.
+	**/
+
+	public convenience init(withExtension fileExtension: String, conformingTo conforming: UTI? = nil) {
+
+		self.init(withTagClass:.fileExtension, value: fileExtension, conformingTo: conforming)
+	}
+
+	/**
+
+	Initialize an UTI with a MIME type.
+	
+	- Parameters:
+		- mimeType: The MIME type (e.g. "text/plain").
+		- conformingTo: If specified, the returned UTI must conform to this UTI. If nil is specified, this parameter is ignored. The default is nil.
+	- Returns:
+		An UTI corresponding to the specified values.
+	*/
+
+	public convenience init(withMimeType mimeType: String, conformingTo conforming: UTI? = nil) {
+
+		self.init(withTagClass:.mimeType, value: mimeType, conformingTo: conforming)
+	}
+
+	#if os(macOS)
+
+	/**
+
+	Initialize an UTI with a pasteboard type.
+    - Important: **This function is de-facto deprecated!** The old cocoa pasteboard types ( `NSStringPboardType`, `NSPDFPboardType`, etc) have been deprecated in favour of actual UTIs, and the constants are not available anymore in Swift. This function only works correctly with the values of these old constants, but _not_ with the replacement values (like `NSPasteboardTypeString` etc), since these already are UTIs.
+	- Parameters:
+		- pbType: The pasteboard type (e.g. NSPDFPboardType).
+		- conformingTo: If specified, the returned UTI must conform to this UTI. If nil is specified, this parameter is ignored. The default is nil.
+	- Returns:
+		An UTI corresponding to the specified values.
+	*/
+	public convenience init(withPBType pbType: String, conformingTo conforming: UTI? = nil) {
+
+		self.init(withTagClass:.pbType, value: pbType, conformingTo: conforming)
+	}
+
+	/**
+	Initialize an UTI with a OSType.
+	
+	- Parameters:
+		- osType: The OSType type as a string (e.g. "PDF ").
+		- conformingTo: If specified, the returned UTI must conform to this UTI. If nil is specified, this parameter is ignored. The default is nil.
+	- Returns:
+		An UTI corresponding to the specified values.
+	- Note:
+		You can use the variable ```OSType.string``` to get a string from an actual OSType.
+	*/
+
+	public convenience init(withOSType osType: String, conformingTo conforming: UTI? = nil) {
+
+		self.init(withTagClass:.osType, value: osType, conformingTo: conforming)
+	}
+
+	#endif
+
+	// MARK: Accessing Tags
+
+	/**
+
+	Returns the tag with the specified class.
+	
+	- Parameters:
+		- tagClass: The tag class to return.
+	- Returns:
+		The requested tag, or nil if there is no tag of the specified class.
+	*/
+
+	public func tag(with tagClass: TagClass) -> String? {
+
+		let unmanagedTag = UTTypeCopyPreferredTagWithClass(self.rawCFValue, tagClass.rawCFValue)
+
+		guard let tag = unmanagedTag?.takeRetainedValue() as String? else {
+			return nil
+		}
+
+		return tag
+	}
+
+	/// Return the file extension that corresponds the the UTI. Returns nil if not available.
+
+	public var fileExtension: String? {
+
+		return self.tag(with: .fileExtension)
+	}
+
+	/// Return the MIME type that corresponds the the UTI. Returns nil if not available.
+
+	public var mimeType: String? {
+
+		return self.tag(with: .mimeType)
+	}
+
+	#if os(macOS)
+
+	/// Return the pasteboard type that corresponds the the UTI. Returns nil if not available.
+
+	public var pbType: String? {
+
+		return self.tag(with: .pbType)
+	}
+
+	/// Return the OSType as a string that corresponds the the UTI. Returns nil if not available.
+	/// - Note: you can use the ```init(with string: String)``` initializer to construct an actual OSType from the returnes string.
+
+	public var osType: String? {
+
+		return self.tag(with: .osType)
+	}
+
+	#endif
+
+	/**
+
+	Returns all tags of the specified tag class.
+	
+	- Parameters:
+		- tagClass: The class of the requested tags.
+	- Returns:
+		An array of all tags of the receiver of the specified class.
+	*/
+
+	public func tags(with tagClass: TagClass) -> Array<String> {
+
+		let unmanagedTags = UTTypeCopyAllTagsWithClass(self.rawCFValue, tagClass.rawCFValue)
+
+		guard let tags = unmanagedTags?.takeRetainedValue() as? Array<CFString> else {
+			return []
+		}
+
+		return tags as Array<String>
+	}
+
+	// MARK: List all UTIs associated with a tag
+
+
+	/**
+	Returns all UTIs that are associated with a specified tag.
+	
+	- Parameters:
+	  - tag: The class of the specified tag.
+	  - value: The value of the tag.
+	  - conforming: If specified, the returned UTIs must conform to this UTI. If nil is specified, this parameter is ignored. The default is nil.
+	- Returns:
+		An array of all UTIs that satisfy the specified parameters.
+	*/
+
+	public static func utis(for tag: TagClass, value: String, conformingTo conforming: UTI? = nil) -> Array<UTI> {
+
+		let unmanagedIdentifiers = UTTypeCreateAllIdentifiersForTag(tag.rawCFValue, value as CFString, conforming?.rawCFValue)
+
+
+		guard let identifiers = unmanagedIdentifiers?.takeRetainedValue() as? Array<CFString> else {
+			return []
+		}
+
+		return identifiers.compactMap { UTI(rawValue: $0 as String) }
+	}
+
+	// MARK: Equality and Conformance to other UTIs
+
+	/**
+
+	Checks if the receiver conforms to a specified UTI.
+	
+	- Parameters:
+		- otherUTI: The UTI to which the receiver is compared.
+	- Returns:
+		```true``` if the receiver conforms to the specified UTI, ```false```otherwise.
+	*/
+
+	public func conforms(to otherUTI: UTI) -> Bool {
+
+		return UTTypeConformsTo(self.rawCFValue, otherUTI.rawCFValue) as Bool
+	}
+
+	public static func ==(lhs: UTI, rhs: UTI) -> Bool {
+
+		return UTTypeEqual(lhs.rawCFValue, rhs.rawCFValue) as Bool
+	}
+
+	// MARK: Accessing Information about an UTI
+
+	/// Returns the localized, user-readable type description string associated with a uniform type identifier.
+	
+	public var description: String? {
+
+		let unmanagedDescription = UTTypeCopyDescription(self.rawCFValue)
+
+		guard let description = unmanagedDescription?.takeRetainedValue() as String? else {
+			return nil
+		}
+
+		return description
+	}
+
+	/// Returns a uniform type’s declaration as a Dictionary, or nil if if no declaration for that type can be found.
+
+	public var declaration: [AnyHashable:Any]? {
+
+		let unmanagedDeclaration = UTTypeCopyDeclaration(self.rawCFValue)
+
+		guard let declaration = unmanagedDeclaration?.takeRetainedValue() as? [AnyHashable:Any] else {
+			return nil
+		}
+
+		return declaration
+	}
+
+	/// Returns the location of a bundle containing the declaration for a type, or nil if the bundle could not be located.
+
+	public var declaringBundleURL: URL? {
+
+		let unmanagedURL = UTTypeCopyDeclaringBundleURL(self.rawCFValue)
+
+		guard let url = unmanagedURL?.takeRetainedValue() as URL? else {
+			return nil
+		}
+
+		return url
+	}
+
+	/// Returns ```true``` if the receiver is a dynamic UTI.
+
+	public var isDynamic: Bool {
+
+		return UTTypeIsDynamic(self.rawCFValue)
+	}
+}
+
+
+// MARK: System defined UTIs
+
+public extension UTI {
+
+	static       let  item                        =    UTI(rawValue:  kUTTypeItem                        as  String)
+	static       let  content                     =    UTI(rawValue:  kUTTypeContent                     as  String)
+	static       let  compositeContent            =    UTI(rawValue:  kUTTypeCompositeContent            as  String)
+	static       let  message                     =    UTI(rawValue:  kUTTypeMessage                     as  String)
+	static       let  contact                     =    UTI(rawValue:  kUTTypeContact                     as  String)
+	static       let  archive                     =    UTI(rawValue:  kUTTypeArchive                     as  String)
+	static       let  diskImage                   =    UTI(rawValue:  kUTTypeDiskImage                   as  String)
+	static       let  data                        =    UTI(rawValue:  kUTTypeData                        as  String)
+	static       let  directory                   =    UTI(rawValue:  kUTTypeDirectory                   as  String)
+	static       let  resolvable                  =    UTI(rawValue:  kUTTypeResolvable                  as  String)
+	static       let  symLink                     =    UTI(rawValue:  kUTTypeSymLink                     as  String)
+	static       let  executable                  =    UTI(rawValue:  kUTTypeExecutable                  as  String)
+	static       let  mountPoint                  =    UTI(rawValue:  kUTTypeMountPoint                  as  String)
+	static       let  aliasFile                   =    UTI(rawValue:  kUTTypeAliasFile                   as  String)
+	static       let  aliasRecord                 =    UTI(rawValue:  kUTTypeAliasRecord                 as  String)
+	static       let  urlBookmarkData             =    UTI(rawValue:  kUTTypeURLBookmarkData             as  String)
+	static       let  url                         =    UTI(rawValue:  kUTTypeURL                         as  String)
+	static       let  fileURL                     =    UTI(rawValue:  kUTTypeFileURL                     as  String)
+	static       let  text                        =    UTI(rawValue:  kUTTypeText                        as  String)
+	static       let  plainText                   =    UTI(rawValue:  kUTTypePlainText                   as  String)
+	static       let  utf8PlainText               =    UTI(rawValue:  kUTTypeUTF8PlainText               as  String)
+	static       let  utf16ExternalPlainText      =    UTI(rawValue:  kUTTypeUTF16ExternalPlainText      as  String)
+	static       let  utf16PlainText              =    UTI(rawValue:  kUTTypeUTF16PlainText              as  String)
+	static       let  delimitedText               =    UTI(rawValue:  kUTTypeDelimitedText               as  String)
+	static       let  commaSeparatedText          =    UTI(rawValue:  kUTTypeCommaSeparatedText          as  String)
+	static       let  tabSeparatedText            =    UTI(rawValue:  kUTTypeTabSeparatedText            as  String)
+	static       let  utf8TabSeparatedText        =    UTI(rawValue:  kUTTypeUTF8TabSeparatedText        as  String)
+	static       let  rtf                         =    UTI(rawValue:  kUTTypeRTF                         as  String)
+	static       let  html                        =    UTI(rawValue:  kUTTypeHTML                        as  String)
+	static       let  xml                         =    UTI(rawValue:  kUTTypeXML                         as  String)
+	static       let  sourceCode                  =    UTI(rawValue:  kUTTypeSourceCode                  as  String)
+	static       let  assemblyLanguageSource      =    UTI(rawValue:  kUTTypeAssemblyLanguageSource      as  String)
+	static       let  cSource                     =    UTI(rawValue:  kUTTypeCSource                     as  String)
+	static       let  objectiveCSource            =    UTI(rawValue:  kUTTypeObjectiveCSource            as  String)
+	@available( OSX 10.11, iOS 9.0, * )
+	static       let  swiftSource				  =    UTI(rawValue:  kUTTypeSwiftSource				 as  String)
+	static       let  cPlusPlusSource             =    UTI(rawValue:  kUTTypeCPlusPlusSource             as  String)
+	static       let  objectiveCPlusPlusSource    =    UTI(rawValue:  kUTTypeObjectiveCPlusPlusSource    as  String)
+	static       let  cHeader                     =    UTI(rawValue:  kUTTypeCHeader                     as  String)
+	static       let  cPlusPlusHeader             =    UTI(rawValue:  kUTTypeCPlusPlusHeader             as  String)
+	static       let  javaSource                  =    UTI(rawValue:  kUTTypeJavaSource                  as  String)
+	static       let  script                      =    UTI(rawValue:  kUTTypeScript                      as  String)
+	static       let  appleScript                 =    UTI(rawValue:  kUTTypeAppleScript                 as  String)
+	static       let  osaScript                   =    UTI(rawValue:  kUTTypeOSAScript                   as  String)
+	static       let  osaScriptBundle             =    UTI(rawValue:  kUTTypeOSAScriptBundle             as  String)
+	static       let  javaScript                  =    UTI(rawValue:  kUTTypeJavaScript                  as  String)
+	static       let  shellScript                 =    UTI(rawValue:  kUTTypeShellScript                 as  String)
+	static       let  perlScript                  =    UTI(rawValue:  kUTTypePerlScript                  as  String)
+	static       let  pythonScript                =    UTI(rawValue:  kUTTypePythonScript                as  String)
+	static       let  rubyScript                  =    UTI(rawValue:  kUTTypeRubyScript                  as  String)
+	static       let  phpScript                   =    UTI(rawValue:  kUTTypePHPScript                   as  String)
+	static       let  json                        =    UTI(rawValue:  kUTTypeJSON                        as  String)
+	static       let  propertyList                =    UTI(rawValue:  kUTTypePropertyList                as  String)
+	static       let  xmlPropertyList             =    UTI(rawValue:  kUTTypeXMLPropertyList             as  String)
+	static       let  binaryPropertyList          =    UTI(rawValue:  kUTTypeBinaryPropertyList          as  String)
+	static       let  pdf                         =    UTI(rawValue:  kUTTypePDF                         as  String)
+	static       let  rtfd                        =    UTI(rawValue:  kUTTypeRTFD                        as  String)
+	static       let  flatRTFD                    =    UTI(rawValue:  kUTTypeFlatRTFD                    as  String)
+	static       let  txnTextAndMultimediaData    =    UTI(rawValue:  kUTTypeTXNTextAndMultimediaData    as  String)
+	static       let  webArchive                  =    UTI(rawValue:  kUTTypeWebArchive                  as  String)
+	static       let  image                       =    UTI(rawValue:  kUTTypeImage                       as  String)
+	static       let  jpeg                        =    UTI(rawValue:  kUTTypeJPEG                        as  String)
+	static       let  jpeg2000                    =    UTI(rawValue:  kUTTypeJPEG2000                    as  String)
+	static       let  tiff                        =    UTI(rawValue:  kUTTypeTIFF                        as  String)
+	static       let  pict                        =    UTI(rawValue:  kUTTypePICT                        as  String)
+	static       let  gif                         =    UTI(rawValue:  kUTTypeGIF                         as  String)
+	static       let  png                         =    UTI(rawValue:  kUTTypePNG                         as  String)
+	static       let  quickTimeImage              =    UTI(rawValue:  kUTTypeQuickTimeImage              as  String)
+	static       let  appleICNS                   =    UTI(rawValue:  kUTTypeAppleICNS                   as  String)
+	static       let  bmp                         =    UTI(rawValue:  kUTTypeBMP                         as  String)
+	static       let  ico                         =    UTI(rawValue:  kUTTypeICO                         as  String)
+	static       let  rawImage                    =    UTI(rawValue:  kUTTypeRawImage                    as  String)
+	static       let  scalableVectorGraphics      =    UTI(rawValue:  kUTTypeScalableVectorGraphics      as  String)
+	@available(OSX 10.12, iOS 9.1, watchOS 2.1, *)
+	static       let  livePhoto					  =    UTI(rawValue:  kUTTypeLivePhoto					 as  String)
+	@available(OSX 10.12, iOS 9.1, *)
+	static       let  audiovisualContent          =    UTI(rawValue:  kUTTypeAudiovisualContent          as  String)
+	static       let  movie                       =    UTI(rawValue:  kUTTypeMovie                       as  String)
+	static       let  video                       =    UTI(rawValue:  kUTTypeVideo                       as  String)
+	static       let  audio                       =    UTI(rawValue:  kUTTypeAudio                       as  String)
+	static       let  quickTimeMovie              =    UTI(rawValue:  kUTTypeQuickTimeMovie              as  String)
+	static       let  mpeg                        =    UTI(rawValue:  kUTTypeMPEG                        as  String)
+	static       let  mpeg2Video                  =    UTI(rawValue:  kUTTypeMPEG2Video                  as  String)
+	static       let  mpeg2TransportStream        =    UTI(rawValue:  kUTTypeMPEG2TransportStream        as  String)
+	static       let  mp3                         =    UTI(rawValue:  kUTTypeMP3                         as  String)
+	static       let  mpeg4                       =    UTI(rawValue:  kUTTypeMPEG4                       as  String)
+	static       let  mpeg4Audio                  =    UTI(rawValue:  kUTTypeMPEG4Audio                  as  String)
+	static       let  appleProtectedMPEG4Audio    =    UTI(rawValue:  kUTTypeAppleProtectedMPEG4Audio    as  String)
+	static       let  appleProtectedMPEG4Video    =    UTI(rawValue:  kUTTypeAppleProtectedMPEG4Video    as  String)
+	static       let  aviMovie                    =    UTI(rawValue:  kUTTypeAVIMovie                    as  String)
+	static       let  audioInterchangeFileFormat  =    UTI(rawValue:  kUTTypeAudioInterchangeFileFormat  as  String)
+	static       let  waveformAudio               =    UTI(rawValue:  kUTTypeWaveformAudio               as  String)
+	static       let  midiAudio                   =    UTI(rawValue:  kUTTypeMIDIAudio                   as  String)
+	static       let  playlist                    =    UTI(rawValue:  kUTTypePlaylist                    as  String)
+	static       let  m3UPlaylist                 =    UTI(rawValue:  kUTTypeM3UPlaylist                 as  String)
+	static       let  folder                      =    UTI(rawValue:  kUTTypeFolder                      as  String)
+	static       let  volume                      =    UTI(rawValue:  kUTTypeVolume                      as  String)
+	static       let  package                     =    UTI(rawValue:  kUTTypePackage                     as  String)
+	static       let  bundle                      =    UTI(rawValue:  kUTTypeBundle                      as  String)
+	static       let  pluginBundle                =    UTI(rawValue:  kUTTypePluginBundle                as  String)
+	static       let  spotlightImporter           =    UTI(rawValue:  kUTTypeSpotlightImporter           as  String)
+	static       let  quickLookGenerator          =    UTI(rawValue:  kUTTypeQuickLookGenerator          as  String)
+	static       let  xpcService                  =    UTI(rawValue:  kUTTypeXPCService                  as  String)
+	static       let  framework                   =    UTI(rawValue:  kUTTypeFramework                   as  String)
+	static       let  application                 =    UTI(rawValue:  kUTTypeApplication                 as  String)
+	static       let  applicationBundle           =    UTI(rawValue:  kUTTypeApplicationBundle           as  String)
+	static       let  applicationFile             =    UTI(rawValue:  kUTTypeApplicationFile             as  String)
+	static       let  unixExecutable              =    UTI(rawValue:  kUTTypeUnixExecutable              as  String)
+	static       let  windowsExecutable           =    UTI(rawValue:  kUTTypeWindowsExecutable           as  String)
+	static       let  javaClass                   =    UTI(rawValue:  kUTTypeJavaClass                   as  String)
+	static       let  javaArchive                 =    UTI(rawValue:  kUTTypeJavaArchive                 as  String)
+	static       let  systemPreferencesPane       =    UTI(rawValue:  kUTTypeSystemPreferencesPane       as  String)
+	static       let  gnuZipArchive               =    UTI(rawValue:  kUTTypeGNUZipArchive               as  String)
+	static       let  bzip2Archive                =    UTI(rawValue:  kUTTypeBzip2Archive                as  String)
+	static       let  zipArchive                  =    UTI(rawValue:  kUTTypeZipArchive                  as  String)
+	static       let  spreadsheet                 =    UTI(rawValue:  kUTTypeSpreadsheet                 as  String)
+	static       let  presentation                =    UTI(rawValue:  kUTTypePresentation                as  String)
+	static       let  database                    =    UTI(rawValue:  kUTTypeDatabase                    as  String)
+	static       let  vCard                       =    UTI(rawValue:  kUTTypeVCard                       as  String)
+	static       let  toDoItem                    =    UTI(rawValue:  kUTTypeToDoItem                    as  String)
+	static       let  calendarEvent               =    UTI(rawValue:  kUTTypeCalendarEvent               as  String)
+	static       let  emailMessage                =    UTI(rawValue:  kUTTypeEmailMessage                as  String)
+	static       let  internetLocation            =    UTI(rawValue:  kUTTypeInternetLocation            as  String)
+	static       let  inkText                     =    UTI(rawValue:  kUTTypeInkText                     as  String)
+	static       let  font                        =    UTI(rawValue:  kUTTypeFont                        as  String)
+	static       let  bookmark                    =    UTI(rawValue:  kUTTypeBookmark                    as  String)
+	static       let  _3DContent                  =    UTI(rawValue:  kUTType3DContent                   as  String)
+	static       let  pkcs12                      =    UTI(rawValue:  kUTTypePKCS12                      as  String)
+	static       let  x509Certificate             =    UTI(rawValue:  kUTTypeX509Certificate             as  String)
+	static       let  electronicPublication       =    UTI(rawValue:  kUTTypeElectronicPublication       as  String)
+	static       let  log                         =    UTI(rawValue:  kUTTypeLog                         as  String)
+}
+
+#if os(OSX)
+
+	extension OSType {
+
+
+		/// Returns the OSType encoded as a String.
+
+		var string: String {
+
+			let unmanagedString = UTCreateStringForOSType(self)
+
+			return unmanagedString.takeRetainedValue() as String
+		}
+
+
+		/// Initializes a OSType from a String.
+		///
+		/// - Parameter string: A String representing an OSType.
+		
+		init(with string: String) {
+			
+			self = UTGetOSTypeFromString(string as CFString)
+		}
+	}
+	
+#endif
diff --git a/Riot/Modules/MatrixKit/MatrixKit-Bridging-Header.h b/Riot/Modules/MatrixKit/MatrixKit-Bridging-Header.h
new file mode 100644
index 000000000..1653472db
--- /dev/null
+++ b/Riot/Modules/MatrixKit/MatrixKit-Bridging-Header.h
@@ -0,0 +1,16 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+
+#import "MXKAppSettings.h"
+#import "MXKTools.h"
+#import "NSBundle+MatrixKit.h"
+#import "NSBundle+MXKLanguage.h"
+#import "MXKAccount.h"
+#import "MXKAccountManager.h"
+#import "MXKContactManager.h"
+#import "MXSDKOptions.h"
+#import "MXKeyProvider.h"
+
+#import "MXKRoomInputToolbarView.h"
+#import "MXKImageView.h"
diff --git a/Riot/Modules/MatrixKit/MatrixKit.h b/Riot/Modules/MatrixKit/MatrixKit.h
new file mode 100644
index 000000000..b6e5806f4
--- /dev/null
+++ b/Riot/Modules/MatrixKit/MatrixKit.h
@@ -0,0 +1,155 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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/UIKit.h>
+
+#import "MXKConstants.h"
+
+#import "MXKAppSettings.h"
+
+#import "MXAggregatedReactions+MatrixKit.h"
+#import "MXEvent+MatrixKit.h"
+#import "MXRoom+Sync.h"
+#import "NSBundle+MatrixKit.h"
+#import "NSBundle+MXKLanguage.h"
+#import "UIAlertController+MatrixKit.h"
+#import "UIViewController+MatrixKit.h"
+
+#import "MXKEventFormatter.h"
+
+#import "MXKTools.h"
+
+#import "MXKErrorPresentation.h"
+#import "MXKErrorPresentable.h"
+#import "MXKErrorViewModel.h"
+#import "MXKErrorPresentableBuilder.h"
+#import "MXKErrorAlertPresentation.h"
+
+#import "MXKViewController.h"
+#import "MXKRoomViewController.h"
+#import "MXKRecentListViewController.h"
+#import "MXKRoomMemberListViewController.h"
+#import "MXKSearchViewController.h"
+#import "MXKCallViewController.h"
+#import "MXKContactListViewController.h"
+#import "MXKAccountDetailsViewController.h"
+#import "MXKContactDetailsViewController.h"
+#import "MXKRoomMemberDetailsViewController.h"
+#import "MXKNotificationSettingsViewController.h"
+#import "MXKAttachmentsViewController.h"
+#import "MXKRoomSettingsViewController.h"
+#import "MXKWebViewViewController.h"
+
+#import "MXKAuthenticationViewController.h"
+#import "MXKAuthInputsPasswordBasedView.h"
+#import "MXKAuthInputsEmailCodeBasedView.h"
+#import "MXKAuthenticationFallbackWebView.h"
+#import "MXKAuthenticationRecaptchaWebView.h"
+
+#import "MXKView.h"
+
+#import "MXKRoomCreationInputs.h"
+
+#import "MXKInterleavedRecentsDataSource.h"
+
+#import "MXKRoomCreationView.h"
+
+#import "MXKRoomInputToolbarView.h"
+#import "MXKRoomInputToolbarViewWithHPGrowingText.h"
+
+#import "MXKRoomDataSourceManager.h"
+
+#import "MXKRoomBubbleCellData.h"
+#import "MXKRoomBubbleCellDataWithAppendingMode.h"
+
+#import "MXKAttachment.h"
+
+#import "MXKRecentTableViewCell.h"
+#import "MXKInterleavedRecentTableViewCell.h"
+
+#import "MXKPublicRoomTableViewCell.h"
+
+#import "MXKDirectoryServersDataSource.h"
+#import "MXKDirectoryServerCellDataStoring.h"
+#import "MXKDirectoryServerCellData.h"
+
+#import "MXKRoomMemberTableViewCell.h"
+#import "MXKAccountTableViewCell.h"
+#import "MXKReadReceiptTableViewCell.h"
+#import "MXKPushRuleTableViewCell.h"
+#import "MXKPushRuleCreationTableViewCell.h"
+
+#import "MXKTableViewCellWithButton.h"
+#import "MXKTableViewCellWithButtons.h"
+#import "MXKTableViewCellWithLabelAndButton.h"
+#import "MXKTableViewCellWithLabelAndImageView.h"
+#import "MXKTableViewCellWithLabelAndMXKImageView.h"
+#import "MXKTableViewCellWithLabelAndSlider.h"
+#import "MXKTableViewCellWithLabelAndSubLabel.h"
+#import "MXKTableViewCellWithLabelAndSwitch.h"
+#import "MXKTableViewCellWithLabelAndTextField.h"
+#import "MXKTableViewCellWithLabelTextFieldAndButton.h"
+#import "MXKTableViewCellWithPicker.h"
+#import "MXKTableViewCellWithSearchBar.h"
+#import "MXKTableViewCellWithTextFieldAndButton.h"
+#import "MXKTableViewCellWithTextView.h"
+
+#import "MXKTableViewHeaderFooterWithLabel.h"
+
+#import "MXKMediaCollectionViewCell.h"
+#import "MXKPieChartView.h"
+#import "MXKPieChartHUD.h"
+
+#import "MXKRoomTitleView.h"
+#import "MXKRoomTitleViewWithTopic.h"
+
+#import "MXKRoomEmptyBubbleTableViewCell.h"
+
+#import "MXKRoomIncomingBubbleTableViewCell.h"
+#import "MXKRoomIncomingTextMsgBubbleCell.h"
+#import "MXKRoomIncomingTextMsgWithoutSenderInfoBubbleCell.h"
+#import "MXKRoomIncomingAttachmentBubbleCell.h"
+#import "MXKRoomIncomingAttachmentWithoutSenderInfoBubbleCell.h"
+
+#import "MXKRoomOutgoingBubbleTableViewCell.h"
+#import "MXKRoomOutgoingTextMsgBubbleCell.h"
+#import "MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h"
+#import "MXKRoomOutgoingAttachmentBubbleCell.h"
+#import "MXKRoomOutgoingAttachmentWithoutSenderInfoBubbleCell.h"
+
+#import "MXKSearchCellData.h"
+#import "MXKSearchTableViewCell.h"
+
+#import "MXKAccountManager.h"
+
+#import "MXKContactManager.h"
+
+#import "MXK3PID.h"
+
+#import "MXKDeviceView.h"
+#import "MXKEncryptionInfoView.h"
+#import "MXKEncryptionKeysExportView.h"
+
+#import "MXKCountryPickerViewController.h"
+#import "MXKLanguagePickerViewController.h"
+
+#import "MXKGroupCellData.h"
+#import "MXKSessionGroupsDataSource.h"
+#import "MXKGroupListViewController.h"
+#import "MXKGroupTableViewCell.h"
+
+#import "MXKSlashCommands.h"
diff --git a/Riot/Modules/MatrixKit/MatrixKitVersion.m b/Riot/Modules/MatrixKit/MatrixKitVersion.m
new file mode 100644
index 000000000..1ba29cf68
--- /dev/null
+++ b/Riot/Modules/MatrixKit/MatrixKitVersion.m
@@ -0,0 +1,19 @@
+/*
+ Copyright 2020 The Matrix.org Foundation C.I.C
+ 
+ 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/Foundation.h>
+
+NSString *const MatrixKitVersion = @"0.16.10";
diff --git a/Riot/Modules/MatrixKit/Models/Account/MXKAccount.h b/Riot/Modules/MatrixKit/Models/Account/MXKAccount.h
new file mode 100644
index 000000000..8d21f6e72
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Account/MXKAccount.h
@@ -0,0 +1,435 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2019 The Matrix.org Foundation C.I.C
+
+ 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 <MatrixSDK/MatrixSDK.h>
+
+@class MXKAccount;
+
+/**
+ Posted when account user information (display name, picture, presence) has been updated.
+ The notification object is the matrix user id of the account.
+ */
+extern NSString *const kMXKAccountUserInfoDidChangeNotification;
+
+/**
+ Posted when the activity of the Apple Push Notification Service has been changed.
+ The notification object is the matrix user id of the account.
+ */
+extern NSString *const kMXKAccountAPNSActivityDidChangeNotification;
+
+/**
+ Posted when the activity of the Push notification based on PushKit has been changed.
+ The notification object is the matrix user id of the account.
+ */
+extern NSString *const kMXKAccountPushKitActivityDidChangeNotification;
+
+/**
+ MXKAccount error domain
+ */
+extern NSString *const kMXKAccountErrorDomain;
+
+/**
+ Block called when a certificate change is observed during authentication challenge from a server.
+ 
+ @param mxAccount the account concerned by this certificate change.
+ @param certificate the server certificate to evaluate.
+ @return YES to accept/trust this certificate, NO to cancel/ignore it.
+ */
+typedef BOOL (^MXKAccountOnCertificateChange)(MXKAccount *mxAccount, NSData *certificate);
+
+/**
+ `MXKAccount` object contains the credentials of a logged matrix user. It is used to handle matrix
+ session and presence for this user.
+ */
+@interface MXKAccount : NSObject <NSCoding>
+
+/**
+ The account's credentials: homeserver, access token, user id.
+ */
+@property (nonatomic, readonly) MXCredentials *mxCredentials;
+
+/**
+ The identity server URL.
+ */
+@property (nonatomic) NSString *identityServerURL;
+
+/**
+ The antivirus server URL, if any (nil by default).
+ Set a non-null url to configure the antivirus scanner use.
+ */
+@property (nonatomic) NSString *antivirusServerURL;
+
+/**
+ The Push Gateway URL used to send event notifications to (nil by default).
+ This URL should be over HTTPS and never over HTTP.
+ */
+@property (nonatomic) NSString *pushGatewayURL;
+
+/**
+ The matrix REST client used to make matrix API requests.
+ */
+@property (nonatomic, readonly) MXRestClient *mxRestClient;
+
+/**
+ The matrix session opened with the account (nil by default).
+ */
+@property (nonatomic, readonly) MXSession *mxSession;
+
+/**
+ The account user's display name (nil by default, available if matrix session `mxSession` is opened).
+ The notification `kMXKAccountUserInfoDidChangeNotification` is posted in case of change of this property.
+ */
+@property (nonatomic, readonly) NSString *userDisplayName;
+
+/**
+ The account user's avatar url (nil by default, available if matrix session `mxSession` is opened).
+ The notification `kMXKAccountUserInfoDidChangeNotification` is posted in case of change of this property.
+ */
+@property (nonatomic, readonly) NSString *userAvatarUrl;
+
+/**
+ The account display name based on user id and user displayname (if any).
+ */
+@property (nonatomic, readonly) NSString *fullDisplayName;
+
+/**
+ The 3PIDs linked to this account.
+ [self load3PIDs] must be called to update the property.
+ */
+@property (nonatomic, readonly) NSArray<MXThirdPartyIdentifier *> *threePIDs;
+
+/**
+ The email addresses linked to this account.
+ This is a subset of self.threePIDs.
+ */
+@property (nonatomic, readonly) NSArray<NSString *> *linkedEmails;
+
+/**
+ The phone numbers linked to this account.
+ This is a subset of self.threePIDs.
+ */
+@property (nonatomic, readonly) NSArray<NSString *> *linkedPhoneNumbers;
+
+/**
+ The account user's device.
+ [self loadDeviceInformation] must be called to update the property.
+ */
+@property (nonatomic, readonly) MXDevice *device;
+
+/**
+ The account user's presence (`MXPresenceUnknown` by default, available if matrix session `mxSession` is opened).
+ The notification `kMXKAccountUserInfoDidChangeNotification` is posted in case of change of this property.      
+ */
+@property (nonatomic, readonly) MXPresence userPresence;
+
+/**
+ The account user's tint color: a unique color fixed by the user id. This tint color may be used to highlight
+ rooms which belong to this account's user.
+ */
+@property (nonatomic, readonly) UIColor *userTintColor;
+
+/**
+ The Apple Push Notification Service activity for this account. YES when APNS is turned on (locally available and synced with server).
+ */
+@property (nonatomic, readonly) BOOL pushNotificationServiceIsActive;
+
+/**
+ Transient information storage.
+ */
+@property (nonatomic, strong, readonly) NSMutableDictionary<NSString *, id<NSCoding>> *others;
+
+/**
+ Enable Push notification based on Apple Push Notification Service (APNS).
+
+ This method creates or removes a pusher on the homeserver.
+
+ @param enable YES to enable it.
+ @param success A block object called when the operation succeeds.
+ @param failure A block object called when the operation fails.
+ */
+- (void)enablePushNotifications:(BOOL)enable
+                        success:(void (^)(void))success
+                        failure:(void (^)(NSError *))failure;
+
+/**
+ Flag to indicate that an APNS pusher has been set on the homeserver for this device.
+ */
+@property (nonatomic, readonly) BOOL hasPusherForPushNotifications;
+
+/**
+ The Push notification activity (based on PushKit) for this account.
+ YES when Push is turned on (locally available and enabled homeserver side).
+ */
+@property (nonatomic, readonly) BOOL isPushKitNotificationActive;
+
+/**
+ Enable Push notification based on PushKit.
+
+ This method creates or removes a pusher on the homeserver.
+
+ @param enable YES to enable it.
+ @param success A block object called when the operation succeeds.
+ @param failure A block object called when the operation fails.
+ */
+- (void)enablePushKitNotifications:(BOOL)enable
+                           success:(void (^)(void))success
+                           failure:(void (^)(NSError *))failure;
+
+/**
+ Flag to indicate that a PushKit pusher has been set on the homeserver for this device.
+ */
+@property (nonatomic, readonly) BOOL hasPusherForPushKitNotifications;
+
+
+/**
+ Enable In-App notifications based on Remote notifications rules.
+ NO by default.
+ */
+@property (nonatomic) BOOL enableInAppNotifications;
+
+/**
+ Disable the account without logging out (NO by default).
+ 
+ A matrix session is automatically opened for the account when this property is toggled from YES to NO.
+ The session is closed when this property is set to YES.
+ */
+@property (nonatomic,getter=isDisabled) BOOL disabled;
+
+/**
+ Manage the online presence event.
+ 
+ The presence event must not be sent if the application is launched by a push notification.
+ */
+@property (nonatomic) BOOL hideUserPresence;
+
+/**
+ Flag indicating if the end user has been warned about encryption and its limitations.
+ */
+@property (nonatomic,getter=isWarnedAboutEncryption) BOOL warnedAboutEncryption;
+
+/**
+ Register the MXKAccountOnCertificateChange block that will be used to handle certificate change during account use.
+ This block is nil by default, any new certificate is ignored/untrusted (this will abort the connection to the server).
+ 
+ @param onCertificateChangeBlock the block that will be used to handle certificate change.
+ */
++ (void)registerOnCertificateChangeBlock:(MXKAccountOnCertificateChange)onCertificateChangeBlock;
+
+/**
+ Get the color code related to a specific presence.
+ 
+ @param presence a user presence
+ @return color defined for the provided presence (nil if no color is defined).
+ */
++ (UIColor*)presenceColor:(MXPresence)presence;
+
+/**
+ Init `MXKAccount` instance with credentials. No matrix session is opened by default.
+ 
+ @param credentials user's credentials
+ */
+- (instancetype)initWithCredentials:(MXCredentials*)credentials;
+
+/**
+ Create a matrix session based on the provided store.
+ When store data is ready, the live stream is automatically launched by synchronising the session with the server.
+ 
+ In case of failure during server sync, the method is reiterated until the data is up-to-date with the server.
+ This loop is stopped if you call [MXCAccount closeSession:], it is suspended if you call [MXCAccount pauseInBackgroundTask].
+ 
+ @param store the store to use for the session.
+ */
+-(void)openSessionWithStore:(id<MXStore>)store;
+
+/**
+ Close the matrix session.
+ 
+ @param clearStore set YES to delete all store data.
+ */
+- (void)closeSession:(BOOL)clearStore;
+
+/**
+ Invalidate the access token, close the matrix session and delete all store data.
+ 
+ @note This method is equivalent to `logoutSendingServerRequest:completion:` with `sendLogoutServerRequest` parameter to YES
+ 
+ @param completion the block to execute at the end of the operation (independently if it succeeded or not).
+ */
+- (void)logout:(void (^)(void))completion;
+
+/**
+ Invalidate the access token, close the matrix session and delete all store data.
+ 
+ @param sendLogoutServerRequest indicate to send logout request to homeserver.
+ @param completion the block to execute at the end of the operation (independently if it succeeded or not).
+ */
+- (void)logoutSendingServerRequest:(BOOL)sendLogoutServerRequest
+                        completion:(void (^)(void))completion;
+
+
+#pragma mark - Soft logout
+
+/**
+ Flag to indicate if the account has been logged out by the homeserver admin.
+ */
+@property (nonatomic, readonly) BOOL isSoftLogout;
+
+/**
+ Soft logout the account.
+
+ The matix session is stopped but the data is kept.
+ */
+- (void)softLogout;
+
+/**
+ Hydrate the account using the credentials provided.
+
+ @param credentials the new credentials.
+*/
+- (void)hydrateWithCredentials:(MXCredentials*)credentials;
+
+/**
+ Pause the current matrix session.
+ 
+ @warning: This matrix session is paused without using background task if no background mode handler
+ is set in the MXSDKOptions sharedInstance (see `backgroundModeHandler`).
+ */
+- (void)pauseInBackgroundTask;
+
+/**
+ Perform a background sync by keeping the user offline.
+ 
+ @warning: This operation failed when no background mode handler is set in the
+ MXSDKOptions sharedInstance (see `backgroundModeHandler`).
+ 
+ @param timeout the timeout in milliseconds.
+ @param success A block object called when the operation succeeds.
+ @param failure A block object called when the operation fails.
+ */
+- (void)backgroundSync:(unsigned int)timeout success:(void (^)(void))success failure:(void (^)(NSError *))failure;
+
+/**
+ Resume the current matrix session.
+ */
+- (void)resume;
+
+/**
+ Close the potential matrix session and open a new one if the account is not disabled.
+ 
+ @param clearCache set YES to delete all store data.
+ */
+- (void)reload:(BOOL)clearCache;
+
+/**
+ Set the display name of the account user.
+ 
+ @param displayname the new display name.
+ 
+ @param success A block object called when the operation succeeds.
+ @param failure A block object called when the operation fails.
+ */
+- (void)setUserDisplayName:(NSString*)displayname success:(void (^)(void))success failure:(void (^)(NSError *error))failure;
+
+/**
+ Set the avatar url of the account user.
+ 
+ @param avatarUrl the new avatar url.
+ 
+ @param success A block object called when the operation succeeds.
+ @param failure A block object called when the operation fails.
+ */
+- (void)setUserAvatarUrl:(NSString*)avatarUrl success:(void (^)(void))success failure:(void (^)(NSError *error))failure;
+
+/**
+ Update the account password.
+ 
+ @param oldPassword the old password.
+ @param newPassword the new password.
+ 
+ @param success A block object called when the operation succeeds.
+ @param failure A block object called when the operation fails.
+ */
+- (void)changePassword:(NSString*)oldPassword with:(NSString*)newPassword success:(void (^)(void))success failure:(void (^)(NSError *error))failure;
+
+/**
+ Load the 3PIDs linked to this account.
+ This method must be called to refresh self.threePIDs and self.linkedEmails.
+
+ @param success A block object called when the operation succeeds.
+ @param failure A block object called when the operation fails.
+ */
+- (void)load3PIDs:(void (^)(void))success failure:(void (^)(NSError *error))failure;
+
+/**
+ Load the current device information for this account.
+ This method must be called to refresh self.device.
+ 
+ @param success A block object called when the operation succeeds.
+ @param failure A block object called when the operation fails.
+ */
+- (void)loadDeviceInformation:(void (^)(void))success failure:(void (^)(NSError *error))failure;
+
+#pragma mark - Push notification listeners
+/**
+ Register a listener to push notifications for the account's session.
+ 
+ The listener will be called when a push rule matches a live event.
+ Note: only one listener is supported. Potential existing listener is removed.
+ 
+ You may use `[MXCAccount updateNotificationListenerForRoomId:]` to disable/enable all notifications from a specific room.
+ 
+ @param onNotification the block that will be called once a live event matches a push rule.
+ */
+- (void)listenToNotifications:(MXOnNotification)onNotification;
+
+/**
+ Unregister the listener.
+ */
+- (void)removeNotificationListener;
+
+/**
+ Update the listener to ignore or restore notifications from a specific room.
+ 
+ @param roomID the id of the concerned room.
+ @param isIgnored YES to disable notifications from the specified room. NO to restore them.
+ */
+- (void)updateNotificationListenerForRoomId:(NSString*)roomID ignore:(BOOL)isIgnored;
+
+#pragma mark - Crypto
+/**
+ Delete the device id.
+
+ Call this method when the current device id cannot be used anymore.
+ */
+- (void)resetDeviceId;
+
+#pragma mark - Sync filter
+/**
+ Check if the homeserver supports room members lazy loading.
+ @param completion the check result.
+ */
+- (void)supportLazyLoadOfRoomMembers:(void (^)(BOOL supportLazyLoadOfRoomMembers))completion;
+
+/**
+ Call this method at an appropriate time to attempt dehydrating to a new backup device
+ */
+- (void)attemptDeviceDehydrationWithKeyData:(NSData *)keyData
+                                    success:(void (^)(void))success
+                                    failure:(void (^)(NSError *error))failure;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Account/MXKAccount.m b/Riot/Modules/MatrixKit/Models/Account/MXKAccount.m
new file mode 100644
index 000000000..c30867251
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Account/MXKAccount.m
@@ -0,0 +1,2228 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 New Vector Ltd
+ Copyright 2019 The Matrix.org Foundation C.I.C
+
+ 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 "MXKAccount.h"
+
+#import "MXKAccountManager.h"
+#import "MXKRoomDataSourceManager.h"
+#import "MXKEventFormatter.h"
+
+#import "MXKTools.h"
+#import "MXKContactManager.h"
+
+#import "MXKConstants.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import <AFNetworking/AFNetworking.h>
+
+#import <MatrixSDK/MXBackgroundModeHandler.h>
+
+#import "MXKSwiftHeader.h"
+
+NSString *const kMXKAccountUserInfoDidChangeNotification = @"kMXKAccountUserInfoDidChangeNotification";
+NSString *const kMXKAccountAPNSActivityDidChangeNotification = @"kMXKAccountAPNSActivityDidChangeNotification";
+NSString *const kMXKAccountPushKitActivityDidChangeNotification = @"kMXKAccountPushKitActivityDidChangeNotification";
+
+NSString *const kMXKAccountErrorDomain = @"kMXKAccountErrorDomain";
+
+static MXKAccountOnCertificateChange _onCertificateChangeBlock;
+/**
+ HTTP status codes for error cases on initial sync requests, for which errors will not be propagated to the client.
+ */
+static NSArray<NSNumber*> *initialSyncSilentErrorsHTTPStatusCodes;
+
+@interface MXKAccount ()
+{
+    // We will notify user only once on session failure
+    BOOL notifyOpenSessionFailure;
+    
+    // The timer used to postpone server sync on failure
+    NSTimer* initialServerSyncTimer;
+    
+    // Reachability observer
+    id reachabilityObserver;
+    
+    // Session state observer
+    id sessionStateObserver;
+    
+    // Handle user's settings change
+    id userUpdateListener;
+    
+    // Used for logging application start up
+    NSDate *openSessionStartDate;
+    
+    // Event notifications listener
+    id notificationCenterListener;
+    
+    // Internal list of ignored rooms
+    NSMutableArray* ignoredRooms;
+    
+    // If a server sync is in progress, the pause is delayed at the end of sync (except if resume is called).
+    BOOL isPauseRequested;
+    
+    // Background sync management
+    MXOnBackgroundSyncDone backgroundSyncDone;
+    MXOnBackgroundSyncFail backgroundSyncFails;
+    NSTimer* backgroundSyncTimer;
+
+    // Observe UIApplicationSignificantTimeChangeNotification to refresh MXRoomSummaries on time formatting change.
+    id UIApplicationSignificantTimeChangeNotificationObserver;
+
+    // Observe NSCurrentLocaleDidChangeNotification to refresh MXRoomSummaries on time formatting change.
+    id NSCurrentLocaleDidChangeNotificationObserver;
+}
+
+@property (nonatomic, strong) id<MXBackgroundTask> backgroundTask;
+@property (nonatomic, strong) id<MXBackgroundTask> backgroundSyncBgTask;
+
+@property (nonatomic, strong) NSMutableDictionary<NSString *, id<NSCoding>> *others;
+
+@end
+
+@implementation MXKAccount
+@synthesize mxCredentials, mxSession, mxRestClient;
+@synthesize threePIDs;
+@synthesize userPresence;
+@synthesize userTintColor;
+@synthesize hideUserPresence;
+
++ (void)load
+{
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        initialSyncSilentErrorsHTTPStatusCodes = @[
+            @(504),
+            @(522),
+            @(524),
+            @(599)
+        ];
+    });
+}
+
++ (void)registerOnCertificateChangeBlock:(MXKAccountOnCertificateChange)onCertificateChangeBlock
+{
+    _onCertificateChangeBlock = onCertificateChangeBlock;
+}
+
++ (UIColor*)presenceColor:(MXPresence)presence
+{
+    switch (presence)
+    {
+        case MXPresenceOnline:
+            return [[MXKAppSettings standardAppSettings] presenceColorForOnlineUser];
+        case MXPresenceUnavailable:
+            return [[MXKAppSettings standardAppSettings] presenceColorForUnavailableUser];
+        case MXPresenceOffline:
+            return [[MXKAppSettings standardAppSettings] presenceColorForOfflineUser];
+        case MXPresenceUnknown:
+        default:
+            return nil;
+    }
+}
+
+- (instancetype)initWithCredentials:(MXCredentials*)credentials
+{
+    if (self = [super init])
+    {
+        notifyOpenSessionFailure = YES;
+        
+        // Report credentials and alloc REST client.
+        mxCredentials = credentials;
+        [self prepareRESTClient];
+        
+        userPresence = MXPresenceUnknown;
+        
+        // Refresh device information
+        [self loadDeviceInformation:nil failure:nil];
+
+        [self registerAccountDataDidChangeIdentityServerNotification];
+        [self registerIdentityServiceDidChangeAccessTokenNotification];
+    }
+    return self;
+}
+
+- (void)dealloc
+{
+    [self closeSession:NO];
+    mxSession = nil;
+    
+    [mxRestClient close];
+    mxRestClient = nil;
+}
+
+#pragma mark - NSCoding
+
+- (id)initWithCoder:(NSCoder *)coder
+{
+    self = [super init];
+    
+    if (self)
+    {
+        notifyOpenSessionFailure = YES;
+        
+        NSString *homeServerURL = [coder decodeObjectForKey:@"homeserverurl"];
+        NSString *userId = [coder decodeObjectForKey:@"userid"];
+        NSString *accessToken = [coder decodeObjectForKey:@"accesstoken"];
+        _identityServerURL = [coder decodeObjectForKey:@"identityserverurl"];
+        NSString *identityServerAccessToken = [coder decodeObjectForKey:@"identityserveraccesstoken"];
+        
+        mxCredentials = [[MXCredentials alloc] initWithHomeServer:homeServerURL
+                                                           userId:userId
+                                                      accessToken:accessToken];
+
+        mxCredentials.identityServer = _identityServerURL;
+        mxCredentials.identityServerAccessToken = identityServerAccessToken;
+        mxCredentials.deviceId = [coder decodeObjectForKey:@"deviceId"];  
+        mxCredentials.allowedCertificate = [coder decodeObjectForKey:@"allowedCertificate"];
+        
+        [self prepareRESTClient];
+        
+        [self registerAccountDataDidChangeIdentityServerNotification];
+        [self registerIdentityServiceDidChangeAccessTokenNotification];
+
+        if ([coder decodeObjectForKey:@"threePIDs"])
+        {
+            threePIDs = [coder decodeObjectForKey:@"threePIDs"];
+        }
+        
+        if ([coder decodeObjectForKey:@"device"])
+        {
+            _device = [coder decodeObjectForKey:@"device"];
+        }
+
+        userPresence = MXPresenceUnknown;
+        
+        if ([coder decodeObjectForKey:@"antivirusserverurl"])
+        {
+            _antivirusServerURL = [coder decodeObjectForKey:@"antivirusserverurl"];
+        }
+        
+        if ([coder decodeObjectForKey:@"pushgatewayurl"])
+        {
+            _pushGatewayURL = [coder decodeObjectForKey:@"pushgatewayurl"];
+        }
+        
+        _hasPusherForPushNotifications = [coder decodeBoolForKey:@"_enablePushNotifications"];
+        _hasPusherForPushKitNotifications = [coder decodeBoolForKey:@"enablePushKitNotifications"];
+        _enableInAppNotifications = [coder decodeBoolForKey:@"enableInAppNotifications"];
+        
+        _disabled = [coder decodeBoolForKey:@"disabled"];
+        _isSoftLogout = [coder decodeBoolForKey:@"isSoftLogout"];
+
+        _warnedAboutEncryption = [coder decodeBoolForKey:@"warnedAboutEncryption"];
+        
+        _others = [coder decodeObjectForKey:@"others"];
+        
+        // Refresh device information
+        [self loadDeviceInformation:nil failure:nil];
+    }
+    
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder
+{
+    [coder encodeObject:mxCredentials.homeServer forKey:@"homeserverurl"];
+    [coder encodeObject:mxCredentials.userId forKey:@"userid"];
+    [coder encodeObject:mxCredentials.accessToken forKey:@"accesstoken"];
+    [coder encodeObject:mxCredentials.identityServerAccessToken forKey:@"identityserveraccesstoken"];
+
+    if (mxCredentials.deviceId)
+    {
+        [coder encodeObject:mxCredentials.deviceId forKey:@"deviceId"];
+    }
+
+    if (mxCredentials.allowedCertificate)
+    {
+        [coder encodeObject:mxCredentials.allowedCertificate forKey:@"allowedCertificate"];
+    }
+
+    if (self.threePIDs)
+    {
+        [coder encodeObject:threePIDs forKey:@"threePIDs"];
+    }
+    
+    if (self.device)
+    {
+        [coder encodeObject:_device forKey:@"device"];
+    }
+
+    if (self.identityServerURL)
+    {
+        [coder encodeObject:_identityServerURL forKey:@"identityserverurl"];
+    }
+    
+    if (self.antivirusServerURL)
+    {
+        [coder encodeObject:_antivirusServerURL forKey:@"antivirusserverurl"];
+    }
+    
+    if (self.pushGatewayURL)
+    {
+        [coder encodeObject:_pushGatewayURL forKey:@"pushgatewayurl"];
+    }
+    
+    [coder encodeBool:_hasPusherForPushNotifications forKey:@"_enablePushNotifications"];
+    [coder encodeBool:_hasPusherForPushKitNotifications forKey:@"enablePushKitNotifications"];
+    [coder encodeBool:_enableInAppNotifications forKey:@"enableInAppNotifications"];
+    
+    [coder encodeBool:_disabled forKey:@"disabled"];
+    [coder encodeBool:_isSoftLogout forKey:@"isSoftLogout"];
+
+    [coder encodeBool:_warnedAboutEncryption forKey:@"warnedAboutEncryption"];
+    
+    [coder encodeObject:_others forKey:@"others"];
+}
+
+#pragma mark - Properties
+
+- (void)setIdentityServerURL:(NSString *)identityServerURL
+{
+    if (identityServerURL.length)
+    {
+        _identityServerURL = identityServerURL;
+        mxCredentials.identityServer = identityServerURL;
+        
+        // Update services used in MXSession
+        [mxSession setIdentityServer:mxCredentials.identityServer andAccessToken:mxCredentials.identityServerAccessToken];
+    }
+    else
+    {
+        _identityServerURL = nil;
+        [mxSession setIdentityServer:nil andAccessToken:nil];
+    }
+    
+    // Archive updated field
+    [[MXKAccountManager sharedManager] saveAccounts];
+}
+
+- (void)setAntivirusServerURL:(NSString *)antivirusServerURL
+{
+    _antivirusServerURL = antivirusServerURL;
+    // Update the current session if any
+    [mxSession setAntivirusServerURL:antivirusServerURL];
+    
+    // Archive updated field
+    [[MXKAccountManager sharedManager] saveAccounts];
+}
+
+- (void)setPushGatewayURL:(NSString *)pushGatewayURL
+{
+    _pushGatewayURL = pushGatewayURL.length ? pushGatewayURL : nil;
+
+    MXLogDebug(@"[MXKAccount][Push] setPushGatewayURL: %@", _pushGatewayURL);
+    
+    // Archive updated field
+    [[MXKAccountManager sharedManager] saveAccounts];
+}
+
+- (NSString*)userDisplayName
+{
+    if (mxSession)
+    {
+        return mxSession.myUser.displayname;
+    }
+    return nil;
+}
+
+- (NSString*)userAvatarUrl
+{
+    if (mxSession)
+    {
+        return mxSession.myUser.avatarUrl;
+    }
+    return nil;
+}
+
+- (NSString*)fullDisplayName
+{
+    if (self.userDisplayName.length)
+    {
+        return [NSString stringWithFormat:@"%@ (%@)", self.userDisplayName, mxCredentials.userId];
+    }
+    else
+    {
+        return mxCredentials.userId;
+    }
+}
+
+- (NSArray<MXThirdPartyIdentifier *> *)threePIDs
+{
+    return threePIDs;
+}
+
+- (NSArray<NSString *> *)linkedEmails
+{
+    NSMutableArray<NSString *> *linkedEmails = [NSMutableArray array];
+
+    for (MXThirdPartyIdentifier *threePID in threePIDs)
+    {
+        if ([threePID.medium isEqualToString:kMX3PIDMediumEmail])
+        {
+            [linkedEmails addObject:threePID.address];
+        }
+    }
+
+    return linkedEmails;
+}
+
+- (NSArray<NSString *> *)linkedPhoneNumbers
+{
+    NSMutableArray<NSString *> *linkedPhoneNumbers = [NSMutableArray array];
+    
+    for (MXThirdPartyIdentifier *threePID in threePIDs)
+    {
+        if ([threePID.medium isEqualToString:kMX3PIDMediumMSISDN])
+        {
+            [linkedPhoneNumbers addObject:threePID.address];
+        }
+    }
+    
+    return linkedPhoneNumbers;
+}
+
+- (UIColor*)userTintColor
+{
+    if (!userTintColor)
+    {
+        userTintColor = [MXKTools colorWithRGBValue:[mxCredentials.userId hash]];
+    }
+    
+    return userTintColor;
+}
+
+- (BOOL)pushNotificationServiceIsActive
+{
+    BOOL pushNotificationServiceIsActive = ([[MXKAccountManager sharedManager] isAPNSAvailable] && _hasPusherForPushNotifications && mxSession);
+    MXLogDebug(@"[MXKAccount][Push] pushNotificationServiceIsActive: %@", @(pushNotificationServiceIsActive));
+
+    return pushNotificationServiceIsActive;
+}
+
+- (void)enablePushNotifications:(BOOL)enable
+                        success:(void (^)(void))success
+                        failure:(void (^)(NSError *))failure
+{
+    MXLogDebug(@"[MXKAccount][Push] enablePushNotifications: %@", @(enable));
+
+    if (enable)
+    {
+        if ([[MXKAccountManager sharedManager] isAPNSAvailable])
+        {
+            MXLogDebug(@"[MXKAccount][Push] enablePushNotifications: Enable Push for %@ account", self.mxCredentials.userId);
+
+            // Create/restore the pusher
+            [self enableAPNSPusher:YES success:^{
+
+                MXLogDebug(@"[MXKAccount][Push] enablePushNotifications: Enable Push: Success");
+                if (success)
+                {
+                    success();
+                }
+            } failure:^(NSError *error) {
+
+                MXLogDebug(@"[MXKAccount][Push] enablePushNotifications: Enable Push: Error: %@", error);
+                if (failure)
+                {
+                    failure(error);
+                }
+            }];
+        }
+        else
+        {
+            MXLogDebug(@"[MXKAccount][Push] enablePushNotifications: Error: Cannot enable Push");
+
+            NSError *error = [NSError errorWithDomain:kMXKAccountErrorDomain
+                                                 code:0
+                                             userInfo:@{
+                                                        NSLocalizedDescriptionKey:
+                                                            [MatrixKitL10n accountErrorPushNotAllowed]
+                                                        }];
+            if (failure)
+            {
+                failure (error);
+            }
+        }
+    }
+    else if (_hasPusherForPushNotifications)
+    {
+        MXLogDebug(@"[MXKAccount][Push] enablePushNotifications: Disable APNS for %@ account", self.mxCredentials.userId);
+        
+        // Delete the pusher, report the new value only on success.
+        [self enableAPNSPusher:NO
+                       success:^{
+
+                           MXLogDebug(@"[MXKAccount][Push] enablePushNotifications: Disable Push: Success");
+                           if (success)
+                           {
+                               success();
+                           }
+                       } failure:^(NSError *error) {
+
+                           MXLogDebug(@"[MXKAccount][Push] enablePushNotifications: Disable Push: Error: %@", error);
+                           if (failure)
+                           {
+                               failure(error);
+                           }
+                       }];
+    }
+}
+
+- (BOOL)isPushKitNotificationActive
+{
+    BOOL isPushKitNotificationActive = ([[MXKAccountManager sharedManager] isPushAvailable] && _hasPusherForPushKitNotifications && mxSession);
+    MXLogDebug(@"[MXKAccount][Push] isPushKitNotificationActive: %@", @(isPushKitNotificationActive));
+
+    return isPushKitNotificationActive;
+}
+
+- (void)enablePushKitNotifications:(BOOL)enable
+                           success:(void (^)(void))success
+                           failure:(void (^)(NSError *))failure
+{
+    MXLogDebug(@"[MXKAccount][Push] enablePushKitNotifications: %@", @(enable));
+
+    if (enable)
+    {
+        if ([[MXKAccountManager sharedManager] isPushAvailable])
+        {
+            MXLogDebug(@"[MXKAccount][Push] enablePushKitNotifications: Enable Push for %@ account", self.mxCredentials.userId);
+
+            // Create/restore the pusher
+            [self enablePushKitPusher:YES success:^{
+
+                MXLogDebug(@"[MXKAccount][Push] enablePushKitNotifications: Enable Push: Success");
+                if (success)
+                {
+                    success();
+                }
+            } failure:^(NSError *error) {
+
+                MXLogDebug(@"[MXKAccount][Push] enablePushKitNotifications: Enable Push: Error: %@", error);
+                if (failure)
+                {
+                    failure(error);
+                }
+            }];
+        }
+        else
+        {
+            MXLogDebug(@"[MXKAccount][Push] enablePushKitNotifications: Error: Cannot enable Push");
+
+            NSError *error = [NSError errorWithDomain:kMXKAccountErrorDomain
+                                                 code:0
+                                             userInfo:@{
+                                                        NSLocalizedDescriptionKey:
+                                                            [MatrixKitL10n accountErrorPushNotAllowed]
+                                                        }];
+            failure (error);
+        }
+    }
+    else if (_hasPusherForPushKitNotifications)
+    {
+        MXLogDebug(@"[MXKAccount][Push] enablePushKitNotifications: Disable Push for %@ account", self.mxCredentials.userId);
+
+        // Delete the pusher, report the new value only on success.
+        [self enablePushKitPusher:NO success:^{
+
+            MXLogDebug(@"[MXKAccount][Push] enablePushKitNotifications: Disable Push: Success");
+            if (success)
+            {
+                success();
+            }
+        } failure:^(NSError *error) {
+
+            MXLogDebug(@"[MXKAccount][Push] enablePushKitNotifications: Disable Push: Error: %@", error);
+            if (failure)
+            {
+                failure(error);
+            }
+        }];
+    }
+    else
+    {
+        MXLogDebug(@"[MXKAccount][Push] enablePushKitNotifications: PushKit is already disabled for %@", self.mxCredentials.userId);
+        if (success)
+        {
+            success();
+        }
+    }
+}
+
+- (void)setEnableInAppNotifications:(BOOL)enableInAppNotifications
+{
+    MXLogDebug(@"[MXKAccount] setEnableInAppNotifications: %@", @(enableInAppNotifications));
+
+    _enableInAppNotifications = enableInAppNotifications;
+    
+    // Archive updated field
+    [[MXKAccountManager sharedManager] saveAccounts];
+}
+
+- (void)setDisabled:(BOOL)disabled
+{
+    if (_disabled != disabled)
+    {
+        _disabled = disabled;
+        
+        if (_disabled)
+        {
+            [self deletePusher];
+            [self enablePushKitNotifications:NO success:nil failure:nil];
+            
+            // Close session (keep the storage).
+            [self closeSession:NO];
+        }
+        else if (!mxSession)
+        {
+            // Open a new matrix session
+            id<MXStore> store = [[[MXKAccountManager sharedManager].storeClass alloc] init];
+            
+            [self openSessionWithStore:store];
+        }
+        
+        // Archive updated field
+        [[MXKAccountManager sharedManager] saveAccounts];
+    }
+}
+
+- (void)setWarnedAboutEncryption:(BOOL)warnedAboutEncryption
+{
+    _warnedAboutEncryption = warnedAboutEncryption;
+
+    // Archive updated field
+    [[MXKAccountManager sharedManager] saveAccounts];
+}
+
+- (NSMutableDictionary<NSString *, id<NSCoding>> *)others
+{
+    if(_others == nil) 
+    {
+        _others = [NSMutableDictionary dictionary];
+    }
+    
+    return _others;
+}
+
+#pragma mark - Matrix user's profile
+
+- (void)setUserDisplayName:(NSString*)displayname success:(void (^)(void))success failure:(void (^)(NSError *error))failure
+{
+    if (mxSession && mxSession.myUser)
+    {
+        [mxSession.myUser setDisplayName:displayname
+                                 success:^{
+                                     if (success) {
+                                         success();
+                                     }
+                                     
+                                     [[NSNotificationCenter defaultCenter] postNotificationName:kMXKAccountUserInfoDidChangeNotification object:self->mxCredentials.userId];
+                                 }
+                                 failure:failure];
+    }
+    else if (failure)
+    {
+        failure ([NSError errorWithDomain:kMXKAccountErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey: [MatrixKitL10n accountErrorMatrixSessionIsNotOpened]}]);
+    }
+}
+
+- (void)setUserAvatarUrl:(NSString*)avatarUrl success:(void (^)(void))success failure:(void (^)(NSError *error))failure
+{
+    if (mxSession && mxSession.myUser)
+    {
+        [mxSession.myUser setAvatarUrl:avatarUrl
+                               success:^{
+                                   if (success) {
+                                       success();
+                                   }
+                                   
+                                   [[NSNotificationCenter defaultCenter] postNotificationName:kMXKAccountUserInfoDidChangeNotification object:self->mxCredentials.userId];
+                               }
+                               failure:failure];
+    }
+    else if (failure)
+    {
+        failure ([NSError errorWithDomain:kMXKAccountErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey: [MatrixKitL10n accountErrorMatrixSessionIsNotOpened]}]);
+    }
+}
+
+- (void)changePassword:(NSString*)oldPassword with:(NSString*)newPassword success:(void (^)(void))success failure:(void (^)(NSError *error))failure
+{
+    if (mxSession)
+    {
+        [mxRestClient changePassword:oldPassword
+                                with:newPassword
+                             success:^{
+                                 
+                                 if (success) {
+                                     success();
+                                 }
+                                 
+                             }
+                             failure:failure];
+    }
+    else if (failure)
+    {
+        failure ([NSError errorWithDomain:kMXKAccountErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey: [MatrixKitL10n accountErrorMatrixSessionIsNotOpened]}]);
+    }
+}
+
+- (void)load3PIDs:(void (^)(void))success failure:(void (^)(NSError *))failure
+{
+    [mxRestClient threePIDs:^(NSArray<MXThirdPartyIdentifier *> *threePIDs2) {
+
+        self->threePIDs = threePIDs2;
+
+        // Archive updated field
+        [[MXKAccountManager sharedManager] saveAccounts];
+
+        if (success)
+        {
+            success();
+        }
+
+    } failure:^(NSError *error) {
+        if (failure)
+        {
+            failure(error);
+        }
+    }];
+}
+
+- (void)loadDeviceInformation:(void (^)(void))success failure:(void (^)(NSError *error))failure
+{
+    if (mxCredentials.deviceId)
+    {
+        [mxRestClient deviceByDeviceId:mxCredentials.deviceId success:^(MXDevice *device) {
+            
+            self->_device = device;
+            
+            // Archive updated field
+            [[MXKAccountManager sharedManager] saveAccounts];
+            
+            if (success)
+            {
+                success();
+            }
+            
+        } failure:^(NSError *error) {
+            
+            if (failure)
+            {
+                failure(error);
+            }
+            
+        }];
+    }
+    else
+    {
+        _device = nil;
+        if (success)
+        {
+            success();
+        }
+    }
+}
+
+- (void)setUserPresence:(MXPresence)presence andStatusMessage:(NSString *)statusMessage completion:(void (^)(void))completion
+{
+    userPresence = presence;
+    
+    if (mxSession && !hideUserPresence)
+    {
+        // Update user presence on server side
+        [mxSession.myUser setPresence:userPresence
+                     andStatusMessage:statusMessage
+                              success:^{
+                                  MXLogDebug(@"[MXKAccount] %@: set user presence (%lu) succeeded", self->mxCredentials.userId, (unsigned long)self->userPresence);
+                                  if (completion)
+                                  {
+                                      completion();
+                                  }
+                                  
+                                  [[NSNotificationCenter defaultCenter] postNotificationName:kMXKAccountUserInfoDidChangeNotification object:self->mxCredentials.userId];
+                              }
+                              failure:^(NSError *error) {
+                                  MXLogDebug(@"[MXKAccount] %@: set user presence (%lu) failed", self->mxCredentials.userId, (unsigned long)self->userPresence);
+                              }];
+    }
+    else if (hideUserPresence)
+    {
+        MXLogDebug(@"[MXKAccount] %@: set user presence is disabled.", mxCredentials.userId);
+    }
+}
+
+#pragma mark -
+
+/**
+ Create a matrix session based on the provided store.
+ When store data is ready, the live stream is automatically launched by synchronising the session with the server.
+ 
+ In case of failure during server sync, the method is reiterated until the data is up-to-date with the server.
+ This loop is stopped if you call [MXCAccount closeSession:], it is suspended if you call [MXCAccount pauseInBackgroundTask].
+ 
+ @param store the store to use for the session.
+ */
+-(void)openSessionWithStore:(id<MXStore>)store
+{
+    // Sanity check
+    if (!mxCredentials || !mxRestClient)
+    {
+        MXLogDebug(@"[MXKAccount] Matrix session cannot be created without credentials");
+        return;
+    }
+    
+    // Close potential session (keep associated store).
+    [self closeSession:NO];
+    
+    openSessionStartDate = [NSDate date];
+    
+    // Instantiate new session
+    mxSession = [[MXSession alloc] initWithMatrixRestClient:mxRestClient];
+    
+    // Check whether an antivirus url is defined.
+    if (_antivirusServerURL)
+    {
+        // Enable the antivirus scanner in the current session.
+        [mxSession setAntivirusServerURL:_antivirusServerURL];
+    }
+
+    // Set default MXEvent -> NSString formatter
+    MXKEventFormatter *eventFormatter = [[MXKEventFormatter alloc] initWithMatrixSession:self.mxSession];
+    eventFormatter.isForSubtitle = YES;
+
+    // Apply the event types filter to display only the wanted event types.
+    eventFormatter.eventTypesFilterForMessages = [MXKAppSettings standardAppSettings].eventsFilterForMessages;
+
+    mxSession.roomSummaryUpdateDelegate = eventFormatter;
+
+    // Observe UIApplicationSignificantTimeChangeNotification to refresh to MXRoomSummaries if date/time are shown.
+    // UIApplicationSignificantTimeChangeNotification is posted if DST is updated, carrier time is updated
+    UIApplicationSignificantTimeChangeNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationSignificantTimeChangeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+        [self onDateTimeFormatUpdate];
+    }];
+
+
+    // Observe NSCurrentLocaleDidChangeNotification to refresh MXRoomSummaries if date/time are shown.
+    // NSCurrentLocaleDidChangeNotification is triggered when the time swicthes to AM/PM to 24h time format
+    NSCurrentLocaleDidChangeNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSCurrentLocaleDidChangeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+        [self onDateTimeFormatUpdate];
+    }];
+    
+    // Force a date refresh for all the last messages.
+    [self onDateTimeFormatUpdate];
+
+    // Register session state observer
+    sessionStateObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXSessionStateDidChangeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+        
+        // Check whether the concerned session is the associated one
+        if (notif.object == self->mxSession)
+        {
+            [self onMatrixSessionStateChange];
+        }
+    }];
+    
+    MXWeakify(self);
+    
+    [mxSession setStore:store success:^{
+        
+        // Complete session registration by launching live stream
+        MXStrongifyAndReturnIfNil(self);
+        
+        // Validate the availability of local contact sync for any changes to the
+        // authorization of contacts access that may have occurred since the last launch.
+        // The session is passed in as the contacts manager may not have had a session added yet.
+        [MXKContactManager.sharedManager validateSyncLocalContactsStateForSession:self.mxSession];
+        
+        // Refresh pusher state
+        [self refreshAPNSPusher];
+        [self refreshPushKitPusher];
+        
+        // Launch server sync
+        [self launchInitialServerSync];
+        
+    } failure:^(NSError *error) {
+        
+        // This cannot happen. Loading of MXFileStore cannot fail.
+        MXStrongifyAndReturnIfNil(self);
+        self->mxSession = nil;
+        
+        [[NSNotificationCenter defaultCenter] removeObserver:self->sessionStateObserver];
+        self->sessionStateObserver = nil;
+        
+    }];
+}
+
+/**
+ Close the matrix session.
+ 
+ @param clearStore set YES to delete all store data.
+ */
+- (void)closeSession:(BOOL)clearStore
+{
+    MXLogDebug(@"[MXKAccount] closeSession (%u)", clearStore);
+    
+    if (NSCurrentLocaleDidChangeNotificationObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:NSCurrentLocaleDidChangeNotificationObserver];
+        NSCurrentLocaleDidChangeNotificationObserver = nil;
+    }
+
+    if (UIApplicationSignificantTimeChangeNotificationObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:UIApplicationSignificantTimeChangeNotificationObserver];
+        UIApplicationSignificantTimeChangeNotificationObserver = nil;
+    }
+    
+    [self removeNotificationListener];
+    
+    if (reachabilityObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:reachabilityObserver];
+        reachabilityObserver = nil;
+    }
+    
+    if (sessionStateObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:sessionStateObserver];
+        sessionStateObserver = nil;
+    }
+    
+    [initialServerSyncTimer invalidate];
+    initialServerSyncTimer = nil;
+    
+    if (userUpdateListener)
+    {
+        [mxSession.myUser removeListener:userUpdateListener];
+        userUpdateListener = nil;
+    }
+    
+    if (mxSession)
+    {
+        // Reset room data stored in memory
+        [MXKRoomDataSourceManager removeSharedManagerForMatrixSession:mxSession];
+
+        if (clearStore)
+        {
+            // Force a reload of device keys at the next session start.
+            // This will fix potential UISIs other peoples receive for our messages.
+            [mxSession.crypto resetDeviceKeys];
+            
+            // Clean other stores
+            [mxSession.scanManager deleteAllAntivirusScans];
+            [mxSession.aggregations resetData];
+        }
+        else
+        {
+            // For recomputing of room summaries as they are a cache of computed data
+            [mxSession resetRoomsSummariesLastMessage];
+        }
+
+        // Close session
+        [mxSession close];
+        
+        if (clearStore)
+        {
+            [mxSession.store deleteAllData];
+        }
+        
+        mxSession = nil;
+    }
+    
+    notifyOpenSessionFailure = YES;
+}
+
+- (void)logout:(void (^)(void))completion 
+{
+    if (!mxSession)
+    {
+        MXLogDebug(@"[MXKAccount] logout: Need to open the closed session to make a logout request");
+        id<MXStore> store = [[[MXKAccountManager sharedManager].storeClass alloc] init];
+        mxSession = [[MXSession alloc] initWithMatrixRestClient:mxRestClient];
+
+        MXWeakify(self);
+        [mxSession setStore:store success:^{
+            MXStrongifyAndReturnIfNil(self);
+
+            [self logout:completion];
+
+        } failure:^(NSError *error) {
+            completion();
+        }];
+        return;
+    }
+
+    [self deletePusher];
+    [self enablePushKitNotifications:NO success:nil failure:nil];
+    
+    MXHTTPOperation *operation = [mxSession logout:^{
+        
+        [self closeSession:YES];
+        if (completion)
+        {
+            completion();
+        }
+        
+    } failure:^(NSError *error) {
+        
+        // Close the session even if the logout request failed
+        [self closeSession:YES];
+        if (completion)
+        {
+            completion();
+        }
+        
+    }];
+    
+    // Do not retry on failure.
+    operation.maxNumberOfTries = 1;
+}
+
+// Logout locally, do not send server request
+- (void)logoutLocally:(void (^)(void))completion
+{
+    [self deletePusher];
+    [self enablePushKitNotifications:NO success:nil failure:nil];
+    
+    [mxSession enableCrypto:NO success:^{
+        [self closeSession:YES];
+        if (completion)
+        {
+            completion();
+        }
+        
+    } failure:^(NSError *error) {
+        
+        // Close the session even if the logout request failed
+        [self closeSession:YES];
+        if (completion)
+        {
+            completion();
+        }
+        
+    }];
+}
+
+- (void)logoutSendingServerRequest:(BOOL)sendLogoutServerRequest
+                        completion:(void (^)(void))completion
+{
+    if (sendLogoutServerRequest)
+    {
+        [self logout:completion];
+    }
+    else
+    {
+        [self logoutLocally:completion];
+    }
+}
+
+
+#pragma mark - Soft logout
+
+- (void)softLogout
+{
+    _isSoftLogout = YES;
+    [[MXKAccountManager sharedManager] saveAccounts];
+
+    // Stop SDK making requests to the homeserver
+    [mxSession close];
+}
+
+- (void)hydrateWithCredentials:(MXCredentials*)credentials
+{
+    // Sanity check
+    if ([mxCredentials.userId isEqualToString:credentials.userId])
+    {
+        mxCredentials = credentials;
+        _isSoftLogout = NO;
+        [[MXKAccountManager sharedManager] saveAccounts];
+
+        [self prepareRESTClient];
+    }
+    else
+    {
+        MXLogDebug(@"[MXKAccount] hydrateWithCredentials: Error: users ids mismatch: %@ vs %@", credentials.userId, mxCredentials.userId);
+    }
+}
+
+
+- (void)deletePusher
+{
+    if (self.pushNotificationServiceIsActive)
+    {
+        [self enableAPNSPusher:NO success:nil failure:nil];
+    }
+}
+
+- (void)pauseInBackgroundTask
+{
+    // Reset internal flag
+    isPauseRequested = NO;
+    
+    if (mxSession && mxSession.isPauseable)
+    {
+        id<MXBackgroundModeHandler> handler = [MXSDKOptions sharedInstance].backgroundModeHandler;
+        if (handler)
+        {
+            if (!self.backgroundTask.isRunning)
+            {
+                self.backgroundTask = [handler startBackgroundTaskWithName:@"[MXKAccount] pauseInBackgroundTask" expirationHandler:nil];
+            }
+        }
+        
+        // Pause SDK
+        [mxSession pause];
+        
+        // Update user presence
+        __weak typeof(self) weakSelf = self;
+        [self setUserPresence:MXPresenceUnavailable andStatusMessage:nil completion:^{
+            
+            if (weakSelf)
+            {
+                typeof(self) self = weakSelf;
+                
+                if (self.backgroundTask.isRunning)
+                {
+                    [self.backgroundTask stop];
+                    self.backgroundTask = nil;
+                }
+            }
+            
+        }];
+    }
+    else
+    {
+        // Cancel pending actions
+        [[NSNotificationCenter defaultCenter] removeObserver:reachabilityObserver];
+        reachabilityObserver = nil;
+        [initialServerSyncTimer invalidate];
+        initialServerSyncTimer = nil;
+        
+        if (mxSession.state == MXSessionStateSyncInProgress || mxSession.state == MXSessionStateInitialised || mxSession.state == MXSessionStateStoreDataReady)
+        {
+            // Make sure the SDK finish its work before the app goes sleeping in background
+            id<MXBackgroundModeHandler> handler = [MXSDKOptions sharedInstance].backgroundModeHandler;
+            if (handler)
+            {
+                if (!self.backgroundTask.isRunning)
+                {
+                    self.backgroundTask = [handler startBackgroundTaskWithName:@"[MXKAccount] pauseInBackgroundTask" expirationHandler:nil];
+                }
+            }
+            
+            MXLogDebug(@"[MXKAccount] Pause is delayed at the end of sync (current state %tu)", mxSession.state);
+            isPauseRequested = YES;
+        }
+    }
+}
+
+- (void)resume
+{
+    isPauseRequested = NO;
+    
+    if (mxSession)
+    {
+        MXLogVerbose(@"[MXKAccount] resume with session state: %tu", mxSession.state);
+        
+        [self cancelBackgroundSync];
+        
+        if (mxSession.state == MXSessionStatePaused || mxSession.state == MXSessionStatePauseRequested)
+        {
+            // Resume SDK and update user presence
+            [mxSession resume:^{
+                [self setUserPresence:MXPresenceOnline andStatusMessage:nil completion:nil];
+                
+                [self refreshAPNSPusher];
+                [self refreshPushKitPusher];
+            }];
+        }
+        else if (mxSession.state == MXSessionStateStoreDataReady || mxSession.state == MXSessionStateInitialSyncFailed)
+        {
+            // The session initialisation was uncompleted, we try to complete it here.
+            [self launchInitialServerSync];
+            
+            [self refreshAPNSPusher];
+            [self refreshPushKitPusher];
+        }
+        else if (mxSession.state == MXSessionStateSyncInProgress)
+        {
+            [self refreshAPNSPusher];
+            [self refreshPushKitPusher];
+        }
+        
+        // Cancel background task
+        if (self.backgroundTask.isRunning)
+        {
+            [self.backgroundTask stop];
+            self.backgroundTask = nil;
+        }
+    }
+}
+
+- (void)reload:(BOOL)clearCache
+{
+    // close potential session
+    [self closeSession:clearCache];
+    
+    if (!_disabled)
+    {
+        // Open a new matrix session
+        id<MXStore> store = [[[MXKAccountManager sharedManager].storeClass alloc] init];
+        [self openSessionWithStore:store];
+    }
+}
+
+#pragma mark - Push notifications
+
+// Refresh the APNS pusher state for this account on this device.
+- (void)refreshAPNSPusher
+{
+    MXLogDebug(@"[MXKAccount][Push] refreshAPNSPusher");
+
+    // Check the conditions required to run the pusher
+    if (self.pushNotificationServiceIsActive)
+    {
+        MXLogDebug(@"[MXKAccount][Push] refreshAPNSPusher: Refresh APNS pusher for %@ account", self.mxCredentials.userId);
+        
+        // Create/restore the pusher
+        [self enableAPNSPusher:YES
+                       success:nil
+                       failure:^(NSError *error) {
+                           MXLogDebug(@"[MXKAccount][Push] ;: Error: %@", error);
+                       }];
+    }
+    else if (_hasPusherForPushNotifications)
+    {
+        if ([MXKAccountManager sharedManager].apnsDeviceToken)
+        {
+            if (mxSession)
+            {
+                // Turn off pusher if user denied remote notification.
+                MXLogDebug(@"[MXKAccount][Push] refreshAPNSPusher: Disable APNS pusher for %@ account (notifications are denied)", self.mxCredentials.userId);
+                [self enableAPNSPusher:NO success:nil failure:nil];
+            }
+        }
+        else
+        {
+            MXLogDebug(@"[MXKAccount][Push] refreshAPNSPusher: APNS pusher for %@ account is already disabled. Reset _hasPusherForPushNotifications", self.mxCredentials.userId);
+            _hasPusherForPushNotifications = NO;
+            [[MXKAccountManager sharedManager] saveAccounts];
+        }
+    }
+}
+
+// Enable/Disable the APNS pusher for this account on this device on the homeserver.
+- (void)enableAPNSPusher:(BOOL)enabled success:(void (^)(void))success failure:(void (^)(NSError *))failure
+{
+    MXLogDebug(@"[MXKAccount][Push] enableAPNSPusher: %@", @(enabled));
+
+#ifdef DEBUG
+    NSString *appId = [[NSUserDefaults standardUserDefaults] objectForKey:@"pusherAppIdDev"];
+#else
+    NSString *appId = [[NSUserDefaults standardUserDefaults] objectForKey:@"pusherAppIdProd"];
+#endif
+    
+    NSString *locKey = MXKAppSettings.standardAppSettings.notificationBodyLocalizationKey;
+    
+    NSDictionary *pushData = @{
+        @"url": self.pushGatewayURL,
+        @"format": @"event_id_only",
+        @"default_payload": @{@"aps": @{@"mutable-content": @(1), @"alert": @{@"loc-key": locKey, @"loc-args": @[]}}}
+    };
+    
+    [self enablePusher:enabled appId:appId token:[MXKAccountManager sharedManager].apnsDeviceToken pushData:pushData success:^{
+        
+        MXLogDebug(@"[MXKAccount][Push] enableAPNSPusher: Succeeded to update APNS pusher for %@ (%d)", self.mxCredentials.userId, enabled);
+
+        self->_hasPusherForPushNotifications = enabled;
+        [[MXKAccountManager sharedManager] saveAccounts];
+        
+        if (success)
+        {
+            success();
+        }
+        
+        [[NSNotificationCenter defaultCenter] postNotificationName:kMXKAccountAPNSActivityDidChangeNotification object:self->mxCredentials.userId];
+        
+    } failure:^(NSError *error) {
+        
+        // Ignore error if the client try to disable an unknown token
+        if (!enabled)
+        {
+            // Check whether the token was unknown
+            MXError *mxError = [[MXError alloc] initWithNSError:error];
+            if (mxError && [mxError.errcode isEqualToString:kMXErrCodeStringUnknown])
+            {
+                MXLogDebug(@"[MXKAccount][Push] enableAPNSPusher: APNS was already disabled for %@!", self.mxCredentials.userId);
+                
+                // Ignore the error
+                if (success)
+                {
+                    success();
+                }
+                
+                [[NSNotificationCenter defaultCenter] postNotificationName:kMXKAccountAPNSActivityDidChangeNotification object:self->mxCredentials.userId];
+                
+                return;
+            }
+            
+            MXLogDebug(@"[MXKAccount][Push] enableAPNSPusher: Failed to disable APNS %@! (%@)", self.mxCredentials.userId, error);
+        }
+        else
+        {
+            MXLogDebug(@"[MXKAccount][Push] enableAPNSPusher: Failed to send APNS token for %@! (%@)", self.mxCredentials.userId, error);
+        }
+        
+        if (failure)
+        {
+            failure(error);
+        }
+        
+        [[NSNotificationCenter defaultCenter] postNotificationName:kMXKAccountAPNSActivityDidChangeNotification object:self->mxCredentials.userId];
+    }];
+}
+
+// Refresh the PushKit pusher state for this account on this device.
+- (void)refreshPushKitPusher
+{
+    MXLogDebug(@"[MXKAccount][Push] refreshPushKitPusher");
+
+    // Check the conditions required to run the pusher
+    if (![MXKAppSettings standardAppSettings].allowPushKitPushers)
+    {
+        // Turn off pusher if PushKit pushers are not allowed
+        MXLogDebug(@"[MXKAccount][Push] refreshPushKitPusher: Disable PushKit pusher for %@ account (pushers are not allowed)", self.mxCredentials.userId);
+        [self enablePushKitPusher:NO success:nil failure:nil];
+    }
+    else if (self.isPushKitNotificationActive)
+    {
+        MXLogDebug(@"[MXKAccount][Push] refreshPushKitPusher: Refresh PushKit pusher for %@ account", self.mxCredentials.userId);
+        
+        // Create/restore the pusher
+        [self enablePushKitPusher:YES
+                          success:nil
+                          failure:^(NSError *error) {
+                              MXLogDebug(@"[MXKAccount][Push] refreshPushKitPusher: Error: %@", error);
+                          }];
+    }
+    else if (_hasPusherForPushKitNotifications)
+    {
+        if ([MXKAccountManager sharedManager].pushDeviceToken)
+        {
+            if (mxSession)
+            {
+                // Turn off pusher if user denied remote notification.
+                MXLogDebug(@"[MXKAccount][Push] refreshPushKitPusher: Disable PushKit pusher for %@ account (notifications are denied)", self.mxCredentials.userId);
+                [self enablePushKitPusher:NO success:nil failure:nil];
+            }
+        }
+        else
+        {
+            MXLogDebug(@"[MXKAccount][Push] refreshPushKitPusher: PushKit pusher for %@ account is already disabled. Reset _hasPusherForPushKitNotifications", self.mxCredentials.userId);
+            _hasPusherForPushKitNotifications = NO;
+            [[MXKAccountManager sharedManager] saveAccounts];
+        }
+    }
+}
+
+// Enable/Disable the pusher based on PushKit for this account on this device on the homeserver.
+- (void)enablePushKitPusher:(BOOL)enabled success:(void (^)(void))success failure:(void (^)(NSError *))failure
+{
+    MXLogDebug(@"[MXKAccount][Push] enablePushKitPusher: %@", @(enabled));
+    
+    if (enabled && ![MXKAppSettings standardAppSettings].allowPushKitPushers)
+    {
+        //  sanity check, if accidently try to enable the pusher
+        MXLogDebug(@"[MXKAccount][Push] enablePushKitPusher: Do not enable it because PushKit pushers not allowed");
+        if (failure)
+        {
+            failure([NSError errorWithDomain:kMXKAccountErrorDomain code:0 userInfo:nil]);
+        }
+        return;
+    }
+
+    NSString *appIdKey;
+    #ifdef DEBUG
+        appIdKey = @"pushKitAppIdDev";
+    #else
+        appIdKey = @"pushKitAppIdProd";
+    #endif
+
+    NSString *appId = [[NSUserDefaults standardUserDefaults] objectForKey:appIdKey];
+    
+    NSMutableDictionary *pushData = [NSMutableDictionary dictionaryWithDictionary:@{@"url": self.pushGatewayURL}];
+    
+    NSDictionary *options = [MXKAccountManager sharedManager].pushOptions;
+    if (options.count)
+    {
+        [pushData addEntriesFromDictionary:options];
+    }
+
+    NSData *token = [MXKAccountManager sharedManager].pushDeviceToken;
+    if (!token)
+    {
+        //  sanity check, if no token there is no point of calling the endpoint
+        MXLogDebug(@"[MXKAccount][Push] enablePushKitPusher: Failed to update PushKit pusher to %@ for %@. (token is missing)", @(enabled), self.mxCredentials.userId);
+        if (failure)
+        {
+            failure([NSError errorWithDomain:kMXKAccountErrorDomain code:0 userInfo:nil]);
+        }
+        return;
+    }
+    [self enablePusher:enabled appId:appId token:token pushData:pushData success:^{
+        
+        MXLogDebug(@"[MXKAccount][Push] enablePushKitPusher: Succeeded to update PushKit pusher for %@. Enabled: %@. Token: %@", self.mxCredentials.userId, @(enabled), [MXKTools logForPushToken:token]);
+
+        self->_hasPusherForPushKitNotifications = enabled;
+        [[MXKAccountManager sharedManager] saveAccounts];
+        
+        if (success)
+        {
+            success();
+        }
+        
+        [[NSNotificationCenter defaultCenter] postNotificationName:kMXKAccountPushKitActivityDidChangeNotification object:self->mxCredentials.userId];
+        
+    } failure:^(NSError *error) {
+        
+        // Ignore error if the client try to disable an unknown token
+        if (!enabled)
+        {
+            // Check whether the token was unknown
+            MXError *mxError = [[MXError alloc] initWithNSError:error];
+            if (mxError && [mxError.errcode isEqualToString:kMXErrCodeStringUnknown])
+            {
+                MXLogDebug(@"[MXKAccount][Push] enablePushKitPusher: Push was already disabled for %@!", self.mxCredentials.userId);
+                
+                // Ignore the error
+                if (success)
+                {
+                    success();
+                }
+                
+                [[NSNotificationCenter defaultCenter] postNotificationName:kMXKAccountPushKitActivityDidChangeNotification object:self->mxCredentials.userId];
+                
+                return;
+            }
+            
+            MXLogDebug(@"[MXKAccount][Push] enablePushKitPusher: Failed to disable Push %@! (%@)", self.mxCredentials.userId, error);
+        }
+        else
+        {
+            MXLogDebug(@"[MXKAccount][Push] enablePushKitPusher: Failed to send Push token for %@! (%@)", self.mxCredentials.userId, error);
+        }
+        
+        if (failure)
+        {
+            failure(error);
+        }
+        
+        [[NSNotificationCenter defaultCenter] postNotificationName:kMXKAccountPushKitActivityDidChangeNotification object:self->mxCredentials.userId];
+    }];
+}
+
+- (void)enablePusher:(BOOL)enabled appId:(NSString*)appId token:(NSData*)token pushData:(NSDictionary*)pushData success:(void (^)(void))success failure:(void (^)(NSError *))failure
+{
+    MXLogDebug(@"[MXKAccount][Push] enablePusher: %@", @(enabled));
+
+    // Refuse to try & turn push on if we're not logged in, it's nonsensical.
+    if (!mxCredentials)
+    {
+        MXLogDebug(@"[MXKAccount][Push] enablePusher: Not setting push token because we're not logged in");
+        return;
+    }
+    
+    // Check whether the Push Gateway URL has been configured.
+    if (!self.pushGatewayURL)
+    {
+        MXLogDebug(@"[MXKAccount][Push] enablePusher: Not setting pusher because the Push Gateway URL is undefined");
+        return;
+    }
+    
+    if (!appId)
+    {
+        MXLogDebug(@"[MXKAccount][Push] enablePusher: Not setting pusher because pusher app id is undefined");
+        return;
+    }
+    
+    NSString *appDisplayName = [NSString stringWithFormat:@"%@ (iOS)", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"]];
+    
+    NSString *b64Token = [token base64EncodedStringWithOptions:0];
+    
+    NSString *deviceLang = [NSLocale preferredLanguages][0];
+    
+    NSString * profileTag = [[NSUserDefaults standardUserDefaults] valueForKey:@"pusherProfileTag"];
+    if (!profileTag)
+    {
+        profileTag = @"";
+        NSString *alphabet = @"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+        for (int i = 0; i < 16; ++i)
+        {
+            unsigned char c = [alphabet characterAtIndex:arc4random() % alphabet.length];
+            profileTag = [profileTag stringByAppendingFormat:@"%c", c];
+        }
+        MXLogDebug(@"[MXKAccount][Push] enablePusher: Generated fresh profile tag: %@", profileTag);
+        [[NSUserDefaults standardUserDefaults] setValue:profileTag forKey:@"pusherProfileTag"];
+    }
+    else
+    {
+        MXLogDebug(@"[MXKAccount][Push] enablePusher: Using existing profile tag: %@", profileTag);
+    }
+    
+    NSObject *kind = enabled ? @"http" : [NSNull null];
+    
+    // Use the append flag to handle multiple accounts registration.
+    BOOL append = NO;
+    // Check whether a pusher is running for another account
+    NSArray *activeAccounts = [MXKAccountManager sharedManager].activeAccounts;
+    for (MXKAccount *account in activeAccounts)
+    {
+        if (![account.mxCredentials.userId isEqualToString:self.mxCredentials.userId] && account.pushNotificationServiceIsActive)
+        {
+            append = YES;
+            break;
+        }
+    }
+    MXLogDebug(@"[MXKAccount][Push] enablePusher: append flag: %d", append);
+    
+    MXRestClient *restCli = self.mxRestClient;
+    
+    [restCli setPusherWithPushkey:b64Token kind:kind appId:appId appDisplayName:appDisplayName deviceDisplayName:[[UIDevice currentDevice] name] profileTag:profileTag lang:deviceLang data:pushData append:append success:success failure:failure];
+}
+
+#pragma mark - InApp notifications
+
+- (void)listenToNotifications:(MXOnNotification)onNotification
+{
+    // Check conditions required to add notification listener
+    if (!mxSession || !onNotification)
+    {
+        return;
+    }
+    
+    // Remove existing listener (if any)
+    [self removeNotificationListener];
+    
+    // Register on notification center
+    notificationCenterListener = [self.mxSession.notificationCenter listenToNotifications:^(MXEvent *event, MXRoomState *roomState, MXPushRule *rule)
+    {
+        // Apply first the event filter defined in the related room data source
+        MXKRoomDataSourceManager *roomDataSourceManager = [MXKRoomDataSourceManager sharedManagerForMatrixSession:self->mxSession];
+        [roomDataSourceManager roomDataSourceForRoom:event.roomId create:NO onComplete:^(MXKRoomDataSource *roomDataSource) {
+            if (roomDataSource)
+            {
+                if (!roomDataSource.eventFormatter.eventTypesFilterForMessages || [roomDataSource.eventFormatter.eventTypesFilterForMessages indexOfObject:event.type] != NSNotFound)
+                {
+                    // Check conditions to report this notification
+                    if (nil == self->ignoredRooms || [self->ignoredRooms indexOfObject:event.roomId] == NSNotFound)
+                    {
+                        onNotification(event, roomState, rule);
+                    }
+                }
+            }
+        }];
+    }];
+}
+
+- (void)removeNotificationListener
+{
+    if (notificationCenterListener)
+    {
+        [self.mxSession.notificationCenter removeListener:notificationCenterListener];
+        notificationCenterListener = nil;
+    }
+    ignoredRooms = nil;
+}
+
+- (void)updateNotificationListenerForRoomId:(NSString*)roomID ignore:(BOOL)isIgnored
+{
+    if (isIgnored)
+    {
+        if (!ignoredRooms)
+        {
+            ignoredRooms = [[NSMutableArray alloc] init];
+        }
+        [ignoredRooms addObject:roomID];
+    }
+    else if (ignoredRooms)
+    {
+        [ignoredRooms removeObject:roomID];
+    }
+}
+
+#pragma mark - Internals
+
+- (void)launchInitialServerSync
+{
+    // Complete the session registration when store data is ready.
+    
+    // Cancel potential reachability observer and pending action
+    [[NSNotificationCenter defaultCenter] removeObserver:reachabilityObserver];
+    reachabilityObserver = nil;
+    [initialServerSyncTimer invalidate];
+    initialServerSyncTimer = nil;
+    
+    // Sanity check
+    if (!mxSession || (mxSession.state != MXSessionStateStoreDataReady && mxSession.state != MXSessionStateInitialSyncFailed))
+    {
+        MXLogDebug(@"[MXKAccount] Initial server sync is applicable only when store data is ready to complete session initialisation");
+        return;
+    }
+
+    // Use /sync filter corresponding to current settings and homeserver capabilities
+    MXWeakify(self);
+    [self buildSyncFilter:^(MXFilterJSONModel *syncFilter) {
+        MXStrongifyAndReturnIfNil(self);
+
+        // Make sure the filter is compatible with the previously used one
+        MXWeakify(self);
+        [self checkSyncFilterCompatibility:syncFilter completion:^(BOOL compatible) {
+            MXStrongifyAndReturnIfNil(self);
+
+            if (!compatible)
+            {
+                // Else clear the cache
+                MXLogDebug(@"[MXKAccount] New /sync filter not compatible with previous one. Clear cache");
+
+                [self reload:YES];
+                return;
+            }
+
+            // Launch mxSession
+            MXWeakify(self);
+            [self.mxSession startWithSyncFilter:syncFilter onServerSyncDone:^{
+                MXStrongifyAndReturnIfNil(self);
+
+                MXLogDebug(@"[MXKAccount] %@: The session is ready. Matrix SDK session has been started in %0.fms.", self->mxCredentials.userId, [[NSDate date] timeIntervalSinceDate:self->openSessionStartDate] * 1000);
+
+                [self setUserPresence:MXPresenceOnline andStatusMessage:nil completion:nil];
+
+            } failure:^(NSError *error) {
+                MXStrongifyAndReturnIfNil(self);
+
+                MXLogDebug(@"[MXKAccount] Initial Sync failed. Error: %@", error);
+                
+                BOOL isClientTimeout = [error.domain isEqualToString:NSURLErrorDomain] && error.code == NSURLErrorTimedOut;
+                NSHTTPURLResponse *httpResponse = [MXHTTPOperation urlResponseFromError:error];
+                BOOL isServerTimeout = httpResponse && [initialSyncSilentErrorsHTTPStatusCodes containsObject:@(httpResponse.statusCode)];
+                
+                if (isClientTimeout || isServerTimeout)
+                {
+                    //  do not propagate this error to the client
+                    //  the request will be retried or postponed according to the reachability status
+                    MXLogDebug(@"[MXKAccount] Initial sync failure did not propagated");
+                }
+                else if (self->notifyOpenSessionFailure && error)
+                {
+                    // Notify MatrixKit user only once
+                    self->notifyOpenSessionFailure = NO;
+                    NSString *myUserId = self.mxSession.myUser.userId;
+                    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+                }
+
+                // Check if it is a network connectivity issue
+                AFNetworkReachabilityManager *networkReachabilityManager = [AFNetworkReachabilityManager sharedManager];
+                MXLogDebug(@"[MXKAccount] Network reachability: %d", networkReachabilityManager.isReachable);
+
+                if (networkReachabilityManager.isReachable)
+                {
+                    // The problem is not the network
+                    // Postpone a new attempt in 10 sec
+                    self->initialServerSyncTimer = [NSTimer scheduledTimerWithTimeInterval:10 target:self selector:@selector(launchInitialServerSync) userInfo:self repeats:NO];
+                }
+                else
+                {
+                    // The device is not connected to the internet, wait for the connection to be up again before retrying
+                    // Add observer to launch a new attempt according to reachability.
+                    self->reachabilityObserver = [[NSNotificationCenter defaultCenter] addObserverForName:AFNetworkingReachabilityDidChangeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
+
+                        NSNumber *statusItem = note.userInfo[AFNetworkingReachabilityNotificationStatusItem];
+                        if (statusItem)
+                        {
+                            AFNetworkReachabilityStatus reachabilityStatus = statusItem.integerValue;
+                            if (reachabilityStatus == AFNetworkReachabilityStatusReachableViaWiFi || reachabilityStatus == AFNetworkReachabilityStatusReachableViaWWAN)
+                            {
+                                // New attempt
+                                [self launchInitialServerSync];
+                            }
+                        }
+
+                    }];
+                }
+            }];
+        }];
+    }];
+}
+
+- (void)attemptDeviceDehydrationWithKeyData:(NSData *)keyData
+                                    success:(void (^)(void))success
+                                    failure:(void (^)(NSError *error))failure
+{
+    [self attemptDeviceDehydrationWithKeyData:keyData retry:YES success:success failure:failure];
+}
+
+- (void)attemptDeviceDehydrationWithKeyData:(NSData *)keyData
+                                      retry:(BOOL)retry
+                                    success:(void (^)(void))success
+                                    failure:(void (^)(NSError *error))failure
+{
+    if (keyData == nil)
+    {
+        MXLogWarning(@"[MXKAccount] attemptDeviceDehydrationWithRetry: no key provided for device dehydration");
+        
+        if (failure)
+        {
+            failure(nil);
+        }
+        
+        return;
+    }
+    
+    MXLogDebug(@"[MXKAccount] attemptDeviceDehydrationWithRetry: starting device dehydration");
+    [[MXKAccountManager sharedManager].dehydrationService dehydrateDeviceWithMatrixRestClient:mxRestClient crypto:mxSession.crypto dehydrationKey:keyData success:^(NSString *deviceId) {
+        MXLogDebug(@"[MXKAccount] attemptDeviceDehydrationWithRetry: device successfully dehydrated");
+        
+        if (success)
+        {
+            success();
+        }
+    } failure:^(NSError *error) {
+        if (retry)
+        {
+            [self attemptDeviceDehydrationWithKeyData:keyData retry:NO success:success failure:failure];
+            MXLogError(@"[MXKAccount] attemptDeviceDehydrationWithRetry: device dehydration failed due to error: %@. Retrying.", error);
+        }
+        else
+        {
+            MXLogError(@"[MXKAccount] attemptDeviceDehydrationWithRetry: device dehydration failed due to error: %@", error);
+            
+            if (failure)
+            {
+                failure(error);
+            }
+        }
+    }];
+}
+
+- (void)onMatrixSessionStateChange
+{
+    if (mxSession.state == MXSessionStateRunning)
+    {
+        // Check if pause has been requested
+        if (isPauseRequested)
+        {
+            MXLogDebug(@"[MXKAccount] Apply the pending pause.");
+            [self pauseInBackgroundTask];
+            return;
+        }
+        
+        // Check whether the session was not already running
+        if (!userUpdateListener)
+        {
+            // Register listener to user's information change
+            userUpdateListener = [mxSession.myUser listenToUserUpdate:^(MXEvent *event) {
+                // Consider events related to user's presence
+                if (event.eventType == MXEventTypePresence)
+                {
+                    self->userPresence = [MXTools presence:event.content[@"presence"]];
+                }
+                
+                // Here displayname or other information have been updated, post update notification.
+                [[NSNotificationCenter defaultCenter] postNotificationName:kMXKAccountUserInfoDidChangeNotification object:self->mxCredentials.userId];
+            }];
+            
+            // User information are just up-to-date (`mxSession` is running), post update notification.
+            [[NSNotificationCenter defaultCenter] postNotificationName:kMXKAccountUserInfoDidChangeNotification object:mxCredentials.userId];
+        }
+    }
+    else if (mxSession.state == MXSessionStateStoreDataReady || mxSession.state == MXSessionStateSyncInProgress)
+    {
+        // Remove listener (if any), this action is required to handle correctly matrix sdk handler reload (see clear cache)
+        if (userUpdateListener)
+        {
+            [mxSession.myUser removeListener:userUpdateListener];
+            userUpdateListener = nil;
+        }
+        else
+        {
+            // Here the initial server sync is in progress. The session is not running yet, but some user's information are available (from local storage).
+            // We post update notification to let observer take into account this user's information even if they may not be up-to-date.
+            [[NSNotificationCenter defaultCenter] postNotificationName:kMXKAccountUserInfoDidChangeNotification object:mxCredentials.userId];
+        }
+    }
+    else if (mxSession.state == MXSessionStatePaused)
+    {
+        isPauseRequested = NO;
+    }
+    else if (mxSession.state == MXSessionStateUnknownToken)
+    {
+        // Logout this account
+        [[MXKAccountManager sharedManager] removeAccount:self completion:nil];
+    }
+    else if (mxSession.state == MXSessionStateSoftLogout)
+    {
+        // Soft logout this account
+        [[MXKAccountManager sharedManager] softLogout:self];
+    }
+}
+
+- (void)prepareRESTClient
+{
+    if (!mxCredentials)
+    {
+        return;
+    }
+    
+    mxRestClient = [[MXRestClient alloc] initWithCredentials:mxCredentials andOnUnrecognizedCertificateBlock:^BOOL(NSData *certificate) {
+        
+        if (_onCertificateChangeBlock)
+        {
+            if (_onCertificateChangeBlock (self, certificate))
+            {
+                // Update the certificate in credentials
+                self->mxCredentials.allowedCertificate = certificate;
+                
+                // Archive updated field
+                [[MXKAccountManager sharedManager] saveAccounts];
+                
+                return YES;
+            }
+            
+            self->mxCredentials.ignoredCertificate = certificate;
+            
+            // Archive updated field
+            [[MXKAccountManager sharedManager] saveAccounts];
+        }
+        return NO;
+    
+    }];
+}
+
+- (void)onDateTimeFormatUpdate
+{
+    if ([mxSession.roomSummaryUpdateDelegate isKindOfClass:MXKEventFormatter.class])
+    {
+        MXKEventFormatter *eventFormatter = (MXKEventFormatter*)mxSession.roomSummaryUpdateDelegate;
+        
+        // Update the date and time formatters
+        [eventFormatter initDateTimeFormatters];
+        
+        dispatch_group_t dispatchGroup = dispatch_group_create();
+        
+        for (MXRoomSummary *summary in mxSession.roomsSummaries)
+        {
+            dispatch_group_enter(dispatchGroup);
+            [summary.mxSession eventWithEventId:summary.lastMessage.eventId
+                                         inRoom:summary.roomId
+                                        success:^(MXEvent *event) {
+                
+                if (event)
+                {
+                    if (summary.lastMessage.others == nil)
+                    {
+                        summary.lastMessage.others = [NSMutableDictionary dictionary];
+                    }
+                    summary.lastMessage.others[@"lastEventDate"] = [eventFormatter dateStringFromEvent:event withTime:YES];
+                    [self->mxSession.store storeSummaryForRoom:summary.roomId summary:summary];
+                }
+                
+                dispatch_group_leave(dispatchGroup);
+            } failure:^(NSError *error) {
+                dispatch_group_leave(dispatchGroup);
+            }];
+        }
+        
+        dispatch_group_notify(dispatchGroup, dispatch_get_main_queue(), ^{
+            
+            // Commit store changes done
+            if ([self->mxSession.store respondsToSelector:@selector(commit)])
+            {
+                [self->mxSession.store commit];
+            }
+            
+            // Broadcast the change which concerns all the room summaries.
+            [[NSNotificationCenter defaultCenter] postNotificationName:kMXRoomSummaryDidChangeNotification object:nil userInfo:nil];
+            
+        });
+    }
+}
+
+#pragma mark - Crypto
+- (void)resetDeviceId
+{
+    mxCredentials.deviceId = nil;
+
+    // Archive updated field
+    [[MXKAccountManager sharedManager] saveAccounts];
+}
+
+#pragma mark - backgroundSync management
+
+- (void)cancelBackgroundSync
+{
+    if (self.backgroundSyncBgTask.isRunning)
+    {
+        MXLogDebug(@"[MXKAccount] The background Sync is cancelled.");
+        
+        if (mxSession)
+        {
+            if (mxSession.state == MXSessionStateBackgroundSyncInProgress)
+            {
+                [mxSession pause];
+            }
+        }
+        
+        [self onBackgroundSyncDone:[NSError errorWithDomain:kMXKAccountErrorDomain code:0 userInfo:nil]];
+    }
+}
+
+- (void)onBackgroundSyncDone:(NSError*)error
+{
+    if (backgroundSyncTimer)
+    {
+        [backgroundSyncTimer invalidate];
+        backgroundSyncTimer = nil;
+    }
+    
+    if (backgroundSyncFails && error)
+    {
+        backgroundSyncFails(error);
+    }
+    
+    if (backgroundSyncDone && !error)
+    {
+        backgroundSyncDone();
+    }
+    
+    backgroundSyncDone = nil;
+    backgroundSyncFails = nil;
+    
+    // End background task
+    if (self.backgroundSyncBgTask.isRunning)
+    {
+        [self.backgroundSyncBgTask stop];
+        self.backgroundSyncBgTask = nil;
+    }
+}
+
+- (void)onBackgroundSyncTimerOut
+{
+    [self cancelBackgroundSync];
+}
+
+- (void)backgroundSync:(unsigned int)timeout success:(void (^)(void))success failure:(void (^)(NSError *))failure
+{
+    // Check whether a background mode handler has been set.
+    id<MXBackgroundModeHandler> handler = [MXSDKOptions sharedInstance].backgroundModeHandler;
+    if (handler)
+    {
+        // Only work when the application is suspended.
+        // Check conditions before launching background sync
+        if (mxSession && mxSession.state == MXSessionStatePaused)
+        {
+            MXLogDebug(@"[MXKAccount] starts a background Sync");
+            
+            backgroundSyncDone = success;
+            backgroundSyncFails = failure;
+            
+            MXWeakify(self);
+            
+            self.backgroundSyncBgTask = [handler startBackgroundTaskWithName:@"[MXKAccount] backgroundSync:success:failure:" expirationHandler:^{
+                
+                MXStrongifyAndReturnIfNil(self);
+                
+                MXLogDebug(@"[MXKAccount] the background Sync fails because of the bg task timeout");
+                [self cancelBackgroundSync];
+            }];
+            
+            // ensure that the backgroundSync will be really done in the expected time
+            // the request could be done but the treatment could be long so add a timer to cancel it
+            // if it takes too much time
+            backgroundSyncTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:(timeout - 1) / 1000]
+                                                           interval:0
+                                                             target:self
+                                                           selector:@selector(onBackgroundSyncTimerOut)
+                                                           userInfo:nil
+                                                            repeats:NO];
+            
+            [[NSRunLoop mainRunLoop] addTimer:backgroundSyncTimer forMode:NSDefaultRunLoopMode];
+            
+            [mxSession backgroundSync:timeout success:^{
+                MXLogDebug(@"[MXKAccount] the background Sync succeeds");
+                [self onBackgroundSyncDone:nil];
+                
+            }
+                              failure:^(NSError* error) {
+                                  
+                                  MXLogDebug(@"[MXKAccount] the background Sync fails");
+                                  [self onBackgroundSyncDone:error];
+                                  
+                              }
+             
+             ];
+        }
+        else
+        {
+            MXLogDebug(@"[MXKAccount] cannot start background Sync (invalid state %tu)", mxSession.state);
+            failure([NSError errorWithDomain:kMXKAccountErrorDomain code:0 userInfo:nil]);
+        }
+    }
+    else
+    {
+        MXLogDebug(@"[MXKAccount] cannot start background Sync");
+        failure([NSError errorWithDomain:kMXKAccountErrorDomain code:0 userInfo:nil]);
+    }
+}
+
+#pragma mark - Sync filter
+
+- (void)supportLazyLoadOfRoomMembers:(void (^)(BOOL supportLazyLoadOfRoomMembers))completion
+{
+    void(^onUnsupportedLazyLoadOfRoomMembers)(NSError *) = ^(NSError *error) {
+        completion(NO);
+    };
+
+    // Check if the server supports LL sync filter
+    MXFilterJSONModel *filter = [self syncFilterWithLazyLoadOfRoomMembers:YES];
+    [mxSession.store filterIdForFilter:filter success:^(NSString * _Nullable filterId) {
+
+        if (filterId)
+        {
+            // The LL filter is already in the store. The HS supports LL
+            completion(YES);
+        }
+        else
+        {
+            // Check the Matrix versions supported by the HS
+            [self.mxSession supportedMatrixVersions:^(MXMatrixVersions *matrixVersions) {
+
+                if (matrixVersions.supportLazyLoadMembers)
+                {
+                    // The HS supports LL
+                    completion(YES);
+                }
+                else
+                {
+                    onUnsupportedLazyLoadOfRoomMembers(nil);
+                }
+
+            } failure:onUnsupportedLazyLoadOfRoomMembers];
+        }
+    } failure:onUnsupportedLazyLoadOfRoomMembers];
+}
+
+/**
+ Build the sync filter according to application settings and HS capability.
+
+ @param completion the block providing the sync filter to use.
+ */
+- (void)buildSyncFilter:(void (^)(MXFilterJSONModel *syncFilter))completion
+{
+    // Check settings
+    BOOL syncWithLazyLoadOfRoomMembersSetting = [MXKAppSettings standardAppSettings].syncWithLazyLoadOfRoomMembers;
+
+    if (syncWithLazyLoadOfRoomMembersSetting)
+    {
+        // Check if the server supports LL sync filter before enabling it
+        [self supportLazyLoadOfRoomMembers:^(BOOL supportLazyLoadOfRoomMembers) {
+
+            if (supportLazyLoadOfRoomMembers)
+            {
+                completion([self syncFilterWithLazyLoadOfRoomMembers:YES]);
+            }
+            else
+            {
+                // No support from the HS
+                // Disable the setting. That will avoid to make a request at every startup
+                [MXKAppSettings standardAppSettings].syncWithLazyLoadOfRoomMembers = NO;
+                completion([self syncFilterWithLazyLoadOfRoomMembers:NO]);
+            }
+        }];
+    }
+    else
+    {
+        completion([self syncFilterWithLazyLoadOfRoomMembers:NO]);
+    }
+}
+
+/**
+ Compute the sync filter to use according to the device screen size.
+
+ @param syncWithLazyLoadOfRoomMembers enable LL support.
+ @return the sync filter to use.
+ */
+- (MXFilterJSONModel *)syncFilterWithLazyLoadOfRoomMembers:(BOOL)syncWithLazyLoadOfRoomMembers
+{
+    MXFilterJSONModel *syncFilter;
+    NSUInteger limit = 10;
+    
+    // Define a message limit for /sync requests that is high enough so that
+    // a full page of room messages can be displayed without an additional
+    // server request.
+
+    // This limit value depends on the device screen size. So, the rough rule is:
+    //    - use 10 for small phones (5S/SE)
+    //    - use 15 for phones (6/6S/7/8)
+    //    - use 20 for phablets (.Plus/X/XR/XS/XSMax)
+    //    - use 30 for iPads
+    UIUserInterfaceIdiom userInterfaceIdiom = [[UIDevice currentDevice] userInterfaceIdiom];
+    if (userInterfaceIdiom == UIUserInterfaceIdiomPhone)
+    {
+        CGFloat screenHeight = [[UIScreen mainScreen] nativeBounds].size.height;
+        if (screenHeight == 1334)   // 6/6S/7/8 screen height
+        {
+            limit = 15;
+        }
+        else if (screenHeight > 1334)
+        {
+            limit = 20;
+        }
+    }
+    else if (userInterfaceIdiom == UIUserInterfaceIdiomPad)
+    {
+        limit = 30;
+    }
+    
+    // Set that limit in the filter
+    if (syncWithLazyLoadOfRoomMembers)
+    {
+        syncFilter = [MXFilterJSONModel syncFilterForLazyLoadingWithMessageLimit:limit];
+    }
+    else
+    {
+        syncFilter = [MXFilterJSONModel syncFilterWithMessageLimit:limit];
+    }
+
+    // TODO: We could extend the filter to match other settings (self.showAllEventsInRoomHistory,
+    // self.eventsFilterForMessages, etc).
+
+    return syncFilter;
+}
+
+
+/**
+ Check the sync filter we want to use is compatible with the one previously used.
+
+ @param syncFilter the sync filter to use.
+ @param completion the block called to indicated the compatibility.
+ */
+- (void)checkSyncFilterCompatibility:(MXFilterJSONModel*)syncFilter completion:(void (^)(BOOL compatible))completion
+{
+    // There is no compatibility issue if no /sync was done before
+    if (!mxSession.store.eventStreamToken)
+    {
+        completion(YES);
+    }
+
+    // Check the filter we want to use is compatible with the one previously used
+    else if (!syncFilter && !mxSession.syncFilterId)
+    {
+        // A nil filter implies a nil mxSession.syncFilterId. So, there is no filter change
+        completion(YES);
+    }
+    else if (!syncFilter || !mxSession.syncFilterId)
+    {
+        // Change from no filter with using a filter or vice-versa. So, there is a filter change
+        MXLogDebug(@"[MXKAccount] checkSyncFilterCompatibility: Incompatible filter. New or old is nil. mxSession.syncFilterId: %@ - syncFilter: %@",
+              mxSession.syncFilterId, syncFilter.JSONDictionary);
+        completion(NO);
+    }
+    else
+    {
+        // Check the filter is the one previously set
+        // It must be already in the store
+        MXWeakify(self);
+        [mxSession.store filterIdForFilter:syncFilter success:^(NSString * _Nullable filterId) {
+            MXStrongifyAndReturnIfNil(self);
+
+            // Note: We could be more tolerant here
+            // We could accept filter hot change if the change is limited to the `limit` filter value
+            // But we do not have this requirement yet
+            BOOL compatible = [filterId isEqualToString:self.mxSession.syncFilterId];
+            if (!compatible)
+            {
+                MXLogDebug(@"[MXKAccount] checkSyncFilterCompatibility: Incompatible filter ids. mxSession.syncFilterId: %@ -  store.filterId: %@ - syncFilter: %@",
+                      self.mxSession.syncFilterId, filterId, syncFilter.JSONDictionary);
+            }
+            completion(compatible);
+
+        } failure:^(NSError * _Nullable error) {
+            // Should never happen
+            completion(NO);
+        }];
+    }
+}
+
+
+#pragma mark - Identity server updates
+
+- (void)registerAccountDataDidChangeIdentityServerNotification
+{
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleAccountDataDidChangeIdentityServerNotification:) name:kMXSessionAccountDataDidChangeIdentityServerNotification object:nil];
+}
+
+- (void)handleAccountDataDidChangeIdentityServerNotification:(NSNotification*)notification
+{
+    MXSession *mxSession = notification.object;
+    if (mxSession == self.mxSession)
+    {
+        if (![mxCredentials.identityServer isEqualToString:self.mxSession.accountDataIdentityServer])
+        {
+            _identityServerURL = self.mxSession.accountDataIdentityServer;
+            mxCredentials.identityServer = _identityServerURL;
+            mxCredentials.identityServerAccessToken = nil;
+
+            // Archive updated field
+            [[MXKAccountManager sharedManager] saveAccounts];
+        }
+    }
+}
+
+
+#pragma mark - Identity server Access Token updates
+
+- (void)identityService:(MXIdentityService *)identityService didUpdateAccessToken:(NSString *)accessToken
+{
+    mxCredentials.identityServerAccessToken = accessToken;
+}
+
+- (void)registerIdentityServiceDidChangeAccessTokenNotification
+{
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleIdentityServiceDidChangeAccessTokenNotification:) name:MXIdentityServiceDidChangeAccessTokenNotification object:nil];
+}
+
+- (void)handleIdentityServiceDidChangeAccessTokenNotification:(NSNotification*)notification
+{
+    NSDictionary *userInfo = notification.userInfo;
+    
+    NSString *userId = userInfo[MXIdentityServiceNotificationUserIdKey];
+    NSString *identityServer = userInfo[MXIdentityServiceNotificationIdentityServerKey];
+    NSString *accessToken = userInfo[MXIdentityServiceNotificationAccessTokenKey];
+    
+    if (userId && identityServer && accessToken && [mxCredentials.identityServer isEqualToString:identityServer])
+    {
+        mxCredentials.identityServerAccessToken = accessToken;
+
+        // Archive updated field
+        [[MXKAccountManager sharedManager] saveAccounts];
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Account/MXKAccountManager.h b/Riot/Modules/MatrixKit/Models/Account/MXKAccountManager.h
new file mode 100644
index 000000000..70c4857c9
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Account/MXKAccountManager.h
@@ -0,0 +1,218 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2018 New Vector Ltd
+ Copyright 2019 The Matrix.org Foundation C.I.C
+
+ 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/Foundation.h>
+
+#import "MXKAccount.h"
+
+/**
+ Posted when the user logged in with a matrix account.
+ The notification object is the new added account.
+ */
+extern NSString *const kMXKAccountManagerDidAddAccountNotification;
+
+/**
+ Posted when an existing account is logged out.
+ The notification object is the removed account.
+ */
+extern NSString *const kMXKAccountManagerDidRemoveAccountNotification;
+
+/**
+ Posted when an existing account is soft logged out.
+ The notification object is the account.
+ */
+extern NSString *const kMXKAccountManagerDidSoftlogoutAccountNotification;
+
+/**
+ Used to identify the type of data when requesting MXKeyProvider
+ */
+extern NSString *const MXKAccountManagerDataType;
+
+/**
+ `MXKAccountManager` manages a pool of `MXKAccount` instances.
+ */
+@interface MXKAccountManager : NSObject
+
+/**
+ The class of store used to open matrix session for the accounts. This class must be conformed to MXStore protocol.
+ By default this class is MXFileStore.
+ */
+@property (nonatomic) Class storeClass;
+
+/**
+ List of all available accounts (enabled and disabled).
+ */
+@property (nonatomic, readonly) NSArray<MXKAccount *> *accounts;
+
+/**
+ List of active accounts (only enabled accounts)
+ */
+@property (nonatomic, readonly) NSArray<MXKAccount *> *activeAccounts;
+
+/**
+ The device token used for Apple Push Notification Service registration.
+ */
+@property (nonatomic, copy) NSData *apnsDeviceToken;
+
+/**
+ The APNS status: YES when app is registered for remote notif, and device token is known.
+ */
+@property (nonatomic) BOOL isAPNSAvailable;
+
+/**
+ The device token used for Push notifications registration (PushKit support).
+ */
+@property (nonatomic, copy, readonly) NSData *pushDeviceToken;
+
+/**
+ The current options of the Push notifications based on PushKit.
+ */
+@property (nonatomic, copy, readonly) NSDictionary *pushOptions;
+
+/**
+ Set the push token and the potential push options.
+ For example, for clients that want to go & fetch the body of the event themselves anyway,
+ the key-value `format: event_id_only` may be used in `pushOptions` dictionary to tell the
+ HTTP pusher to send just the event_id of the event it's notifying about, the room id and
+ the notification counts.
+ 
+ @param pushDeviceToken the push token.
+ @param pushOptions dictionary of the push options (may be nil).
+ */
+- (void)setPushDeviceToken:(NSData *)pushDeviceToken withPushOptions:(NSDictionary *)pushOptions;
+
+/**
+ The PushKit status: YES when app is registered for push notif, and push token is known.
+ */
+@property (nonatomic) BOOL isPushAvailable;
+
+@property (nonatomic, readonly) MXDehydrationService *dehydrationService;
+
+/**
+ Retrieve the MXKAccounts manager.
+ 
+ @return the MXKAccounts manager.
+ */
++ (MXKAccountManager *)sharedManager;
+
+/**
+ Check for each enabled account if a matrix session is already opened.
+ Open a matrix session for each enabled account which doesn't have a session.
+ The developper must set 'storeClass' before the first call of this method 
+ if the default class is not suitable.
+ */
+- (void)prepareSessionForActiveAccounts;
+
+/**
+ Save a snapshot of the current accounts.
+ */
+- (void)saveAccounts;
+
+/**
+ Add an account and save the new account list. Optionally a matrix session may be opened for the provided account.
+ 
+ @param account a matrix account.
+ @param openSession YES to open a matrix session (this value is ignored if the account is disabled).
+ */
+- (void)addAccount:(MXKAccount *)account andOpenSession:(BOOL)openSession;
+
+/**
+ Remove the provided account and save the new account list. This method is used in case of logout.
+ 
+ @note equivalent to `removeAccount:sendLogoutRequest:completion:` method with `sendLogoutRequest` parameter to YES
+ 
+ @param account a matrix account.
+ @param completion the block to execute at the end of the operation.
+ */
+- (void)removeAccount:(MXKAccount *)account completion:(void (^)(void))completion;
+
+
+/**
+ Remove the provided account and save the new account list. This method is used in case of logout or account deactivation.
+ 
+ @param account a matrix account.
+ @param sendLogoutRequest Indicate whether send logout request to homeserver.
+ @param completion the block to execute at the end of the operation.
+ */
+- (void)removeAccount:(MXKAccount*)account
+    sendLogoutRequest:(BOOL)sendLogoutRequest
+           completion:(void (^)(void))completion;
+
+/**
+ Log out and remove all the existing accounts
+ 
+ @param completion the block to execute at the end of the operation.
+ */
+- (void)logoutWithCompletion:(void (^)(void))completion;
+
+/**
+ Soft logout an account.
+
+ @param account a matrix account.
+ */
+- (void)softLogout:(MXKAccount*)account;
+
+/**
+ Hydrate an existing account by using the credentials provided.
+
+ This updates account credentials and restarts the account session
+
+ If the credentials belong to a different user from the account already stored,
+ the old account will be cleared automatically.
+
+ @param account a matrix account.
+ @param credentials the new credentials.
+ */
+- (void)hydrateAccount:(MXKAccount*)account withCredentials:(MXCredentials*)credentials;
+
+/**
+ Retrieve the account for a user id.
+ 
+ @param userId the user id.
+ @return the user's account (nil if no account exist).
+ */
+- (MXKAccount *)accountForUserId:(NSString *)userId;
+
+/**
+ Retrieve an account that knows the room with the passed id or alias.
+ 
+ Note: The method is not accurate as it returns the first account that matches.
+
+ @param roomIdOrAlias the room id or alias.
+ @return the user's account. Nil if no account matches.
+ */
+- (MXKAccount *)accountKnowingRoomWithRoomIdOrAlias:(NSString *)roomIdOrAlias;
+
+/**
+ Retrieve an account that knows the user with the passed id.
+
+ Note: The method is not accurate as it returns the first account that matches.
+
+ @param userId the user id.
+ @return the user's account. Nil if no account matches.
+ */
+- (MXKAccount *)accountKnowingUserWithUserId:(NSString *)userId;
+
+/**
+ Force the account manager to reload existing accounts from the local storage.
+ The account manager is supposed to handle itself the list of the accounts.
+ Call this method only when an account has been changed from an other application from the same group.
+ */
+- (void)forceReloadAccounts;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Account/MXKAccountManager.m b/Riot/Modules/MatrixKit/Models/Account/MXKAccountManager.m
new file mode 100644
index 000000000..0763dab53
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Account/MXKAccountManager.m
@@ -0,0 +1,726 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 New Vector Ltd
+ Copyright 2019 The Matrix.org Foundation C.I.C
+
+ 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 "MXKAccountManager.h"
+#import "MXKAppSettings.h"
+
+#import "MXKTools.h"
+
+static NSString *const kMXKAccountsKeyOld = @"accounts";
+static NSString *const kMXKAccountsKey = @"accountsV2";
+
+NSString *const kMXKAccountManagerDidAddAccountNotification = @"kMXKAccountManagerDidAddAccountNotification";
+NSString *const kMXKAccountManagerDidRemoveAccountNotification = @"kMXKAccountManagerDidRemoveAccountNotification";
+NSString *const kMXKAccountManagerDidSoftlogoutAccountNotification = @"kMXKAccountManagerDidSoftlogoutAccountNotification";
+NSString *const MXKAccountManagerDataType = @"org.matrix.kit.MXKAccountManagerDataType";
+
+@interface MXKAccountManager()
+{
+    /**
+     The list of all accounts (enabled and disabled). Each value is a `MXKAccount` instance.
+     */
+    NSMutableArray<MXKAccount *> *mxAccounts;
+}
+
+@end
+
+@implementation MXKAccountManager
+
++ (MXKAccountManager *)sharedManager
+{
+    static MXKAccountManager *sharedAccountManager = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        sharedAccountManager = [[super allocWithZone:NULL] init];
+    });
+    
+    return sharedAccountManager;
+}
+
+- (instancetype)init
+{
+    self = [super init];
+    if (self)
+    {
+        _storeClass = [MXFileStore class];
+        _dehydrationService = [MXDehydrationService new];
+        
+        // Migrate old account file to new format
+        [self migrateAccounts];
+        
+        // Load existing accounts from local storage
+        [self loadAccounts];
+    }
+    return self;
+}
+
+- (void)dealloc
+{
+    mxAccounts = nil;
+}
+
+#pragma mark -
+
+- (void)prepareSessionForActiveAccounts
+{
+    for (MXKAccount *account in mxAccounts)
+    {
+        // Check whether the account is enabled. Open a new matrix session if none.
+        if (!account.isDisabled && !account.isSoftLogout && !account.mxSession)
+        {
+            MXLogDebug(@"[MXKAccountManager] openSession for %@ account", account.mxCredentials.userId);
+            
+            id<MXStore> store = [[_storeClass alloc] init];
+            [account openSessionWithStore:store];
+        }
+    }
+}
+
+- (void)saveAccounts
+{
+    NSDate *startDate = [NSDate date];
+    
+    MXLogDebug(@"[MXKAccountManager] saveAccounts...");
+    
+    NSMutableData *data = [NSMutableData data];
+    NSKeyedArchiver *encoder = [[NSKeyedArchiver alloc] initForWritingWithMutableData:data];
+
+    [encoder encodeObject:mxAccounts forKey:@"mxAccounts"];
+
+    [encoder finishEncoding];
+
+    [data setData:[self encryptData:data]];
+
+    BOOL result = [data writeToFile:[self accountFile] atomically:YES];
+
+    MXLogDebug(@"[MXKAccountManager] saveAccounts. Done (result: %@) in %.0fms", @(result), [[NSDate date] timeIntervalSinceDate:startDate] * 1000);
+}
+
+- (void)addAccount:(MXKAccount *)account andOpenSession:(BOOL)openSession
+{
+    MXLogDebug(@"[MXKAccountManager] login (%@)", account.mxCredentials.userId);
+    
+    [mxAccounts addObject:account];
+    [self saveAccounts];
+    
+    // Check conditions to open a matrix session
+    if (openSession && !account.disabled)
+    {
+        // Open a new matrix session by default
+        MXLogDebug(@"[MXKAccountManager] openSession for %@ account (device %@)", account.mxCredentials.userId, account.mxCredentials.deviceId);
+        id<MXStore> store = [[_storeClass alloc] init];
+        [account openSessionWithStore:store];
+    }
+    
+    // Post notification
+    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKAccountManagerDidAddAccountNotification object:account userInfo:nil];
+}
+
+- (void)removeAccount:(MXKAccount*)theAccount completion:(void (^)(void))completion
+{
+    [self removeAccount:theAccount sendLogoutRequest:YES completion:completion];
+}
+
+- (void)removeAccount:(MXKAccount*)theAccount
+    sendLogoutRequest:(BOOL)sendLogoutRequest
+           completion:(void (^)(void))completion
+{
+    MXLogDebug(@"[MXKAccountManager] logout (%@), send logout request to homeserver: %d", theAccount.mxCredentials.userId, sendLogoutRequest);
+    
+    // Close session and clear associated store.
+    [theAccount logoutSendingServerRequest:sendLogoutRequest completion:^{
+        
+        // Retrieve the corresponding account in the internal array
+        MXKAccount* removedAccount = nil;
+        
+        for (MXKAccount *account in self->mxAccounts)
+        {
+            if ([account.mxCredentials.userId isEqualToString:theAccount.mxCredentials.userId])
+            {
+                removedAccount = account;
+                break;
+            }
+        }
+        
+        if (removedAccount)
+        {
+            [self->mxAccounts removeObject:removedAccount];
+            
+            [self saveAccounts];
+            
+            // Post notification
+            [[NSNotificationCenter defaultCenter] postNotificationName:kMXKAccountManagerDidRemoveAccountNotification object:removedAccount userInfo:nil];
+        }
+        
+        if (completion)
+        {
+            completion();
+        }
+        
+    }];
+}
+
+
+- (void)logoutWithCompletion:(void (^)(void))completion
+{
+    // Logout one by one the existing accounts
+    if (mxAccounts.count)
+    {
+        [self removeAccount:mxAccounts.lastObject completion:^{
+            
+            // loop: logout the next existing account (if any)
+            [self logoutWithCompletion:completion];
+            
+        }];
+        
+        return;
+    }
+    
+    NSUserDefaults *sharedUserDefaults = [MXKAppSettings standardAppSettings].sharedUserDefaults;
+    
+    // Remove APNS device token
+    [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"apnsDeviceToken"];
+    
+    // Remove Push device token
+    [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"pushDeviceToken"];
+    [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"pushOptions"];
+    
+    // Be sure that no account survive in local storage
+    [[NSUserDefaults standardUserDefaults] removeObjectForKey:kMXKAccountsKey];
+    [sharedUserDefaults removeObjectForKey:kMXKAccountsKey];
+    [[NSFileManager defaultManager] removeItemAtPath:[self accountFile] error:nil];
+
+    if (completion)
+    {
+        completion();
+    }
+}
+
+- (void)softLogout:(MXKAccount*)account
+{
+    [account softLogout];
+    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKAccountManagerDidSoftlogoutAccountNotification
+                                                        object:account
+                                                      userInfo:nil];
+}
+
+- (void)hydrateAccount:(MXKAccount*)account withCredentials:(MXCredentials*)credentials
+{
+    MXLogDebug(@"[MXKAccountManager] hydrateAccount: %@", account.mxCredentials.userId);
+
+    if ([account.mxCredentials.userId isEqualToString:credentials.userId])
+    {
+        // Restart the account
+        [account hydrateWithCredentials:credentials];
+
+        MXLogDebug(@"[MXKAccountManager] hydrateAccount: Open session");
+
+        id<MXStore> store = [[_storeClass alloc] init];
+        [account openSessionWithStore:store];
+
+        [[NSNotificationCenter defaultCenter] postNotificationName:kMXKAccountManagerDidAddAccountNotification
+                                                            object:account
+                                                          userInfo:nil];
+    }
+    else
+    {
+        MXLogDebug(@"[MXKAccountManager] hydrateAccount: Credentials given for another account: %@", credentials.userId);
+
+        // Logout the old account and create a new one with the new credentials
+        [self removeAccount:account sendLogoutRequest:YES completion:nil];
+
+        MXKAccount *newAccount = [[MXKAccount alloc] initWithCredentials:credentials];
+        [self addAccount:newAccount andOpenSession:YES];
+    }
+}
+
+- (MXKAccount *)accountForUserId:(NSString *)userId
+{
+    for (MXKAccount *account in mxAccounts)
+    {
+        if ([account.mxCredentials.userId isEqualToString:userId])
+        {
+            return account;
+        }
+    }
+    return nil;
+}
+
+- (MXKAccount *)accountKnowingRoomWithRoomIdOrAlias:(NSString *)roomIdOrAlias
+{
+    MXKAccount *theAccount = nil;
+
+    NSArray *activeAccounts = self.activeAccounts;
+
+    for (MXKAccount *account in activeAccounts)
+    {
+        if ([roomIdOrAlias hasPrefix:@"#"])
+        {
+            if ([account.mxSession roomWithAlias:roomIdOrAlias])
+            {
+                theAccount = account;
+                break;
+            }
+        }
+        else
+        {
+            if ([account.mxSession roomWithRoomId:roomIdOrAlias])
+            {
+                theAccount = account;
+                break;
+            }
+        }
+    }
+    return theAccount;
+}
+
+- (MXKAccount *)accountKnowingUserWithUserId:(NSString *)userId
+{
+    MXKAccount *theAccount = nil;
+
+    NSArray *activeAccounts = self.activeAccounts;
+
+    for (MXKAccount *account in activeAccounts)
+    {
+        if ([account.mxSession userWithUserId:userId])
+        {
+            theAccount = account;
+            break;
+        }
+    }
+    return theAccount;
+}
+
+#pragma mark -
+
+- (void)setStoreClass:(Class)storeClass
+{
+    // Sanity check
+    NSAssert([storeClass conformsToProtocol:@protocol(MXStore)], @"MXKAccountManager only manages store class that conforms to MXStore protocol");
+    
+    _storeClass = storeClass;
+}
+
+- (NSArray<MXKAccount *> *)accounts
+{
+    return [mxAccounts copy];
+}
+
+- (NSArray<MXKAccount *> *)activeAccounts
+{
+    NSMutableArray *activeAccounts = [NSMutableArray arrayWithCapacity:mxAccounts.count];
+    for (MXKAccount *account in mxAccounts)
+    {
+        if (!account.disabled && !account.isSoftLogout)
+        {
+            [activeAccounts addObject:account];
+        }
+    }
+    return activeAccounts;
+}
+
+- (NSData *)apnsDeviceToken
+{
+    NSData *token = [[NSUserDefaults standardUserDefaults] objectForKey:@"apnsDeviceToken"];
+    if (!token.length)
+    {
+        [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"apnsDeviceToken"];
+        token = nil;
+    }
+
+    MXLogDebug(@"[MXKAccountManager][Push] apnsDeviceToken: %@", [MXKTools logForPushToken:token]);
+    return token;
+}
+
+- (void)setApnsDeviceToken:(NSData *)apnsDeviceToken
+{
+    MXLogDebug(@"[MXKAccountManager][Push] setApnsDeviceToken: %@", [MXKTools logForPushToken:apnsDeviceToken]);
+
+    NSData *oldToken = self.apnsDeviceToken;
+    if (!apnsDeviceToken.length)
+    {
+        MXLogDebug(@"[MXKAccountManager][Push] setApnsDeviceToken: reset APNS device token");
+        
+        if (oldToken)
+        {
+            // turn off the Apns flag for all accounts if any
+            for (MXKAccount *account in mxAccounts)
+            {
+                [account enablePushNotifications:NO success:nil failure:nil];
+            }
+        }
+        
+        [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"apnsDeviceToken"];
+    }
+    else
+    {
+        NSArray *activeAccounts = self.activeAccounts;
+        
+        if (!oldToken)
+        {
+            MXLogDebug(@"[MXKAccountManager][Push] setApnsDeviceToken: set APNS device token");
+            
+            [[NSUserDefaults standardUserDefaults] setObject:apnsDeviceToken forKey:@"apnsDeviceToken"];
+
+            // turn on the Apns flag for all accounts, when the Apns registration succeeds for the first time
+            for (MXKAccount *account in activeAccounts)
+            {
+                [account enablePushNotifications:YES success:nil failure:nil];
+            }
+        }
+        else if (![oldToken isEqualToData:apnsDeviceToken])
+        {
+            MXLogDebug(@"[MXKAccountManager][Push] setApnsDeviceToken: update APNS device token");
+
+            NSMutableArray<MXKAccount*> *accountsWithAPNSPusher = [NSMutableArray new];
+
+            // Delete the pushers related to the old token
+            for (MXKAccount *account in activeAccounts)
+            {
+                if (account.hasPusherForPushNotifications)
+                {
+                    [accountsWithAPNSPusher addObject:account];
+                }
+
+                [account enablePushNotifications:NO success:nil failure:nil];
+            }
+            
+            // Update the token
+            [[NSUserDefaults standardUserDefaults] setObject:apnsDeviceToken forKey:@"apnsDeviceToken"];
+
+            // Refresh pushers with the new token.
+            for (MXKAccount *account in activeAccounts)
+            {
+                if ([accountsWithAPNSPusher containsObject:account])
+                {
+                    MXLogDebug(@"[MXKAccountManager][Push] setApnsDeviceToken: Resync APNS for %@ account", account.mxCredentials.userId);
+                    [account enablePushNotifications:YES success:nil failure:nil];
+                }
+                else
+                {
+                    MXLogDebug(@"[MXKAccountManager][Push] setApnsDeviceToken: hasPusherForPushNotifications = NO for %@ account. Do not enable Push", account.mxCredentials.userId);
+                }
+            }
+        }
+        else
+        {
+            MXLogDebug(@"[MXKAccountManager][Push] setApnsDeviceToken: Same token. Nothing to do.");
+        }
+    }
+}
+
+- (BOOL)isAPNSAvailable
+{
+    // [UIApplication isRegisteredForRemoteNotifications] tells whether your app can receive
+    // remote notifications or not. Receiving remote notifications does not guarantee it will
+    // display them to the user as they may have notifications set to deliver quietly.
+    
+    BOOL isRemoteNotificationsAllowed = NO;
+    
+    UIApplication *sharedApplication = [UIApplication performSelector:@selector(sharedApplication)];
+    if (sharedApplication)
+    {
+        isRemoteNotificationsAllowed = [sharedApplication isRegisteredForRemoteNotifications];
+        
+        MXLogDebug(@"[MXKAccountManager][Push] isAPNSAvailable: The user %@ remote notification", (isRemoteNotificationsAllowed ? @"allowed" : @"denied"));
+    }
+
+    BOOL isAPNSAvailable = (isRemoteNotificationsAllowed && self.apnsDeviceToken);
+
+    MXLogDebug(@"[MXKAccountManager][Push] isAPNSAvailable: %@", @(isAPNSAvailable));
+
+    return isAPNSAvailable;
+}
+
+- (NSData *)pushDeviceToken
+{
+    NSData *token = [[NSUserDefaults standardUserDefaults] objectForKey:@"pushDeviceToken"];
+    if (!token.length)
+    {
+        [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"pushDeviceToken"];
+        [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"pushOptions"];
+        token = nil;
+    }
+
+    MXLogDebug(@"[MXKAccountManager][Push] pushDeviceToken: %@", [MXKTools logForPushToken:token]);
+    return token;
+}
+
+- (NSDictionary *)pushOptions
+{
+    NSDictionary *pushOptions = [[NSUserDefaults standardUserDefaults] objectForKey:@"pushOptions"];
+
+    MXLogDebug(@"[MXKAccountManager][Push] pushOptions: %@", pushOptions);
+    return pushOptions;
+}
+
+- (void)setPushDeviceToken:(NSData *)pushDeviceToken withPushOptions:(NSDictionary *)pushOptions
+{
+    MXLogDebug(@"[MXKAccountManager][Push] setPushDeviceToken: %@ withPushOptions: %@", [MXKTools logForPushToken:pushDeviceToken], pushOptions);
+
+    NSData *oldToken = self.pushDeviceToken;
+    if (!pushDeviceToken.length)
+    {
+        MXLogDebug(@"[MXKAccountManager][Push] setPushDeviceToken: Reset Push device token");
+        
+        if (oldToken)
+        {
+            // turn off the Push flag for all accounts if any
+            for (MXKAccount *account in mxAccounts)
+            {
+                [account enablePushKitNotifications:NO success:^{
+                    //  make sure pusher really removed before losing token.
+                    [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"pushDeviceToken"];
+                    [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"pushOptions"];
+                } failure:nil];
+            }
+        }
+    }
+    else
+    {
+        NSArray *activeAccounts = self.activeAccounts;
+        
+        if (!oldToken)
+        {
+            MXLogDebug(@"[MXKAccountManager][Push] setPushDeviceToken: Set Push device token");
+            
+            [[NSUserDefaults standardUserDefaults] setObject:pushDeviceToken forKey:@"pushDeviceToken"];
+            if (pushOptions)
+            {
+                [[NSUserDefaults standardUserDefaults] setObject:pushOptions forKey:@"pushOptions"];
+            }
+            else
+            {
+                [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"pushOptions"];
+            }
+
+            // turn on the Push flag for all accounts
+            for (MXKAccount *account in activeAccounts)
+            {
+                [account enablePushKitNotifications:YES success:nil failure:nil];
+            }
+        }
+        else if (![oldToken isEqualToData:pushDeviceToken])
+        {
+            MXLogDebug(@"[MXKAccountManager][Push] setPushDeviceToken: Update Push device token");
+
+            NSMutableArray<MXKAccount*> *accountsWithPushKitPusher = [NSMutableArray new];
+
+            // Delete the pushers related to the old token
+            for (MXKAccount *account in activeAccounts)
+            {
+                if (account.hasPusherForPushKitNotifications)
+                {
+                    [accountsWithPushKitPusher addObject:account];
+                }
+
+                [account enablePushKitNotifications:NO success:nil failure:nil];
+            }
+            
+            // Update the token
+            [[NSUserDefaults standardUserDefaults] setObject:pushDeviceToken forKey:@"pushDeviceToken"];
+            if (pushOptions)
+            {
+                [[NSUserDefaults standardUserDefaults] setObject:pushOptions forKey:@"pushOptions"];
+            }
+            else
+            {
+                [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"pushOptions"];
+            }
+
+            // Refresh pushers with the new token.
+            for (MXKAccount *account in activeAccounts)
+            {
+                if ([accountsWithPushKitPusher containsObject:account])
+                {
+                    MXLogDebug(@"[MXKAccountManager][Push] setPushDeviceToken: Resync Push for %@ account", account.mxCredentials.userId);
+                    [account enablePushKitNotifications:YES success:nil failure:nil];
+                }
+                else
+                {
+                    MXLogDebug(@"[MXKAccountManager][Push] setPushDeviceToken: hasPusherForPushKitNotifications = NO for %@ account. Do not enable Push", account.mxCredentials.userId);
+                }
+            }
+        }
+        else
+        {
+            MXLogDebug(@"[MXKAccountManager][Push] setPushDeviceToken: Same token. Nothing to do.");
+        }
+    }
+}
+
+- (BOOL)isPushAvailable
+{
+    // [UIApplication isRegisteredForRemoteNotifications] tells whether your app can receive
+    // remote notifications or not. Receiving remote notifications does not guarantee it will
+    // display them to the user as they may have notifications set to deliver quietly.
+    
+    BOOL isRemoteNotificationsAllowed = NO;
+    
+    UIApplication *sharedApplication = [UIApplication performSelector:@selector(sharedApplication)];
+    if (sharedApplication)
+    {
+        isRemoteNotificationsAllowed = [sharedApplication isRegisteredForRemoteNotifications];
+        
+        MXLogDebug(@"[MXKAccountManager][Push] isPushAvailable: The user %@ remote notification", (isRemoteNotificationsAllowed ? @"allowed" : @"denied"));
+    }
+
+    BOOL isPushAvailable = (isRemoteNotificationsAllowed && self.pushDeviceToken);
+
+    MXLogDebug(@"[MXKAccountManager][Push] isPushAvailable: %@", @(isPushAvailable));
+    return isPushAvailable;
+}
+
+#pragma mark -
+
+// Return the path of the file containing stored MXAccounts array
+- (NSString*)accountFile
+{
+    NSString *matrixKitCacheFolder = [MXKAppSettings cacheFolder];
+    return [matrixKitCacheFolder stringByAppendingPathComponent:kMXKAccountsKey];
+}
+
+- (void)loadAccounts
+{
+    MXLogDebug(@"[MXKAccountManager] loadAccounts");
+
+    NSString *accountFile = [self accountFile];
+    if ([[NSFileManager defaultManager] fileExistsAtPath:accountFile])
+    {
+        NSDate *startDate = [NSDate date];
+        
+        NSError *error = nil;
+        NSData* filecontent = [NSData dataWithContentsOfFile:accountFile options:(NSDataReadingMappedAlways | NSDataReadingUncached) error:&error];
+        
+        if (!error)
+        {
+            // Decrypt data if encryption method is provided
+            NSData *unciphered = [self decryptData:filecontent];
+            NSKeyedUnarchiver *decoder = [[NSKeyedUnarchiver alloc] initForReadingWithData:unciphered];
+            mxAccounts = [decoder decodeObjectForKey:@"mxAccounts"];
+            
+            if (!mxAccounts && [[MXKeyProvider sharedInstance] isEncryptionAvailableForDataOfType:MXKAccountManagerDataType])
+            {
+                // This happens if the V2 file has not been encrypted -> read file content then save encrypted accounts
+                MXLogDebug(@"[MXKAccountManager] loadAccounts. Failed to read decrypted data: reading file data without encryption.");
+                decoder = [[NSKeyedUnarchiver alloc] initForReadingWithData:filecontent];
+                mxAccounts = [decoder decodeObjectForKey:@"mxAccounts"];
+                
+                if (mxAccounts)
+                {
+                    MXLogDebug(@"[MXKAccountManager] loadAccounts. saving encrypted accounts");
+                    [self saveAccounts];
+                }
+            }
+        }
+
+        MXLogDebug(@"[MXKAccountManager] loadAccounts. %tu accounts loaded in %.0fms", mxAccounts.count, [[NSDate date] timeIntervalSinceDate:startDate] * 1000);
+    }
+    else
+    {
+        // Migration of accountData from sharedUserDefaults to a file
+        NSUserDefaults *sharedDefaults = [MXKAppSettings standardAppSettings].sharedUserDefaults;
+
+        NSData *accountData = [sharedDefaults objectForKey:kMXKAccountsKey];
+        if (!accountData)
+        {
+            // Migration of accountData from [NSUserDefaults standardUserDefaults], the first location storage
+            accountData = [[NSUserDefaults standardUserDefaults] objectForKey:kMXKAccountsKey];
+        }
+
+        if (accountData)
+        {
+            mxAccounts = [NSMutableArray arrayWithArray:[NSKeyedUnarchiver unarchiveObjectWithData:accountData]];
+            [self saveAccounts];
+
+            MXLogDebug(@"[MXKAccountManager] loadAccounts: performed data migration");
+
+            // Now that data has been migrated, erase old location of accountData
+            [[NSUserDefaults standardUserDefaults] removeObjectForKey:kMXKAccountsKey];
+
+            [sharedDefaults removeObjectForKey:kMXKAccountsKey];
+        }
+    }
+
+    if (!mxAccounts)
+    {
+        MXLogDebug(@"[MXKAccountManager] loadAccounts. No accounts");
+        mxAccounts = [NSMutableArray array];
+    }
+}
+
+- (void)forceReloadAccounts
+{
+    MXLogDebug(@"[MXKAccountManager] Force reload existing accounts from local storage");
+    [self loadAccounts];
+}
+
+- (NSData*)encryptData:(NSData*)data
+{
+    // Exceptions are not caught as the key is always needed if the KeyProviderDelegate
+    // is provided.
+    MXKeyData *keyData = [[MXKeyProvider sharedInstance] requestKeyForDataOfType:MXKAccountManagerDataType isMandatory:YES expectedKeyType:kAes];
+    if (keyData && [keyData isKindOfClass:[MXAesKeyData class]])
+    {
+        MXAesKeyData *aesKey = (MXAesKeyData *) keyData;
+        NSData *cipher = [MXAes encrypt:data aesKey:aesKey.key iv:aesKey.iv error:nil];
+        return cipher;
+    }
+
+    MXLogDebug(@"[MXKAccountManager] encryptData: no key method provided for encryption.");
+    return data;
+}
+
+- (NSData*)decryptData:(NSData*)data
+{
+    // Exceptions are not cached as the key is always needed if the KeyProviderDelegate
+    // is provided.
+    MXKeyData *keyData = [[MXKeyProvider sharedInstance] requestKeyForDataOfType:MXKAccountManagerDataType isMandatory:YES expectedKeyType:kAes];
+    if (keyData && [keyData isKindOfClass:[MXAesKeyData class]])
+    {
+        MXAesKeyData *aesKey = (MXAesKeyData *) keyData;
+        NSData *decrypt = [MXAes decrypt:data aesKey:aesKey.key iv:aesKey.iv error:nil];
+        return decrypt;
+    }
+
+    MXLogDebug(@"[MXKAccountManager] decryptData: no key method provided for decryption.");
+    return data;
+}
+
+- (void)migrateAccounts
+{
+    NSString *pathOld = [[MXKAppSettings cacheFolder] stringByAppendingPathComponent:kMXKAccountsKeyOld];
+    NSString *pathNew = [[MXKAppSettings cacheFolder] stringByAppendingPathComponent:kMXKAccountsKey];
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    if ([fileManager fileExistsAtPath:pathOld])
+    {
+        if (![fileManager fileExistsAtPath:pathNew])
+        {
+            MXLogDebug(@"[MXKAccountManager] migrateAccounts: reading account");
+            mxAccounts = [NSKeyedUnarchiver unarchiveObjectWithFile:pathOld];
+            MXLogDebug(@"[MXKAccountManager] migrateAccounts: writing to accountV2");
+            [self saveAccounts];
+        }
+        
+        MXLogDebug(@"[MXKAccountManager] migrateAccounts: removing account");
+        [fileManager removeItemAtPath:pathOld error:nil];
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Contact/MXKContact.h b/Riot/Modules/MatrixKit/Models/Contact/MXKContact.h
new file mode 100644
index 000000000..3d8e8af24
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Contact/MXKContact.h
@@ -0,0 +1,170 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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/UIKit.h>
+
+#import <AddressBook/AddressBook.h>
+
+#import "MXKCellData.h"
+
+#import "MXKEmail.h"
+#import "MXKPhoneNumber.h"
+
+/**
+ Posted when the contact thumbnail is updated.
+ The notification object is a contact Id.
+ */
+extern NSString *const kMXKContactThumbnailUpdateNotification;
+
+extern NSString *const kMXKContactLocalContactPrefixId;
+extern NSString *const kMXKContactMatrixContactPrefixId;
+extern NSString *const kMXKContactDefaultContactPrefixId;
+
+@interface MXKContact : MXKCellData <NSCoding>
+
+/**
+ The unique identifier
+ */
+@property (nonatomic, readonly) NSString * contactID;
+
+/**
+ The display name
+ */
+@property (nonatomic, readwrite) NSString *displayName;
+
+/**
+ The sorting display name built by trimming the symbols [_!~`@#$%^&*-+();:={}[],.<>?\/"'] from the display name.
+ */
+@property (nonatomic) NSString* sortingDisplayName;
+
+/**
+ The contact thumbnail. Default size: 256 X 256 pixels
+ */
+@property (nonatomic, copy, readonly) UIImage *thumbnail;
+
+/**
+ YES if the contact does not exist in the contacts book
+ the contact has been created from a MXUser or MXRoomThirdPartyInvite
+ */
+@property (nonatomic) BOOL isMatrixContact;
+
+/**
+ YES if the contact is coming from MXRoomThirdPartyInvite event (NO by default).
+ */
+@property (nonatomic) BOOL isThirdPartyInvite;
+
+/**
+ The array of MXKPhoneNumber
+ */
+@property (nonatomic, readonly) NSArray *phoneNumbers;
+
+/**
+ The array of MXKEmail
+ */
+@property (nonatomic, readonly) NSArray *emailAddresses;
+
+/**
+ The array of matrix identifiers
+ */
+@property (nonatomic, readonly) NSArray* matrixIdentifiers;
+
+/**
+ The matrix avatar url used (if any) to build the current thumbnail, nil by default.
+ */
+@property (nonatomic, readonly) NSString* matrixAvatarURL;
+
+/**
+ Reset the current thumbnail if it is retrieved from a matrix url. May be used in case of the matrix avatar url change.
+ A new thumbnail will be automatically restored from the contact data.
+ */
+- (void)resetMatrixThumbnail;
+
+/**
+ The contact ID from native phonebook record
+ */
++ (NSString*)contactID:(ABRecordRef)record;
+
+/**
+ Create a local contact from a device contact
+ 
+ @param record device contact id
+ @return MXKContact instance
+ */
+- (id)initLocalContactWithABRecord:(ABRecordRef)record;
+
+/**
+ Create a matrix contact with the dedicated info
+ 
+ @param displayName the contact display name
+ @param matrixID the contact matrix id
+ @return MXKContact instance
+ */
+- (id)initMatrixContactWithDisplayName:(NSString*)displayName andMatrixID:(NSString*)matrixID;
+
+/**
+ Create a matrix contact with the dedicated info
+
+ @param displayName the contact display name
+ @param matrixID the contact matrix id
+ @param matrixAvatarURL the matrix avatar url
+ @return MXKContact instance
+ */
+- (id)initMatrixContactWithDisplayName:(NSString*)displayName matrixID:(NSString*)matrixID andMatrixAvatarURL:(NSString*)matrixAvatarURL;
+
+/**
+ Create a contact with the dedicated info
+ 
+ @param displayName the contact display name
+ @param emails an array of emails
+ @param phones an array of phone numbers
+ @param thumbnail  the contact thumbnail
+ @return MXKContact instance
+ */
+- (id)initContactWithDisplayName:(NSString*)displayName
+                          emails:(NSArray<MXKEmail*> *)emails
+                    phoneNumbers:(NSArray<MXKPhoneNumber*> *)phones
+                    andThumbnail:(UIImage *)thumbnail;
+
+/**
+ The contact thumbnail with a prefered size.
+ 
+ If the thumbnail is already loaded, this method returns this one by ignoring prefered size.
+ The prefered size is used only if a server request is required.
+ 
+ @return thumbnail with a prefered size
+ */
+- (UIImage*)thumbnailWithPreferedSize:(CGSize)size;
+
+/**
+ Tell whether a component of the contact's displayName, or one of his matrix id/email has the provided prefix.
+ 
+ @param prefix a non empty string.
+ @return YES when at least one matrix id, email or a component of the display name has this prefix.
+ */
+- (BOOL)hasPrefix:(NSString*)prefix;
+
+/**
+ Check if the patterns can match with this contact
+ */
+- (BOOL)matchedWithPatterns:(NSArray*)patterns;
+
+/**
+ The default ISO 3166-1 country code used to internationalize the contact phone numbers.
+ */
+@property (nonatomic) NSString *defaultCountryCode;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Contact/MXKContact.m b/Riot/Modules/MatrixKit/Models/Contact/MXKContact.m
new file mode 100644
index 000000000..2b1e57727
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Contact/MXKContact.m
@@ -0,0 +1,659 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2019 The Matrix.org Foundation C.I.C
+ 
+ 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 "MXKContact.h"
+
+#import "MXKEmail.h"
+#import "MXKPhoneNumber.h"
+
+NSString *const kMXKContactThumbnailUpdateNotification = @"kMXKContactThumbnailUpdateNotification";
+
+NSString *const kMXKContactLocalContactPrefixId = @"Local_";
+NSString *const kMXKContactMatrixContactPrefixId = @"Matrix_";
+NSString *const kMXKContactDefaultContactPrefixId = @"Default_";
+
+@interface MXKContact()
+{
+    UIImage* contactThumbnail;
+    UIImage* matrixThumbnail;
+    
+    // The matrix id of the contact (used when the contact is not defined in the contacts book)
+    MXKContactField *matrixIdField;
+}
+@end
+
+@implementation MXKContact
+@synthesize isMatrixContact, isThirdPartyInvite;
+
++ (NSString*)contactID:(ABRecordRef)record
+{
+    return [NSString stringWithFormat:@"%@%d", kMXKContactLocalContactPrefixId, ABRecordGetRecordID(record)];
+}
+
+- (id)init
+{
+    self = [super init];
+    if (self)
+    {
+        matrixIdField = nil;
+        isMatrixContact = NO;
+        _matrixAvatarURL = nil;
+        
+        isThirdPartyInvite = NO;
+    }
+    
+    return self;
+}
+
+- (id)initLocalContactWithABRecord:(ABRecordRef)record
+{
+    self = [self init];
+    if (self)
+    {
+        // compute a contact ID
+        _contactID = [MXKContact contactID:record];
+        
+        // use the contact book display name
+        _displayName = (__bridge NSString*) ABRecordCopyCompositeName(record);
+        
+        // avoid nil display name
+        // the display name is used to sort contacts
+        if (!_displayName)
+        {
+            _displayName = @"";
+        }
+        
+        // extract the phone numbers and their related label
+        ABMultiValueRef multi = ABRecordCopyValue(record, kABPersonPhoneProperty);
+        CFIndex        nCount = ABMultiValueGetCount(multi);
+        NSMutableArray* pns = [[NSMutableArray alloc] initWithCapacity:nCount];
+        
+        for (int i = 0; i < nCount; i++)
+        {
+            CFTypeRef phoneRef = ABMultiValueCopyValueAtIndex(multi, i);
+            NSString *phoneVal = (__bridge NSString*)phoneRef;
+            
+            // sanity check
+            if (0 != [phoneVal length])
+            {
+                CFStringRef lblRef = ABMultiValueCopyLabelAtIndex(multi, i);
+                CFStringRef localizedLblRef = nil;
+                NSString *lbl =  @"";
+                
+                if (lblRef != nil)
+                {
+                    localizedLblRef = ABAddressBookCopyLocalizedLabel(lblRef);
+                    if (localizedLblRef)
+                    {
+                        lbl = (__bridge NSString*)localizedLblRef;
+                    }
+                    else
+                    {
+                        lbl = (__bridge NSString*)lblRef;
+                    }
+                }
+                else
+                {
+                    localizedLblRef = ABAddressBookCopyLocalizedLabel(kABOtherLabel);
+                    if (localizedLblRef)
+                    {
+                        lbl = (__bridge NSString*)localizedLblRef;
+                    }
+                }
+                
+                [pns addObject:[[MXKPhoneNumber alloc] initWithTextNumber:phoneVal type:lbl contactID:_contactID matrixID:nil]];
+                
+                if (lblRef)
+                {
+                    CFRelease(lblRef);
+                }
+                if (localizedLblRef)
+                {
+                    CFRelease(localizedLblRef);
+                }
+            }
+            
+            // release meory
+            if (phoneRef)
+            {
+                CFRelease(phoneRef);
+            }
+        }
+        
+        CFRelease(multi);
+        _phoneNumbers = pns;
+        
+        // extract the emails
+        multi = ABRecordCopyValue(record, kABPersonEmailProperty);
+        nCount = ABMultiValueGetCount(multi);
+        
+        NSMutableArray *emails = [[NSMutableArray alloc] initWithCapacity:nCount];
+        
+        for (int i = 0; i < nCount; i++)
+        {
+            CFTypeRef emailValRef = ABMultiValueCopyValueAtIndex(multi, i);
+            NSString *emailVal = (__bridge NSString*)emailValRef;
+            
+            // sanity check
+            if ((nil != emailVal) && (0 != [emailVal length]))
+            {
+                CFStringRef lblRef = ABMultiValueCopyLabelAtIndex(multi, i);
+                CFStringRef localizedLblRef = nil;
+                NSString *lbl =  @"";
+                
+                if (lblRef != nil)
+                {
+                    localizedLblRef = ABAddressBookCopyLocalizedLabel(lblRef);
+                    
+                    if (localizedLblRef)
+                    {
+                        lbl = (__bridge NSString*)localizedLblRef;
+                    }
+                    else
+                    {
+                        lbl = (__bridge NSString*)lblRef;
+                    }
+                }
+                else
+                {
+                    localizedLblRef = ABAddressBookCopyLocalizedLabel(kABOtherLabel);
+                    if (localizedLblRef)
+                    {
+                        lbl = (__bridge NSString*)localizedLblRef;
+                    }
+                }
+                
+                [emails addObject: [[MXKEmail alloc] initWithEmailAddress:emailVal type:lbl contactID:_contactID matrixID:nil]];
+                
+                if (lblRef)
+                {
+                    CFRelease(lblRef);
+                }
+                
+                if (localizedLblRef)
+                {
+                    CFRelease(localizedLblRef);
+                }
+            }
+            
+            if (emailValRef)
+            {
+                CFRelease(emailValRef);
+            }
+        }
+        
+        CFRelease(multi);
+        
+        _emailAddresses = emails;
+        
+        // thumbnail/picture
+        // check whether the contact has a picture
+        if (ABPersonHasImageData(record))
+        {
+            CFDataRef dataRef;
+            
+            dataRef = ABPersonCopyImageDataWithFormat(record, kABPersonImageFormatThumbnail);
+            if (dataRef)
+            {
+                contactThumbnail = [UIImage imageWithData:(__bridge NSData*)dataRef];
+                CFRelease(dataRef);
+            }
+        }
+    }
+    return self;
+}
+
+- (id)initMatrixContactWithDisplayName:(NSString*)displayName andMatrixID:(NSString*)matrixID
+{
+    self = [self init];
+    if (self)
+    {
+        _contactID = [NSString stringWithFormat:@"%@%@", kMXKContactMatrixContactPrefixId, [[NSUUID UUID] UUIDString]];
+        
+        // Sanity check
+        if (matrixID.length)
+        {
+            // used when the contact is not defined in the contacts book
+            matrixIdField = [[MXKContactField alloc] initWithContactID:_contactID matrixID:matrixID];
+            isMatrixContact = YES;
+        }
+        
+        // _displayName must not be nil
+        // it is used to sort the contacts
+        if (displayName)
+        {
+            _displayName = displayName;
+        }
+        else
+        {
+            _displayName = @"";
+        }
+    }
+    
+    return self;
+}
+
+- (id)initMatrixContactWithDisplayName:(NSString*)displayName matrixID:(NSString*)matrixID andMatrixAvatarURL:(NSString*)matrixAvatarURL
+{
+    self = [self initMatrixContactWithDisplayName:displayName andMatrixID:matrixID];
+    if (self)
+    {
+        matrixIdField.matrixAvatarURL = matrixAvatarURL;
+    }
+    return self;
+}
+
+- (id)initContactWithDisplayName:(NSString*)displayName
+                          emails:(NSArray<MXKEmail*> *)emails
+                    phoneNumbers:(NSArray<MXKPhoneNumber*> *)phones
+                    andThumbnail:(UIImage *)thumbnail
+{
+    self = [self init];
+    if (self)
+    {
+        _contactID = [NSString stringWithFormat:@"%@%@", kMXKContactDefaultContactPrefixId, [[NSUUID UUID] UUIDString]];
+        
+        // _displayName must not be nil
+        // it is used to sort the contacts
+        if (displayName)
+        {
+            _displayName = displayName;
+        }
+        else
+        {
+            _displayName = @"";
+        }
+        
+        _emailAddresses = emails;
+        _phoneNumbers = phones;
+        
+        contactThumbnail = thumbnail;
+    }
+    
+    return self;
+}
+
+#pragma mark -
+
+- (NSString*)sortingDisplayName
+{
+    if (!_sortingDisplayName)
+    {
+        // Sanity check - display name should not be nil here
+        if (self.displayName)
+        {
+            NSCharacterSet *specialCharacterSet = [NSCharacterSet characterSetWithCharactersInString:@"_!~`@#$%^&*-+();:={}[],.<>?\\/\"\'"];
+            
+            _sortingDisplayName = [self.displayName stringByTrimmingCharactersInSet:specialCharacterSet];
+        }
+        else
+        {
+            return @"";
+        }
+    }
+    
+    return _sortingDisplayName;
+}
+
+- (BOOL)hasPrefix:(NSString*)prefix
+{
+    prefix = [prefix lowercaseString];
+    
+    // Check first display name
+    if (_displayName.length)
+    {
+        NSString *lowercaseString = [_displayName lowercaseString];
+        if ([lowercaseString hasPrefix:prefix])
+        {
+            return YES;
+        }
+        
+        NSArray *components = [lowercaseString componentsSeparatedByString:@" "];
+        for (NSString *component in components)
+        {
+            NSString *theComponent = [component stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+            if ([theComponent hasPrefix:prefix])
+            {
+                return YES;
+            }
+        }
+    }
+    
+    // Check matrix identifiers
+    NSArray *identifiers = self.matrixIdentifiers;
+    NSString *idPrefix = prefix;
+    if (![prefix hasPrefix:@"@"])
+    {
+        idPrefix = [NSString stringWithFormat:@"@%@", prefix];
+    }
+    
+    for (NSString* mxId in identifiers)
+    {
+        if ([[mxId lowercaseString] hasPrefix:idPrefix])
+        {
+            return YES;
+        }
+    }
+    
+    // Check email
+    for (MXKEmail* email in _emailAddresses)
+    {
+        if ([email.emailAddress hasPrefix:prefix])
+        {
+            return YES;
+        }
+    }
+    
+    // Check phones
+    for (MXKPhoneNumber* phone in _phoneNumbers)
+    {
+        if ([phone hasPrefix:prefix])
+        {
+            return YES;
+        }
+    }
+    
+    return NO;
+}
+
+- (BOOL)matchedWithPatterns:(NSArray*)patterns
+{
+    BOOL matched = NO;
+    
+    if (patterns.count > 0)
+    {
+        matched = YES;
+        
+        // test first display name
+        for (NSString* pattern in patterns)
+        {
+            if ([_displayName rangeOfString:pattern options:NSCaseInsensitiveSearch].location == NSNotFound)
+            {
+                matched = NO;
+                break;
+            }
+        }
+        
+        NSArray *identifiers = self.matrixIdentifiers;
+        if (!matched && identifiers.count > 0)
+        {
+            for (NSString* mxId in identifiers)
+            {
+                // Consider only the first part of the matrix id (ignore homeserver name)
+                NSRange range = [mxId rangeOfString:@":"];
+                if (range.location != NSNotFound)
+                {
+                    NSString *mxIdName = [mxId substringToIndex:range.location];
+                    for (NSString* pattern in patterns)
+                    {
+                        if ([mxIdName rangeOfString:pattern options:NSCaseInsensitiveSearch].location != NSNotFound)
+                        {
+                            matched = YES;
+                            break;
+                        }
+                    }
+                    
+                    if (matched)
+                    {
+                        break;
+                    }
+                }
+            }
+        }
+        
+        if (!matched && _phoneNumbers.count > 0)
+        {
+            for (MXKPhoneNumber* phonenumber in _phoneNumbers)
+            {
+                if ([phonenumber matchedWithPatterns:patterns])
+                {
+                    matched = YES;
+                    break;
+                }
+            }
+        }
+        
+        if (!matched && _emailAddresses.count > 0)
+        {
+            for (MXKEmail* email in _emailAddresses)
+            {
+                if ([email matchedWithPatterns:patterns])
+                {
+                    matched = YES;
+                    break;
+                }
+            }
+        }
+    }
+    else
+    {
+        // if there is no pattern to search, it should always matched
+        matched = YES;
+    }
+    
+    return matched;
+}
+
+- (void)setDefaultCountryCode:(NSString *)defaultCountryCode
+{
+    for (MXKPhoneNumber* phonenumber in _phoneNumbers)
+    {
+        phonenumber.defaultCountryCode = defaultCountryCode;
+    }
+    
+    _defaultCountryCode = defaultCountryCode;
+}
+
+#pragma mark - getter/setter
+
+- (NSArray*)matrixIdentifiers
+{
+    NSMutableArray* identifiers = [[NSMutableArray alloc] init];
+    
+    if (matrixIdField)
+    {
+        [identifiers addObject:matrixIdField.matrixID];
+    }
+    
+    for (MXKEmail* email in _emailAddresses)
+    {
+        if (email.matrixID && ([identifiers indexOfObject:email.matrixID] == NSNotFound))
+        {
+            [identifiers addObject:email.matrixID];
+        }
+    }
+    
+    for (MXKPhoneNumber* pn in _phoneNumbers)
+    {
+        if (pn.matrixID && ([identifiers indexOfObject:pn.matrixID] == NSNotFound))
+        {
+            [identifiers addObject:pn.matrixID];
+        }
+    }
+    
+    return identifiers;
+}
+
+- (void)setDisplayName:(NSString *)displayName
+{
+    // a display name must not be emptied
+    // it is used to sort the contacts
+    if (displayName.length == 0)
+    {
+        _displayName = _contactID;
+    }
+    else
+    {
+        _displayName = displayName;
+    }
+}
+
+- (void)resetMatrixThumbnail
+{
+    matrixThumbnail = nil;
+    _matrixAvatarURL = nil;
+    
+    // Reset the avatar in the contact fields too.
+    [matrixIdField resetMatrixAvatar];
+    
+    for (MXKEmail* email in _emailAddresses)
+    {
+        [email resetMatrixAvatar];
+    }
+}
+
+- (UIImage*)thumbnailWithPreferedSize:(CGSize)size
+{
+    // Consider first the local thumbnail if any.
+    if (contactThumbnail)
+    {
+        return contactThumbnail;
+    }
+    
+    // Check whether a matrix thumbnail is already found.
+    if (matrixThumbnail)
+    {
+        return matrixThumbnail;
+    }
+    
+    // Look for a thumbnail from the matrix identifiers
+    MXKContactField* firstField = matrixIdField;
+    if (firstField)
+    {
+        if (firstField.avatarImage)
+        {
+            matrixThumbnail = firstField.avatarImage;
+            _matrixAvatarURL = firstField.matrixAvatarURL;
+            return matrixThumbnail;
+        }
+    }
+    
+    // try to replace the thumbnail by the matrix one
+    if (_emailAddresses.count > 0)
+    {
+        // list the linked email
+        // search if one email field has a dedicated thumbnail
+        for (MXKEmail* email in _emailAddresses)
+        {
+            if (email.avatarImage)
+            {
+                matrixThumbnail = email.avatarImage;
+                _matrixAvatarURL = email.matrixAvatarURL;
+                return matrixThumbnail;
+            }
+            else if (!firstField && email.matrixID)
+            {
+                firstField = email;
+            }
+        }
+    }
+    
+    if (_phoneNumbers.count > 0)
+    {
+        // list the linked phones
+        // search if one phone field has a dedicated thumbnail
+        for (MXKPhoneNumber* phoneNb in _phoneNumbers)
+        {
+            if (phoneNb.avatarImage)
+            {
+                matrixThumbnail = phoneNb.avatarImage;
+                _matrixAvatarURL = phoneNb.matrixAvatarURL;
+                return matrixThumbnail;
+            }
+            else if (!firstField && phoneNb.matrixID)
+            {
+                firstField = phoneNb;
+            }
+        }
+    }
+    
+    // if no thumbnail has been found
+    // try to load the first field one
+    if (firstField)
+    {
+        // should be retrieved by the cell info
+        [firstField loadAvatarWithSize:size];
+    }
+    
+    return nil;
+}
+
+- (UIImage*)thumbnail
+{
+    return [self thumbnailWithPreferedSize:CGSizeMake(256, 256)];
+}
+
+#pragma mark NSCoding
+
+- (id)initWithCoder:(NSCoder *)coder
+{
+    _contactID = [coder decodeObjectForKey:@"contactID"];
+    _displayName = [coder decodeObjectForKey:@"displayName"];
+    
+    matrixIdField = [coder decodeObjectForKey:@"matrixIdField"];
+    
+    _phoneNumbers = [coder decodeObjectForKey:@"phoneNumbers"];
+    _emailAddresses = [coder decodeObjectForKey:@"emailAddresses"];
+    
+    NSData *data = [coder decodeObjectForKey:@"contactThumbnail"];
+    if (!data)
+    {
+        // Check the legacy storage.
+        data = [coder decodeObjectForKey:@"contactBookThumbnail"];
+    }
+    
+    if (data)
+    {
+        contactThumbnail = [UIImage imageWithData:data];
+    }
+    
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder
+{
+    
+    [coder encodeObject:_contactID forKey:@"contactID"];
+    [coder encodeObject:_displayName forKey:@"displayName"];
+    
+    if (matrixIdField)
+    {
+        [coder encodeObject:matrixIdField forKey:@"matrixIdField"];
+    }
+    
+    if (_phoneNumbers.count)
+    {
+        [coder encodeObject:_phoneNumbers forKey:@"phoneNumbers"];
+    }
+    
+    if (_emailAddresses.count)
+    {
+        [coder encodeObject:_emailAddresses forKey:@"emailAddresses"];
+    }
+    
+    if (contactThumbnail)
+    {
+        @autoreleasepool
+        {
+            NSData *data = UIImageJPEGRepresentation(contactThumbnail, 0.8);
+            [coder encodeObject:data forKey:@"contactThumbnail"];
+        }
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Contact/MXKContactField.h b/Riot/Modules/MatrixKit/Models/Contact/MXKContactField.h
new file mode 100644
index 000000000..0fa4107d2
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Contact/MXKContactField.h
@@ -0,0 +1,50 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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/UIKit.h>
+
+@interface MXKContactField : NSObject<NSCoding>
+
+/**
+ The identifier of the contact to whom the data belongs to.
+ */
+@property (nonatomic, readonly) NSString *contactID;
+/**
+ The linked matrix identifier if any
+ */
+@property (nonatomic, readwrite) NSString *matrixID;
+/**
+ The matrix avatar url (Matrix Content URI), nil by default.
+ */
+@property (nonatomic) NSString* matrixAvatarURL;
+/**
+ The current avatar downloaded by using the avatar url if any
+ */
+@property (nonatomic, readonly) UIImage  *avatarImage;
+
+- (id)initWithContactID:(NSString*)contactID matrixID:(NSString*)matrixID;
+
+- (void)loadAvatarWithSize:(CGSize)avatarSize;
+
+/**
+ Reset the current avatar. May be used in case of the matrix avatar url change.
+ A new avatar will be automatically restored from the matrix data.
+ */
+- (void)resetMatrixAvatar;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Contact/MXKContactField.m b/Riot/Modules/MatrixKit/Models/Contact/MXKContactField.m
new file mode 100644
index 000000000..b1850878e
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Contact/MXKContactField.m
@@ -0,0 +1,235 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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 "MXKContactField.h"
+
+@import MatrixSDK.MXMediaManager;
+
+#import "MXKContactManager.h"
+
+@interface MXKContactField()
+{
+    // Tell whether we already check the contact avatar definition.
+    BOOL shouldCheckAvatarURL;
+    // The media manager of the session used to retrieve the contect avatar url
+    // This manager is used to download this avatar if need
+    MXMediaManager *mediaManager;
+    // The current download id
+    NSString *downloadId;
+}
+@end
+
+@implementation MXKContactField
+
+- (void)initFields
+{
+    // init members
+    _contactID = nil;
+    _matrixID = nil;
+    
+    [self resetMatrixAvatar];
+}
+
+- (id)initWithContactID:(NSString*)contactID matrixID:(NSString*)matrixID
+{
+    self = [super init];
+    
+    if (self)
+    {
+        [self initFields];
+        _contactID = contactID;
+        _matrixID = matrixID;
+    }
+    
+    return self;
+}
+
+- (void)resetMatrixAvatar
+{
+    _avatarImage = nil;
+    _matrixAvatarURL = nil;
+    shouldCheckAvatarURL = YES;
+    mediaManager = nil;
+    downloadId = nil;
+}
+
+- (void)loadAvatarWithSize:(CGSize)avatarSize
+{
+    // Check whether the avatar image is already set
+    if (_avatarImage)
+    {
+        return;
+    }
+    
+    // Sanity check
+    if (_matrixID)
+    {
+        if (shouldCheckAvatarURL)
+        {
+            // Consider here all sessions reported into contact manager
+            NSArray* mxSessions = [MXKContactManager sharedManager].mxSessions;
+            
+            if (mxSessions.count)
+            {
+                // Check whether a matrix user is already known
+                MXUser* user;
+                MXSession *mxSession;
+                
+                for (mxSession in mxSessions)
+                {
+                    user = [mxSession userWithUserId:_matrixID];
+                    if (user)
+                    {
+                        _matrixAvatarURL = user.avatarUrl;
+                        if (_matrixAvatarURL)
+                        {
+                            shouldCheckAvatarURL = NO;
+                            mediaManager = mxSession.mediaManager;
+                            [self downloadAvatarImage:avatarSize];
+                        }
+                        break;
+                    }
+                }
+                
+                // Trigger a server request if this url has not been found.
+                if (shouldCheckAvatarURL)
+                {
+                    MXWeakify(self);
+                    [mxSession.matrixRestClient avatarUrlForUser:_matrixID
+                                                         success:^(NSString *mxAvatarUrl) {
+                                                             
+                                                             MXStrongifyAndReturnIfNil(self);
+                                                             self.matrixAvatarURL = mxAvatarUrl;
+                                                             self->shouldCheckAvatarURL = NO;
+                                                             self->mediaManager = mxSession.mediaManager;
+                                                             [self downloadAvatarImage:avatarSize];
+                                                             
+                                                         } failure:nil];
+                }
+            }
+        }
+        else if (_matrixAvatarURL)
+        {
+            [self downloadAvatarImage:avatarSize];
+        }
+        // Do nothing if the avatar url has been checked, and it is null.
+    }
+}
+
+- (void)downloadAvatarImage:(CGSize)avatarSize
+{
+    // the avatar image is already done
+    if (_avatarImage)
+    {
+        return;
+    }
+    
+    if (_matrixAvatarURL)
+    {
+        NSString *cacheFilePath = [MXMediaManager thumbnailCachePathForMatrixContentURI:_matrixAvatarURL
+                                                                                andType:nil
+                                                                               inFolder:kMXMediaManagerAvatarThumbnailFolder
+                                                                          toFitViewSize:avatarSize
+                                                                             withMethod:MXThumbnailingMethodCrop];
+        _avatarImage = [MXMediaManager loadPictureFromFilePath:cacheFilePath];
+        
+        // the image is already in the cache
+        if (_avatarImage)
+        {
+            MXWeakify(self);
+            dispatch_async(dispatch_get_main_queue(), ^{
+                MXStrongifyAndReturnIfNil(self);
+                [[NSNotificationCenter defaultCenter] postNotificationName:kMXKContactThumbnailUpdateNotification object:self.contactID userInfo:nil];
+            });
+        }
+        else
+        {
+            NSString *downloadId = [MXMediaManager thumbnailDownloadIdForMatrixContentURI:_matrixAvatarURL inFolder:kMXMediaManagerAvatarThumbnailFolder toFitViewSize:avatarSize withMethod:MXThumbnailingMethodCrop];
+            MXMediaLoader* loader = [MXMediaManager existingDownloaderWithIdentifier:downloadId];
+            [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXMediaLoaderStateDidChangeNotification object:nil];
+            [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onMediaDownloadEnd:) name:kMXMediaLoaderStateDidChangeNotification object:loader];
+            if (!loader && mediaManager)
+            {
+                [mediaManager downloadThumbnailFromMatrixContentURI:_matrixAvatarURL
+                                                                     withType:nil
+                                                                     inFolder:kMXMediaManagerAvatarThumbnailFolder
+                                                                toFitViewSize:avatarSize
+                                                                   withMethod:MXThumbnailingMethodCrop
+                                                                      success:nil
+                                                                      failure:nil];
+            }
+        }
+    }
+}
+
+- (void)onMediaDownloadEnd:(NSNotification *)notif
+{
+    MXMediaLoader *loader = (MXMediaLoader*)notif.object;
+    if ([loader.downloadId isEqualToString:downloadId])
+    {
+        // update the image
+        switch (loader.state) {
+            case MXMediaLoaderStateDownloadCompleted:
+            {
+                UIImage *image = [MXMediaManager loadPictureFromFilePath:loader.downloadOutputFilePath];
+                if (image)
+                {
+                    _avatarImage = image;
+                    
+                    MXWeakify(self);
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        MXStrongifyAndReturnIfNil(self);
+                        [[NSNotificationCenter defaultCenter] postNotificationName:kMXKContactThumbnailUpdateNotification object:self.contactID userInfo:nil];
+                    });
+                }
+                [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXMediaLoaderStateDidChangeNotification object:nil];
+                downloadId = nil;
+                break;
+            }
+            case MXMediaLoaderStateDownloadFailed:
+            case MXMediaLoaderStateCancelled:
+                [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXMediaLoaderStateDidChangeNotification object:nil];
+                downloadId = nil;
+                break;
+            default:
+                break;
+        }
+    }
+}
+
+#pragma mark NSCoding
+
+- (id)initWithCoder:(NSCoder *)coder
+{
+    if (self)
+    {
+        [self initFields];
+        _contactID = [coder decodeObjectForKey:@"contactID"];
+        _matrixID = [coder decodeObjectForKey:@"matrixID"];
+    }
+    
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder
+{
+    [coder encodeObject:_contactID forKey:@"contactID"];
+    [coder encodeObject:_matrixID forKey:@"matrixID"];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Contact/MXKContactManager.h b/Riot/Modules/MatrixKit/Models/Contact/MXKContactManager.h
new file mode 100644
index 000000000..c8b0082b0
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Contact/MXKContactManager.h
@@ -0,0 +1,243 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2019 The Matrix.org Foundation C.I.C
+ 
+ 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/Foundation.h>
+#import <Contacts/Contacts.h>
+
+#import <MatrixSDK/MatrixSDK.h>
+
+#import "MXKSectionedContacts.h"
+#import "MXKContact.h"
+
+/**
+ Posted when the matrix contact list is loaded or updated.
+ The notification object is:
+ - a contact Id when a matrix contact has been added/updated/removed.
+ or
+ - nil when all matrix contacts are concerned.
+ */
+extern NSString * _Nonnull const kMXKContactManagerDidUpdateMatrixContactsNotification;
+
+/**
+ Posted when the local contact list is loaded and updated.
+ The notification object is:
+ - a contact Id when a local contact has been added/updated/removed.
+ or
+ - nil when all local contacts are concerned.
+ */
+extern NSString * _Nonnull const kMXKContactManagerDidUpdateLocalContactsNotification;
+
+/**
+ Posted when local contact matrix ids is updated.
+ The notification object is:
+ - a contact Id when a local contact has been added/updated/removed.
+ or
+ - nil when all local contacts are concerned.
+ */
+extern NSString * _Nonnull const kMXKContactManagerDidUpdateLocalContactMatrixIDsNotification;
+
+/**
+ Posted when the presence of a matrix user linked at least to one contact has changed.
+ The notification object is the matrix Id. The `userInfo` dictionary contains an `MXPresenceString` object under the `kMXKContactManagerMatrixPresenceKey` key, representing the matrix user presence.
+ */
+extern NSString * _Nonnull const kMXKContactManagerMatrixUserPresenceChangeNotification;
+extern NSString * _Nonnull const kMXKContactManagerMatrixPresenceKey;
+
+/**
+ Posted when all phonenumbers of local contacts have been internationalized.
+ The notification object is nil.
+ */
+extern NSString * _Nonnull const kMXKContactManagerDidInternationalizeNotification;
+
+/**
+ Used to identify the type of data when requesting MXKeyProvider
+ */
+extern NSString * _Nonnull const MXKContactManagerDataType;
+
+/**
+ Define the contact creation for the room members
+ */
+typedef NS_ENUM(NSInteger, MXKContactManagerMXRoomSource) {
+    MXKContactManagerMXRoomSourceNone        = 0,   // the MXMember does not create any new contact.
+    MXKContactManagerMXRoomSourceDirectChats = 1,   // the direct chat users have their own contact even if they are not defined in the device contacts book
+    MXKContactManagerMXRoomSourceAll         = 2,   // all the room members have their own contact even if they are not defined in the device contacts book
+};
+
+/**
+ This manager handles 2 kinds of contact list:
+ - The local contacts retrieved from the device phonebook.
+ - The matrix contacts retrieved from the matrix one-to-one rooms.
+ 
+ Note: The local contacts handling depends on the 'syncLocalContacts' and 'phonebookCountryCode' properties
+ of the shared application settings object '[MXKAppSettings standardAppSettings]'.
+ */
+@interface MXKContactManager : NSObject
+
+/**
+ The shared instance of contact manager.
+ */
++ (MXKContactManager* _Nonnull)sharedManager;
+
+/**
+ Block called (if any) to discover the Matrix users bound to a set of third-party identifiers (email addresses, phone numbers).
+ If this property is unset, the contact manager will consider the potential identity server URL (see the `identityServer` property)
+ to build its own Restclient and trigger `lookup3PIDs` requests.
+ 
+ @param threepids the list of 3rd party ids: [[<(MX3PIDMedium)media1>, <(NSString*)address1>], [<(MX3PIDMedium)media2>, <(NSString*)address2>], ...].
+ @param success a block object called when the operation succeeds. It provides the array of the discovered users:
+ [[<(MX3PIDMedium)media>, <(NSString*)address>, <(NSString*)userId>], ...].
+ @param failure a block object called when the operation fails.
+ */
+typedef void(^MXKContactManagerDiscoverUsersBoundTo3PIDs)(NSArray<NSArray<NSString *> *> * _Nonnull threepids,
+                                                          void (^ _Nonnull success)(NSArray<NSArray<NSString *> *> *_Nonnull),
+                                                          void (^ _Nonnull failure)(NSError *_Nonnull));
+@property (nonatomic, nullable) MXKContactManagerDiscoverUsersBoundTo3PIDs discoverUsersBoundTo3PIDsBlock;
+
+/**
+ Define if the room member must have their dedicated contact even if they are not define in the device contacts book.
+ The default value is MXKContactManagerMXRoomSourceDirectChats;
+ */
+@property (nonatomic) MXKContactManagerMXRoomSource contactManagerMXRoomSource;
+
+/**
+ Associated matrix sessions (empty by default).
+ */
+@property (nonatomic, readonly, nonnull) NSArray *mxSessions;
+
+/**
+ The current list of the contacts extracted from matrix data. Depends on 'contactManagerMXRoomSource'.
+ */
+@property (nonatomic, readonly, nullable) NSArray *matrixContacts;
+
+/**
+ The current list of the local contacts (nil by default until the contacts are loaded).
+ */
+@property (nonatomic, readonly, nullable) NSArray *localContacts;
+
+/**
+ The current list of the local contacts who have contact methods which can be used to invite them or to discover matrix users.
+ */
+@property (nonatomic, readonly, nullable) NSArray *localContactsWithMethods;
+
+/**
+ The contacts list obtained by splitting each local contact by contact method.
+ This list is alphabetically sorted.
+ Each contact has one and only one contact method.
+ */
+//- (void)localContactsSplitByContactMethod:(void (^)(NSArray<MXKContact*> *localContactsSplitByContactMethod))onComplete;
+
+@property (nonatomic, readonly, nullable) NSArray *localContactsSplitByContactMethod;
+
+/**
+ The current list of the contacts for whom a direct chat exists.
+ */
+@property (nonatomic, readonly, nonnull) NSArray *directMatrixContacts;
+
+/// Flag to allow local contacts access or not. Default value is YES.
+@property (nonatomic, assign) BOOL allowLocalContactsAccess;
+
+/**
+ Add/remove matrix session. The matrix contact list is automatically updated (see kMXKContactManagerDidUpdateMatrixContactsNotification event).
+ */
+- (void)addMatrixSession:(MXSession* _Nonnull)mxSession;
+- (void)removeMatrixSession:(MXSession* _Nonnull)mxSession;
+
+/**
+ Takes into account the state of the identity service's terms, local contacts access authorization along with
+ whether the user has left the app for the Settings app to update the contacts access, and enables/disables
+ the `syncLocalContacts` property of `MXKAppSettings` when necessary.
+ @param mxSession The session who's identity service shall be used.
+ */
+- (void)validateSyncLocalContactsStateForSession:(MXSession *)mxSession;
+
+/**
+ Load and/or refresh the local contacts. Observe kMXKContactManagerDidUpdateLocalContactsNotification to know when local contacts are available.
+ */
+- (void)refreshLocalContacts;
+
+/**
+ Delete contacts info
+ */
+- (void)reset;
+
+/**
+ Get contact by its identifier.
+ 
+ @param contactID the contact identifier.
+ @return the contact defined with the provided id.
+ */
+- (MXKContact* _Nullable)contactWithContactID:(NSString* _Nonnull)contactID;
+
+/**
+ Refresh matrix IDs for a specific local contact. See kMXKContactManagerDidUpdateLocalContactMatrixIDsNotification
+ posted when update is done.
+ 
+ @param contact the local contact to refresh.
+ */
+- (void)updateMatrixIDsForLocalContact:(MXKContact* _Nonnull)contact;
+
+/**
+ Refresh matrix IDs for all local contacts. See kMXKContactManagerDidUpdateLocalContactMatrixIDsNotification
+ posted when update for all local contacts is done.
+ */
+- (void)updateMatrixIDsForAllLocalContacts;
+
+/**
+ The contacts list obtained by splitting each local contact by contact method.
+ This list is alphabetically sorted.
+ Each contact has one and only one contact method.
+ */
+//- (void)localContactsSplitByContactMethod:(void (^)(NSArray<MXKContact*> *localContactsSplitByContactMethod))onComplete;
+
+/**
+ Sort a contacts array in sectioned arrays to be displayable in a UITableview
+ */
+- (MXKSectionedContacts* _Nullable)getSectionedContacts:(NSArray* _Nonnull)contactList;
+
+/**
+ Sort alphabetically an array of contacts.
+ 
+ @param contactsArray the array of contacts to sort.
+ */
+- (void)sortAlphabeticallyContacts:(NSMutableArray<MXKContact*> * _Nonnull)contactsArray;
+
+/**
+ Sort an array of contacts by last active, with "active now" first.
+ ...and then alphabetically.
+ 
+ @param contactsArray the array of contacts to sort.
+ */
+- (void)sortContactsByLastActiveInformation:(NSMutableArray<MXKContact*> * _Nonnull)contactsArray;
+
+/**
+ Refresh the international phonenumber of the local contacts (See kMXKContactManagerDidInternationalizeNotification).
+ 
+ @param countryCode the country code.
+ */
+- (void)internationalizePhoneNumbers:(NSString* _Nonnull)countryCode;
+
+/**
+ Request user permission for syncing local contacts.
+
+ @param viewController the view controller to attach the dialog to the user.
+ @param handler the block called with the result of requesting access
+ */
++ (void)requestUserConfirmationForLocalContactsSyncInViewController:(UIViewController* _Nonnull)viewController
+                                                  completionHandler:(void (^_Nonnull)(BOOL granted))handler;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Contact/MXKContactManager.m b/Riot/Modules/MatrixKit/Models/Contact/MXKContactManager.m
new file mode 100644
index 000000000..52ac60a68
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Contact/MXKContactManager.m
@@ -0,0 +1,1939 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2019 The Matrix.org Foundation C.I.C
+ 
+ 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 "MXKContactManager.h"
+
+#import "MXKContact.h"
+
+#import "MXKAppSettings.h"
+#import "MXKTools.h"
+#import "NSBundle+MatrixKit.h"
+#import <MatrixSDK/MXAes.h>
+#import <MatrixSDK/MXRestClient.h>
+#import <MatrixSDK/MXKeyProvider.h>
+
+#import "MXKSwiftHeader.h"
+
+NSString *const kMXKContactManagerDidUpdateMatrixContactsNotification = @"kMXKContactManagerDidUpdateMatrixContactsNotification";
+
+NSString *const kMXKContactManagerDidUpdateLocalContactsNotification = @"kMXKContactManagerDidUpdateLocalContactsNotification";
+NSString *const kMXKContactManagerDidUpdateLocalContactMatrixIDsNotification = @"kMXKContactManagerDidUpdateLocalContactMatrixIDsNotification";
+
+NSString *const kMXKContactManagerMatrixUserPresenceChangeNotification = @"kMXKContactManagerMatrixUserPresenceChangeNotification";
+NSString *const kMXKContactManagerMatrixPresenceKey = @"kMXKContactManagerMatrixPresenceKey";
+
+NSString *const kMXKContactManagerDidInternationalizeNotification = @"kMXKContactManagerDidInternationalizeNotification";
+
+NSString *const MXKContactManagerDataType = @"org.matrix.kit.MXKContactManagerDataType";
+
+@interface MXKContactManager()
+{
+    /**
+     Array of `MXSession` instances.
+     */
+    NSMutableArray *mxSessionArray;
+    id mxSessionStateObserver;
+    id mxSessionNewSyncedRoomObserver;
+    
+    /**
+     Listeners registered on matrix presence and membership events (one by matrix session)
+     */
+    NSMutableArray *mxEventListeners;
+    
+    /**
+     Local contacts handling
+     */
+    BOOL isLocalContactListRefreshing;
+    dispatch_queue_t processingQueue;
+    NSDate *lastSyncDate;
+    // Local contacts by contact Id
+    NSMutableDictionary* localContactByContactID;
+    NSMutableArray* localContactsWithMethods;
+    NSMutableArray* splitLocalContacts;
+    
+    // Matrix id linked to 3PID.
+    NSMutableDictionary<NSString*, NSString*> *matrixIDBy3PID;
+    
+    /**
+     Matrix contacts handling
+     */
+    // Matrix contacts by contact Id
+    NSMutableDictionary* matrixContactByContactID;
+    // Matrix contacts by matrix id
+    NSMutableDictionary* matrixContactByMatrixID;
+}
+
+@end
+
+@implementation MXKContactManager
+@synthesize contactManagerMXRoomSource;
+
+#pragma mark Singleton Methods
+
++ (instancetype)sharedManager
+{
+    static MXKContactManager *sharedInstance = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        sharedInstance = [[MXKContactManager alloc] init];
+    });
+    return sharedInstance;
+}
+
+#pragma mark -
+
+-(MXKContactManager *)init
+{
+    if (self = [super init])
+    {
+        NSString *label = [NSString stringWithFormat:@"MatrixKit.%@.Contacts", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"]];
+        
+        [self deleteOldFiles];
+        
+        processingQueue = dispatch_queue_create([label UTF8String], DISPATCH_QUEUE_SERIAL);
+        
+        // save the last sync date
+        // to avoid resync the whole phonebook
+        lastSyncDate = nil;
+        
+        self.contactManagerMXRoomSource = MXKContactManagerMXRoomSourceDirectChats;
+        
+        // Observe related settings change
+        [[MXKAppSettings standardAppSettings]  addObserver:self forKeyPath:@"syncLocalContacts" options:0 context:nil];
+        [[MXKAppSettings standardAppSettings]  addObserver:self forKeyPath:@"phonebookCountryCode" options:0 context:nil];
+
+        [self registerAccountDataDidChangeIdentityServerNotification];
+        self.allowLocalContactsAccess = YES;
+    }
+    
+    return self;
+}
+
+-(void)dealloc
+{
+    matrixIDBy3PID = nil;
+
+    localContactByContactID = nil;
+    localContactsWithMethods = nil;
+    splitLocalContacts = nil;
+    
+    matrixContactByContactID = nil;
+    matrixContactByMatrixID = nil;
+    
+    lastSyncDate = nil;
+    
+    while (mxSessionArray.count) {
+        [self removeMatrixSession:mxSessionArray.lastObject];
+    }
+    mxSessionArray = nil;
+    mxEventListeners = nil;
+    
+    [[MXKAppSettings standardAppSettings] removeObserver:self forKeyPath:@"syncLocalContacts"];
+    [[MXKAppSettings standardAppSettings] removeObserver:self forKeyPath:@"phonebookCountryCode"];
+    
+    processingQueue = nil;
+}
+
+#pragma mark -
+
+- (void)addMatrixSession:(MXSession*)mxSession
+{
+    if (!mxSessionArray)
+    {
+        mxSessionArray = [NSMutableArray array];
+    }
+    if (!mxEventListeners)
+    {
+        mxEventListeners = [NSMutableArray array];
+    }
+    
+    if ([mxSessionArray indexOfObject:mxSession] == NSNotFound)
+    {
+        [mxSessionArray addObject:mxSession];
+        
+        MXWeakify(self);
+        
+        // Register a listener on matrix presence and membership events
+        id eventListener = [mxSession listenToEventsOfTypes:@[kMXEventTypeStringRoomMember, kMXEventTypeStringPresence]
+                                                       onEvent:^(MXEvent *event, MXTimelineDirection direction, id customObject) {
+                                                           
+                               MXStrongifyAndReturnIfNil(self);
+                                                           
+                               // Consider only live event
+                               if (direction == MXTimelineDirectionForwards)
+                               {
+                                   // Consider first presence events
+                                   if (event.eventType == MXEventTypePresence)
+                                   {
+                                       // Check whether the concerned matrix user belongs to at least one contact.
+                                       BOOL isMatched = ([self->matrixContactByMatrixID objectForKey:event.sender] != nil);
+                                       if (!isMatched)
+                                       {
+                                           NSArray *matrixIDs = [self->matrixIDBy3PID allValues];
+                                           isMatched = ([matrixIDs indexOfObject:event.sender] != NSNotFound);
+                                       }
+                                       
+                                       if (isMatched) {
+                                           [[NSNotificationCenter defaultCenter] postNotificationName:kMXKContactManagerMatrixUserPresenceChangeNotification object:event.sender userInfo:@{kMXKContactManagerMatrixPresenceKey:event.content[@"presence"]}];
+                                       }
+                                   }
+                                   // Else the event type is MXEventTypeRoomMember.
+                                   // Ignore here membership events if the session is not running yet,
+                                   // Indeed all the contacts are refreshed when session state becomes running.
+                                   else if (mxSession.state == MXSessionStateRunning)
+                                   {
+                                       // Update matrix contact list on membership change
+                                       [self updateMatrixContactWithID:event.sender];
+                                   }
+                               }
+                           }];
+        
+        [mxEventListeners addObject:eventListener];
+        
+        // Update matrix contact list in case of new synced one-to-one room
+        if (!mxSessionNewSyncedRoomObserver)
+        {
+            mxSessionNewSyncedRoomObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXRoomInitialSyncNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+                
+                MXStrongifyAndReturnIfNil(self);
+                
+                // create contact for known room members
+                if (self.contactManagerMXRoomSource != MXKContactManagerMXRoomSourceNone)
+                {
+                    MXRoom *room = notif.object;
+                    [room state:^(MXRoomState *roomState) {
+
+                        MXRoomMembers *roomMembers = roomState.members;
+
+                        NSArray *members = roomMembers.members;
+
+                        // Consider only 1:1 chat for MXKMemberContactCreationOneToOneRoom
+                        // or adding all
+                        if (((members.count == 2) && (self.contactManagerMXRoomSource == MXKContactManagerMXRoomSourceDirectChats)) || (self.contactManagerMXRoomSource == MXKContactManagerMXRoomSourceAll))
+                        {
+                            NSString* myUserId = room.mxSession.myUser.userId;
+
+                            for (MXRoomMember* member in members)
+                            {
+                                if ([member.userId isEqualToString:myUserId])
+                                {
+                                    [self updateMatrixContactWithID:member.userId];
+                                }
+                            }
+                        }
+                    }];
+                }
+            }];
+        }
+        
+        // Update all matrix contacts as soon as matrix session is ready
+        if (!mxSessionStateObserver) {
+            mxSessionStateObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXSessionStateDidChangeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+                
+                MXStrongifyAndReturnIfNil(self);
+                
+                MXSession *mxSession = notif.object;
+                
+                if ([self->mxSessionArray indexOfObject:mxSession] != NSNotFound)
+                {
+                    if ((mxSession.state == MXSessionStateStoreDataReady) || (mxSession.state == MXSessionStateRunning)) {
+                        [self refreshMatrixContacts];
+                    }
+                }
+            }];
+        }
+
+        // refreshMatrixContacts can take time. Delay its execution to not overload
+        // launch of apps that call [MXKContactManager addMatrixSession] at startup
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self refreshMatrixContacts];
+        });
+    }
+}
+
+- (void)removeMatrixSession:(MXSession*)mxSession
+{
+    NSUInteger index = [mxSessionArray indexOfObject:mxSession];
+    if (index != NSNotFound)
+    {
+        id eventListener = [mxEventListeners objectAtIndex:index];
+        [mxSession removeListener:eventListener];
+        
+        [mxEventListeners removeObjectAtIndex:index];
+        [mxSessionArray removeObjectAtIndex:index];
+        
+        if (!mxSessionArray.count) {
+            if (mxSessionStateObserver) {
+                [[NSNotificationCenter defaultCenter] removeObserver:mxSessionStateObserver];
+                mxSessionStateObserver = nil;
+            }
+            
+            if (mxSessionNewSyncedRoomObserver) {
+                [[NSNotificationCenter defaultCenter] removeObserver:mxSessionNewSyncedRoomObserver];
+                mxSessionNewSyncedRoomObserver = nil;
+            }
+        }
+        
+        // Update matrix contacts list
+        [self refreshMatrixContacts];
+    }
+}
+
+- (NSArray*)mxSessions
+{
+    return [NSArray arrayWithArray:mxSessionArray];
+}
+
+
+- (NSArray*)matrixContacts
+{
+    NSParameterAssert([NSThread isMainThread]);
+
+    return [matrixContactByContactID allValues];
+}
+
+- (NSArray*)localContacts
+{
+    NSParameterAssert([NSThread isMainThread]);
+
+    // Return nil if the loading step is in progress.
+    if (isLocalContactListRefreshing)
+    {
+        return nil;
+    }
+    
+    return [localContactByContactID allValues];
+}
+
+- (NSArray*)localContactsWithMethods
+{
+    NSParameterAssert([NSThread isMainThread]);
+
+    // Return nil if the loading step is in progress.
+    if (isLocalContactListRefreshing)
+    {
+        return nil;
+    }
+    
+    // Check whether the array must be prepared
+    if (!localContactsWithMethods)
+    {
+        // List all the local contacts with emails and/or phones
+        NSArray *localContacts = self.localContacts;
+        localContactsWithMethods = [NSMutableArray arrayWithCapacity:localContacts.count];
+        
+        for (MXKContact* contact in localContacts)
+        {
+            if (contact.emailAddresses)
+            {
+                [localContactsWithMethods addObject:contact];
+            }
+            else if (contact.phoneNumbers)
+            {
+                [localContactsWithMethods addObject:contact];
+            }
+        }
+    }
+    
+    return localContactsWithMethods;
+}
+
+- (NSArray*)localContactsSplitByContactMethod
+{
+   NSParameterAssert([NSThread isMainThread]);
+
+    // Return nil if the loading step is in progress.
+    if (isLocalContactListRefreshing)
+    {
+        return nil;
+    }
+    
+    // Check whether the array must be prepared
+    if (!splitLocalContacts)
+    {
+        // List all the local contacts with contact methods
+        NSArray *contactsArray = self.localContactsWithMethods;
+        
+        splitLocalContacts = [NSMutableArray arrayWithCapacity:contactsArray.count];
+        
+        for (MXKContact* contact in contactsArray)
+        {
+            NSArray *emails = contact.emailAddresses;
+            NSArray *phones = contact.phoneNumbers;
+            
+            if (emails.count + phones.count > 1)
+            {
+                for (MXKEmail *email in emails)
+                {
+                    MXKContact *splitContact = [[MXKContact alloc] initContactWithDisplayName:contact.displayName emails:@[email] phoneNumbers:nil andThumbnail:contact.thumbnail];
+                    [splitLocalContacts addObject:splitContact];
+                }
+                
+                for (MXKPhoneNumber *phone in phones)
+                {
+                    MXKContact *splitContact = [[MXKContact alloc] initContactWithDisplayName:contact.displayName emails:nil phoneNumbers:@[phone] andThumbnail:contact.thumbnail];
+                    [splitLocalContacts addObject:splitContact];
+                }
+            }
+            else if (emails.count + phones.count)
+            {
+                [splitLocalContacts addObject:contact];
+            }
+        }
+        
+        // Sort alphabetically the resulting list
+        [self sortAlphabeticallyContacts:splitLocalContacts];
+    }
+    
+    return splitLocalContacts;
+}
+
+
+//- (void)localContactsSplitByContactMethod:(void (^)(NSArray<MXKContact*> *localContactsSplitByContactMethod))onComplete
+//{
+//    NSParameterAssert([NSThread isMainThread]);
+//
+//    // Return nil if the loading step is in progress.
+//    if (isLocalContactListRefreshing)
+//    {
+//        onComplete(nil);
+//        return;
+//    }
+//    
+//    // Check whether the array must be prepared
+//    if (!splitLocalContacts)
+//    {
+//        // List all the local contacts with contact methods
+//        NSArray *contactsArray = self.localContactsWithMethods;
+//        
+//        splitLocalContacts = [NSMutableArray arrayWithCapacity:contactsArray.count];
+//        
+//        for (MXKContact* contact in contactsArray)
+//        {
+//            NSArray *emails = contact.emailAddresses;
+//            NSArray *phones = contact.phoneNumbers;
+//            
+//            if (emails.count + phones.count > 1)
+//            {
+//                for (MXKEmail *email in emails)
+//                {
+//                    MXKContact *splitContact = [[MXKContact alloc] initContactWithDisplayName:contact.displayName emails:@[email] phoneNumbers:nil andThumbnail:contact.thumbnail];
+//                    [splitLocalContacts addObject:splitContact];
+//                }
+//                
+//                for (MXKPhoneNumber *phone in phones)
+//                {
+//                    MXKContact *splitContact = [[MXKContact alloc] initContactWithDisplayName:contact.displayName emails:nil phoneNumbers:@[phone] andThumbnail:contact.thumbnail];
+//                    [splitLocalContacts addObject:splitContact];
+//                }
+//            }
+//            else if (emails.count + phones.count)
+//            {
+//                [splitLocalContacts addObject:contact];
+//            }
+//        }
+//        
+//        // Sort alphabetically the resulting list
+//        [self sortAlphabeticallyContacts:splitLocalContacts];
+//    }
+//    
+//    onComplete(splitLocalContacts);
+//}
+
+- (NSArray*)directMatrixContacts
+{
+    NSParameterAssert([NSThread isMainThread]);
+
+    NSMutableDictionary *directContacts = [NSMutableDictionary dictionary];
+    
+    NSArray *mxSessions = self.mxSessions;
+    
+    for (MXSession *mxSession in mxSessions)
+    {
+        // Check all existing users for whom a direct chat exists
+        NSArray *mxUserIds = mxSession.directRooms.allKeys;
+        
+        for (NSString *mxUserId in mxUserIds)
+        {
+            MXKContact* contact = [matrixContactByMatrixID objectForKey:mxUserId];
+            
+            // Sanity check - the contact must be already defined here
+            if (contact)
+            {
+                [directContacts setValue:contact forKey:mxUserId];
+            }
+        }
+    }
+    
+    return directContacts.allValues;
+}
+
+// The current identity service used with the contact manager
+- (MXIdentityService*)identityService
+{
+    // For the moment, only use the one of the first session
+    MXSession *mxSession = [mxSessionArray firstObject];
+    return mxSession.identityService;
+}
+
+- (BOOL)isUsersDiscoveringEnabled
+{
+    // Check whether the 3pid lookup is available
+    return (self.discoverUsersBoundTo3PIDsBlock || self.identityService);
+}
+
+#pragma mark -
+
+- (void)validateSyncLocalContactsStateForSession:(MXSession *)mxSession
+{
+    if (!self.allowLocalContactsAccess)
+    {
+        return;
+    }
+    
+    // Get the status of the identity service terms.
+    BOOL areAllTermsAgreed = mxSession.identityService.areAllTermsAgreed;
+    
+    if (MXKAppSettings.standardAppSettings.syncLocalContacts)
+    {
+        // Disable local contact sync when all terms are no longer accepted or if contacts access has been revoked.
+        if (!areAllTermsAgreed || [CNContactStore authorizationStatusForEntityType:CNEntityTypeContacts] != CNAuthorizationStatusAuthorized)
+        {
+            MXLogDebug(@"[MXKContactManager] validateSyncLocalContactsState : Disabling contacts sync.");
+            MXKAppSettings.standardAppSettings.syncLocalContacts = false;
+            return;
+        }
+    }
+    else
+    {
+        // Check whether the user has been directed to the Settings app to enable contact access.
+        if (MXKAppSettings.standardAppSettings.syncLocalContactsPermissionOpenedSystemSettings)
+        {
+            // Reset the system settings app flag as they are back in the app.
+            MXKAppSettings.standardAppSettings.syncLocalContactsPermissionOpenedSystemSettings = false;
+            
+            // And if all other conditions are met for contacts sync enable it.
+            if (areAllTermsAgreed && [CNContactStore authorizationStatusForEntityType:CNEntityTypeContacts] == CNAuthorizationStatusAuthorized)
+            {
+                MXLogDebug(@"[MXKContactManager] validateSyncLocalContactsState : Enabling contacts sync after user visited Settings app.");
+                MXKAppSettings.standardAppSettings.syncLocalContacts = true;
+            }
+        }
+    }
+}
+
+- (void)refreshLocalContacts
+{
+    MXLogDebug(@"[MXKContactManager] refreshLocalContacts : Started");
+    
+    if (!self.allowLocalContactsAccess)
+    {
+        MXLogDebug(@"[MXKContactManager] refreshLocalContacts : Finished because local contacts access not allowed.");
+        return;
+    }
+    
+    NSDate *startDate = [NSDate date];
+    
+    if ([CNContactStore authorizationStatusForEntityType:CNEntityTypeContacts] != CNAuthorizationStatusAuthorized)
+    {
+        if ([MXKAppSettings standardAppSettings].syncLocalContacts)
+        {
+            // The user authorised syncLocalContacts and allowed access to his contacts
+            // but he then removed contacts access from app permissions.
+            // So, reset syncLocalContacts value
+            [MXKAppSettings standardAppSettings].syncLocalContacts = NO;
+        }
+        
+        // Local contacts list is empty if the access is denied.
+        self->localContactByContactID = nil;
+        self->localContactsWithMethods = nil;
+        self->splitLocalContacts = nil;
+        [self cacheLocalContacts];
+        
+        [[NSNotificationCenter defaultCenter] postNotificationName:kMXKContactManagerDidUpdateLocalContactsNotification object:nil userInfo:nil];
+        
+        MXLogDebug(@"[MXKContactManager] refreshLocalContacts : Complete");
+        MXLogDebug(@"[MXKContactManager] refreshLocalContacts : Local contacts access denied");
+    }
+    else
+    {
+        self->isLocalContactListRefreshing = YES;
+        
+        // Reset the internal contact lists (These arrays will be prepared only if need).
+        self->localContactsWithMethods = self->splitLocalContacts = nil;
+        
+        BOOL isColdStart = NO;
+        
+        // Check whether the local contacts sync has been disabled.
+        if (self->matrixIDBy3PID && ![MXKAppSettings standardAppSettings].syncLocalContacts)
+        {
+            // The user changed his mind and disabled the local contact sync, remove the cached data.
+            self->matrixIDBy3PID = nil;
+            [self cacheMatrixIDsDict];
+            
+            // Reload the local contacts from the system
+            self->localContactByContactID = nil;
+            [self cacheLocalContacts];
+        }
+        
+        // Check whether this is a cold start.
+        if (!self->matrixIDBy3PID)
+        {
+            isColdStart = YES;
+            
+            // Load the dictionary from the file system. It is cached to improve UX.
+            [self loadCachedMatrixIDsDict];
+        }
+        
+        MXWeakify(self);
+        
+        dispatch_async(self->processingQueue, ^{
+            
+            MXStrongifyAndReturnIfNil(self);
+
+            // In case of cold start, retrieve the data from the file system
+            if (isColdStart)
+            {
+                [self loadCachedLocalContacts];
+                [self loadCachedContactBookInfo];
+
+                // no local contact -> assume that the last sync date is useless
+                if (self->localContactByContactID.count == 0)
+                {
+                    self->lastSyncDate = nil;
+                }
+            }
+
+            BOOL didContactBookChange = NO;
+
+            NSMutableArray* deletedContactIDs = [NSMutableArray arrayWithArray:[self->localContactByContactID allKeys]];
+
+            // can list local contacts?
+            if (ABAddressBookGetAuthorizationStatus() == kABAuthorizationStatusAuthorized)
+            {
+                NSString* countryCode = [[MXKAppSettings standardAppSettings] phonebookCountryCode];
+
+                ABAddressBookRef ab = ABAddressBookCreateWithOptions(nil, nil);
+                ABRecordRef      contactRecord;
+                CFIndex          index;
+                CFMutableArrayRef people = (CFMutableArrayRef)ABAddressBookCopyArrayOfAllPeople(ab);
+
+                if (nil != people)
+                {
+                    CFIndex peopleCount = CFArrayGetCount(people);
+
+                    for (index = 0; index < peopleCount; index++)
+                    {
+                        contactRecord = (ABRecordRef)CFArrayGetValueAtIndex(people, index);
+
+                        NSString* contactID = [MXKContact contactID:contactRecord];
+
+                        // the contact still exists
+                        [deletedContactIDs removeObject:contactID];
+
+                        if (self->lastSyncDate)
+                        {
+                            // ignore unchanged contacts since the previous sync
+                            CFDateRef lastModifDate = ABRecordCopyValue(contactRecord, kABPersonModificationDateProperty);
+                            if (lastModifDate)
+                            {
+                                if (kCFCompareGreaterThan != CFDateCompare(lastModifDate, (__bridge CFDateRef)self->lastSyncDate, nil))
+
+                                {
+                                    CFRelease(lastModifDate);
+                                    continue;
+                                }
+                                CFRelease(lastModifDate);
+                            }
+                        }
+
+                        didContactBookChange = YES;
+
+                        MXKContact* contact = [[MXKContact alloc] initLocalContactWithABRecord:contactRecord];
+
+                        if (countryCode)
+                        {
+                            contact.defaultCountryCode = countryCode;
+                        }
+
+                        // update the local contacts list
+                        [self->localContactByContactID setValue:contact forKey:contactID];
+                    }
+
+                    CFRelease(people);
+                }
+
+                if (ab)
+                {
+                    CFRelease(ab);
+                }
+            }
+
+            // some contacts have been deleted
+            for (NSString* contactID in deletedContactIDs)
+            {
+                didContactBookChange = YES;
+                [self->localContactByContactID removeObjectForKey:contactID];
+            }
+
+            // something has been modified in the local contact book
+            if (didContactBookChange)
+            {
+                [self cacheLocalContacts];
+            }
+            
+            self->lastSyncDate = [NSDate date];
+            [self cacheContactBookInfo];
+            
+            // Update loaded contacts with the known dict 3PID -> matrix ID
+            [self updateAllLocalContactsMatrixIDs];
+            
+            dispatch_async(dispatch_get_main_queue(), ^{
+                
+                // Contacts are loaded, post a notification
+                self->isLocalContactListRefreshing = NO;
+                [[NSNotificationCenter defaultCenter] postNotificationName:kMXKContactManagerDidUpdateLocalContactsNotification object:nil userInfo:nil];
+                
+                // Check the conditions required before triggering a matrix users lookup.
+                if (isColdStart || didContactBookChange)
+                {
+                    [self updateMatrixIDsForAllLocalContacts];
+                }
+                
+                MXLogDebug(@"[MXKContactManager] refreshLocalContacts : Complete");
+                MXLogDebug(@"[MXKContactManager] refreshLocalContacts : Refresh %tu local contacts in %.0fms", self->localContactByContactID.count, [[NSDate date] timeIntervalSinceDate:startDate] * 1000);
+            });
+        });
+    }
+}
+
+- (void)updateMatrixIDsForLocalContact:(MXKContact *)contact
+{
+    // Check if the user allowed to sync local contacts.
+    // + Check whether users discovering is available.
+    if ([MXKAppSettings standardAppSettings].syncLocalContacts && !contact.isMatrixContact && [self isUsersDiscoveringEnabled])
+    {
+        // Retrieve all 3PIDs of the contact
+        NSMutableArray* threepids = [[NSMutableArray alloc] init];
+        NSMutableArray* lookup3pidsArray = [[NSMutableArray alloc] init];
+        
+        for (MXKEmail* email in contact.emailAddresses)
+        {
+            // Not yet added
+            if (email.emailAddress.length && [threepids indexOfObject:email.emailAddress] == NSNotFound)
+            {
+                [lookup3pidsArray addObject:@[kMX3PIDMediumEmail, email.emailAddress]];
+                [threepids addObject:email.emailAddress];
+            }
+        }
+        
+        for (MXKPhoneNumber* phone in contact.phoneNumbers)
+        {
+            if (phone.msisdn)
+            {
+                [lookup3pidsArray addObject:@[kMX3PIDMediumMSISDN, phone.msisdn]];
+                [threepids addObject:phone.msisdn];
+            }
+        }
+        
+        if (lookup3pidsArray.count > 0)
+        {
+            MXWeakify(self);
+            
+            void (^success)(NSArray<NSArray<NSString *> *> *) = ^(NSArray<NSArray<NSString *> *> *discoveredUsers) {
+                MXStrongifyAndReturnIfNil(self);
+                
+                // Look for updates
+                BOOL isUpdated = NO;
+                
+                // Consider each discored user
+                for (NSArray *discoveredUser in discoveredUsers)
+                {
+                    // Sanity check
+                    if (discoveredUser.count == 3)
+                    {
+                        NSString *pid = discoveredUser[1];
+                        NSString *matrixId = discoveredUser[2];
+                        
+                        // Remove the 3pid from the requested list
+                        [threepids removeObject:pid];
+                        
+                        NSString *currentMatrixID = [self->matrixIDBy3PID objectForKey:pid];
+                        
+                        if (![currentMatrixID isEqualToString:matrixId])
+                        {
+                            [self->matrixIDBy3PID setObject:matrixId forKey:pid];
+                            isUpdated = YES;
+                        }
+                    }
+                }
+                
+                // Remove existing information which is not valid anymore
+                for (NSString *pid in threepids)
+                {
+                    if ([self->matrixIDBy3PID objectForKey:pid])
+                    {
+                        [self->matrixIDBy3PID removeObjectForKey:pid];
+                        isUpdated = YES;
+                    }
+                }
+                
+                if (isUpdated)
+                {
+                    [self cacheMatrixIDsDict];
+                    
+                    // Update only this contact
+                    [self updateLocalContactMatrixIDs:contact];
+                    
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        [[NSNotificationCenter defaultCenter] postNotificationName:kMXKContactManagerDidUpdateLocalContactMatrixIDsNotification object:contact.contactID userInfo:nil];
+                    });
+                }
+            };
+            
+            void (^failure)(NSError *) = ^(NSError *error) {
+                MXLogDebug(@"[MXKContactManager] updateMatrixIDsForLocalContact failed");
+            };
+            
+            if (self.discoverUsersBoundTo3PIDsBlock)
+            {
+                self.discoverUsersBoundTo3PIDsBlock(lookup3pidsArray, success, failure);
+            }
+            else
+            {
+                // Consider the potential identity server url by default
+                [self.identityService lookup3pids:lookup3pidsArray
+                                          success:success
+                                          failure:failure];
+            }
+        }
+    }
+}
+
+
+- (void)updateMatrixIDsForAllLocalContacts
+{
+    // If localContactByContactID is not loaded, the manager will consider there is no local contacts
+    // and will reset its cache
+    NSAssert(localContactByContactID, @"[MXKContactManager] updateMatrixIDsForAllLocalContacts: refreshLocalContacts must be called before");
+
+    // Check if the user allowed to sync local contacts.
+    // + Check if at least an identity server is available, and if the loading step is not in progress.
+    if (![MXKAppSettings standardAppSettings].syncLocalContacts || ![self isUsersDiscoveringEnabled] || isLocalContactListRefreshing)
+    {
+        return;
+    }
+    
+    MXWeakify(self);
+    
+    // Refresh the 3PIDs -> Matrix ID mapping
+    dispatch_async(processingQueue, ^{
+        
+        MXStrongifyAndReturnIfNil(self);
+        
+        NSArray* contactsSnapshot = [self->localContactByContactID allValues];
+        
+        // Retrieve all 3PIDs
+        NSMutableArray* threepids = [[NSMutableArray alloc] init];
+        NSMutableArray* lookup3pidsArray = [[NSMutableArray alloc] init];
+        
+        for (MXKContact* contact in contactsSnapshot)
+        {
+            for (MXKEmail* email in contact.emailAddresses)
+            {
+                // Not yet added
+                if (email.emailAddress.length && [threepids indexOfObject:email.emailAddress] == NSNotFound)
+                {
+                    [lookup3pidsArray addObject:@[kMX3PIDMediumEmail, email.emailAddress]];
+                    [threepids addObject:email.emailAddress];
+                }
+            }
+            
+            for (MXKPhoneNumber* phone in contact.phoneNumbers)
+            {
+                if (phone.msisdn)
+                {
+                    // Not yet added
+                    if ([threepids indexOfObject:phone.msisdn] == NSNotFound)
+                    {
+                        [lookup3pidsArray addObject:@[kMX3PIDMediumMSISDN, phone.msisdn]];
+                        [threepids addObject:phone.msisdn];
+                    }
+                }
+            }
+        }
+        
+        // Update 3PIDs mapping
+        if (lookup3pidsArray.count > 0)
+        {
+            MXWeakify(self);
+            
+            void (^success)(NSArray<NSArray<NSString *> *> *) = ^(NSArray<NSArray<NSString *> *> *discoveredUsers) {
+                MXStrongifyAndReturnIfNil(self);
+                
+                [threepids removeAllObjects];
+                NSMutableArray* userIds = [[NSMutableArray alloc] init];
+                
+                // Consider each discored user
+                for (NSArray *discoveredUser in discoveredUsers)
+                {
+                    // Sanity check
+                    if (discoveredUser.count == 3)
+                    {
+                        id threepid = discoveredUser[1];
+                        id userId = discoveredUser[2];
+                        
+                        if ([threepid isKindOfClass:[NSString class]] && [userId isKindOfClass:[NSString class]])
+                        {
+                            [threepids addObject:threepid];
+                            [userIds addObject:userId];
+                        }
+                    }
+                }
+                
+                if (userIds.count)
+                {
+                    self->matrixIDBy3PID = [[NSMutableDictionary alloc] initWithObjects:userIds forKeys:threepids];
+                }
+                else
+                {
+                    self->matrixIDBy3PID = nil;
+                }
+                
+                [self cacheMatrixIDsDict];
+                
+                [self updateAllLocalContactsMatrixIDs];
+                
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKContactManagerDidUpdateLocalContactMatrixIDsNotification object:nil userInfo:nil];
+                });
+            };
+            
+            void (^failure)(NSError *) = ^(NSError *error) {
+                MXLogDebug(@"[MXKContactManager] updateMatrixIDsForAllLocalContacts failed");
+            };
+            
+            if (self.discoverUsersBoundTo3PIDsBlock)
+            {
+                self.discoverUsersBoundTo3PIDsBlock(lookup3pidsArray, success, failure);
+            }
+            else if (self.identityService)
+            {
+                [self.identityService lookup3pids:lookup3pidsArray
+                                          success:success
+                                          failure:failure];
+            }
+            else
+            {
+                // No IS, no detection of Matrix users in local contacts
+                self->matrixIDBy3PID = nil;
+                [self cacheMatrixIDsDict];
+            }
+        }
+        else
+        {
+            self->matrixIDBy3PID = nil;
+            [self cacheMatrixIDsDict];
+        }
+    });
+}
+
+- (void)resetMatrixIDs
+{
+    dispatch_async(processingQueue, ^{
+        
+        self->matrixIDBy3PID = nil;
+        [self cacheMatrixIDsDict];
+
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [[NSNotificationCenter defaultCenter] postNotificationName:kMXKContactManagerDidUpdateLocalContactMatrixIDsNotification object:nil userInfo:nil];
+        });
+    });
+}
+
+- (void)reset
+{
+    matrixIDBy3PID = nil;
+    [self cacheMatrixIDsDict];
+    
+    isLocalContactListRefreshing = NO;
+    localContactByContactID = nil;
+    localContactsWithMethods = nil;
+    splitLocalContacts = nil;
+    [self cacheLocalContacts];
+    
+    matrixContactByContactID = nil;
+    matrixContactByMatrixID = nil;
+    [self cacheMatrixContacts];
+    
+    lastSyncDate = nil;
+    [self cacheContactBookInfo];
+    
+    while (mxSessionArray.count) {
+        [self removeMatrixSession:mxSessionArray.lastObject];
+    }
+    mxSessionArray = nil;
+    mxEventListeners = nil;
+    
+    // warn of the contacts list update
+    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKContactManagerDidUpdateMatrixContactsNotification object:nil userInfo:nil];
+    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKContactManagerDidUpdateLocalContactsNotification object:nil userInfo:nil];
+}
+
+- (MXKContact*)contactWithContactID:(NSString*)contactID
+{
+    if ([contactID hasPrefix:kMXKContactLocalContactPrefixId])
+    {
+        return [localContactByContactID objectForKey:contactID];
+    }
+    else
+    {
+        return [matrixContactByContactID objectForKey:contactID];
+    }
+}
+
+// refresh the international phonenumber of the contacts
+- (void)internationalizePhoneNumbers:(NSString*)countryCode
+{
+    MXWeakify(self);
+    
+    dispatch_async(processingQueue, ^{
+        
+        MXStrongifyAndReturnIfNil(self);
+        
+        NSArray* contactsSnapshot = [self->localContactByContactID allValues];
+        
+        for (MXKContact* contact in contactsSnapshot)
+        {
+            contact.defaultCountryCode = countryCode;
+        }
+        
+        [self cacheLocalContacts];
+        
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [[NSNotificationCenter defaultCenter] postNotificationName:kMXKContactManagerDidInternationalizeNotification object:nil userInfo:nil];
+        });
+    });
+}
+
+- (MXKSectionedContacts *)getSectionedContacts:(NSArray*)contactsList
+{
+    if (!contactsList.count)
+    {
+        return nil;
+    }
+    
+    UILocalizedIndexedCollation *collation = [UILocalizedIndexedCollation currentCollation];
+    
+    int indexOffset = 0;
+    
+    NSInteger index, sectionTitlesCount = [[collation sectionTitles] count];
+    NSMutableArray *tmpSectionsArray = [[NSMutableArray alloc] initWithCapacity:(sectionTitlesCount)];
+    
+    sectionTitlesCount += indexOffset;
+    
+    for (index = 0; index < sectionTitlesCount; index++)
+    {
+        NSMutableArray *array = [[NSMutableArray alloc] init];
+        [tmpSectionsArray addObject:array];
+    }
+    
+    int contactsCount = 0;
+    
+    for (MXKContact *aContact in contactsList)
+    {
+        NSInteger section = [collation sectionForObject:aContact collationStringSelector:@selector(displayName)] + indexOffset;
+        
+        [[tmpSectionsArray objectAtIndex:section] addObject:aContact];
+        ++contactsCount;
+    }
+    
+    NSMutableArray *tmpSectionedContactsTitle = [[NSMutableArray alloc] initWithCapacity:sectionTitlesCount];
+    NSMutableArray *shortSectionsArray = [[NSMutableArray alloc] initWithCapacity:sectionTitlesCount];
+    
+    for (index = indexOffset; index < sectionTitlesCount; index++)
+    {
+        NSMutableArray *usersArrayForSection = [tmpSectionsArray objectAtIndex:index];
+        
+        if ([usersArrayForSection count] != 0)
+        {
+            NSArray* sortedUsersArrayForSection = [collation sortedArrayFromArray:usersArrayForSection collationStringSelector:@selector(displayName)];
+            [shortSectionsArray addObject:sortedUsersArrayForSection];
+            [tmpSectionedContactsTitle addObject:[[[UILocalizedIndexedCollation currentCollation] sectionTitles] objectAtIndex:(index - indexOffset)]];
+        }
+    }
+    
+    return [[MXKSectionedContacts alloc] initWithContacts:shortSectionsArray andTitles:tmpSectionedContactsTitle andCount:contactsCount];
+}
+
+- (void)sortAlphabeticallyContacts:(NSMutableArray<MXKContact*> *)contactsArray
+{
+    NSComparator comparator = ^NSComparisonResult(MXKContact *contactA, MXKContact *contactB) {
+        
+        if (contactA.sortingDisplayName.length && contactB.sortingDisplayName.length)
+        {
+            return [contactA.sortingDisplayName compare:contactB.sortingDisplayName options:NSCaseInsensitiveSearch];
+        }
+        else if (contactA.sortingDisplayName.length)
+        {
+            return NSOrderedAscending;
+        }
+        else if (contactB.sortingDisplayName.length)
+        {
+            return NSOrderedDescending;
+        }
+        return [contactA.displayName compare:contactB.displayName options:NSCaseInsensitiveSearch];
+    };
+    
+    // Sort the contacts list
+    [contactsArray sortUsingComparator:comparator];
+}
+
+- (void)sortContactsByLastActiveInformation:(NSMutableArray<MXKContact*> *)contactsArray
+{
+    // Sort invitable contacts by last active, with "active now" first.
+    // ...and then alphabetically.
+    NSComparator comparator = ^NSComparisonResult(MXKContact *contactA, MXKContact *contactB) {
+        
+        MXUser *userA = [self firstMatrixUserOfContact:contactA];
+        MXUser *userB = [self firstMatrixUserOfContact:contactB];
+        
+        // Non-Matrix-enabled contacts are moved to the end.
+        if (userA && !userB)
+        {
+            return NSOrderedAscending;
+        }
+        if (!userA && userB)
+        {
+            return NSOrderedDescending;
+        }
+        
+        // Display active contacts first.
+        if (userA.currentlyActive && userB.currentlyActive)
+        {
+            // Then order by name
+            if (contactA.sortingDisplayName.length && contactB.sortingDisplayName.length)
+            {
+                return [contactA.sortingDisplayName compare:contactB.sortingDisplayName options:NSCaseInsensitiveSearch];
+            }
+            else if (contactA.sortingDisplayName.length)
+            {
+                return NSOrderedAscending;
+            }
+            else if (contactB.sortingDisplayName.length)
+            {
+                return NSOrderedDescending;
+            }
+            return [contactA.displayName compare:contactB.displayName options:NSCaseInsensitiveSearch];
+        }
+        
+        if (userA.currentlyActive && !userB.currentlyActive)
+        {
+            return NSOrderedAscending;
+        }
+        if (!userA.currentlyActive && userB.currentlyActive)
+        {
+            return NSOrderedDescending;
+        }
+        
+        // Finally, compare the lastActiveAgo
+        NSUInteger lastActiveAgoA = userA.lastActiveAgo;
+        NSUInteger lastActiveAgoB = userB.lastActiveAgo;
+        
+        if (lastActiveAgoA == lastActiveAgoB)
+        {
+            return NSOrderedSame;
+        }
+        else
+        {
+            return ((lastActiveAgoA > lastActiveAgoB) ? NSOrderedDescending : NSOrderedAscending);
+        }
+    };
+    
+    // Sort the contacts list
+    [contactsArray sortUsingComparator:comparator];
+}
+
++ (void)requestUserConfirmationForLocalContactsSyncInViewController:(UIViewController *)viewController completionHandler:(void (^)(BOOL))handler
+{
+    NSString *appDisplayName = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleDisplayName"];
+
+    [MXKContactManager requestUserConfirmationForLocalContactsSyncWithTitle:[MatrixKitL10n localContactsAccessDiscoveryWarningTitle]
+                                                                    message:[MatrixKitL10n localContactsAccessDiscoveryWarning:appDisplayName]
+                                                manualPermissionChangeMessage:[MatrixKitL10n localContactsAccessNotGranted:appDisplayName]
+                                                    showPopUpInViewController:viewController
+                                                            completionHandler:handler];
+}
+
++ (void)requestUserConfirmationForLocalContactsSyncWithTitle:(NSString*)title
+                                                     message:(NSString*)message
+                                           manualPermissionChangeMessage:(NSString*)manualPermissionChangeMessage
+                                     showPopUpInViewController:(UIViewController*)viewController
+                                             completionHandler:(void (^)(BOOL granted))handler
+{
+    if ([[MXKAppSettings standardAppSettings] syncLocalContacts])
+    {
+        handler(YES);
+    }
+    else
+    {
+        UIAlertController *alert = [UIAlertController alertControllerWithTitle:title message:message preferredStyle:UIAlertControllerStyleAlert];
+        
+        [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
+                                                  style:UIAlertActionStyleDefault
+                                                handler:^(UIAlertAction * action) {
+                                                    
+                                                    [MXKTools checkAccessForContacts:manualPermissionChangeMessage showPopUpInViewController:viewController completionHandler:^(BOOL granted) {
+                                                        
+                                                        handler(granted);
+                                                    }];
+                                                    
+                                                }]];
+        
+        [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+                                                  style:UIAlertActionStyleDefault
+                                                handler:^(UIAlertAction * action) {
+                                                    
+                                                    handler(NO);
+                                                    
+                                                }]];
+        
+        
+        [viewController presentViewController:alert animated:YES completion:nil];
+    }
+}
+
+#pragma mark - Internals
+
+- (NSDictionary*)matrixContactsByMatrixIDFromMXSessions:(NSArray<MXSession*>*)mxSessions
+{
+    // The existing dictionary of contacts will be replaced by this one
+    NSMutableDictionary *matrixContactByMatrixID = [[NSMutableDictionary alloc] init];
+    for (MXSession *mxSession in mxSessions)
+    {
+        // Check all existing users
+        NSArray *mxUsers = [mxSession.users copy];
+        
+        for (MXUser *user in mxUsers)
+        {
+            // Check whether this user has already been added
+            if (!matrixContactByMatrixID[user.userId])
+            {
+                if ((self.contactManagerMXRoomSource == MXKContactManagerMXRoomSourceAll) || ((self.contactManagerMXRoomSource == MXKContactManagerMXRoomSourceDirectChats) && mxSession.directRooms[user.userId]))
+                {
+                    // Check whether a contact is already defined for this id in previous dictionary
+                    // (avoid delete and create the same ones, it could save thumbnail downloads).
+                    MXKContact* contact = matrixContactByMatrixID[user.userId];
+                    if (contact)
+                    {
+                        contact.displayName = (user.displayname.length > 0) ? user.displayname : user.userId;
+                        
+                        // Check the avatar change
+                        if ((user.avatarUrl || contact.matrixAvatarURL) && ([user.avatarUrl isEqualToString:contact.matrixAvatarURL] == NO))
+                        {
+                            [contact resetMatrixThumbnail];
+                        }
+                    }
+                    else
+                    {
+                        contact = [[MXKContact alloc] initMatrixContactWithDisplayName:((user.displayname.length > 0) ? user.displayname : user.userId) andMatrixID:user.userId];
+                    }
+                    
+                    matrixContactByMatrixID[user.userId] = contact;
+                }
+            }
+        }
+    }
+    
+    // Do not make an immutable copy to avoid performance penalty
+    return matrixContactByMatrixID;
+}
+
+- (void)refreshMatrixContacts
+{
+    NSArray *mxSessions = self.mxSessions;
+
+    // Check whether at least one session is available
+    if (!mxSessions.count)
+    {
+        matrixContactByMatrixID = nil;
+        matrixContactByContactID = nil;
+        [self cacheMatrixContacts];
+
+        [[NSNotificationCenter defaultCenter] postNotificationName:kMXKContactManagerDidUpdateMatrixContactsNotification object:nil userInfo:nil];
+    }
+    else if (self.contactManagerMXRoomSource != MXKContactManagerMXRoomSourceNone)
+    {
+        MXWeakify(self);
+
+        BOOL shouldFetchLocalContacts = self->matrixContactByContactID == nil;
+        
+        dispatch_async(processingQueue, ^{
+
+            MXStrongifyAndReturnIfNil(self);
+            
+            NSArray *sessions = self.mxSessions;
+
+            NSMutableDictionary *matrixContactsByMatrixID = nil;
+            NSMutableDictionary *matrixContactsByContactID = nil;
+
+            if (shouldFetchLocalContacts)
+            {
+                NSDictionary *cachedMatrixContacts = [self fetchCachedMatrixContacts];
+
+                if (!matrixContactsByContactID)
+                {
+                    matrixContactsByContactID = [NSMutableDictionary dictionary];
+                }
+                else
+                {
+                    matrixContactsByContactID = [cachedMatrixContacts mutableCopy];
+                }
+            }
+            else
+            {
+                matrixContactsByContactID = [NSMutableDictionary dictionary];
+            }
+
+            NSDictionary *matrixContacts = [self matrixContactsByMatrixIDFromMXSessions:sessions];
+
+            if (!matrixContacts)
+            {
+                matrixContactsByMatrixID = [NSMutableDictionary dictionary];
+                
+                for (MXKContact *contact in matrixContactsByContactID.allValues)
+                {
+                    matrixContactsByMatrixID[contact.matrixIdentifiers.firstObject] = contact;
+                }
+            }
+            else
+            {
+                matrixContactsByMatrixID = [matrixContacts mutableCopy];
+            }
+
+            for (MXKContact *contact in matrixContactsByMatrixID.allValues)
+            {
+                matrixContactsByContactID[contact.contactID] = contact;
+            }
+
+            dispatch_async(dispatch_get_main_queue(), ^{
+                MXStrongifyAndReturnIfNil(self);
+
+                // Update the matrix contacts list
+                self->matrixContactByMatrixID = matrixContactsByMatrixID;
+                self->matrixContactByContactID = matrixContactsByContactID;
+
+                [self cacheMatrixContacts];
+
+                [[NSNotificationCenter defaultCenter] postNotificationName:kMXKContactManagerDidUpdateMatrixContactsNotification object:nil userInfo:nil];
+            });
+        });
+    }
+}
+
+- (void)updateMatrixContactWithID:(NSString*)matrixId
+{
+    // Check if a one-to-one room exist for this matrix user in at least one matrix session.
+    NSArray *mxSessions = self.mxSessions;
+    for (MXSession *mxSession in mxSessions)
+    {
+        if ((self.contactManagerMXRoomSource == MXKContactManagerMXRoomSourceAll) || ((self.contactManagerMXRoomSource == MXKContactManagerMXRoomSourceDirectChats) && mxSession.directRooms[matrixId]))
+        {
+            // Retrieve the user object related to this contact
+            MXUser* user = [mxSession userWithUserId:matrixId];
+            
+            // This user may not exist (if the oneToOne room is a pending invitation to him).
+            if (user)
+            {
+                // Update or create a contact for this user
+                MXKContact* contact = [matrixContactByMatrixID objectForKey:matrixId];
+                BOOL isUpdated = NO;
+                
+                // already defined
+                if (contact)
+                {
+                    // Check the display name change
+                    NSString *userDisplayName = (user.displayname.length > 0) ? user.displayname : user.userId;
+                    if (![contact.displayName isEqualToString:userDisplayName])
+                    {
+                        contact.displayName = userDisplayName;
+                        
+                        [self cacheMatrixContacts];
+                        isUpdated = YES;
+                    }
+                    
+                    // Check the avatar change
+                    if ((user.avatarUrl || contact.matrixAvatarURL) && ([user.avatarUrl isEqualToString:contact.matrixAvatarURL] == NO))
+                    {
+                        [contact resetMatrixThumbnail];
+                        isUpdated = YES;
+                    }
+                }
+                else
+                {
+                    contact = [[MXKContact alloc] initMatrixContactWithDisplayName:((user.displayname.length > 0) ? user.displayname : user.userId) andMatrixID:user.userId];
+                    [matrixContactByMatrixID setValue:contact forKey:matrixId];
+                    
+                    // update the matrix contacts list
+                    [matrixContactByContactID setValue:contact forKey:contact.contactID];
+                    
+                    [self cacheMatrixContacts];
+                    isUpdated = YES;
+                }
+                
+                if (isUpdated)
+                {
+                    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKContactManagerDidUpdateMatrixContactsNotification object:contact.contactID userInfo:nil];
+                }
+                
+                // Done
+                return;
+            }
+        }
+    }
+    
+    // Here no one-to-one room exist, remove the contact if any
+    MXKContact* contact = [matrixContactByMatrixID objectForKey:matrixId];
+    if (contact)
+    {
+        [matrixContactByContactID removeObjectForKey:contact.contactID];
+        [matrixContactByMatrixID removeObjectForKey:matrixId];
+        
+        [self cacheMatrixContacts];
+        [[NSNotificationCenter defaultCenter] postNotificationName:kMXKContactManagerDidUpdateMatrixContactsNotification object:contact.contactID userInfo:nil];
+    }
+}
+
+- (void)updateLocalContactMatrixIDs:(MXKContact*) contact
+{
+    for (MXKPhoneNumber* phoneNumber in contact.phoneNumbers)
+    {
+        if (phoneNumber.msisdn)
+        {
+            NSString* matrixID = [matrixIDBy3PID objectForKey:phoneNumber.msisdn];
+            
+            dispatch_async(dispatch_get_main_queue(), ^{
+                
+                [phoneNumber setMatrixID:matrixID];
+                
+            });
+        }
+    }
+    
+    for (MXKEmail* email in contact.emailAddresses)
+    {
+        if (email.emailAddress.length > 0)
+        {
+            NSString *matrixID = [matrixIDBy3PID objectForKey:email.emailAddress];
+            
+            dispatch_async(dispatch_get_main_queue(), ^{
+                
+                [email setMatrixID:matrixID];
+                
+            });
+        }
+    }
+}
+
+- (void)updateAllLocalContactsMatrixIDs
+{
+    // Check if the user allowed to sync local contacts
+    if (![MXKAppSettings standardAppSettings].syncLocalContacts)
+    {
+        return;
+    }
+    
+    NSArray* localContacts = [localContactByContactID allValues];
+    
+    // update the contacts info
+    for (MXKContact* contact in localContacts)
+    {
+        [self updateLocalContactMatrixIDs:contact];
+    }
+}
+
+- (MXUser*)firstMatrixUserOfContact:(MXKContact*)contact;
+{
+    MXUser *user = nil;
+    
+    NSArray *identifiers = contact.matrixIdentifiers;
+    if (identifiers.count)
+    {
+        for (MXSession *session in mxSessionArray)
+        {
+            user = [session userWithUserId:identifiers.firstObject];
+            if (user)
+            {
+                break;
+            }
+        }
+    }
+    
+    return user;
+}
+
+
+#pragma mark - Identity server updates
+
+- (void)registerAccountDataDidChangeIdentityServerNotification
+{
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleAccountDataDidChangeIdentityServerNotification:) name:kMXSessionAccountDataDidChangeIdentityServerNotification object:nil];
+}
+
+- (void)handleAccountDataDidChangeIdentityServerNotification:(NSNotification*)notification
+{
+    MXLogDebug(@"[MXKContactManager] handleAccountDataDidChangeIdentityServerNotification");
+    
+    if (!self.allowLocalContactsAccess)
+    {
+        MXLogDebug(@"[MXKContactManager] handleAccountDataDidChangeIdentityServerNotification. Does nothing because local contacts access not allowed.");
+        return;
+    }
+
+    // Use the identity server of the up
+    MXSession *mxSession = notification.object;
+    if (mxSession != mxSessionArray.firstObject)
+    {
+        return;
+    }
+
+    if (self.identityService)
+    {
+        // Do a full lookup
+        // But check first if the data is loaded
+        if (!self->localContactByContactID )
+        {
+            // Load data. That will trigger updateMatrixIDsForAllLocalContacts if needed
+            [self refreshLocalContacts];
+        }
+        else
+        {
+            [self updateMatrixIDsForAllLocalContacts];
+        }
+    }
+    else
+    {
+        [self resetMatrixIDs];
+    }
+}
+
+
+#pragma mark - KVO
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
+{
+    if (!self.allowLocalContactsAccess)
+    {
+        MXLogDebug(@"[MXKContactManager] Ignoring KVO changes, because local contacts access not allowed.");
+        return;
+    }
+    
+    if ([@"syncLocalContacts" isEqualToString:keyPath])
+    {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            
+            [self refreshLocalContacts];
+            
+        });
+    }
+    else if ([@"phonebookCountryCode" isEqualToString:keyPath])
+    {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            
+            [self internationalizePhoneNumbers:[[MXKAppSettings standardAppSettings] phonebookCountryCode]];
+            
+            // Refresh local contacts if we have some
+            if (MXKAppSettings.standardAppSettings.syncLocalContacts && self->localContactByContactID.count)
+            {
+                [self refreshLocalContacts];
+            }
+            
+        });
+    }
+}
+
+#pragma mark - file caches
+
+static NSString *MXKContactManagerDomain = @"org.matrix.MatrixKit.MXKContactManager";
+static NSInteger MXContactManagerEncryptionDelegateNotReady = -1;
+
+static NSString *matrixContactsFileOld = @"matrixContacts";
+static NSString *matrixIDsDictFileOld = @"matrixIDsDict";
+static NSString *localContactsFileOld = @"localContacts";
+static NSString *contactsBookInfoFileOld = @"contacts";
+
+static NSString *matrixContactsFile = @"matrixContactsV2";
+static NSString *matrixIDsDictFile = @"matrixIDsDictV2";
+static NSString *localContactsFile = @"localContactsV2";
+static NSString *contactsBookInfoFile = @"contactsV2";
+
+- (NSString*)dataFilePathForComponent:(NSString*)component
+{
+    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+    NSString *documentsDirectory = [paths objectAtIndex:0];
+    return [documentsDirectory stringByAppendingPathComponent:component];
+}
+
+- (void)cacheMatrixContacts
+{
+    NSString *dataFilePath = [self dataFilePathForComponent:matrixContactsFile];
+    
+    if (matrixContactByContactID && (matrixContactByContactID.count > 0))
+    {
+        // Switch on processing queue because matrixContactByContactID dictionary may be huge.
+        NSDictionary *matrixContactByContactIDCpy = [matrixContactByContactID copy];
+        
+        dispatch_async(processingQueue, ^{
+            
+            NSMutableData *theData = [NSMutableData data];
+            NSKeyedArchiver *encoder = [[NSKeyedArchiver alloc] initForWritingWithMutableData:theData];
+            
+            [encoder encodeObject:matrixContactByContactIDCpy forKey:@"matrixContactByContactID"];
+            
+            [encoder finishEncoding];
+            
+            [self encryptAndSaveData:theData toFile:matrixContactsFile];
+        });
+    }
+    else
+    {
+        NSFileManager *fileManager = [[NSFileManager alloc] init];
+        [fileManager removeItemAtPath:dataFilePath error:nil];
+    }
+}
+
+- (NSDictionary*)fetchCachedMatrixContacts
+{
+    NSDate *startDate = [NSDate date];
+    
+    NSString *dataFilePath = [self dataFilePathForComponent:matrixContactsFile];
+    
+    NSFileManager *fileManager = [[NSFileManager alloc] init];
+    
+    __block NSDictionary *matrixContactByContactID = nil;
+    
+    if ([fileManager fileExistsAtPath:dataFilePath])
+    {
+        @try
+        {
+            NSData* filecontent = [NSData dataWithContentsOfFile:dataFilePath options:(NSDataReadingMappedAlways | NSDataReadingUncached) error:nil];
+            
+            NSError *error = nil;
+            filecontent = [self decryptData:filecontent error:&error fileName:matrixContactsFile];
+
+            if (!error)
+            {
+                NSKeyedUnarchiver *decoder = [[NSKeyedUnarchiver alloc] initForReadingWithData:filecontent];
+                
+                id object = [decoder decodeObjectForKey:@"matrixContactByContactID"];
+                
+                if ([object isKindOfClass:[NSDictionary class]])
+                {
+                    matrixContactByContactID = object;
+                }
+                
+                [decoder finishDecoding];
+            }
+            else
+            {
+                MXLogDebug(@"[MXKContactManager] fetchCachedMatrixContacts: failed to decrypt %@: %@", matrixContactsFile, error);
+            }
+        }
+        @catch (NSException *exception)
+        {
+        }
+    }
+    
+    MXLogDebug(@"[MXKContactManager] fetchCachedMatrixContacts : Loaded %tu contacts in %.0fms", matrixContactByContactID.count, [[NSDate date] timeIntervalSinceDate:startDate] * 1000);
+    
+    return matrixContactByContactID;
+}
+
+- (void)cacheMatrixIDsDict
+{
+    NSString *dataFilePath = [self dataFilePathForComponent:matrixIDsDictFile];
+    
+    if (matrixIDBy3PID.count)
+    {
+        NSMutableData *theData = [NSMutableData data];
+        NSKeyedArchiver *encoder = [[NSKeyedArchiver alloc] initForWritingWithMutableData:theData];
+        
+        [encoder encodeObject:matrixIDBy3PID forKey:@"matrixIDsDict"];
+        [encoder finishEncoding];
+        
+        [self encryptAndSaveData:theData toFile:matrixIDsDictFile];
+    }
+    else
+    {
+        NSFileManager *fileManager = [[NSFileManager alloc] init];
+        [fileManager removeItemAtPath:dataFilePath error:nil];
+    }
+}
+
+- (void)loadCachedMatrixIDsDict
+{
+    NSString *dataFilePath = [self dataFilePathForComponent:matrixIDsDictFile];
+    
+    NSFileManager *fileManager = [[NSFileManager alloc] init];
+    
+    if ([fileManager fileExistsAtPath:dataFilePath])
+    {
+        // the file content could be corrupted
+        @try
+        {
+            NSData* filecontent = [NSData dataWithContentsOfFile:dataFilePath options:(NSDataReadingMappedAlways | NSDataReadingUncached) error:nil];
+            
+            NSError *error = nil;
+            filecontent = [self decryptData:filecontent error:&error fileName:matrixIDsDictFile];
+
+            if (!error)
+            {
+                NSKeyedUnarchiver *decoder = [[NSKeyedUnarchiver alloc] initForReadingWithData:filecontent];
+                
+                id object = [decoder decodeObjectForKey:@"matrixIDsDict"];
+                
+                if ([object isKindOfClass:[NSDictionary class]])
+                {
+                    matrixIDBy3PID = [object mutableCopy];
+                }
+                
+                [decoder finishDecoding];
+            }
+            else
+            {
+                MXLogDebug(@"[MXKContactManager] loadCachedMatrixIDsDict: failed to decrypt %@: %@", matrixIDsDictFile, error);
+            }
+        }
+        @catch (NSException *exception)
+        {
+        }
+    }
+    
+    if (!matrixIDBy3PID)
+    {
+        matrixIDBy3PID = [[NSMutableDictionary alloc] init];
+    }
+}
+
+- (void)cacheLocalContacts
+{
+    NSString *dataFilePath = [self dataFilePathForComponent:localContactsFile];
+    
+    if (localContactByContactID && (localContactByContactID.count > 0))
+    {
+        NSMutableData *theData = [NSMutableData data];
+        NSKeyedArchiver *encoder = [[NSKeyedArchiver alloc] initForWritingWithMutableData:theData];
+        
+        [encoder encodeObject:localContactByContactID forKey:@"localContactByContactID"];
+        
+        [encoder finishEncoding];
+        
+        [self encryptAndSaveData:theData toFile:localContactsFile];
+    }
+    else
+    {
+        NSFileManager *fileManager = [[NSFileManager alloc] init];
+        [fileManager removeItemAtPath:dataFilePath error:nil];
+    }
+}
+
+- (void)loadCachedLocalContacts
+{
+    NSString *dataFilePath = [self dataFilePathForComponent:localContactsFile];
+    
+    NSFileManager *fileManager = [[NSFileManager alloc] init];
+    
+    if ([fileManager fileExistsAtPath:dataFilePath])
+    {
+        // the file content could be corrupted
+        @try
+        {
+            NSData* filecontent = [NSData dataWithContentsOfFile:dataFilePath options:(NSDataReadingMappedAlways | NSDataReadingUncached) error:nil];
+            
+            NSError *error = nil;
+            filecontent = [self decryptData:filecontent error:&error fileName:localContactsFile];
+
+            if (!error)
+            {
+                NSKeyedUnarchiver *decoder = [[NSKeyedUnarchiver alloc] initForReadingWithData:filecontent];
+                
+                id object = [decoder decodeObjectForKey:@"localContactByContactID"];
+                
+                if ([object isKindOfClass:[NSDictionary class]])
+                {
+                    localContactByContactID = [object mutableCopy];
+                }
+                
+                [decoder finishDecoding];
+            }
+            else
+            {
+                MXLogDebug(@"[MXKContactManager] loadCachedLocalContacts: failed to decrypt %@: %@", localContactsFile, error);
+            }
+        }
+        @catch (NSException *exception)
+        {
+            lastSyncDate = nil;
+        }
+    }
+    
+    if (!localContactByContactID)
+    {
+        localContactByContactID = [[NSMutableDictionary alloc] init];
+    }
+}
+
+- (void)cacheContactBookInfo
+{
+    NSString *dataFilePath = [self dataFilePathForComponent:contactsBookInfoFile];
+    
+    if (lastSyncDate)
+    {
+        NSMutableData *theData = [NSMutableData data];
+        NSKeyedArchiver *encoder = [[NSKeyedArchiver alloc] initForWritingWithMutableData:theData];
+        
+        [encoder encodeObject:lastSyncDate forKey:@"lastSyncDate"];
+        
+        [encoder finishEncoding];
+        
+        [self encryptAndSaveData:theData toFile:contactsBookInfoFile];
+    }
+    else
+    {
+        NSFileManager *fileManager = [[NSFileManager alloc] init];
+        [fileManager removeItemAtPath:dataFilePath error:nil];
+    }
+}
+
+- (void)loadCachedContactBookInfo
+{
+    NSString *dataFilePath = [self dataFilePathForComponent:contactsBookInfoFile];
+    
+    NSFileManager *fileManager = [[NSFileManager alloc] init];
+    
+    if ([fileManager fileExistsAtPath:dataFilePath])
+    {
+        // the file content could be corrupted
+        @try
+        {
+            NSData* filecontent = [NSData dataWithContentsOfFile:dataFilePath options:(NSDataReadingMappedAlways | NSDataReadingUncached) error:nil];
+            
+            NSError *error = nil;
+            filecontent = [self decryptData:filecontent error:&error fileName:contactsBookInfoFile];
+
+            if (!error)
+            {
+                NSKeyedUnarchiver *decoder = [[NSKeyedUnarchiver alloc] initForReadingWithData:filecontent];
+                
+                lastSyncDate = [decoder decodeObjectForKey:@"lastSyncDate"];
+                
+                [decoder finishDecoding];
+            }
+            else
+            {
+                lastSyncDate = nil;
+                MXLogDebug(@"[MXKContactManager] loadCachedContactBookInfo: failed to decrypt %@: %@", contactsBookInfoFile, error);
+            }
+        }
+        @catch (NSException *exception)
+        {
+            lastSyncDate = nil;
+        }
+    }
+}
+
+- (BOOL)encryptAndSaveData:(NSData*)data toFile:(NSString*)fileName
+{
+    NSError *error = nil;
+    NSData *cipher = [self encryptData:data error:&error fileName:fileName];
+
+    if (error == nil)
+    {
+        [cipher writeToFile:[self dataFilePathForComponent:fileName] atomically:YES];
+    }
+    else
+    {
+        MXLogDebug(@"[MXKContactManager] encryptAndSaveData: failed to encrypt %@", fileName);
+    }
+    
+    return error == nil;
+}
+
+- (NSData*)encryptData:(NSData*)data error:(NSError**)error fileName:(NSString*)fileName
+{
+    @try
+    {
+        MXKeyData *keyData = (MXKeyData *) [[MXKeyProvider sharedInstance] requestKeyForDataOfType:MXKContactManagerDataType isMandatory:NO expectedKeyType:kAes];
+        if (keyData && [keyData isKindOfClass:[MXAesKeyData class]])
+        {
+            MXAesKeyData *aesKey = (MXAesKeyData *) keyData;
+            NSData *cipher = [MXAes encrypt:data aesKey:aesKey.key iv:aesKey.iv error:error];
+            MXLogDebug(@"[MXKContactManager] encryptData: encrypted %lu Bytes for %@", cipher.length, fileName);
+            return cipher;
+        }
+    }
+    @catch (NSException *exception)
+    {
+        *error = [NSError errorWithDomain:MXKContactManagerDomain code:MXContactManagerEncryptionDelegateNotReady userInfo:@{NSLocalizedDescriptionKey: [NSString stringWithFormat:@"encryptData failed: %@", exception.reason]}];
+    }
+    
+    MXLogDebug(@"[MXKContactManager] encryptData: no key method provided for encryption of %@", fileName);
+    return data;
+}
+
+- (NSData*)decryptData:(NSData*)data error:(NSError**)error fileName:(NSString*)fileName
+{
+    @try
+    {
+        MXKeyData *keyData = [[MXKeyProvider sharedInstance] requestKeyForDataOfType:MXKContactManagerDataType isMandatory:NO expectedKeyType:kAes];
+        if (keyData && [keyData isKindOfClass:[MXAesKeyData class]])
+        {
+            MXAesKeyData *aesKey = (MXAesKeyData *) keyData;
+            NSData *decrypt = [MXAes decrypt:data aesKey:aesKey.key iv:aesKey.iv error:error];
+            MXLogDebug(@"[MXKContactManager] decryptData: decrypted %lu Bytes for %@", decrypt.length, fileName);
+            return decrypt;
+        }
+    }
+    @catch (NSException *exception)
+    {
+        *error = [NSError errorWithDomain:MXKContactManagerDomain code:MXContactManagerEncryptionDelegateNotReady userInfo:@{NSLocalizedDescriptionKey: [NSString stringWithFormat:@"decryptData failed: %@", exception.reason]}];
+    }
+    
+    MXLogDebug(@"[MXKContactManager] decryptData: no key method provided for decryption of %@", fileName);
+    return data;
+}
+
+- (void)deleteOldFiles {
+    NSFileManager *fileManager = [[NSFileManager alloc] init];
+    NSArray<NSString*> *oldFileNames = @[matrixContactsFileOld, matrixIDsDictFileOld, localContactsFileOld, contactsBookInfoFileOld];
+    NSError *error = nil;
+    
+    for (NSString *fileName in oldFileNames) {
+        NSString *filePath = [self dataFilePathForComponent:fileName];
+        if ([fileManager fileExistsAtPath:filePath])
+        {
+            error = nil;
+            if (![fileManager removeItemAtPath:filePath error:&error])
+            {
+                MXLogDebug(@"[MXKContactManager] deleteOldFiles: failed to remove %@", fileName);
+            }
+        }
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Contact/MXKEmail.h b/Riot/Modules/MatrixKit/Models/Contact/MXKEmail.h
new file mode 100644
index 000000000..7073ae5c6
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Contact/MXKEmail.h
@@ -0,0 +1,30 @@
+/*
+ Copyright 2015 OpenMarket 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/UIKit.h>
+#import "MXKContactField.h"
+
+@interface MXKEmail : MXKContactField
+
+// email info (the address is stored in lowercase)
+@property (nonatomic, readonly) NSString *type;
+@property (nonatomic, readonly) NSString *emailAddress;
+
+- (id)initWithEmailAddress:(NSString*)anEmailAddress type:(NSString*)aType contactID:(NSString*)aContactID matrixID:(NSString*)matrixID;
+
+- (BOOL)matchedWithPatterns:(NSArray*)patterns;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Contact/MXKEmail.m b/Riot/Modules/MatrixKit/Models/Contact/MXKEmail.m
new file mode 100644
index 000000000..5ccda81c3
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Contact/MXKEmail.m
@@ -0,0 +1,91 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2019 The Matrix.org Foundation C.I.C
+ 
+ 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 "MXKEmail.h"
+
+@implementation MXKEmail
+
+- (id)init
+{
+    self = [super init];
+    
+    if (self)
+    {
+        _emailAddress = nil;
+        _type = nil;
+    }
+    
+    return self;
+}
+
+- (id)initWithEmailAddress:(NSString*)anEmailAddress type:(NSString*)aType contactID:(NSString*)aContactID matrixID:(NSString*)matrixID
+{
+    self = [super initWithContactID:aContactID matrixID:matrixID];
+    
+    if (self)
+    {
+        _emailAddress = [anEmailAddress lowercaseString];
+        _type = aType;
+    }
+    
+    return self;
+}
+
+- (BOOL)matchedWithPatterns:(NSArray*)patterns
+{
+    // no number -> cannot match
+    if (_emailAddress.length == 0)
+    {
+        return NO;
+    }
+    if (patterns.count > 0)
+    {
+        for(NSString *pattern in patterns)
+        {
+            if ([_emailAddress rangeOfString:pattern options:NSCaseInsensitiveSearch].location == NSNotFound)
+            {
+                return NO;
+            }
+        }
+    }
+    
+    return YES;
+}
+#pragma mark NSCoding
+
+- (id)initWithCoder:(NSCoder *)coder
+{
+    self = [super initWithCoder:coder];
+    
+    if (self)
+    {
+        _type = [coder decodeObjectForKey:@"type"];
+        _emailAddress = [[coder decodeObjectForKey:@"emailAddress"] lowercaseString];
+    }
+    
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder
+{
+    [super encodeWithCoder:coder];
+    
+    [coder encodeObject:_type forKey:@"type"];
+    [coder encodeObject:_emailAddress forKey:@"emailAddress"];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Contact/MXKPhoneNumber.h b/Riot/Modules/MatrixKit/Models/Contact/MXKPhoneNumber.h
new file mode 100644
index 000000000..b992dd358
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Contact/MXKPhoneNumber.h
@@ -0,0 +1,78 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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/Foundation.h>
+
+#import "MXKContactField.h"
+
+@class NBPhoneNumber;
+
+@interface MXKPhoneNumber : MXKContactField
+
+/**
+ The phone number information
+ */
+@property (nonatomic, readonly) NSString *type;
+@property (nonatomic, readonly) NSString *textNumber;
+@property (nonatomic, readonly) NSString *cleanedPhonenumber;
+
+/**
+ When the number is considered to be a possible number. We expose here
+ the corresponding NBPhoneNumber instance. Use the NBPhoneNumberUtil interface 
+ to format this phone number, or check whether the number is actually a
+ valid number.
+ */
+@property (nonatomic, readonly) NBPhoneNumber* nbPhoneNumber;
+
+/**
+ The default ISO 3166-1 country code used to parse the text number,
+ and create the nbPhoneNumber instance.
+ */
+@property (nonatomic) NSString *defaultCountryCode;
+
+/**
+ The Mobile Station International Subscriber Directory Number.
+ Available when the nbPhoneNumber is not nil.
+ */
+@property (nonatomic, readonly) NSString *msisdn;
+
+/**
+ Create a new MXKPhoneNumber instance
+ 
+ @param textNumber the phone number
+ @param type the phone number type
+ @param contactID The identifier of the contact to whom the data belongs to.
+ @param matrixID The linked matrix identifier if any.
+ */
+- (id)initWithTextNumber:(NSString*)textNumber type:(NSString*)type contactID:(NSString*)contactID matrixID:(NSString*)matrixID;
+
+/**
+ Return YES when all the provided patterns are found in the phone number or its msisdn.
+ 
+ @param patterns an array of patterns (The potential "+" (or "00") prefix is ignored during the msisdn handling).
+ */
+- (BOOL)matchedWithPatterns:(NSArray*)patterns;
+
+/**
+ Tell whether the phone number or its msisdn has the provided prefix.
+ 
+ @param prefix a non empty string (The potential "+" (or "00") prefix is ignored during the msisdn handling).
+ @return YES when the phone number or its msisdn has the provided prefix.
+ */
+- (BOOL)hasPrefix:(NSString*)prefix;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Contact/MXKPhoneNumber.m b/Riot/Modules/MatrixKit/Models/Contact/MXKPhoneNumber.m
new file mode 100644
index 000000000..5e4779926
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Contact/MXKPhoneNumber.m
@@ -0,0 +1,213 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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 "MXKPhoneNumber.h"
+
+@import libPhoneNumber_iOS;
+
+@implementation MXKPhoneNumber
+
+@synthesize msisdn;
+
+- (id)initWithTextNumber:(NSString*)textNumber type:(NSString*)type contactID:(NSString*)contactID matrixID:(NSString*)matrixID
+{
+    self = [super initWithContactID:contactID matrixID:matrixID];
+    
+    if (self)
+    {
+        _type = type ? type : @"";
+        _textNumber = textNumber ? textNumber : @"" ;
+        _cleanedPhonenumber = [MXKPhoneNumber cleanPhonenumber:_textNumber];
+        _defaultCountryCode = nil;
+        msisdn = nil;
+        
+        _nbPhoneNumber = [[NBPhoneNumberUtil sharedInstance] parse:_cleanedPhonenumber defaultRegion:nil error:nil];
+    }
+    
+    return self;
+}
+
+// remove the unuseful characters in a phonenumber
++ (NSString*)cleanPhonenumber:(NSString*)phoneNumber
+{
+    // sanity check
+    if (nil == phoneNumber)
+    {
+        return nil;
+    }
+    
+    // empty string
+    if (0 == [phoneNumber length])
+    {
+        return @"";
+    }
+    
+    static NSCharacterSet *invertedPhoneCharSet = nil;
+    
+    if (!invertedPhoneCharSet)
+    {
+        invertedPhoneCharSet = [[NSCharacterSet characterSetWithCharactersInString:@"0123456789+*#,()"] invertedSet];
+    }
+    
+    return [[phoneNumber componentsSeparatedByCharactersInSet:invertedPhoneCharSet] componentsJoinedByString:@""];
+}
+
+
+- (BOOL)matchedWithPatterns:(NSArray*)patterns
+{
+    // no number -> cannot match
+    if (_textNumber.length == 0)
+    {
+        return NO;
+    }
+    
+    if (patterns.count > 0)
+    {
+        for (NSString *pattern in patterns)
+        {
+            if ([_textNumber rangeOfString:pattern].location == NSNotFound)
+            {
+                NSString *cleanPattern = [[pattern componentsSeparatedByCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] componentsJoinedByString:@""];
+                
+                if ([_cleanedPhonenumber rangeOfString:cleanPattern].location == NSNotFound)
+                {
+                    NSString *msisdnPattern;
+                    
+                    if ([cleanPattern hasPrefix:@"+"])
+                    {
+                        msisdnPattern = [cleanPattern substringFromIndex:1];
+                    }
+                    else if ([cleanPattern hasPrefix:@"00"])
+                    {
+                        msisdnPattern = [cleanPattern substringFromIndex:2];
+                    }
+                    else
+                    {
+                        msisdnPattern = cleanPattern;
+                    }
+                    
+                    // Check the msisdn
+                    if (!self.msisdn || !msisdnPattern.length || [self.msisdn rangeOfString:msisdnPattern].location == NSNotFound)
+                    {
+                        return NO;
+                    }
+                }
+                
+            }
+        }
+    }
+    
+    return YES;
+}
+
+- (BOOL)hasPrefix:(NSString*)prefix
+{
+    // no number -> cannot match
+    if (_textNumber.length == 0)
+    {
+        return NO;
+    }
+    
+    if ([_textNumber hasPrefix:prefix])
+    {
+        return YES;
+    }
+    
+    // Remove whitespace before checking the cleaned phone number
+    prefix = [[prefix componentsSeparatedByCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] componentsJoinedByString:@""];
+    
+    if ([_cleanedPhonenumber hasPrefix:prefix])
+    {
+        return YES;
+    }
+    
+    if (self.msisdn)
+    {
+        if ([prefix hasPrefix:@"+"])
+        {
+            prefix = [prefix substringFromIndex:1];
+        }
+        else if ([prefix hasPrefix:@"00"])
+        {
+            prefix = [prefix substringFromIndex:2];
+        }
+        
+        return [self.msisdn hasPrefix:prefix];
+    }
+    
+    return NO;
+}
+
+- (void)setDefaultCountryCode:(NSString *)defaultCountryCode
+{
+    if (![defaultCountryCode isEqualToString:_defaultCountryCode])
+    {
+        _nbPhoneNumber = [[NBPhoneNumberUtil sharedInstance] parse:_cleanedPhonenumber defaultRegion:defaultCountryCode error:nil];
+        
+        _defaultCountryCode = defaultCountryCode;
+        msisdn = nil;
+    }
+}
+
+- (NSString*)msisdn
+{
+    if (!msisdn && _nbPhoneNumber)
+    {
+        NSString *e164 = [[NBPhoneNumberUtil sharedInstance] format:_nbPhoneNumber numberFormat:NBEPhoneNumberFormatE164 error:nil];
+        if ([e164 hasPrefix:@"+"])
+        {
+            msisdn = [e164 substringFromIndex:1];
+        }
+        else if ([e164 hasPrefix:@"00"])
+        {
+            msisdn = [e164 substringFromIndex:2];
+        }
+    }
+    return msisdn;
+}
+
+#pragma mark NSCoding
+
+- (id)initWithCoder:(NSCoder *)coder
+{
+    self = [super initWithCoder:coder];
+    
+    if (self)
+    {
+        _type = [coder decodeObjectForKey:@"type"];
+        _textNumber = [coder decodeObjectForKey:@"textNumber"];
+        _cleanedPhonenumber = [coder decodeObjectForKey:@"cleanedPhonenumber"];
+        _defaultCountryCode = [coder decodeObjectForKey:@"countryCode"];
+        
+        _nbPhoneNumber = [[NBPhoneNumberUtil sharedInstance] parse:_cleanedPhonenumber defaultRegion:_defaultCountryCode error:nil];
+        msisdn = nil;
+    }
+    
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder
+{
+    [super encodeWithCoder:coder];
+    
+    [coder encodeObject:_type forKey:@"type"];
+    [coder encodeObject:_textNumber forKey:@"textNumber"];
+    [coder encodeObject:_cleanedPhonenumber forKey:@"cleanedPhonenumber"];
+    [coder encodeObject:_defaultCountryCode forKey:@"countryCode"];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Contact/MXKSectionedContacts.h b/Riot/Modules/MatrixKit/Models/Contact/MXKSectionedContacts.h
new file mode 100644
index 000000000..aaee29742
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Contact/MXKSectionedContacts.h
@@ -0,0 +1,33 @@
+/*
+ Copyright 2015 OpenMarket 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/Foundation.h>
+
+#import "MXKContact.h"
+
+@interface MXKSectionedContacts : NSObject {
+    int contactsCount;
+    NSArray<NSString*> *sectionTitles;
+    NSArray<NSArray<MXKContact*>*> *sectionedContacts;
+}
+
+@property (nonatomic, readonly) int contactsCount;
+@property (nonatomic, readonly) NSArray<NSString*> *sectionTitles;
+@property (nonatomic, readonly) NSArray<NSArray<MXKContact*>*> *sectionedContacts;
+
+- (instancetype)initWithContacts:(NSArray<NSArray<MXKContact*>*> *)inSectionedContacts andTitles:(NSArray<NSString*> *)titles andCount:(int)count;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Contact/MXKSectionedContacts.m b/Riot/Modules/MatrixKit/Models/Contact/MXKSectionedContacts.m
new file mode 100644
index 000000000..a8237dfcc
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Contact/MXKSectionedContacts.m
@@ -0,0 +1,32 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKSectionedContacts.h"
+
+@implementation MXKSectionedContacts
+
+@synthesize contactsCount, sectionTitles, sectionedContacts;
+
+-(id)initWithContacts:(NSArray<NSArray<MXKContact*> *> *)inSectionedContacts andTitles:(NSArray<NSString *> *)titles andCount:(int)count {
+    if (self = [super init]) {
+        contactsCount = count;
+        sectionedContacts = inSectionedContacts;
+        sectionTitles = titles;
+    }
+    return self;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Group/MXKGroupCellData.h b/Riot/Modules/MatrixKit/Models/Group/MXKGroupCellData.h
new file mode 100644
index 000000000..9ecd35b9c
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Group/MXKGroupCellData.h
@@ -0,0 +1,24 @@
+/*
+ Copyright 2017 Vector Creations 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 "MXKGroupCellDataStoring.h"
+
+/**
+ `MXKGroupCellData` modelised the data for a `MXKGroupTableViewCell` cell.
+ */
+@interface MXKGroupCellData : MXKCellData <MXKGroupCellDataStoring>
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Group/MXKGroupCellData.m b/Riot/Modules/MatrixKit/Models/Group/MXKGroupCellData.m
new file mode 100644
index 000000000..9bb53db22
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Group/MXKGroupCellData.m
@@ -0,0 +1,49 @@
+/*
+ Copyright 2017 Vector Creations 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 "MXKGroupCellData.h"
+
+#import "MXKSessionGroupsDataSource.h"
+
+@implementation MXKGroupCellData
+@synthesize group, groupsDataSource, groupDisplayname, sortingDisplayname;
+
+- (instancetype)initWithGroup:(MXGroup*)theGroup andGroupsDataSource:(MXKSessionGroupsDataSource*)theGroupsDataSource
+{
+    self = [self init];
+    if (self)
+    {
+        groupsDataSource = theGroupsDataSource;
+        [self updateWithGroup:theGroup];
+    }
+    return self;
+}
+
+- (void)updateWithGroup:(MXGroup*)theGroup
+{
+    group = theGroup;
+    
+    groupDisplayname = sortingDisplayname = group.profile.name;
+    
+    if (!groupDisplayname.length)
+    {
+        groupDisplayname = group.groupId;
+        // Ignore the prefix '+' of the group id during sorting.
+        sortingDisplayname = [groupDisplayname substringFromIndex:1];
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Group/MXKGroupCellDataStoring.h b/Riot/Modules/MatrixKit/Models/Group/MXKGroupCellDataStoring.h
new file mode 100644
index 000000000..9ca2bd57b
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Group/MXKGroupCellDataStoring.h
@@ -0,0 +1,53 @@
+/*
+ Copyright 2017 Vector Creations 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 <MatrixSDK/MatrixSDK.h>
+
+#import "MXKCellData.h"
+
+@class MXKSessionGroupsDataSource;
+
+/**
+ `MXKGroupCellDataStoring` defines a protocol a class must conform in order to store group cell data
+ managed by `MXKSessionGroupsDataSource`.
+ */
+@protocol MXKGroupCellDataStoring <NSObject>
+
+@property (nonatomic, weak, readonly) MXKSessionGroupsDataSource *groupsDataSource;
+
+@property (nonatomic, readonly) MXGroup *group;
+
+@property (nonatomic, readonly) NSString *groupDisplayname;
+@property (nonatomic, readonly) NSString *sortingDisplayname;
+
+#pragma mark - Public methods
+/**
+ Create a new `MXKCellData` object for a new group cell.
+
+ @param group the `MXGroup` object that has data about the group.
+ @param groupsDataSource the `MXKSessionGroupsDataSource` object that will use this instance.
+ @return the newly created instance.
+ */
+- (instancetype)initWithGroup:(MXGroup*)group andGroupsDataSource:(MXKSessionGroupsDataSource*)groupsDataSource;
+
+/**
+ The `MXKSessionGroupsDataSource` object calls this method when the group data has been updated.
+ 
+ @param group the updated group.
+ */
+- (void)updateWithGroup:(MXGroup*)group;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Group/MXKSessionGroupsDataSource.h b/Riot/Modules/MatrixKit/Models/Group/MXKSessionGroupsDataSource.h
new file mode 100644
index 000000000..7ee1ac3c0
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Group/MXKSessionGroupsDataSource.h
@@ -0,0 +1,94 @@
+/*
+ Copyright 2017 Vector Creations 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 "MXKDataSource.h"
+#import "MXKGroupCellData.h"
+
+/**
+ Identifier to use for cells that display a group.
+ */
+extern NSString *const kMXKGroupCellIdentifier;
+
+/**
+ 'MXKSessionGroupsDataSource' is a base class to handle the groups of a matrix session.
+ A 'MXKSessionGroupsDataSource' instance provides the data source for `MXKGroupListViewController`.
+ 
+ A section is created to handle the invitations to a group, the first one if any.
+ */
+@interface MXKSessionGroupsDataSource : MXKDataSource <UITableViewDataSource>
+{    
+@protected
+    
+    /**
+     The current list of the group invitations (sorted in the alphabetic order).
+     This list takes into account potential filter defined by`patternsList`.
+     */
+    NSMutableArray<MXKGroupCellData*> *groupsInviteCellDataArray;
+    
+    /**
+     The current displayed list of the joined groups (sorted in the alphabetic order).
+     This list takes into account potential filter defined by`patternsList`.
+     */
+    NSMutableArray<MXKGroupCellData*> *groupsCellDataArray;
+}
+
+@property (nonatomic) NSInteger groupInvitesSection;
+@property (nonatomic) NSInteger joinedGroupsSection;
+
+#pragma mark - Life cycle
+
+/**
+ Refresh all the groups summary.
+ The group data are not synced with the server, use this method to refresh them according to your needs.
+ 
+ @param completion the block to execute when a request has been done for each group (whatever the result of the requests).
+ You may specify nil for this parameter.
+ */
+- (void)refreshGroupsSummary:(void (^)(void))completion;
+
+/**
+ Filter the current groups list according to the provided patterns.
+ When patterns are not empty, the search result is stored in `filteredGroupsCellDataArray`,
+ this array provides then data for the cells served by `MXKSessionGroupsDataSource`.
+ 
+ @param patternsList the list of patterns (`NSString` instances) to match with. Set nil to cancel search.
+ */
+- (void)searchWithPatterns:(NSArray*)patternsList;
+
+/**
+ Get the data for the cell at the given index path.
+ 
+ @param indexPath the index of the cell in the table
+ @return the cell data
+ */
+- (id<MXKGroupCellDataStoring>)cellDataAtIndex:(NSIndexPath*)indexPath;
+
+/**
+ Get the index path of the cell related to the provided groupId.
+ 
+ @param groupId the group identifier.
+ @return indexPath the index of the cell (nil if not found).
+ */
+- (NSIndexPath*)cellIndexPathWithGroupId:(NSString*)groupId;
+
+/**
+ Leave the group displayed at the provided path.
+ 
+ @param indexPath the index of the group cell in the table
+ */
+- (void)leaveGroupAtIndexPath:(NSIndexPath *)indexPath;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Group/MXKSessionGroupsDataSource.m b/Riot/Modules/MatrixKit/Models/Group/MXKSessionGroupsDataSource.m
new file mode 100644
index 000000000..cb9f7a948
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Group/MXKSessionGroupsDataSource.m
@@ -0,0 +1,611 @@
+/*
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 New Vector Ltd
+ Copyright 2019 The Matrix.org Foundation C.I.C
+
+ 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 "MXKSessionGroupsDataSource.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKConstants.h"
+
+#import "MXKSwiftHeader.h"
+
+#pragma mark - Constant definitions
+NSString *const kMXKGroupCellIdentifier = @"kMXKGroupCellIdentifier";
+
+
+@interface MXKSessionGroupsDataSource ()
+{
+    /**
+     Internal array used to regulate change notifications.
+     Cell data changes are stored instantly in this array.
+     We wait at least for 500 ms between two notifications of the delegate.
+     */
+    NSMutableArray *internalCellDataArray;
+    
+    /*
+     Timer to not notify the delegate on every changes.
+     */
+    NSTimer *timer;
+    
+    /*
+     Tells whether some changes must be notified.
+     */
+    BOOL isDataChangePending;
+    
+    /**
+     Store the current search patterns list.
+     */
+    NSArray* searchPatternsList;
+}
+
+@end
+
+@implementation MXKSessionGroupsDataSource
+
+- (instancetype)initWithMatrixSession:(MXSession *)matrixSession
+{
+    self = [super initWithMatrixSession:matrixSession];
+    if (self)
+    {
+        internalCellDataArray = [NSMutableArray array];
+        groupsCellDataArray = [NSMutableArray array];
+        groupsInviteCellDataArray = [NSMutableArray array];
+        
+        isDataChangePending = NO;
+        
+        // Set default data and view classes
+        [self registerCellDataClass:MXKGroupCellData.class forCellIdentifier:kMXKGroupCellIdentifier];
+    }
+    return self;
+}
+
+- (void)destroy
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    
+    groupsCellDataArray = nil;
+    groupsInviteCellDataArray = nil;
+    internalCellDataArray = nil;
+    
+    searchPatternsList = nil;
+    
+    [timer invalidate];
+    timer = nil;
+    
+    [super destroy];
+}
+
+- (void)didMXSessionStateChange
+{
+    if (MXSessionStateRunning <= self.mxSession.state)
+    {
+        // Check whether some data have been already load
+        if (0 == internalCellDataArray.count)
+        {
+            [self loadData];
+        }
+        else if (self.mxSession.state == MXSessionStateRunning)
+        {
+            // Refresh the group data
+            [self refreshGroupsSummary:nil];
+        }
+    }
+}
+
+#pragma mark -
+
+- (void)refreshGroupsSummary:(void (^)(void))completion
+{
+    MXLogDebug(@"[MXKSessionGroupsDataSource] refreshGroupsSummary");
+    
+    __block NSUInteger count = internalCellDataArray.count;
+    
+    if (count)
+    {
+        for (id<MXKGroupCellDataStoring> groupData in internalCellDataArray)
+        {
+            // Force the matrix session to refresh the group summary.
+            [self.mxSession updateGroupSummary:groupData.group success:^{
+                
+                if (completion && !(--count))
+                {
+                    // All the requests have been done.
+                    completion ();
+                }
+                
+            } failure:^(NSError *error) {
+                
+                MXLogDebug(@"[MXKSessionGroupsDataSource] refreshGroupsSummary: group summary update failed %@", groupData.group.groupId);
+                
+                if (completion && !(--count))
+                {
+                    // All the requests have been done.
+                    completion ();
+                }
+                
+            }];
+        }
+    }
+    else if (completion)
+    {
+        completion();
+    }
+}
+
+- (void)searchWithPatterns:(NSArray*)patternsList
+{
+    if (patternsList.count)
+    {
+        searchPatternsList = patternsList;
+    }
+    else
+    {
+        searchPatternsList = nil;
+    }
+    
+    [self onCellDataChange];
+}
+
+- (id<MXKGroupCellDataStoring>)cellDataAtIndex:(NSIndexPath*)indexPath
+{
+    id<MXKGroupCellDataStoring> groupData;
+    
+    if (indexPath.section == _groupInvitesSection)
+    {
+        if (indexPath.row < groupsInviteCellDataArray.count)
+        {
+            groupData = groupsInviteCellDataArray[indexPath.row];
+        }
+    }
+    else if (indexPath.section == _joinedGroupsSection)
+    {
+        if (indexPath.row < groupsCellDataArray.count)
+        {
+            groupData = groupsCellDataArray[indexPath.row];
+        }
+    }
+    
+    return groupData;
+}
+
+- (NSIndexPath*)cellIndexPathWithGroupId:(NSString*)groupId
+{
+    // Look for the cell
+    if (_groupInvitesSection != -1)
+    {
+        for (NSInteger index = 0; index < groupsInviteCellDataArray.count; index ++)
+        {
+            id<MXKGroupCellDataStoring> groupData = groupsInviteCellDataArray[index];
+            if ([groupId isEqualToString:groupData.group.groupId])
+            {
+                // Got it
+                return [NSIndexPath indexPathForRow:index inSection:_groupInvitesSection];
+            }
+        }
+    }
+    
+    if (_joinedGroupsSection != -1)
+    {
+        for (NSInteger index = 0; index < groupsCellDataArray.count; index ++)
+        {
+            id<MXKGroupCellDataStoring> groupData = groupsCellDataArray[index];
+            if ([groupId isEqualToString:groupData.group.groupId])
+            {
+                // Got it
+                return [NSIndexPath indexPathForRow:index inSection:_joinedGroupsSection];
+            }
+        }
+    }
+    
+    return nil;
+}
+
+#pragma mark - Groups processing
+
+- (void)loadData
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionNewGroupInviteNotification object:self.mxSession];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionDidJoinGroupNotification object:self.mxSession];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionDidLeaveGroupNotification object:self.mxSession];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionDidUpdateGroupSummaryNotification object:self.mxSession];
+    
+    // Reset the table
+    [internalCellDataArray removeAllObjects];
+    
+    // Retrieve the MXKCellData class to manage the data
+    Class class = [self cellDataClassForCellIdentifier:kMXKGroupCellIdentifier];
+    NSAssert([class conformsToProtocol:@protocol(MXKGroupCellDataStoring)], @"MXKSessionGroupsDataSource only manages MXKCellData that conforms to MXKGroupCellDataStoring protocol");
+    
+    // Listen to MXSession groups changes
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onNewGroupInvite:) name:kMXSessionNewGroupInviteNotification object:self.mxSession];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didJoinGroup:) name:kMXSessionDidJoinGroupNotification object:self.mxSession];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didLeaveGroup:) name:kMXSessionDidLeaveGroupNotification object:self.mxSession];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didUpdateGroup:) name:kMXSessionDidUpdateGroupSummaryNotification object:self.mxSession];
+    
+    NSDate *startDate = [NSDate date];
+    
+    NSArray *groups = self.mxSession.groups;
+    for (MXGroup *group in groups)
+    {
+        id<MXKGroupCellDataStoring> cellData = [[class alloc] initWithGroup:group andGroupsDataSource:self];
+        if (cellData)
+        {
+            [internalCellDataArray addObject:cellData];
+            
+            // Force the matrix session to refresh the group summary.
+            [self.mxSession updateGroupSummary:group success:nil failure:^(NSError *error) {
+                MXLogDebug(@"[MXKSessionGroupsDataSource] loadData: group summary update failed %@", group.groupId);
+            }];
+        }
+    }
+    
+    MXLogDebug(@"[MXKSessionGroupsDataSource] Loaded %tu groups in %.3fms", groups.count, [[NSDate date] timeIntervalSinceDate:startDate] * 1000);
+    
+    [self sortCellData];
+    [self onCellDataChange];
+}
+
+- (void)didUpdateGroup:(NSNotification *)notif
+{
+    MXGroup *group = notif.userInfo[kMXSessionNotificationGroupKey];
+    if (group)
+    {
+        id<MXKGroupCellDataStoring> groupData = [self cellDataWithGroupId:group.groupId];
+        if (groupData)
+        {
+            [groupData updateWithGroup:group];
+        }
+        else
+        {
+            MXLogDebug(@"[MXKSessionGroupsDataSource] didUpdateGroup: Cannot find the changed group for %@ (%@). It is probably not managed by this group data source", group.groupId, group);
+            return;
+        }
+    }
+    
+    [self sortCellData];
+    [self onCellDataChange];
+}
+
+- (void)onNewGroupInvite:(NSNotification *)notif
+{
+    MXGroup *group = notif.userInfo[kMXSessionNotificationGroupKey];
+    if (group)
+    {
+        // Add the group if there is not yet a cell for it
+        id<MXKGroupCellDataStoring> groupData = [self cellDataWithGroupId:group.groupId];
+        if (nil == groupData)
+        {
+            MXLogDebug(@"MXKSessionGroupsDataSource] Add new group invite: %@", group.groupId);
+            
+            // Retrieve the MXKCellData class to manage the data
+            Class class = [self cellDataClassForCellIdentifier:kMXKGroupCellIdentifier];
+            
+            id<MXKGroupCellDataStoring> cellData = [[class alloc] initWithGroup:group andGroupsDataSource:self];
+            if (cellData)
+            {
+                [internalCellDataArray addObject:cellData];
+                
+                [self sortCellData];
+                [self onCellDataChange];
+            }
+        }
+    }
+}
+
+- (void)didJoinGroup:(NSNotification *)notif
+{
+    MXGroup *group = notif.userInfo[kMXSessionNotificationGroupKey];
+    if (group)
+    { 
+        id<MXKGroupCellDataStoring> groupData = [self cellDataWithGroupId:group.groupId];
+        if (groupData)
+        {
+            MXLogDebug(@"MXKSessionGroupsDataSource] Update joined room: %@", group.groupId);
+            [groupData updateWithGroup:group];
+        }
+        else
+        {
+            MXLogDebug(@"MXKSessionGroupsDataSource] Add new joined invite: %@", group.groupId);
+            
+            // Retrieve the MXKCellData class to manage the data
+            Class class = [self cellDataClassForCellIdentifier:kMXKGroupCellIdentifier];
+            
+            id<MXKGroupCellDataStoring> cellData = [[class alloc] initWithGroup:group andGroupsDataSource:self];
+            if (cellData)
+            {
+                [internalCellDataArray addObject:cellData];
+            }
+        }
+        
+        [self sortCellData];
+        [self onCellDataChange];
+    }
+}
+
+- (void)didLeaveGroup:(NSNotification *)notif
+{
+    NSString *groupId = notif.userInfo[kMXSessionNotificationGroupIdKey];
+    if (groupId)
+    {
+        [self removeGroup:groupId];
+    }
+}
+
+- (void)removeGroup:(NSString*)groupId
+{
+    id<MXKGroupCellDataStoring> groupData = [self cellDataWithGroupId:groupId];
+    if (groupData)
+    {
+        MXLogDebug(@"MXKSessionGroupsDataSource] Remove left group: %@", groupId);
+        
+        [internalCellDataArray removeObject:groupData];
+        
+        [self sortCellData];
+        [self onCellDataChange];
+    }
+}
+
+- (void)onCellDataChange
+{
+    isDataChangePending = NO;
+    
+    // Check no notification was done recently.
+    // Note: do not wait in case of search
+    if (timer == nil || searchPatternsList)
+    {
+        [timer invalidate];
+        timer = [NSTimer scheduledTimerWithTimeInterval:0.5 target:self selector:@selector(checkPendingUpdate:) userInfo:nil repeats:NO];
+        
+        // Prepare cell data array, and notify the delegate.
+        [self prepareCellDataAndNotifyChanges];
+    }
+    else
+    {
+        isDataChangePending = YES;
+    }
+}
+
+- (IBAction)checkPendingUpdate:(id)sender
+{
+    [timer invalidate];
+    timer = nil;
+    
+    if (isDataChangePending)
+    {
+        [self onCellDataChange];
+    }
+}
+
+- (void)sortCellData
+{
+    // Order alphabetically the groups
+    [internalCellDataArray sortUsingComparator:^NSComparisonResult(id<MXKGroupCellDataStoring> cellData1, id<MXKGroupCellDataStoring> cellData2)
+     {
+         if (cellData1.sortingDisplayname.length && cellData2.sortingDisplayname.length)
+         {
+             return [cellData1.sortingDisplayname compare:cellData2.sortingDisplayname options:NSCaseInsensitiveSearch];
+         }
+         else if (cellData1.sortingDisplayname.length)
+         {
+             return NSOrderedAscending;
+         }
+         else if (cellData2.sortingDisplayname.length)
+         {
+             return NSOrderedDescending;
+         }
+         return NSOrderedSame;
+     }];
+}
+
+- (void)prepareCellDataAndNotifyChanges
+{
+    // Prepare the cell data arrays by considering the potential filter.
+    [groupsInviteCellDataArray removeAllObjects];
+    [groupsCellDataArray removeAllObjects];
+    for (id<MXKGroupCellDataStoring> groupData in internalCellDataArray)
+    {
+        BOOL isKept = !searchPatternsList;
+        
+        for (NSString* pattern in searchPatternsList)
+        {
+            if (groupData.groupDisplayname && [groupData.groupDisplayname rangeOfString:pattern options:NSCaseInsensitiveSearch].location != NSNotFound)
+            {
+                isKept = YES;
+                break;
+            }
+        }
+        
+        if (isKept)
+        {
+            if (groupData.group.membership == MXMembershipInvite)
+            {
+                [groupsInviteCellDataArray addObject:groupData];
+            }
+            else
+            {
+                [groupsCellDataArray addObject:groupData];
+            }
+        }
+    }
+    
+    // Update here data source state
+    if (state != MXKDataSourceStateReady)
+    {
+        state = MXKDataSourceStateReady;
+        if (self.delegate && [self.delegate respondsToSelector:@selector(dataSource:didStateChange:)])
+        {
+            [self.delegate dataSource:self didStateChange:state];
+        }
+    }
+    
+    // And inform the delegate about the update
+    [self.delegate dataSource:self didCellChange:nil];
+}
+
+// Find the cell data that stores information about the given group id
+- (id<MXKGroupCellDataStoring>)cellDataWithGroupId:(NSString*)groupId
+{
+    id<MXKGroupCellDataStoring> theGroupData;
+    for (id<MXKGroupCellDataStoring> groupData in internalCellDataArray)
+    {
+        if ([groupData.group.groupId isEqualToString:groupId])
+        {
+            theGroupData = groupData;
+            break;
+        }
+    }
+    return theGroupData;
+}
+
+#pragma mark - UITableViewDataSource
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+    NSInteger count = 0;
+    _groupInvitesSection = _joinedGroupsSection = -1;
+    
+    // Check whether all data sources are ready before rendering groups.
+    if (self.state == MXKDataSourceStateReady)
+    {
+        if (groupsInviteCellDataArray.count)
+        {
+            _groupInvitesSection = count++;
+        }
+        if (groupsCellDataArray.count)
+        {
+            _joinedGroupsSection = count++;
+        }
+    }
+    return count;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    if (section == _groupInvitesSection)
+    {
+        return groupsInviteCellDataArray.count;
+    }
+    else if (section == _joinedGroupsSection)
+    {
+        return groupsCellDataArray.count;
+    }
+    
+    return 0;
+}
+
+- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
+{
+    NSString* sectionTitle = nil;
+    
+    if (section == _groupInvitesSection)
+    {
+        sectionTitle = [MatrixKitL10n groupInviteSection];
+    }
+    else if (section == _joinedGroupsSection)
+    {
+        sectionTitle = [MatrixKitL10n groupSection];
+    }
+    
+    return sectionTitle;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    id<MXKGroupCellDataStoring> groupData;
+    
+    if (indexPath.section == _groupInvitesSection)
+    {
+        if (indexPath.row < groupsInviteCellDataArray.count)
+        {
+            groupData = groupsInviteCellDataArray[indexPath.row];
+        }
+    }
+    else if (indexPath.section == _joinedGroupsSection)
+    {
+        if (indexPath.row < groupsCellDataArray.count)
+        {
+            groupData = groupsCellDataArray[indexPath.row];
+        }
+    }
+    
+    if (groupData)
+    {
+        NSString *cellIdentifier = [self.delegate cellReuseIdentifierForCellData:groupData];
+        if (cellIdentifier)
+        {
+            UITableViewCell<MXKCellRendering> *cell  = [tableView dequeueReusableCellWithIdentifier:cellIdentifier forIndexPath:indexPath];
+            
+            // Make sure we listen to user actions on the cell
+            cell.delegate = self;
+            
+            // Make the bubble display the data
+            [cell render:groupData];
+            
+            return cell;
+        }
+    }
+    
+    // Return a fake cell to prevent app from crashing.
+    return [[UITableViewCell alloc] init];
+}
+
+- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    // Return NO if you do not want the specified item to be editable.
+    return YES;
+}
+
+- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    if (editingStyle == UITableViewCellEditingStyleDelete)
+    {
+        [self leaveGroupAtIndexPath:indexPath];
+    }
+}
+
+- (void)leaveGroupAtIndexPath:(NSIndexPath *)indexPath
+{
+    id<MXKGroupCellDataStoring> cellData = [self cellDataAtIndex:indexPath];
+    
+    if (cellData.group)
+    {
+        __weak typeof(self) weakSelf = self;
+        
+        [self.mxSession leaveGroup:cellData.group.groupId success:^{
+            
+            if (weakSelf)
+            {
+                // Refresh the table content
+                typeof(self) self = weakSelf;
+                [self removeGroup:cellData.group.groupId];
+            }
+            
+        } failure:^(NSError *error) {
+            
+            MXLogDebug(@"[MXKSessionGroupsDataSource] Failed to leave group (%@)", cellData.group.groupId);
+            
+            // Notify MatrixKit user
+            NSString *myUserId = self.mxSession.myUser.userId;
+            [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+            
+        }];
+    }
+}
+
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/MXK3PID.h b/Riot/Modules/MatrixKit/Models/MXK3PID.h
new file mode 100644
index 000000000..1bf84cb3c
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/MXK3PID.h
@@ -0,0 +1,119 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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 <MatrixSDK/MatrixSDK.h>
+
+typedef enum : NSUInteger {
+    MXK3PIDAuthStateUnknown,
+    MXK3PIDAuthStateTokenRequested,
+    MXK3PIDAuthStateTokenReceived,
+    MXK3PIDAuthStateTokenSubmitted,
+    MXK3PIDAuthStateAuthenticated
+} MXK3PIDAuthState;
+
+
+@interface MXK3PID : NSObject
+
+/**
+ The type of the third party media.
+ */
+@property (nonatomic, readonly) MX3PIDMedium medium;
+
+/**
+ The third party media (email address, msisdn,...).
+ */
+@property (nonatomic, readonly) NSString *address;
+
+/**
+ The current client secret key used during third party validation.
+ */
+@property (nonatomic, readonly) NSString *clientSecret;
+
+/**
+ The current session identifier during third party validation.
+ */
+@property (nonatomic, readonly) NSString *sid;
+
+/**
+ The id of the user on Matrix.
+ nil if unknown or not yet resolved.
+ */
+@property (nonatomic) NSString *userId;
+
+@property (nonatomic, readonly) MXK3PIDAuthState validationState;
+
+/**
+ Initialise the instance with a 3PID.
+
+ @param medium the medium.
+ @param address the id of the contact on this medium.
+ @return the new instance.
+ */
+- (instancetype)initWithMedium:(NSString*)medium andAddress:(NSString*)address;
+
+/**
+ Cancel the current request, and reset parameters
+ */
+- (void)cancelCurrentRequest;
+
+/**
+ Start the validation process 
+ The identity server will send a validation token by email or sms.
+ 
+ In case of email, the end user must click on the link in the received email
+ to validate their email address in order to be able to call add3PIDToUser successfully.
+ 
+ In case of phone number, the end user must send back the sms token
+ in order to be able to call add3PIDToUser successfully.
+ 
+ @param restClient used to make matrix API requests during validation process.
+ @param isDuringRegistration  tell whether this request occurs during a registration flow.
+ @param nextLink the link the validation page will automatically open. Can be nil.
+ @param success A block object called when the operation succeeds.
+ @param failure A block object called when the operation fails.
+ */
+- (void)requestValidationTokenWithMatrixRestClient:(MXRestClient*)restClient
+                              isDuringRegistration:(BOOL)isDuringRegistration
+                                          nextLink:(NSString*)nextLink
+                                           success:(void (^)(void))success
+                                           failure:(void (^)(NSError *error))failure;
+
+/**
+ Submit the received validation token.
+ 
+ @param token the validation token.
+ @param success A block object called when the operation succeeds.
+ @param failure A block object called when the operation fails.
+ */
+- (void)submitValidationToken:(NSString *)token
+                      success:(void (^)(void))success
+                      failure:(void (^)(NSError *error))failure;
+
+/**
+ Link a 3rd party id to the user.
+ 
+ @param bind whether the homeserver should also bind this third party identifier
+        to the account's Matrix ID with the identity server.
+ @param success A block object called when the operation succeeds. It provides the raw
+ server response.
+ @param failure A block object called when the operation fails.
+ */
+- (void)add3PIDToUser:(BOOL)bind
+              success:(void (^)(void))success
+              failure:(void (^)(NSError *error))failure;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/MXK3PID.m b/Riot/Modules/MatrixKit/Models/MXK3PID.m
new file mode 100644
index 000000000..5c4657cfa
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/MXK3PID.m
@@ -0,0 +1,316 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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 "MXK3PID.h"
+
+@import libPhoneNumber_iOS;
+
+@interface MXK3PID ()
+{
+    MXRestClient *mxRestClient;
+    MXHTTPOperation *currentRequest;
+}
+@property (nonatomic) NSString *clientSecret;
+@property (nonatomic) NSUInteger sendAttempt;
+@property (nonatomic) NSString *sid;
+@property (nonatomic) MXIdentityService *identityService;
+@property (nonatomic) NSString *submitUrl;
+
+@end
+
+@implementation MXK3PID
+
+- (instancetype)initWithMedium:(NSString *)medium andAddress:(NSString *)address
+{
+    self = [super init];
+    if (self)
+    {
+        _medium = [medium copy];
+        _address = [address copy];
+        self.clientSecret = [MXTools generateSecret];
+    }
+    return self;
+}
+
+- (void)cancelCurrentRequest
+{
+    _validationState = MXK3PIDAuthStateUnknown;
+    
+    [currentRequest cancel];
+    currentRequest = nil;
+    mxRestClient = nil;
+    self.identityService = nil;
+
+    self.sendAttempt = 1;
+    self.sid = nil;
+    // Removed potential linked userId
+    self.userId = nil;
+}
+
+- (void)requestValidationTokenWithMatrixRestClient:(MXRestClient*)restClient
+                              isDuringRegistration:(BOOL)isDuringRegistration
+                                          nextLink:(NSString*)nextLink
+                                           success:(void (^)(void))success
+                                           failure:(void (^)(NSError *error))failure
+{
+    // Sanity Check
+    if (_validationState != MXK3PIDAuthStateTokenRequested && restClient)
+    {
+        // Reset if the current state is different than "Unknown"
+        if (_validationState != MXK3PIDAuthStateUnknown)
+        {
+            [self cancelCurrentRequest];
+        }
+        
+        NSString *identityServer = restClient.identityServer;
+        if (identityServer)
+        {
+            // Use same identity server as REST client for validation token submission
+            self.identityService = [[MXIdentityService alloc] initWithIdentityServer:identityServer accessToken:nil andHomeserverRestClient:restClient];
+        }
+        
+        if ([self.medium isEqualToString:kMX3PIDMediumEmail])
+        {
+            _validationState = MXK3PIDAuthStateTokenRequested;
+            mxRestClient = restClient;
+            
+            currentRequest = [mxRestClient requestTokenForEmail:self.address isDuringRegistration:isDuringRegistration clientSecret:self.clientSecret sendAttempt:self.sendAttempt nextLink:nextLink success:^(NSString *sid) {
+                
+                self->_validationState = MXK3PIDAuthStateTokenReceived;
+                self->currentRequest = nil;
+                self.sid = sid;
+                
+                if (success)
+                {
+                    success();
+                }
+                
+            } failure:^(NSError *error) {
+                
+                // Return in unknown state
+                self->_validationState = MXK3PIDAuthStateUnknown;
+                self->currentRequest = nil;
+                // Increment attempt counter
+                self.sendAttempt++;
+                
+                if (failure)
+                {
+                    failure (error);
+                }
+                
+            }];
+        }
+        else if ([self.medium isEqualToString:kMX3PIDMediumMSISDN])
+        {
+            _validationState = MXK3PIDAuthStateTokenRequested;
+            mxRestClient = restClient;
+            
+            NSString *phoneNumber = [NSString stringWithFormat:@"+%@", self.address];
+            
+            currentRequest = [mxRestClient requestTokenForPhoneNumber:phoneNumber isDuringRegistration:isDuringRegistration countryCode:nil clientSecret:self.clientSecret sendAttempt:self.sendAttempt nextLink:nextLink success:^(NSString *sid, NSString *msisdn, NSString *submitUrl) {
+                
+                self->_validationState = MXK3PIDAuthStateTokenReceived;
+                self->currentRequest = nil;
+                self.sid = sid;
+                self.submitUrl = submitUrl;
+                
+                if (success)
+                {
+                    success();
+                }
+                
+            } failure:^(NSError *error) {
+                
+                // Return in unknown state
+                self->_validationState = MXK3PIDAuthStateUnknown;
+                self->currentRequest = nil;
+                // Increment attempt counter
+                self.sendAttempt++;
+                
+                if (failure)
+                {
+                    failure (error);
+                }
+                
+            }];
+        }
+        else
+        {
+            MXLogDebug(@"[MXK3PID] requestValidationToken: is not supported for this 3PID: %@ (%@)", self.address, self.medium);
+        }
+    }
+    else
+    {
+        MXLogDebug(@"[MXK3PID] Failed to request validation token for 3PID: %@ (%@), state: %lu", self.address, self.medium, (unsigned long)_validationState);
+    }
+}
+
+- (void)submitValidationToken:(NSString *)token
+                      success:(void (^)(void))success
+                      failure:(void (^)(NSError *error))failure
+{
+    // Sanity Check
+    if (_validationState == MXK3PIDAuthStateTokenReceived)
+    {
+        if (self.submitUrl)
+        {
+            _validationState = MXK3PIDAuthStateTokenSubmitted;
+
+            currentRequest = [self submitMsisdnTokenOtherUrl:self.submitUrl token:token medium:self.medium clientSecret:self.clientSecret sid:self.sid success:^{
+
+                self->_validationState = MXK3PIDAuthStateAuthenticated;
+                self->currentRequest = nil;
+
+                if (success)
+                {
+                    success();
+                }
+
+            } failure:^(NSError *error) {
+
+                // Return in previous state
+                self->_validationState = MXK3PIDAuthStateTokenReceived;
+                self->currentRequest = nil;
+
+                if (failure)
+                {
+                    failure (error);
+                }
+
+            }];
+        }
+        else if (self.identityService)
+        {
+            _validationState = MXK3PIDAuthStateTokenSubmitted;
+            
+            currentRequest = [self.identityService submit3PIDValidationToken:token medium:self.medium clientSecret:self.clientSecret sid:self.sid success:^{
+                
+                self->_validationState = MXK3PIDAuthStateAuthenticated;
+                self->currentRequest = nil;
+                
+                if (success)
+                {
+                    success();
+                }
+                
+            } failure:^(NSError *error) {
+                
+                // Return in previous state
+                self->_validationState = MXK3PIDAuthStateTokenReceived;
+                self->currentRequest = nil;
+                
+                if (failure)
+                {
+                    failure (error);
+                }
+                
+            }];
+        }
+        else
+        {
+            MXLogDebug(@"[MXK3PID] Failed to submit validation token for 3PID: %@ (%@), identity service is not set", self.address, self.medium);
+            
+            if (failure)
+            {
+                failure(nil);
+            }
+        }
+    }
+    else
+    {
+        MXLogDebug(@"[MXK3PID] Failed to submit validation token for 3PID: %@ (%@), state: %lu", self.address, self.medium, (unsigned long)_validationState);
+        
+        if (failure)
+        {
+            failure(nil);
+        }
+    }
+}
+
+- (MXHTTPOperation *)submitMsisdnTokenOtherUrl:(NSString *)url
+                                         token:(NSString*)token
+                                        medium:(NSString *)medium
+                                  clientSecret:(NSString *)clientSecret
+                                           sid:(NSString *)sid
+                                       success:(void (^)(void))success
+                                       failure:(void (^)(NSError *))failure
+{
+    NSDictionary *parameters = @{
+                                 @"sid": sid,
+                                 @"client_secret": clientSecret,
+                                 @"token": token
+                                 };
+
+    MXHTTPClient *httpClient = [[MXHTTPClient alloc] initWithBaseURL:nil andOnUnrecognizedCertificateBlock:nil];
+    return [httpClient requestWithMethod:@"POST"
+                                    path:url
+                              parameters:parameters
+                                 success:^(NSDictionary *JSONResponse) {
+                                     success();
+                                 }
+                                 failure:failure];
+}
+
+- (void)add3PIDToUser:(BOOL)bind
+              success:(void (^)(void))success
+              failure:(void (^)(NSError *error))failure
+{
+    if ([self.medium isEqualToString:kMX3PIDMediumEmail] || [self.medium isEqualToString:kMX3PIDMediumMSISDN])
+    {
+        MXWeakify(self);
+        
+        currentRequest = [mxRestClient add3PID:self.sid clientSecret:self.clientSecret bind:bind success:^{
+
+            MXStrongifyAndReturnIfNil(self);
+
+            // Update linked userId in 3PID
+            self.userId = self->mxRestClient.credentials.userId;
+            self->currentRequest = nil;
+
+            if (success)
+            {
+                success();
+            }
+            
+        } failure:^(NSError *error) {
+            
+            MXStrongifyAndReturnIfNil(self);
+            
+            self->currentRequest = nil;
+
+            if (failure)
+            {
+                failure (error);
+            }
+            
+        }];
+
+        return;
+    }
+    else
+    {
+        MXLogDebug(@"[MXK3PID] bindWithUserId: is not supported for this 3PID: %@ (%@)", self.address, self.medium);
+    }
+
+    // Here the validation process failed
+    if (failure)
+    {
+        failure (nil);
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/MXKAppSettings.h b/Riot/Modules/MatrixKit/Models/MXKAppSettings.h
new file mode 100644
index 000000000..710e1d5db
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/MXKAppSettings.h
@@ -0,0 +1,290 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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 <MatrixSDK/MatrixSDK.h>
+
+typedef NS_ENUM(NSUInteger, MXKKeyPreSharingStrategy)
+{
+    MXKKeyPreSharingNone = 0,
+    MXKKeyPreSharingWhenEnteringRoom = 1,
+    MXKKeyPreSharingWhenTyping = 2
+};
+
+/**
+ `MXKAppSettings` represents the application settings. Most of them are used to handle matrix session data.
+ 
+ The shared object `standardAppSettings` provides the default application settings defined in `standardUserDefaults`.
+ Any property change of this shared settings is reported into `standardUserDefaults`.
+ 
+ Developper may define their own `MXKAppSettings` instances to handle specific setting values without impacting the shared object.
+ */
+@interface MXKAppSettings : NSObject
+
+#pragma mark - /sync filter
+
+/**
+ Lazy load room members when /syncing with the homeserver.
+ */
+@property (nonatomic) BOOL syncWithLazyLoadOfRoomMembers;
+
+#pragma mark - Room display
+
+/**
+ Display all received events in room history (Only recognized events are displayed, presently `custom` events are ignored).
+ 
+ This boolean value is defined in shared settings object with the key: `showAllEventsInRoomHistory`.
+ Return NO if no value is defined.
+ */
+@property (nonatomic) BOOL showAllEventsInRoomHistory;
+
+/**
+ The types of events allowed to be displayed in room history.
+ Its value depends on `showAllEventsInRoomHistory`.
+ */
+@property (nonatomic, readonly) NSArray<MXEventTypeString> *eventsFilterForMessages;
+
+/**
+ All the event types which may be displayed in the room history.
+ */
+@property (nonatomic, readonly) NSArray<MXEventTypeString> *allEventTypesForMessages;
+
+/**
+ An allow list for the types of events allowed to be displayed as the last message.
+ 
+ When `nil`, there is no list and all events are allowed.
+ */
+@property (nonatomic, readonly) NSArray<MXEventTypeString> *lastMessageEventTypesAllowList;
+
+/**
+ Add event types to `eventsFilterForMessages` and `eventsFilterForMessages`.
+ 
+ @param eventTypes the event types to add.
+ */
+- (void)addSupportedEventTypes:(NSArray<MXEventTypeString> *)eventTypes;
+
+/**
+ Remove event types from `eventsFilterForMessages` and `eventsFilterForMessages`.
+
+ @param eventTypes the event types to remove.
+ */
+- (void)removeSupportedEventTypes:(NSArray<MXEventTypeString> *)eventTypes;
+
+/**
+ Display redacted events in room history.
+ 
+ This boolean value is defined in shared settings object with the key: `showRedactionsInRoomHistory`.
+ Return NO if no value is defined.
+ */
+@property (nonatomic) BOOL showRedactionsInRoomHistory;
+
+/**
+ Display unsupported/unexpected events in room history.
+ 
+ This boolean value is defined in shared settings object with the key: `showUnsupportedEventsInRoomHistory`.
+ Return NO if no value is defined.
+ */
+@property (nonatomic) BOOL showUnsupportedEventsInRoomHistory;
+
+/**
+ Scheme with which to open HTTP links. e.g. if this is set to "googlechrome", any http:// links displayed in a room will be rewritten to use the googlechrome:// scheme.
+ Defaults to "http".
+ */
+@property (nonatomic) NSString *httpLinkScheme;
+
+/**
+ Scheme with which to open HTTPS links. e.g. if this is set to "googlechromes", any https:// links displayed in a room will be rewritten to use the googlechromes:// scheme.
+ Defaults to "https".
+ */
+@property (nonatomic) NSString *httpsLinkScheme;
+
+/**
+ Whether a bubble component should detect the first link in its event's body, storing it in the `link` property.
+ 
+ This boolean value is defined in shared settings object with the key: `enableBubbleComponentLinkDetection`.
+ Return NO if no value is defined.
+ */
+@property (nonatomic) BOOL enableBubbleComponentLinkDetection;
+
+/**
+ Any hosts that should be ignored when calling `mxk_firstURLDetected` on an `NSString` without passing in any parameters.
+ Customising this value modifies the behaviour of link detection in `MXKRoomBubbleComponent`.
+ 
+ This boolean value is defined in shared settings object with the key: `firstURLDetectionIgnoredHosts`.
+ The default value of this property only contains the matrix.to host.
+ */
+@property (nonatomic) NSArray<NSString *> *firstURLDetectionIgnoredHosts;
+
+/**
+ Indicate to hide un-decryptable events before joining the room. Default is `NO`.
+ */
+@property (nonatomic) BOOL hidePreJoinedUndecryptableEvents;
+
+/**
+ Indicate to hide un-decryptable events in the room. Default is `NO`.
+ */
+@property (nonatomic) BOOL hideUndecryptableEvents;
+
+/**
+ Indicates the strategy for sharing the outbound session key to other devices of the room
+ */
+@property (nonatomic) MXKKeyPreSharingStrategy outboundGroupSessionKeyPreSharingStrategy;
+
+#pragma mark - Room members
+
+/**
+ Sort room members by considering their presence.
+ Set NO to sort members in alphabetic order.
+ 
+ This boolean value is defined in shared settings object with the key: `sortRoomMembersUsingLastSeenTime`.
+ Return YES if no value is defined.
+ */
+@property (nonatomic) BOOL sortRoomMembersUsingLastSeenTime;
+
+/**
+ Show left members in room member list.
+ 
+ This boolean value is defined in shared settings object with the key: `showLeftMembersInRoomMemberList`.
+ Return NO if no value is defined.
+ */
+@property (nonatomic) BOOL showLeftMembersInRoomMemberList;
+
+/// Flag to allow sharing a message or not. Default value is YES.
+@property (nonatomic) BOOL messageDetailsAllowSharing;
+
+/// Flag to allow saving a message or not. Default value is YES.
+@property (nonatomic) BOOL messageDetailsAllowSaving;
+
+/// Flag to allow copying a media/file or not. Default value is YES.
+@property (nonatomic) BOOL messageDetailsAllowCopyingMedia;
+
+/// Flag to allow pasting a media/file or not. Default value is YES.
+@property (nonatomic) BOOL messageDetailsAllowPastingMedia;
+
+#pragma mark - Contacts
+
+/**
+ Return YES if the user allows the local contacts sync.
+ 
+ This boolean value is defined in shared settings object with the key: `syncLocalContacts`.
+ Return NO if no value is defined.
+ */
+@property (nonatomic) BOOL syncLocalContacts;
+
+/**
+ Return YES if the user has been already asked for local contacts sync permission.
+
+ This boolean value is defined in shared settings object with the key: `syncLocalContactsPermissionRequested`.
+ Return NO if no value is defined.
+ */
+@property (nonatomic) BOOL syncLocalContactsPermissionRequested;
+
+/**
+ Return YES if after the user has been asked for local contacts sync permission and choose to open
+ the system's Settings app to enable contacts access.
+
+ This boolean value is defined in shared settings object with the key: `syncLocalContactsPermissionOpenedSystemSettings`.
+ Return NO if no value is defined.
+ */
+@property (nonatomic) BOOL syncLocalContactsPermissionOpenedSystemSettings;
+
+/**
+ The current selected country code for the phonebook.
+ 
+ This value is defined in shared settings object with the key: `phonebookCountryCode`.
+ Return the SIM card information (if any) if no default value is defined.
+ */
+@property (nonatomic) NSString* phonebookCountryCode;
+
+
+#pragma mark - Matrix users
+
+/**
+ Color associated to online matrix users.
+ 
+ This color value is defined in shared settings object with the key: `presenceColorForOnlineUser`.
+ The default color is `[UIColor greenColor]`.
+ */
+@property (nonatomic) UIColor *presenceColorForOnlineUser;
+
+/**
+ Color associated to unavailable matrix users.
+ 
+ This color value is defined in shared settings object with the key: `presenceColorForUnavailableUser`.
+ The default color is `[UIColor yellowColor]`.
+ */
+@property (nonatomic) UIColor *presenceColorForUnavailableUser;
+
+/**
+ Color associated to offline matrix users.
+ 
+ This color value is defined in shared settings object with the key: `presenceColorForOfflineUser`.
+ The default color is `[UIColor redColor]`.
+ */
+@property (nonatomic) UIColor *presenceColorForOfflineUser;
+
+#pragma mark - Notifications
+
+/// Flag to allow PushKit pushers or not. Default value is `NO`.
+@property (nonatomic, assign) BOOL allowPushKitPushers;
+
+/**
+ A localization key used when registering the default notification payload.
+ This key will be translated and displayed for APNS notifications as the body
+ content, unless it is modified locally by a Notification Service Extension.
+ 
+ The default value for this setting is "MESSAGE". Changes are *not* persisted.
+ Updating the value after MXKAccount has called `enableAPNSPusher:success:failure:`
+ will have no effect.
+ */
+@property (nonatomic) NSString *notificationBodyLocalizationKey;
+
+#pragma mark - Calls
+
+/**
+ Return YES if the user enable CallKit support.
+ 
+ This boolean value is defined in shared settings object with the key: `enableCallKit`.
+ Return YES if no value is defined.
+ */
+@property (nonatomic, getter=isCallKitEnabled) BOOL enableCallKit;
+
+#pragma mark - Shared userDefaults
+
+/**
+ A userDefaults object that is shared within the application group. The application group identifier
+ is retrieved from MXSDKOptions sharedInstance (see `applicationGroupIdentifier` property).
+ The default group is "group.org.matrix".
+ */
+@property (nonatomic, readonly) NSUserDefaults *sharedUserDefaults;
+
+#pragma mark - Class methods
+
+/**
+ Return the shared application settings object. These settings are retrieved/stored in the shared defaults object (`[NSUserDefaults standardUserDefaults]`).
+ */
++ (MXKAppSettings *)standardAppSettings;
+
+/**
+ Return the folder to use for caching MatrixKit data.
+ */
++ (NSString*)cacheFolder;
+
+/**
+ Restore the default values.
+ */
+- (void)reset;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/MXKAppSettings.m b/Riot/Modules/MatrixKit/Models/MXKAppSettings.m
new file mode 100644
index 000000000..88aa527f7
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/MXKAppSettings.m
@@ -0,0 +1,871 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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 "MXKAppSettings.h"
+
+#import "MXKTools.h"
+
+
+// get ISO country name
+#import <CoreTelephony/CTCarrier.h>
+#import <CoreTelephony/CTTelephonyNetworkInfo.h>
+
+static MXKAppSettings *standardAppSettings = nil;
+
+static NSString *const kMXAppGroupID = @"group.org.matrix";
+
+@interface MXKAppSettings ()
+{
+    NSMutableArray <NSString*> *eventsFilterForMessages;
+    NSMutableArray <NSString*> *allEventTypesForMessages;
+    NSMutableArray <NSString*> *lastMessageEventTypesAllowList;
+}
+
+@property (nonatomic, readwrite) NSUserDefaults *sharedUserDefaults;
+@property (nonatomic) NSString *currentApplicationGroup;
+
+@end
+
+@implementation MXKAppSettings
+@synthesize syncWithLazyLoadOfRoomMembers;
+@synthesize showAllEventsInRoomHistory, showRedactionsInRoomHistory, showUnsupportedEventsInRoomHistory, httpLinkScheme, httpsLinkScheme;
+@synthesize enableBubbleComponentLinkDetection, firstURLDetectionIgnoredHosts, showLeftMembersInRoomMemberList, sortRoomMembersUsingLastSeenTime;
+@synthesize syncLocalContacts, syncLocalContactsPermissionRequested, syncLocalContactsPermissionOpenedSystemSettings, phonebookCountryCode;
+@synthesize presenceColorForOnlineUser, presenceColorForUnavailableUser, presenceColorForOfflineUser;
+@synthesize enableCallKit;
+@synthesize sharedUserDefaults;
+
++ (MXKAppSettings *)standardAppSettings
+{
+    @synchronized(self)
+    {
+        if(standardAppSettings == nil)
+        {
+            standardAppSettings = [[super allocWithZone:NULL] init];
+        }
+    }
+    return standardAppSettings;
+}
+
++ (NSString *)cacheFolder
+{
+    NSString *cacheFolder;
+
+    // Check for a potential application group id
+    NSString *applicationGroupIdentifier = [MXSDKOptions sharedInstance].applicationGroupIdentifier;
+    if (applicationGroupIdentifier)
+    {
+        NSURL *sharedContainerURL = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:applicationGroupIdentifier];
+        cacheFolder = [sharedContainerURL path];
+    }
+    else
+    {
+        NSArray *cacheDirList = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
+        cacheFolder  = [cacheDirList objectAtIndex:0];
+    }
+
+    // Use a dedicated cache folder for MatrixKit
+    cacheFolder = [cacheFolder stringByAppendingPathComponent:@"MatrixKit"];
+
+    // Make sure the folder exists so that it can be used
+    if (cacheFolder && ![[NSFileManager defaultManager] fileExistsAtPath:cacheFolder])
+    {
+        NSError *error;
+        [[NSFileManager defaultManager] createDirectoryAtPath:cacheFolder withIntermediateDirectories:YES attributes:nil error:&error];
+        if (error)
+        {
+            MXLogDebug(@"[MXKAppSettings] cacheFolder: Error: Cannot create MatrixKit folder at %@. Error: %@", cacheFolder, error);
+        }
+    }
+
+    return cacheFolder;
+}
+
+#pragma  mark -
+
+-(instancetype)init
+{
+    if (self = [super init])
+    {
+        syncWithLazyLoadOfRoomMembers = YES;
+
+        // Use presence to sort room members by default
+        if (![[NSUserDefaults standardUserDefaults] objectForKey:@"sortRoomMembersUsingLastSeenTime"])
+        {
+            [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"sortRoomMembersUsingLastSeenTime"];
+        }
+        _hidePreJoinedUndecryptableEvents = NO;
+        _hideUndecryptableEvents = NO;
+        sortRoomMembersUsingLastSeenTime = YES;
+        
+        presenceColorForOnlineUser = [UIColor greenColor];
+        presenceColorForUnavailableUser = [UIColor yellowColor];
+        presenceColorForOfflineUser = [UIColor redColor];
+
+        httpLinkScheme = @"http";
+        httpsLinkScheme = @"https";
+        enableBubbleComponentLinkDetection = NO;
+        firstURLDetectionIgnoredHosts = @[[NSURL URLWithString:kMXMatrixDotToUrl].host];
+        
+        _allowPushKitPushers = NO;
+        _notificationBodyLocalizationKey = @"MESSAGE";
+        enableCallKit = YES;
+        
+        eventsFilterForMessages = @[
+            kMXEventTypeStringRoomCreate,
+            kMXEventTypeStringRoomName,
+            kMXEventTypeStringRoomTopic,
+            kMXEventTypeStringRoomMember,
+            kMXEventTypeStringRoomEncrypted,
+            kMXEventTypeStringRoomEncryption,
+            kMXEventTypeStringRoomHistoryVisibility,
+            kMXEventTypeStringRoomMessage,
+            kMXEventTypeStringRoomThirdPartyInvite,
+            kMXEventTypeStringRoomGuestAccess,
+            kMXEventTypeStringRoomJoinRules,
+            kMXEventTypeStringCallInvite,
+            kMXEventTypeStringCallAnswer,
+            kMXEventTypeStringCallHangup,
+            kMXEventTypeStringCallReject,
+            kMXEventTypeStringCallNegotiate,
+            kMXEventTypeStringSticker,
+            kMXEventTypeStringKeyVerificationCancel,
+            kMXEventTypeStringKeyVerificationDone,
+            kMXEventTypeStringPollStart,
+            kMXEventTypeStringPollStartMSC3381
+        ].mutableCopy;
+        
+
+        // List all the event types, except kMXEventTypeStringPresence which are not related to a specific room.
+        allEventTypesForMessages = @[
+            kMXEventTypeStringRoomName,
+            kMXEventTypeStringRoomTopic,
+            kMXEventTypeStringRoomMember,
+            kMXEventTypeStringRoomCreate,
+            kMXEventTypeStringRoomEncrypted,
+            kMXEventTypeStringRoomEncryption,
+            kMXEventTypeStringRoomJoinRules,
+            kMXEventTypeStringRoomPowerLevels,
+            kMXEventTypeStringRoomAliases,
+            kMXEventTypeStringRoomHistoryVisibility,
+            kMXEventTypeStringRoomMessage,
+            kMXEventTypeStringRoomMessageFeedback,
+            kMXEventTypeStringRoomRedaction,
+            kMXEventTypeStringRoomThirdPartyInvite,
+            kMXEventTypeStringRoomRelatedGroups,
+            kMXEventTypeStringReaction,
+            kMXEventTypeStringCallInvite,
+            kMXEventTypeStringCallAnswer,
+            kMXEventTypeStringCallSelectAnswer,
+            kMXEventTypeStringCallHangup,
+            kMXEventTypeStringCallReject,
+            kMXEventTypeStringCallNegotiate,
+            kMXEventTypeStringSticker,
+            kMXEventTypeStringKeyVerificationCancel,
+            kMXEventTypeStringKeyVerificationDone,
+            kMXEventTypeStringPollStart,
+            kMXEventTypeStringPollStartMSC3381
+        ].mutableCopy;
+        
+        lastMessageEventTypesAllowList = @[
+            kMXEventTypeStringRoomCreate,       // Without any messages, calls or stickers an event is needed to provide a date.
+            kMXEventTypeStringRoomEncrypted,    // Show a UTD string rather than the previous message.
+            kMXEventTypeStringRoomMessage,
+            kMXEventTypeStringRoomMember,
+            kMXEventTypeStringCallInvite,
+            kMXEventTypeStringCallAnswer,
+            kMXEventTypeStringCallHangup,
+            kMXEventTypeStringSticker,
+            kMXEventTypeStringPollStart,
+            kMXEventTypeStringPollStartMSC3381
+        ].mutableCopy;
+        
+        _messageDetailsAllowSharing = YES;
+        _messageDetailsAllowSaving = YES;
+        _messageDetailsAllowCopyingMedia = YES;
+        _messageDetailsAllowPastingMedia = YES;
+        _outboundGroupSessionKeyPreSharingStrategy = MXKKeyPreSharingWhenTyping;
+    }
+    return self;
+}
+
+- (void)reset
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        // Flush shared user defaults
+        [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"syncWithLazyLoadOfRoomMembers2"];
+
+        [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"showAllEventsInRoomHistory"];
+        [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"showRedactionsInRoomHistory"];
+        [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"showUnsupportedEventsInRoomHistory"];
+        
+        [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"sortRoomMembersUsingLastSeenTime"];
+        [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"showLeftMembersInRoomMemberList"];
+        
+        [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"syncLocalContactsPermissionRequested"];
+        [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"syncLocalContacts"];
+        [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"phonebookCountryCode"];
+        
+        [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"presenceColorForOnlineUser"];
+        [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"presenceColorForUnavailableUser"];
+        [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"presenceColorForOfflineUser"];
+
+        [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"httpLinkScheme"];
+        [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"httpsLinkScheme"];
+        [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"enableBubbleComponentLinkDetection"];
+        [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"firstURLDetectionIgnoredHosts"];
+        
+        [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"enableCallKit"];
+	}
+    else
+    {
+        syncWithLazyLoadOfRoomMembers = YES;
+
+        showAllEventsInRoomHistory = NO;
+        showRedactionsInRoomHistory = NO;
+        showUnsupportedEventsInRoomHistory = NO;
+        
+        sortRoomMembersUsingLastSeenTime = YES;
+        showLeftMembersInRoomMemberList = NO;
+        
+        syncLocalContactsPermissionRequested = NO;
+        syncLocalContacts = NO;
+        phonebookCountryCode = nil;
+        
+        presenceColorForOnlineUser = [UIColor greenColor];
+        presenceColorForUnavailableUser = [UIColor yellowColor];
+        presenceColorForOfflineUser = [UIColor redColor];
+
+        httpLinkScheme = @"http";
+        httpsLinkScheme = @"https";
+        
+        enableCallKit = YES;
+    }
+}
+
+- (NSUserDefaults *)sharedUserDefaults
+{
+    if (sharedUserDefaults)
+    {
+        // Check whether the current group id did not change.
+        NSString *applicationGroup = [MXSDKOptions sharedInstance].applicationGroupIdentifier;
+        if (!applicationGroup.length)
+        {
+            applicationGroup = kMXAppGroupID;
+        }
+        
+        if (![_currentApplicationGroup isEqualToString:applicationGroup])
+        {
+            // Reset the existing shared object
+            sharedUserDefaults = nil;
+        }
+    }
+    
+    if (!sharedUserDefaults)
+    {
+        _currentApplicationGroup = [MXSDKOptions sharedInstance].applicationGroupIdentifier;
+        if (!_currentApplicationGroup.length)
+        {
+            _currentApplicationGroup = kMXAppGroupID;
+        }
+        
+        sharedUserDefaults = [[NSUserDefaults alloc] initWithSuiteName:_currentApplicationGroup];
+    }
+    
+    return sharedUserDefaults;
+}
+
+#pragma mark - Calls
+
+- (BOOL)syncWithLazyLoadOfRoomMembers
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        id storedValue = [[NSUserDefaults standardUserDefaults] objectForKey:@"syncWithLazyLoadOfRoomMembers2"];
+        if (storedValue)
+        {
+            return [(NSNumber *)storedValue boolValue];
+        }
+        else
+        {
+            // Enabled by default
+            return YES;
+        }
+    }
+    else
+    {
+        return syncWithLazyLoadOfRoomMembers;
+    }
+}
+
+- (void)setSyncWithLazyLoadOfRoomMembers:(BOOL)syncWithLazyLoadOfRoomMembers
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        [[NSUserDefaults standardUserDefaults] setBool:syncWithLazyLoadOfRoomMembers forKey:@"syncWithLazyLoadOfRoomMembers2"];
+    }
+    else
+    {
+        syncWithLazyLoadOfRoomMembers = syncWithLazyLoadOfRoomMembers;
+    }
+}
+
+#pragma mark - Room display
+
+- (BOOL)showAllEventsInRoomHistory
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        return [[NSUserDefaults standardUserDefaults] boolForKey:@"showAllEventsInRoomHistory"];
+    }
+    else
+    {
+        return showAllEventsInRoomHistory;
+    }
+}
+
+- (void)setShowAllEventsInRoomHistory:(BOOL)boolValue
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        [[NSUserDefaults standardUserDefaults] setBool:boolValue forKey:@"showAllEventsInRoomHistory"];
+    }
+    else
+    {
+        showAllEventsInRoomHistory = boolValue;
+    }
+}
+
+- (NSArray *)eventsFilterForMessages
+{
+    if (showAllEventsInRoomHistory)
+    {
+        // Consider all the event types
+        return self.allEventTypesForMessages;
+    }
+    else
+    {
+        // Display only a subset of events
+        return eventsFilterForMessages;
+    }
+}
+
+- (NSArray *)allEventTypesForMessages
+{
+    return allEventTypesForMessages;
+}
+
+- (NSArray<MXEventTypeString> *)lastMessageEventTypesAllowList
+{
+    return lastMessageEventTypesAllowList;
+}
+
+- (void)addSupportedEventTypes:(NSArray<NSString *> *)eventTypes
+{
+    [eventsFilterForMessages addObjectsFromArray:eventTypes];
+    [allEventTypesForMessages addObjectsFromArray:eventTypes];
+}
+
+- (void)removeSupportedEventTypes:(NSArray<NSString *> *)eventTypes
+{
+    [eventsFilterForMessages removeObjectsInArray:eventTypes];
+    [allEventTypesForMessages removeObjectsInArray:eventTypes];
+    [lastMessageEventTypesAllowList removeObjectsInArray:eventTypes];
+}
+
+- (BOOL)showRedactionsInRoomHistory
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        return [[NSUserDefaults standardUserDefaults] boolForKey:@"showRedactionsInRoomHistory"];
+    }
+    else
+    {
+        return showRedactionsInRoomHistory;
+    }
+}
+
+- (void)setShowRedactionsInRoomHistory:(BOOL)boolValue
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        [[NSUserDefaults standardUserDefaults] setBool:boolValue forKey:@"showRedactionsInRoomHistory"];
+    }
+    else
+    {
+        showRedactionsInRoomHistory = boolValue;
+    }
+}
+
+- (BOOL)showUnsupportedEventsInRoomHistory
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        return [[NSUserDefaults standardUserDefaults] boolForKey:@"showUnsupportedEventsInRoomHistory"];
+    }
+    else
+    {
+        return showUnsupportedEventsInRoomHistory;
+    }
+}
+
+- (void)setShowUnsupportedEventsInRoomHistory:(BOOL)boolValue
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        [[NSUserDefaults standardUserDefaults] setBool:boolValue forKey:@"showUnsupportedEventsInRoomHistory"];
+    }
+    else
+    {
+        showUnsupportedEventsInRoomHistory = boolValue;
+    }
+}
+
+- (NSString *)httpLinkScheme
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        NSString *ret = [[NSUserDefaults standardUserDefaults] stringForKey:@"httpLinkScheme"];
+        if (ret == nil) {
+            ret = @"http";
+        }
+        return ret;
+    }
+    else
+    {
+        return httpLinkScheme;
+    }
+}
+
+- (void)setHttpLinkScheme:(NSString *)stringValue
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        [[NSUserDefaults standardUserDefaults] setObject:stringValue forKey:@"httpLinkScheme"];
+    }
+    else
+    {
+        httpLinkScheme = stringValue;
+    }
+}
+
+- (NSString *)httpsLinkScheme
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        NSString *ret = [[NSUserDefaults standardUserDefaults] stringForKey:@"httpsLinkScheme"];
+        if (ret == nil) {
+            ret = @"https";
+        }
+        return ret;
+    }
+    else
+    {
+        return httpsLinkScheme;
+    }
+}
+
+- (void)setHttpsLinkScheme:(NSString *)stringValue
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        [[NSUserDefaults standardUserDefaults] setObject:stringValue forKey:@"httpsLinkScheme"];
+    }
+    else
+    {
+        httpsLinkScheme = stringValue;
+    }
+}
+
+- (BOOL)enableBubbleComponentLinkDetection
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        return [NSUserDefaults.standardUserDefaults boolForKey:@"enableBubbleComponentLinkDetection"];
+    }
+    else
+    {
+        return enableBubbleComponentLinkDetection;
+    }
+}
+
+- (void)setEnableBubbleComponentLinkDetection:(BOOL)storeLinksInBubbleComponents
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        [NSUserDefaults.standardUserDefaults setBool:storeLinksInBubbleComponents forKey:@"enableBubbleComponentLinkDetection"];
+    }
+    else
+    {
+        enableBubbleComponentLinkDetection = storeLinksInBubbleComponents;
+    }
+}
+
+- (NSArray<NSString *> *)firstURLDetectionIgnoredHosts
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        return [NSUserDefaults.standardUserDefaults objectForKey:@"firstURLDetectionIgnoredHosts"] ?: @[[NSURL URLWithString:kMXMatrixDotToUrl].host];
+    }
+    else
+    {
+        return firstURLDetectionIgnoredHosts;
+    }
+}
+
+- (void)setFirstURLDetectionIgnoredHosts:(NSArray<NSString *> *)ignoredHosts
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        if (ignoredHosts == nil)
+        {
+            ignoredHosts = @[];
+        }
+        
+        [NSUserDefaults.standardUserDefaults setObject:ignoredHosts forKey:@"firstURLDetectionIgnoredHosts"];
+    }
+    else
+    {
+        firstURLDetectionIgnoredHosts = ignoredHosts;
+    }
+}
+
+#pragma mark - Room members
+
+- (BOOL)sortRoomMembersUsingLastSeenTime
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        return [[NSUserDefaults standardUserDefaults] boolForKey:@"sortRoomMembersUsingLastSeenTime"];
+    }
+    else
+    {
+        return sortRoomMembersUsingLastSeenTime;
+    }
+}
+
+- (void)setSortRoomMembersUsingLastSeenTime:(BOOL)boolValue
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        [[NSUserDefaults standardUserDefaults] setBool:boolValue forKey:@"sortRoomMembersUsingLastSeenTime"];
+    }
+    else
+    {
+        sortRoomMembersUsingLastSeenTime = boolValue;
+    }
+}
+
+- (BOOL)showLeftMembersInRoomMemberList
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        return [[NSUserDefaults standardUserDefaults] boolForKey:@"showLeftMembersInRoomMemberList"];
+    }
+    else
+    {
+        return showLeftMembersInRoomMemberList;
+    }
+}
+
+- (void)setShowLeftMembersInRoomMemberList:(BOOL)boolValue
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        [[NSUserDefaults standardUserDefaults] setBool:boolValue forKey:@"showLeftMembersInRoomMemberList"];
+    }
+    else
+    {
+        showLeftMembersInRoomMemberList = boolValue;
+    }
+}
+
+#pragma mark - Contacts
+
+- (BOOL)syncLocalContacts
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        return [[NSUserDefaults standardUserDefaults] boolForKey:@"syncLocalContacts"];
+    }
+    else
+    {
+        return syncLocalContacts;
+    }
+}
+
+- (void)setSyncLocalContacts:(BOOL)boolValue
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        [[NSUserDefaults standardUserDefaults] setBool:boolValue forKey:@"syncLocalContacts"];
+    }
+    else
+    {
+        syncLocalContacts = boolValue;
+    }
+}
+
+- (BOOL)syncLocalContactsPermissionRequested
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        return [[NSUserDefaults standardUserDefaults] boolForKey:@"syncLocalContactsPermissionRequested"];
+    }
+    else
+    {
+        return syncLocalContactsPermissionRequested;
+    }
+}
+
+- (void)setSyncLocalContactsPermissionRequested:(BOOL)theSyncLocalContactsPermissionRequested
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        [[NSUserDefaults standardUserDefaults] setBool:theSyncLocalContactsPermissionRequested forKey:@"syncLocalContactsPermissionRequested"];
+    }
+    else
+    {
+        syncLocalContactsPermissionRequested = theSyncLocalContactsPermissionRequested;
+    }
+}
+
+- (BOOL)syncLocalContactsPermissionOpenedSystemSettings
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        return [[NSUserDefaults standardUserDefaults] boolForKey:@"syncLocalContactsPermissionOpenedSystemSettings"];
+    }
+    else
+    {
+        return syncLocalContactsPermissionOpenedSystemSettings;
+    }
+}
+
+- (void)setSyncLocalContactsPermissionOpenedSystemSettings:(BOOL)theSyncLocalContactsPermissionOpenedSystemSettings
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        [[NSUserDefaults standardUserDefaults] setBool:theSyncLocalContactsPermissionOpenedSystemSettings forKey:@"syncLocalContactsPermissionOpenedSystemSettings"];
+    }
+    else
+    {
+        syncLocalContactsPermissionOpenedSystemSettings = theSyncLocalContactsPermissionOpenedSystemSettings;
+    }
+}
+
+- (NSString*)phonebookCountryCode
+{
+    NSString* res = phonebookCountryCode;
+    
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        res = [[NSUserDefaults standardUserDefaults] stringForKey:@"phonebookCountryCode"];
+    }
+    
+    // does not exist : try to get the SIM card information
+    if (!res)
+    {
+        // get the current MCC
+        CTTelephonyNetworkInfo *netInfo = [[CTTelephonyNetworkInfo alloc] init];
+        CTCarrier *carrier = [netInfo subscriberCellularProvider];
+        
+        if (carrier)
+        {
+            res = [[carrier isoCountryCode] uppercaseString];
+            
+            if (res)
+            {
+                [self setPhonebookCountryCode:res];
+            }
+        }
+    }
+    
+    return res;
+}
+
+- (void)setPhonebookCountryCode:(NSString *)stringValue
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        [[NSUserDefaults standardUserDefaults] setObject:stringValue forKey:@"phonebookCountryCode"];
+    }
+    else
+    {
+        phonebookCountryCode = stringValue;
+    }
+}
+
+#pragma mark - Matrix users
+
+- (UIColor*)presenceColorForOnlineUser
+{
+    UIColor *color = presenceColorForOnlineUser;
+    
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        NSNumber *rgbValue = [[NSUserDefaults standardUserDefaults] objectForKey:@"presenceColorForOnlineUser"];
+        if (rgbValue)
+        {
+            color = [MXKTools colorWithRGBValue:[rgbValue unsignedIntegerValue]];
+        }
+        else
+        {
+            color = [UIColor greenColor];
+        }
+    }
+    
+    return color;
+}
+
+- (void)setPresenceColorForOnlineUser:(UIColor*)color
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        if (color)
+        {
+            NSUInteger rgbValue = [MXKTools rgbValueWithColor:color];
+            [[NSUserDefaults standardUserDefaults] setInteger:rgbValue forKey:@"presenceColorForOnlineUser"];
+        }
+        else
+        {
+            [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"presenceColorForOnlineUser"];
+        }
+    }
+    else
+    {
+        presenceColorForOnlineUser = color ? color : [UIColor greenColor];
+    }
+}
+
+- (UIColor*)presenceColorForUnavailableUser
+{
+    UIColor *color = presenceColorForUnavailableUser;
+    
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        NSNumber *rgbValue = [[NSUserDefaults standardUserDefaults] objectForKey:@"presenceColorForUnavailableUser"];
+        if (rgbValue)
+        {
+            color = [MXKTools colorWithRGBValue:[rgbValue unsignedIntegerValue]];
+        }
+        else
+        {
+            color = [UIColor yellowColor];
+        }
+    }
+    
+    return color;
+}
+
+- (void)setPresenceColorForUnavailableUser:(UIColor*)color
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        if (color)
+        {
+            NSUInteger rgbValue = [MXKTools rgbValueWithColor:color];
+            [[NSUserDefaults standardUserDefaults] setInteger:rgbValue forKey:@"presenceColorForUnavailableUser"];
+        }
+        else
+        {
+            [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"presenceColorForUnavailableUser"];
+        }
+    }
+    else
+    {
+        presenceColorForUnavailableUser = color ? color : [UIColor yellowColor];
+    }
+}
+
+- (UIColor*)presenceColorForOfflineUser
+{
+    UIColor *color = presenceColorForOfflineUser;
+    
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        NSNumber *rgbValue = [[NSUserDefaults standardUserDefaults] objectForKey:@"presenceColorForOfflineUser"];
+        if (rgbValue)
+        {
+            color = [MXKTools colorWithRGBValue:[rgbValue unsignedIntegerValue]];
+        }
+        else
+        {
+            color = [UIColor redColor];
+        }
+    }
+    
+    return color;
+}
+
+- (void)setPresenceColorForOfflineUser:(UIColor *)color
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        if (color)
+        {
+            NSUInteger rgbValue = [MXKTools rgbValueWithColor:color];
+            [[NSUserDefaults standardUserDefaults] setInteger:rgbValue forKey:@"presenceColorForOfflineUser"];
+        }
+        else
+        {
+            [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"presenceColorForOfflineUser"];
+        }
+    }
+    else
+    {
+        presenceColorForOfflineUser = color ? color : [UIColor redColor];
+    }
+}
+
+#pragma mark - Calls
+
+- (BOOL)isCallKitEnabled
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        id storedValue = [[NSUserDefaults standardUserDefaults] objectForKey:@"enableCallKit"];
+        if (storedValue)
+        {
+            return [(NSNumber *)storedValue boolValue];
+        }
+        else
+        {
+            return YES;
+        }
+    }
+    else
+    {
+        return enableCallKit;
+    }
+}
+
+- (void)setEnableCallKit:(BOOL)enable
+{
+    if (self == [MXKAppSettings standardAppSettings])
+    {
+        [[NSUserDefaults standardUserDefaults] setBool:enable forKey:@"enableCallKit"];
+    }
+    else
+    {
+        enableCallKit = enable;
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/MXKCellData.h b/Riot/Modules/MatrixKit/Models/MXKCellData.h
new file mode 100644
index 000000000..68fba4f95
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/MXKCellData.h
@@ -0,0 +1,27 @@
+/*
+ Copyright 2015 OpenMarket 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/Foundation.h>
+
+/**
+ `MXKCellData` objects contain data that is displayed by objects implementing `MXKCellRendering`.
+ 
+ The goal of `MXKCellData` is mainly to cache computed data in order to avoid to compute it each time
+ a cell is displayed.
+ */
+@interface MXKCellData : NSObject
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/MXKCellData.m b/Riot/Modules/MatrixKit/Models/MXKCellData.m
new file mode 100644
index 000000000..faea25676
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/MXKCellData.m
@@ -0,0 +1,21 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKCellData.h"
+
+@implementation MXKCellData
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/MXKDataSource.h b/Riot/Modules/MatrixKit/Models/MXKDataSource.h
new file mode 100644
index 000000000..a1332d6e2
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/MXKDataSource.h
@@ -0,0 +1,225 @@
+/*
+ Copyright 2015 OpenMarket 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/Foundation.h>
+
+#import <MatrixSDK/MatrixSDK.h>
+#import "MXKCellRendering.h"
+
+/**
+ List data source states.
+ */
+typedef enum : NSUInteger {
+    /**
+     Default value (used when all resources have been disposed).
+     The instance cannot be used anymore.
+     */
+    MXKDataSourceStateUnknown,
+    
+    /**
+     Initialisation is in progress.
+     */
+    MXKDataSourceStatePreparing,
+    
+    /**
+     Something wrong happens during initialisation.
+     */
+    MXKDataSourceStateFailed,
+    
+    /**
+     Data source is ready to be used.
+     */
+    MXKDataSourceStateReady
+    
+} MXKDataSourceState;
+
+@protocol MXKDataSourceDelegate;
+
+/**
+ `MXKDataSource` is the base class for data sources managed by MatrixKit.
+ 
+ Inherited 'MXKDataSource' instances are used to handle table or collection data.
+ They may conform to UITableViewDataSource or UICollectionViewDataSource protocol to be used as data source delegate
+ for a UITableView or a UICollectionView instance.
+ */
+@interface MXKDataSource : NSObject <MXKCellRenderingDelegate>
+{
+@protected
+    MXKDataSourceState state;
+}
+
+/**
+ The matrix session.
+ */
+@property (nonatomic, weak, readonly) MXSession *mxSession;
+
+/**
+ The data source state
+ */
+@property (nonatomic, readonly) MXKDataSourceState state;
+
+/**
+ The delegate notified when the data has been updated.
+ */
+@property (weak, nonatomic) id<MXKDataSourceDelegate> delegate;
+
+
+#pragma mark - Life cycle
+/**
+ Base constructor of data source.
+ 
+ Customization like class registrations must be done before loading data (see '[MXKDataSource registerCellDataClass: forCellIdentifier:]') .
+ That is why 3 steps should be considered during 'MXKDataSource' initialization:
+ 1- call [MXKDataSource initWithMatrixSession:] to initialize a new allocated object.
+ 2- customize classes and others...
+ 3- call [MXKDataSource finalizeInitialization] to finalize the initialization.
+
+ @param mxSession the Matrix session to get data from.
+ @return the newly created instance.
+ */
+- (instancetype)initWithMatrixSession:(MXSession*)mxSession;
+
+/**
+ Finalize the initialization by adding an observer on matrix session state change.
+ */
+- (void)finalizeInitialization;
+
+/**
+ Dispose all resources.
+ */
+- (void)destroy;
+
+/**
+ This method is called when the state of the attached Matrix session has changed.
+ */
+- (void)didMXSessionStateChange;
+
+
+#pragma mark - MXKCellData classes
+/**
+ Register the MXKCellData class that will be used to process and store data for cells
+ with the designated identifier.
+
+ @param cellDataClass a MXKCellData-inherited class that will handle data for cells.
+ @param identifier the identifier of targeted cell.
+ */
+- (void)registerCellDataClass:(Class)cellDataClass forCellIdentifier:(NSString *)identifier;
+
+/**
+ Return the MXKCellData class that handles data for cells with the designated identifier.
+
+ @param identifier the cell identifier.
+ @return the associated MXKCellData-inherited class.
+ */
+- (Class)cellDataClassForCellIdentifier:(NSString *)identifier;
+
+#pragma mark - Pending HTTP requests 
+
+/**
+ Cancel all registered requests.
+ */
+- (void)cancelAllRequests;
+
+@end
+
+@protocol MXKDataSourceDelegate <NSObject>
+
+/**
+ Ask the delegate which MXKCellRendering-compliant class must be used to render this cell data.
+ 
+ This method is called when MXKDataSource instance is used as the data source delegate of a table or a collection.
+ CAUTION: The table or the collection MUST have registered the returned class with the same identifier than the one returned by [cellReuseIdentifierForCellData:].
+ 
+ @param cellData the cell data to display.
+ @return a MXKCellRendering-compliant class which inherits UITableViewCell or UICollectionViewCell class (nil if the cellData is not supported).
+ */
+- (Class<MXKCellRendering>)cellViewClassForCellData:(MXKCellData*)cellData;
+
+/**
+ Ask the delegate which identifier must be used to dequeue reusable cell for this cell data.
+ 
+ This method is called when MXKDataSource instance is used as the data source delegate of a table or a collection.
+ CAUTION: The table or the collection MUST have registered the right class with the returned identifier (see [cellViewClassForCellData:]).
+ 
+ @param cellData the cell data to display.
+ @return the reuse identifier for the cell (nil if the cellData is not supported).
+ */
+- (NSString *)cellReuseIdentifierForCellData:(MXKCellData*)cellData;
+
+/**
+ Tells the delegate that some cell data/views have been changed.
+
+ @param dataSource the involved data source.
+ @param changes contains the index paths of objects that changed.
+ */
+- (void)dataSource:(MXKDataSource*)dataSource didCellChange:(id /* @TODO*/)changes;
+
+@optional
+
+/**
+ Tells the delegate that data source state changed
+ 
+ @param dataSource the involved data source.
+ @param state the new data source state.
+ */
+- (void)dataSource:(MXKDataSource*)dataSource didStateChange:(MXKDataSourceState)state;
+
+/**
+ Relevant only for data source which support multi-sessions.
+ Tells the delegate that a matrix session has been added.
+ 
+ @param dataSource the involved data source.
+ @param mxSession the new added session.
+ */
+- (void)dataSource:(MXKDataSource*)dataSource didAddMatrixSession:(MXSession*)mxSession;
+
+/**
+ Relevant only for data source which support multi-sessions.
+ Tells the delegate that a matrix session has been removed.
+ 
+ @param dataSource the involved data source.
+ @param mxSession the removed session.
+ */
+- (void)dataSource:(MXKDataSource*)dataSource didRemoveMatrixSession:(MXSession*)mxSession;
+
+/**
+ Tells the delegate when a user action is observed inside a cell.
+ 
+ @see `MXKCellRenderingDelegate` for more details.
+ 
+ @param dataSource the involved data source.
+ @param actionIdentifier an identifier indicating the action type (tap, long press...) and which part of the cell is concerned.
+ @param cell the cell in which action has been observed.
+ @param userInfo a dict containing additional information. It depends on actionIdentifier. May be nil.
+ */
+- (void)dataSource:(MXKDataSource*)dataSource didRecognizeAction:(NSString*)actionIdentifier inCell:(id<MXKCellRendering>)cell userInfo:(NSDictionary*)userInfo;
+
+/**
+ Asks the delegate if a user action (click on a link) can be done.
+
+ @see `MXKCellRenderingDelegate` for more details.
+
+ @param dataSource the involved data source.
+ @param actionIdentifier an identifier indicating the action type (link click) and which part of the cell is concerned.
+ @param cell the cell in which action has been observed.
+ @param userInfo a dict containing additional information. It depends on actionIdentifier. May be nil.
+ @param defaultValue the value to return by default if the action is not handled.
+ @return a boolean value which depends on actionIdentifier.
+ */
+- (BOOL)dataSource:(MXKDataSource*)dataSource shouldDoAction:(NSString *)actionIdentifier inCell:(id<MXKCellRendering>)cell userInfo:(NSDictionary *)userInfo defaultValue:(BOOL)defaultValue;
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Models/MXKDataSource.m b/Riot/Modules/MatrixKit/Models/MXKDataSource.m
new file mode 100644
index 000000000..49a787ae0
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/MXKDataSource.m
@@ -0,0 +1,148 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKDataSource.h"
+
+#import "MXKCellData.h"
+#import "MXKCellRendering.h"
+
+@interface MXKDataSource ()
+{
+    /**
+     The mapping between cell identifiers and MXKCellData classes.
+     */
+    NSMutableDictionary *cellDataMap;
+}
+@end
+
+@implementation MXKDataSource
+@synthesize state;
+
+#pragma mark - Life cycle
+
+- (instancetype)init
+{
+    self = [super init];
+    if (self)
+    {
+        state = MXKDataSourceStateUnknown;
+        cellDataMap = [NSMutableDictionary dictionary];
+    }
+    return self;
+}
+
+- (instancetype)initWithMatrixSession:(MXSession *)matrixSession
+{
+    self = [self init];
+    if (self)
+    {
+        _mxSession = matrixSession;
+        state = MXKDataSourceStatePreparing;
+    }
+    return self;
+}
+
+- (void)finalizeInitialization
+{
+    // Add an observer on matrix session state change (prevent multiple registrations).
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionStateDidChangeNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didMXSessionStateChange:) name:kMXSessionStateDidChangeNotification object:nil];
+    
+    // Call the registered callback to finalize the initialisation step.
+    [self didMXSessionStateChange];
+}
+
+- (void)destroy
+{
+    state = MXKDataSourceStateUnknown;
+    if (_delegate && [_delegate respondsToSelector:@selector(dataSource:didStateChange:)])
+    {
+        [_delegate dataSource:self didStateChange:state];
+    }
+    
+    _mxSession = nil;
+    _delegate = nil;
+    
+    [self cancelAllRequests];
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    cellDataMap = nil;
+}
+
+#pragma mark - MXSessionStateDidChangeNotification
+- (void)didMXSessionStateChange:(NSNotification *)notif
+{
+    // Check this is our Matrix session that has changed
+    if (notif.object == _mxSession)
+    {
+        [self didMXSessionStateChange];
+    }
+}
+
+- (void)didMXSessionStateChange
+{
+    // The inherited class is highly invited to override this method for its business logic
+}
+
+
+#pragma mark - MXKCellData classes
+- (void)registerCellDataClass:(Class)cellDataClass forCellIdentifier:(NSString *)identifier
+{
+    // Sanity check: accept only MXKCellData classes or sub-classes
+    NSParameterAssert([cellDataClass isSubclassOfClass:MXKCellData.class]);
+    
+    cellDataMap[identifier] = cellDataClass;
+}
+
+- (Class)cellDataClassForCellIdentifier:(NSString *)identifier
+{
+    return cellDataMap[identifier];
+}
+
+#pragma mark - MXKCellRenderingDelegate
+- (void)cell:(id<MXKCellRendering>)cell didRecognizeAction:(NSString*)actionIdentifier userInfo:(NSDictionary *)userInfo
+{
+    // The data source simply relays the information to its delegate
+    if (_delegate && [_delegate respondsToSelector:@selector(dataSource:didRecognizeAction:inCell:userInfo:)])
+    {
+        [_delegate dataSource:self didRecognizeAction:actionIdentifier inCell:cell userInfo:userInfo];
+    }
+}
+
+- (BOOL)cell:(id<MXKCellRendering>)cell shouldDoAction:(NSString *)actionIdentifier userInfo:(NSDictionary *)userInfo defaultValue:(BOOL)defaultValue
+{
+    BOOL shouldDoAction = defaultValue;
+
+    // The data source simply relays the question to its delegate
+    if (_delegate && [_delegate respondsToSelector:@selector(dataSource:shouldDoAction:inCell:userInfo:defaultValue:)])
+    {
+        shouldDoAction = [_delegate dataSource:self shouldDoAction:actionIdentifier inCell:cell userInfo:userInfo defaultValue:defaultValue];
+    }
+
+    return shouldDoAction;
+}
+
+
+#pragma mark - Pending HTTP requests
+/**
+ Cancel all registered requests.
+ */
+- (void)cancelAllRequests
+{
+    // The inherited class is invited to override this method
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/MXKPasteboardManager.swift b/Riot/Modules/MatrixKit/Models/MXKPasteboardManager.swift
new file mode 100644
index 000000000..814ae10b4
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/MXKPasteboardManager.swift
@@ -0,0 +1,33 @@
+/*
+ Copyright 2020 The Matrix.org Foundation C.I.C
+
+ 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
+
+@objcMembers
+public class MXKPasteboardManager: NSObject {
+    
+    public static let shared = MXKPasteboardManager(withPasteboard: .general)
+    
+    private init(withPasteboard pasteboard: UIPasteboard) {
+        self.pasteboard = pasteboard
+        super.init()
+    }
+    
+    /// Pasteboard to use on copy operations. Defaults to `UIPasteboard.generalPasteboard`.
+    public var pasteboard: UIPasteboard
+    
+}
diff --git a/Riot/Modules/MatrixKit/Models/PublicRoomList/DirectoryServerList/MXKDirectoryServerCellData.h b/Riot/Modules/MatrixKit/Models/PublicRoomList/DirectoryServerList/MXKDirectoryServerCellData.h
new file mode 100644
index 000000000..e98dd16e1
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/PublicRoomList/DirectoryServerList/MXKDirectoryServerCellData.h
@@ -0,0 +1,27 @@
+/*
+ Copyright 2017 Vector Creations 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/Foundation.h>
+#import <MatrixSDK/MatrixSDK.h>
+
+#import "MXKDirectoryServerCellDataStoring.h"
+
+/**
+ `MXKRoomMemberCellData` modelised the data for a `MXKRoomMemberTableViewCell` cell.
+ */
+@interface MXKDirectoryServerCellData : MXKCellData <MXKDirectoryServerCellDataStoring>
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/PublicRoomList/DirectoryServerList/MXKDirectoryServerCellData.m b/Riot/Modules/MatrixKit/Models/PublicRoomList/DirectoryServerList/MXKDirectoryServerCellData.m
new file mode 100644
index 000000000..e1f80368b
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/PublicRoomList/DirectoryServerList/MXKDirectoryServerCellData.m
@@ -0,0 +1,66 @@
+/*
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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 "MXKDirectoryServerCellData.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKSwiftHeader.h"
+
+@implementation MXKDirectoryServerCellData;
+@synthesize desc, icon;
+@synthesize homeserver, includeAllNetworks;
+@synthesize thirdPartyProtocolInstance, thirdPartyProtocol;
+@synthesize mediaManager;
+
+- (id)initWithHomeserver:(NSString *)theHomeserver includeAllNetworks:(BOOL)theIncludeAllNetworks
+{
+    self = [super init];
+    if (self)
+    {
+        homeserver = theHomeserver;
+        includeAllNetworks = theIncludeAllNetworks;
+
+        if (theIncludeAllNetworks)
+        {
+            desc = homeserver;
+            icon = nil;
+        }
+        else
+        {
+            // Use the Matrix name and logo when looking for Matrix rooms only
+            desc = [MatrixKitL10n matrix];
+            icon = [NSBundle mxk_imageFromMXKAssetsBundleWithName:@"network_matrix"];
+        }
+    }
+    return self;
+}
+
+- (id)initWithProtocolInstance:(MXThirdPartyProtocolInstance *)instance protocol:(MXThirdPartyProtocol *)protocol
+{
+    self = [super init];
+    if (self)
+    {
+        thirdPartyProtocolInstance = instance;
+        thirdPartyProtocol = protocol;
+        desc = thirdPartyProtocolInstance.desc;
+        icon = nil;
+    }
+    return self;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/PublicRoomList/DirectoryServerList/MXKDirectoryServerCellDataStoring.h b/Riot/Modules/MatrixKit/Models/PublicRoomList/DirectoryServerList/MXKDirectoryServerCellDataStoring.h
new file mode 100644
index 000000000..01bba13ea
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/PublicRoomList/DirectoryServerList/MXKDirectoryServerCellDataStoring.h
@@ -0,0 +1,75 @@
+/*
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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/Foundation.h>
+#import <MatrixSDK/MatrixSDK.h>
+
+#import "MXKCellData.h"
+
+/**
+ `MXKDirectoryServerCellDataStoring` defines a protocol a class must conform in order to
+ store directory cell data managed by `MXKDirectoryServersDataSource`.
+ */
+@protocol MXKDirectoryServerCellDataStoring <NSObject>
+
+#pragma mark - Data displayed by a server cell
+
+/**
+ The name of the directory server.
+ */
+@property (nonatomic) NSString *desc;
+
+/**
+ The icon of the server.
+ */
+@property (nonatomic) UIImage *icon;
+
+/**
+ The optional media manager used to download the icon of the server.
+ */
+@property (nonatomic) MXMediaManager *mediaManager;
+
+/**
+ In case the cell data represents a homeserver, its description.
+ */
+@property (nonatomic, readonly) NSString *homeserver;
+@property (nonatomic, readonly) BOOL includeAllNetworks;
+
+/**
+ In case the cell data represents a third-party protocol instance, its description.
+ */
+@property (nonatomic, readonly) MXThirdPartyProtocolInstance *thirdPartyProtocolInstance;
+@property (nonatomic, readonly) MXThirdPartyProtocol *thirdPartyProtocol;
+
+/**
+ Define a MXKDirectoryServerCellData that will store a homeserver.
+
+ @param homeserver the homeserver name (ex: "matrix.org).
+ @param includeAllNetworks YES to list all public rooms on the homeserver whatever their protocol.
+                           NO to list only matrix rooms.
+ */
+- (id)initWithHomeserver:(NSString*)homeserver includeAllNetworks:(BOOL)includeAllNetworks;
+
+/**
+ Define a MXKDirectoryServerCellData that will store a third-party protocol instance.
+ 
+ @param instance the instance of the protocol.
+ @param protocol the protocol description.
+ */
+- (id)initWithProtocolInstance:(MXThirdPartyProtocolInstance*)instance protocol:(MXThirdPartyProtocol*)protocol;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/PublicRoomList/DirectoryServerList/MXKDirectoryServersDataSource.h b/Riot/Modules/MatrixKit/Models/PublicRoomList/DirectoryServerList/MXKDirectoryServersDataSource.h
new file mode 100644
index 000000000..c7079343c
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/PublicRoomList/DirectoryServerList/MXKDirectoryServersDataSource.h
@@ -0,0 +1,82 @@
+/*
+ Copyright 2017 Vector Creations 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/Foundation.h>
+
+#import "MXKDataSource.h"
+#import "MXKDirectoryServerCellDataStoring.h"
+
+/**
+ Identifier to use for cells that display a server in the servers list.
+ */
+FOUNDATION_EXPORT NSString *const kMXKDirectorServerCellIdentifier;
+
+/**
+ `DirectoryServersDataSource` is a base class to list servers and third-party protocols
+ instances available on the user homeserver.
+ 
+ We can then list public rooms from the directory of these servers. This is done 
+ with `PublicRoomsDirectoryDataSource`.
+
+ As a `MXKDataSource` child class, the class has a state where values have the following meanings:
+     - MXKDataSourceStatePreparing: the data source is not yet ready or it is fetching data from the homeserver.
+     - MXKDataSourceStateReady: the data source data is ready.
+     - MXKDataSourceStateFailed: the data source failed to fetch data.
+ 
+ There is no way in Matrix to be notified when there is a change.
+ */
+@interface MXKDirectoryServersDataSource : MXKDataSource <UITableViewDataSource>
+{
+@protected
+    /**
+     The data for the cells served by `DirectoryServersDataSource`.
+     */
+    NSMutableArray<id<MXKDirectoryServerCellDataStoring>> *cellDataArray;
+
+    /**
+     The filtered servers: sub-list of `cellDataArray` defined by `searchWithPatterns:`.
+     */
+    NSMutableArray<id<MXKDirectoryServerCellDataStoring>> *filteredCellDataArray;
+}
+
+/**
+ Additional room directory servers the datasource will list.
+ */
+@property (nonatomic) NSArray<NSString*> *roomDirectoryServers;
+
+/**
+ Fetch the data source data.
+ */
+- (void)loadData;
+
+/**
+ Filter the current recents list according to the provided patterns.
+ When patterns are not empty, the search result is stored in `filteredCellDataArray`,
+ this array provides then data for the cells served by `MXKDirectoryServersDataSource`.
+
+ @param patternsList the list of patterns to match with. Set nil to cancel search.
+ */
+- (void)searchWithPatterns:(NSArray<NSString*> *)patternsList;
+
+/**
+ Get the data for the cell at the given index path.
+
+ @param indexPath the index of the cell.
+ @return the cell data.
+ */
+- (id<MXKDirectoryServerCellDataStoring>)cellDataAtIndexPath:(NSIndexPath*)indexPath;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/PublicRoomList/DirectoryServerList/MXKDirectoryServersDataSource.m b/Riot/Modules/MatrixKit/Models/PublicRoomList/DirectoryServerList/MXKDirectoryServersDataSource.m
new file mode 100644
index 000000000..9520a16fb
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/PublicRoomList/DirectoryServerList/MXKDirectoryServersDataSource.m
@@ -0,0 +1,230 @@
+/*
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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 "MXKDirectoryServersDataSource.h"
+
+#import "MXKDirectoryServerCellData.h"
+
+NSString *const kMXKDirectorServerCellIdentifier = @"kMXKDirectorServerCellIdentifier";
+
+#pragma mark - DirectoryServersDataSource
+
+@interface MXKDirectoryServersDataSource ()
+{
+    // The pending request to load third-party protocols.
+    MXHTTPOperation *request;
+}
+
+@end
+
+@implementation MXKDirectoryServersDataSource
+
+- (instancetype)init
+{
+    self = [super init];
+    if (self)
+    {
+        cellDataArray = [NSMutableArray array];
+        filteredCellDataArray = nil;
+
+        // Set default data w classes
+        [self registerCellDataClass:MXKDirectoryServerCellData.class forCellIdentifier:kMXKDirectorServerCellIdentifier];
+    }
+    return self;
+}
+
+- (void)destroy
+{
+    cellDataArray = nil;
+    filteredCellDataArray = nil;
+}
+
+- (void)cancelAllRequests
+{
+    [super cancelAllRequests];
+
+    [request cancel];
+    request = nil;
+}
+
+- (void)loadData
+{
+    // Cancel the previous request
+    if (request)
+    {
+        [request cancel];
+    }
+
+    // Reset all vars
+    [cellDataArray removeAllObjects];
+
+    [self setState:MXKDataSourceStatePreparing];
+
+    Class class = [self cellDataClassForCellIdentifier:kMXKDirectorServerCellIdentifier];
+
+    // Add user's HS
+    NSString *userHomeserver = self.mxSession.matrixRestClient.credentials.homeServerName;
+    id<MXKDirectoryServerCellDataStoring> cellData = [[class alloc] initWithHomeserver:userHomeserver includeAllNetworks:YES];
+    [cellDataArray addObject:cellData];
+
+    // Add user's HS but for Matrix public rooms only
+    cellData = [[class alloc] initWithHomeserver:userHomeserver includeAllNetworks:NO];
+    [cellDataArray addObject:cellData];
+
+    // Add custom directory servers
+    for (NSString *homeserver in _roomDirectoryServers)
+    {
+        if (![homeserver isEqualToString:userHomeserver])
+        {
+            cellData = [[class alloc] initWithHomeserver:homeserver includeAllNetworks:YES];
+            [cellDataArray addObject:cellData];
+        }
+    }
+
+    MXWeakify(self);
+    request = [self.mxSession.matrixRestClient thirdpartyProtocols:^(MXThirdpartyProtocolsResponse *thirdpartyProtocolsResponse) {
+
+        MXStrongifyAndReturnIfNil(self);
+        for (NSString *protocolName in thirdpartyProtocolsResponse.protocols)
+        {
+            MXThirdPartyProtocol *protocol = thirdpartyProtocolsResponse.protocols[protocolName];
+            
+            for (MXThirdPartyProtocolInstance *instance in protocol.instances)
+            {
+                id<MXKDirectoryServerCellDataStoring> cellData = [[class alloc] initWithProtocolInstance:instance protocol:protocol];
+                cellData.mediaManager = self.mxSession.mediaManager;
+                [self->cellDataArray addObject:cellData];
+            }
+        }
+        
+        [self setState:MXKDataSourceStateReady];
+
+    } failure:^(NSError *error) {
+
+        MXStrongifyAndReturnIfNil(self);
+        if (!self->request || self->request.isCancelled)
+        {
+            // Do not take into account error coming from a cancellation
+            return;
+        }
+        
+        self->request = nil;
+        
+        MXLogDebug(@"[MXKDirectoryServersDataSource] Failed to fecth third-party protocols. The HS may be too old to support third party networks");
+        
+        [self setState:MXKDataSourceStateReady];
+    }];
+}
+
+- (void)searchWithPatterns:(NSArray*)patternsList
+{
+    if (patternsList.count)
+    {
+        if (filteredCellDataArray)
+        {
+            [filteredCellDataArray removeAllObjects];
+        }
+        else
+        {
+            filteredCellDataArray = [NSMutableArray arrayWithCapacity:cellDataArray.count];
+        }
+
+        for (id<MXKDirectoryServerCellDataStoring> cellData in cellDataArray)
+        {
+            for (NSString* pattern in patternsList)
+            {
+                if ([cellData.desc rangeOfString:pattern options:NSCaseInsensitiveSearch].location != NSNotFound)
+                {
+                    [filteredCellDataArray addObject:cellData];
+                    break;
+                }
+            }
+        }
+    }
+    else
+    {
+        filteredCellDataArray = nil;
+    }
+
+    if (self.delegate)
+    {
+        [self.delegate dataSource:self didCellChange:nil];
+    }
+}
+
+/**
+ Get the data for the cell at the given index path.
+
+ @param indexPath the index of the cell.
+ @return the cell data.
+ */
+- (id<MXKDirectoryServerCellDataStoring>)cellDataAtIndexPath:(NSIndexPath*)indexPath;
+{
+    if (filteredCellDataArray)
+    {
+        return filteredCellDataArray[indexPath.row];
+    }
+    return cellDataArray[indexPath.row];
+}
+
+
+#pragma mark - Private methods
+
+// Update the MXKDataSource state and the delegate
+- (void)setState:(MXKDataSourceState)newState
+{
+    state = newState;
+    if (self.delegate && [self.delegate respondsToSelector:@selector(dataSource:didStateChange:)])
+    {
+        [self.delegate dataSource:self didStateChange:state];
+    }
+}
+
+#pragma mark - UITableViewDataSource
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    if (filteredCellDataArray)
+    {
+        return filteredCellDataArray.count;
+    }
+    return cellDataArray.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    id<MXKDirectoryServerCellDataStoring> cellData = [self cellDataAtIndexPath:indexPath];
+
+    if (cellData && self.delegate)
+    {
+        NSString *identifier = [self.delegate cellReuseIdentifierForCellData:cellData];
+        if (identifier)
+        {
+            UITableViewCell<MXKCellRendering> *cell  = [tableView dequeueReusableCellWithIdentifier:identifier forIndexPath:indexPath];
+
+            // Make the cell display the data
+            [cell render:cellData];
+
+            return cell;
+        }
+    }
+
+    // Return a fake cell to prevent app from crashing.
+    return [[UITableViewCell alloc] init];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKAttachment.h b/Riot/Modules/MatrixKit/Models/Room/MXKAttachment.h
new file mode 100644
index 000000000..07e878161
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKAttachment.h
@@ -0,0 +1,212 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2018 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/Foundation.h>
+#import <MatrixSDK/MatrixSDK.h>
+
+@class MXKUTI;
+
+NS_ASSUME_NONNULL_BEGIN
+
+extern NSString * const kMXKAttachmentErrorDomain;
+
+/**
+ List attachment types
+ */
+typedef enum : NSUInteger {
+    MXKAttachmentTypeUndefined,
+    MXKAttachmentTypeImage,
+    MXKAttachmentTypeAudio,
+    MXKAttachmentTypeVoiceMessage,
+    MXKAttachmentTypeVideo,
+    MXKAttachmentTypeLocation,
+    MXKAttachmentTypeFile,
+    MXKAttachmentTypeSticker
+    
+} MXKAttachmentType;
+
+/**
+ `MXKAttachment` represents a room attachment.
+ */
+@interface MXKAttachment : NSObject
+
+/**
+ The media manager instance used to download the attachment data.
+ */
+@property (nonatomic, readonly) MXMediaManager *mediaManager;
+
+/**
+ The attachment type.
+ */
+@property (nonatomic, readonly) MXKAttachmentType type;
+
+/**
+ The attachment information retrieved from the event content during the initialisation.
+ */
+@property (nonatomic, readonly, nullable) NSString *eventId;
+@property (nonatomic, readonly, nullable) NSString *eventRoomId;
+@property (nonatomic, readonly) MXEventSentState eventSentState;
+@property (nonatomic, readonly, nullable) NSString *contentURL;
+@property (nonatomic, readonly, nullable) NSDictionary *contentInfo;
+
+/**
+ The URL of a 'standard size' thumbnail.
+ */
+@property (nonatomic, readonly, nullable) NSString *mxcThumbnailURI;
+@property (nonatomic, readonly, nullable) NSString *thumbnailMimeType;
+
+/**
+ The download identifier of the attachment content (related to contentURL).
+ */
+@property (nonatomic, readonly, nullable) NSString *downloadId;
+/**
+ The download identifier of the attachment thumbnail.
+ */
+@property (nonatomic, readonly, nullable) NSString *thumbnailDownloadId;
+
+/**
+ The attached video thumbnail information.
+ */
+@property (nonatomic, readonly, nullable) NSDictionary *thumbnailInfo;
+
+/**
+ The original file name retrieved from the event body (if any).
+ */
+@property (nonatomic, readonly, nullable) NSString *originalFileName;
+
+/**
+ The thumbnail orientation (relevant in case of image).
+ */
+@property (nonatomic, readonly) UIImageOrientation thumbnailOrientation;
+
+/**
+ The cache file path of the attachment.
+ */
+@property (nonatomic, readonly, nullable) NSString *cacheFilePath;
+
+/**
+ The cache file path of the attachment thumbnail (may be nil).
+ */
+@property (nonatomic, readonly, nullable) NSString *thumbnailCachePath;
+
+/**
+ The preview of the attachment (nil by default).
+ */
+@property (nonatomic, nullable) UIImage *previewImage;
+
+/**
+ True if the attachment is encrypted
+ The encryption status of the thumbnail is not covered by this
+ property: it is possible for the thumbnail to be encrypted
+ whether this peoperty is true or false.
+ */
+@property (nonatomic, readonly) BOOL isEncrypted;
+
+/**
+ The UTI of this attachment.
+ */
+@property (nonatomic, readonly, nullable) MXKUTI *uti;
+
+/**
+ Create a `MXKAttachment` instance for the passed event.
+ The created instance copies the current data of the event (content, event id, sent state...).
+ It will ignore any future changes of these data.
+ 
+ @param event a matrix event.
+ @param mediaManager the media manager instance used to download the attachment data.
+ @return `MXKAttachment` instance.
+ */
+- (nullable instancetype)initWithEvent:(MXEvent*)event andMediaManager:(MXMediaManager*)mediaManager;
+
+- (void)destroy;
+
+/**
+ Gets the thumbnail for this attachment if it is in the memory or disk cache,
+ otherwise return nil
+ */
+- (nullable UIImage *)getCachedThumbnail;
+
+/**
+ For image attachments, gets a UIImage for the full-res image
+ */
+- (void)getImage:(void (^_Nullable)(MXKAttachment *_Nullable, UIImage *_Nullable))onSuccess failure:(void (^_Nullable)(MXKAttachment *_Nullable, NSError * _Nullable error))onFailure;
+
+/**
+ Decrypt the attachment data into memory and provide it as an NSData
+ */
+- (void)getAttachmentData:(void (^_Nullable)(NSData *_Nullable))onSuccess failure:(void (^_Nullable)(NSError * _Nullable error))onFailure;
+
+/**
+ Decrypts the attachment to a newly created temporary file.
+ If the isEncrypted property is YES, this method (or getImage) should be used to
+ obtain the full decrypted attachment. The behaviour of this method is undefined
+ if isEncrypted is NO.
+ It is the caller's responsibility to delete the temporary file once it is no longer
+ needed.
+ */
+- (void)decryptToTempFile:(void (^_Nullable)(NSString *_Nullable))onSuccess failure:(void (^_Nullable)(NSError * _Nullable error))onFailure;
+
+
+/** Deletes all previously created temporary files */
++ (void)clearCache;
+
+/**
+ Gets the thumbnails for this attachment, downloading it or loading it from disk cache
+ if necessary
+ */
+- (void)getThumbnail:(void (^_Nullable)(MXKAttachment *_Nullable, UIImage *_Nullable))onSuccess failure:(void (^_Nullable)(MXKAttachment *_Nullable, NSError * _Nullable error))onFailure;
+
+/**
+ Download the attachment data if it is not already cached.
+ 
+ @param onAttachmentReady block called when attachment is available at 'cacheFilePath'.
+ @param onFailure the block called on failure.
+ */
+- (void)prepare:(void (^_Nullable)(void))onAttachmentReady failure:(void (^_Nullable)(NSError * _Nullable error))onFailure;
+
+/**
+ Save the attachment in user's photo library. This operation is available only for images and video.
+ 
+ @param onSuccess the block called on success.
+ @param onFailure the block called on failure.
+ */
+- (void)save:(void (^_Nullable)(void))onSuccess failure:(void (^_Nullable)(NSError * _Nullable error))onFailure;
+
+/**
+ Copy the attachment data in general pasteboard.
+ 
+ @param onSuccess the block called on success.
+ @param onFailure the block called on failure.
+ */
+- (void)copy:(void (^_Nullable)(void))onSuccess failure:(void (^_Nullable)(NSError * _Nullable error))onFailure;
+
+/**
+ Prepare the attachment data to share it. The original name of the attachment (if any) is used
+ to name the prepared file.
+ 
+ The developer must call 'onShareEnd' when share operation is ended in order to release potential
+ resources allocated here.
+ 
+ @param onReadyToShare the block called when attachment is ready to share at the provided file URL.
+ @param onFailure the block called on failure.
+ */
+- (void)prepareShare:(void (^_Nullable)(NSURL * _Nullable fileURL))onReadyToShare failure:(void (^_Nullable)(NSError * _Nullable error))onFailure;
+- (void)onShareEnded;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKAttachment.m b/Riot/Modules/MatrixKit/Models/Room/MXKAttachment.m
new file mode 100644
index 000000000..e15fd70b3
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKAttachment.m
@@ -0,0 +1,718 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2018 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 "MXKAttachment.h"
+#import "MXKSwiftHeader.h"
+
+@import MatrixSDK;
+@import MobileCoreServices;
+
+#import "MXKTools.h"
+
+// The size of thumbnail we request from the server
+// Note that this is smaller than the ones we upload: when sending, one size
+// must fit all, including the web which will want relatively high res thumbnails.
+// We, however, are a mobile client and so would prefer smaller thumbnails, which
+// we can have if they're being generated by the media repo.
+static const int kThumbnailWidth = 320;
+static const int kThumbnailHeight = 240;
+
+NSString *const kMXKAttachmentErrorDomain = @"kMXKAttachmentErrorDomain";
+NSString *const kMXKAttachmentFileNameBase = @"attatchment";
+
+@interface MXKAttachment ()
+{
+    /**
+     The information on the encrypted content.
+     */
+    MXEncryptedContentFile *contentFile;
+    
+    /**
+     The information on the encrypted thumbnail.
+     */
+    MXEncryptedContentFile *thumbnailFile;
+    
+    /**
+     Observe Attachment download
+     */
+    id onAttachmentDownloadObs;
+    
+    /**
+     The local path used to store the attachment with its original name
+     */
+    NSString *documentCopyPath;
+    
+    /**
+     The attachment mimetype.
+     */
+    NSString *mimetype;
+}
+
+@end
+
+@implementation MXKAttachment
+
+- (instancetype)initWithEvent:(MXEvent*)event andMediaManager:(MXMediaManager*)mediaManager
+{
+    self = [super init];
+    if (self)
+    {
+        _mediaManager = mediaManager;
+        
+        // Make a copy as the data can be read at anytime later
+        _eventId = event.eventId;
+        _eventRoomId = event.roomId;
+        _eventSentState = event.sentState;
+        
+        NSDictionary *eventContent = event.content;
+        
+        // Set default thumbnail orientation
+        _thumbnailOrientation = UIImageOrientationUp;
+        
+        if (event.eventType == MXEventTypeSticker)
+        {
+            _type = MXKAttachmentTypeSticker;
+            MXJSONModelSetDictionary(_thumbnailInfo, eventContent[@"info"][@"thumbnail_info"]);
+        }
+        else
+        {
+            // Note: mxEvent.eventType is supposed to be MXEventTypeRoomMessage here.
+            NSString *msgtype = eventContent[@"msgtype"];
+            if ([msgtype isEqualToString:kMXMessageTypeImage])
+            {
+                _type = MXKAttachmentTypeImage;
+            }
+            else if (event.isVoiceMessage)
+            {
+                _type = MXKAttachmentTypeVoiceMessage;
+            }
+            else if ([msgtype isEqualToString:kMXMessageTypeAudio])
+            {
+                _type = MXKAttachmentTypeAudio;
+            }
+            else if ([msgtype isEqualToString:kMXMessageTypeVideo])
+            {
+                _type = MXKAttachmentTypeVideo;
+                MXJSONModelSetDictionary(_thumbnailInfo, eventContent[@"info"][@"thumbnail_info"]);
+            }
+            else if ([msgtype isEqualToString:kMXMessageTypeLocation])
+            {
+                // Not supported yet
+                // _type = MXKAttachmentTypeLocation;
+                return nil;
+            }
+            else if ([msgtype isEqualToString:kMXMessageTypeFile])
+            {
+                _type = MXKAttachmentTypeFile;
+            }
+            else
+            {
+                return nil;
+            }
+        }
+        
+        MXJSONModelSetString(_originalFileName, eventContent[@"body"]);
+        MXJSONModelSetDictionary(_contentInfo, eventContent[@"info"]);
+        MXJSONModelSetMXJSONModel(contentFile, MXEncryptedContentFile, eventContent[@"file"]);
+        
+        // Retrieve the content url by taking into account the potential encryption.
+        if (contentFile)
+        {
+            _isEncrypted = YES;
+            _contentURL = contentFile.url;
+            
+            MXJSONModelSetMXJSONModel(thumbnailFile, MXEncryptedContentFile, _contentInfo[@"thumbnail_file"]);
+        }
+        else
+        {
+            _isEncrypted = NO;
+            MXJSONModelSetString(_contentURL, eventContent[@"url"]);
+        }
+        
+        mimetype = nil;
+        if (_contentInfo)
+        {
+            MXJSONModelSetString(mimetype, _contentInfo[@"mimetype"]);
+        }
+        
+        _cacheFilePath = [MXMediaManager cachePathForMatrixContentURI:_contentURL andType:mimetype inFolder:_eventRoomId];
+        _downloadId = [MXMediaManager downloadIdForMatrixContentURI:_contentURL inFolder:_eventRoomId];
+        
+        // Deduce the thumbnail information from the retrieved data.
+        _mxcThumbnailURI = [self getThumbnailURI];
+        _thumbnailMimeType = [self getThumbnailMimeType];
+        _thumbnailCachePath = [self getThumbnailCachePath];
+        _thumbnailDownloadId = [self getThumbnailDownloadId];
+    }
+    return self;
+}
+
+- (void)dealloc
+{
+    [self destroy];
+}
+
+- (void)destroy
+{
+    if (onAttachmentDownloadObs)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:onAttachmentDownloadObs];
+        onAttachmentDownloadObs = nil;
+    }
+    
+    // Remove the temporary file created to prepare attachment sharing
+    if (documentCopyPath)
+    {
+        [[NSFileManager defaultManager] removeItemAtPath:documentCopyPath error:nil];
+        documentCopyPath = nil;
+    }
+    
+    _previewImage = nil;
+}
+
+- (NSString *)getThumbnailURI
+{
+    if (thumbnailFile)
+    {
+        // there's an encrypted thumbnail: we return the mxc url
+        return thumbnailFile.url;
+    }
+    
+    // Look for a clear thumbnail url
+    return _contentInfo[@"thumbnail_url"];
+}
+
+- (NSString *)getThumbnailMimeType
+{
+    return _thumbnailInfo[@"mimetype"];
+}
+
+- (NSString*)getThumbnailCachePath
+{
+    if (_mxcThumbnailURI)
+    {
+        return [MXMediaManager cachePathForMatrixContentURI:_mxcThumbnailURI andType:_thumbnailMimeType inFolder:_eventRoomId];
+    }
+    // In case of an unencrypted image, consider the thumbnail URI deduced from the content URL, except if
+    // the attachment is currently uploading.
+    // Note: When the uploading is in progress, the upload id is stored in the content url (nasty trick).
+    else if (_type == MXKAttachmentTypeImage && !_isEncrypted && _contentURL && ![_contentURL hasPrefix:kMXMediaUploadIdPrefix])
+    {
+        return [MXMediaManager thumbnailCachePathForMatrixContentURI:_contentURL
+                                                             andType:@"image/jpeg"
+                                                            inFolder:_eventRoomId
+                                                       toFitViewSize:CGSizeMake(kThumbnailWidth, kThumbnailHeight)
+                                                          withMethod:MXThumbnailingMethodScale];
+        
+        
+    }
+    return nil;
+}
+
+- (NSString *)getThumbnailDownloadId
+{
+    if (_mxcThumbnailURI)
+    {
+        return [MXMediaManager downloadIdForMatrixContentURI:_mxcThumbnailURI inFolder:_eventRoomId];
+    }
+    // In case of an unencrypted image, consider the thumbnail URI deduced from the content URL, except if
+    // the attachment is currently uploading.
+    // Note: When the uploading is in progress, the upload id is stored in the content url (nasty trick).
+    else if (_type == MXKAttachmentTypeImage && !_isEncrypted && _contentURL && ![_contentURL hasPrefix:kMXMediaUploadIdPrefix])
+    {
+        return [MXMediaManager thumbnailDownloadIdForMatrixContentURI:_contentURL
+                                                             inFolder:_eventRoomId
+                                                        toFitViewSize:CGSizeMake(kThumbnailWidth, kThumbnailHeight)
+                                                           withMethod:MXThumbnailingMethodScale];
+    }
+    return nil;
+}
+
+- (UIImage *)getCachedThumbnail
+{
+    if (_thumbnailCachePath)
+    {
+        UIImage *thumb = [MXMediaManager getFromMemoryCacheWithFilePath:_thumbnailCachePath];
+        if (thumb) return thumb;
+        
+        if ([[NSFileManager defaultManager] fileExistsAtPath:_thumbnailCachePath])
+        {
+            return [MXMediaManager loadThroughCacheWithFilePath:_thumbnailCachePath];
+        }
+    }
+    return nil;
+}
+
+- (void)getThumbnail:(void (^)(MXKAttachment *, UIImage *))onSuccess failure:(void (^)(MXKAttachment *, NSError *error))onFailure
+{
+    // Check whether a thumbnail is defined.
+    if (!_thumbnailCachePath)
+    {
+        // there is no thumbnail: if we're an image, return the full size image. Otherwise, nothing we can do.
+        if (_type == MXKAttachmentTypeImage)
+        {
+            [self getImage:onSuccess failure:onFailure];
+        }
+        else if (onFailure)
+        {
+            onFailure(self, nil);
+        }
+        
+        return;
+    }
+    
+    // Check the current memory cache.
+    UIImage *thumb = [MXMediaManager getFromMemoryCacheWithFilePath:_thumbnailCachePath];
+    if (thumb)
+    {
+        onSuccess(self, thumb);
+        return;
+    }
+    
+    if (thumbnailFile)
+    {
+        MXWeakify(self);
+        
+        void (^decryptAndCache)(void) = ^{
+            MXStrongifyAndReturnIfNil(self);
+            NSInputStream *instream = [[NSInputStream alloc] initWithFileAtPath:self.thumbnailCachePath];
+            NSOutputStream *outstream = [[NSOutputStream alloc] initToMemory];
+            [MXEncryptedAttachments decryptAttachment:self->thumbnailFile inputStream:instream outputStream:outstream success:^{
+                UIImage *img = [UIImage imageWithData:[outstream propertyForKey:NSStreamDataWrittenToMemoryStreamKey]];
+                // Save this image to in-memory cache.
+                [MXMediaManager cacheImage:img withCachePath:self.thumbnailCachePath];
+                onSuccess(self, img);
+            } failure:^(NSError *err) {
+                if (err) {
+                    MXLogDebug(@"Error decrypting attachment! %@", err.userInfo);
+                    if (onFailure) onFailure(self, err);
+                    return;
+                }
+            }];
+        };
+        
+        if ([[NSFileManager defaultManager] fileExistsAtPath:_thumbnailCachePath])
+        {
+            decryptAndCache();
+        }
+        else
+        {
+            [_mediaManager downloadEncryptedMediaFromMatrixContentFile:thumbnailFile
+                                                              mimeType:_thumbnailMimeType
+                                                              inFolder:_eventRoomId
+                                                               success:^(NSString *outputFilePath) {
+                                                                   decryptAndCache();
+                                                               }
+                                                               failure:^(NSError *error) {
+                                                                   if (onFailure) onFailure(self, error);
+                                                               }];
+        }
+    }
+    else
+    {
+        if ([[NSFileManager defaultManager] fileExistsAtPath:_thumbnailCachePath])
+        {
+            onSuccess(self, [MXMediaManager loadThroughCacheWithFilePath:_thumbnailCachePath]);
+        }
+        else if (_mxcThumbnailURI)
+        {
+            [_mediaManager downloadMediaFromMatrixContentURI:_mxcThumbnailURI
+                                                    withType:_thumbnailMimeType
+                                                    inFolder:_eventRoomId
+                                                     success:^(NSString *outputFilePath) {
+                                                         // Here outputFilePath = thumbnailCachePath
+                                                         onSuccess(self, [MXMediaManager loadThroughCacheWithFilePath:outputFilePath]);
+                                                     }
+                                                     failure:^(NSError *error) {
+                                                         if (onFailure) onFailure(self, error);
+                                                     }];
+        }
+        else
+        {
+            // Here _thumbnailCachePath is defined, so a thumbnail is available.
+            // Because _mxcThumbnailURI is null, this means we have to consider the content uri (see getThumbnailCachePath).
+            [_mediaManager downloadThumbnailFromMatrixContentURI:_contentURL
+                                                         withType:@"image/jpeg"
+                                                        inFolder:_eventRoomId
+                                                   toFitViewSize:CGSizeMake(kThumbnailWidth, kThumbnailHeight)
+                                                      withMethod:MXThumbnailingMethodScale
+                                                         success:^(NSString *outputFilePath) {
+                                                             // Here outputFilePath = thumbnailCachePath
+                                                             onSuccess(self, [MXMediaManager loadThroughCacheWithFilePath:outputFilePath]);
+                                                         }
+                                                         failure:^(NSError *error) {
+                                                             if (onFailure) onFailure(self, error);
+                                                         }];
+        }
+    }
+}
+
+- (void)getImage:(void (^)(MXKAttachment *, UIImage *))onSuccess failure:(void (^)(MXKAttachment *, NSError *error))onFailure
+{
+    [self getAttachmentData:^(NSData *data) {
+        
+        UIImage *img = [UIImage imageWithData:data];
+        
+        if (img)
+        {
+            if (onSuccess)
+            {
+                onSuccess(self, img);
+            }
+        }
+        else
+        {
+            if (onFailure)
+            {
+                NSError *error = [NSError errorWithDomain:kMXKAttachmentErrorDomain code:0 userInfo:@{@"err": @"error_get_image_from_data"}];
+                onFailure(self, error);
+            }
+        }
+        
+    } failure:^(NSError *error) {
+        
+        if (onFailure) onFailure(self, error);
+        
+    }];
+}
+
+- (void)getAttachmentData:(void (^)(NSData *))onSuccess failure:(void (^)(NSError *error))onFailure
+{
+    MXWeakify(self);
+    [self prepare:^{
+        MXStrongifyAndReturnIfNil(self);
+        if (self.isEncrypted)
+        {
+            // decrypt the encrypted file
+            NSInputStream *instream = [[NSInputStream alloc] initWithFileAtPath:self.cacheFilePath];
+            NSOutputStream *outstream = [[NSOutputStream alloc] initToMemory];
+            [MXEncryptedAttachments decryptAttachment:self->contentFile inputStream:instream outputStream:outstream success:^{
+                onSuccess([outstream propertyForKey:NSStreamDataWrittenToMemoryStreamKey]);
+            } failure:^(NSError *err) {
+                if (err)
+                {
+                    MXLogDebug(@"Error decrypting attachment! %@", err.userInfo);
+                    return;
+                }
+            }];
+        }
+        else
+        {
+            onSuccess([NSData dataWithContentsOfFile:self.cacheFilePath]);
+        }
+    } failure:onFailure];
+}
+
+- (void)decryptToTempFile:(void (^)(NSString *))onSuccess failure:(void (^)(NSError *error))onFailure
+{
+    MXWeakify(self);
+    [self prepare:^{
+        MXStrongifyAndReturnIfNil(self);
+        NSString *tempPath = [self getTempFile];
+        if (!tempPath)
+        {
+            if (onFailure) onFailure([NSError errorWithDomain:kMXKAttachmentErrorDomain code:0 userInfo:@{@"err": @"error_creating_temp_file"}]);
+            return;
+        }
+        
+        NSInputStream *inStream = [NSInputStream inputStreamWithFileAtPath:self.cacheFilePath];
+        NSOutputStream *outStream = [NSOutputStream outputStreamToFileAtPath:tempPath append:NO];
+        
+        [MXEncryptedAttachments decryptAttachment:self->contentFile inputStream:inStream outputStream:outStream success:^{
+            onSuccess(tempPath);
+        } failure:^(NSError *err) {
+            if (err) {
+                if (onFailure) onFailure(err);
+                return;
+            }
+        }];
+    } failure:onFailure];
+}
+
+- (NSString *)getTempFile
+{
+    // create a file with an appropriate extension because iOS detects based on file extension
+    // all over the place
+    NSString *ext = [MXTools fileExtensionFromContentType:mimetype];
+    NSString *filenameTemplate = [NSString stringWithFormat:@"%@.XXXXXX%@", kMXKAttachmentFileNameBase, ext];
+    NSString *template = [NSTemporaryDirectory() stringByAppendingPathComponent:filenameTemplate];
+    
+    const char *templateCstr = [template fileSystemRepresentation];
+    char *tempPathCstr = (char *)malloc(strlen(templateCstr) + 1);
+    strcpy(tempPathCstr, templateCstr);
+    
+    int fd = mkstemps(tempPathCstr, (int)ext.length);
+    if (!fd)
+    {
+        return nil;
+    }
+    close(fd);
+    
+    NSString *tempPath = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:tempPathCstr
+                                                                                     length:strlen(tempPathCstr)];
+    free(tempPathCstr);
+    return tempPath;
+}
+
++ (void)clearCache
+{
+    NSString *temporaryDirectoryPath = NSTemporaryDirectory();
+    NSDirectoryEnumerator<NSString *> *enumerator = [NSFileManager.defaultManager enumeratorAtPath:temporaryDirectoryPath];
+    
+    NSString *filePath;
+    while (filePath = [enumerator nextObject]) {
+        if(![filePath containsString:kMXKAttachmentFileNameBase]) {
+            continue;
+        }
+        
+        NSError *error;
+        BOOL result = [NSFileManager.defaultManager removeItemAtPath:[temporaryDirectoryPath stringByAppendingPathComponent:filePath] error:&error];
+        if (!result && error) {
+            MXLogError(@"[MXKAttachment] Failed deleting temporary file with error: %@", error);
+        }
+    }
+}
+
+- (void)prepare:(void (^)(void))onAttachmentReady failure:(void (^)(NSError *error))onFailure
+{
+    if ([[NSFileManager defaultManager] fileExistsAtPath:_cacheFilePath])
+    {
+        // Done
+        if (onAttachmentReady)
+        {
+            onAttachmentReady();
+        }
+    }
+    else
+    {
+        // Trigger download if it is not already in progress
+        MXMediaLoader* loader = [MXMediaManager existingDownloaderWithIdentifier:_downloadId];
+        if (!loader)
+        {
+            if (_isEncrypted)
+            {
+                loader = [_mediaManager downloadEncryptedMediaFromMatrixContentFile:contentFile
+                                                                           mimeType:mimetype
+                                                                           inFolder:_eventRoomId];
+            }
+            else
+            {
+                loader = [_mediaManager downloadMediaFromMatrixContentURI:_contentURL
+                                                                 withType:mimetype
+                                                                 inFolder:_eventRoomId];
+            }
+        }
+        
+        if (loader)
+        {
+            MXWeakify(self);
+            
+            // Add observers
+            onAttachmentDownloadObs = [[NSNotificationCenter defaultCenter] addObserverForName:kMXMediaLoaderStateDidChangeNotification object:loader queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+                
+                MXStrongifyAndReturnIfNil(self);
+                MXMediaLoader *loader = (MXMediaLoader*)notif.object;
+                switch (loader.state) {
+                    case MXMediaLoaderStateDownloadCompleted:
+                        [[NSNotificationCenter defaultCenter] removeObserver:self->onAttachmentDownloadObs];
+                        self->onAttachmentDownloadObs = nil;
+                        if (onAttachmentReady)
+                        {
+                            onAttachmentReady ();
+                        }
+                        break;
+                    case MXMediaLoaderStateDownloadFailed:
+                    case MXMediaLoaderStateCancelled:
+                        [[NSNotificationCenter defaultCenter] removeObserver:self->onAttachmentDownloadObs];
+                        self->onAttachmentDownloadObs = nil;
+                        if (onFailure)
+                        {
+                            onFailure (loader.error);
+                        }
+                        break;
+                    default:
+                        break;
+                }
+            }];
+        }
+        else if (onFailure)
+        {
+            onFailure (nil);
+        }
+    }
+}
+
+- (void)save:(void (^)(void))onSuccess failure:(void (^)(NSError *error))onFailure
+{
+    if (_type == MXKAttachmentTypeImage || _type == MXKAttachmentTypeVideo)
+    {
+        MXWeakify(self);
+        if (self.isEncrypted) {
+            [self decryptToTempFile:^(NSString *path) {
+                MXStrongifyAndReturnIfNil(self);
+                NSURL* url = [NSURL fileURLWithPath:path];
+                
+                [MXMediaManager saveMediaToPhotosLibrary:url
+                                                  isImage:(self.type == MXKAttachmentTypeImage)
+                                                  success:^(NSURL *assetURL){
+                                                      if (onSuccess)
+                                                      {
+                                                          [[NSFileManager defaultManager] removeItemAtPath:path error:nil];
+                                                          onSuccess();
+                                                      }
+                                                  }
+                                                  failure:onFailure];
+            } failure:onFailure];
+        }
+        else
+        {
+            [self prepare:^{
+                MXStrongifyAndReturnIfNil(self);
+                NSURL* url = [NSURL fileURLWithPath:self.cacheFilePath];
+                
+                [MXMediaManager saveMediaToPhotosLibrary:url
+                                                  isImage:(self.type == MXKAttachmentTypeImage)
+                                                  success:^(NSURL *assetURL){
+                                                      if (onSuccess)
+                                                      {
+                                                          onSuccess();
+                                                      }
+                                                  }
+                                                  failure:onFailure];
+            } failure:onFailure];
+        }
+    }
+    else
+    {
+        // Not supported
+        if (onFailure)
+        {
+            onFailure(nil);
+        }
+    }
+}
+
+- (void)copy:(void (^)(void))onSuccess failure:(void (^)(NSError *error))onFailure
+{
+    MXWeakify(self);
+    [self prepare:^{
+        MXStrongifyAndReturnIfNil(self);
+        if (self.type == MXKAttachmentTypeImage)
+        {
+            [self getImage:^(MXKAttachment *attachment, UIImage *img) {
+                MXKPasteboardManager.shared.pasteboard.image = img;
+                if (onSuccess)
+                {
+                    onSuccess();
+                }
+            } failure:^(MXKAttachment *attachment, NSError *error) {
+                if (onFailure) onFailure(error);
+            }];
+        }
+        else
+        {
+            MXWeakify(self);
+            [self getAttachmentData:^(NSData *data) {
+                if (data)
+                {
+                    MXStrongifyAndReturnIfNil(self);
+                    NSString* UTI = (__bridge_transfer NSString *) UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, (__bridge CFStringRef)[self.cacheFilePath pathExtension] , NULL);
+                    
+                    if (UTI)
+                    {
+                        [MXKPasteboardManager.shared.pasteboard setData:data forPasteboardType:UTI];
+                        if (onSuccess)
+                        {
+                            onSuccess();
+                        }
+                    }
+                }
+            } failure:onFailure];
+        }
+        
+        // Unexpected error
+        if (onFailure)
+        {
+            onFailure(nil);
+        }
+        
+    } failure:onFailure];
+}
+
+- (MXKUTI *)uti
+{
+    return [[MXKUTI alloc] initWithMimeType:mimetype];
+}
+
+- (void)prepareShare:(void (^)(NSURL *fileURL))onReadyToShare failure:(void (^)(NSError *error))onFailure
+{
+    MXWeakify(self);
+    void (^haveFile)(NSString *) = ^(NSString *path) {
+        // Prepare the file URL by considering the original file name (if any)
+        NSURL *fileUrl;
+        MXStrongifyAndReturnIfNil(self);
+        // Check whether the original name retrieved from event body has extension
+        if (self.originalFileName && [self.originalFileName pathExtension].length)
+        {
+            // Copy the cached file to restore its original name
+            // Note:  We used previously symbolic link (instead of copy) but UIDocumentInteractionController failed to open Office documents (.docx, .pptx...).
+            self->documentCopyPath = [[MXMediaManager getCachePath] stringByAppendingPathComponent:self.originalFileName];
+            
+            [[NSFileManager defaultManager] removeItemAtPath:self->documentCopyPath error:nil];
+            if ([[NSFileManager defaultManager] copyItemAtPath:path toPath:self->documentCopyPath error:nil])
+            {
+                fileUrl = [NSURL fileURLWithPath:self->documentCopyPath];
+                [[NSFileManager defaultManager] removeItemAtPath:path error:nil];
+            }
+        }
+        
+        if (!fileUrl)
+        {
+            // Use the cached file by default
+            fileUrl = [NSURL fileURLWithPath:path];
+            self->documentCopyPath = path;
+        }
+        
+        onReadyToShare (fileUrl);
+    };
+    
+    if (self.isEncrypted)
+    {
+        [self decryptToTempFile:^(NSString *path) {
+            haveFile(path);
+        } failure:onFailure];
+    }
+    else
+    {
+        // First download data if it is not already done
+        [self prepare:^{
+            haveFile(self.cacheFilePath);
+        } failure:onFailure];
+    }
+}
+
+- (void)onShareEnded
+{
+    // Remove the temporary file created to prepare attachment sharing
+    if (documentCopyPath)
+    {
+        [[NSFileManager defaultManager] removeItemAtPath:documentCopyPath error:nil];
+        documentCopyPath = nil;
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKQueuedEvent.h b/Riot/Modules/MatrixKit/Models/Room/MXKQueuedEvent.h
new file mode 100644
index 000000000..6639eb15c
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKQueuedEvent.h
@@ -0,0 +1,52 @@
+/*
+ Copyright 2015 OpenMarket 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/Foundation.h>
+#import <MatrixSDK/MatrixSDK.h>
+
+/**
+ `MXKQueuedEvent` represents an event waiting to be processed.
+ */
+@interface MXKQueuedEvent : NSObject
+
+/**
+ The event.
+ */
+@property (nonatomic, readonly) MXEvent *event;
+
+/**
+ The state of the room when the event has been received.
+ */
+@property (nonatomic, readonly) MXRoomState *state;
+
+/**
+ The direction of reception. Is it a live event or an event from the history?
+ */
+@property (nonatomic, readonly) MXTimelineDirection direction;
+
+/**
+ Tells whether the event is queued during server sync or not.
+ */
+@property (nonatomic) BOOL serverSyncEvent;
+
+/**
+ Date of the `event`. If event has a valid `originServerTs`, it's converted to a date object, otherwise current date.
+ */
+@property (nonatomic, readonly) NSDate *eventDate;
+
+- (instancetype)initWithEvent:(MXEvent*)event andRoomState:(MXRoomState*)state direction:(MXTimelineDirection)direction;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKQueuedEvent.m b/Riot/Modules/MatrixKit/Models/Room/MXKQueuedEvent.m
new file mode 100644
index 000000000..d06d475bf
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKQueuedEvent.m
@@ -0,0 +1,43 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKQueuedEvent.h"
+
+@implementation MXKQueuedEvent
+
+- (instancetype)initWithEvent:(MXEvent *)event andRoomState:(MXRoomState *)state direction:(MXTimelineDirection)direction
+{
+    self = [super init];
+    if (self)
+    {
+        _event = event;
+        _state = state;
+        _direction = direction;
+    }
+    return self;
+}
+
+- (NSDate *)eventDate
+{
+    if (_event.originServerTs != kMXUndefinedTimestamp)
+    {
+        return [NSDate dateWithTimeIntervalSince1970:(double)_event.originServerTs/1000];
+    }
+    
+    return [NSDate date];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellData.h b/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellData.h
new file mode 100644
index 000000000..691f092e6
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellData.h
@@ -0,0 +1,166 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2019 The Matrix.org Foundation C.I.C
+
+ 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 "MXKCellData.h"
+#import "MXKRoomBubbleCellDataStoring.h"
+
+#import "MXKRoomBubbleComponent.h"
+
+#define MXKROOMBUBBLECELLDATA_TEXTVIEW_DEFAULT_VERTICAL_INSET 8
+
+/**
+ `MXKRoomBubbleCellData` instances compose data for `MXKRoomBubbleTableViewCell` cells.
+ 
+ This is the basic implementation which considers only one component (event) by bubble.
+ `MXKRoomBubbleCellDataWithAppendingMode` extends this class to merge consecutive messages from the same sender into one bubble.
+ */
+@interface MXKRoomBubbleCellData : MXKCellData <MXKRoomBubbleCellDataStoring>
+{
+@protected
+    /**
+     The data source owner of this instance.
+     */
+    __weak MXKRoomDataSource *roomDataSource;
+    
+    /**
+     Array of bubble components. Each bubble is supposed to have at least one component.
+     */
+    NSMutableArray *bubbleComponents;
+    
+    /**
+     The body of the message with sets of attributes, or kind of content description in case of attachment (e.g. "image attachment")
+     */
+    NSAttributedString *attributedTextMessage;
+    
+    /**
+     The optional text pattern to be highlighted in the body of the message.
+     */
+    NSString *highlightedPattern;
+    UIColor  *highlightedPatternColor;
+    UIFont   *highlightedPatternFont;
+}
+
+/**
+ The matrix session.
+ */
+@property (nonatomic, readonly) MXSession *mxSession;
+
+/**
+ Returns bubble components list (`MXKRoomBubbleComponent` instances).
+ */
+@property (nonatomic, readonly) NSArray<MXKRoomBubbleComponent*> *bubbleComponents;
+
+/**
+ Read receipts per event.
+ */
+@property(nonatomic) NSMutableDictionary<NSString* /* eventId */,
+                                         NSArray<MXReceiptData *> *> *readReceipts;
+
+/**
+ Aggregated reactions per event.
+ */
+@property(nonatomic) NSMutableDictionary<NSString* /* eventId */, MXAggregatedReactions*> *reactions;
+
+/**
+ Whether there is a link to preview in the components.
+ */
+@property (nonatomic, readonly) BOOL hasLink;
+
+/**
+ Event formatter
+ */
+@property (nonatomic) MXKEventFormatter *eventFormatter;
+
+/**
+ The max width of the text view used to display the text message (relevant only for text message or attached file).
+ */
+@property (nonatomic) CGFloat maxTextViewWidth;
+
+/**
+ The bubble content size depends on its type:
+ - Text: returns suitable content size of a text view to display the whole text message (respecting maxTextViewWidth).
+ - Attached image or video: returns suitable content size for an image view in order to display
+ attachment thumbnail or icon.
+ - Attached file: returns suitable content size of a text view to display the file name (no icon is used presently).
+ */
+@property (nonatomic) CGSize contentSize;
+
+/**
+ Set of flags indicating fixes that need to be applied at display time.
+ */
+@property (nonatomic, readonly) MXKRoomBubbleComponentDisplayFix displayFix;
+
+/**
+ Attachment upload
+ */
+@property (nonatomic) NSString *uploadId;
+@property (nonatomic) CGFloat uploadProgress;
+
+/**
+ Indicate a bubble component needs to show encryption badge.
+ */
+@property (nonatomic, readonly) BOOL containsBubbleComponentWithEncryptionBadge;
+
+/**
+ Indicate that the current text message layout is no longer valid and should be recomputed
+ before presentation in a bubble cell. This could be due to the content changing, or the
+ available space for the cell has been updated.
+ 
+ This will clear the current `attributedTextMessage` allowing it to be
+ rebuilt on demand when requested.
+ */
+- (void)invalidateTextLayout;
+
+/**
+ Check and refresh the position of each component.
+ */
+- (void)prepareBubbleComponentsPosition;
+
+/**
+ Return the raw height of the provided text by removing any vertical margin/inset.
+ 
+ @param attributedText the attributed text to measure
+ @return the computed height
+ */
+- (CGFloat)rawTextHeight:(NSAttributedString*)attributedText;
+
+/**
+ Return the content size of a text view initialized with the provided attributed text.
+ CAUTION: This method runs only on main thread.
+ 
+ @param attributedText the attributed text to measure
+ @param removeVerticalInset tell whether the computation should remove vertical inset in text container.
+ @return the computed size content
+ */
+- (CGSize)textContentSize:(NSAttributedString*)attributedText removeVerticalInset:(BOOL)removeVerticalInset;
+
+/**
+ Get bubble component index from event id.
+
+ @param eventId Event id of bubble component.
+ @return Index of bubble component associated to event id or NSNotFound
+ */
+- (NSInteger)bubbleComponentIndexForEventId:(NSString *)eventId;
+
+/**
+ Get the first visible component.
+ 
+ @return First visible component or nil.
+ */
+- (MXKRoomBubbleComponent*)getFirstBubbleComponentWithDisplay;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellData.m b/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellData.m
new file mode 100644
index 000000000..b20bcb668
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellData.m
@@ -0,0 +1,923 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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.
+ */
+
+#define MXKROOMBUBBLECELLDATA_MAX_ATTACHMENTVIEW_WIDTH 192
+
+#define MXKROOMBUBBLECELLDATA_DEFAULT_MAX_TEXTVIEW_WIDTH 200
+
+@import MatrixSDK;
+
+#import "MXKRoomBubbleCellData.h"
+
+#import "MXKTools.h"
+
+@implementation MXKRoomBubbleCellData
+@synthesize senderId, targetId, roomId, senderDisplayName, senderAvatarUrl, senderAvatarPlaceholder, targetDisplayName, targetAvatarUrl, targetAvatarPlaceholder, isEncryptedRoom, isPaginationFirstBubble, shouldHideSenderInformation, date, isIncoming, isAttachmentWithThumbnail, isAttachmentWithIcon, attachment, senderFlair;
+@synthesize textMessage, attributedTextMessage;
+@synthesize shouldHideSenderName, isTyping, showBubbleDateTime, showBubbleReceipts, useCustomDateTimeLabel, useCustomReceipts, useCustomUnsentButton, hasNoDisplay;
+@synthesize tag;
+@synthesize collapsable, collapsed, collapsedAttributedTextMessage, prevCollapsableCellData, nextCollapsableCellData, collapseState;
+
+#pragma mark - MXKRoomBubbleCellDataStoring
+
+- (instancetype)initWithEvent:(MXEvent *)event andRoomState:(MXRoomState *)roomState andRoomDataSource:(MXKRoomDataSource *)roomDataSource2
+{
+    self = [self init];
+    if (self)
+    {
+        roomDataSource = roomDataSource2;
+
+        // Initialize read receipts
+        self.readReceipts = [NSMutableDictionary dictionary];
+        
+        // Create the bubble component based on matrix event
+        MXKRoomBubbleComponent *firstComponent = [[MXKRoomBubbleComponent alloc] initWithEvent:event roomState:roomState eventFormatter:roomDataSource.eventFormatter session:roomDataSource.mxSession];
+        if (firstComponent)
+        {
+            bubbleComponents = [NSMutableArray array];
+            [bubbleComponents addObject:firstComponent];
+            
+            senderId = event.sender;
+            targetId = [event.type isEqualToString:kMXEventTypeStringRoomMember] ? event.stateKey : nil;
+            roomId = roomDataSource.roomId;
+            senderDisplayName = [roomDataSource.eventFormatter senderDisplayNameForEvent:event withRoomState:roomState];
+            senderAvatarUrl = [roomDataSource.eventFormatter senderAvatarUrlForEvent:event withRoomState:roomState];
+            senderAvatarPlaceholder = nil;
+            targetDisplayName = [roomDataSource.eventFormatter targetDisplayNameForEvent:event withRoomState:roomState];
+            targetAvatarUrl = [roomDataSource.eventFormatter targetAvatarUrlForEvent:event withRoomState:roomState];
+            targetAvatarPlaceholder = nil;
+            isEncryptedRoom = roomState.isEncrypted;
+            isIncoming = ([event.sender isEqualToString:roomDataSource.mxSession.myUser.userId] == NO);
+            
+            // Check attachment if any
+            if ([roomDataSource.eventFormatter isSupportedAttachment:event])
+            {
+                // Note: event.eventType is equal here to MXEventTypeRoomMessage or MXEventTypeSticker
+                attachment = [[MXKAttachment alloc] initWithEvent:event andMediaManager:roomDataSource.mxSession.mediaManager];
+                if (attachment && attachment.type == MXKAttachmentTypeImage)
+                {
+                    // Check the current thumbnail orientation. Rotate the current content size (if need)
+                    if (attachment.thumbnailOrientation == UIImageOrientationLeft || attachment.thumbnailOrientation == UIImageOrientationRight)
+                    {
+                        _contentSize = CGSizeMake(_contentSize.height, _contentSize.width);
+                    }
+                }
+            }
+            
+            // Report the attributed string (This will initialize _contentSize attribute)
+            self.attributedTextMessage = firstComponent.attributedTextMessage;
+            
+            // Initialize rendering attributes
+            _maxTextViewWidth = MXKROOMBUBBLECELLDATA_DEFAULT_MAX_TEXTVIEW_WIDTH;
+        }
+        else
+        {
+            // Ignore this event
+            self = nil;
+        }
+    }
+    return self;
+}
+
+- (void)dealloc
+{
+    // Reset any observer on publicised groups by user.
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionDidUpdatePublicisedGroupsForUsersNotification object:self.mxSession];
+    
+    roomDataSource = nil;
+    bubbleComponents = nil;
+}
+
+- (NSUInteger)updateEvent:(NSString *)eventId withEvent:(MXEvent *)event
+{
+    NSUInteger count = 0;
+
+    @synchronized(bubbleComponents)
+    {
+        // Retrieve the component storing the event and update it
+        for (NSUInteger index = 0; index < bubbleComponents.count; index++)
+        {
+            MXKRoomBubbleComponent *roomBubbleComponent = [bubbleComponents objectAtIndex:index];
+            if ([roomBubbleComponent.event.eventId isEqualToString:eventId])
+            {
+                [roomBubbleComponent updateWithEvent:event roomState:roomDataSource.roomState session:self.mxSession];
+                if (!roomBubbleComponent.textMessage.length)
+                {
+                    [bubbleComponents removeObjectAtIndex:index];
+                }
+                // Indicate that the text message layout should be recomputed.
+                [self invalidateTextLayout];
+                
+                // Handle here attachment update.
+                // For example: the case of update of attachment event happens when an echo is replaced by its true event
+                // received back by the events stream.
+                if (attachment)
+                {
+                    // Check the current content url, to update it with the actual one
+                    // Retrieve content url/info
+                    NSString *eventContentURL = event.content[@"url"];
+                    if (event.content[@"file"][@"url"])
+                    {
+                        eventContentURL = event.content[@"file"][@"url"];
+                    }
+                    
+                    if (!eventContentURL.length)
+                    {
+                        // The attachment has been redacted.
+                        attachment = nil;
+                        _contentSize = CGSizeZero;
+                    }
+                    else if (![attachment.eventId isEqualToString:event.eventId] || ![attachment.contentURL isEqualToString:eventContentURL])
+                    {
+                        MXKAttachment *updatedAttachment = [[MXKAttachment alloc] initWithEvent:event andMediaManager:roomDataSource.mxSession.mediaManager];
+                        
+                        // Sanity check on attachment type
+                        if (updatedAttachment && attachment.type == updatedAttachment.type)
+                        {
+                            // Re-use the current image as preview to prevent the cell from flashing
+                            updatedAttachment.previewImage = [attachment getCachedThumbnail];
+                            if (!updatedAttachment.previewImage && attachment.type == MXKAttachmentTypeImage)
+                            {
+                                updatedAttachment.previewImage = [MXMediaManager loadPictureFromFilePath:attachment.cacheFilePath];
+                            }
+                            
+                            // Clean the cache by removing the useless data
+                            if (![updatedAttachment.cacheFilePath isEqualToString:attachment.cacheFilePath])
+                            {
+                                [[NSFileManager defaultManager] removeItemAtPath:attachment.cacheFilePath error:nil];
+                            }
+                            if (![updatedAttachment.thumbnailCachePath isEqualToString:attachment.thumbnailCachePath])
+                            {
+                                [[NSFileManager defaultManager] removeItemAtPath:attachment.thumbnailCachePath error:nil];
+                            }
+                            
+                            // Update the current attachment description
+                            attachment = updatedAttachment;
+                            
+                            if (attachment.type == MXKAttachmentTypeImage)
+                            {
+                                // Reset content size
+                                _contentSize = CGSizeZero;
+                                
+                                // Check the current thumbnail orientation. Rotate the current content size (if need)
+                                if (attachment.thumbnailOrientation == UIImageOrientationLeft || attachment.thumbnailOrientation == UIImageOrientationRight)
+                                {
+                                    _contentSize = CGSizeMake(_contentSize.height, _contentSize.width);
+                                }
+                            }
+                        }
+                        else
+                        {
+                            MXLogDebug(@"[MXKRoomBubbleCellData] updateEvent: Warning: Does not support change of attachment type");
+                        }
+                    }
+                }
+                else if ([roomDataSource.eventFormatter isSupportedAttachment:event])
+                {
+                    // The event is updated to an event with attachement
+                    attachment = [[MXKAttachment alloc] initWithEvent:event andMediaManager:roomDataSource.mxSession.mediaManager];
+                    if (attachment && attachment.type == MXKAttachmentTypeImage)
+                    {
+                        // Check the current thumbnail orientation. Rotate the current content size (if need)
+                        if (attachment.thumbnailOrientation == UIImageOrientationLeft || attachment.thumbnailOrientation == UIImageOrientationRight)
+                        {
+                            _contentSize = CGSizeMake(_contentSize.height, _contentSize.width);
+                        }
+                    }
+                }
+
+                break;
+            }
+        }
+        
+        count = bubbleComponents.count;
+    }
+    
+    return count;
+}
+
+- (NSUInteger)removeEvent:(NSString *)eventId
+{
+    NSUInteger count = 0;
+    
+    @synchronized(bubbleComponents)
+    {
+        for (MXKRoomBubbleComponent *roomBubbleComponent in bubbleComponents)
+        {
+            if ([roomBubbleComponent.event.eventId isEqualToString:eventId])
+            {
+                [bubbleComponents removeObject:roomBubbleComponent];
+                
+                // Indicate that the text message layout should be recomputed.
+                [self invalidateTextLayout];
+                
+                break;
+            }
+        }
+        
+        count = bubbleComponents.count;
+    }
+
+    return count;
+}
+
+- (NSUInteger)removeEventsFromEvent:(NSString*)eventId removedEvents:(NSArray<MXEvent*>**)removedEvents;
+{
+    NSMutableArray *cuttedEvents = [NSMutableArray array];
+
+    @synchronized(bubbleComponents)
+    {
+        NSInteger componentIndex = [self bubbleComponentIndexForEventId:eventId];
+
+        if (NSNotFound != componentIndex)
+        {
+            NSArray *newBubbleComponents = [bubbleComponents subarrayWithRange:NSMakeRange(0, componentIndex)];
+
+            for (NSUInteger i = componentIndex; i < bubbleComponents.count; i++)
+            {
+                MXKRoomBubbleComponent *roomBubbleComponent = bubbleComponents[i];
+                [cuttedEvents addObject:roomBubbleComponent.event];
+            }
+
+            bubbleComponents = [NSMutableArray arrayWithArray:newBubbleComponents];
+
+            // Indicate that the text message layout should be recomputed.
+            [self invalidateTextLayout];
+        }
+    }
+
+    *removedEvents = cuttedEvents;
+    return bubbleComponents.count;
+}
+
+- (BOOL)hasSameSenderAsBubbleCellData:(id<MXKRoomBubbleCellDataStoring>)bubbleCellData
+{
+    // Sanity check: accept only object of MXKRoomBubbleCellData classes or sub-classes
+    NSParameterAssert([bubbleCellData isKindOfClass:[MXKRoomBubbleCellData class]]);
+    
+    // NOTE: Same sender means here same id, same display name and same avatar
+    
+    // Check first user id
+    if ([senderId isEqualToString:bubbleCellData.senderId] == NO)
+    {
+        return NO;
+    }
+    // Check sender name
+    if ((senderDisplayName.length || bubbleCellData.senderDisplayName.length) && ([senderDisplayName isEqualToString:bubbleCellData.senderDisplayName] == NO))
+    {
+        return NO;
+    }
+    // Check avatar url
+    if ((senderAvatarUrl.length || bubbleCellData.senderAvatarUrl.length) && ([senderAvatarUrl isEqualToString:bubbleCellData.senderAvatarUrl] == NO))
+    {
+        return NO;
+    }
+    
+    return YES;
+}
+
+- (MXKRoomBubbleComponent*) getFirstBubbleComponent
+{
+    MXKRoomBubbleComponent* first = nil;
+    
+    @synchronized(bubbleComponents)
+    {
+        if (bubbleComponents.count)
+        {
+            first = [bubbleComponents firstObject];
+        }
+    }
+    
+    return first;
+}
+
+- (MXKRoomBubbleComponent*) getFirstBubbleComponentWithDisplay
+{
+    // Look for the first component which is actually displayed (some event are ignored in room history display).
+    MXKRoomBubbleComponent* first = nil;
+    
+    @synchronized(bubbleComponents)
+    {
+        for (NSInteger index = 0; index < bubbleComponents.count; index++)
+        {
+            MXKRoomBubbleComponent *component = bubbleComponents[index];
+            if (component.attributedTextMessage)
+            {
+                first = component;
+                break;
+            }
+        }
+    }
+    
+    return first;
+}
+
+- (NSAttributedString*)attributedTextMessageWithHighlightedEvent:(NSString*)eventId tintColor:(UIColor*)tintColor
+{
+    NSAttributedString *customAttributedTextMsg;
+    
+    // By default only one component is supported, consider here the first component
+    MXKRoomBubbleComponent *firstComponent = [self getFirstBubbleComponent];
+    
+    if (firstComponent)
+    {
+        customAttributedTextMsg = firstComponent.attributedTextMessage;
+        
+        // Sanity check
+        if (customAttributedTextMsg && [firstComponent.event.eventId isEqualToString:eventId])
+        {
+            NSMutableAttributedString *customComponentString = [[NSMutableAttributedString alloc] initWithAttributedString:customAttributedTextMsg];
+            UIColor *color = tintColor ? tintColor : [UIColor lightGrayColor];
+            [customComponentString addAttribute:NSBackgroundColorAttributeName value:color range:NSMakeRange(0, customComponentString.length)];
+            customAttributedTextMsg = customComponentString;
+        }
+    }
+
+    return customAttributedTextMsg;
+}
+
+- (void)highlightPatternInTextMessage:(NSString*)pattern withForegroundColor:(UIColor*)patternColor andFont:(UIFont*)patternFont
+{
+    highlightedPattern = pattern;
+    highlightedPatternColor = patternColor;
+    highlightedPatternFont = patternFont;
+    
+    // Indicate that the text message layout should be recomputed.
+    [self invalidateTextLayout];
+}
+
+- (void)setShouldHideSenderInformation:(BOOL)inShouldHideSenderInformation
+{
+    shouldHideSenderInformation = inShouldHideSenderInformation;
+    
+    if (!shouldHideSenderInformation)
+    {
+        // Refresh the flair
+        [self refreshSenderFlair];
+    }
+}
+
+- (void)refreshSenderFlair
+{
+    // Reset by default any observer on publicised groups by user.
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionDidUpdatePublicisedGroupsForUsersNotification object:self.mxSession];
+    
+    // Check first whether the room enabled the flair for some groups
+    NSArray<NSString *> *roomRelatedGroups = roomDataSource.roomState.relatedGroups;
+    if (roomRelatedGroups.count && senderId)
+    {
+        NSArray<NSString *> *senderPublicisedGroups;
+        
+        senderPublicisedGroups = [self.mxSession publicisedGroupsForUser:senderId];
+        
+        if (senderPublicisedGroups.count)
+        {
+            // Cross the 2 arrays to keep only the common group ids
+            NSMutableArray *flair = [NSMutableArray arrayWithCapacity:roomRelatedGroups.count];
+            
+            for (NSString *groupId in roomRelatedGroups)
+            {
+                if ([senderPublicisedGroups indexOfObject:groupId] != NSNotFound)
+                {
+                    MXGroup *group = [roomDataSource groupWithGroupId:groupId];
+                    [flair addObject:group];
+                }
+            }
+            
+            if (flair.count)
+            {
+                self.senderFlair = flair;
+            }
+            else
+            {
+                self.senderFlair = nil;
+            }
+        }
+        else
+        {
+            self.senderFlair = nil;
+        }
+        
+        // Observe any change on publicised groups for the message sender
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didMXSessionUpdatePublicisedGroupsForUsers:) name:kMXSessionDidUpdatePublicisedGroupsForUsersNotification object:self.mxSession];
+    }
+}
+
+#pragma mark -
+
+- (void)invalidateTextLayout
+{
+    self.attributedTextMessage = nil;
+}
+
+- (void)prepareBubbleComponentsPosition
+{
+    // Consider here only the first component if any
+    MXKRoomBubbleComponent *firstComponent = [self getFirstBubbleComponent];
+    
+    if (firstComponent)
+    {
+        CGFloat positionY = (attachment == nil || attachment.type == MXKAttachmentTypeFile || attachment.type == MXKAttachmentTypeAudio || attachment.type == MXKAttachmentTypeVoiceMessage) ? MXKROOMBUBBLECELLDATA_TEXTVIEW_DEFAULT_VERTICAL_INSET : 0;
+        firstComponent.position = CGPointMake(0, positionY);
+    }
+}
+
+- (NSInteger)bubbleComponentIndexForEventId:(NSString *)eventId
+{
+    return [self.bubbleComponents indexOfObjectPassingTest:^BOOL(MXKRoomBubbleComponent * _Nonnull bubbleComponent, NSUInteger idx, BOOL * _Nonnull stop) {
+        if ([bubbleComponent.event.eventId isEqualToString:eventId])
+        {
+            *stop = YES;
+            return YES;
+        }
+        return NO;
+    }];
+}
+
+#pragma mark - Text measuring
+
+// Return the raw height of the provided text by removing any margin
+- (CGFloat)rawTextHeight: (NSAttributedString*)attributedText
+{
+    __block CGSize textSize;
+    if ([NSThread currentThread] != [NSThread mainThread])
+    {
+        dispatch_sync(dispatch_get_main_queue(), ^{
+            textSize = [self textContentSize:attributedText removeVerticalInset:YES];
+        });
+    }
+    else
+    {
+        textSize = [self textContentSize:attributedText removeVerticalInset:YES];
+    }
+    
+    return textSize.height;
+}
+
+- (CGSize)textContentSize:(NSAttributedString*)attributedText removeVerticalInset:(BOOL)removeVerticalInset
+{
+    static UITextView* measurementTextView = nil;
+    static UITextView* measurementTextViewWithoutInset = nil;
+    
+    if (attributedText.length)
+    {
+        if (!measurementTextView)
+        {
+            measurementTextView = [[UITextView alloc] init];
+            
+            measurementTextViewWithoutInset = [[UITextView alloc] init];
+            // Remove the container inset: this operation impacts only the vertical margin.
+            // Note: consider textContainer.lineFragmentPadding to remove horizontal margin
+            measurementTextViewWithoutInset.textContainerInset = UIEdgeInsetsZero;
+        }
+        
+        // Select the right text view for measurement
+        UITextView *selectedTextView = (removeVerticalInset ? measurementTextViewWithoutInset : measurementTextView);
+        
+        selectedTextView.frame = CGRectMake(0, 0, _maxTextViewWidth, MAXFLOAT);
+        selectedTextView.attributedText = attributedText;
+            
+        CGSize size = [selectedTextView sizeThatFits:selectedTextView.frame.size];
+
+        // Manage the case where a string attribute has a single paragraph with a left indent
+        // In this case, [UITextView sizeThatFits] ignores the indent and return the width
+        // of the text only.
+        // So, add this indent afterwards
+        NSRange textRange = NSMakeRange(0, attributedText.length);
+        NSRange longestEffectiveRange;
+        NSParagraphStyle *paragraphStyle = [attributedText attribute:NSParagraphStyleAttributeName atIndex:0 longestEffectiveRange:&longestEffectiveRange inRange:textRange];
+
+        if (NSEqualRanges(textRange, longestEffectiveRange))
+        {
+            size.width = size.width + paragraphStyle.headIndent;
+        }
+
+        return size;
+    }
+    
+    return CGSizeZero;
+}
+
+#pragma mark - Properties
+
+- (MXSession*)mxSession
+{
+    return roomDataSource.mxSession;
+}
+
+- (NSArray*)bubbleComponents
+{
+    NSArray* copy;
+    
+    @synchronized(bubbleComponents)
+    {
+        copy = [bubbleComponents copy];
+    }
+    
+    return copy;
+}
+
+- (NSString*)textMessage
+{
+    return self.attributedTextMessage.string;
+}
+
+- (void)setAttributedTextMessage:(NSAttributedString *)inAttributedTextMessage
+{
+    attributedTextMessage = inAttributedTextMessage;
+    
+    if (attributedTextMessage.length && highlightedPattern)
+    {
+        [self highlightPattern];
+    }
+    
+    // Reset content size
+    _contentSize = CGSizeZero;
+}
+
+- (NSAttributedString*)attributedTextMessage
+{
+    if (self.hasAttributedTextMessage && !attributedTextMessage.length)
+    {
+        // By default only one component is supported, consider here the first component
+        MXKRoomBubbleComponent *firstComponent = [self getFirstBubbleComponent];
+        
+        if (firstComponent)
+        {
+            attributedTextMessage = firstComponent.attributedTextMessage;
+            
+            if (attributedTextMessage.length && highlightedPattern)
+            {
+                [self highlightPattern];
+            }
+        }
+    }
+
+    return attributedTextMessage;
+}
+
+- (BOOL)hasAttributedTextMessage
+{
+    // Determine if the event formatter will return at least one string for the events in this cell.
+    // No string means that the event formatter has been configured so that it did not accept all events
+    // of the cell.
+    BOOL hasAttributedTextMessage = NO;
+
+    @synchronized(bubbleComponents)
+    {
+        for (MXKRoomBubbleComponent *roomBubbleComponent in bubbleComponents)
+        {
+            if (roomBubbleComponent.attributedTextMessage)
+            {
+                hasAttributedTextMessage = YES;
+                break;
+            }
+        }
+    }
+    return hasAttributedTextMessage;
+}
+
+- (BOOL)hasLink
+{
+    @synchronized (bubbleComponents) {
+        for (MXKRoomBubbleComponent *component in bubbleComponents)
+        {
+            if (component.link)
+            {
+                return YES;
+            }
+        }
+    }
+    
+    return NO;
+}
+
+- (MXKRoomBubbleComponentDisplayFix)displayFix
+{
+    MXKRoomBubbleComponentDisplayFix displayFix = MXKRoomBubbleComponentDisplayFixNone;
+
+    @synchronized(bubbleComponents)
+    {
+        for (MXKRoomBubbleComponent *component in self.bubbleComponents)
+        {
+            displayFix |= component.displayFix;
+        }
+    }
+    return displayFix;
+}
+
+- (BOOL)shouldHideSenderName
+{
+    BOOL res = NO;
+    
+    MXKRoomBubbleComponent *firstDisplayedComponent = [self getFirstBubbleComponentWithDisplay];
+    NSString *senderDisplayName = self.senderDisplayName;
+    
+    if (firstDisplayedComponent)
+    {
+        res = (firstDisplayedComponent.event.isEmote || (firstDisplayedComponent.event.isState && senderDisplayName && [firstDisplayedComponent.textMessage hasPrefix:senderDisplayName]));
+    }
+    
+    return res;
+}
+
+- (NSArray*)events
+{
+    NSMutableArray* eventsArray;
+    
+    @synchronized(bubbleComponents)
+    {
+        eventsArray = [NSMutableArray arrayWithCapacity:bubbleComponents.count];
+        for (MXKRoomBubbleComponent *roomBubbleComponent in bubbleComponents)
+        {
+            if (roomBubbleComponent.event)
+            {
+                [eventsArray addObject:roomBubbleComponent.event];
+            }
+        }
+    }
+    return eventsArray;
+}
+
+- (NSDate*)date
+{
+    MXKRoomBubbleComponent *firstDisplayedComponent = [self getFirstBubbleComponentWithDisplay];
+    
+    if (firstDisplayedComponent)
+    {
+        return firstDisplayedComponent.date;
+    }
+    
+    return nil;
+}
+
+- (BOOL)hasNoDisplay
+{
+    BOOL noDisplay = YES;
+    
+    // Check whether at least one component has a string description.
+    @synchronized(bubbleComponents)
+    {
+        if (self.collapsed)
+        {
+            // Collapsed cells have no display except their cell header
+            noDisplay = !self.collapsedAttributedTextMessage;
+        }
+        else
+        {
+            for (MXKRoomBubbleComponent *roomBubbleComponent in bubbleComponents)
+            {
+                if (roomBubbleComponent.attributedTextMessage)
+                {
+                    noDisplay = NO;
+                    break;
+                }
+            }
+        }
+    }
+    
+    return (noDisplay && !attachment);
+}
+
+- (BOOL)isAttachmentWithThumbnail
+{
+    return (attachment && (attachment.type == MXKAttachmentTypeImage || attachment.type == MXKAttachmentTypeVideo || attachment.type == MXKAttachmentTypeSticker));
+}
+
+- (BOOL)isAttachmentWithIcon
+{
+    // Not supported yet (TODO for audio, file).
+    return NO;
+}
+
+- (void)setMaxTextViewWidth:(CGFloat)inMaxTextViewWidth
+{
+    // Check change
+    if (inMaxTextViewWidth != _maxTextViewWidth)
+    {
+        _maxTextViewWidth = inMaxTextViewWidth;
+        // Reset content size
+        _contentSize = CGSizeZero;
+    }
+}
+
+- (CGSize)contentSize
+{
+    if (CGSizeEqualToSize(_contentSize, CGSizeZero))
+    {
+        if (attachment == nil)
+        {
+            // Here the bubble is a text message
+            if ([NSThread currentThread] != [NSThread mainThread])
+            {
+                dispatch_sync(dispatch_get_main_queue(), ^{
+                    self->_contentSize = [self textContentSize:self.attributedTextMessage removeVerticalInset:NO];
+                });
+            }
+            else
+            {
+                _contentSize = [self textContentSize:self.attributedTextMessage removeVerticalInset:NO];
+            }
+        }
+        else if (self.isAttachmentWithThumbnail)
+        {
+            CGFloat width, height;
+            
+            // Set default content size
+            width = height = MXKROOMBUBBLECELLDATA_MAX_ATTACHMENTVIEW_WIDTH;
+            
+            if (attachment.thumbnailInfo || attachment.contentInfo)
+            {
+                if (attachment.thumbnailInfo && attachment.thumbnailInfo[@"w"] && attachment.thumbnailInfo[@"h"])
+                {
+                    width = [attachment.thumbnailInfo[@"w"] integerValue];
+                    height = [attachment.thumbnailInfo[@"h"] integerValue];
+                }
+                else if (attachment.contentInfo[@"w"] && attachment.contentInfo[@"h"])
+                {
+                    width = [attachment.contentInfo[@"w"] integerValue];
+                    height = [attachment.contentInfo[@"h"] integerValue];
+                }
+                
+                if (width > MXKROOMBUBBLECELLDATA_MAX_ATTACHMENTVIEW_WIDTH || height > MXKROOMBUBBLECELLDATA_MAX_ATTACHMENTVIEW_WIDTH)
+                {
+                    if (width > height)
+                    {
+                        height = (height * MXKROOMBUBBLECELLDATA_MAX_ATTACHMENTVIEW_WIDTH) / width;
+                        height = floorf(height / 2) * 2;
+                        width = MXKROOMBUBBLECELLDATA_MAX_ATTACHMENTVIEW_WIDTH;
+                    }
+                    else
+                    {
+                        width = (width * MXKROOMBUBBLECELLDATA_MAX_ATTACHMENTVIEW_WIDTH) / height;
+                        width = floorf(width / 2) * 2;
+                        height = MXKROOMBUBBLECELLDATA_MAX_ATTACHMENTVIEW_WIDTH;
+                    }
+                }
+            }
+            
+            // Check here thumbnail orientation
+            if (attachment.thumbnailOrientation == UIImageOrientationLeft || attachment.thumbnailOrientation == UIImageOrientationRight)
+            {
+                _contentSize = CGSizeMake(height, width);
+            }
+            else
+            {
+                _contentSize = CGSizeMake(width, height);
+            }
+        }
+        else if (attachment.type == MXKAttachmentTypeFile || attachment.type == MXKAttachmentTypeAudio)
+        {
+            // Presently we displayed only the file name for attached file (no icon yet)
+            // Return suitable content size of a text view to display the file name (available in text message). 
+            if ([NSThread currentThread] != [NSThread mainThread])
+            {
+                dispatch_sync(dispatch_get_main_queue(), ^{
+                    self->_contentSize = [self textContentSize:self.attributedTextMessage removeVerticalInset:NO];
+                });
+            }
+            else
+            {
+                _contentSize = [self textContentSize:self.attributedTextMessage removeVerticalInset:NO];
+            }
+        }
+        else
+        {
+            _contentSize = CGSizeMake(40, 40);
+        }
+    }
+    return _contentSize;
+}
+
+- (MXKEventFormatter *)eventFormatter
+{
+    MXKRoomBubbleComponent *firstComponent = [bubbleComponents firstObject];
+    
+    // Retrieve event formatter from the first component
+    if (firstComponent)
+    {
+        return firstComponent.eventFormatter;
+    }
+    
+    return nil;
+}
+
+- (BOOL)showAntivirusScanStatus
+{
+    MXKRoomBubbleComponent *firstBubbleComponent = self.bubbleComponents.firstObject;
+    
+    if (self.attachment == nil || firstBubbleComponent == nil)
+    {
+        return NO;
+    }
+    
+    MXEventScan *eventScan = firstBubbleComponent.eventScan;
+    
+    return eventScan != nil && eventScan.antivirusScanStatus != MXAntivirusScanStatusTrusted;
+}
+
+- (BOOL)containsBubbleComponentWithEncryptionBadge
+{
+    BOOL containsBubbleComponentWithEncryptionBadge = NO;
+    
+    @synchronized(bubbleComponents)
+    {
+        for (MXKRoomBubbleComponent *component in bubbleComponents)
+        {
+            if (component.showEncryptionBadge)
+            {
+                containsBubbleComponentWithEncryptionBadge = YES;
+                break;
+            }
+        }
+    }
+    
+    return containsBubbleComponentWithEncryptionBadge;
+}
+
+#pragma mark - Bubble collapsing
+
+- (BOOL)collapseWith:(id<MXKRoomBubbleCellDataStoring>)cellData
+{
+    // NO by default
+    return NO;
+}
+
+#pragma mark - Internals
+
+- (void)highlightPattern
+{
+    NSMutableAttributedString *customAttributedTextMsg = nil;
+    
+    NSString *currentTextMessage = self.textMessage;
+    NSRange range = [currentTextMessage rangeOfString:highlightedPattern options:NSCaseInsensitiveSearch];
+    
+    if (range.location != NSNotFound)
+    {
+        customAttributedTextMsg = [[NSMutableAttributedString alloc] initWithAttributedString:self.attributedTextMessage];
+        
+        while (range.location != NSNotFound)
+        {
+            if (highlightedPatternColor)
+            {
+                // Update text color
+                [customAttributedTextMsg addAttribute:NSForegroundColorAttributeName value:highlightedPatternColor range:range];
+            }
+            
+            if (highlightedPatternFont)
+            {
+                // Update text font
+                [customAttributedTextMsg addAttribute:NSFontAttributeName value:highlightedPatternFont range:range];
+            }
+            
+            // Look for the next pattern occurrence
+            range.location += range.length;
+            if (range.location < currentTextMessage.length)
+            {
+                range.length = currentTextMessage.length - range.location;
+                range = [currentTextMessage rangeOfString:highlightedPattern options:NSCaseInsensitiveSearch range:range];
+            }
+            else
+            {
+                range.location = NSNotFound;
+            }
+        }
+    }
+    
+    if (customAttributedTextMsg)
+    {
+        // Update resulting message body
+        attributedTextMessage = customAttributedTextMsg;
+    }
+}
+
+- (void)didMXSessionUpdatePublicisedGroupsForUsers:(NSNotification *)notif
+{
+    // Retrieved the list of the concerned users
+    NSArray<NSString*> *userIds = notif.userInfo[kMXSessionNotificationUserIdsArrayKey];
+    if (userIds.count && self.senderId)
+    {
+        // Check whether the current sender is concerned.
+        if ([userIds indexOfObject:self.senderId] != NSNotFound)
+        {
+            [self refreshSenderFlair];
+        }
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellDataStoring.h b/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellDataStoring.h
new file mode 100644
index 000000000..06b1584c4
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellDataStoring.h
@@ -0,0 +1,348 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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/Foundation.h>
+#import <MatrixSDK/MatrixSDK.h>
+
+#import "MXKRoomDataSource.h"
+
+#import "MXKAttachment.h"
+
+#import "MXEvent+MatrixKit.h"
+
+@class MXKRoomDataSource;
+/**
+ `MXKRoomBubbleCellDataStoring` defines a protocol a class must conform in order to store MXKRoomBubble cell data
+ managed by `MXKRoomDataSource`.
+ */
+@protocol MXKRoomBubbleCellDataStoring <NSObject>
+
+#pragma mark - Data displayed by a room bubble cell
+
+/**
+ The sender Id
+ */
+@property (nonatomic) NSString *senderId;
+
+/**
+ The target Id (may be nil)
+
+ @discussion "target" refers to the room member who is the target of this event (if any), e.g.
+ the invitee, the person being banned, etc.
+ */
+@property (nonatomic) NSString *targetId;
+
+/**
+ The room id
+ */
+@property (nonatomic) NSString *roomId;
+
+/**
+ The sender display name composed when event occured
+ */
+@property (nonatomic) NSString *senderDisplayName;
+
+/**
+ The sender avatar url retrieved when event occured
+ */
+@property (nonatomic) NSString *senderAvatarUrl;
+
+/**
+ The sender avatar placeholder (may be nil) - Used when url is nil, or during avatar download.
+ */
+@property (nonatomic) UIImage *senderAvatarPlaceholder;
+
+/**
+ The target display name composed when event occured (may be nil)
+
+ @discussion "target" refers to the room member who is the target of this event (if any), e.g.
+ the invitee, the person being banned, etc.
+ */
+@property (nonatomic) NSString *targetDisplayName;
+
+/**
+ The target avatar url retrieved when event occured (may be nil)
+
+ @discussion "target" refers to the room member who is the target of this event (if any), e.g.
+ the invitee, the person being banned, etc.
+ */
+@property (nonatomic) NSString *targetAvatarUrl;
+
+/**
+ The target avatar placeholder (may be nil) - Used when url is nil, or during avatar download.
+
+ @discussion "target" refers to the room member who is the target of this event (if any), e.g.
+ the invitee, the person being banned, etc.
+ */
+@property (nonatomic) UIImage *targetAvatarPlaceholder;
+
+/**
+ The current sender flair (list of the publicised groups in the sender profile which matches the room flair settings)
+ */
+@property (nonatomic) NSArray<MXGroup*> *senderFlair;
+
+/**
+ Tell whether the room is encrypted.
+ */
+@property (nonatomic) BOOL isEncryptedRoom;
+
+/**
+ Tell whether a new pagination starts with this bubble.
+ */
+@property (nonatomic) BOOL isPaginationFirstBubble;
+
+/**
+ Tell whether the sender information is relevant for this bubble
+ (For example this information should be hidden in case of 2 consecutive bubbles from the same sender).
+ */
+@property (nonatomic) BOOL shouldHideSenderInformation;
+
+/**
+ Tell whether this bubble has nothing to display (neither a message nor an attachment).
+ */
+@property (nonatomic, readonly) BOOL hasNoDisplay;
+
+/**
+ The list of events (`MXEvent` instances) handled by this bubble.
+ */
+@property (nonatomic, readonly) NSArray<MXEvent*> *events;
+
+/**
+ The bubble attachment (if any).
+ */
+@property (nonatomic) MXKAttachment *attachment;
+
+/**
+ The bubble date
+ */
+@property (nonatomic) NSDate *date;
+
+/**
+ YES when the bubble is composed by incoming event(s).
+ */
+@property (nonatomic) BOOL isIncoming;
+
+/**
+ YES when the bubble correspond to an attachment displayed with a thumbnail (see image, video).
+ */
+@property (nonatomic) BOOL isAttachmentWithThumbnail;
+
+/**
+ YES when the bubble correspond to an attachment displayed with an icon (audio, file...).
+ */
+@property (nonatomic) BOOL isAttachmentWithIcon;
+
+/**
+ Flag that indicates that self.attributedTextMessage will be not nil.
+ This avoids the computation of self.attributedTextMessage that can take time.
+ */
+@property (nonatomic, readonly) BOOL hasAttributedTextMessage;
+
+/**
+ The body of the message with sets of attributes, or kind of content description in case of attachment (e.g. "image attachment")
+ */
+@property (nonatomic) NSAttributedString *attributedTextMessage;
+
+/**
+ The raw text message (without attributes)
+ */
+@property (nonatomic) NSString *textMessage;
+
+/**
+ Tell whether the sender's name is relevant or not for this bubble.
+ Return YES if the first component of the bubble message corresponds to an emote, or a state event in which
+ the sender's name appears at the beginning of the message text (for example membership events).
+ */
+@property (nonatomic) BOOL shouldHideSenderName;
+
+/**
+ YES if the sender is currently typing in the current room
+ */
+@property (nonatomic) BOOL isTyping;
+
+/**
+ Show the date time label in rendered bubble cell. NO by default.
+ */
+@property (nonatomic) BOOL showBubbleDateTime;
+
+/**
+ A Boolean value that determines whether the date time labels are customized (By default date time display is handled by MatrixKit). NO by default.
+ */
+@property (nonatomic) BOOL useCustomDateTimeLabel;
+
+/**
+ Show the receipts in rendered bubble cell. YES by default.
+ */
+@property (nonatomic) BOOL showBubbleReceipts;
+
+/**
+ A Boolean value that determines whether the read receipts are customized (By default read receipts display is handled by MatrixKit). NO by default.
+ */
+@property (nonatomic) BOOL useCustomReceipts;
+
+/**
+ A Boolean value that determines whether the unsent button is customized (By default an 'Unsent' button is displayed by MatrixKit in front of unsent events). NO by default.
+ */
+@property (nonatomic) BOOL useCustomUnsentButton;
+
+/**
+ An integer that you can use to identify cell data in your application.
+ The default value is 0. You can set the value of this tag and use that value to identify the cell data later.
+ */
+@property (nonatomic) NSInteger tag;
+
+/**
+ Indicate if antivirus scan status should be shown.
+ */
+@property (nonatomic, readonly) BOOL showAntivirusScanStatus;
+
+#pragma mark - Public methods
+/**
+ Create a new `MXKRoomBubbleCellDataStoring` object for a new bubble cell.
+ 
+ @param event the event to be displayed in the cell.
+ @param roomState the room state when the event occured.
+ @param roomDataSource the `MXKRoomDataSource` object that will use this instance.
+ @return the newly created instance.
+ */
+- (instancetype)initWithEvent:(MXEvent*)event andRoomState:(MXRoomState*)roomState andRoomDataSource:(MXKRoomDataSource*)roomDataSource;
+
+/**
+Update the event because its sent state changed or it is has been redacted.
+ 
+ @param eventId the id of the event to change.
+ @param event the new event data
+ @return the number of events hosting by the object after the update.
+ */
+- (NSUInteger)updateEvent:(NSString*)eventId withEvent:(MXEvent*)event;
+
+/**
+ Remove the event from the `MXKRoomBubbleCellDataStoring` object.
+
+ @param eventId the id of the event to remove.
+ @return the number of events still hosting by the object after the removal
+ */
+- (NSUInteger)removeEvent:(NSString*)eventId;
+
+/**
+ Remove the passed event and all events after it.
+
+ @param eventId the id of the event where to start removing.
+ @param removedEvents removedEvents will contain the list of removed events.
+ @return the number of events still hosting by the object after the removal.
+ */
+- (NSUInteger)removeEventsFromEvent:(NSString*)eventId removedEvents:(NSArray<MXEvent*>**)removedEvents;
+
+/**
+ Check if the receiver has the same sender as another bubble.
+ 
+ @param bubbleCellData an object conforms to `MXKRoomBubbleCellDataStoring` protocol.
+ @return YES if the receiver has the same sender as the provided bubble
+ */
+- (BOOL)hasSameSenderAsBubbleCellData:(id<MXKRoomBubbleCellDataStoring>)bubbleCellData;
+
+/**
+ Highlight text message of an event in the resulting message body.
+ 
+ @param eventId the id of the event to highlight.
+ @param tintColor optional tint color
+ @return The body of the message by highlighting the content related to the provided event id
+ */
+- (NSAttributedString*)attributedTextMessageWithHighlightedEvent:(NSString*)eventId tintColor:(UIColor*)tintColor;
+
+/**
+ Highlight all the occurrences of a pattern in the resulting message body 'attributedTextMessage'.
+ 
+ @param pattern the text pattern to highlight.
+ @param patternColor optional text color (the pattern text color is unchanged if nil).
+ @param patternFont optional text font (the pattern font is unchanged if nil).
+ */
+- (void)highlightPatternInTextMessage:(NSString*)pattern withForegroundColor:(UIColor*)patternColor andFont:(UIFont*)patternFont;
+
+/**
+ Refresh the sender flair information
+ */
+- (void)refreshSenderFlair;
+
+/**
+ Indicate that the current text message layout is no longer valid and should be recomputed
+ before presentation in a bubble cell. This could be due to the content changing, or the
+ available space for the cell has been updated.
+ */
+- (void)invalidateTextLayout;
+
+#pragma mark - Bubble collapsing
+
+/**
+ A Boolean value that indicates if the cell is collapsable.
+ */
+@property (nonatomic) BOOL collapsable;
+
+/**
+ A Boolean value that indicates if the cell and its series is collapsed.
+ */
+@property (nonatomic) BOOL collapsed;
+
+/**
+ The attributed string to display when the collapsable cells series is collapsed.
+ It is not nil only for the start cell of the cells series.
+ */
+@property (nonatomic) NSAttributedString *collapsedAttributedTextMessage;
+
+/**
+ Bidirectional linked list of cells that can be collapsed together.
+ If prevCollapsableCellData is nil, this cell data instance is the data of the start
+ cell of the collapsable cells series.
+ */
+@property (nonatomic) id<MXKRoomBubbleCellDataStoring> prevCollapsableCellData;
+@property (nonatomic) id<MXKRoomBubbleCellDataStoring> nextCollapsableCellData;
+
+/**
+ The room state to use for computing or updating the data to display for the series when it is
+ collapsed.
+ It is not nil only for the start cell of the cells series.
+ */
+@property (nonatomic) MXRoomState *collapseState;
+
+/**
+ Check whether the two cells can be collapsable together.
+
+ @return YES if YES.
+ */
+- (BOOL)collapseWith:(id<MXKRoomBubbleCellDataStoring>)cellData;
+
+@optional
+/**
+ Attempt to add a new event to the bubble.
+ 
+ @param event the event to be displayed in the cell.
+ @param roomState the room state when the event occured.
+ @return YES if the model accepts that the event can concatenated to events already in the bubble.
+ */
+- (BOOL)addEvent:(MXEvent*)event andRoomState:(MXRoomState*)roomState;
+
+/**
+ The receiver appends to its content the provided bubble cell data, if both have the same sender.
+ 
+ @param bubbleCellData an object conforms to `MXKRoomBubbleCellDataStoring` protocol.
+ @return YES if the provided cell data has been merged into receiver.
+ */
+- (BOOL)mergeWithBubbleCellData:(id<MXKRoomBubbleCellDataStoring>)bubbleCellData;
+
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellDataWithAppendingMode.h b/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellDataWithAppendingMode.h
new file mode 100644
index 000000000..8fc2cc2de
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellDataWithAppendingMode.h
@@ -0,0 +1,45 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomBubbleCellData.h"
+
+/**
+ `MXKRoomBubbleCellDataWithAppendingMode` class inherits from `MXKRoomBubbleCellData`, it merges
+ consecutive events from the same sender into one bubble.
+ Each concatenated event is represented by a bubble component.
+ */
+@interface MXKRoomBubbleCellDataWithAppendingMode : MXKRoomBubbleCellData
+{
+@protected
+    /**
+     YES if position of each component must be refreshed
+     */
+    BOOL shouldUpdateComponentsPosition;
+}
+
+/**
+ The string appended to the current message before adding a new component text.
+ */
++ (NSAttributedString *)messageSeparator;
+
+/**
+ The maximum number of components in each bubble. Default is 10.
+ We limit the number of components to reduce the computation time required during bubble handling.
+ Indeed some process like [prepareBubbleComponentsPosition] is time consuming.
+ */
+@property (nonatomic) NSUInteger maxComponentCount;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellDataWithAppendingMode.m b/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellDataWithAppendingMode.m
new file mode 100644
index 000000000..680086ddd
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellDataWithAppendingMode.m
@@ -0,0 +1,356 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomBubbleCellDataWithAppendingMode.h"
+
+static NSAttributedString *messageSeparator = nil;
+
+@implementation MXKRoomBubbleCellDataWithAppendingMode
+
+#pragma mark - MXKRoomBubbleCellDataStoring
+
+- (instancetype)initWithEvent:(MXEvent *)event andRoomState:(MXRoomState *)roomState andRoomDataSource:(MXKRoomDataSource *)roomDataSource2
+{
+    self = [super initWithEvent:event andRoomState:roomState andRoomDataSource:roomDataSource2];
+    if (self)
+    {
+        // Set default settings
+        self.maxComponentCount = 10;
+    }
+    
+    return self;
+}
+
+- (BOOL)addEvent:(MXEvent*)event andRoomState:(MXRoomState*)roomState
+{
+    // We group together text messages from the same user (attachments are not merged).
+    if ([event.sender isEqualToString:self.senderId] && (self.attachment == nil) && (self.bubbleComponents.count < self.maxComponentCount))
+    {
+        // Attachments (image, video, sticker ...) cannot be added here
+        if ([roomDataSource.eventFormatter isSupportedAttachment:event])
+        {
+            return NO;
+        }
+        
+        // Check sender information
+        NSString *eventSenderName = [roomDataSource.eventFormatter senderDisplayNameForEvent:event withRoomState:roomState];
+        NSString *eventSenderAvatar = [roomDataSource.eventFormatter senderAvatarUrlForEvent:event withRoomState:roomState];
+        if ((self.senderDisplayName || eventSenderName) &&
+            ([self.senderDisplayName isEqualToString:eventSenderName] == NO))
+        {
+            return NO;
+        }
+        if ((self.senderAvatarUrl || eventSenderAvatar) &&
+            ([self.senderAvatarUrl isEqualToString:eventSenderAvatar] == NO))
+        {
+            return NO;
+        }
+        
+        // Take into account here the rendered bubbles pagination
+        if (roomDataSource.bubblesPagination == MXKRoomDataSourceBubblesPaginationPerDay)
+        {
+            // Event must be sent the same day than the existing bubble.
+            NSString *bubbleDateString = [roomDataSource.eventFormatter dateStringFromDate:self.date withTime:NO];
+            NSString *eventDateString = [roomDataSource.eventFormatter dateStringFromEvent:event withTime:NO];
+            if (bubbleDateString && eventDateString && ![bubbleDateString isEqualToString:eventDateString])
+            {
+                return NO;
+            }
+        }
+        
+        // Create new message component
+        MXKRoomBubbleComponent *addedComponent = [[MXKRoomBubbleComponent alloc] initWithEvent:event roomState:roomState eventFormatter:roomDataSource.eventFormatter session:self.mxSession];
+        if (addedComponent)
+        {
+            [self addComponent:addedComponent];
+        }
+        // else the event is ignored, we consider it as handled
+        return YES;
+    }
+    return NO;
+}
+
+- (BOOL)mergeWithBubbleCellData:(id<MXKRoomBubbleCellDataStoring>)bubbleCellData
+{
+    if ([self hasSameSenderAsBubbleCellData:bubbleCellData])
+    {
+        MXKRoomBubbleCellData *cellData = (MXKRoomBubbleCellData*)bubbleCellData;
+        // Only text messages are merged (Attachments are not merged).
+        if ((self.attachment == nil) && (cellData.attachment == nil))
+        {
+            // Take into account here the rendered bubbles pagination
+            if (roomDataSource.bubblesPagination == MXKRoomDataSourceBubblesPaginationPerDay)
+            {
+                // bubble components must be sent the same day than self.
+                NSString *selfDateString = [roomDataSource.eventFormatter dateStringFromDate:self.date withTime:NO];
+                NSString *bubbleDateString = [roomDataSource.eventFormatter dateStringFromDate:bubbleCellData.date withTime:NO];
+                if (![bubbleDateString isEqualToString:selfDateString])
+                {
+                    return NO;
+                }
+            }
+        
+            // Add all components of the provided message
+            for (MXKRoomBubbleComponent* component in cellData.bubbleComponents)
+            {
+                [self addComponent:component];
+            }
+            return YES;
+        }
+    }
+    return NO;
+}
+
+- (NSAttributedString*)attributedTextMessageWithHighlightedEvent:(NSString*)eventId tintColor:(UIColor*)tintColor
+{
+    // Create attributed string
+    NSMutableAttributedString *customAttributedTextMsg;
+    NSAttributedString *componentString;
+    
+    @synchronized(bubbleComponents)
+    {
+        for (MXKRoomBubbleComponent* component in bubbleComponents)
+        {
+            componentString = component.attributedTextMessage;
+            
+            if (componentString)
+            {
+                if ([component.event.eventId isEqualToString:eventId])
+                {
+                    NSMutableAttributedString *customComponentString = [[NSMutableAttributedString alloc] initWithAttributedString:componentString];
+                    UIColor *color = tintColor ? tintColor : [UIColor lightGrayColor];
+                    [customComponentString addAttribute:NSBackgroundColorAttributeName value:color range:NSMakeRange(0, customComponentString.length)];
+                    componentString = customComponentString;
+                }
+                
+                if (!customAttributedTextMsg)
+                {
+                    customAttributedTextMsg = [[NSMutableAttributedString alloc] initWithAttributedString:componentString];
+                }
+                else
+                {
+                    // Append attributed text
+                    [customAttributedTextMsg appendAttributedString:[MXKRoomBubbleCellDataWithAppendingMode messageSeparator]];
+                    [customAttributedTextMsg appendAttributedString:componentString];
+                }
+            }
+        }
+    }
+
+    return customAttributedTextMsg;
+}
+
+#pragma mark -
+
+- (void)prepareBubbleComponentsPosition
+{
+    // Set position of the first component
+    [super prepareBubbleComponentsPosition];
+    
+    @synchronized(bubbleComponents)
+    {
+        // Check whether the position of other components need to be refreshed
+        if (!self.attachment && shouldUpdateComponentsPosition && bubbleComponents.count > 1)
+        {
+            // Init attributed string with the first text component not nil.
+            MXKRoomBubbleComponent *component = bubbleComponents.firstObject;
+            CGFloat positionY = component.position.y;
+            NSMutableAttributedString *attributedString;
+            NSUInteger index = 0;
+            
+            for (; index < bubbleComponents.count; index++)
+            {
+                component = [bubbleComponents objectAtIndex:index];
+                
+                component.position = CGPointMake(0, positionY);
+                
+                if (component.attributedTextMessage)
+                {
+                    attributedString = [[NSMutableAttributedString alloc] initWithAttributedString:component.attributedTextMessage];
+                    [attributedString appendAttributedString:[MXKRoomBubbleCellDataWithAppendingMode messageSeparator]];
+                    break;
+                }
+            }
+            
+            for (index++; index < bubbleComponents.count; index++)
+            {
+                // Append the next text component
+                component = [bubbleComponents objectAtIndex:index];
+                
+                if (component.attributedTextMessage)
+                {
+                    [attributedString appendAttributedString:component.attributedTextMessage];
+                    
+                    // Compute the height of the resulting string
+                    CGFloat cumulatedHeight = [self rawTextHeight:attributedString];
+                    
+                    // Deduce the position of the beginning of this component
+                    CGFloat positionY = MXKROOMBUBBLECELLDATA_TEXTVIEW_DEFAULT_VERTICAL_INSET + (cumulatedHeight - [self rawTextHeight:component.attributedTextMessage]);
+                    
+                    component.position = CGPointMake(0, positionY);
+                    
+                    [attributedString appendAttributedString:[MXKRoomBubbleCellDataWithAppendingMode messageSeparator]];
+                }
+                else
+                {
+                    // Apply the current vertical position on this empty component.
+                    component.position = CGPointMake(0, positionY);
+                }
+            }
+        }
+    }
+    
+    shouldUpdateComponentsPosition = NO;
+}
+
+#pragma mark -
+
+- (NSString*)textMessage
+{
+    NSString *rawText = nil;
+    
+    if (self.attributedTextMessage)
+    {
+        // Append all components text message
+        NSMutableString *currentTextMsg;
+        @synchronized(bubbleComponents)
+        {
+            for (MXKRoomBubbleComponent* component in bubbleComponents)
+            {
+                if (component.textMessage == nil)
+                {
+                    continue;
+                }
+                if (!currentTextMsg)
+                {
+                    currentTextMsg = [NSMutableString stringWithString:component.textMessage];
+                }
+                else
+                {
+                    // Append text message
+                    [currentTextMsg appendString:@"\n"];
+                    [currentTextMsg appendString:component.textMessage];
+                }
+            }
+        }
+        rawText = currentTextMsg;
+    }
+    
+    return rawText;
+}
+
+- (void)setAttributedTextMessage:(NSAttributedString *)inAttributedTextMessage
+{
+    super.attributedTextMessage = inAttributedTextMessage;
+
+    // Position of each components should be computed again
+    shouldUpdateComponentsPosition = YES;
+}
+
+- (NSAttributedString*)attributedTextMessage
+{
+    @synchronized(bubbleComponents)
+    {
+        if (self.hasAttributedTextMessage && !attributedTextMessage.length)
+        {
+            // Create attributed string
+            NSMutableAttributedString *currentAttributedTextMsg;
+            
+            for (MXKRoomBubbleComponent* component in bubbleComponents)
+            {
+                if (component.attributedTextMessage)
+                {
+                    if (!currentAttributedTextMsg)
+                    {
+                        currentAttributedTextMsg = [[NSMutableAttributedString alloc] initWithAttributedString:component.attributedTextMessage];
+                    }
+                    else
+                    {
+                        // Append attributed text
+                        [currentAttributedTextMsg appendAttributedString:[MXKRoomBubbleCellDataWithAppendingMode messageSeparator]];
+                        [currentAttributedTextMsg appendAttributedString:component.attributedTextMessage];
+                    }
+                }
+            }
+            self.attributedTextMessage = currentAttributedTextMsg;
+        }
+    }
+    
+    return attributedTextMessage;
+}
+
+- (void)setMaxTextViewWidth:(CGFloat)inMaxTextViewWidth
+{
+    CGFloat previousMaxWidth = self.maxTextViewWidth;
+    
+    [super setMaxTextViewWidth:inMaxTextViewWidth];
+    
+    // Check change
+    if (previousMaxWidth != self.maxTextViewWidth)
+    {
+        // Position of each components should be computed again
+        shouldUpdateComponentsPosition = YES;
+    }
+}
+
+#pragma mark -
+
++ (NSAttributedString *)messageSeparator
+{
+    @synchronized(self)
+    {
+        if(messageSeparator == nil)
+        {
+            messageSeparator = [[NSAttributedString alloc] initWithString:@"\n\n" attributes:@{NSForegroundColorAttributeName : [UIColor blackColor],
+                                                                                               NSFontAttributeName: [UIFont systemFontOfSize:4]}];
+        }
+    }
+    return messageSeparator;
+}
+
+#pragma mark - Privates
+
+- (void)addComponent:(MXKRoomBubbleComponent*)addedComponent
+{
+    @synchronized(bubbleComponents)
+    {
+        // Check date of existing components to insert this new one
+        NSUInteger index = bubbleComponents.count;
+        
+        // Component without date is added at the end by default
+        if (addedComponent.date)
+        {
+            while (index)
+            {
+                MXKRoomBubbleComponent *msgComponent = [bubbleComponents objectAtIndex:(--index)];
+                if (msgComponent.date && [msgComponent.date compare:addedComponent.date] != NSOrderedDescending)
+                {
+                    // New component will be inserted here
+                    index ++;
+                    break;
+                }
+            }
+        }
+        
+        // Insert new component
+        [bubbleComponents insertObject:addedComponent atIndex:index];
+        
+        // Indicate that the data's text message layout should be recomputed.
+        [self invalidateTextLayout];
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellDataWithIncomingAppendingMode.h b/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellDataWithIncomingAppendingMode.h
new file mode 100644
index 000000000..49b050595
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellDataWithIncomingAppendingMode.h
@@ -0,0 +1,27 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomBubbleCellDataWithAppendingMode.h"
+
+/**
+ `MXKRoomBubbleCellDataWithIncomingAppendingMode` class inherits from `MXKRoomBubbleCellDataWithAppendingMode`, 
+  only the incoming message cells are merged.
+ */
+@interface MXKRoomBubbleCellDataWithIncomingAppendingMode : MXKRoomBubbleCellDataWithAppendingMode
+{
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellDataWithIncomingAppendingMode.m b/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellDataWithIncomingAppendingMode.m
new file mode 100644
index 000000000..ebe30784f
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellDataWithIncomingAppendingMode.m
@@ -0,0 +1,45 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomBubbleCellDataWithIncomingAppendingMode.h"
+
+@implementation MXKRoomBubbleCellDataWithIncomingAppendingMode
+
+#pragma mark - MXKRoomBubbleCellDataStoring
+
+- (BOOL)addEvent:(MXEvent*)event andRoomState:(MXRoomState*)roomState
+{
+    // Do not merge outgoing events
+    if  ([event.sender isEqualToString:roomDataSource.mxSession.myUser.userId])
+    {
+        return NO;
+    }
+    
+    return [super addEvent:event andRoomState:roomState];
+}
+
+- (BOOL)mergeWithBubbleCellData:(id<MXKRoomBubbleCellDataStoring>)bubbleCellData
+{
+    // Do not merge outgoing events
+    if  ([bubbleCellData.senderId isEqualToString:roomDataSource.mxSession.myUser.userId])
+    {
+        return NO;
+    }
+    
+    return [super mergeWithBubbleCellData:bubbleCellData];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleComponent.h b/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleComponent.h
new file mode 100644
index 000000000..3912932c8
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleComponent.h
@@ -0,0 +1,127 @@
+/*
+ Copyright 2015 OpenMarket 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 <MatrixSDK/MatrixSDK.h>
+
+#import "MXKEventFormatter.h"
+#import "MXKURLPreviewDataProtocol.h"
+
+/**
+ Flags to indicate if a fix is required at the display time.
+ */
+typedef enum : NSUInteger {
+
+    /**
+     No fix required.
+     */
+    MXKRoomBubbleComponentDisplayFixNone = 0,
+
+    /**
+     Borders for HTML blockquotes need to be fixed.
+     */
+    MXKRoomBubbleComponentDisplayFixHtmlBlockquote = 0x1
+
+} MXKRoomBubbleComponentDisplayFix;
+
+/**
+ `MXKRoomBubbleComponent` class compose data related to one `MXEvent` instance.
+ */
+@interface MXKRoomBubbleComponent : NSObject
+
+/**
+ The body of the message, or kind of content description in case of attachment (e.g. "image attachment").
+ */
+@property (nonatomic) NSString *textMessage;
+
+/**
+ The `textMessage` with sets of attributes.
+ */
+@property (nonatomic) NSAttributedString *attributedTextMessage;
+
+/**
+ The event date
+ */
+@property (nonatomic) NSDate *date;
+
+/**
+ Event formatter
+ */
+@property (nonatomic) MXKEventFormatter *eventFormatter;
+
+/**
+ The event on which the component is based (used in case of redaction)
+ */
+@property (nonatomic, readonly) MXEvent *event;
+
+// The following properties are defined to store information on component.
+// They must be handled by the object which creates the MXKRoomBubbleComponent instance.
+//@property (nonatomic) CGFloat height;
+@property (nonatomic) CGPoint position;
+
+/**
+ Set of flags indicating fixes that need to be applied at display time.
+ */
+@property (nonatomic) MXKRoomBubbleComponentDisplayFix displayFix;
+
+/**
+ The first link detected in the event's content, otherwise nil.
+ */
+@property (nonatomic) NSURL *link;
+
+/**
+ Any data necessary to show a URL preview.
+ Note: MatrixKit is unable to display this data by itself.
+ */
+@property (nonatomic) id <MXKURLPreviewDataProtocol> urlPreviewData;
+
+/**
+ Whether a URL preview should be displayed for this cell.
+ Note: MatrixKit is unable to display URL previews by itself.
+ */
+@property (nonatomic) BOOL showURLPreview;
+
+/**
+ Event antivirus scan. Present only if antivirus is enabled and event contains media.
+ */
+@property (nonatomic) MXEventScan *eventScan;
+
+/**
+ Indicate if an encryption badge should be shown.
+ */
+@property (nonatomic, readonly) BOOL showEncryptionBadge;
+
+/**
+ Create a new `MXKRoomBubbleComponent` object based on a `MXEvent` instance.
+ 
+ @param event the event used to compose the bubble component.
+ @param roomState the room state when the event occured.
+ @param eventFormatter object used to format event into displayable string.
+ @param session the related matrix session.
+ @return the newly created instance.
+ */
+- (instancetype)initWithEvent:(MXEvent*)event roomState:(MXRoomState*)roomState eventFormatter:(MXKEventFormatter*)eventFormatter session:(MXSession*)session;
+
+/**
+ Update the event because its sent state changed or it is has been redacted.
+
+ @param event the new event data.
+ @param roomState the up-to-date state of the room.
+ @param session the related matrix session.
+ */
+- (void)updateWithEvent:(MXEvent*)event roomState:(MXRoomState*)roomState session:(MXSession*)session;
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleComponent.m b/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleComponent.m
new file mode 100644
index 000000000..565519ba9
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleComponent.m
@@ -0,0 +1,189 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomBubbleComponent.h"
+
+#import "MXEvent+MatrixKit.h"
+#import "MXKSwiftHeader.h"
+
+@implementation MXKRoomBubbleComponent
+
+- (instancetype)initWithEvent:(MXEvent*)event roomState:(MXRoomState*)roomState eventFormatter:(MXKEventFormatter*)eventFormatter session:(MXSession*)session;
+{
+    if (self = [super init])
+    {
+        // Build text component related to this event
+        _eventFormatter = eventFormatter;
+        MXKEventFormatterError error;
+
+        NSAttributedString *eventString = [_eventFormatter attributedStringFromEvent:event withRoomState:roomState error:&error];
+        
+        // Store the potential error
+        event.mxkEventFormatterError = error;
+        
+        _textMessage = nil;
+        _attributedTextMessage = eventString;
+        
+        // Set date time
+        if (event.originServerTs != kMXUndefinedTimestamp)
+        {
+            _date = [NSDate dateWithTimeIntervalSince1970:(double)event.originServerTs/1000];
+        }
+        else
+        {
+            _date = nil;
+        }
+        
+        // Keep ref on event (used to handle the read marker, or a potential event redaction).
+        _event = event;
+
+        _displayFix = MXKRoomBubbleComponentDisplayFixNone;
+        if ([event.content[@"format"] isEqualToString:kMXRoomMessageFormatHTML])
+        {
+            if ([((NSString*)event.content[@"formatted_body"]) containsString:@"<blockquote"])
+            {
+                _displayFix |= MXKRoomBubbleComponentDisplayFixHtmlBlockquote;
+            }
+        }
+        
+        _showEncryptionBadge = [self shouldShowWarningBadgeForEvent:event roomState:(MXRoomState*)roomState session:session];
+        
+        [self updateLinkWithRoomState:roomState];
+    }
+    return self;
+}
+
+- (void)updateWithEvent:(MXEvent*)event roomState:(MXRoomState*)roomState session:(MXSession*)session
+{
+    // Report the new event
+    _event = event;
+
+    if (_event.isRedactedEvent)
+    {
+        // Do not use the live room state for redacted events as they occurred in the past
+        // Note: as we don't have valid room state in this case, userId will be used as display name
+        roomState = nil;
+    }
+    // Other calls to updateWithEvent are made to update the state of an event (ex: MXKEventStateSending to MXKEventStateDefault).
+    // They occur in live so we can use the room up-to-date state without making huge errors
+
+    _textMessage = nil;
+
+    MXKEventFormatterError error;
+    _attributedTextMessage = [_eventFormatter attributedStringFromEvent:event withRoomState:roomState error:&error];
+    
+    _showEncryptionBadge = [self shouldShowWarningBadgeForEvent:event roomState:roomState session:session];
+    
+    [self updateLinkWithRoomState:roomState];
+}
+
+- (NSString *)textMessage
+{
+    if (!_textMessage)
+    {
+        _textMessage = _attributedTextMessage.string;
+    }
+    return _textMessage;
+}
+
+- (void)updateLinkWithRoomState:(MXRoomState*)roomState
+{
+    // Ensure link detection has been enabled
+    if (!MXKAppSettings.standardAppSettings.enableBubbleComponentLinkDetection)
+    {
+        return;
+    }
+    
+    // Only detect links in unencrypted rooms, for un-redacted message events that are text, notice or emote.
+    // Specifically check the room's encryption state rather than the event's as outgoing events are always unencrypted initially.
+    if (roomState.isEncrypted || self.event.eventType != MXEventTypeRoomMessage || [self.event isRedactedEvent])
+    {
+        self.link = nil;    // Ensure there's no link for a redacted event
+        return;
+    }
+    
+    NSString *messageType = self.event.content[@"msgtype"];
+    
+    if (!messageType || !([messageType isEqualToString:kMXMessageTypeText] || [messageType isEqualToString:kMXMessageTypeNotice] || [messageType isEqualToString:kMXMessageTypeEmote]))
+    {
+        return;
+    }
+    
+    // Detect links in the attributed string which gets updated when the message is edited.
+    // Restrict detection to the unquoted string so links are only found in the sender's message.
+    NSString *body = [self.attributedTextMessage mxk_unquotedString];
+    NSURL *url = [body mxk_firstURLDetected];
+    
+    if (!url)
+    {
+        self.link = nil;
+        return;
+    }
+    
+    self.link = url;
+}
+
+- (BOOL)shouldShowWarningBadgeForEvent:(MXEvent*)event roomState:(MXRoomState*)roomState session:(MXSession*)session
+{
+    // Warning badges are unnecessary in unencrypted rooms
+    if (!roomState.isEncrypted)
+    {
+        return NO;
+    }
+    
+    // Not all events are encrypted (e.g. state/reactions/redactions) and we only have encrypted cell subclasses for messages and attachments.
+    if (event.eventType != MXEventTypeRoomMessage && !event.isMediaAttachment)
+    {
+        return NO;
+    }
+    
+    // Always show a warning badge if there was a decryption error.
+    if (event.decryptionError)
+    {
+        return YES;
+    }
+    
+    // Unencrypted message events should show a warning unless they're pending local echoes
+    if (!event.isEncrypted)
+    {
+        if (event.isLocalEvent
+            || event.contentHasBeenEdited)    // Local echo for an edit is clear but uses a true event id, the one of the edited event
+        {
+            return NO;
+        }
+            
+        return YES;
+    }
+    
+    // The encryption is in a good state.
+    // Only show a warning badge if there are trust issues.
+    if (event.sender)
+    {
+        MXUserTrustLevel *userTrustLevel = [session.crypto trustLevelForUser:event.sender];
+        MXDeviceInfo *deviceInfo = [session.crypto eventDeviceInfo:event];
+        
+        if (userTrustLevel.isVerified && !deviceInfo.trustLevel.isVerified)
+        {
+            return YES;
+        }
+    }
+    
+    // Everything was fine
+    return NO;
+}
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKRoomCreationInputs.h b/Riot/Modules/MatrixKit/Models/Room/MXKRoomCreationInputs.h
new file mode 100644
index 000000000..d17afefbd
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKRoomCreationInputs.h
@@ -0,0 +1,78 @@
+/*
+ Copyright 2015 OpenMarket 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/Foundation.h>
+#import <UIKit/UIImage.h>
+
+#import <MatrixSDK/MXEnumConstants.h>
+
+@class MXSession;
+
+/**
+ `MXKRoomCreationInputs` objects lists all the fields considered for a new room creation.
+ */
+@interface MXKRoomCreationInputs : NSObject
+
+/**
+ The selected matrix session in which the new room should be created.
+ */
+@property (nonatomic) MXSession* mxSession;
+
+/**
+ The room name.
+ */
+@property (nonatomic) NSString* roomName;
+
+/**
+ The room alias.
+ */
+@property (nonatomic) NSString* roomAlias;
+
+/**
+ The room topic.
+ */
+@property (nonatomic) NSString* roomTopic;
+
+/**
+ The room picture.
+ */
+@property (nonatomic) UIImage *roomPicture;
+
+/**
+ The room visibility (kMXRoomVisibilityPrivate by default).
+ */
+@property (nonatomic) MXRoomDirectoryVisibility roomVisibility;
+
+/**
+ The room participants (nil by default).
+ */
+@property (nonatomic) NSArray *roomParticipants;
+
+/**
+ Add a participant.
+ 
+ @param participantId The matrix user id of the participant.
+ */
+- (void)addParticipant:(NSString *)participantId;
+
+/**
+ Remove a participant.
+ 
+ @param participantId The matrix user id of the participant.
+ */
+- (void)removeParticipant:(NSString *)participantId;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKRoomCreationInputs.m b/Riot/Modules/MatrixKit/Models/Room/MXKRoomCreationInputs.m
new file mode 100644
index 000000000..f5cda5bb8
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKRoomCreationInputs.m
@@ -0,0 +1,74 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomCreationInputs.h"
+
+#import <MatrixSDK/MXSession.h>
+
+@interface MXKRoomCreationInputs ()
+{
+    NSMutableArray *participants;
+}
+@end
+
+@implementation MXKRoomCreationInputs
+
+- (instancetype)init
+{
+    self = [super init];
+    if (self)
+    {
+        _roomVisibility = kMXRoomDirectoryVisibilityPrivate;
+    }
+    return self;
+}
+
+- (void)setRoomParticipants:(NSArray *)roomParticipants
+{
+    participants = [NSMutableArray arrayWithArray:roomParticipants];
+}
+
+- (NSArray*)roomParticipants
+{
+    return participants;
+}
+
+- (void)addParticipant:(NSString *)participantId
+{
+    if (participantId.length)
+    {
+        if (!participants)
+        {
+            participants = [NSMutableArray array];
+        }
+        [participants addObject:participantId];
+    }
+}
+
+- (void)removeParticipant:(NSString *)participantId
+{
+    if (participantId.length)
+    {
+        [participants removeObject:participantId];
+        
+        if (!participants.count)
+        {
+            participants = nil;
+        }
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.h b/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.h
new file mode 100644
index 000000000..8559fba2d
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.h
@@ -0,0 +1,779 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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/UIKit.h>
+
+#import "MXKDataSource.h"
+#import "MXKRoomBubbleCellDataStoring.h"
+#import "MXKEventFormatter.h"
+
+@class MXKQueuedEvent;
+
+/**
+ Define the threshold which triggers a bubbles count flush.
+ */
+#define MXKROOMDATASOURCE_CACHED_BUBBLES_COUNT_THRESHOLD 30
+
+/**
+ Define the number of messages to preload around the initial event.
+ */
+#define MXKROOMDATASOURCE_PAGINATION_LIMIT_AROUND_INITIAL_EVENT 30
+
+/**
+ List the supported pagination of the rendered room bubble cells
+ */
+typedef enum : NSUInteger
+{
+    /**
+     No pagination
+     */
+    MXKRoomDataSourceBubblesPaginationNone,
+    /**
+     The rendered room bubble cells are paginated per day
+     */
+    MXKRoomDataSourceBubblesPaginationPerDay
+    
+} MXKRoomDataSourceBubblesPagination;
+
+
+#pragma mark - Cells identifiers
+
+/**
+ String identifying the object used to store and prepare room bubble data.
+ */
+extern NSString *const kMXKRoomBubbleCellDataIdentifier;
+
+
+#pragma mark - Notifications
+
+/**
+ Posted when a server sync starts or ends (depend on 'serverSyncEventCount').
+ The notification object is the `MXKRoomDataSource` instance.
+ */
+extern NSString *const kMXKRoomDataSourceSyncStatusChanged;
+
+/**
+ Posted when the data source has failed to paginate around an event.
+ The notification object is the `MXKRoomDataSource` instance. The `userInfo` dictionary contains the following key:
+     - kMXKRoomDataTimelineErrorErrorKey: The NSError.
+ */
+extern NSString *const kMXKRoomDataSourceTimelineError;
+
+/**
+ Notifications `userInfo` keys
+ */
+extern NSString *const kMXKRoomDataSourceTimelineErrorErrorKey;
+
+#pragma mark - MXKRoomDataSource
+@protocol MXKRoomBubbleCellDataStoring;
+@class MXKRoomBubbleCellData;
+
+/**
+ The data source for `MXKRoomViewController`.
+ */
+@interface MXKRoomDataSource : MXKDataSource <UITableViewDataSource>
+{
+@protected
+
+    /**
+     The data for the cells served by `MXKRoomDataSource`.
+     */
+    NSMutableArray<id<MXKRoomBubbleCellDataStoring>> *bubbles;
+
+    /**
+     The queue of events that need to be processed in order to compute their display.
+     */
+    NSMutableArray<MXKQueuedEvent*> *eventsToProcess;
+    
+    /**
+     The dictionary of the related groups that the current user did not join.
+     */
+    NSMutableDictionary<NSString*, MXGroup*> *externalRelatedGroups;
+}
+
+/**
+ The id of the room managed by the data source.
+ */
+@property (nonatomic, readonly) NSString *roomId;
+
+/**
+ The id of the secondary room managed by the data source. Events with specified types from the secondary room will be provided from the data source.
+ @see `secondaryRoomEventTypes`.
+ Can be nil.
+ */
+@property (nonatomic, copy) NSString *secondaryRoomId;
+
+/**
+ Types of events to include from the secondary room. Default is all call events.
+ */
+@property (nonatomic, copy) NSArray<MXEventTypeString> *secondaryRoomEventTypes;
+
+/**
+ The room the data comes from.
+ The object is defined when the MXSession has data for the room
+ */
+@property (nonatomic, readonly) MXRoom *room;
+
+/**
+ The preloaded room.state.
+ */
+@property (nonatomic, readonly) MXRoomState *roomState;
+
+/**
+ The timeline being managed. It can be the live timeline of the room
+ or a timeline from a past event, initialEventId.
+ */
+@property (nonatomic, readonly) MXEventTimeline *timeline;
+
+/**
+ Flag indicating if the data source manages, or will manage, a live timeline.
+ */
+@property (nonatomic, readonly) BOOL isLive;
+
+/**
+ Flag indicating if the data source is used to peek into a room, ie it gets data from
+ a room the user has not joined yet.
+ */
+@property (nonatomic, readonly) BOOL isPeeking;
+
+/**
+ The list of the attachments with thumbnail in the current available bubbles (MXKAttachment instances).
+ Note: the stickers are excluded from the returned list.
+ Note2: the attachments for which the antivirus scan status is not available are excluded too.
+ */
+@property (nonatomic, readonly) NSArray *attachmentsWithThumbnail;
+
+/**
+ The events are processed asynchronously. This property counts the number of queued events
+ during server sync for which the process is pending.
+ */
+@property (nonatomic, readonly) NSInteger serverSyncEventCount;
+
+/**
+ The current text message partially typed in text input (use nil to reset it).
+ */
+@property (nonatomic) NSString *partialTextMessage;
+
+#pragma mark - Configuration
+/**
+ The text formatter applied on the events.
+ By default, the events are filtered according to the value stored in the shared application settings (see [MXKAppSettings standardAppSettings].eventsFilterForMessages).
+ The events whose the type doesn't belong to the this list are not displayed.
+ `MXKRoomBubbleCellDataStoring` instances can use it to format text.
+ */
+@property (nonatomic) MXKEventFormatter *eventFormatter;
+
+/**
+ Show the date time label in rendered room bubble cells. NO by default.
+ */
+@property (nonatomic) BOOL showBubblesDateTime;
+
+/**
+ A Boolean value that determines whether the date time labels are customized (By default date time display is handled by MatrixKit). NO by default.
+ */
+@property (nonatomic) BOOL useCustomDateTimeLabel;
+
+/**
+ Show the read marker (if any) in the rendered room bubble cells. YES by default.
+ */
+@property (nonatomic) BOOL showReadMarker;
+
+/**
+ Show the receipts in rendered bubble cell. YES by default.
+ */
+@property (nonatomic) BOOL showBubbleReceipts;
+
+/**
+ A Boolean value that determines whether the read receipts are customized (By default read receipts display is handled by MatrixKit). NO by default.
+ */
+@property (nonatomic) BOOL useCustomReceipts;
+
+/**
+ Show the reactions in rendered bubble cell. NO by default.
+ */
+@property (nonatomic) BOOL showReactions;
+
+/**
+ Show only reactions with single Emoji. NO by default.
+ */
+@property (nonatomic) BOOL showOnlySingleEmojiReactions;
+
+/**
+ A Boolean value that determines whether the unsent button is customized (By default an 'Unsent' button is displayed by MatrixKit in front of unsent events). NO by default.
+ */
+@property (nonatomic) BOOL useCustomUnsentButton;
+
+/**
+ Show the typing notifications of other room members in the chat history (NO by default).
+ */
+@property (nonatomic) BOOL showTypingNotifications;
+
+/**
+ The pagination applied on the rendered room bubble cells (MXKRoomDataSourceBubblesPaginationNone by default).
+ */
+@property (nonatomic) MXKRoomDataSourceBubblesPagination bubblesPagination;
+
+/**
+ Max nbr of cached bubbles when there is no delegate.
+ The default value is 30.
+ */
+@property (nonatomic) unsigned long maxBackgroundCachedBubblesCount;
+
+/**
+ The number of messages to preload around the initial event.
+ The default value is 30.
+ */
+@property (nonatomic) NSUInteger paginationLimitAroundInitialEvent;
+
+/**
+ Tell whether only the message events with an url key in their content must be handled. NO by default.
+ Note: The stickers are not retained by this filter.
+ */
+@property (nonatomic) BOOL filterMessagesWithURL;
+
+#pragma mark - Life cycle
+
+/**
+ Asynchronously create a data source to serve data corresponding to the passed room.
+
+ This method preloads room data, like the room state, to make it available once
+ the room data source is created.
+
+ @param roomId the id of the room to get data from.
+ @param mxSession the Matrix session to get data from.
+ @param onComplete a block providing the newly created instance.
+ */
++ (void)loadRoomDataSourceWithRoomId:(NSString*)roomId andMatrixSession:(MXSession*)mxSession onComplete:(void (^)(id roomDataSource))onComplete;
+
+/**
+ Asynchronously create adata source to serve data corresponding to an event in the
+ past of a room.
+
+ This method preloads room data, like the room state, to make it available once
+ the room data source is created.
+
+ @param roomId the id of the room to get data from.
+ @param initialEventId the id of the event where to start the timeline.
+ @param mxSession the Matrix session to get data from.
+ @param onComplete a block providing the newly created instance.
+ */
++ (void)loadRoomDataSourceWithRoomId:(NSString*)roomId initialEventId:(NSString*)initialEventId andMatrixSession:(MXSession*)mxSession onComplete:(void (^)(id roomDataSource))onComplete;
+
+/**
+ Asynchronously create a data source to peek into a room.
+
+ The data source will close the `peekingRoom` instance on [self destroy].
+
+ This method preloads room data, like the room state, to make it available once
+ the room data source is created.
+
+ @param peekingRoom the room to peek.
+ @param initialEventId the id of the event where to start the timeline. nil means the live
+                       timeline.
+ @param onComplete a block providing the newly created instance.
+ */
++ (void)loadRoomDataSourceWithPeekingRoom:(MXPeekingRoom*)peekingRoom andInitialEventId:(NSString*)initialEventId onComplete:(void (^)(id roomDataSource))onComplete;
+
+#pragma mark - Constructors (Should not be called directly)
+
+/**
+ Initialise the data source to serve data corresponding to the passed room.
+ 
+ @param roomId the id of the room to get data from.
+ @param mxSession the Matrix session to get data from.
+ @return the newly created instance.
+ */
+- (instancetype)initWithRoomId:(NSString*)roomId andMatrixSession:(MXSession*)mxSession;
+
+/**
+ Initialise the data source to serve data corresponding to an event in the
+ past of a room.
+
+ @param roomId the id of the room to get data from.
+ @param initialEventId the id of the event where to start the timeline.
+ @param mxSession the Matrix session to get data from.
+ @return the newly created instance.
+ */
+- (instancetype)initWithRoomId:(NSString*)roomId initialEventId:(NSString*)initialEventId andMatrixSession:(MXSession*)mxSession;
+
+/**
+ Initialise the data source to peek into a room.
+ 
+ The data source will close the `peekingRoom` instance on [self destroy].
+
+ @param peekingRoom the room to peek.
+ @param initialEventId the id of the event where to start the timeline. nil means the live
+                       timeline.
+ @return the newly created instance.
+ */
+- (instancetype)initWithPeekingRoom:(MXPeekingRoom*)peekingRoom andInitialEventId:(NSString*)initialEventId;
+
+/**
+ Mark all messages as read in the room.
+ */
+- (void)markAllAsRead;
+
+/**
+ Reduce memory usage by releasing room data if the number of bubbles is over the provided limit 'maxBubbleNb'.
+ 
+ This operation is ignored if some local echoes are pending or if unread messages counter is not nil.
+ 
+ @param maxBubbleNb The room bubble data are released only if the number of bubbles is over this limit.
+ */
+- (void)limitMemoryUsage:(NSInteger)maxBubbleNb;
+
+/**
+ Force data reload.
+ */
+- (void)reload;
+
+/**
+ Called when room property changed. Designed to be used by subclasses.
+ */
+- (void)roomDidSet;
+
+#pragma mark - Public methods
+/**
+ Get the data for the cell at the given index.
+
+ @param index the index of the cell in the array
+ @return the cell data
+ */
+- (id<MXKRoomBubbleCellDataStoring>)cellDataAtIndex:(NSInteger)index;
+
+/**
+ Get the data for the cell which contains the event with the provided event id.
+
+ @param eventId the event identifier
+ @return the cell data
+ */
+- (id<MXKRoomBubbleCellDataStoring>)cellDataOfEventWithEventId:(NSString*)eventId;
+
+/**
+ Get the index of the cell which contains the event with the provided event id.
+
+ @param eventId the event identifier
+ @return the index of the concerned cell (NSNotFound if none).
+ */
+- (NSInteger)indexOfCellDataWithEventId:(NSString *)eventId;
+
+/**
+ Get height of the cell at the given index.
+
+ @param index the index of the cell in the array.
+ @param maxWidth the maximum available width.
+ @return the cell height (0 if no data is available for this cell, or if the delegate is undefined).
+ */
+- (CGFloat)cellHeightAtIndex:(NSInteger)index withMaximumWidth:(CGFloat)maxWidth;
+
+
+/**
+ Force bubbles cell data message recalculation.
+ */
+- (void)invalidateBubblesCellDataCache;
+
+#pragma mark - Pagination
+/**
+ Load more messages.
+ This method fails (with nil error) if the data source is not ready (see `MXKDataSourceStateReady`).
+ 
+ @param numItems the number of items to get.
+ @param direction backwards or forwards.
+ @param onlyFromStore if YES, return available events from the store, do not make a pagination request to the homeserver.
+ @param success a block called when the operation succeeds. This block returns the number of added cells.
+ (Note this count may be 0 if paginated messages have been concatenated to the current first cell).
+ @param failure a block called when the operation fails.
+ */
+- (void)paginate:(NSUInteger)numItems direction:(MXTimelineDirection)direction onlyFromStore:(BOOL)onlyFromStore success:(void (^)(NSUInteger addedCellNumber))success failure:(void (^)(NSError *error))failure;
+
+/**
+ Load enough messages to fill the rect.
+ This method fails (with nil error) if the data source is not ready (see `MXKDataSourceStateReady`),
+ or if the delegate is undefined (this delegate is required to compute the actual size of the cells).
+ 
+ @param rect the rect to fill.
+ @param direction backwards or forwards.
+ @param minRequestMessagesCount if messages are not available in the store, a request to the homeserver
+        is required. minRequestMessagesCount indicates the minimum messages count to retrieve from the hs.
+ @param success a block called when the operation succeeds.
+ @param failure a block called when the operation fails.
+ */
+- (void)paginateToFillRect:(CGRect)rect  direction:(MXTimelineDirection)direction withMinRequestMessagesCount:(NSUInteger)minRequestMessagesCount success:(void (^)(void))success failure:(void (^)(NSError *error))failure;
+
+
+#pragma mark - Sending
+/**
+ Send a text message to the room.
+ 
+ While sending, a fake event will be echoed in the messages list.
+ Once complete, this local echo will be replaced by the event saved by the homeserver.
+
+ @param text the text to send.
+ @param success A block object called when the operation succeeds. It returns
+                the event id of the event generated on the homeserver
+ @param failure A block object called when the operation fails.
+ */
+- (void)sendTextMessage:(NSString*)text
+                success:(void (^)(NSString *eventId))success
+                failure:(void (^)(NSError *error))failure;
+
+/**
+ Send a reply to an event with text message to the room.
+ 
+ While sending, a fake event will be echoed in the messages list.
+ Once complete, this local echo will be replaced by the event saved by the homeserver.
+ 
+ @param eventIdToReply the id of event to reply.
+ @param text the text to send.
+ @param success A block object called when the operation succeeds. It returns
+ the event id of the event generated on the homeserver
+ @param failure A block object called when the operation fails.
+ */
+- (void)sendReplyToEventWithId:(NSString*)eventIdToReply
+               withTextMessage:(NSString *)text
+                       success:(void (^)(NSString *))success
+                       failure:(void (^)(NSError *))failure;
+
+/**
+ Indicates if replying to the provided event is supported.
+ Only event of type 'MXEventTypeRoomMessage' are supported for the moment, and for certain msgtype.
+ 
+ @param eventId The id of the event.
+ @return YES if it is possible to reply to this event.
+ */
+- (BOOL)canReplyToEventWithId:(NSString*)eventId;
+
+/**
+ Send an image to the room.
+
+ While sending, a fake event will be echoed in the messages list.
+ Once complete, this local echo will be replaced by the event saved by the homeserver.
+
+ @param image the UIImage containing the image to send.
+ @param success A block object called when the operation succeeds. It returns
+                the event id of the event generated on the homeserver
+ @param failure A block object called when the operation fails.
+ */
+- (void)sendImage:(UIImage*)image
+          success:(void (^)(NSString *eventId))success
+          failure:(void (^)(NSError *error))failure;
+
+/**
+ Send an image to the room.
+ 
+ While sending, a fake event will be echoed in the messages list.
+ Once complete, this local echo will be replaced by the event saved by the homeserver.
+ 
+ @param imageData the full-sized image data of the image to send.
+ @param mimetype the mime type of the image
+ @param success A block object called when the operation succeeds. It returns
+ the event id of the event generated on the homeserver
+ @param failure A block object called when the operation fails.
+ */
+- (void)sendImage:(NSData*)imageData mimeType:(NSString*)mimetype success:(void (^)(NSString *))success failure:(void (^)(NSError *))failure;
+
+/**
+ Send a video to the room.
+
+ While sending, a fake event will be echoed in the messages list.
+ Once complete, this local echo will be replaced by the event saved by the homeserver.
+
+ @param videoLocalURL the local filesystem path of the video to send.
+ @param videoThumbnail the UIImage hosting a video thumbnail.
+ @param success A block object called when the operation succeeds. It returns
+                the event id of the event generated on the homeserver
+ @param failure A block object called when the operation fails.
+ */
+- (void)sendVideo:(NSURL*)videoLocalURL
+    withThumbnail:(UIImage*)videoThumbnail
+          success:(void (^)(NSString *eventId))success
+          failure:(void (^)(NSError *error))failure;
+
+/**
+ Send a video to the room.
+
+ While sending, a fake event will be echoed in the messages list.
+ Once complete, this local echo will be replaced by the event saved by the homeserver.
+
+ @param videoAsset the AVAsset that represents the video to send.
+ @param videoThumbnail the UIImage hosting a video thumbnail.
+ @param success A block object called when the operation succeeds. It returns
+                the event id of the event generated on the homeserver
+ @param failure A block object called when the operation fails.
+ */
+- (void)sendVideoAsset:(AVAsset*)videoAsset
+         withThumbnail:(UIImage*)videoThumbnail
+               success:(void (^)(NSString *eventId))success
+               failure:(void (^)(NSError *error))failure;
+
+/**
+ Send an audio file to the room.
+
+ While sending, a fake event will be echoed in the messages list.
+ Once complete, this local echo will be replaced by the event saved by the homeserver.
+
+ @param audioFileLocalURL the local filesystem path of the audio file to send.
+ @param mimeType the mime type of the file.
+ @param success A block object called when the operation succeeds. It returns
+                the event id of the event generated on the homeserver
+ @param failure A block object called when the operation fails.
+ */
+- (void)sendAudioFile:(NSURL *)audioFileLocalURL
+             mimeType:mimeType
+              success:(void (^)(NSString *))success
+              failure:(void (^)(NSError *))failure;
+
+/**
+ Send a voice message to the room.
+
+ While sending, a fake event will be echoed in the messages list.
+ Once complete, this local echo will be replaced by the event saved by the homeserver.
+
+ @param audioFileLocalURL the local filesystem path of the audio file to send.
+ @param mimeType (optional) the mime type of the file. Defaults to `audio/ogg`
+ @param duration the length of the voice message in milliseconds
+ @param samples an array of floating point values normalized to [0, 1], boxed within NSNumbers
+ @param success A block object called when the operation succeeds. It returns
+                the event id of the event generated on the homeserver
+ @param failure A block object called when the operation fails.
+ */
+- (void)sendVoiceMessage:(NSURL *)audioFileLocalURL
+                mimeType:mimeType
+                duration:(NSUInteger)duration
+                 samples:(NSArray<NSNumber *> *)samples
+                 success:(void (^)(NSString *))success
+                 failure:(void (^)(NSError *))failure;
+
+/**
+ Send a file to the room.
+ 
+ While sending, a fake event will be echoed in the messages list.
+ Once complete, this local echo will be replaced by the event saved by the homeserver.
+ 
+ @param fileLocalURL the local filesystem path of the file to send.
+ @param mimeType the mime type of the file.
+ @param success A block object called when the operation succeeds. It returns
+ the event id of the event generated on the homeserver
+ @param failure A block object called when the operation fails.
+ */
+- (void)sendFile:(NSURL*)fileLocalURL
+        mimeType:(NSString*)mimeType
+          success:(void (^)(NSString *eventId))success
+          failure:(void (^)(NSError *error))failure;
+
+/**
+ Send a room message to a room.
+ 
+ While sending, a fake event will be echoed in the messages list.
+ Once complete, this local echo will be replaced by the event saved by the homeserver.
+
+ @param content the message content that will be sent to the server as a JSON object.
+ @param success A block object called when the operation succeeds. It returns
+                the event id of the event generated on the homeserver
+ @param failure A block object called when the operation fails.
+ */
+- (void)sendMessageWithContent:(NSDictionary*)content
+                       success:(void (^)(NSString *eventId))success
+                       failure:(void (^)(NSError *error))failure;
+
+/**
+ Send a generic non state event to a room.
+
+ While sending, a fake event will be echoed in the messages list.
+ Once complete, this local echo will be replaced by the event saved by the homeserver.
+
+ @param eventTypeString the type of the event. @see MXEventType.
+ @param content the content that will be sent to the server as a JSON object.
+ @param success A block object called when the operation succeeds. It returns
+                the event id of the event generated on the homeserver
+ @param failure A block object called when the operation fails.
+ */
+- (void)sendEventOfType:(MXEventTypeString)eventTypeString
+                            content:(NSDictionary<NSString*, id>*)content
+                            success:(void (^)(NSString *eventId))success
+                            failure:(void (^)(NSError *error))failure;
+
+/**
+ Resend a room message event.
+ 
+ The echo message corresponding to the event will be removed and a new echo message
+ will be added at the end of the room history.
+
+ @param eventId of the event to resend.
+ @param success A block object called when the operation succeeds. It returns
+                the event id of the event generated on the homeserver
+ @param failure A block object called when the operation fails.
+ */
+- (void)resendEventWithEventId:(NSString*)eventId
+                  success:(void (^)(NSString *eventId))success
+                  failure:(void (^)(NSError *error))failure;
+
+
+#pragma mark - Events management
+/**
+ Get an event loaded in this room datasource.
+
+ @param eventId of the event to retrieve.
+ @return the MXEvent object or nil if not found.
+ */
+- (MXEvent *)eventWithEventId:(NSString *)eventId;
+
+/**
+ Remove an event from the events loaded by room datasource.
+
+ @param eventId of the event to remove.
+ */
+- (void)removeEventWithEventId:(NSString *)eventId;
+
+/**
+ This method is called for each read receipt event received in forward mode.
+ 
+ By default, it tells the delegate that some cell data/views have been changed.
+ You may override this method to handle the receipt event according to the application needs.
+ 
+ You should not call this method directly.
+ You may override it in inherited 'MXKRoomDataSource' class.
+ 
+ @param receiptEvent an event with 'm.receipt' type.
+ @param roomState the room state right before the event
+ */
+- (void)didReceiveReceiptEvent:(MXEvent *)receiptEvent roomState:(MXRoomState *)roomState;
+
+/**
+ Update read receipts for an event in a bubble cell data.
+
+ @param cellData The cell data to update.
+ @param readReceipts The new read receipts.
+ @param eventId The id of the event.
+ */
+- (void)updateCellData:(MXKRoomBubbleCellData*)cellData withReadReceipts:(NSArray<MXReceiptData*>*)readReceipts forEventId:(NSString*)eventId;
+
+/**
+ Overridable method to customise the way how unsent messages are managed.
+ By default, they are added to the end of the timeline.
+ */
+- (void)handleUnsentMessages;
+
+#pragma mark - Asynchronous events processing
+/**
+ The dispatch queue to process room messages.
+ 
+ This processing can consume time. Handling it on a separated thread avoids to block the main thread.
+ All MXKRoomDataSource instances share the same dispatch queue.
+ */
++ (dispatch_queue_t)processingQueue;
+
+#pragma mark - Bubble collapsing
+
+/**
+ Collapse or expand a series of collapsable bubbles.
+ 
+ @param bubbleData the first bubble of the series.
+ @param collapsed YES to collapse. NO to expand.
+ */
+- (void)collapseRoomBubble:(id<MXKRoomBubbleCellDataStoring>)bubbleData collapsed:(BOOL)collapsed;
+
+#pragma mark - Groups
+
+/**
+ Get a MXGroup instance for a group.
+ This method is used by the bubble to retrieve a related groups of the room.
+ 
+ @param groupId The identifier to the group.
+ @return the MXGroup instance.
+ */
+- (MXGroup *)groupWithGroupId:(NSString*)groupId;
+
+#pragma mark - Reactions
+
+/**
+ Indicates if it's possible to react on the event.
+
+ @param eventId The id of the event.
+ @return True to indicates reaction possibility for this event.
+ */
+- (BOOL)canReactToEventWithId:(NSString*)eventId;
+
+/**
+ Send a reaction to an event.
+
+ @param reaction Reaction to add.
+ @param eventId The id of the event.
+ @param success A block object called when the operation succeeds.
+ @param failure A block object called when the operation fails.
+ */
+- (void)addReaction:(NSString *)reaction
+         forEventId:(NSString *)eventId
+            success:(void (^)(void))success
+            failure:(void (^)(NSError *error))failure;
+
+/**
+ Unreact a reaction to an event.
+
+ @param reaction Reaction to unreact.
+ @param eventId The id of the event.
+ @param success A block object called when the operation succeeds.
+ @param failure A block object called when the operation fails.
+ */
+- (void)removeReaction:(NSString *)reaction
+            forEventId:(NSString *)eventId
+               success:(void (^)(void))success
+               failure:(void (^)(NSError *error))failure;
+
+#pragma mark - Editions
+
+/**
+ Indicates if it's possible to edit the event content.
+ 
+ @param eventId The id of the event.
+ @return True to indicates edition possibility for this event.
+ */
+- (BOOL)canEditEventWithId:(NSString*)eventId;
+
+/**
+ Replace a text in an event.
+
+ @param eventId The eventId of event to replace.
+ @param text The new message text.
+ @param success A block object called when the operation succeeds. It returns
+ the event id of the event generated on the homeserver.
+ @param failure A block object called when the operation fails.
+ */
+- (void)replaceTextMessageForEventWithId:(NSString *)eventId
+                         withTextMessage:(NSString *)text
+                                 success:(void (^)(NSString *eventId))success
+                                 failure:(void (^)(NSError *error))failure;
+
+
+/**
+ Update reactions for an event in a bubble cell data.
+
+ @param cellData The cell data to update.
+ @param eventId The id of the event.
+ */
+- (void)updateCellDataReactions:(id<MXKRoomBubbleCellDataStoring>)cellData forEventId:(NSString*)eventId;
+
+/**
+ Retrieve editable text message from an event.
+
+ @param event An event.
+ @return Event text editable by user.
+ */
+- (NSString*)editableTextMessageForEvent:(MXEvent*)event;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m b/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m
new file mode 100644
index 000000000..43ab3e623
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m
@@ -0,0 +1,4143 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 New Vector Ltd
+ Copyright 2019 The Matrix.org Foundation C.I.C
+
+ 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 "MXKRoomDataSource.h"
+
+@import MatrixSDK;
+
+#import "MXKQueuedEvent.h"
+#import "MXKRoomBubbleTableViewCell.h"
+
+#import "MXKRoomBubbleCellData.h"
+
+#import "MXKTools.h"
+#import "MXAggregatedReactions+MatrixKit.h"
+
+#import "MXKAppSettings.h"
+
+#import "MXKSendReplyEventStringLocalizer.h"
+#import "MXKSlashCommands.h"
+
+
+#pragma mark - Constant definitions
+
+NSString *const kMXKRoomBubbleCellDataIdentifier = @"kMXKRoomBubbleCellDataIdentifier";
+
+NSString *const kMXKRoomDataSourceSyncStatusChanged = @"kMXKRoomDataSourceSyncStatusChanged";
+NSString *const kMXKRoomDataSourceFailToLoadTimelinePosition = @"kMXKRoomDataSourceFailToLoadTimelinePosition";
+NSString *const kMXKRoomDataSourceTimelineError = @"kMXKRoomDataSourceTimelineError";
+NSString *const kMXKRoomDataSourceTimelineErrorErrorKey = @"kMXKRoomDataSourceTimelineErrorErrorKey";
+
+NSString * const MXKRoomDataSourceErrorDomain = @"kMXKRoomDataSourceErrorDomain";
+
+typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
+    MXKRoomDataSourceErrorResendGeneric = 10001,
+    MXKRoomDataSourceErrorResendInvalidMessageType = 10002,
+    MXKRoomDataSourceErrorResendInvalidLocalFilePath = 10003,
+};
+
+
+@interface MXKRoomDataSource ()
+{
+    /**
+     If the data is not from a live timeline, `initialEventId` is the event in the past
+     where the timeline starts.
+     */
+    NSString *initialEventId;
+
+    /**
+     Current pagination request (if any)
+     */
+    MXHTTPOperation *paginationRequest;
+    
+    /**
+     The actual listener related to the current pagination in the timeline.
+     */
+    id paginationListener;
+    
+    /**
+     The listener to incoming events in the room.
+     */
+    id liveEventsListener;
+    
+    /**
+     The listener to redaction events in the room.
+     */
+    id redactionListener;
+    
+    /**
+     The listener to receipts events in the room.
+     */
+    id receiptsListener;
+    
+    /**
+     The listener to the related groups state events in the room.
+     */
+    id relatedGroupsListener;
+
+    /**
+     The listener to reactions changed in the room.
+     */
+    id reactionsChangeListener;
+    
+    /**
+     The listener to edits in the room.
+     */
+    id eventEditsListener;
+    
+    /**
+     Current secondary pagination request (if any)
+     */
+    MXHTTPOperation *secondaryPaginationRequest;
+    
+    /**
+     The listener to incoming events in the secondary room.
+     */
+    id secondaryLiveEventsListener;
+    
+    /**
+     The listener to redaction events in the secondary room.
+     */
+    id secondaryRedactionListener;
+    
+    /**
+     The actual listener related to the current pagination in the secondary timeline.
+     */
+    id secondaryPaginationListener;
+    
+    /**
+     Mapping between events ids and bubbles.
+     */
+    NSMutableDictionary *eventIdToBubbleMap;
+    
+    /**
+     Typing notifications listener.
+     */
+    id typingNotifListener;
+    
+    /**
+     List of members who are typing in the room.
+     */
+    NSArray *currentTypingUsers;
+    
+    /**
+     Snapshot of the queued events.
+     */
+    NSMutableArray *eventsToProcessSnapshot;
+    
+    /**
+     Snapshot of the bubbles used during events processing.
+     */
+    NSMutableArray<id<MXKRoomBubbleCellDataStoring>> *bubblesSnapshot;
+    
+    /**
+     The room being peeked, if any.
+     */
+    MXPeekingRoom *peekingRoom;
+
+    /**
+     If any, the non terminated series of collapsable events at the start of self.bubbles.
+     (Such series is determined by the cell data of its oldest event).
+     */
+    id<MXKRoomBubbleCellDataStoring> collapsableSeriesAtStart;
+
+    /**
+     If any, the non terminated series of collapsable events at the end of self.bubbles.
+     (Such series is determined by the cell data of its oldest event).
+     */
+    id<MXKRoomBubbleCellDataStoring> collapsableSeriesAtEnd;
+
+    /**
+     Observe UIApplicationSignificantTimeChangeNotification to trigger cell change on time formatting change.
+     */
+    id UIApplicationSignificantTimeChangeNotificationObserver;
+    
+    /**
+     Observe NSCurrentLocaleDidChangeNotification to trigger cell change on time formatting change.
+     */
+    id NSCurrentLocaleDidChangeNotificationObserver;
+    
+    /**
+     Observe kMXRoomDidFlushDataNotification to trigger cell change when existing room history has been flushed during server sync.
+     */
+    id roomDidFlushDataNotificationObserver;
+    
+    /**
+     Observe kMXRoomDidUpdateUnreadNotification to refresh unread counters.
+     */
+    id roomDidUpdateUnreadNotificationObserver;
+    
+    /**
+     Emote slash command prefix @"/me "
+     */
+    NSString *emoteMessageSlashCommandPrefix;
+}
+
+/**
+ Indicate to stop back-paginating when finding an un-decryptable event as previous event.
+ It is used to hide pre join UTD events before joining the room.
+ */
+@property (nonatomic, assign) BOOL shouldPreventBackPaginationOnPreviousUTDEvent;
+
+/**
+ Indicate to stop back-paginating.
+ */
+@property (nonatomic, assign) BOOL shouldStopBackPagination;
+
+@property (nonatomic, readwrite) MXRoom *room;
+
+@property (nonatomic, readwrite) MXRoom *secondaryRoom;
+@property (nonatomic, strong) MXEventTimeline *secondaryTimeline;
+
+@end
+
+@implementation MXKRoomDataSource
+
++ (void)loadRoomDataSourceWithRoomId:(NSString*)roomId andMatrixSession:(MXSession*)mxSession onComplete:(void (^)(id roomDataSource))onComplete
+{
+    MXKRoomDataSource *roomDataSource = [[self alloc] initWithRoomId:roomId andMatrixSession:mxSession];
+    [self ensureSessionStateForDataSource:roomDataSource initialEventId:nil andMatrixSession:mxSession onComplete:onComplete];
+}
+
++ (void)loadRoomDataSourceWithRoomId:(NSString*)roomId initialEventId:(NSString*)initialEventId andMatrixSession:(MXSession*)mxSession onComplete:(void (^)(id roomDataSource))onComplete
+{
+    MXKRoomDataSource *roomDataSource = [[self alloc] initWithRoomId:roomId initialEventId:initialEventId andMatrixSession:mxSession];
+    [self ensureSessionStateForDataSource:roomDataSource initialEventId:initialEventId andMatrixSession:mxSession onComplete:onComplete];
+}
+
++ (void)loadRoomDataSourceWithPeekingRoom:(MXPeekingRoom*)peekingRoom andInitialEventId:(NSString*)initialEventId onComplete:(void (^)(id roomDataSource))onComplete
+{
+    MXKRoomDataSource *roomDataSource = [[self alloc] initWithPeekingRoom:peekingRoom andInitialEventId:initialEventId];
+    [self finalizeRoomDataSource:roomDataSource onComplete:onComplete];
+}
+
+/// Ensure session state to be store data ready for the roomDataSource.
++ (void)ensureSessionStateForDataSource:(MXKRoomDataSource*)roomDataSource initialEventId:(NSString*)initialEventId andMatrixSession:(MXSession*)mxSession onComplete:(void (^)(id roomDataSource))onComplete
+{
+    //  if store is not ready, roomDataSource.room will be nil. So onComplete block will never be called.
+    //  In order to successfully fetch the room, we should wait for store to be ready.
+    if (mxSession.state >= MXSessionStateStoreDataReady)
+    {
+        [self finalizeRoomDataSource:roomDataSource onComplete:onComplete];
+    }
+    else
+    {
+        //  wait for session state to be store data ready
+        __block id sessionStateObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXSessionStateDidChangeNotification object:mxSession queue:nil usingBlock:^(NSNotification * _Nonnull note) {
+            if (mxSession.state >= MXSessionStateStoreDataReady)
+            {
+                [[NSNotificationCenter defaultCenter] removeObserver:sessionStateObserver];
+                [self finalizeRoomDataSource:roomDataSource onComplete:onComplete];
+            }
+        }];
+    }
+}
+
++ (void)finalizeRoomDataSource:(MXKRoomDataSource*)roomDataSource onComplete:(void (^)(id roomDataSource))onComplete
+{
+    if (roomDataSource)
+    {
+        [roomDataSource finalizeInitialization];
+
+        // Asynchronously preload data here so that the data will be ready later
+        // to synchronously respond to that request
+        [roomDataSource.room liveTimeline:^(MXEventTimeline *liveTimeline) {
+            onComplete(roomDataSource);
+        }];
+    }
+}
+
+- (instancetype)initWithRoomId:(NSString *)roomId andMatrixSession:(MXSession *)matrixSession
+{
+    self = [super initWithMatrixSession:matrixSession];
+    if (self)
+    {
+        MXLogVerbose(@"[MXKRoomDataSource][%p] initWithRoomId: %@", self, roomId);
+        
+        _roomId = roomId;
+        _secondaryRoomEventTypes = @[
+            kMXEventTypeStringCallInvite,
+            kMXEventTypeStringCallCandidates,
+            kMXEventTypeStringCallAnswer,
+            kMXEventTypeStringCallSelectAnswer,
+            kMXEventTypeStringCallHangup,
+            kMXEventTypeStringCallReject,
+            kMXEventTypeStringCallNegotiate,
+            kMXEventTypeStringCallReplaces,
+            kMXEventTypeStringCallRejectReplacement
+        ];
+        NSString *virtualRoomId = [matrixSession virtualRoomOf:_roomId];
+        if (virtualRoomId)
+        {
+            _secondaryRoomId = virtualRoomId;
+        }
+        _isLive = YES;
+        bubbles = [NSMutableArray array];
+        eventsToProcess = [NSMutableArray array];
+        eventIdToBubbleMap = [NSMutableDictionary dictionary];
+        
+        externalRelatedGroups = [NSMutableDictionary dictionary];
+        
+        _filterMessagesWithURL = NO;
+        
+        emoteMessageSlashCommandPrefix = [NSString stringWithFormat:@"%@ ", kMXKSlashCmdEmote];
+
+        // Set default data and view classes
+        // Cell data
+        [self registerCellDataClass:MXKRoomBubbleCellData.class forCellIdentifier:kMXKRoomBubbleCellDataIdentifier];
+        
+        // Set default MXEvent -> NSString formatter
+        self.eventFormatter = [[MXKEventFormatter alloc] initWithMatrixSession:self.mxSession];
+        // Apply here the event types filter to display only the wanted event types.
+        self.eventFormatter.eventTypesFilterForMessages = [MXKAppSettings standardAppSettings].eventsFilterForMessages;
+        
+        // display the read receips by default
+        self.showBubbleReceipts = YES;
+        
+        // show the read marker by default
+        self.showReadMarker = YES;
+        
+        // Disable typing notification in cells by default.
+        self.showTypingNotifications = NO;
+        
+        self.useCustomDateTimeLabel = NO;
+        self.useCustomReceipts = NO;
+        self.useCustomUnsentButton = NO;
+        
+        _maxBackgroundCachedBubblesCount = MXKROOMDATASOURCE_CACHED_BUBBLES_COUNT_THRESHOLD;
+        _paginationLimitAroundInitialEvent = MXKROOMDATASOURCE_PAGINATION_LIMIT_AROUND_INITIAL_EVENT;
+
+        // Observe UIApplicationSignificantTimeChangeNotification to refresh bubbles if date/time are shown.
+        // UIApplicationSignificantTimeChangeNotification is posted if DST is updated, carrier time is updated
+        UIApplicationSignificantTimeChangeNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationSignificantTimeChangeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+            [self onDateTimeFormatUpdate];
+        }];
+        
+        // Observe NSCurrentLocaleDidChangeNotification to refresh bubbles if date/time are shown.
+        // NSCurrentLocaleDidChangeNotification is triggered when the time swicthes to AM/PM to 24h time format
+        NSCurrentLocaleDidChangeNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSCurrentLocaleDidChangeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+            
+            [self onDateTimeFormatUpdate];
+            
+        }];
+
+        // Listen to the event sent state changes
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(eventDidChangeSentState:) name:kMXEventDidChangeSentStateNotification object:nil];
+        // Listen to events decrypted
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(eventDidDecrypt:) name:kMXEventDidDecryptNotification object:nil];
+        // Listen to virtual rooms change
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(virtualRoomsDidChange:) name:kMXSessionVirtualRoomsDidChangeNotification object:matrixSession];
+    }
+    return self;
+}
+
+- (instancetype)initWithRoomId:(NSString*)roomId initialEventId:(NSString*)initialEventId2 andMatrixSession:(MXSession*)mxSession
+{
+    self = [self initWithRoomId:roomId andMatrixSession:mxSession];
+    if (self)
+    {
+        if (initialEventId2)
+        {
+            initialEventId = initialEventId2;
+            _isLive = NO;
+        }
+    }
+
+    return self;
+}
+
+- (instancetype)initWithPeekingRoom:(MXPeekingRoom*)peekingRoom2 andInitialEventId:(NSString*)theInitialEventId
+{
+    self = [self initWithRoomId:peekingRoom2.roomId initialEventId:theInitialEventId andMatrixSession:peekingRoom2.mxSession];
+    if (self)
+    {
+        peekingRoom = peekingRoom2;
+        _isPeeking = YES;
+    }
+    return self;
+}
+
+- (void)dealloc
+{
+    [self unregisterEventEditsListener];
+    [self unregisterScanManagerNotifications];
+    [self unregisterReactionsChangeListener];
+}
+
+- (MXRoomState *)roomState
+{
+    // @TODO(async-state): Just here for dev
+    NSAssert(_timeline.state, @"[MXKRoomDataSource] Room state must be preloaded before accessing to MXKRoomDataSource.roomState");
+    return _timeline.state;
+}
+
+- (void)onDateTimeFormatUpdate
+{
+    // update the date and the time formatters
+    [self.eventFormatter initDateTimeFormatters];
+    
+    // refresh the UI if it is required
+    if (self.showBubblesDateTime && self.delegate)
+    {
+        // Reload all the table
+        [self.delegate dataSource:self didCellChange:nil];
+    }
+}
+
+- (void)markAllAsRead
+{
+    [_room.summary markAllAsRead];
+}
+
+- (void)limitMemoryUsage:(NSInteger)maxBubbleNb
+{
+    NSInteger bubbleCount;
+    @synchronized(bubbles)
+    {
+        bubbleCount = bubbles.count;
+    }
+    
+    if (bubbleCount > maxBubbleNb)
+    {
+        // Do nothing if some local echoes are in progress.
+        NSArray<MXEvent*>* outgoingMessages = _room.outgoingMessages;
+        
+        for (NSInteger index = 0; index < outgoingMessages.count; index++)
+        {
+            MXEvent *outgoingMessage = [outgoingMessages objectAtIndex:index];
+            
+            if (outgoingMessage.sentState == MXEventSentStateSending ||
+                outgoingMessage.sentState == MXEventSentStatePreparing ||
+                outgoingMessage.sentState == MXEventSentStateEncrypting ||
+                outgoingMessage.sentState == MXEventSentStateUploading)
+            {
+                MXLogDebug(@"[MXKRoomDataSource][%p] cancel limitMemoryUsage because some messages are being sent", self);
+                return;
+            }
+        }
+
+        // Reset the room data source (return in initial state: minimum memory usage).
+        [self reload];
+    }
+}
+
+- (void)reset
+{
+    [self resetNotifying:YES];
+}
+
+- (void)resetNotifying:(BOOL)notify
+{
+    [externalRelatedGroups removeAllObjects];
+    
+    if (roomDidFlushDataNotificationObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:roomDidFlushDataNotificationObserver];
+        roomDidFlushDataNotificationObserver = nil;
+    }
+    
+    if (roomDidUpdateUnreadNotificationObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:roomDidUpdateUnreadNotificationObserver];
+        roomDidUpdateUnreadNotificationObserver = nil;
+    }
+    
+    if (paginationRequest)
+    {
+        // We have to remove here the listener. A new pagination request may be triggered whereas the cancellation of this one is in progress
+        [_timeline removeListener:paginationListener];
+        paginationListener = nil;
+        
+        [paginationRequest cancel];
+        paginationRequest = nil;
+    }
+    
+    if (secondaryPaginationRequest)
+    {
+        // We have to remove here the listener. A new pagination request may be triggered whereas the cancellation of this one is in progress
+        [_secondaryTimeline removeListener:secondaryPaginationListener];
+        secondaryPaginationListener = nil;
+        
+        [secondaryPaginationRequest cancel];
+        secondaryPaginationRequest = nil;
+    }
+    
+    if (_room && liveEventsListener)
+    {
+        [_timeline removeListener:liveEventsListener];
+        liveEventsListener = nil;
+        
+        [_timeline removeListener:redactionListener];
+        redactionListener = nil;
+        
+        [_timeline removeListener:receiptsListener];
+        receiptsListener = nil;
+        
+        [_timeline removeListener:relatedGroupsListener];
+        relatedGroupsListener = nil;
+    }
+    
+    if (_secondaryRoom && secondaryLiveEventsListener)
+    {
+        [_secondaryTimeline removeListener:secondaryLiveEventsListener];
+        secondaryLiveEventsListener = nil;
+        
+        [_secondaryTimeline removeListener:secondaryRedactionListener];
+        secondaryRedactionListener = nil;
+    }
+    
+    if (_room && typingNotifListener)
+    {
+        [_timeline removeListener:typingNotifListener];
+        typingNotifListener = nil;
+    }
+    currentTypingUsers = nil;
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXRoomInitialSyncNotification object:nil];
+    
+    @synchronized(eventsToProcess)
+    {
+        MXLogVerbose(@"[MXKRoomDataSource][%p] Reset eventsToProcess", self);
+        [eventsToProcess removeAllObjects];
+    }
+    
+    // Suspend the reset operation if some events is under processing
+    @synchronized(eventsToProcessSnapshot)
+    {
+        eventsToProcessSnapshot = nil;
+        bubblesSnapshot = nil;
+        
+        @synchronized(bubbles)
+        {
+            for (id<MXKRoomBubbleCellDataStoring> bubble in bubbles) {
+                bubble.prevCollapsableCellData = nil;
+                bubble.nextCollapsableCellData = nil;
+            }
+            [bubbles removeAllObjects];
+        }
+        
+        @synchronized(eventIdToBubbleMap)
+        {
+            [eventIdToBubbleMap removeAllObjects];
+        }
+        
+        self.room = nil;
+        self.secondaryRoom = nil;
+    }
+    
+    _serverSyncEventCount = 0;
+
+    // Notify the delegate to reload its tableview
+    if (notify && self.delegate)
+    {
+        [self.delegate dataSource:self didCellChange:nil];
+    }
+}
+
+- (void)reload
+{
+    [self reloadNotifying:YES];
+}
+
+- (void)reloadNotifying:(BOOL)notify
+{
+    MXLogVerbose(@"[MXKRoomDataSource][%p] Reload - room id: %@", self, _roomId);
+    
+    [self setState:MXKDataSourceStatePreparing];
+    
+    [self resetNotifying:notify];
+    
+    // Reload
+    [self didMXSessionStateChange];
+}
+
+- (void)destroy
+{
+    MXLogDebug(@"[MXKRoomDataSource][%p] Destroy - room id: %@", self, _roomId);
+    
+    [self unregisterScanManagerNotifications];
+    [self unregisterReactionsChangeListener];
+    [self unregisterEventEditsListener];
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionDidUpdatePublicisedGroupsForUsersNotification object:self.mxSession];
+
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXEventDidChangeSentStateNotification object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXEventDidDecryptNotification object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXEventDidChangeIdentifierNotification object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionVirtualRoomsDidChangeNotification object:nil];
+
+    if (NSCurrentLocaleDidChangeNotificationObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:NSCurrentLocaleDidChangeNotificationObserver];
+        NSCurrentLocaleDidChangeNotificationObserver = nil;
+    }
+    
+    if (UIApplicationSignificantTimeChangeNotificationObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:UIApplicationSignificantTimeChangeNotificationObserver];
+        UIApplicationSignificantTimeChangeNotificationObserver = nil;
+    }
+
+    // If the room data source was used to peek into a room, stop the events stream on this room
+    if (peekingRoom)
+    {
+        [_room.mxSession stopPeeking:peekingRoom];
+    }
+
+    [self reset];
+    
+    self.eventFormatter = nil;
+    
+    eventsToProcess = nil;
+    bubbles = nil;
+    eventIdToBubbleMap = nil;
+
+    [_timeline destroy];
+    [_secondaryTimeline destroy];
+    
+    externalRelatedGroups = nil;
+    
+    [super destroy];
+}
+
+- (void)didMXSessionStateChange
+{
+    if (MXSessionStateStoreDataReady <= self.mxSession.state)
+    {
+        // Check whether the room is not already set
+        if (!_room)
+        {
+            // Are we peeking into a random room or displaying a room the user is part of?
+            if (peekingRoom)
+            {
+                self.room = peekingRoom;
+            }
+            else
+            {
+                self.room = [self.mxSession roomWithRoomId:_roomId];
+            }
+
+            if (_room)
+            {
+                // This is the time to set up the timeline according to the called init method
+                if (_isLive)
+                {
+                    // LIVE
+                    MXWeakify(self);
+                    [_room liveTimeline:^(MXEventTimeline *liveTimeline) {
+                        MXStrongifyAndReturnIfNil(self);
+
+                        self->_timeline = liveTimeline;
+
+                        // Only one pagination process can be done at a time by an MXRoom object.
+                        // This assumption is satisfied by MatrixKit. Only MXRoomDataSource does it.
+                        [self.timeline resetPagination];
+
+                        // Observe room history flush (sync with limited timeline, or state event redaction)
+                        self->roomDidFlushDataNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXRoomDidFlushDataNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+
+                            MXRoom *room = notif.object;
+                            if (self.mxSession == room.mxSession && ([self.roomId isEqualToString:room.roomId] ||
+                                                                     ([self.secondaryRoomId isEqualToString:room.roomId])))
+                            {
+                                // The existing room history has been flushed during server sync because a gap has been observed between local and server storage.
+                                [self reload];
+                            }
+
+                        }];
+
+                        // Add the event listeners, by considering all the event types (the event filtering is applying by the event formatter),
+                        // except if only the events with a url key in their content must be handled.
+                        [self refreshEventListeners:(self.filterMessagesWithURL ? @[kMXEventTypeStringRoomMessage] : [MXKAppSettings standardAppSettings].allEventTypesForMessages)];
+
+                        // display typing notifications is optional
+                        // the inherited class can manage them by its own.
+                        if (self.showTypingNotifications)
+                        {
+                            // Register on typing notif
+                            [self listenTypingNotifications];
+                        }
+
+                        // Manage unsent messages
+                        [self handleUnsentMessages];
+
+                        // Update here data source state if it is not already ready
+                        if (!self->_secondaryRoomId)
+                        {
+                            [self setState:MXKDataSourceStateReady];
+                        }
+
+                        // Check user membership in this room
+                        MXMembership membership = self.room.summary.membership;
+                        if (membership == MXMembershipUnknown || membership == MXMembershipInvite)
+                        {
+                            // Here the initial sync is not ended or the room is a pending invitation.
+                            // Note: In case of invitation, a full sync will be triggered if the user joins this room.
+
+                            // We have to observe here 'kMXRoomInitialSyncNotification' to reload room data when room sync is done.
+                            [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didMXRoomInitialSynced:) name:kMXRoomInitialSyncNotification object:self.room];
+                        }
+                    }];
+                    
+                    if (!_secondaryRoom && _secondaryRoomId)
+                    {
+                        _secondaryRoom = [self.mxSession roomWithRoomId:_secondaryRoomId];
+                        
+                        if (_secondaryRoom)
+                        {
+                            MXWeakify(self);
+                            [_secondaryRoom liveTimeline:^(MXEventTimeline *liveTimeline) {
+                                MXStrongifyAndReturnIfNil(self);
+
+                                self->_secondaryTimeline = liveTimeline;
+
+                                // Only one pagination process can be done at a time by an MXRoom object.
+                                // This assumption is satisfied by MatrixKit. Only MXRoomDataSource does it.
+                                [self.secondaryTimeline resetPagination];
+
+                                // Add the secondary event listeners, by considering the event types in self.secondaryRoomEventTypes
+                                [self refreshSecondaryEventListeners:self.secondaryRoomEventTypes];
+                                
+                                // Update here data source state if it is not already ready
+                                [self setState:MXKDataSourceStateReady];
+
+                                // Check user membership in the secondary room
+                                MXMembership membership = self.secondaryRoom.summary.membership;
+                                if (membership == MXMembershipUnknown || membership == MXMembershipInvite)
+                                {
+                                    // Here the initial sync is not ended or the room is a pending invitation.
+                                    // Note: In case of invitation, a full sync will be triggered if the user joins this room.
+
+                                    // We have to observe here 'kMXRoomInitialSyncNotification' to reload room data when room sync is done.
+                                    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didMXRoomInitialSynced:) name:kMXRoomInitialSyncNotification object:self.secondaryRoom];
+                                }
+                            }];
+                        }
+                    }
+                }
+                else
+                {
+                    // Past timeline
+                    // Less things need to configured
+                    _timeline = [_room timelineOnEvent:initialEventId];
+
+                    // Refresh the event listeners. Note: events for past timelines come only from pagination request
+                    [self refreshEventListeners:nil];
+                    
+                    MXWeakify(self);
+
+                    // Preload the state and some messages around the initial event
+                    [_timeline resetPaginationAroundInitialEventWithLimit:_paginationLimitAroundInitialEvent success:^{
+
+                        MXStrongifyAndReturnIfNil(self);
+                        
+                        // Do a "classic" reset. The room view controller will paginate
+                        // from the events stored in the timeline store
+                        [self.timeline resetPagination];
+                        
+                        // Update here data source state if it is not already ready
+                        [self setState:MXKDataSourceStateReady];
+
+                    } failure:^(NSError *error) {
+                        
+                        MXStrongifyAndReturnIfNil(self);
+
+                        MXLogDebug(@"[MXKRoomDataSource][%p] Failed to resetPaginationAroundInitialEventWithLimit", self);
+
+                        // Notify the error
+                        [[NSNotificationCenter defaultCenter] postNotificationName:kMXKRoomDataSourceTimelineError
+                                                                            object:self
+                                                                          userInfo:@{
+                                                                                     kMXKRoomDataSourceTimelineErrorErrorKey: error
+                                                                                     }];
+                    }];
+                }
+            }
+            else
+            {
+                MXLogDebug(@"[MXKRoomDataSource][%p] Warning: The user does not know the room %@", self, _roomId);
+                
+                // Update here data source state if it is not already ready
+                [self setState:MXKDataSourceStateFailed];
+            }
+        }
+        
+        if (_room && MXSessionStateRunning == self.mxSession.state)
+        {
+            // Flair handling: observe the update in the publicised groups by users when the flair is enabled in the room.
+            [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionDidUpdatePublicisedGroupsForUsersNotification object:self.mxSession];
+            [self.room state:^(MXRoomState *roomState) {
+                if (roomState.relatedGroups.count)
+                {
+                    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didMXSessionUpdatePublicisedGroupsForUsers:) name:kMXSessionDidUpdatePublicisedGroupsForUsersNotification object:self.mxSession];
+
+                    // Get a fresh profile for all the related groups. Trigger a table refresh when all requests are done.
+                    __block NSUInteger count = roomState.relatedGroups.count;
+                    for (NSString *groupId in roomState.relatedGroups)
+                    {
+                        MXGroup *group = [self.mxSession groupWithGroupId:groupId];
+                        if (!group)
+                        {
+                            // Create a group instance for the groups that the current user did not join.
+                            group = [[MXGroup alloc] initWithGroupId:groupId];
+                            [self->externalRelatedGroups setObject:group forKey:groupId];
+                        }
+
+                        // Refresh the group profile from server.
+                        [self.mxSession updateGroupProfile:group success:^{
+
+                            if (self.delegate && !(--count))
+                            {
+                                // All the requests have been done.
+                                [self.delegate dataSource:self didCellChange:nil];
+                            }
+
+                        } failure:^(NSError *error) {
+
+                            MXLogDebug(@"[MXKRoomDataSource][%p] group profile update failed %@", self, groupId);
+
+                            if (self.delegate && !(--count))
+                            {
+                                // All the requests have been done.
+                                [self.delegate dataSource:self didCellChange:nil];
+                            }
+
+                        }];
+                    }
+                }
+            }];
+        }
+    }
+}
+
+- (NSArray *)attachmentsWithThumbnail
+{
+    NSMutableArray *attachments = [NSMutableArray array];
+    
+    @synchronized(bubbles)
+    {
+        for (id<MXKRoomBubbleCellDataStoring> bubbleData in bubbles)
+        {
+            if (bubbleData.isAttachmentWithThumbnail && bubbleData.attachment.type != MXKAttachmentTypeSticker && !bubbleData.showAntivirusScanStatus)
+            {
+                [attachments addObject:bubbleData.attachment];
+            }
+        }
+    }
+    
+    return attachments;
+}
+
+- (NSString *)partialTextMessage
+{
+    return _room.partialTextMessage;
+}
+
+- (void)setPartialTextMessage:(NSString *)partialTextMessage
+{
+    _room.partialTextMessage = partialTextMessage;
+}
+
+- (void)refreshEventListeners:(NSArray *)liveEventTypesFilterForMessages
+{
+    // Remove the existing listeners
+    if (liveEventsListener)
+    {
+        [_timeline removeListener:liveEventsListener];
+        [_timeline removeListener:redactionListener];
+        [_timeline removeListener:receiptsListener];
+        [_timeline removeListener:relatedGroupsListener];
+    }
+
+    // Listen to live events only for live timeline
+    // Events for past timelines come only from pagination request
+    if (_isLive)
+    {
+        // Register a new one with the requested filter
+        MXWeakify(self);
+        liveEventsListener = [_timeline listenToEventsOfTypes:liveEventTypesFilterForMessages onEvent:^(MXEvent *event, MXTimelineDirection direction, MXRoomState *roomState) {
+            
+            MXStrongifyAndReturnIfNil(self);
+            
+            if (MXTimelineDirectionForwards == direction)
+            {
+                // Check for local echo suppression
+                MXEvent *localEcho;
+                if (self.room.outgoingMessages.count && [event.sender isEqualToString:self.mxSession.myUser.userId])
+                {
+                    localEcho = [self.room pendingLocalEchoRelatedToEvent:event];
+                    if (localEcho)
+                    {
+                        // Check whether the local echo has a timestamp (in this case, it is replaced with the actual event).
+                        if (localEcho.originServerTs != kMXUndefinedTimestamp)
+                        {
+                            // Replace the local echo by the true event sent by the homeserver
+                            [self replaceEvent:localEcho withEvent:event];
+                        }
+                        else
+                        {
+                            // Remove the local echo, and process independently the true event.
+                            [self replaceEvent:localEcho withEvent:nil];
+                            localEcho = nil;
+                        }
+                    }
+                }
+
+                if (self.secondaryRoom)
+                {
+                    [self reloadNotifying:NO];
+                }
+                else if (nil == localEcho)
+                {
+                    // Process here incoming events, and outgoing events sent from another device.
+                    [self queueEventForProcessing:event withRoomState:roomState direction:MXTimelineDirectionForwards];
+                    [self processQueuedEvents:nil];
+                }
+            }
+        }];
+
+        receiptsListener = [_timeline listenToEventsOfTypes:@[kMXEventTypeStringReceipt] onEvent:^(MXEvent *event, MXTimelineDirection direction, MXRoomState *roomState) {
+
+            if (MXTimelineDirectionForwards == direction)
+            {
+                // Handle this read receipt
+                [self didReceiveReceiptEvent:event roomState:roomState];
+            }
+        }];
+        
+        // Flair handling: register a listener for the related groups state event in this room.
+        relatedGroupsListener = [_timeline listenToEventsOfTypes:@[kMXEventTypeStringRoomRelatedGroups] onEvent:^(MXEvent *event, MXTimelineDirection direction, MXRoomState *roomState) {
+            
+            if (MXTimelineDirectionForwards == direction)
+            {
+                // The flair settings have been updated: flush the current bubble data and rebuild them.
+                [self reload];
+            }
+        }];
+    }
+
+    // Register a listener to handle redaction which can affect live and past timelines
+    redactionListener = [_timeline listenToEventsOfTypes:@[kMXEventTypeStringRoomRedaction] onEvent:^(MXEvent *redactionEvent, MXTimelineDirection direction, MXRoomState *roomState) {
+
+        // Consider only live redaction events
+        if (direction == MXTimelineDirectionForwards)
+        {
+            // Do the processing on the processing queue
+            dispatch_async(MXKRoomDataSource.processingQueue, ^{
+
+                // Check whether a message contains the redacted event
+                id<MXKRoomBubbleCellDataStoring> bubbleData = [self cellDataOfEventWithEventId:redactionEvent.redacts];
+                if (bubbleData)
+                {
+                    BOOL shouldRemoveBubbleData = NO;
+                    BOOL hasChanged = NO;
+                    MXEvent *redactedEvent = nil;
+
+                    @synchronized (bubbleData)
+                    {
+                        // Retrieve the original event to redact it
+                        NSArray *events = bubbleData.events;
+
+                        for (MXEvent *event in events)
+                        {
+                            if ([event.eventId isEqualToString:redactionEvent.redacts])
+                            {
+                                // Check whether the event was not already redacted (Redaction may be handled by event timeline too).
+                                if (!event.isRedactedEvent)
+                                {
+                                    redactedEvent = [event prune];
+                                    redactedEvent.redactedBecause = redactionEvent.JSONDictionary;
+                                }
+
+                                break;
+                            }
+                        }
+
+                        if (redactedEvent)
+                        {
+                            // Update bubble data
+                            NSUInteger remainingEvents = [bubbleData updateEvent:redactionEvent.redacts withEvent:redactedEvent];
+
+                            hasChanged = YES;
+
+                            // Remove the bubble if there is no more events
+                            shouldRemoveBubbleData = (remainingEvents == 0);
+                        }
+                    }
+
+                    // Check whether the bubble should be removed
+                    if (shouldRemoveBubbleData)
+                    {
+                        [self removeCellData:bubbleData];
+                    }
+
+                    if (hasChanged)
+                    {
+                        // Update the delegate on main thread
+                        dispatch_async(dispatch_get_main_queue(), ^{
+
+                            if (self.delegate)
+                            {
+                                [self.delegate dataSource:self didCellChange:nil];
+                            }
+
+                        });
+                    }
+                }
+
+            });
+        }
+    }];
+}
+
+- (void)refreshSecondaryEventListeners:(NSArray *)liveEventTypesFilterForMessages
+{
+    // Remove the existing listeners
+    if (secondaryLiveEventsListener)
+    {
+        [_secondaryTimeline removeListener:secondaryLiveEventsListener];
+        [_secondaryTimeline removeListener:secondaryRedactionListener];
+    }
+
+    // Listen to live events only for live timeline
+    // Events for past timelines come only from pagination request
+    if (_isLive)
+    {
+        // Register a new one with the requested filter
+        MXWeakify(self);
+        secondaryLiveEventsListener = [_secondaryTimeline listenToEventsOfTypes:liveEventTypesFilterForMessages onEvent:^(MXEvent *event, MXTimelineDirection direction, MXRoomState *roomState) {
+            
+            MXStrongifyAndReturnIfNil(self);
+            
+            if (MXTimelineDirectionForwards == direction)
+            {
+                // Check for local echo suppression
+                MXEvent *localEcho;
+                if (self.secondaryRoom.outgoingMessages.count && [event.sender isEqualToString:self.mxSession.myUserId])
+                {
+                    localEcho = [self.secondaryRoom pendingLocalEchoRelatedToEvent:event];
+                    if (localEcho)
+                    {
+                        // Check whether the local echo has a timestamp (in this case, it is replaced with the actual event).
+                        if (localEcho.originServerTs != kMXUndefinedTimestamp)
+                        {
+                            // Replace the local echo by the true event sent by the homeserver
+                            [self replaceEvent:localEcho withEvent:event];
+                        }
+                        else
+                        {
+                            // Remove the local echo, and process independently the true event.
+                            [self replaceEvent:localEcho withEvent:nil];
+                            localEcho = nil;
+                        }
+                    }
+                }
+
+                if (nil == localEcho)
+                {
+                    // Process here incoming events, and outgoing events sent from another device.
+                    [self queueEventForProcessing:event withRoomState:roomState direction:MXTimelineDirectionForwards];
+                    [self processQueuedEvents:nil];
+                }
+            }
+        }];
+
+    }
+
+    // Register a listener to handle redaction which can affect live and past timelines
+    secondaryRedactionListener = [_secondaryTimeline listenToEventsOfTypes:@[kMXEventTypeStringRoomRedaction] onEvent:^(MXEvent *redactionEvent, MXTimelineDirection direction, MXRoomState *roomState) {
+
+        // Consider only live redaction events
+        if (direction == MXTimelineDirectionForwards)
+        {
+            // Do the processing on the processing queue
+            dispatch_async(MXKRoomDataSource.processingQueue, ^{
+
+                // Check whether a message contains the redacted event
+                id<MXKRoomBubbleCellDataStoring> bubbleData = [self cellDataOfEventWithEventId:redactionEvent.redacts];
+                if (bubbleData)
+                {
+                    BOOL shouldRemoveBubbleData = NO;
+                    BOOL hasChanged = NO;
+                    MXEvent *redactedEvent = nil;
+
+                    @synchronized (bubbleData)
+                    {
+                        // Retrieve the original event to redact it
+                        NSArray *events = bubbleData.events;
+
+                        for (MXEvent *event in events)
+                        {
+                            if ([event.eventId isEqualToString:redactionEvent.redacts])
+                            {
+                                // Check whether the event was not already redacted (Redaction may be handled by event timeline too).
+                                if (!event.isRedactedEvent)
+                                {
+                                    redactedEvent = [event prune];
+                                    redactedEvent.redactedBecause = redactionEvent.JSONDictionary;
+                                }
+
+                                break;
+                            }
+                        }
+
+                        if (redactedEvent)
+                        {
+                            // Update bubble data
+                            NSUInteger remainingEvents = [bubbleData updateEvent:redactionEvent.redacts withEvent:redactedEvent];
+
+                            hasChanged = YES;
+
+                            // Remove the bubble if there is no more events
+                            shouldRemoveBubbleData = (remainingEvents == 0);
+                        }
+                    }
+
+                    // Check whether the bubble should be removed
+                    if (shouldRemoveBubbleData)
+                    {
+                        [self removeCellData:bubbleData];
+                    }
+
+                    if (hasChanged)
+                    {
+                        // Update the delegate on main thread
+                        dispatch_async(dispatch_get_main_queue(), ^{
+
+                            if (self.delegate)
+                            {
+                                [self.delegate dataSource:self didCellChange:nil];
+                            }
+
+                        });
+                    }
+                }
+
+            });
+        }
+    }];
+}
+
+- (void)setFilterMessagesWithURL:(BOOL)filterMessagesWithURL
+{
+    _filterMessagesWithURL = filterMessagesWithURL;
+    
+    if (_isLive && _room)
+    {
+        // Update the event listeners by considering the right types for the live events.
+        [self refreshEventListeners:(_filterMessagesWithURL ? @[kMXEventTypeStringRoomMessage] : [MXKAppSettings standardAppSettings].allEventTypesForMessages)];
+    }
+}
+
+- (void)setEventFormatter:(MXKEventFormatter *)eventFormatter
+{
+    if (_eventFormatter)
+    {
+        // Remove observers on previous event formatter settings
+        [_eventFormatter.settings removeObserver:self forKeyPath:@"showRedactionsInRoomHistory"];
+        [_eventFormatter.settings removeObserver:self forKeyPath:@"showUnsupportedEventsInRoomHistory"];
+    }
+    
+    _eventFormatter = eventFormatter;
+    
+    if (_eventFormatter)
+    {
+        // Add observer to flush stored data on settings changes
+        [_eventFormatter.settings  addObserver:self forKeyPath:@"showRedactionsInRoomHistory" options:0 context:nil];
+        [_eventFormatter.settings  addObserver:self forKeyPath:@"showUnsupportedEventsInRoomHistory" options:0 context:nil];
+    }
+}
+
+- (void)setShowBubblesDateTime:(BOOL)showBubblesDateTime
+{
+    _showBubblesDateTime = showBubblesDateTime;
+    
+    if (self.delegate)
+    {
+        // Reload all the table
+        [self.delegate dataSource:self didCellChange:nil];
+    }
+}
+
+- (void)setShowTypingNotifications:(BOOL)shouldShowTypingNotifications
+{
+    _showTypingNotifications = shouldShowTypingNotifications;
+    
+    if (shouldShowTypingNotifications)
+    {
+        // Register on typing notif
+        [self listenTypingNotifications];
+    }
+    else
+    {
+        // Remove the live listener
+        if (typingNotifListener)
+        {
+            [_timeline removeListener:typingNotifListener];
+            currentTypingUsers = nil;
+            typingNotifListener = nil;
+        }
+    }
+}
+
+- (void)listenTypingNotifications
+{
+    // Remove the previous live listener
+    if (typingNotifListener)
+    {
+        [_timeline removeListener:typingNotifListener];
+        currentTypingUsers = nil;
+    }
+    
+    // Add typing notification listener
+    MXWeakify(self);
+    
+    typingNotifListener = [_timeline listenToEventsOfTypes:@[kMXEventTypeStringTypingNotification] onEvent:^(MXEvent *event, MXTimelineDirection direction, MXRoomState *roomState)
+    {
+        MXStrongifyAndReturnIfNil(self);
+        
+        // Handle only live events
+        if (direction == MXTimelineDirectionForwards)
+        {
+            // Retrieve typing users list
+            NSMutableArray *typingUsers = [NSMutableArray arrayWithArray:self.room.typingUsers];
+
+            // Remove typing info for the current user
+            NSUInteger index = [typingUsers indexOfObject:self.mxSession.myUser.userId];
+            if (index != NSNotFound)
+            {
+                [typingUsers removeObjectAtIndex:index];
+            }
+            // Ignore this notification if both arrays are empty
+            if (self->currentTypingUsers.count || typingUsers.count)
+            {
+                self->currentTypingUsers = typingUsers;
+                
+                if (self.delegate)
+                {
+                    // refresh all the table
+                    [self.delegate dataSource:self didCellChange:nil];
+                }
+            }
+        }
+    }];
+    
+    currentTypingUsers = _room.typingUsers;
+}
+
+- (void)cancelAllRequests
+{
+    if (paginationRequest)
+    {
+        // We have to remove here the listener. A new pagination request may be triggered whereas the cancellation of this one is in progress
+        [_timeline removeListener:paginationListener];
+        paginationListener = nil;
+        
+        [paginationRequest cancel];
+        paginationRequest = nil;
+    }
+    
+    [super cancelAllRequests];
+}
+
+- (void)setDelegate:(id<MXKDataSourceDelegate>)delegate
+{
+    super.delegate = delegate;
+    
+    // Register to MXScanManager notification only when a delegate is set
+    if (delegate && self.mxSession.scanManager)
+    {
+        [self registerScanManagerNotifications];
+    }
+
+    // Register to reaction notification only when a delegate is set
+    if (delegate)
+    {
+        [self registerReactionsChangeListener];
+        [self registerEventEditsListener];
+    }
+}
+
+- (void)setRoom:(MXRoom *)room
+{
+    if (![_room isEqual:room])
+    {
+        _room = room;
+        
+        [self roomDidSet];
+    }
+}
+
+- (void)roomDidSet
+{
+    
+}
+
+#pragma mark - KVO
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
+{
+    if ([@"showRedactionsInRoomHistory" isEqualToString:keyPath] || [@"showUnsupportedEventsInRoomHistory" isEqualToString:keyPath])
+    {
+        // Flush the current bubble data and rebuild them
+        [self reload];
+    }
+}
+
+#pragma mark - Public methods
+- (id<MXKRoomBubbleCellDataStoring>)cellDataAtIndex:(NSInteger)index
+{
+    id<MXKRoomBubbleCellDataStoring> bubbleData;
+    @synchronized(bubbles)
+    {
+        if (index < bubbles.count)
+        {
+            bubbleData = bubbles[index];
+        }
+    }
+    return bubbleData;
+}
+
+- (id<MXKRoomBubbleCellDataStoring>)cellDataOfEventWithEventId:(NSString *)eventId
+{
+    id<MXKRoomBubbleCellDataStoring> bubbleData;
+    @synchronized(eventIdToBubbleMap)
+    {
+        bubbleData = eventIdToBubbleMap[eventId];
+    }
+    return bubbleData;
+}
+
+- (NSInteger)indexOfCellDataWithEventId:(NSString *)eventId
+{
+    NSInteger index = NSNotFound;
+    
+    id<MXKRoomBubbleCellDataStoring> bubbleData;
+    @synchronized(eventIdToBubbleMap)
+    {
+        bubbleData = eventIdToBubbleMap[eventId];
+    }
+    
+    if (bubbleData)
+    {
+        @synchronized(bubbles)
+        {
+            index = [bubbles indexOfObject:bubbleData];
+        }
+    }
+    
+    return index;
+}
+
+- (CGFloat)cellHeightAtIndex:(NSInteger)index withMaximumWidth:(CGFloat)maxWidth
+{
+    id<MXKRoomBubbleCellDataStoring> bubbleData = [self cellDataAtIndex:index];
+    
+    // Sanity check
+    if (bubbleData && self.delegate)
+    {
+        // Compute here height of bubble cell
+        Class<MXKCellRendering> cellViewClass = [self.delegate cellViewClassForCellData:bubbleData];
+        return [cellViewClass heightForCellData:bubbleData withMaximumWidth:maxWidth];
+    }
+    
+    return 0;
+}
+
+- (void)invalidateBubblesCellDataCache
+{
+    @synchronized(bubbles)
+    {
+        for (id<MXKRoomBubbleCellDataStoring> bubble in bubbles)
+        {
+            [bubble invalidateTextLayout];
+        }
+    }
+}
+
+#pragma mark - Pagination
+- (void)paginate:(NSUInteger)numItems direction:(MXTimelineDirection)direction onlyFromStore:(BOOL)onlyFromStore success:(void (^)(NSUInteger addedCellNumber))success failure:(void (^)(NSError *error))failure
+{
+    // Check the current data source state, and the actual user membership for this room.
+    if (state != MXKDataSourceStateReady || ((self.room.summary.membership == MXMembershipUnknown || self.room.summary.membership == MXMembershipInvite) && ![self.roomState.historyVisibility isEqualToString:kMXRoomHistoryVisibilityWorldReadable]))
+    {
+        // Back pagination is not available here.
+        if (failure)
+        {
+            failure(nil);
+        }
+        return;
+    }
+    
+    if (paginationRequest || secondaryPaginationRequest)
+    {
+        MXLogDebug(@"[MXKRoomDataSource][%p] paginate: a pagination is already in progress", self);
+        if (failure)
+        {
+            failure(nil);
+        }
+        return;
+    }
+    
+    if (NO == [self canPaginate:direction])
+    {
+        MXLogDebug(@"[MXKRoomDataSource][%p] paginate: No more events to paginate", self);
+        if (success)
+        {
+            success(0);
+        }
+    }
+    
+    __block NSUInteger addedCellNb = 0;
+    __block NSMutableArray<NSError*> *operationErrors = [NSMutableArray arrayWithCapacity:2];
+    dispatch_group_t dispatchGroup = dispatch_group_create();
+    
+    // Define a new listener for this pagination
+    paginationListener = [_timeline listenToEventsOfTypes:(_filterMessagesWithURL ? @[kMXEventTypeStringRoomMessage] : [MXKAppSettings standardAppSettings].allEventTypesForMessages) onEvent:^(MXEvent *event, MXTimelineDirection direction2, MXRoomState *roomState) {
+        
+        if (direction2 == direction)
+        {
+            [self queueEventForProcessing:event withRoomState:roomState direction:direction];
+        }
+        
+    }];
+    
+    // Keep a local reference to this listener.
+    id localPaginationListenerRef = paginationListener;
+    
+    dispatch_group_enter(dispatchGroup);
+    // Launch the pagination
+    
+    MXWeakify(self);
+    paginationRequest = [_timeline paginate:numItems direction:direction onlyFromStore:onlyFromStore complete:^{
+        
+        MXStrongifyAndReturnIfNil(self);
+        
+        // Everything went well, remove the listener
+        self->paginationRequest = nil;
+        [self.timeline removeListener:self->paginationListener];
+        self->paginationListener = nil;
+        
+        // Once done, process retrieved events
+        [self processQueuedEvents:^(NSUInteger addedHistoryCellNb, NSUInteger addedLiveCellNb) {
+            
+            addedCellNb += (direction == MXTimelineDirectionBackwards) ? addedHistoryCellNb : addedLiveCellNb;
+            dispatch_group_leave(dispatchGroup);
+            
+        }];
+        
+    } failure:^(NSError *error) {
+        
+        MXLogDebug(@"[MXKRoomDataSource][%p] paginateBackMessages fails", self);
+        
+        MXStrongifyAndReturnIfNil(self);
+        
+        // Something wrong happened or the request was cancelled.
+        // Check whether the request is the actual one before removing listener and handling the retrieved events.
+        if (localPaginationListenerRef == self->paginationListener)
+        {
+            self->paginationRequest = nil;
+            [self.timeline removeListener:self->paginationListener];
+            self->paginationListener = nil;
+            
+            // Process at least events retrieved from store
+            [self processQueuedEvents:^(NSUInteger addedHistoryCellNb, NSUInteger addedLiveCellNb) {
+                
+                [operationErrors addObject:error];
+                if (addedHistoryCellNb)
+                {
+                    addedCellNb += addedHistoryCellNb;
+                }
+                dispatch_group_leave(dispatchGroup);
+
+            }];
+        }
+        
+    }];
+    
+    if (_secondaryTimeline)
+    {
+        // Define a new listener for this pagination
+        secondaryPaginationListener = [_secondaryTimeline listenToEventsOfTypes:_secondaryRoomEventTypes onEvent:^(MXEvent *event, MXTimelineDirection direction2, MXRoomState *roomState) {
+            
+            if (direction2 == direction)
+            {
+                [self queueEventForProcessing:event withRoomState:roomState direction:direction];
+            }
+            
+        }];
+        
+        // Keep a local reference to this listener.
+        id localPaginationListenerRef = secondaryPaginationListener;
+        
+        dispatch_group_enter(dispatchGroup);
+        // Launch the pagination
+        MXWeakify(self);
+        secondaryPaginationRequest = [_secondaryTimeline paginate:numItems direction:direction onlyFromStore:onlyFromStore complete:^{
+            
+            MXStrongifyAndReturnIfNil(self);
+            
+            // Everything went well, remove the listener
+            self->secondaryPaginationRequest = nil;
+            [self.secondaryTimeline removeListener:self->secondaryPaginationListener];
+            self->secondaryPaginationListener = nil;
+            
+            // Once done, process retrieved events
+            [self processQueuedEvents:^(NSUInteger addedHistoryCellNb, NSUInteger addedLiveCellNb) {
+                
+                addedCellNb += (direction == MXTimelineDirectionBackwards) ? addedHistoryCellNb : addedLiveCellNb;
+                dispatch_group_leave(dispatchGroup);
+
+            }];
+            
+        } failure:^(NSError *error) {
+            
+            MXLogDebug(@"[MXKRoomDataSource][%p] paginateBackMessages fails", self);
+            
+            MXStrongifyAndReturnIfNil(self);
+            
+            // Something wrong happened or the request was cancelled.
+            // Check whether the request is the actual one before removing listener and handling the retrieved events.
+            if (localPaginationListenerRef == self->secondaryPaginationListener)
+            {
+                self->secondaryPaginationRequest = nil;
+                [self.secondaryTimeline removeListener:self->secondaryPaginationListener];
+                self->secondaryPaginationListener = nil;
+                
+                // Process at least events retrieved from store
+                [self processQueuedEvents:^(NSUInteger addedHistoryCellNb, NSUInteger addedLiveCellNb) {
+                    
+                    [operationErrors addObject:error];
+                    if (addedHistoryCellNb)
+                    {
+                        addedCellNb += addedHistoryCellNb;
+                    }
+                    dispatch_group_leave(dispatchGroup);
+
+                }];
+            }
+            
+        }];
+    }
+    
+    dispatch_group_notify(dispatchGroup, dispatch_get_main_queue(), ^{
+        if (operationErrors.count)
+        {
+            if (failure)
+            {
+                failure(operationErrors.firstObject);
+            }
+        }
+        else
+        {
+            if (success)
+            {
+                success(addedCellNb);
+            }
+        }
+    });
+}
+
+- (void)paginateToFillRect:(CGRect)rect direction:(MXTimelineDirection)direction withMinRequestMessagesCount:(NSUInteger)minRequestMessagesCount success:(void (^)(void))success failure:(void (^)(NSError *error))failure
+{
+    MXLogDebug(@"[MXKRoomDataSource][%p] paginateToFillRect: %@", self, NSStringFromCGRect(rect));
+    
+    // During the first call of this method, the delegate is supposed defined.
+    // This delegate may be removed whereas this method is called by itself after a pagination request.
+    // The delegate is required here to be able to compute cell height (and prevent infinite loop in case of reentrancy).
+    if (!self.delegate)
+    {
+        MXLogDebug(@"[MXKRoomDataSource][%p] paginateToFillRect ignored (delegate is undefined)", self);
+        if (failure)
+        {
+            failure(nil);
+        }
+        return;
+    }
+
+    // Get the total height of cells already loaded in memory
+    CGFloat minMessageHeight = CGFLOAT_MAX;
+    CGFloat bubblesTotalHeight = 0;
+
+    @synchronized(bubbles)
+    {
+        // Check whether data has been aldready loaded
+        if (bubbles.count)
+        {
+            NSUInteger eventsCount = 0;
+            for (NSInteger i = bubbles.count - 1; i >= 0; i--)
+            {
+                id<MXKRoomBubbleCellDataStoring> bubbleData = bubbles[i];
+                eventsCount += bubbleData.events.count;
+                
+                CGFloat bubbleHeight = [self cellHeightAtIndex:i withMaximumWidth:rect.size.width];
+                // Sanity check
+                if (bubbleHeight)
+                {
+                    bubblesTotalHeight += bubbleHeight;
+
+                    if (bubblesTotalHeight > rect.size.height)
+                    {
+                        // No need to compute more cells heights, there are enough to fill the rect
+                        MXLogDebug(@"[MXKRoomDataSource][%p] -> %tu already loaded bubbles (%tu events) are enough to fill the screen", self, bubbles.count - i, eventsCount);
+                        break;
+                    }
+                    
+                    // Compute the minimal height an event takes
+                    minMessageHeight = MIN(minMessageHeight, bubbleHeight / bubbleData.events.count);
+                }
+            }
+        }
+        else if (minRequestMessagesCount && [self canPaginate:direction])
+        {
+            MXLogDebug(@"[MXKRoomDataSource][%p] paginateToFillRect: Prefill with data from the store", self);
+            // Give a chance to load data from the store before doing homeserver requests
+            // Reuse minRequestMessagesCount because we need to provide a number.
+            [self paginate:minRequestMessagesCount direction:direction onlyFromStore:YES success:^(NSUInteger addedCellNumber) {
+
+                // Then retry
+                [self paginateToFillRect:rect direction:direction withMinRequestMessagesCount:minRequestMessagesCount success:success failure:failure];
+
+            } failure:failure];
+            return;
+        }
+    }
+    
+    // Is there enough cells to cover all the requested height?
+    if (bubblesTotalHeight < rect.size.height)
+    {
+        // No. Paginate to get more messages
+        if ([self canPaginate:direction])
+        {
+            // Bound the minimal height to 44
+            minMessageHeight = MIN(minMessageHeight, 44);
+            
+            // Load messages to cover the remaining height
+            // Use an extra of 50% to manage unsupported/unexpected/redated events
+            NSUInteger messagesToLoad = ceil((rect.size.height - bubblesTotalHeight) / minMessageHeight * 1.5);
+
+            // It does not worth to make a pagination request for only 1 message.
+            // So, use minRequestMessagesCount
+            messagesToLoad = MAX(messagesToLoad, minRequestMessagesCount);
+            
+            MXLogDebug(@"[MXKRoomDataSource][%p] paginateToFillRect: need to paginate %tu events to cover %fpx", self, messagesToLoad, rect.size.height - bubblesTotalHeight);
+            [self paginate:messagesToLoad direction:direction onlyFromStore:NO success:^(NSUInteger addedCellNumber) {
+                
+                [self paginateToFillRect:rect direction:direction withMinRequestMessagesCount:minRequestMessagesCount success:success failure:failure];
+                
+            } failure:failure];
+        }
+        else
+        {
+            
+            MXLogDebug(@"[MXKRoomDataSource][%p] paginateToFillRect: No more events to paginate", self);
+            if (success)
+            {
+                success();
+            }
+        }
+    }
+    else
+    {
+        // Yes. Nothing to do
+        if (success)
+        {
+            success();
+        }
+    }
+}
+
+
+#pragma mark - Sending
+- (void)sendTextMessage:(NSString *)text success:(void (^)(NSString *))success failure:(void (^)(NSError *))failure
+{
+    __block MXEvent *localEchoEvent = nil;
+    
+    BOOL isEmote = [self isMessageAnEmote:text];
+    NSString *sanitizedText = [self sanitizedMessageText:text];
+    NSString *html = [self htmlMessageFromSanitizedText:sanitizedText];
+    
+    // Make the request to the homeserver
+    if (isEmote)
+    {
+        [_room sendEmote:sanitizedText formattedText:html localEcho:&localEchoEvent success:success failure:failure];
+    }    
+    else
+    {
+        [_room sendTextMessage:sanitizedText formattedText:html localEcho:&localEchoEvent success:success failure:failure];
+    }
+    
+    if (localEchoEvent)
+    {
+        // Make the data source digest this fake local echo message
+        [self queueEventForProcessing:localEchoEvent withRoomState:self.roomState direction:MXTimelineDirectionForwards];
+        [self processQueuedEvents:nil];
+    }
+}
+
+- (void)sendReplyToEventWithId:(NSString*)eventIdToReply
+               withTextMessage:(NSString *)text
+                       success:(void (^)(NSString *))success
+                       failure:(void (^)(NSError *))failure
+{
+    MXEvent *eventToReply = [self eventWithEventId:eventIdToReply];
+    
+    __block MXEvent *localEchoEvent = nil;
+    
+    NSString *sanitizedText = [self sanitizedMessageText:text];
+    NSString *html = [self htmlMessageFromSanitizedText:sanitizedText];
+    
+    id<MXSendReplyEventStringLocalizerProtocol> stringLocalizer = [MXKSendReplyEventStringLocalizer new];
+    
+    [_room sendReplyToEvent:eventToReply withTextMessage:sanitizedText formattedTextMessage:html stringLocalizer:stringLocalizer localEcho:&localEchoEvent success:success failure:failure];
+    
+    if (localEchoEvent)
+    {
+        // Make the data source digest this fake local echo message
+        [self queueEventForProcessing:localEchoEvent withRoomState:self.roomState direction:MXTimelineDirectionForwards];
+        [self processQueuedEvents:nil];
+    }
+}
+
+- (BOOL)isMessageAnEmote:(NSString*)text
+{
+    return [text hasPrefix:emoteMessageSlashCommandPrefix];
+}
+
+- (NSString*)sanitizedMessageText:(NSString*)rawText
+{
+    NSString *text;
+    
+    //Remove NULL bytes from the string, as they are likely to trip up many things later,
+    //including our own C-based Markdown-to-HTML convertor.
+    //
+    //Normally, we don't expect people to be entering NULL bytes in messages,
+    //but because of a bug in iOS 11, it's easy to have it happen.
+    //
+    //iOS 11's Smart Punctuation feature "conveniently" converts double hyphens (`--`) to longer en-dashes (`—`).
+    //However, when adding any kind of dash/hyphen after such an en-dash,
+    //iOS would also insert a NULL byte inbetween the dashes (`<en-dash>NULL<some other dash>`).
+    //
+    //Even if a future iOS update fixes this,
+    //we'd better be defensive and always remove occurrences of NULL bytes from text messages.
+    text = [rawText stringByReplacingOccurrencesOfString:[NSString stringWithFormat:@"%C", 0x00000000] withString:@""];
+    
+    // Check whether the message is an emote
+    if ([self isMessageAnEmote:text])
+    {
+        // Remove "/me " string
+        text = [text substringFromIndex:emoteMessageSlashCommandPrefix.length];
+    }
+    
+    return text;
+}
+
+- (NSString*)htmlMessageFromSanitizedText:(NSString*)sanitizedText
+{
+    NSString *html;
+    
+    // Did user use Markdown text?
+    NSString *htmlStringFromMarkdown = [_eventFormatter htmlStringFromMarkdownString:sanitizedText];
+    
+    if ([htmlStringFromMarkdown isEqualToString:sanitizedText])
+    {
+        // No formatted string
+        html = nil;
+    }
+    else
+    {
+        html = htmlStringFromMarkdown;
+    }
+    
+    return html;
+}
+
+- (void)sendImage:(UIImage *)image success:(void (^)(NSString *))success failure:(void (^)(NSError *))failure
+{
+    // Make sure the uploaded image orientation is up
+    image = [MXKTools forceImageOrientationUp:image];
+    
+    // Only jpeg image is supported here
+    NSString *mimetype = @"image/jpeg";
+    NSData *imageData = UIImageJPEGRepresentation(image, 0.9);
+    
+    // Shall we need to consider a thumbnail?
+    UIImage *thumbnail = nil;
+    if (_room.summary.isEncrypted)
+    {
+        // Thumbnail is useful only in case of encrypted room
+        thumbnail = [MXKTools reduceImage:image toFitInSize:CGSizeMake(800, 600)];
+        if (thumbnail == image)
+        {
+            thumbnail = nil;
+        }
+    }
+    
+    [self sendImageData:imageData withImageSize:image.size mimeType:mimetype andThumbnail:thumbnail success:success failure:failure];
+}
+
+- (BOOL)canReplyToEventWithId:(NSString*)eventIdToReply
+{
+    MXEvent *eventToReply = [self eventWithEventId:eventIdToReply];
+    return [self.room canReplyToEvent:eventToReply];
+}
+
+- (void)sendImage:(NSData *)imageData mimeType:(NSString *)mimetype success:(void (^)(NSString *))success failure:(void (^)(NSError *))failure
+{
+    UIImage *image = [UIImage imageWithData:imageData];
+    
+    // Shall we need to consider a thumbnail?
+    UIImage *thumbnail = nil;
+    if (_room.summary.isEncrypted)
+    {
+        // Thumbnail is useful only in case of encrypted room
+        thumbnail = [MXKTools reduceImage:image toFitInSize:CGSizeMake(800, 600)];
+        if (thumbnail == image)
+        {
+            thumbnail = nil;
+        }
+    }
+    
+    [self sendImageData:imageData withImageSize:image.size mimeType:mimetype andThumbnail:thumbnail success:success failure:failure];
+}
+
+- (void)sendImageData:(NSData*)imageData withImageSize:(CGSize)imageSize mimeType:(NSString*)mimetype andThumbnail:(UIImage*)thumbnail success:(void (^)(NSString *eventId))success failure:(void (^)(NSError *error))failure
+{
+    __block MXEvent *localEchoEvent = nil;
+    
+    [_room sendImage:imageData withImageSize:imageSize mimeType:mimetype andThumbnail:thumbnail localEcho:&localEchoEvent success:success failure:failure];
+    
+    if (localEchoEvent)
+    {
+        // Make the data source digest this fake local echo message
+        [self queueEventForProcessing:localEchoEvent withRoomState:self.roomState direction:MXTimelineDirectionForwards];
+        [self processQueuedEvents:nil];
+    }
+}
+
+- (void)sendVideo:(NSURL *)videoLocalURL withThumbnail:(UIImage *)videoThumbnail success:(void (^)(NSString *))success failure:(void (^)(NSError *))failure
+{
+    AVURLAsset *videoAsset = [AVURLAsset assetWithURL:videoLocalURL];
+    [self sendVideoAsset:videoAsset withThumbnail:videoThumbnail success:success failure:failure];
+}
+
+- (void)sendVideoAsset:(AVAsset *)videoAsset withThumbnail:(UIImage *)videoThumbnail success:(void (^)(NSString *))success failure:(void (^)(NSError *))failure
+{
+    __block MXEvent *localEchoEvent = nil;
+    
+    [_room sendVideoAsset:videoAsset withThumbnail:videoThumbnail localEcho:&localEchoEvent success:success failure:failure];
+    
+    if (localEchoEvent)
+    {
+        // Make the data source digest this fake local echo message
+        [self queueEventForProcessing:localEchoEvent withRoomState:self.roomState direction:MXTimelineDirectionForwards];
+        [self processQueuedEvents:nil];
+    }
+}
+
+- (void)sendAudioFile:(NSURL *)audioFileLocalURL mimeType:mimeType success:(void (^)(NSString *))success failure:(void (^)(NSError *))failure
+{
+    __block MXEvent *localEchoEvent = nil;
+    
+    [_room sendAudioFile:audioFileLocalURL mimeType:mimeType localEcho:&localEchoEvent success:success failure:failure keepActualFilename:YES];
+    
+    if (localEchoEvent)
+    {
+        // Make the data source digest this fake local echo message
+        [self queueEventForProcessing:localEchoEvent withRoomState:self.roomState direction:MXTimelineDirectionForwards];
+        [self processQueuedEvents:nil];
+    }
+}
+
+- (void)sendVoiceMessage:(NSURL *)audioFileLocalURL
+                mimeType:mimeType
+                duration:(NSUInteger)duration
+                 samples:(NSArray<NSNumber *> *)samples
+                 success:(void (^)(NSString *))success
+                 failure:(void (^)(NSError *))failure
+{
+    __block MXEvent *localEchoEvent = nil;
+    
+    [_room sendVoiceMessage:audioFileLocalURL mimeType:mimeType duration:duration samples:samples localEcho:&localEchoEvent success:success failure:failure keepActualFilename:YES];
+    
+    if (localEchoEvent)
+    {
+        // Make the data source digest this fake local echo message
+        [self queueEventForProcessing:localEchoEvent withRoomState:self.roomState direction:MXTimelineDirectionForwards];
+        [self processQueuedEvents:nil];
+    }
+}
+
+
+- (void)sendFile:(NSURL *)fileLocalURL mimeType:(NSString*)mimeType success:(void (^)(NSString *))success failure:(void (^)(NSError *))failure
+{
+    __block MXEvent *localEchoEvent = nil;
+    
+    [_room sendFile:fileLocalURL mimeType:mimeType localEcho:&localEchoEvent success:success failure:failure];
+    
+    if (localEchoEvent)
+    {
+        // Make the data source digest this fake local echo message
+        [self queueEventForProcessing:localEchoEvent withRoomState:self.roomState direction:MXTimelineDirectionForwards];
+        [self processQueuedEvents:nil];
+    }
+}
+
+- (void)sendMessageWithContent:(NSDictionary *)msgContent success:(void (^)(NSString *))success failure:(void (^)(NSError *))failure
+{
+    __block MXEvent *localEchoEvent = nil;
+    
+    // Make the request to the homeserver
+    [_room sendMessageWithContent:msgContent localEcho:&localEchoEvent success:success failure:failure];
+    
+    if (localEchoEvent)
+    {
+        // Make the data source digest this fake local echo message
+        [self queueEventForProcessing:localEchoEvent withRoomState:self.roomState direction:MXTimelineDirectionForwards];
+        [self processQueuedEvents:nil];
+    }
+}
+
+- (void)sendEventOfType:(MXEventTypeString)eventTypeString content:(NSDictionary<NSString*, id>*)msgContent success:(void (^)(NSString *eventId))success failure:(void (^)(NSError *error))failure
+{
+    __block MXEvent *localEchoEvent = nil;
+
+    // Make the request to the homeserver
+    [_room sendEventOfType:eventTypeString content:msgContent localEcho:&localEchoEvent success:success failure:failure];
+
+    if (localEchoEvent)
+    {
+        // Make the data source digest this fake local echo message
+        [self queueEventForProcessing:localEchoEvent withRoomState:self.roomState direction:MXTimelineDirectionForwards];
+        [self processQueuedEvents:nil];
+    }
+}
+
+- (void)resendEventWithEventId:(NSString *)eventId success:(void (^)(NSString *))success failure:(void (^)(NSError *))failure
+{
+    MXEvent *event = [self eventWithEventId:eventId];
+    
+    // Sanity check
+    if (!event)
+    {
+        return;
+    }
+    
+    MXLogInfo(@"[MXKRoomDataSource][%p] resendEventWithEventId. EventId: %@", self, event.eventId);
+    
+    // Check first whether the event is encrypted
+    if ([event.wireType isEqualToString:kMXEventTypeStringRoomEncrypted])
+    {
+        // We try here to resent an encrypted event
+        // Note: we keep the existing local echo.
+        [_room sendEventOfType:kMXEventTypeStringRoomEncrypted content:event.wireContent localEcho:&event success:success failure:failure];
+    }
+    else if ([event.type isEqualToString:kMXEventTypeStringRoomMessage])
+    {
+        // And retry the send the message according to its type
+        NSString *msgType = event.content[@"msgtype"];
+        if ([msgType isEqualToString:kMXMessageTypeText] || [msgType isEqualToString:kMXMessageTypeEmote])
+        {
+            // Resend the Matrix event by reusing the existing echo
+            [_room sendMessageWithContent:event.content localEcho:&event success:success failure:failure];
+        }
+        else if ([msgType isEqualToString:kMXMessageTypeImage])
+        {
+            // Check whether the sending failed while uploading the data.
+            // If the content url corresponds to a upload id, the upload was not complete.
+            NSString *contentURL = event.content[@"url"];
+            if (contentURL && [contentURL hasPrefix:kMXMediaUploadIdPrefix])
+            {
+                NSString *mimetype = nil;
+                if (event.content[@"info"])
+                {
+                    mimetype = event.content[@"info"][@"mimetype"];
+                }
+                
+                NSString *localImagePath = [MXMediaManager cachePathForMatrixContentURI:contentURL andType:mimetype inFolder:_roomId];
+                UIImage* image = [MXMediaManager loadPictureFromFilePath:localImagePath];
+                if (image)
+                {
+                    // Restart sending the image from the beginning.
+                    
+                    // Remove the local echo.
+                    [self removeEventWithEventId:eventId];
+                    
+                    if (mimetype)
+                    {
+                        NSData *imageData = [NSData dataWithContentsOfFile:localImagePath];
+                        [self sendImage:imageData mimeType:mimetype success:success failure:failure];
+                    }
+                    else
+                    {
+                        [self sendImage:image success:success failure:failure];
+                    }
+                }
+                else
+                {
+                    failure([NSError errorWithDomain:MXKRoomDataSourceErrorDomain code:MXKRoomDataSourceErrorResendGeneric userInfo:nil]);
+                    MXLogWarning(@"[MXKRoomDataSource][%p] resendEventWithEventId: Warning - Unable to resend room message of type: %@", self, msgType);
+                }
+            }
+            else
+            {
+                // Resend the Matrix event by reusing the existing echo
+                [_room sendMessageWithContent:event.content localEcho:&event success:success failure:failure];
+            }
+        }
+        else if ([msgType isEqualToString:kMXMessageTypeAudio])
+        {
+            // Check whether the sending failed while uploading the data.
+            // If the content url corresponds to a upload id, the upload was not complete.
+            NSString *contentURL = event.content[@"url"];
+            if (!contentURL || ![contentURL hasPrefix:kMXMediaUploadIdPrefix])
+            {
+                // Resend the Matrix event by reusing the existing echo
+                [_room sendMessageWithContent:event.content localEcho:&event success:success failure:failure];
+                return;
+            }
+            
+            NSString *mimetype = event.content[@"info"][@"mimetype"];
+            NSString *localFilePath = [MXMediaManager cachePathForMatrixContentURI:contentURL andType:mimetype inFolder:_roomId];
+            NSURL *localFileURL = [NSURL URLWithString:localFilePath];
+            
+            if (![NSFileManager.defaultManager fileExistsAtPath:localFilePath]) {
+                failure([NSError errorWithDomain:MXKRoomDataSourceErrorDomain code:MXKRoomDataSourceErrorResendInvalidLocalFilePath userInfo:nil]);
+                MXLogWarning(@"[MXKRoomDataSource][%p] resendEventWithEventId: Warning - Unable to resend voice message, invalid file path.", self);
+                return;
+            }
+            
+            // Remove the local echo.
+            [self removeEventWithEventId:eventId];
+            
+            if (event.isVoiceMessage) {
+                NSNumber *duration = event.content[kMXMessageContentKeyExtensibleAudio][kMXMessageContentKeyExtensibleAudioDuration];
+                NSArray<NSNumber *> *samples = event.content[kMXMessageContentKeyExtensibleAudio][kMXMessageContentKeyExtensibleAudioWaveform];
+                
+                [self sendVoiceMessage:localFileURL mimeType:mimetype duration:duration.doubleValue samples:samples success:success failure:failure];
+            } else {
+                [self sendAudioFile:localFileURL mimeType:mimetype success:success failure:failure];
+            }
+        }
+        else if ([msgType isEqualToString:kMXMessageTypeVideo])
+        {
+            // Check whether the sending failed while uploading the data.
+            // If the content url corresponds to a upload id, the upload was not complete.
+            NSString *contentURL = event.content[@"url"];
+            if (contentURL && [contentURL hasPrefix:kMXMediaUploadIdPrefix])
+            {
+                // TODO: Support resend on attached video when upload has been failed.
+                MXLogDebug(@"[MXKRoomDataSource][%p] resendEventWithEventId: Warning - Unable to resend attached video (upload was not complete)", self);
+                failure([NSError errorWithDomain:MXKRoomDataSourceErrorDomain code:MXKRoomDataSourceErrorResendInvalidMessageType userInfo:nil]);
+            }
+            else
+            {
+                // Resend the Matrix event by reusing the existing echo
+                [_room sendMessageWithContent:event.content localEcho:&event success:success failure:failure];
+            }
+        }
+        else if ([msgType isEqualToString:kMXMessageTypeFile])
+        {
+            // Check whether the sending failed while uploading the data.
+            // If the content url corresponds to a upload id, the upload was not complete.
+            NSString *contentURL = event.content[@"url"];
+            if (contentURL && [contentURL hasPrefix:kMXMediaUploadIdPrefix])
+            {
+                NSString *mimetype = nil;
+                if (event.content[@"info"])
+                {
+                    mimetype = event.content[@"info"][@"mimetype"];
+                }
+                
+                if (mimetype)
+                {
+                    // Restart sending the image from the beginning.
+                    
+                    // Remove the local echo
+                    [self removeEventWithEventId:eventId];
+                    
+                    NSString *localFilePath = [MXMediaManager cachePathForMatrixContentURI:contentURL andType:mimetype inFolder:_roomId];
+                    
+                    [self sendFile:[NSURL fileURLWithPath:localFilePath isDirectory:NO] mimeType:mimetype success:success failure:failure];
+                }
+                else
+                {
+                    failure([NSError errorWithDomain:MXKRoomDataSourceErrorDomain code:MXKRoomDataSourceErrorResendGeneric userInfo:nil]);
+                    MXLogWarning(@"[MXKRoomDataSource][%p] resendEventWithEventId: Warning - Unable to resend room message of type: %@", self, msgType);
+                }
+            }
+            else
+            {
+                // Resend the Matrix event by reusing the existing echo
+                [_room sendMessageWithContent:event.content localEcho:&event success:success failure:failure];
+            }
+        }
+        else
+        {
+            failure([NSError errorWithDomain:MXKRoomDataSourceErrorDomain code:MXKRoomDataSourceErrorResendInvalidMessageType userInfo:nil]);
+            MXLogWarning(@"[MXKRoomDataSource][%p] resendEventWithEventId: Warning - Unable to resend room message of type: %@", self, msgType);
+        }
+    }
+    else
+    {
+        failure([NSError errorWithDomain:MXKRoomDataSourceErrorDomain code:MXKRoomDataSourceErrorResendInvalidMessageType userInfo:nil]);
+        MXLogWarning(@"[MXKRoomDataSource][%p] MXKRoomDataSource: Warning - Only resend of MXEventTypeRoomMessage is allowed. Event.type: %@", self, event.type);
+    }
+}
+
+
+#pragma mark - Events management
+- (MXEvent *)eventWithEventId:(NSString *)eventId
+{
+    MXEvent *theEvent;
+    
+    // First, retrieve the cell data hosting the event
+    id<MXKRoomBubbleCellDataStoring> bubbleData = [self cellDataOfEventWithEventId:eventId];
+    if (bubbleData)
+    {
+        // Then look into the events in this cell
+        for (MXEvent *event in bubbleData.events)
+        {
+            if ([event.eventId isEqualToString:eventId])
+            {
+                theEvent = event;
+                break;
+            }
+        }
+    }
+    return theEvent;
+}
+
+- (void)removeEventWithEventId:(NSString *)eventId
+{
+    MXLogVerbose(@"[MXKRoomDataSource][%p] removeEventWithEventId: %@", self, eventId);
+    
+    // First, retrieve the cell data hosting the event
+    id<MXKRoomBubbleCellDataStoring> bubbleData = [self cellDataOfEventWithEventId:eventId];
+    if (bubbleData)
+    {
+        NSUInteger remainingEvents;
+        @synchronized (bubbleData)
+        {
+            remainingEvents = [bubbleData removeEvent:eventId];
+        }
+        
+        // If there is no more events in the bubble, remove it
+        if (0 == remainingEvents)
+        {
+            [self removeCellData:bubbleData];
+        }
+
+        // Remove the event from the outgoing messages storage
+        [_room removeOutgoingMessage:eventId];
+    
+        // Update the delegate
+        if (self.delegate)
+        {
+            [self.delegate dataSource:self didCellChange:nil];
+        }
+    }
+}
+
+- (void)didReceiveReceiptEvent:(MXEvent *)receiptEvent roomState:(MXRoomState *)roomState
+{
+    // Do the processing on the same processing queue
+    MXWeakify(self);
+    dispatch_async(MXKRoomDataSource.processingQueue, ^{
+        MXStrongifyAndReturnIfNil(self);
+
+        // Remove the previous displayed read receipt for each user who sent a
+        // new read receipt.
+        // To implement it, we need to find the sender id of each new read receipt
+        // among the read receipts array of all events in all bubbles.
+        NSArray *readReceiptSenders = receiptEvent.readReceiptSenders;
+
+        @synchronized(self->bubbles)
+        {
+            for (MXKRoomBubbleCellData *cellData in self->bubbles)
+            {
+                NSMutableDictionary<NSString* /* eventId */, NSArray<MXReceiptData*> *> *updatedCellDataReadReceipts = [NSMutableDictionary dictionary];
+
+                for (NSString *eventId in cellData.readReceipts)
+                {
+                    for (MXReceiptData *receiptData in cellData.readReceipts[eventId])
+                    {
+                        for (NSString *senderId in readReceiptSenders)
+                        {
+                            if ([receiptData.userId isEqualToString:senderId])
+                            {
+                                if (!updatedCellDataReadReceipts[eventId])
+                                {
+                                    updatedCellDataReadReceipts[eventId] = cellData.readReceipts[eventId];
+                                }
+
+                                NSPredicate *predicate = [NSPredicate predicateWithFormat:@"userId!=%@", receiptData.userId];
+                                updatedCellDataReadReceipts[eventId] = [updatedCellDataReadReceipts[eventId] filteredArrayUsingPredicate:predicate];
+                                break;
+                            }
+                        }
+
+                    }
+                }
+
+                // Flush found changed to the cell data
+                for (NSString *eventId in updatedCellDataReadReceipts)
+                {
+                    if (updatedCellDataReadReceipts[eventId].count)
+                    {
+                        [self updateCellData:cellData withReadReceipts:updatedCellDataReadReceipts[eventId] forEventId:eventId];
+                    }
+                    else
+                    {
+                        [self updateCellData:cellData withReadReceipts:nil forEventId:eventId];
+                    }
+                }
+            }
+        }
+        
+        dispatch_group_t dispatchGroup = dispatch_group_create();
+
+        // Update cell data we have received a read receipt for
+        NSArray *readEventIds = receiptEvent.readReceiptEventIds;
+        for (NSString* eventId in readEventIds)
+        {
+            MXKRoomBubbleCellData *cellData = [self cellDataOfEventWithEventId:eventId];
+            if (cellData)
+            {
+                @synchronized(self->bubbles)
+                {
+                    dispatch_group_enter(dispatchGroup);
+                    [self addReadReceiptsForEvent:eventId inCellDatas:self->bubbles startingAtCellData:cellData completion:^{
+                        dispatch_group_leave(dispatchGroup);
+                    }];
+                }
+            }
+        }
+
+        dispatch_group_notify(dispatchGroup, dispatch_get_main_queue(), ^{
+            if (self.delegate)
+            {
+                [self.delegate dataSource:self didCellChange:nil];
+            }
+        });
+    });
+}
+
+- (void)updateCellData:(MXKRoomBubbleCellData*)cellData withReadReceipts:(NSArray<MXReceiptData*>*)readReceipts forEventId:(NSString*)eventId
+{
+    cellData.readReceipts[eventId] = readReceipts;
+    
+    // Indicate that the text message layout should be recomputed.
+    [cellData invalidateTextLayout];
+}
+
+- (void)handleUnsentMessages
+{
+    // Add the unsent messages at the end of the conversation
+    NSArray<MXEvent*>* outgoingMessages = _room.outgoingMessages;
+    
+    [self.mxSession decryptEvents:outgoingMessages inTimeline:nil onComplete:^(NSArray<MXEvent *> *failedEvents) {
+        
+        for (MXEvent *outgoingMessage in outgoingMessages)
+        {
+            [self queueEventForProcessing:outgoingMessage withRoomState:self.roomState direction:MXTimelineDirectionForwards];
+        }
+        
+        MXLogVerbose(@"[MXKRoomDataSource][%p] handleUnsentMessages: queued %tu events", self, outgoingMessages.count);
+        
+        [self processQueuedEvents:nil];
+    }];
+}
+
+#pragma mark - Bubble collapsing
+
+- (void)collapseRoomBubble:(id<MXKRoomBubbleCellDataStoring>)bubbleData collapsed:(BOOL)collapsed
+{
+    if (bubbleData.collapsed != collapsed)
+    {
+        id<MXKRoomBubbleCellDataStoring> nextBubbleData = bubbleData;
+        do
+        {
+            nextBubbleData.collapsed = collapsed;
+        }
+        while ((nextBubbleData = nextBubbleData.nextCollapsableCellData));
+
+        if (self.delegate)
+        {
+            // Reload all the table
+            [self.delegate dataSource:self didCellChange:nil];
+        }
+    }
+}
+
+#pragma mark - Private methods
+
+- (void)replaceEvent:(MXEvent*)eventToReplace withEvent:(MXEvent*)event
+{
+    MXLogVerbose(@"[MXKRoomDataSource][%p] replaceEvent: %@ with: %@", self, eventToReplace.eventId, event.eventId);
+    
+    if (eventToReplace.isLocalEvent)
+    {
+        // Stop listening to the identifier change for the replaced event.
+        [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXEventDidChangeIdentifierNotification object:eventToReplace];
+    }
+    
+    // Retrieve the cell data hosting the replaced event
+    id<MXKRoomBubbleCellDataStoring> bubbleData = [self cellDataOfEventWithEventId:eventToReplace.eventId];
+    if (!bubbleData)
+    {
+        return;
+    }
+    
+    NSUInteger remainingEvents;
+    @synchronized (bubbleData)
+    {
+        // Check whether the local echo is replaced or removed
+        if (event)
+        {
+            remainingEvents = [bubbleData updateEvent:eventToReplace.eventId withEvent:event];
+        }
+        else
+        {
+            remainingEvents = [bubbleData removeEvent:eventToReplace.eventId];
+        }
+    }
+    
+    // Update bubbles mapping
+    @synchronized (eventIdToBubbleMap)
+    {
+        // Remove the broken link from the map
+        [eventIdToBubbleMap removeObjectForKey:eventToReplace.eventId];
+        
+        if (event && remainingEvents)
+        {
+            eventIdToBubbleMap[event.eventId] = bubbleData;
+            
+            if (event.isLocalEvent)
+            {
+                // Listen to the identifier change for the local events.
+                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(localEventDidChangeIdentifier:) name:kMXEventDidChangeIdentifierNotification object:event];
+            }
+        }
+    }
+    
+    // If there is no more events in the bubble, remove it
+    if (0 == remainingEvents)
+    {
+        [self removeCellData:bubbleData];
+    }
+
+    // Update the delegate
+    if (self.delegate)
+    {
+        [self.delegate dataSource:self didCellChange:nil];
+    }
+}
+
+- (NSArray<NSIndexPath *> *)removeCellData:(id<MXKRoomBubbleCellDataStoring>)cellData
+{
+    NSMutableArray *deletedRows = [NSMutableArray array];
+    
+    MXLogVerbose(@"[MXKRoomDataSource][%p] removeCellData: %@", self, [cellData.events valueForKey:@"eventId"]);
+    
+    // Remove potential occurrences in bubble map
+    @synchronized (eventIdToBubbleMap)
+    {
+        for (MXEvent *event in cellData.events)
+        {
+            [eventIdToBubbleMap removeObjectForKey:event.eventId];
+            
+            if (event.isLocalEvent)
+            {
+                // Stop listening to the identifier change for this event.
+                [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXEventDidChangeIdentifierNotification object:event];
+            }
+        }
+    }
+    
+    // Check whether the adjacent bubbles can merge together
+    @synchronized(bubbles)
+    {
+        NSUInteger index = [bubbles indexOfObject:cellData];
+        if (index != NSNotFound)
+        {
+            [bubbles removeObjectAtIndex:index];
+            [deletedRows addObject:[NSIndexPath indexPathForRow:index inSection:0]];
+            
+            if (bubbles.count)
+            {
+                // Update flag in remaining data
+                if (index == 0)
+                {
+                    // We removed here the first bubble.
+                    // We have to update the 'isPaginationFirstBubble' and 'shouldHideSenderInformation' flags of the new first bubble.
+                    id<MXKRoomBubbleCellDataStoring> firstCellData = bubbles.firstObject;
+                    
+                    firstCellData.isPaginationFirstBubble = ((self.bubblesPagination == MXKRoomDataSourceBubblesPaginationPerDay) && firstCellData.date);
+                    
+                    // Keep visible the sender information by default,
+                    // except if the bubble has no display (composed only by ignored events).
+                    firstCellData.shouldHideSenderInformation = firstCellData.hasNoDisplay;
+                }
+                else if (index < bubbles.count)
+                {
+                    // We removed here a bubble which is not the before last.
+                    id<MXKRoomBubbleCellDataStoring> cellData1 = bubbles[index-1];
+                    id<MXKRoomBubbleCellDataStoring> cellData2 = bubbles[index];
+                    
+                    // Check first whether the neighbor bubbles can merge
+                    Class class = [self cellDataClassForCellIdentifier:kMXKRoomBubbleCellDataIdentifier];
+                    if ([class instancesRespondToSelector:@selector(mergeWithBubbleCellData:)])
+                    {
+                        if ([cellData1 mergeWithBubbleCellData:cellData2])
+                        {
+                            [bubbles removeObjectAtIndex:index];
+                            [deletedRows addObject:[NSIndexPath indexPathForRow:(index + 1) inSection:0]];
+                            
+                            cellData2 = nil;
+                        }
+                    }
+                    
+                    if (cellData2)
+                    {
+                        // Update its 'isPaginationFirstBubble' and 'shouldHideSenderInformation' flags
+                        
+                        // Pagination handling
+                        if (self.bubblesPagination == MXKRoomDataSourceBubblesPaginationPerDay && !cellData2.isPaginationFirstBubble)
+                        {
+                            // Check whether a new pagination starts on the second cellData
+                            NSString *cellData1DateString = [self.eventFormatter dateStringFromDate:cellData1.date withTime:NO];
+                            NSString *cellData2DateString = [self.eventFormatter dateStringFromDate:cellData2.date withTime:NO];
+                            
+                            if (!cellData1DateString)
+                            {
+                                cellData2.isPaginationFirstBubble = (cellData2DateString && cellData.isPaginationFirstBubble);
+                            }
+                            else
+                            {
+                                cellData2.isPaginationFirstBubble = (cellData2DateString && ![cellData2DateString isEqualToString:cellData1DateString]);
+                            }
+                        }
+                        
+                        // Check whether the sender information is relevant for this bubble.
+                        // Check first if the bubble is not composed only by ignored events.
+                        cellData2.shouldHideSenderInformation = cellData2.hasNoDisplay;
+                        if (!cellData2.shouldHideSenderInformation && cellData2.isPaginationFirstBubble == NO)
+                        {
+                            // Check whether the neighbor bubbles have been sent by the same user.
+                            cellData2.shouldHideSenderInformation = [cellData2 hasSameSenderAsBubbleCellData:cellData1];
+                        }
+                    }
+
+                }
+            }
+        }
+    }
+    
+    return deletedRows;
+}
+
+- (void)didMXRoomInitialSynced:(NSNotification *)notif
+{
+    // Refresh the room data source when the room has been initialSync'ed
+    MXRoom *room = notif.object;
+    if (self.mxSession == room.mxSession &&
+        ([self.roomId isEqualToString:room.roomId] || [self.secondaryRoomId isEqualToString:room.roomId]))
+    { 
+        MXLogDebug(@"[MXKRoomDataSource][%p] didMXRoomInitialSynced for room: %@", self, room.roomId);
+        
+        [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXRoomInitialSyncNotification object:room];
+        
+        [self reload];
+    }
+}
+
+- (void)didMXSessionUpdatePublicisedGroupsForUsers:(NSNotification *)notif
+{
+    // Retrieved the list of the concerned users
+    NSArray<NSString*> *userIds = notif.userInfo[kMXSessionNotificationUserIdsArrayKey];
+    if (userIds.count)
+    {
+        // Check whether at least one listed user is a room member.
+        for (NSString* userId in userIds)
+        {
+            MXRoomMember * roomMember = [self.roomState.members memberWithUserId:userId];
+            if (roomMember)
+            {
+                // Inform the delegate to refresh the bubble display
+                // We dispatch here this action in order to let each bubble data update their sender flair.
+                if (self.delegate)
+                {
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        [self.delegate dataSource:self didCellChange:nil];
+                    });
+                }
+                break;
+            }
+        }
+    }
+}
+
+- (void)eventDidChangeSentState:(NSNotification *)notif
+{
+    MXEvent *event = notif.object;
+    if ([event.roomId isEqualToString:_roomId])
+    {
+        MXLogVerbose(@"[MXKRoomDataSource][%p] eventDidChangeSentState: %@, to: %tu", self, event.eventId, event.sentState);
+        
+        // Retrieve the cell data hosting the local echo
+        id<MXKRoomBubbleCellDataStoring> bubbleData = [self cellDataOfEventWithEventId:event.eventId];
+        if (!bubbleData)
+        {
+            //  Initial state for local echos
+            BOOL isInitial = event.isLocalEvent &&
+                (event.sentState == MXEventSentStateSending || event.sentState == MXEventSentStateEncrypting);
+            if (!isInitial)
+            {
+                MXLogWarning(@"[MXKRoomDataSource][%p] eventDidChangeSentState: Cannot find bubble data for event: %@", self, event.eventId);
+            }
+            return;
+        }
+        
+        @synchronized (bubbleData)
+        {
+            [bubbleData updateEvent:event.eventId withEvent:event];
+        }
+        
+        // Inform the delegate
+        if (self.delegate && (self.secondaryRoom ? bubbles.count > 0 : YES))
+        {
+            [self.delegate dataSource:self didCellChange:nil];
+        }
+    }
+}
+
+- (void)localEventDidChangeIdentifier:(NSNotification *)notif
+{
+    MXEvent *event = notif.object;
+    NSString *previousId = notif.userInfo[kMXEventIdentifierKey];
+    
+    MXLogVerbose(@"[MXKRoomDataSource][%p] localEventDidChangeIdentifier from: %@ to: %@", self, previousId, event.eventId);
+    
+    if (event && previousId)
+    {
+        // Update bubbles mapping
+        @synchronized (eventIdToBubbleMap)
+        {
+            id<MXKRoomBubbleCellDataStoring> bubbleData = eventIdToBubbleMap[previousId];
+            if (bubbleData && event.eventId)
+            {
+                eventIdToBubbleMap[event.eventId] = bubbleData;
+                [eventIdToBubbleMap removeObjectForKey:previousId];
+
+                // The bubble data must use the final event id too
+                [bubbleData updateEvent:previousId withEvent:event];
+            }
+        }
+        
+        if (!event.isLocalEvent)
+        {
+            // Stop listening to the identifier change when the event becomes an actual event.
+            [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXEventDidChangeIdentifierNotification object:event];
+        }
+    }
+}
+
+- (void)eventDidDecrypt:(NSNotification *)notif
+{
+    MXEvent *event = notif.object;
+    if ([event.roomId isEqualToString:_roomId] ||
+        ([event.roomId isEqualToString:_secondaryRoomId] && [_secondaryRoomEventTypes containsObject:event.type]))
+    {
+        // Retrieve the cell data hosting the event
+        id<MXKRoomBubbleCellDataStoring> bubbleData = [self cellDataOfEventWithEventId:event.eventId];
+        if (!bubbleData)
+        {
+            return;
+        }
+
+        // We need to update the data of the cell that displays the event.
+        // The trickiest update is when the cell contains several events and the event
+        // to update turns out to be an attachment.
+        // In this case, we need to split the cell into several cells so that the attachment
+        // has its own cell.
+        if (bubbleData.events.count == 1 || ![_eventFormatter isSupportedAttachment:event])
+        {
+            // If the event is still a text, a simple update is enough
+            // If the event is an attachment, it has already its own cell. Let the bubble
+            // data handle the type change.
+            @synchronized (bubbleData)
+            {
+                [bubbleData updateEvent:event.eventId withEvent:event];
+            }
+        }
+        else
+        {
+            @synchronized (bubbleData)
+            {
+                BOOL eventIsFirstInBubble = NO;
+                NSInteger bubbleDataIndex =  [bubbles indexOfObject:bubbleData];
+                
+                if (NSNotFound == bubbleDataIndex)
+                {
+                    // If bubbleData is not in bubbles there is nothing to update for this event, its not displayed.
+                    return;
+                }
+
+                // We need to create a dedicated cell for the event attachment.
+                // From the current bubble, remove the updated event and all events after.
+                NSMutableArray<MXEvent*> *removedEvents;
+                NSUInteger remainingEvents = [bubbleData removeEventsFromEvent:event.eventId removedEvents:&removedEvents];
+
+                // If there is no more events in this bubble, remove it
+                if (0 == remainingEvents)
+                {
+                    eventIsFirstInBubble = YES;
+                    @synchronized (eventsToProcessSnapshot)
+                    {
+                        [bubbles removeObjectAtIndex:bubbleDataIndex];
+                        bubbleDataIndex--;
+                    }
+                }
+
+                // Create a dedicated bubble for the attachment
+                if (removedEvents.count)
+                {
+                    Class class = [self cellDataClassForCellIdentifier:kMXKRoomBubbleCellDataIdentifier];
+
+                    id<MXKRoomBubbleCellDataStoring> newBubbleData = [[class alloc] initWithEvent:removedEvents[0] andRoomState:self.roomState andRoomDataSource:self];
+
+                    if (eventIsFirstInBubble)
+                    {
+                        // Apply same config as before
+                        newBubbleData.isPaginationFirstBubble = bubbleData.isPaginationFirstBubble;
+                        newBubbleData.shouldHideSenderInformation = bubbleData.shouldHideSenderInformation;
+                    }
+                    else
+                    {
+                        // This new bubble is not the first. Show nothing
+                        newBubbleData.isPaginationFirstBubble = NO;
+                        newBubbleData.shouldHideSenderInformation = YES;
+                    }
+
+                    // Update bubbles mapping
+                    @synchronized (eventIdToBubbleMap)
+                    {
+                        eventIdToBubbleMap[event.eventId] = newBubbleData;
+                    }
+
+                    @synchronized (eventsToProcessSnapshot)
+                    {
+                        [bubbles insertObject:newBubbleData atIndex:bubbleDataIndex + 1];
+                    }
+                }
+
+                // And put other cutted events in another bubble
+                if (removedEvents.count > 1)
+                {
+                    Class class = [self cellDataClassForCellIdentifier:kMXKRoomBubbleCellDataIdentifier];
+
+                    id<MXKRoomBubbleCellDataStoring> newBubbleData;
+                    for (NSUInteger i = 1; i < removedEvents.count; i++)
+                    {
+                        MXEvent *removedEvent = removedEvents[i];
+                        if (i == 1)
+                        {
+                            newBubbleData = [[class alloc] initWithEvent:removedEvent andRoomState:self.roomState andRoomDataSource:self];
+                        }
+                        else
+                        {
+                            [newBubbleData addEvent:removedEvent andRoomState:self.roomState];
+                        }
+
+                        // Update bubbles mapping
+                        @synchronized (eventIdToBubbleMap)
+                        {
+                            eventIdToBubbleMap[removedEvent.eventId] = newBubbleData;
+                        }
+                    }
+
+                    // Do not show the
+                    newBubbleData.isPaginationFirstBubble = NO;
+                    newBubbleData.shouldHideSenderInformation = YES;
+
+                    @synchronized (eventsToProcessSnapshot)
+                    {
+                        [bubbles insertObject:newBubbleData atIndex:bubbleDataIndex + 2];
+                    }
+                }
+            }
+        }
+
+        // Update the delegate
+        if (self.delegate)
+        {
+            [self.delegate dataSource:self didCellChange:nil];
+        }
+    }
+}
+
+// Indicates whether an event has base requirements to allow actions (like reply, reactions, edit, etc.)
+- (BOOL)canPerformActionOnEvent:(MXEvent*)event
+{
+    BOOL isSent = event.sentState == MXEventSentStateSent;
+    
+    if (!isSent) {
+        return NO;
+    }
+    
+    if (event.eventType == MXEventTypePollStart) {
+        return YES;
+    }
+    
+    BOOL isRoomMessage = (event.eventType == MXEventTypeRoomMessage);
+    
+    if (!isRoomMessage) {
+        return NO;
+    }
+    
+    NSString *messageType = event.content[@"msgtype"];
+    if (messageType == nil || [messageType isEqualToString:@"m.bad.encrypted"]) {
+        return NO;
+    }
+    
+    return YES;
+}
+
+- (void)setState:(MXKDataSourceState)newState
+{
+    self->state = newState;
+    
+    if (self.delegate && [self.delegate respondsToSelector:@selector(dataSource:didStateChange:)])
+    {
+        [self.delegate dataSource:self didStateChange:self->state];
+    }
+}
+
+- (void)setSecondaryRoomId:(NSString *)secondaryRoomId
+{
+    if (_secondaryRoomId != secondaryRoomId)
+    {
+        _secondaryRoomId = secondaryRoomId;
+        
+        if (self.state == MXKDataSourceStateReady)
+        {
+            [self reload];
+        }
+    }
+}
+
+- (void)setSecondaryRoomEventTypes:(NSArray<MXEventTypeString> *)secondaryRoomEventTypes
+{
+    if (_secondaryRoomEventTypes != secondaryRoomEventTypes)
+    {
+        _secondaryRoomEventTypes = secondaryRoomEventTypes;
+        
+        if (self.state == MXKDataSourceStateReady)
+        {
+            [self reload];
+        }
+    }
+}
+
+#pragma mark - Asynchronous events processing
+ + (dispatch_queue_t)processingQueue
+{
+    static dispatch_queue_t processingQueue;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        processingQueue = dispatch_queue_create("MXKRoomDataSource", DISPATCH_QUEUE_SERIAL);
+    });
+
+    return processingQueue;
+}
+
+/**
+ Queue an event in order to process its display later.
+ 
+ @param event the event to process.
+ @param roomState the state of the room when the event fired.
+ @param direction the order of the events in the arrays
+ */
+- (void)queueEventForProcessing:(MXEvent*)event withRoomState:(MXRoomState*)roomState direction:(MXTimelineDirection)direction
+{
+    if (event.isLocalEvent)
+    {
+        MXLogVerbose(@"[MXKRoomDataSource][%p] queueEventForProcessing: %@", self, event.eventId);
+    }
+    
+    if (self.filterMessagesWithURL)
+    {
+        // Check whether the event has a value for the 'url' key in its content.
+        if (!event.getMediaURLs.count)
+        {
+            // Ignore the event
+            return;
+        }
+    }
+    
+    // Check for undecryptable messages that were sent while the user was not in the room and hide them
+    if ([MXKAppSettings standardAppSettings].hidePreJoinedUndecryptableEvents
+        && direction == MXTimelineDirectionBackwards)
+    {
+        [self checkForPreJoinUTDWithEvent:event roomState:roomState];
+        
+        // Hide pre joint UTD events
+        if (self.shouldStopBackPagination)
+        {
+            return;
+        }
+    }
+    
+    MXKQueuedEvent *queuedEvent = [[MXKQueuedEvent alloc] initWithEvent:event andRoomState:roomState direction:direction];
+    
+    // Count queued events when the server sync is in progress
+    if (self.mxSession.state == MXSessionStateSyncInProgress)
+    {
+        queuedEvent.serverSyncEvent = YES;
+        _serverSyncEventCount++;
+        
+        if (_serverSyncEventCount == 1)
+        {
+            // Notify that sync process starts
+            [[NSNotificationCenter defaultCenter] postNotificationName:kMXKRoomDataSourceSyncStatusChanged object:self userInfo:nil];
+        }
+    }
+    
+    @synchronized(eventsToProcess)
+    {
+        [eventsToProcess addObject:queuedEvent];
+        
+        if (self.secondaryRoom)
+        {
+            //  use a stable sorting here, which means it won't change the order of events unless it has to.
+            [eventsToProcess sortWithOptions:NSSortStable
+                             usingComparator:^NSComparisonResult(MXKQueuedEvent * _Nonnull event1, MXKQueuedEvent * _Nonnull event2) {
+                return [event2.eventDate compare:event1.eventDate];
+            }];
+        }
+    }
+}
+
+- (BOOL)canPaginate:(MXTimelineDirection)direction
+{
+    if (_secondaryTimeline)
+    {
+        if (![_timeline canPaginate:direction] && ![_secondaryTimeline canPaginate:direction])
+        {
+            return NO;
+        }
+    }
+    else
+    {
+        if (![_timeline canPaginate:direction])
+        {
+            return NO;
+        }
+    }
+    
+    if (direction == MXTimelineDirectionBackwards && self.shouldStopBackPagination)
+    {
+        return NO;
+    }
+    
+    return YES;
+}
+
+// Check for undecryptable messages that were sent while the user was not in the room.
+- (void)checkForPreJoinUTDWithEvent:(MXEvent*)event roomState:(MXRoomState*)roomState
+{
+    // Only check for encrypted rooms
+    if (!self.room.summary.isEncrypted)
+    {
+        return;
+    }
+    
+    // Back pagination is stopped do not check for other pre join events
+    if (self.shouldStopBackPagination)
+    {
+        return;
+    }
+    
+    // if we reach a UTD and flag is set, hide previous encrypted messages and stop back-paginating
+    if (event.eventType == MXEventTypeRoomEncrypted
+        && [event.decryptionError.domain isEqualToString:MXDecryptingErrorDomain]
+        && self.shouldPreventBackPaginationOnPreviousUTDEvent)
+    {
+        self.shouldStopBackPagination = YES;
+        return;
+    }
+    
+    self.shouldStopBackPagination = NO;
+    
+    if (event.eventType != MXEventTypeRoomMember)
+    {
+        return;
+    }
+    
+    NSString *userId = event.stateKey;
+    
+    // Only check "m.room.member" event for current user
+    if (![userId isEqualToString:self.mxSession.myUserId])
+    {
+        return;
+    }
+    
+    BOOL shouldPreventBackPaginationOnPreviousUTDEvent = NO;
+    
+    MXRoomMember *member = [roomState.members memberWithUserId:userId];
+    
+    if (member)
+    {
+        switch (member.membership) {
+            case MXMembershipJoin:
+            {
+                // if we reach a join event for the user:
+                //  - if prev-content is invite, continue back-paginating
+                //  - if prev-content is join (was just an avatar or displayname change), continue back-paginating
+                //  - otherwise, set a flag and continue back-paginating
+                
+                NSString *previousMemberhsip = event.prevContent[@"membership"];
+                
+                BOOL isPrevContentAnInvite = [previousMemberhsip isEqualToString:@"invite"];
+                BOOL isPrevContentAJoin = [previousMemberhsip isEqualToString:@"join"];
+                
+                if (!(isPrevContentAnInvite || isPrevContentAJoin))
+                {
+                    shouldPreventBackPaginationOnPreviousUTDEvent = YES;
+                }
+            }
+                break;
+            case MXMembershipInvite:
+                // if we reach an invite event for the user, set flag and continue back-paginating
+                shouldPreventBackPaginationOnPreviousUTDEvent = YES;
+                break;
+            default:
+                break;
+        }
+    }
+    
+    self.shouldPreventBackPaginationOnPreviousUTDEvent = shouldPreventBackPaginationOnPreviousUTDEvent;
+}
+
+- (BOOL)checkBing:(MXEvent*)event
+{
+    BOOL isHighlighted = NO;
+    
+    // read receipts have no rule
+    if (![event.type isEqualToString:kMXEventTypeStringReceipt]) {
+        // Check if we should bing this event
+        MXPushRule *rule = [self.mxSession.notificationCenter ruleMatchingEvent:event roomState:self.roomState];
+        if (rule)
+        {
+            // Check whether is there an highlight tweak on it
+            for (MXPushRuleAction *ruleAction in rule.actions)
+            {
+                if (ruleAction.actionType == MXPushRuleActionTypeSetTweak)
+                {
+                    if ([ruleAction.parameters[@"set_tweak"] isEqualToString:@"highlight"])
+                    {
+                        // Check the highlight tweak "value"
+                        // If not present, highlight. Else check its value before highlighting
+                        if (nil == ruleAction.parameters[@"value"] || YES == [ruleAction.parameters[@"value"] boolValue])
+                        {
+                            isHighlighted = YES;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+    event.mxkIsHighlighted = isHighlighted;
+    return isHighlighted;
+}
+
+/**
+ Start processing pending events.
+ 
+ @param onComplete a block called (on the main thread) when the processing has been done. Can be nil.
+ Note this block returns the number of added cells in first and last positions.
+ */
+- (void)processQueuedEvents:(void (^)(NSUInteger addedHistoryCellNb, NSUInteger addedLiveCellNb))onComplete
+{
+    MXWeakify(self);
+    
+    // Do the processing on the processing queue
+    dispatch_async(MXKRoomDataSource.processingQueue, ^{
+        
+        MXStrongifyAndReturnIfNil(self);
+        
+        // Note: As this block is always called from the same processing queue,
+        // only one batch process is done at a time. Thus, an event cannot be
+        // processed twice
+        
+        // Snapshot queued events to avoid too long lock.
+        @synchronized(self->eventsToProcess)
+        {
+            if (self->eventsToProcess.count)
+            {
+                self->eventsToProcessSnapshot = self->eventsToProcess;
+                if (self.secondaryRoom)
+                {
+                    @synchronized(self->bubbles)
+                    {
+                        [self->bubblesSnapshot removeAllObjects];
+                    }
+                }
+                else
+                {
+                    self->eventsToProcess = [NSMutableArray array];
+                }
+            }
+        }
+
+        NSUInteger serverSyncEventCount = 0;
+        NSUInteger addedHistoryCellCount = 0;
+        NSUInteger addedLiveCellCount = 0;
+        
+        dispatch_group_t dispatchGroup = dispatch_group_create();
+
+        // Lock on `eventsToProcessSnapshot` to suspend reload or destroy during the process.
+        @synchronized(self->eventsToProcessSnapshot)
+        {
+            // Is there events to process?
+            // The list can be empty because several calls of processQueuedEvents may be processed
+            // in one pass in the processingQueue
+            if (self->eventsToProcessSnapshot.count)
+            {
+                // Make a quick copy of changing data to avoid to lock it too long time
+                @synchronized(self->bubbles)
+                {
+                    self->bubblesSnapshot = [self->bubbles mutableCopy];
+                }
+
+                NSMutableSet<id<MXKRoomBubbleCellDataStoring>> *collapsingCellDataSeriess = [NSMutableSet set];
+
+                for (MXKQueuedEvent *queuedEvent in self->eventsToProcessSnapshot)
+                {
+                    @synchronized (self->eventIdToBubbleMap)
+                    {
+                        //  Check whether the event processed before
+                        if (self->eventIdToBubbleMap[queuedEvent.event.eventId])
+                        {
+                            MXLogVerbose(@"[MXKRoomDataSource][%p] processQueuedEvents: Skip event: %@, state: %tu", self, queuedEvent.event.eventId, queuedEvent.event.sentState);
+                            continue;
+                        }
+                    }
+                    
+                    @autoreleasepool
+                    {
+                        // Count events received while the server sync was in progress
+                        if (queuedEvent.serverSyncEvent)
+                        {
+                            serverSyncEventCount ++;
+                        }
+
+                        // Check whether the event must be highlighted
+                        [self checkBing:queuedEvent.event];
+
+                        // Retrieve the MXKCellData class to manage the data
+                        Class class = [self cellDataClassForCellIdentifier:kMXKRoomBubbleCellDataIdentifier];
+                        NSAssert([class conformsToProtocol:@protocol(MXKRoomBubbleCellDataStoring)], @"MXKRoomDataSource only manages MXKCellData that conforms to MXKRoomBubbleCellDataStoring protocol");
+
+                        BOOL eventManaged = NO;
+                        BOOL updatedBubbleDataHadNoDisplay = NO;
+                        id<MXKRoomBubbleCellDataStoring> bubbleData;
+                        if ([class instancesRespondToSelector:@selector(addEvent:andRoomState:)] && 0 < self->bubblesSnapshot.count)
+                        {
+                            // Try to concatenate the event to the last or the oldest bubble?
+                            if (queuedEvent.direction == MXTimelineDirectionBackwards)
+                            {
+                                bubbleData = self->bubblesSnapshot.firstObject;
+                            }
+                            else
+                            {
+                                bubbleData = self->bubblesSnapshot.lastObject;
+                            }
+
+                            @synchronized (bubbleData)
+                            {
+                                updatedBubbleDataHadNoDisplay = bubbleData.hasNoDisplay;
+                                eventManaged = [bubbleData addEvent:queuedEvent.event andRoomState:queuedEvent.state];
+                            }
+                        }
+
+                        if (NO == eventManaged)
+                        {
+                            // The event has not been concatenated to an existing cell, create a new bubble for this event
+                            bubbleData = [[class alloc] initWithEvent:queuedEvent.event andRoomState:queuedEvent.state andRoomDataSource:self];
+                            if (!bubbleData)
+                            {
+                                // The event is ignored
+                                continue;
+                            }
+
+                            // Check cells collapsing
+                            if (bubbleData.hasAttributedTextMessage)
+                            {
+                                if (bubbleData.collapsable)
+                                {
+                                    if (queuedEvent.direction == MXTimelineDirectionBackwards)
+                                    {
+                                        // Try to collapse it with the series at the start of self.bubbles
+                                        if (self->collapsableSeriesAtStart && [self->collapsableSeriesAtStart collapseWith:bubbleData])
+                                        {
+                                            // bubbleData becomes the oldest cell data of the current series
+                                            self->collapsableSeriesAtStart.prevCollapsableCellData = bubbleData;
+                                            bubbleData.nextCollapsableCellData = self->collapsableSeriesAtStart;
+
+                                            // The new cell must have the collapsed state as the series
+                                            bubbleData.collapsed = self->collapsableSeriesAtStart.collapsed;
+
+                                            // Release data of the previous header
+                                            self->collapsableSeriesAtStart.collapseState = nil;
+                                            self->collapsableSeriesAtStart.collapsedAttributedTextMessage = nil;
+                                            [collapsingCellDataSeriess removeObject:self->collapsableSeriesAtStart];
+
+                                            // And keep a ref of data for the new start of the series
+                                            self->collapsableSeriesAtStart = bubbleData;
+                                            self->collapsableSeriesAtStart.collapseState = queuedEvent.state;
+                                            [collapsingCellDataSeriess addObject:self->collapsableSeriesAtStart];
+                                        }
+                                        else
+                                        {
+                                            // This is a ending point for a new collapsable series of cells
+                                            self->collapsableSeriesAtStart = bubbleData;
+                                            self->collapsableSeriesAtStart.collapseState = queuedEvent.state;
+                                            [collapsingCellDataSeriess addObject:self->collapsableSeriesAtStart];
+                                        }
+                                    }
+                                    else
+                                    {
+                                        // Try to collapse it with the series at the end of self.bubbles
+                                        if (self->collapsableSeriesAtEnd && [self->collapsableSeriesAtEnd collapseWith:bubbleData])
+                                        {
+                                            // Put bubbleData at the series tail
+                                            // Find the tail
+                                            id<MXKRoomBubbleCellDataStoring> tailBubbleData = self->collapsableSeriesAtEnd;
+                                            while (tailBubbleData.nextCollapsableCellData)
+                                            {
+                                                tailBubbleData = tailBubbleData.nextCollapsableCellData;
+                                            }
+
+                                            tailBubbleData.nextCollapsableCellData = bubbleData;
+                                            bubbleData.prevCollapsableCellData = tailBubbleData;
+
+                                            // The new cell must have the collapsed state as the series
+                                            bubbleData.collapsed = tailBubbleData.collapsed;
+
+                                            // If the start of the collapsible series stems from an event in a different processing
+                                            // batch, we need to track it here so that we can update the summary string later
+                                            if (![collapsingCellDataSeriess containsObject:self->collapsableSeriesAtEnd]) {
+                                                [collapsingCellDataSeriess addObject:self->collapsableSeriesAtEnd];
+                                            }
+                                        }
+                                        else
+                                        {
+                                            // This is a starting point for a new collapsable series of cells
+                                            self->collapsableSeriesAtEnd = bubbleData;
+                                            self->collapsableSeriesAtEnd.collapseState = queuedEvent.state;
+                                            [collapsingCellDataSeriess addObject:self->collapsableSeriesAtEnd];
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    // The new bubble is not collapsable.
+                                    // We can close one border of the current series being built (if any)
+                                    if (queuedEvent.direction == MXTimelineDirectionBackwards && self->collapsableSeriesAtStart)
+                                    {
+                                        // This is the begin border of the series
+                                        self->collapsableSeriesAtStart = nil;
+                                    }
+                                    else if (queuedEvent.direction == MXTimelineDirectionForwards && self->collapsableSeriesAtEnd)
+                                    {
+                                        // This is the end border of the series
+                                        self->collapsableSeriesAtEnd = nil;
+                                    }
+                                }
+                            }
+
+                            if (queuedEvent.direction == MXTimelineDirectionBackwards)
+                            {
+                                // The new bubble data will be inserted at first position.
+                                // We have to update the 'isPaginationFirstBubble' and 'shouldHideSenderInformation' flags of the current first bubble.
+
+                                // Pagination handling
+                                if ((self.bubblesPagination == MXKRoomDataSourceBubblesPaginationPerDay) && bubbleData.date)
+                                {
+                                    // A new pagination starts with this new bubble data
+                                    bubbleData.isPaginationFirstBubble = YES;
+
+                                    // Check whether the current first displayed pagination title is still relevant.
+                                    if (self->bubblesSnapshot.count)
+                                    {
+                                        NSInteger index = 0;
+                                        id<MXKRoomBubbleCellDataStoring> previousFirstBubbleDataWithDate;
+                                        NSString *firstBubbleDateString;
+                                        while (index < self->bubblesSnapshot.count)
+                                        {
+                                            previousFirstBubbleDataWithDate = self->bubblesSnapshot[index++];
+                                            firstBubbleDateString = [self.eventFormatter dateStringFromDate:previousFirstBubbleDataWithDate.date withTime:NO];
+                                            
+                                            if (firstBubbleDateString)
+                                            {
+                                                break;
+                                            }
+                                        }
+                                        
+                                        if (firstBubbleDateString)
+                                        {
+                                            NSString *bubbleDateString = [self.eventFormatter dateStringFromDate:bubbleData.date withTime:NO];
+                                            previousFirstBubbleDataWithDate.isPaginationFirstBubble = (bubbleDateString && ![firstBubbleDateString isEqualToString:bubbleDateString]);
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    bubbleData.isPaginationFirstBubble = NO;
+                                }
+
+                                // Sender information are required for this new first bubble data,
+                                // except if the bubble has no display (composed only by ignored events).
+                                bubbleData.shouldHideSenderInformation = bubbleData.hasNoDisplay;
+
+                                // Check whether this information is relevant for the current first bubble.
+                                if (!bubbleData.shouldHideSenderInformation && self->bubblesSnapshot.count)
+                                {
+                                    id<MXKRoomBubbleCellDataStoring> previousFirstBubbleData = self->bubblesSnapshot.firstObject;
+
+                                    if (previousFirstBubbleData.isPaginationFirstBubble == NO)
+                                    {
+                                        // Check whether the current first bubble has been sent by the same user.
+                                        previousFirstBubbleData.shouldHideSenderInformation |= [previousFirstBubbleData hasSameSenderAsBubbleCellData:bubbleData];
+                                    }
+                                }
+
+                                // Insert the new bubble data in first position
+                                [self->bubblesSnapshot insertObject:bubbleData atIndex:0];
+                                
+                                addedHistoryCellCount++;
+                            }
+                            else
+                            {
+                                // The new bubble data will be added at the last position
+                                // We have to update its 'isPaginationFirstBubble' and 'shouldHideSenderInformation' flags according to the previous last bubble.
+
+                                // Pagination handling
+                                if (self.bubblesPagination == MXKRoomDataSourceBubblesPaginationPerDay)
+                                {
+                                    // Check whether a new pagination starts at this bubble
+                                    NSString *bubbleDateString = [self.eventFormatter dateStringFromDate:bubbleData.date withTime:NO];
+                                    
+                                    // Look for the current last bubble with date
+                                    NSInteger index = self->bubblesSnapshot.count;
+                                    NSString *lastBubbleDateString;
+                                    while (index--)
+                                    {
+                                        id<MXKRoomBubbleCellDataStoring> previousLastBubbleData = self->bubblesSnapshot[index];
+                                        lastBubbleDateString = [self.eventFormatter dateStringFromDate:previousLastBubbleData.date withTime:NO];
+                                        
+                                        if (lastBubbleDateString)
+                                        {
+                                            break;
+                                        }
+                                    }
+                                    
+                                    if (lastBubbleDateString)
+                                    {
+                                        bubbleData.isPaginationFirstBubble = (bubbleDateString && ![bubbleDateString isEqualToString:lastBubbleDateString]);
+                                    }
+                                    else
+                                    {
+                                        bubbleData.isPaginationFirstBubble = (bubbleDateString != nil);
+                                    }
+                                }
+                                else
+                                {
+                                    bubbleData.isPaginationFirstBubble = NO;
+                                }
+
+                                // Check whether the sender information is relevant for this new bubble.
+                                bubbleData.shouldHideSenderInformation = bubbleData.hasNoDisplay;
+                                if (!bubbleData.shouldHideSenderInformation && self->bubblesSnapshot.count && (bubbleData.isPaginationFirstBubble == NO))
+                                {
+                                    // Check whether the previous bubble has been sent by the same user.
+                                    id<MXKRoomBubbleCellDataStoring> previousLastBubbleData = self->bubblesSnapshot.lastObject;
+                                    bubbleData.shouldHideSenderInformation = [bubbleData hasSameSenderAsBubbleCellData:previousLastBubbleData];
+                                }
+
+                                // Insert the new bubble in last position
+                                [self->bubblesSnapshot addObject:bubbleData];
+                                
+                                addedLiveCellCount++;
+                            }
+                        }
+                        else if (updatedBubbleDataHadNoDisplay && !bubbleData.hasNoDisplay)
+                        {
+                            // Here the event has been added in an existing bubble data which had no display,
+                            // and the added event provides a display to this bubble data.
+                            if (queuedEvent.direction == MXTimelineDirectionBackwards)
+                            {
+                                // The bubble is the first one.
+                                
+                                // Pagination handling
+                                if ((self.bubblesPagination == MXKRoomDataSourceBubblesPaginationPerDay) && bubbleData.date)
+                                {
+                                    // A new pagination starts with this bubble data
+                                    bubbleData.isPaginationFirstBubble = YES;
+                                    
+                                    // Look for the first next bubble with date to check whether its pagination title is still relevant.
+                                    if (self->bubblesSnapshot.count)
+                                    {
+                                        NSInteger index = 1;
+                                        id<MXKRoomBubbleCellDataStoring> nextBubbleDataWithDate;
+                                        NSString *firstNextBubbleDateString;
+                                        while (index < self->bubblesSnapshot.count)
+                                        {
+                                            nextBubbleDataWithDate = self->bubblesSnapshot[index++];
+                                            firstNextBubbleDateString = [self.eventFormatter dateStringFromDate:nextBubbleDataWithDate.date withTime:NO];
+                                            
+                                            if (firstNextBubbleDateString)
+                                            {
+                                                break;
+                                            }
+                                        }
+                                        
+                                        if (firstNextBubbleDateString)
+                                        {
+                                            NSString *bubbleDateString = [self.eventFormatter dateStringFromDate:bubbleData.date withTime:NO];
+                                            nextBubbleDataWithDate.isPaginationFirstBubble = (bubbleDateString && ![firstNextBubbleDateString isEqualToString:bubbleDateString]);
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    bubbleData.isPaginationFirstBubble = NO;
+                                }
+                                
+                                // Sender information are required for this new first bubble data
+                                bubbleData.shouldHideSenderInformation = NO;
+                                
+                                // Check whether this information is still relevant for the next bubble.
+                                if (self->bubblesSnapshot.count > 1)
+                                {
+                                    id<MXKRoomBubbleCellDataStoring> nextBubbleData = self->bubblesSnapshot[1];
+                                    
+                                    if (nextBubbleData.isPaginationFirstBubble == NO)
+                                    {
+                                        // Check whether the current first bubble has been sent by the same user.
+                                        nextBubbleData.shouldHideSenderInformation |= [nextBubbleData hasSameSenderAsBubbleCellData:bubbleData];
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                // The bubble data is the last one
+                                
+                                // Pagination handling
+                                if (self.bubblesPagination == MXKRoomDataSourceBubblesPaginationPerDay)
+                                {
+                                    // Check whether a new pagination starts at this bubble
+                                    NSString *bubbleDateString = [self.eventFormatter dateStringFromDate:bubbleData.date withTime:NO];
+                                    
+                                    // Look for the first previous bubble with date
+                                    NSInteger index = self->bubblesSnapshot.count - 1;
+                                    NSString *firstPreviousBubbleDateString;
+                                    while (index--)
+                                    {
+                                        id<MXKRoomBubbleCellDataStoring> previousBubbleData = self->bubblesSnapshot[index];
+                                        firstPreviousBubbleDateString = [self.eventFormatter dateStringFromDate:previousBubbleData.date withTime:NO];
+                                        
+                                        if (firstPreviousBubbleDateString)
+                                        {
+                                            break;
+                                        }
+                                    }
+                                    
+                                    if (firstPreviousBubbleDateString)
+                                    {
+                                        bubbleData.isPaginationFirstBubble = (bubbleDateString && ![bubbleDateString isEqualToString:firstPreviousBubbleDateString]);
+                                    }
+                                    else
+                                    {
+                                        bubbleData.isPaginationFirstBubble = (bubbleDateString != nil);
+                                    }
+                                }
+                                else
+                                {
+                                    bubbleData.isPaginationFirstBubble = NO;
+                                }
+                                
+                                // Check whether the sender information is relevant for this new bubble.
+                                bubbleData.shouldHideSenderInformation = NO;
+                                if (self->bubblesSnapshot.count && (bubbleData.isPaginationFirstBubble == NO))
+                                {
+                                    // Check whether the previous bubble has been sent by the same user.
+                                    NSInteger index = self->bubblesSnapshot.count - 1;
+                                    if (index--)
+                                    {
+                                        id<MXKRoomBubbleCellDataStoring> previousBubbleData = self->bubblesSnapshot[index];
+                                        bubbleData.shouldHideSenderInformation = [bubbleData hasSameSenderAsBubbleCellData:previousBubbleData];
+                                    }
+                                }
+                            }
+                        }
+
+                        [self updateCellDataReactions:bubbleData forEventId:queuedEvent.event.eventId];
+
+                        // Store event-bubble link to the map
+                        @synchronized (self->eventIdToBubbleMap)
+                        {
+                            self->eventIdToBubbleMap[queuedEvent.event.eventId] = bubbleData;
+                        }
+                        
+                        if (queuedEvent.event.isLocalEvent)
+                        {
+                            // Listen to the identifier change for the local events.
+                            [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(localEventDidChangeIdentifier:) name:kMXEventDidChangeIdentifierNotification object:queuedEvent.event];
+                        }
+                    }
+                }
+
+                for (MXKQueuedEvent *queuedEvent in self->eventsToProcessSnapshot)
+                {
+                    @autoreleasepool
+                    {
+                        dispatch_group_enter(dispatchGroup);
+                        [self addReadReceiptsForEvent:queuedEvent.event.eventId inCellDatas:self->bubblesSnapshot startingAtCellData:self->eventIdToBubbleMap[queuedEvent.event.eventId] completion:^{
+                            dispatch_group_leave(dispatchGroup);
+                        }];
+                    }
+                }
+
+                // Check if all cells of self.bubbles belongs to a single collapse series.
+                // In this case, collapsableSeriesAtStart and collapsableSeriesAtEnd must be equal
+                // in order to handle next forward or backward pagination.
+                if (self->collapsableSeriesAtStart && self->collapsableSeriesAtStart == self->bubbles.firstObject)
+                {
+                    // Find the tail
+                    id<MXKRoomBubbleCellDataStoring> tailBubbleData = self->collapsableSeriesAtStart;
+                    while (tailBubbleData.nextCollapsableCellData)
+                    {
+                        tailBubbleData = tailBubbleData.nextCollapsableCellData;
+                    }
+
+                    if (tailBubbleData == self->bubbles.lastObject)
+                    {
+                        self->collapsableSeriesAtEnd = self->collapsableSeriesAtStart;
+                    }
+                }
+                else if (self->collapsableSeriesAtEnd)
+                {
+                    // Find the start
+                    id<MXKRoomBubbleCellDataStoring> startBubbleData = self->collapsableSeriesAtEnd;
+                    while (startBubbleData.prevCollapsableCellData)
+                    {
+                        startBubbleData = startBubbleData.prevCollapsableCellData;
+                    }
+
+                    if (startBubbleData == self->bubbles.firstObject)
+                    {
+                        self->collapsableSeriesAtStart = self->collapsableSeriesAtEnd;
+                    }
+                }
+
+                // Compose (= compute collapsedAttributedTextMessage) of collapsable seriess
+                for (id<MXKRoomBubbleCellDataStoring> bubbleData in collapsingCellDataSeriess)
+                {
+                    // Get all events of the series
+                    NSMutableArray<MXEvent*> *events = [NSMutableArray array];
+                    id<MXKRoomBubbleCellDataStoring> nextBubbleData = bubbleData;
+                    do
+                    {
+                        [events addObjectsFromArray:nextBubbleData.events];
+                    }
+                    while ((nextBubbleData = nextBubbleData.nextCollapsableCellData));
+
+                    // Build the summary string for the series
+                    bubbleData.collapsedAttributedTextMessage = [self.eventFormatter attributedStringFromEvents:events withRoomState:bubbleData.collapseState error:nil];
+
+                    // Release collapseState objects, even the one of collapsableSeriesAtStart.
+                    // We do not need to keep its state because if an collapsable event comes before collapsableSeriesAtStart,
+                    // we will take the room state of this event.
+                    if (bubbleData != self->collapsableSeriesAtEnd)
+                    {
+                        bubbleData.collapseState = nil;
+                    }
+                }
+            }
+            self->eventsToProcessSnapshot = nil;
+        }
+        
+        // Check whether some events have been processed
+        if (self->bubblesSnapshot)
+        {
+            // Updated data can be displayed now
+            // Block MXKRoomDataSource.processingQueue while the processing is finalised on the main thread
+            dispatch_group_wait(dispatchGroup, DISPATCH_TIME_FOREVER);
+            
+            dispatch_sync(dispatch_get_main_queue(), ^{
+                // Check whether self has not been reloaded or destroyed
+                if (self.state == MXKDataSourceStateReady && self->bubblesSnapshot)
+                {
+                    if (self.serverSyncEventCount)
+                    {
+                        self->_serverSyncEventCount -= serverSyncEventCount;
+                        if (!self.serverSyncEventCount)
+                        {
+                            // Notify that sync process ends
+                            [[NSNotificationCenter defaultCenter] postNotificationName:kMXKRoomDataSourceSyncStatusChanged object:self userInfo:nil];
+                        }
+                    }
+                    if (self.secondaryRoom) {
+                        [self->bubblesSnapshot sortWithOptions:NSSortStable
+                                               usingComparator:^NSComparisonResult(MXKRoomBubbleCellData * _Nonnull bubbleData1, MXKRoomBubbleCellData * _Nonnull bubbleData2) {
+                            if (bubbleData1.date)
+                            {
+                                if (bubbleData2.date)
+                                {
+                                    return [bubbleData1.date compare:bubbleData2.date];
+                                }
+                                else
+                                {
+                                    return NSOrderedDescending;
+                                }
+                            }
+                            else
+                            {
+                                if (bubbleData2.date)
+                                {
+                                    return NSOrderedAscending;
+                                }
+                                else
+                                {
+                                    return NSOrderedSame;
+                                }
+                            }
+                        }];
+                    }
+                    self->bubbles = self->bubblesSnapshot;
+                    self->bubblesSnapshot = nil;
+                    
+                    if (self.delegate)
+                    {
+                        [self.delegate dataSource:self didCellChange:nil];
+                    }
+                    else
+                    {
+                        // Check the memory usage of the data source. Reload it if the cache is too huge.
+                        [self limitMemoryUsage:self.maxBackgroundCachedBubblesCount];
+                    }
+                }
+                
+                // Inform about the end if requested
+                if (onComplete)
+                {
+                    onComplete(addedHistoryCellCount, addedLiveCellCount);
+                }
+            });
+        }
+        else
+        {
+            // No new event has been added, we just inform about the end if requested.
+            if (onComplete)
+            {
+                dispatch_group_notify(dispatchGroup, dispatch_get_main_queue(), ^{
+                    onComplete(0, 0);
+                });
+            }
+        }
+    });
+}
+
+/**
+ Add the read receipts of an event into the timeline (which is in array of cell datas)
+
+ If the event is not displayed, read receipts will be added to a previous displayed message.
+
+ @param eventId the id of the event.
+ @param cellDatas the working array of cell datas.
+ @param cellData the original cell data the event belongs to.
+ */
+- (void)addReadReceiptsForEvent:(NSString*)eventId inCellDatas:(NSArray<id<MXKRoomBubbleCellDataStoring>>*)cellDatas startingAtCellData:(id<MXKRoomBubbleCellDataStoring>)cellData completion:(void (^)(void))completion
+{
+    if (self.showBubbleReceipts)
+    {
+        if (self.room)
+        {
+            [self.room getEventReceipts:eventId sorted:YES completion:^(NSArray<MXReceiptData *> * _Nonnull readReceipts) {
+                if (readReceipts.count)
+                {
+                    NSInteger cellDataIndex = [cellDatas indexOfObject:cellData];
+                    if (cellDataIndex != NSNotFound)
+                    {
+                        [self addReadReceipts:readReceipts forEvent:eventId inCellDatas:cellDatas atCellDataIndex:cellDataIndex];
+                    }
+                }
+                
+                if (completion)
+                {
+                    completion();
+                }
+            }];
+        }
+        else if (completion)
+        {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                completion();
+            });
+        }
+    }
+    else if (completion)
+    {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            completion();
+        });
+    }
+}
+
+- (void)addReadReceipts:(NSArray<MXReceiptData*> *)readReceipts forEvent:(NSString*)eventId inCellDatas:(NSArray<id<MXKRoomBubbleCellDataStoring>>*)cellDatas atCellDataIndex:(NSInteger)cellDataIndex
+{
+    id<MXKRoomBubbleCellDataStoring> cellData = cellDatas[cellDataIndex];
+
+    if ([cellData isKindOfClass:MXKRoomBubbleCellData.class])
+    {
+        MXKRoomBubbleCellData *roomBubbleCellData = (MXKRoomBubbleCellData*)cellData;
+
+        BOOL areReadReceiptsAssigned = NO;
+        for (MXKRoomBubbleComponent *component in roomBubbleCellData.bubbleComponents.reverseObjectEnumerator)
+        {
+            if (component.attributedTextMessage)
+            {
+                if (roomBubbleCellData.readReceipts[component.event.eventId])
+                {
+                    NSArray<MXReceiptData*> *currentReadReceipts = roomBubbleCellData.readReceipts[component.event.eventId];
+                    NSMutableArray<MXReceiptData*> *newReadReceipts = [NSMutableArray arrayWithArray:currentReadReceipts];
+                    for (MXReceiptData *readReceipt in readReceipts)
+                    {
+                        BOOL alreadyHere = NO;
+                        for (MXReceiptData *currentReadReceipt in currentReadReceipts)
+                        {
+                            if ([readReceipt.userId isEqualToString:currentReadReceipt.userId])
+                            {
+                                alreadyHere = YES;
+                                break;
+                            }
+                        }
+
+                        if (!alreadyHere)
+                        {
+                            [newReadReceipts addObject:readReceipt];
+                        }
+                    }
+                    [self updateCellData:roomBubbleCellData withReadReceipts:newReadReceipts forEventId:component.event.eventId];
+                }
+                else
+                {
+                    [self updateCellData:roomBubbleCellData withReadReceipts:readReceipts forEventId:component.event.eventId];
+                }
+                areReadReceiptsAssigned = YES;
+                break;
+            }
+
+            MXLogDebug(@"[MXKRoomDataSource][%p] addReadReceipts: Read receipts for an event(%@) that is not displayed", self, eventId);
+        }
+
+        if (!areReadReceiptsAssigned)
+        {
+            MXLogDebug(@"[MXKRoomDataSource][%p] addReadReceipts: Try to attach read receipts to an older message: %@", self, eventId);
+
+            // Try to assign RRs to a previous cell data
+            if (cellDataIndex >= 1)
+            {
+                [self addReadReceipts:readReceipts forEvent:eventId inCellDatas:cellDatas atCellDataIndex:cellDataIndex - 1];
+            }
+            else
+            {
+                MXLogDebug(@"[MXKRoomDataSource][%p] addReadReceipts: Fail to attach read receipts for an event(%@)", self, eventId);
+            }
+        }
+    }
+}
+
+
+#pragma mark - UITableViewDataSource
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    // PATCH: Presently no bubble must be displayed until the user joins the room.
+    // FIXME: Handle room data source in case of room preview
+    if (self.room.summary.membership == MXMembershipInvite)
+    {
+        return 0;
+    }
+    
+    NSInteger count;
+    @synchronized(bubbles)
+    {
+        count = bubbles.count;
+    }
+    return count;
+}
+
+- (void)scanBubbleDataIfNeeded:(id<MXKRoomBubbleCellDataStoring>)bubbleData
+{
+    MXScanManager *scanManager = self.mxSession.scanManager;
+    
+    if (!scanManager && ![bubbleData isKindOfClass:MXKRoomBubbleCellData.class])
+    {
+        return;
+    }
+
+    MXKRoomBubbleCellData *roomBubbleCellData = (MXKRoomBubbleCellData*)bubbleData;
+    
+    NSString *contentURL = roomBubbleCellData.attachment.contentURL;
+
+    // If the content url corresponds to an upload id, the upload is in progress or not complete.
+    // Create a fake event scan with in progress status when uploading media.
+    // Since there is no event scan in database it will be overriden by MXScanManager on media upload complete.
+    if (contentURL && [contentURL hasPrefix:kMXMediaUploadIdPrefix])
+    {
+        MXKRoomBubbleComponent *firstBubbleComponent = roomBubbleCellData.bubbleComponents.firstObject;
+        MXEvent *firstBubbleComponentEvent = firstBubbleComponent.event;
+        
+        if (firstBubbleComponent && firstBubbleComponent.eventScan.antivirusScanStatus != MXAntivirusScanStatusInProgress && firstBubbleComponentEvent)
+        {
+            MXEventScan *uploadEventScan = [MXEventScan new];
+            uploadEventScan.eventId = firstBubbleComponentEvent.eventId;
+            uploadEventScan.antivirusScanStatus = MXAntivirusScanStatusInProgress;
+            uploadEventScan.antivirusScanDate = nil;
+            uploadEventScan.mediaScans = @[];
+            
+            firstBubbleComponent.eventScan = uploadEventScan;
+        }
+    }
+    else
+    {
+        for (MXKRoomBubbleComponent *bubbleComponent in roomBubbleCellData.bubbleComponents)
+        {
+            MXEvent *event = bubbleComponent.event;
+            
+            if ([event isContentScannable])
+            {
+                [scanManager scanEventIfNeeded:event];
+                // NOTE: - [MXScanManager scanEventIfNeeded:] perform modification in background, so - [MXScanManager eventScanWithId:] do not retrieve the last state of event scan.
+                // It is noticeable when eventScan should be created for the first time. It would be better to return an eventScan with an in progress scan status instead of nil.
+                MXEventScan *eventScan = [scanManager eventScanWithId:event.eventId];
+                bubbleComponent.eventScan = eventScan;
+            }
+        }
+    }
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    UITableViewCell<MXKCellRendering> *cell;
+    
+    id<MXKRoomBubbleCellDataStoring> bubbleData = [self cellDataAtIndex:indexPath.row];
+    
+    // Launch an antivirus scan on events contained in bubble data if needed
+    [self scanBubbleDataIfNeeded:bubbleData];
+    
+    if (bubbleData && self.delegate)
+    {
+        // Retrieve the cell identifier according to cell data.
+        NSString *identifier = [self.delegate cellReuseIdentifierForCellData:bubbleData];
+        if (identifier)
+        {
+            cell = [tableView dequeueReusableCellWithIdentifier:identifier forIndexPath:indexPath];
+            
+            // Make sure we listen to user actions on the cell
+            cell.delegate = self;
+            
+            // Update typing flag before rendering
+            bubbleData.isTyping = _showTypingNotifications && currentTypingUsers && ([currentTypingUsers indexOfObject:bubbleData.senderId] != NSNotFound);
+            // Report the current timestamp display option
+            bubbleData.showBubbleDateTime = self.showBubblesDateTime;
+            // display the read receipts
+            bubbleData.showBubbleReceipts = self.showBubbleReceipts;
+            // let the caller application manages the time label?
+            bubbleData.useCustomDateTimeLabel = self.useCustomDateTimeLabel;
+            // let the caller application manages the receipt?
+            bubbleData.useCustomReceipts = self.useCustomReceipts;
+            // let the caller application manages the unsent button?
+            bubbleData.useCustomUnsentButton = self.useCustomUnsentButton;
+            
+            // Make the bubble display the data
+            [cell render:bubbleData];
+        }
+    }
+    
+    // Sanity check: this method may be called during a layout refresh while room data have been modified.
+    if (!cell)
+    {
+        // Return an empty cell
+        return [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"fakeCell"];
+    }
+    
+    return cell;
+}
+
+#pragma mark - Groups
+
+- (MXGroup *)groupWithGroupId:(NSString*)groupId
+{
+    MXGroup *group = [self.mxSession groupWithGroupId:groupId];
+    if (!group)
+    {
+        // Check whether an instance has been already created.
+        group = [externalRelatedGroups objectForKey:groupId];
+    }
+        
+    if (!group)
+    {
+        // Create a new group instance.
+        group = [[MXGroup alloc] initWithGroupId:groupId];
+        [externalRelatedGroups setObject:group forKey:groupId];
+        
+        // Retrieve at least the group profile
+        [self.mxSession updateGroupProfile:group success:nil failure:^(NSError *error) {
+            
+            MXLogDebug(@"[MXKRoomDataSource][%p] groupWithGroupId: group profile update failed %@", self, groupId);
+            
+        }];
+    }
+    
+    return group;
+}
+
+#pragma mark - MXScanManager notifications
+
+- (void)registerScanManagerNotifications
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:MXScanManagerEventScanDidChangeNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(eventScansDidChange:) name:MXScanManagerEventScanDidChangeNotification object:nil];
+}
+
+- (void)unregisterScanManagerNotifications
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:MXScanManagerEventScanDidChangeNotification object:nil];
+}
+     
+- (void)eventScansDidChange:(NSNotification*)notification
+{
+    // TODO: Avoid to call the delegate to often. Set a minimum time interval to avoid table view flickering.
+    [self.delegate dataSource:self didCellChange:nil];
+}
+
+
+#pragma mark - Reactions
+
+- (void)registerReactionsChangeListener
+{
+    if (!self.showReactions || reactionsChangeListener)
+    {
+        return;
+    }
+
+    MXWeakify(self);
+    reactionsChangeListener = [self.mxSession.aggregations listenToReactionCountUpdateInRoom:self.roomId block:^(NSDictionary<NSString *,MXReactionCountChange *> * _Nonnull changes) {
+        MXStrongifyAndReturnIfNil(self);
+
+        BOOL updated = NO;
+        for (NSString *eventId in changes)
+        {
+            id<MXKRoomBubbleCellDataStoring> bubbleData = [self cellDataOfEventWithEventId:eventId];
+            if (bubbleData)
+            {
+                // TODO: Be smarted and use changes[eventId]
+                [self updateCellDataReactions:bubbleData forEventId:eventId];
+                updated = YES;
+            }
+        }
+
+        if (updated)
+        {
+            [self.delegate dataSource:self didCellChange:nil];
+        }
+    }];
+}
+
+- (void)unregisterReactionsChangeListener
+{
+    if (reactionsChangeListener)
+    {
+        [self.mxSession.aggregations removeListener:reactionsChangeListener];
+        reactionsChangeListener = nil;
+    }
+}
+
+- (void)updateCellDataReactions:(id<MXKRoomBubbleCellDataStoring>)cellData forEventId:(NSString*)eventId
+{
+    if (!self.showReactions || ![cellData isKindOfClass:MXKRoomBubbleCellData.class])
+    {
+        return;
+    }
+
+    MXKRoomBubbleCellData *roomBubbleCellData = (MXKRoomBubbleCellData*)cellData;
+
+    MXAggregatedReactions *aggregatedReactions = [self.mxSession.aggregations aggregatedReactionsOnEvent:eventId inRoom:self.roomId].aggregatedReactionsWithNonZeroCount;
+    
+    if (self.showOnlySingleEmojiReactions)
+    {
+        aggregatedReactions = aggregatedReactions.aggregatedReactionsWithSingleEmoji;
+    }
+    
+    if (aggregatedReactions)
+    {
+        if (!roomBubbleCellData.reactions)
+        {
+            roomBubbleCellData.reactions = [NSMutableDictionary dictionary];
+        }
+
+        roomBubbleCellData.reactions[eventId] = aggregatedReactions;
+    }
+    else
+    {
+        // unreaction
+        roomBubbleCellData.reactions[eventId] = nil;
+    }
+
+    // Indicate that the text message layout should be recomputed.
+    [roomBubbleCellData invalidateTextLayout];
+}
+
+- (BOOL)canReactToEventWithId:(NSString*)eventId
+{
+    BOOL canReact = NO;
+    
+    MXEvent *event = [self eventWithEventId:eventId];
+    
+    if ([self canPerformActionOnEvent:event])
+    {
+        NSString *messageType = event.content[@"msgtype"];
+        
+        if ([messageType isEqualToString:kMXMessageTypeKeyVerificationRequest])
+        {
+            canReact = NO;
+        }
+        else
+        {
+            canReact = YES;
+        }
+    }
+    
+    return canReact;
+}
+
+- (void)addReaction:(NSString *)reaction forEventId:(NSString *)eventId success:(void (^)(void))success failure:(void (^)(NSError *))failure
+{
+    [self.mxSession.aggregations addReaction:reaction forEvent:eventId inRoom:self.roomId success:success failure:^(NSError * _Nonnull error) {
+        MXLogDebug(@"[MXKRoomDataSource][%p] Fail to send reaction on eventId: %@", self, eventId);
+        if (failure)
+        {
+            failure(error);
+        }
+    }];
+}
+
+- (void)removeReaction:(NSString *)reaction forEventId:(NSString *)eventId success:(void (^)(void))success failure:(void (^)(NSError *))failure
+{
+    [self.mxSession.aggregations removeReaction:reaction forEvent:eventId inRoom:self.roomId success:success failure:^(NSError * _Nonnull error) {
+        MXLogDebug(@"[MXKRoomDataSource][%p] Fail to unreact on eventId: %@", self, eventId);
+        if (failure)
+        {
+            failure(error);
+        }
+    }];
+}
+
+#pragma mark - Editions
+
+- (BOOL)canEditEventWithId:(NSString*)eventId
+{
+    MXEvent *event = [self eventWithEventId:eventId];
+    BOOL isRoomMessage = event.eventType == MXEventTypeRoomMessage;
+    NSString *messageType = event.content[@"msgtype"];
+    
+    return isRoomMessage
+    && ([messageType isEqualToString:kMXMessageTypeText] || [messageType isEqualToString:kMXMessageTypeEmote])
+    && [event.sender isEqualToString:self.mxSession.myUserId]
+    && [event.roomId isEqualToString:self.roomId];
+}
+
+- (NSString*)editableTextMessageForEvent:(MXEvent*)event
+{
+    NSString *editableTextMessage;
+    
+    if (event.isReplyEvent)
+    {
+        MXReplyEventParser *replyEventParser = [MXReplyEventParser new];
+        MXReplyEventParts *replyEventParts = [replyEventParser parse:event];
+        
+        editableTextMessage = replyEventParts.bodyParts.replyText;
+    }
+    else
+    {
+        editableTextMessage = event.content[@"body"];
+    }
+    
+    return editableTextMessage;
+}
+
+- (void)registerEventEditsListener
+{
+    if (eventEditsListener)
+    {
+        return;
+    }
+    
+    MXWeakify(self);
+    eventEditsListener = [self.mxSession.aggregations listenToEditsUpdateInRoom:self.roomId block:^(MXEvent * _Nonnull replaceEvent) {
+        MXStrongifyAndReturnIfNil(self);
+
+        [self updateEventWithReplaceEvent:replaceEvent];
+    }];
+}
+
+- (void)updateEventWithReplaceEvent:(MXEvent*)replaceEvent
+{
+    NSString *editedEventId = replaceEvent.relatesTo.eventId;
+
+    dispatch_async(MXKRoomDataSource.processingQueue, ^{
+
+        // Check whether a message contains the edited event
+        id<MXKRoomBubbleCellDataStoring> bubbleData = [self cellDataOfEventWithEventId:editedEventId];
+        if (bubbleData)
+        {
+            BOOL hasChanged = [self updateCellData:bubbleData forEditionWithReplaceEvent:replaceEvent andEventId:editedEventId];
+
+            if (hasChanged)
+            {
+                // Update the delegate on main thread
+                dispatch_async(dispatch_get_main_queue(), ^{
+
+                    if (self.delegate)
+                    {
+                        [self.delegate dataSource:self didCellChange:nil];
+                    }
+
+                });
+            }
+        }
+    });
+}
+
+- (void)unregisterEventEditsListener
+{
+    if (eventEditsListener)
+    {
+        [self.mxSession.aggregations removeListener:eventEditsListener];
+        eventEditsListener = nil;
+    }
+}
+
+- (BOOL)updateCellData:(id<MXKRoomBubbleCellDataStoring>)bubbleCellData forEditionWithReplaceEvent:(MXEvent*)replaceEvent andEventId:(NSString*)eventId
+{
+    BOOL hasChanged = NO;
+    
+    @synchronized (bubbleCellData)
+    {
+        // Retrieve the original event to edit it
+        NSArray *events = bubbleCellData.events;
+        MXEvent *editedEvent = nil;
+        
+        // If not already done, update edited event content in-place
+        // This is required for:
+        //   - local echo
+        //   - non live timeline in memory store (permalink)
+        for (MXEvent *event in events)
+        {
+            if ([event.eventId isEqualToString:eventId])
+            {
+                // Check whether the event was not already edited
+                if (![event.unsignedData.relations.replace.eventId isEqualToString:replaceEvent.eventId])
+                {
+                    editedEvent = [event editedEventFromReplacementEvent:replaceEvent];
+                }
+                break;
+            }
+        }
+        
+        if (editedEvent)
+        {
+            if (editedEvent.sentState != replaceEvent.sentState)
+            {
+                // Relay the replace event state to the edited event so that the display
+                // of the edited will rerun the classic sending color flow.
+                // Note: this must be done on the main thread (this operation triggers
+                // the call of [self eventDidChangeSentState])
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    editedEvent.sentState = replaceEvent.sentState;
+                });
+            }
+
+            [bubbleCellData updateEvent:eventId withEvent:editedEvent];
+            [bubbleCellData invalidateTextLayout];
+            hasChanged = YES;
+        }
+    }
+    
+    return hasChanged;
+}
+
+- (void)replaceTextMessageForEventWithId:(NSString*)eventId
+                         withTextMessage:(NSString *)text                           
+                                 success:(void (^)(NSString *))success
+                                 failure:(void (^)(NSError *))failure
+{
+    MXEvent *event = [self eventWithEventId:eventId];
+    
+    NSString *sanitizedText = [self sanitizedMessageText:text];
+    NSString *formattedText = [self htmlMessageFromSanitizedText:sanitizedText];
+    
+    NSString *eventBody = event.content[@"body"];
+    NSString *eventFormattedBody = event.content[@"formatted_body"];
+    
+    if (![sanitizedText isEqualToString:eventBody] && (!eventFormattedBody || ![formattedText isEqualToString:eventFormattedBody]))
+    {
+        [self.mxSession.aggregations replaceTextMessageEvent:event withTextMessage:sanitizedText formattedText:formattedText localEchoBlock:^(MXEvent * _Nonnull replaceEventLocalEcho) {
+
+            // Apply the local echo to the timeline
+            [self updateEventWithReplaceEvent:replaceEventLocalEcho];
+
+            // Integrate the replace local event into the timeline like when sending a message
+            // This also allows to manage read receipt on this replace event
+            [self queueEventForProcessing:replaceEventLocalEcho withRoomState:self.roomState direction:MXTimelineDirectionForwards];
+            [self processQueuedEvents:nil];
+
+        } success:success failure:failure];
+    }
+    else
+    {
+        failure(nil);
+    }
+}
+
+#pragma mark - Virtual Rooms
+
+- (void)virtualRoomsDidChange:(NSNotification *)notification
+{
+    //  update secondary room id
+    self.secondaryRoomId = [self.mxSession virtualRoomOf:self.roomId];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSourceManager.h b/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSourceManager.h
new file mode 100644
index 000000000..46f6709da
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSourceManager.h
@@ -0,0 +1,124 @@
+/*
+ Copyright 2015 OpenMarket 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/Foundation.h>
+
+#import "MXKRoomDataSource.h"
+
+/**
+ `MXKRoomDataSourceManagerReleasePolicy` defines how a `MXKRoomDataSource` instance must be released
+ when [MXKRoomDataSourceManager closeRoomDataSourceWithRoomId:] is called.
+ 
+ Once released, the in-memory data (messages that are outgoing, failed sending, ...) of room data source
+ is lost.
+ */
+typedef enum : NSUInteger {
+
+    /**
+     Created `MXKRoomDataSource` instances are never released when they are closed.
+     */
+    MXKRoomDataSourceManagerReleasePolicyNeverRelease,
+
+    /**
+     Created `MXKRoomDataSource` instances are released when they are closed.
+     */
+    MXKRoomDataSourceManagerReleasePolicyReleaseOnClose,
+
+} MXKRoomDataSourceManagerReleasePolicy;
+
+
+/**
+ `MXKRoomDataSourceManager` manages a pool of `MXKRoomDataSource` instances for a given Matrix session.
+ 
+ It makes the `MXKRoomDataSource` instances reusable so that their data (messages that are outgoing, failed sending, ...)
+ is not lost when the view controller that displays them is gone.
+ */
+@interface MXKRoomDataSourceManager : NSObject
+
+/**
+ Retrieve the MXKRoomDataSources manager for a particular Matrix session.
+ 
+ @param mxSession the Matrix session,
+ @return the MXKRoomDataSources manager to use for this session.
+ */
++ (MXKRoomDataSourceManager*)sharedManagerForMatrixSession:(MXSession*)mxSession;
+
+/**
+ Remove the MXKRoomDataSources manager for a particular Matrix session.
+ 
+ @param mxSession the Matrix session.
+ */
++ (void)removeSharedManagerForMatrixSession:(MXSession*)mxSession;
+
+/**
+ Register the MXKRoomDataSource-inherited class that will be used to instantiate all room data source.
+ By default MXKRoomDataSource class is considered.
+ 
+ CAUTION: All existing room data source instances are reset in case of class change.
+ 
+ @param roomDataSourceClass a MXKRoomDataSource-inherited class.
+ */
++ (void)registerRoomDataSourceClass:(Class)roomDataSourceClass;
+
+/**
+ Force close all the current room data source instances.
+ */
+- (void)reset;
+
+/**
+ Get a room data source corresponding to a room id.
+ 
+ If a room data source already exists for this room, its reference will be returned. Else,
+ if requested, the method will instantiate it.
+ 
+ @param roomId the room id of the room.
+ @param create if YES, the MXKRoomDataSourceManager will create the room data source if it does not exist yet.
+ @param onComplete blocked with the room data source (instance of MXKRoomDataSource-inherited class).
+ */
+- (void)roomDataSourceForRoom:(NSString*)roomId create:(BOOL)create onComplete:(void (^)(MXKRoomDataSource *roomDataSource))onComplete;
+
+/**
+ Make a room data source be managed by the manager.
+
+ Use this method to add a MXKRoomDataSource-inherited instance that cannot be automatically created by
+ [MXKRoomDataSourceManager roomDataSourceForRoom: create:].
+ 
+ @param roomDataSource the MXKRoomDataSource-inherited object to the manager scope.
+ */
+- (void)addRoomDataSource:(MXKRoomDataSource*)roomDataSource;
+
+/**
+ Close the roomDataSource.
+ 
+ The roomDataSource instance will be actually destroyed according to the current release policy.
+
+ @param roomId the room if of the data source to release.
+ @param forceRelease if yes the room data source instance will be destroyed whatever the policy is.
+ */
+- (void)closeRoomDataSourceWithRoomId:(NSString*)roomId forceClose:(BOOL)forceRelease;
+
+/**
+ The release policy to apply when `MXKRoomDataSource` instances are closed.
+ Default is MXKRoomDataSourceManagerReleasePolicyNeverRelease.
+ */
+@property (nonatomic) MXKRoomDataSourceManagerReleasePolicy releasePolicy;
+
+/**
+ Tells whether a server sync is in progress in the matrix session.
+ */
+@property (nonatomic, readonly) BOOL isServerSyncInProgress;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSourceManager.m b/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSourceManager.m
new file mode 100644
index 000000000..fd4e54c8a
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSourceManager.m
@@ -0,0 +1,271 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomDataSourceManager.h"
+
+@interface MXKRoomDataSourceManager()
+{
+    MXSession *mxSession;
+    
+    /**
+     The list of running roomDataSources.
+     Each key is a room ID. Each value, the MXKRoomDataSource instance.
+     */
+    NSMutableDictionary *roomDataSources;
+    
+    /**
+     Observe UIApplicationDidReceiveMemoryWarningNotification to dispose of any resources that can be recreated.
+     */
+    id UIApplicationDidReceiveMemoryWarningNotificationObserver;
+}
+
+@end
+
+static NSMutableDictionary *_roomDataSourceManagers = nil;
+static Class _roomDataSourceClass;
+
+@implementation MXKRoomDataSourceManager
+
++ (MXKRoomDataSourceManager *)sharedManagerForMatrixSession:(MXSession *)mxSession
+{
+    // Manage a pool of managers: one per Matrix session
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        _roomDataSourceManagers = [NSMutableDictionary dictionary];
+    });
+    
+    MXKRoomDataSourceManager *roomDataSourceManager;
+    
+    // Compute an id for this mxSession object: its pointer address as a string
+    NSString *mxSessionId = [NSString stringWithFormat:@"%p", mxSession];
+    
+    @synchronized(_roomDataSourceManagers)
+    {
+        if (_roomDataSourceClass == nil)
+        {
+            // Set default class
+            _roomDataSourceClass = MXKRoomDataSource.class;
+        }
+        // If not available yet, create the `MXKRoomDataSourceManager` for this Matrix session
+        roomDataSourceManager = _roomDataSourceManagers[mxSessionId];
+        if (!roomDataSourceManager)
+        {
+            roomDataSourceManager = [[MXKRoomDataSourceManager alloc]initWithMatrixSession:mxSession];
+            _roomDataSourceManagers[mxSessionId] = roomDataSourceManager;
+        }
+    }
+    
+    return roomDataSourceManager;
+}
+
++ (void)removeSharedManagerForMatrixSession:(MXSession*)mxSession
+{
+    // Compute the id for this mxSession object: its pointer address as a string
+    NSString *mxSessionId = [NSString stringWithFormat:@"%p", mxSession];
+    
+    @synchronized(_roomDataSourceManagers)
+    {
+        MXKRoomDataSourceManager *roomDataSourceManager = [_roomDataSourceManagers objectForKey:mxSessionId];
+        if (roomDataSourceManager)
+        {
+            [roomDataSourceManager destroy];
+            [_roomDataSourceManagers removeObjectForKey:mxSessionId];
+        }
+    }
+}
+
++ (void)registerRoomDataSourceClass:(Class)roomDataSourceClass
+{
+    // Sanity check: accept only MXKRoomDataSource classes or sub-classes
+    NSParameterAssert([roomDataSourceClass isSubclassOfClass:MXKRoomDataSource.class]);
+    
+    @synchronized(_roomDataSourceManagers)
+    {
+        if (roomDataSourceClass !=_roomDataSourceClass)
+        {
+            _roomDataSourceClass = roomDataSourceClass;
+            
+            NSArray *mxSessionIds = _roomDataSourceManagers.allKeys;
+            for (NSString *mxSessionId in mxSessionIds)
+            {
+                MXKRoomDataSourceManager *roomDataSourceManager = [_roomDataSourceManagers objectForKey:mxSessionId];
+                if (roomDataSourceManager)
+                {
+                    [roomDataSourceManager destroy];
+                    [_roomDataSourceManagers removeObjectForKey:mxSessionId];
+                }
+            }
+        }
+    }
+}
+
+- (instancetype)initWithMatrixSession:(MXSession *)matrixSession
+{
+    self = [super init];
+    if (self)
+    {
+        mxSession = matrixSession;
+        roomDataSources = [NSMutableDictionary dictionary];
+        _releasePolicy = MXKRoomDataSourceManagerReleasePolicyNeverRelease;
+        
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didMXSessionDidLeaveRoom:) name:kMXSessionDidLeaveRoomNotification object:nil];
+        
+        // Observe UIApplicationDidReceiveMemoryWarningNotification
+        UIApplicationDidReceiveMemoryWarningNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationDidReceiveMemoryWarningNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+            
+            MXLogDebug(@"[MXKRoomDataSourceManager] %@: Received memory warning.", self);
+            
+            // Reload all data sources (except the current used ones) to reduce memory usage.
+            for (MXKRoomDataSource *roomDataSource in self->roomDataSources.allValues)
+            {
+                if (!roomDataSource.delegate)
+                {
+                    [roomDataSource reload];
+                }
+            }
+            
+        }];
+    }
+    return self;
+}
+
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionDidLeaveRoomNotification object:nil];
+}
+
+- (void)destroy
+{
+    [self reset];
+    
+    if (UIApplicationDidReceiveMemoryWarningNotificationObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:UIApplicationDidReceiveMemoryWarningNotificationObserver];
+        UIApplicationDidReceiveMemoryWarningNotificationObserver = nil;
+    }
+}
+
+#pragma mark
+
+- (BOOL)isServerSyncInProgress
+{
+    // Check first the matrix session state
+    if (mxSession.state == MXSessionStateSyncInProgress)
+    {
+        return YES;
+    }
+    
+    // Check all data sources (events process is asynchronous, server sync may not be complete in data source).
+    for (MXKRoomDataSource *roomDataSource in roomDataSources.allValues)
+    {
+        if (roomDataSource.serverSyncEventCount)
+        {
+            return YES;
+        }
+    }
+    
+    return NO;
+}
+
+#pragma mark
+
+- (void)reset
+{
+    NSArray *roomIds =  roomDataSources.allKeys;
+    for (NSString *roomId in roomIds)
+    {
+        [self closeRoomDataSourceWithRoomId:roomId forceClose:YES];
+    }
+}
+
+- (void)roomDataSourceForRoom:(NSString *)roomId create:(BOOL)create onComplete:(void (^)(MXKRoomDataSource *roomDataSource))onComplete
+{
+    NSParameterAssert(roomId);
+
+    // If not available yet, create the room data source
+    MXKRoomDataSource *roomDataSource = roomDataSources[roomId];
+
+    if (!roomDataSource && create && roomId)
+    {
+        [_roomDataSourceClass loadRoomDataSourceWithRoomId:roomId andMatrixSession:mxSession onComplete:^(id roomDataSource) {
+            [self addRoomDataSource:roomDataSource];
+            onComplete(roomDataSource);
+        }];
+    }
+    else
+    {
+        onComplete(roomDataSource);
+    }
+}
+
+- (void)addRoomDataSource:(MXKRoomDataSource *)roomDataSource
+{
+    roomDataSources[roomDataSource.roomId] = roomDataSource;
+}
+
+- (void)closeRoomDataSourceWithRoomId:(NSString*)roomId forceClose:(BOOL)forceRelease;
+{
+    // Check first whether this roomDataSource is well handled by this manager
+    if (!roomId || !roomDataSources[roomId])
+    {
+        MXLogDebug(@"[MXKRoomDataSourceManager] Failed to close an unknown room id: %@", roomId);
+        return;
+    }
+
+    MXKRoomDataSource *roomDataSource = roomDataSources[roomId];
+
+    // According to the policy, it is interesting to keep the room data source in life: it can keep managing echo messages
+    // in background for instance
+    MXKRoomDataSourceManagerReleasePolicy releasePolicy = _releasePolicy;
+    if (forceRelease)
+    {
+        // Act as ReleaseOnClose policy
+        releasePolicy = MXKRoomDataSourceManagerReleasePolicyReleaseOnClose;
+    }
+    
+    switch (releasePolicy)
+    {
+        case MXKRoomDataSourceManagerReleasePolicyReleaseOnClose:
+            
+            // Destroy and forget the instance
+            [roomDataSource destroy];
+            [roomDataSources removeObjectForKey:roomDataSource.roomId];
+            break;
+            
+        case MXKRoomDataSourceManagerReleasePolicyNeverRelease:
+            
+            // The close here consists in no more sending actions to the current view controller, the room data source delegate
+            roomDataSource.delegate = nil;
+            
+            // Keep the instance for life (reduce memory usage by flushing room data if the number of bubbles is over 30).
+            [roomDataSource limitMemoryUsage:roomDataSource.maxBackgroundCachedBubblesCount];
+            break;
+            
+        default:
+            break;
+    }
+}
+
+- (void)didMXSessionDidLeaveRoom:(NSNotification *)notif
+{
+    if (mxSession == notif.object)
+    {
+        // The room is no more available, remove it from the manager
+        [self closeRoomDataSourceWithRoomId:notif.userInfo[kMXSessionNotificationRoomIdKey] forceClose:YES];
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKSendReplyEventStringLocalizer.h b/Riot/Modules/MatrixKit/Models/Room/MXKSendReplyEventStringLocalizer.h
new file mode 100644
index 000000000..6d0d4b842
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKSendReplyEventStringLocalizer.h
@@ -0,0 +1,25 @@
+/*
+ Copyright 2018 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/Foundation.h>
+#import <MatrixSDK/MXSendReplyEventStringLocalizerProtocol.h>
+
+/**
+ A `MXKSendReplyEventStringLocalizer` instance represents string localizations used when send reply event to a message in a room.
+ */
+@interface MXKSendReplyEventStringLocalizer : NSObject<MXSendReplyEventStringLocalizerProtocol>
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKSendReplyEventStringLocalizer.m b/Riot/Modules/MatrixKit/Models/Room/MXKSendReplyEventStringLocalizer.m
new file mode 100644
index 000000000..f116c466b
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKSendReplyEventStringLocalizer.m
@@ -0,0 +1,53 @@
+/*
+ Copyright 2018 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 "MXKSendReplyEventStringLocalizer.h"
+#import "MXKSwiftHeader.h"
+
+@implementation MXKSendReplyEventStringLocalizer
+
+- (NSString *)senderSentAnImage
+{
+    return [MatrixKitL10n messageReplyToSenderSentAnImage];
+}
+
+- (NSString *)senderSentAVideo
+{
+    return [MatrixKitL10n messageReplyToSenderSentAVideo];
+}
+
+- (NSString *)senderSentAnAudioFile
+{
+    return [MatrixKitL10n messageReplyToSenderSentAnAudioFile];
+}
+
+- (NSString *)senderSentAVoiceMessage
+{
+    return [MatrixKitL10n messageReplyToSenderSentAVoiceMessage];
+}
+
+- (NSString *)senderSentAFile
+{
+    return [MatrixKitL10n messageReplyToSenderSentAFile];
+}
+
+- (NSString *)messageToReplyToPrefix
+{
+    return [MatrixKitL10n messageReplyToMessageToReplyToPrefix];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKSlashCommands.h b/Riot/Modules/MatrixKit/Models/Room/MXKSlashCommands.h
new file mode 100644
index 000000000..d2791b9cf
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKSlashCommands.h
@@ -0,0 +1,33 @@
+/*
+ Copyright 2018 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;
+
+/**
+ Slash commands used to perform actions from a room.
+ */
+
+FOUNDATION_EXPORT NSString *const kMXKSlashCmdChangeDisplayName;
+FOUNDATION_EXPORT NSString *const kMXKSlashCmdEmote;
+FOUNDATION_EXPORT NSString *const kMXKSlashCmdJoinRoom;
+FOUNDATION_EXPORT NSString *const kMXKSlashCmdPartRoom;
+FOUNDATION_EXPORT NSString *const kMXKSlashCmdInviteUser;
+FOUNDATION_EXPORT NSString *const kMXKSlashCmdKickUser;
+FOUNDATION_EXPORT NSString *const kMXKSlashCmdBanUser;
+FOUNDATION_EXPORT NSString *const kMXKSlashCmdUnbanUser;
+FOUNDATION_EXPORT NSString *const kMXKSlashCmdSetUserPowerLevel;
+FOUNDATION_EXPORT NSString *const kMXKSlashCmdResetUserPowerLevel;
+FOUNDATION_EXPORT NSString *const kMXKSlashCmdChangeRoomTopic;
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKSlashCommands.m b/Riot/Modules/MatrixKit/Models/Room/MXKSlashCommands.m
new file mode 100644
index 000000000..b83e42f3e
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKSlashCommands.m
@@ -0,0 +1,29 @@
+/*
+ Copyright 2018 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 "MXKSlashCommands.h"
+
+NSString *const kMXKSlashCmdChangeDisplayName = @"/nick";
+NSString *const kMXKSlashCmdEmote = @"/me";
+NSString *const kMXKSlashCmdJoinRoom = @"/join";
+NSString *const kMXKSlashCmdPartRoom = @"/part";
+NSString *const kMXKSlashCmdInviteUser = @"/invite";
+NSString *const kMXKSlashCmdKickUser = @"/kick";
+NSString *const kMXKSlashCmdBanUser = @"/ban";
+NSString *const kMXKSlashCmdUnbanUser = @"/unban";
+NSString *const kMXKSlashCmdSetUserPowerLevel = @"/op";
+NSString *const kMXKSlashCmdResetUserPowerLevel = @"/deop";
+NSString *const kMXKSlashCmdChangeRoomTopic = @"/topic";
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKURLPreviewDataProtocol.h b/Riot/Modules/MatrixKit/Models/Room/MXKURLPreviewDataProtocol.h
new file mode 100644
index 000000000..3518d81f8
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKURLPreviewDataProtocol.h
@@ -0,0 +1,40 @@
+// 
+// Copyright 2020 The Matrix.org Foundation C.I.C
+//
+// 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.
+//
+
+@protocol MXKURLPreviewDataProtocol <NSObject>
+
+/// The URL that's represented by the preview data.
+@property (readonly, nonnull) NSURL *url;
+
+/// The ID of the event that created this preview.
+@property (readonly, nonnull) NSString *eventID;
+
+/// The ID of the room that this preview is from.
+@property (readonly, nonnull) NSString *roomID;
+
+/// The OpenGraph site name for the URL.
+@property (readonly, nullable) NSString *siteName;
+
+/// The OpenGraph title for the URL.
+@property (readonly, nullable) NSString *title;
+
+/// The OpenGraph description for the URL.
+@property (readonly, nullable) NSString *text;
+
+/// The OpenGraph image for the URL.
+@property (readwrite, nullable) UIImage *image;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/RoomList/MXKInterleavedRecentsDataSource.h b/Riot/Modules/MatrixKit/Models/RoomList/MXKInterleavedRecentsDataSource.h
new file mode 100644
index 000000000..646dfc18a
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/RoomList/MXKInterleavedRecentsDataSource.h
@@ -0,0 +1,26 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRecentsDataSource.h"
+
+/**
+ 'MXKInterleavedRecentsDataSource' class inherits from 'MXKRecentsDataSource'.
+ 
+ It interleaves the recents in case of multiple sessions to display first the most recent room.
+ */
+@interface MXKInterleavedRecentsDataSource : MXKRecentsDataSource
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/RoomList/MXKInterleavedRecentsDataSource.m b/Riot/Modules/MatrixKit/Models/RoomList/MXKInterleavedRecentsDataSource.m
new file mode 100644
index 000000000..28bb4c6ae
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/RoomList/MXKInterleavedRecentsDataSource.m
@@ -0,0 +1,439 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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 "MXKInterleavedRecentsDataSource.h"
+
+#import "MXKInterleavedRecentTableViewCell.h"
+
+#import "MXKAccountManager.h"
+
+#import "NSBundle+MatrixKit.h"
+
+@interface MXKInterleavedRecentsDataSource ()
+{
+    /**
+     The interleaved recents: cell data served by `MXKInterleavedRecentsDataSource`.
+     */
+    NSMutableArray *interleavedCellDataArray;
+}
+
+@end
+
+@implementation MXKInterleavedRecentsDataSource
+
+- (instancetype)init
+{
+    self = [super init];
+    if (self)
+    {
+        interleavedCellDataArray = [NSMutableArray array];
+    }
+    return self;
+}
+
+#pragma mark - Override MXKDataSource
+
+- (void)destroy
+{
+    interleavedCellDataArray = nil;
+    
+    [super destroy];
+}
+
+#pragma mark - Override MXKRecentsDataSource
+
+- (UIView *)viewForHeaderInSection:(NSInteger)section withFrame:(CGRect)frame
+{
+    UIView *sectionHeader = nil;
+    
+    if (displayedRecentsDataSourceArray.count > 1 && section == 0)
+    {
+        sectionHeader = [[UIView alloc] initWithFrame:frame];
+        sectionHeader.backgroundColor = [UIColor colorWithRed:0.9 green:0.9 blue:0.9 alpha:1.0];
+        CGFloat btnWidth = frame.size.width / displayedRecentsDataSourceArray.count;
+        UIButton *previousShrinkButton;
+        
+        for (NSInteger index = 0; index < displayedRecentsDataSourceArray.count; index++)
+        {
+            MXKSessionRecentsDataSource *recentsDataSource = [displayedRecentsDataSourceArray objectAtIndex:index];
+            NSString* btnTitle = recentsDataSource.mxSession.myUser.userId;
+            
+            // Add shrink button
+            UIButton *shrinkButton = [UIButton buttonWithType:UIButtonTypeCustom];
+            CGRect btnFrame = CGRectMake(index * btnWidth, 0, btnWidth, sectionHeader.frame.size.height);
+            shrinkButton.frame = btnFrame;
+            shrinkButton.backgroundColor = [UIColor clearColor];
+            
+            [shrinkButton addTarget:self action:@selector(onButtonPressed:) forControlEvents:UIControlEventTouchUpInside];
+            shrinkButton.tag = index;
+            [sectionHeader addSubview:shrinkButton];
+            sectionHeader.userInteractionEnabled = YES;
+            
+            // Set shrink button constraints
+            NSLayoutConstraint *leftConstraint;
+            NSLayoutConstraint *widthConstraint;
+            shrinkButton.translatesAutoresizingMaskIntoConstraints = NO;
+            if (!previousShrinkButton)
+            {
+                leftConstraint = [NSLayoutConstraint constraintWithItem:shrinkButton
+                                                              attribute:NSLayoutAttributeLeading
+                                                              relatedBy:NSLayoutRelationEqual
+                                                                 toItem:sectionHeader
+                                                              attribute:NSLayoutAttributeLeading
+                                                             multiplier:1
+                                                               constant:0];
+                widthConstraint = [NSLayoutConstraint constraintWithItem:shrinkButton
+                                                               attribute:NSLayoutAttributeWidth
+                                                               relatedBy:NSLayoutRelationEqual
+                                                                  toItem:sectionHeader
+                                                               attribute:NSLayoutAttributeWidth
+                                                              multiplier:(1.0 /displayedRecentsDataSourceArray.count)
+                                                                constant:0];
+            }
+            else
+            {
+                leftConstraint = [NSLayoutConstraint constraintWithItem:shrinkButton
+                                                              attribute:NSLayoutAttributeLeading
+                                                              relatedBy:NSLayoutRelationEqual
+                                                                 toItem:previousShrinkButton
+                                                              attribute:NSLayoutAttributeTrailing
+                                                             multiplier:1
+                                                               constant:0];
+                widthConstraint = [NSLayoutConstraint constraintWithItem:shrinkButton
+                                                               attribute:NSLayoutAttributeWidth
+                                                               relatedBy:NSLayoutRelationEqual
+                                                                  toItem:previousShrinkButton
+                                                               attribute:NSLayoutAttributeWidth
+                                                              multiplier:1
+                                                                constant:0];
+            }
+            [NSLayoutConstraint activateConstraints:@[leftConstraint, widthConstraint]];
+            previousShrinkButton = shrinkButton;
+            
+            // Add shrink icon
+            UIImage *chevron;
+            if ([shrinkedRecentsDataSourceArray indexOfObject:recentsDataSource] != NSNotFound)
+            {
+                chevron = [NSBundle mxk_imageFromMXKAssetsBundleWithName:@"disclosure"];
+            }
+            else
+            {
+                chevron = [NSBundle mxk_imageFromMXKAssetsBundleWithName:@"shrink"];
+            }
+            UIImageView *chevronView = [[UIImageView alloc] initWithImage:chevron];
+            if ([shrinkedRecentsDataSourceArray indexOfObject:recentsDataSource] == NSNotFound)
+            {
+                // Display the tint color of the user
+                MXKAccount *account = [[MXKAccountManager sharedManager] accountForUserId:recentsDataSource.mxSession.myUser.userId];
+                if (account)
+                {
+                    chevronView.backgroundColor = account.userTintColor;
+                }
+                else
+                {
+                    chevronView.backgroundColor = [UIColor clearColor];
+                }
+            }
+            else
+            {
+                chevronView.backgroundColor = [UIColor lightGrayColor];
+            }
+            chevronView.contentMode = UIViewContentModeCenter;
+            frame = chevronView.frame;
+            frame.size.width = frame.size.height = shrinkButton.frame.size.height - 10;
+            frame.origin.x = shrinkButton.frame.size.width - frame.size.width - 8;
+            frame.origin.y = (shrinkButton.frame.size.height - frame.size.height) / 2;
+            chevronView.frame = frame;
+            [shrinkButton addSubview:chevronView];
+            chevronView.autoresizingMask |= (UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin);
+            
+            // Add label
+            frame = shrinkButton.frame;
+            frame.origin.x = 5;
+            frame.origin.y = 5;
+            frame.size.width = chevronView.frame.origin.x - 10;
+            frame.size.height -= 10;
+            UILabel *headerLabel = [[UILabel alloc] initWithFrame:frame];
+            headerLabel.font = [UIFont boldSystemFontOfSize:16];
+            headerLabel.backgroundColor = [UIColor clearColor];
+            headerLabel.text = btnTitle;
+            [shrinkButton addSubview:headerLabel];
+            headerLabel.autoresizingMask |= (UIViewAutoresizingFlexibleWidth);
+        }
+    }
+    
+    return sectionHeader;
+}
+
+- (id<MXKRecentCellDataStoring>)cellDataAtIndexPath:(NSIndexPath *)indexPath
+{
+    id<MXKRecentCellDataStoring> cellData = nil;
+    
+    // Only one section is handled by this data source
+    if (indexPath.section == 0)
+    {
+        // Consider first the case where there is only one data source (no interleaving).
+        if (displayedRecentsDataSourceArray.count == 1)
+        {
+            MXKSessionRecentsDataSource *recentsDataSource = displayedRecentsDataSourceArray.firstObject;
+            cellData = [recentsDataSource cellDataAtIndex:indexPath.row];
+        }
+        // Else all the cells have been interleaved.
+        else if (indexPath.row < interleavedCellDataArray.count)
+        {
+            cellData = interleavedCellDataArray[indexPath.row];
+        }
+    }
+    
+    return cellData;
+}
+
+- (CGFloat)cellHeightAtIndexPath:(NSIndexPath *)indexPath
+{
+    CGFloat height = 0;
+    
+    // Only one section is handled by this data source
+    if (indexPath.section == 0)
+    {
+        // Consider first the case where there is only one data source (no interleaving).
+        if (displayedRecentsDataSourceArray.count == 1)
+        {
+            MXKSessionRecentsDataSource *recentsDataSource = displayedRecentsDataSourceArray.firstObject;
+            height = [recentsDataSource cellHeightAtIndex:indexPath.row];
+        }
+        // Else all the cells have been interleaved.
+        else if (indexPath.row < interleavedCellDataArray.count)
+        {
+            id<MXKRecentCellDataStoring> recentCellData = interleavedCellDataArray[indexPath.row];
+            
+            // Select the related recent data source
+            MXKDataSource *dataSource = recentCellData.dataSource;
+            if ([dataSource isKindOfClass:[MXKSessionRecentsDataSource class]])
+            {
+                MXKSessionRecentsDataSource *recentsDataSource = (MXKSessionRecentsDataSource*)dataSource;
+                // Count the index of this cell data in original data source array
+                NSInteger rank = 0;
+                for (NSInteger index = 0; index < indexPath.row; index++)
+                {
+                    id<MXKRecentCellDataStoring> cellData = interleavedCellDataArray[index];
+                    if (cellData.roomSummary == recentCellData.roomSummary)
+                    {
+                        rank++;
+                    }
+                }
+                
+                height = [recentsDataSource cellHeightAtIndex:rank];
+            }
+        }
+    }
+    
+    return height;
+}
+
+- (NSIndexPath*)cellIndexPathWithRoomId:(NSString*)roomId andMatrixSession:(MXSession*)matrixSession
+{
+    NSIndexPath *indexPath = nil;
+    
+    // Consider first the case where there is only one data source (no interleaving).
+    if (displayedRecentsDataSourceArray.count == 1)
+    {
+        MXKSessionRecentsDataSource *recentsDataSource = displayedRecentsDataSourceArray.firstObject;
+        if (recentsDataSource.mxSession == matrixSession)
+        {
+            // Look for the cell
+            for (NSInteger index = 0; index < recentsDataSource.numberOfCells; index ++)
+            {
+                id<MXKRecentCellDataStoring> recentCellData = [recentsDataSource cellDataAtIndex:index];
+                if ([roomId isEqualToString:recentCellData.roomIdentifier])
+                {
+                    // Got it
+                    indexPath = [NSIndexPath indexPathForRow:index inSection:0];
+                    break;
+                }
+            }
+        }
+    }
+    else
+    {
+        // Look for the right data source
+        for (MXKSessionRecentsDataSource *recentsDataSource in displayedRecentsDataSourceArray)
+        {
+            if (recentsDataSource.mxSession == matrixSession)
+            {
+                // Check whether the source is not shrinked
+                if ([shrinkedRecentsDataSourceArray indexOfObject:recentsDataSource] == NSNotFound)
+                {
+                    // Look for the cell
+                    for (NSInteger index = 0; index < interleavedCellDataArray.count; index ++)
+                    {
+                        id<MXKRecentCellDataStoring> recentCellData = interleavedCellDataArray[index];
+                        if ([roomId isEqualToString:recentCellData.roomIdentifier])
+                        {
+                            // Got it
+                            indexPath = [NSIndexPath indexPathForRow:index inSection:0];
+                            break;
+                        }
+                    }
+                }
+                break;
+            }
+        }
+    }
+    
+    return indexPath;
+}
+
+#pragma mark - UITableViewDataSource
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+    // Check whether all data sources are ready before rendering recents
+    if (self.state == MXKDataSourceStateReady)
+    {
+        // Only one section is handled by this data source.
+        return (displayedRecentsDataSourceArray.count ? 1 : 0);
+    }
+    return 0;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    // Consider first the case where there is only one data source (no interleaving).
+    if (displayedRecentsDataSourceArray.count == 1)
+    {
+        MXKSessionRecentsDataSource *recentsDataSource = displayedRecentsDataSourceArray.firstObject;
+        return recentsDataSource.numberOfCells;
+    }
+    
+    return interleavedCellDataArray.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    id<MXKRecentCellDataStoring> roomData = [self cellDataAtIndexPath:indexPath];
+    if (roomData && self.delegate)
+    {
+        NSString *cellIdentifier = [self.delegate cellReuseIdentifierForCellData:roomData];
+        if (cellIdentifier)
+        {
+            UITableViewCell<MXKCellRendering> *cell  = [tableView dequeueReusableCellWithIdentifier:cellIdentifier forIndexPath:indexPath];
+            
+            // Make sure we listen to user actions on the cell
+            cell.delegate = self;
+            
+            // Make the bubble display the data
+            [cell render:roomData];
+            
+            // Clear the user flag, if only one recents list is available
+            if (displayedRecentsDataSourceArray.count == 1 && [cell isKindOfClass:[MXKInterleavedRecentTableViewCell class]])
+            {
+                ((MXKInterleavedRecentTableViewCell*)cell).userFlag.backgroundColor = [UIColor clearColor];
+            }
+            
+            return cell;
+        }
+    }
+    
+    // Return a fake cell to prevent app from crashing.
+    return [[UITableViewCell alloc] init];
+}
+
+#pragma mark - MXKDataSourceDelegate
+
+- (void)dataSource:(MXKDataSource*)dataSource didCellChange:(id)changes
+{
+    // Consider first the case where there is only one data source (no interleaving).
+    if (displayedRecentsDataSourceArray.count == 1)
+    {
+        // Flush interleaved cells array, we will refer directly to the cell data of the unique data source.
+        [interleavedCellDataArray removeAllObjects];
+    }
+    else
+    {
+        // Handle here the specific case where a second source is just added.
+        // The empty interleaved cells array has to be prefilled with the cell data of the other source (except if this other source is shrinked).
+        if (!interleavedCellDataArray.count && displayedRecentsDataSourceArray.count == 2)
+        {
+            // This is the first interleaving, look for the other source
+            MXKSessionRecentsDataSource *recentsDataSource = displayedRecentsDataSourceArray.firstObject;
+            if (recentsDataSource == dataSource)
+            {
+                recentsDataSource = displayedRecentsDataSourceArray.lastObject;
+            }
+            
+            if ([shrinkedRecentsDataSourceArray indexOfObject:recentsDataSource] == NSNotFound)
+            {
+                // Report all cell data
+                for (NSInteger index = 0; index < recentsDataSource.numberOfCells; index ++)
+                {
+                    [interleavedCellDataArray addObject:[recentsDataSource cellDataAtIndex:index]];
+                }
+            }
+        }
+        
+        // Update now interleaved cells array, TODO take into account 'changes' parameter
+        MXKSessionRecentsDataSource *updateRecentsDataSource = (MXKSessionRecentsDataSource*)dataSource;
+        NSInteger numberOfUpdatedCells = 0;
+        // Check whether this dataSource is used
+        if ([displayedRecentsDataSourceArray indexOfObject:dataSource] != NSNotFound && [shrinkedRecentsDataSourceArray indexOfObject:dataSource] == NSNotFound)
+        {
+            numberOfUpdatedCells = updateRecentsDataSource.numberOfCells;
+        }
+        
+        NSInteger currentCellIndex = 0;
+        NSInteger updatedCellIndex = 0;
+        id<MXKRecentCellDataStoring> updatedCellData = nil;
+        
+        if (numberOfUpdatedCells)
+        {
+            updatedCellData = [updateRecentsDataSource cellDataAtIndex:updatedCellIndex++];
+        }
+        
+        // Review all cell data items of the current list
+        while (currentCellIndex < interleavedCellDataArray.count)
+        {
+            id<MXKRecentCellDataStoring> currentCellData = interleavedCellDataArray[currentCellIndex];
+            
+            // Remove existing cell data of the updated data source
+            if (currentCellData.dataSource == dataSource)
+            {
+                [interleavedCellDataArray removeObjectAtIndex:currentCellIndex];
+            }
+            else
+            {
+                while (updatedCellData && (updatedCellData.roomSummary.lastMessage.originServerTs > currentCellData.roomSummary.lastMessage.originServerTs))
+                {
+                    [interleavedCellDataArray insertObject:updatedCellData atIndex:currentCellIndex++];
+                    updatedCellData = [updateRecentsDataSource cellDataAtIndex:updatedCellIndex++];
+                }
+                
+                currentCellIndex++;
+            }
+        }
+        
+        while (updatedCellData)
+        {
+            [interleavedCellDataArray addObject:updatedCellData];
+            updatedCellData = [updateRecentsDataSource cellDataAtIndex:updatedCellIndex++];
+        }
+    }
+    
+    // Call super to keep update readyRecentsDataSourceArray.
+    [super dataSource:dataSource didCellChange:changes];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/RoomList/MXKRecentCellData.h b/Riot/Modules/MatrixKit/Models/RoomList/MXKRecentCellData.h
new file mode 100644
index 000000000..b02001881
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/RoomList/MXKRecentCellData.h
@@ -0,0 +1,26 @@
+/*
+ Copyright 2015 OpenMarket 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/Foundation.h>
+
+#import "MXKRecentCellDataStoring.h"
+
+/**
+ `MXKRecentCellData` modelised the data for a `MXKRecentTableViewCell` cell.
+ */
+@interface MXKRecentCellData : MXKCellData <MXKRecentCellDataStoring>
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/RoomList/MXKRecentCellData.m b/Riot/Modules/MatrixKit/Models/RoomList/MXKRecentCellData.m
new file mode 100644
index 000000000..b2bfc1885
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/RoomList/MXKRecentCellData.m
@@ -0,0 +1,133 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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 "MXKRecentCellData.h"
+
+@import MatrixSDK;
+
+#import "MXKDataSource.h"
+#import "MXEvent+MatrixKit.h"
+
+#import "MXKSwiftHeader.h"
+
+@implementation MXKRecentCellData
+@synthesize roomSummary, dataSource, lastEventDate;
+
+- (instancetype)initWithRoomSummary:(id<MXRoomSummaryProtocol>)theRoomSummary
+                         dataSource:(MXKDataSource*)theDataSource;
+{
+    self = [self init];
+    if (self)
+    {
+        roomSummary = theRoomSummary;
+        dataSource = theDataSource;
+    }
+    return self;
+}
+
+- (void)dealloc
+{
+    roomSummary = nil;
+}
+
+- (MXSession *)mxSession
+{
+    return dataSource.mxSession;
+}
+
+- (NSString*)lastEventDate
+{
+    return (NSString*)roomSummary.lastMessage.others[@"lastEventDate"];
+}
+
+- (BOOL)hasUnread
+{
+    return (roomSummary.localUnreadEventCount != 0);
+}
+
+- (NSString *)roomIdentifier
+{
+    if (self.isSuggestedRoom)
+    {
+        return self.roomSummary.spaceChildInfo.childRoomId;
+    }
+    return roomSummary.roomId;
+}
+
+- (NSString *)roomDisplayname
+{
+    if (self.isSuggestedRoom)
+    {
+        return self.roomSummary.spaceChildInfo.displayName;
+    }
+    return roomSummary.displayname;
+}
+
+- (NSString *)avatarUrl
+{
+    if (self.isSuggestedRoom)
+    {
+        return self.roomSummary.spaceChildInfo.avatarUrl;
+    }
+    return roomSummary.avatar;
+}
+
+- (NSString *)lastEventTextMessage
+{
+    if (self.isSuggestedRoom)
+    {
+        return roomSummary.spaceChildInfo.topic;
+    }
+    return roomSummary.lastMessage.text;
+}
+
+- (NSAttributedString *)lastEventAttributedTextMessage
+{
+    if (self.isSuggestedRoom)
+    {
+        return nil;
+    }
+    return roomSummary.lastMessage.attributedText;
+}
+
+- (NSUInteger)notificationCount
+{
+    return roomSummary.notificationCount;
+}
+
+- (NSUInteger)highlightCount
+{
+    return roomSummary.highlightCount;
+}
+
+- (NSString*)notificationCountStringValue
+{
+    return [NSString stringWithFormat:@"%tu", self.notificationCount];
+}
+
+- (NSString*)description
+{
+    return [NSString stringWithFormat:@"%@ %@: %@ - %@", super.description, self.roomSummary.roomId, self.roomDisplayname, self.lastEventTextMessage];
+}
+
+- (BOOL)isSuggestedRoom
+{
+    // As off now, we only store MXSpaceChildInfo in case of suggested rooms
+    return self.roomSummary.spaceChildInfo != nil;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/RoomList/MXKRecentCellDataStoring.h b/Riot/Modules/MatrixKit/Models/RoomList/MXKRecentCellDataStoring.h
new file mode 100644
index 000000000..8cf046696
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/RoomList/MXKRecentCellDataStoring.h
@@ -0,0 +1,75 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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/Foundation.h>
+#import <MatrixSDK/MatrixSDK.h>
+
+#import "MXKCellData.h"
+
+@class MXKDataSource;
+@class MXSpaceChildInfo;
+
+/**
+ `MXKRecentCellDataStoring` defines a protocol a class must conform in order to store recent cell data
+ managed by `MXKSessionRecentsDataSource`.
+ */
+@protocol MXKRecentCellDataStoring <NSObject>
+
+#pragma mark - Data displayed by a room recent cell
+
+/**
+ The original data source of the recent displayed by the cell.
+ */
+@property (nonatomic, weak, readonly) MXKDataSource *dataSource;
+
+/**
+ The `MXRoomSummaryProtocol` instance of the room for the recent displayed by the cell.
+ */
+@property (nonatomic, readonly) id<MXRoomSummaryProtocol> roomSummary;
+
+@property (nonatomic, readonly) NSString *roomIdentifier;
+@property (nonatomic, readonly) NSString *roomDisplayname;
+@property (nonatomic, readonly) NSString *avatarUrl;
+@property (nonatomic, readonly) NSString *lastEventTextMessage;
+@property (nonatomic, readonly) NSString *lastEventDate;
+
+@property (nonatomic, readonly) BOOL hasUnread;
+@property (nonatomic, readonly) NSUInteger notificationCount;
+@property (nonatomic, readonly) NSUInteger highlightCount;
+@property (nonatomic, readonly) NSString *notificationCountStringValue;
+@property (nonatomic, readonly) BOOL isSuggestedRoom;
+
+@property (nonatomic, readonly) MXSession *mxSession;
+
+#pragma mark - Public methods
+/**
+ Create a new `MXKCellData` object for a new recent cell.
+
+ @param roomSummary the `id<MXRoomSummaryProtocol>` object that has data about the room.
+ @param dataSource the `MXKDataSource` object that will use this instance.
+ @return the newly created instance.
+ */
+- (instancetype)initWithRoomSummary:(id<MXRoomSummaryProtocol>)roomSummary
+                         dataSource:(MXKDataSource*)dataSource;
+
+@optional
+/**
+ The `lastEventTextMessage` with sets of attributes.
+ */
+@property (nonatomic, readonly) NSAttributedString *lastEventAttributedTextMessage;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/RoomList/MXKRecentsDataSource.h b/Riot/Modules/MatrixKit/Models/RoomList/MXKRecentsDataSource.h
new file mode 100644
index 000000000..b9de69b4a
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/RoomList/MXKRecentsDataSource.h
@@ -0,0 +1,140 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKSessionRecentsDataSource.h"
+
+/**
+ 'MXKRecentsDataSource' is a base class to handle recents from one or multiple matrix sessions.
+ A 'MXKRecentsDataSource' instance provides the recents data source for `MXKRecentListViewController`.
+ 
+ By default, the recents list of different sessions are handled into separate sections.
+ */
+@interface MXKRecentsDataSource : MXKDataSource <UITableViewDataSource, MXKDataSourceDelegate>
+{
+@protected
+    /**
+     Array of `MXKSessionRecentsDataSource` instances. Only ready and non empty data source are listed here.
+     (Note: a data source may be considered as empty during searching)
+     */
+    NSMutableArray *displayedRecentsDataSourceArray;
+    
+    /**
+     Array of shrinked sources. Sub-list of displayedRecentsDataSourceArray.
+     */
+    NSMutableArray *shrinkedRecentsDataSourceArray;
+}
+
+/**
+ List of associated matrix sessions.
+ */
+@property (nonatomic, readonly) NSArray* mxSessions;
+
+/**
+ The number of available recents data sources (This count may be different than mxSession.count because empty data sources are ignored).
+ */
+@property (nonatomic, readonly) NSUInteger displayedRecentsDataSourcesCount;
+
+/**
+ Tell whether there are some unread messages.
+ */
+@property (nonatomic, readonly) BOOL hasUnread;
+
+/**
+ The current search patterns list.
+ */
+@property (nonatomic, readonly) NSArray* searchPatternsList;
+
+@property (nonatomic, strong) MXSpace *currentSpace;
+
+#pragma mark - Configuration
+
+/**
+ Add recents data from a matrix session.
+ 
+ @param mxSession the Matrix session to retrieve contextual data.
+ @return the new 'MXKSessionRecentsDataSource' instance created for this Matrix session.
+ */
+- (MXKSessionRecentsDataSource *)addMatrixSession:(MXSession*)mxSession;
+
+/**
+ Remove recents data related to a matrix session.
+ 
+ @param mxSession the session to remove.
+ */
+- (void)removeMatrixSession:(MXSession*)mxSession;
+
+/**
+ Filter the current recents list according to the provided patterns.
+ 
+ @param patternsList the list of patterns (`NSString` instances) to match with. Set nil to cancel search.
+ */
+- (void)searchWithPatterns:(NSArray*)patternsList;
+
+/**
+ Get the section header view.
+ 
+ @param section the section  index
+ @param frame the drawing area for the header of the specified section.
+ @return the section header.
+ */
+- (UIView *)viewForHeaderInSection:(NSInteger)section withFrame:(CGRect)frame;
+
+/**
+ Get the data for the cell at the given index path.
+
+ @param indexPath the index of the cell
+ @return the cell data
+ */
+- (id<MXKRecentCellDataStoring>)cellDataAtIndexPath:(NSIndexPath*)indexPath;
+
+/**
+ Get the height of the cell at the given index path.
+
+ @param indexPath the index of the cell
+ @return the cell height
+ */
+- (CGFloat)cellHeightAtIndexPath:(NSIndexPath*)indexPath;
+
+/**
+ Get the index path of the cell related to the provided roomId and session.
+ 
+ @param roomId the room identifier.
+ @param mxSession the matrix session in which the room should be available.
+ @return indexPath the index of the cell (nil if not found or if the related section is shrinked).
+ */
+- (NSIndexPath*)cellIndexPathWithRoomId:(NSString*)roomId andMatrixSession:(MXSession*)mxSession;
+
+/**
+ Returns the room at the index path
+ 
+ @param indexPath the index of the cell
+ @return the MXRoom if it exists
+ */
+- (MXRoom*)getRoomAtIndexPath:(NSIndexPath *)indexPath;
+
+/**
+ Leave the room at the index path
+
+ @param indexPath the index of the cell
+ */
+- (void)leaveRoomAtIndexPath:(NSIndexPath *)indexPath;
+
+/**
+ Action registered on buttons used to shrink/disclose recents sources.
+ */
+- (IBAction)onButtonPressed:(id)sender;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/RoomList/MXKRecentsDataSource.m b/Riot/Modules/MatrixKit/Models/RoomList/MXKRecentsDataSource.m
new file mode 100644
index 000000000..0da982a1d
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/RoomList/MXKRecentsDataSource.m
@@ -0,0 +1,657 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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 "MXKRecentsDataSource.h"
+
+@import MatrixSDK.MXMediaManager;
+
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKConstants.h"
+
+@interface MXKRecentsDataSource ()
+{
+    /**
+     Array of `MXSession` instances.
+     */
+    NSMutableArray *mxSessionArray;
+    
+    /**
+     Array of `MXKSessionRecentsDataSource` instances (one by matrix session).
+     */
+    NSMutableArray *recentsDataSourceArray;
+}
+
+@end
+
+@implementation MXKRecentsDataSource
+
+- (instancetype)init
+{
+    self = [super init];
+    if (self)
+    {
+        mxSessionArray = [NSMutableArray array];
+        recentsDataSourceArray = [NSMutableArray array];
+        
+        displayedRecentsDataSourceArray = [NSMutableArray array];
+        shrinkedRecentsDataSourceArray = [NSMutableArray array];
+        
+        // Set default data and view classes
+        [self registerCellDataClass:MXKRecentCellData.class forCellIdentifier:kMXKRecentCellIdentifier];
+        
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didMXSessionInviteRoomUpdate:) name:kMXSessionInvitedRoomsDidChangeNotification object:nil];        
+    }
+    return self;
+}
+
+- (instancetype)initWithMatrixSession:(MXSession *)matrixSession
+{
+    self = [self init];
+    if (self)
+    {
+        [self addMatrixSession:matrixSession];
+    }
+    return self;
+}
+
+- (MXKSessionRecentsDataSource *)addMatrixSession:(MXSession *)matrixSession
+{
+    MXKSessionRecentsDataSource *recentsDataSource = [[MXKSessionRecentsDataSource alloc] initWithMatrixSession:matrixSession];
+    
+    if (recentsDataSource)
+    {
+        // Set the actual data and view classes
+        [recentsDataSource registerCellDataClass:[self cellDataClassForCellIdentifier:kMXKRecentCellIdentifier] forCellIdentifier:kMXKRecentCellIdentifier];
+        
+        [mxSessionArray addObject:matrixSession];
+        
+        recentsDataSource.delegate = self;
+        [recentsDataSourceArray addObject:recentsDataSource];
+        
+        [recentsDataSource finalizeInitialization];
+        
+        if (self.delegate && [self.delegate respondsToSelector:@selector(dataSource:didAddMatrixSession:)])
+        {
+            [self.delegate dataSource:self didAddMatrixSession:matrixSession];
+        }
+        
+        // Check the current state of the data source
+        [self dataSource:recentsDataSource didStateChange:recentsDataSource.state];
+    }
+    
+    return recentsDataSource;
+}
+
+- (void)removeMatrixSession:(MXSession*)matrixSession
+{
+    for (NSUInteger index = 0; index < mxSessionArray.count; index++)
+    {
+        MXSession *mxSession = [mxSessionArray objectAtIndex:index];
+        if (mxSession == matrixSession)
+        {
+            MXKSessionRecentsDataSource *recentsDataSource = [recentsDataSourceArray objectAtIndex:index];
+            [recentsDataSource destroy];
+            
+            [displayedRecentsDataSourceArray removeObject:recentsDataSource];
+            
+            [recentsDataSourceArray removeObjectAtIndex:index];
+            [mxSessionArray removeObjectAtIndex:index];
+            
+            // Loop on 'didCellChange' method to let inherited 'MXKRecentsDataSource' class handle this removed data source.
+            [self dataSource:recentsDataSource didCellChange:nil];
+            
+            if (self.delegate && [self.delegate respondsToSelector:@selector(dataSource:didRemoveMatrixSession:)])
+            {
+                [self.delegate dataSource:self didRemoveMatrixSession:matrixSession];
+            }
+            
+            break;
+        }
+    }
+}
+
+- (void)setCurrentSpace:(MXSpace *)currentSpace
+{
+    _currentSpace = currentSpace;
+
+    for (MXKSessionRecentsDataSource *recentsDataSource in recentsDataSourceArray) {
+        recentsDataSource.currentSpace = currentSpace;
+    }
+}
+
+#pragma mark - MXKDataSource overridden
+
+- (MXSession*)mxSession
+{
+    if (mxSessionArray.count > 1)
+    {
+        MXLogDebug(@"[MXKRecentsDataSource] CAUTION: mxSession property is not relevant in case of multi-sessions (%tu)", mxSessionArray.count);
+    }
+    
+    // TODO: This property is not well adapted in case of multi-sessions
+    // We consider by default the first added session as the main one...
+    if (mxSessionArray.count)
+    {
+        return [mxSessionArray firstObject];
+    }
+    return nil;
+}
+
+- (MXKDataSourceState)state
+{
+    // Manage a global state based on the state of each internal data source.
+    
+    MXKDataSourceState currentState = MXKDataSourceStateUnknown;
+    MXKSessionRecentsDataSource *dataSource;
+    
+    if (recentsDataSourceArray.count)
+    { 
+        dataSource = [recentsDataSourceArray firstObject];
+        currentState = dataSource.state;
+        
+        // Deduce the current state according to the internal data sources
+        for (NSUInteger index = 1; index < recentsDataSourceArray.count; index++)
+        {
+            dataSource = [recentsDataSourceArray objectAtIndex:index];
+            
+            switch (dataSource.state)
+            {
+                case MXKDataSourceStateUnknown:
+                    break;
+                case MXKDataSourceStatePreparing:
+                    currentState = MXKDataSourceStatePreparing;
+                    break;
+                case MXKDataSourceStateFailed:
+                    if (currentState == MXKDataSourceStateUnknown)
+                    {
+                        currentState = MXKDataSourceStateFailed;
+                    }
+                    break;
+                case MXKDataSourceStateReady:
+                    if (currentState == MXKDataSourceStateUnknown || currentState == MXKDataSourceStateFailed)
+                    {
+                        currentState = MXKDataSourceStateReady;
+                    }
+                    break;
+                    
+                default:
+                    break;
+            }
+        }
+    }
+    
+    return currentState;
+}
+
+- (void)destroy
+{
+    for (MXKSessionRecentsDataSource *recentsDataSource in recentsDataSourceArray)
+    {
+        [recentsDataSource destroy];
+    }
+    displayedRecentsDataSourceArray = nil;
+    recentsDataSourceArray = nil;
+    shrinkedRecentsDataSourceArray = nil;
+    mxSessionArray = nil;
+    
+    _searchPatternsList = nil;
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionInvitedRoomsDidChangeNotification object:nil];
+    
+    [super destroy];
+}
+
+#pragma mark -
+
+- (NSArray*)mxSessions
+{
+    return [NSArray arrayWithArray:mxSessionArray];
+}
+
+- (NSUInteger)displayedRecentsDataSourcesCount
+{
+    return displayedRecentsDataSourceArray.count;
+}
+
+- (BOOL)hasUnread
+{
+    // Check hasUnread flag in all ready data sources
+    for (MXKSessionRecentsDataSource *recentsDataSource in displayedRecentsDataSourceArray)
+    {
+        if (recentsDataSource.hasUnread)
+        {
+            return YES;
+        }
+    }
+    return NO;
+}
+
+- (void)searchWithPatterns:(NSArray*)patternsList
+{
+    _searchPatternsList = patternsList;
+    
+    // CAUTION: Apply here the search pattern to all ready data sources (not only displayed ones).
+    // Some data sources may have been removed from 'displayedRecentsDataSourceArray' during a previous search if no recent was matching.
+    for (MXKSessionRecentsDataSource *recentsDataSource in recentsDataSourceArray)
+    {
+        if (recentsDataSource.state == MXKDataSourceStateReady)
+        {
+            [recentsDataSource searchWithPatterns:patternsList];
+        }
+    }
+}
+
+- (UIView *)viewForHeaderInSection:(NSInteger)section withFrame:(CGRect)frame
+{
+    UIView *sectionHeader = nil;
+    
+    if (displayedRecentsDataSourceArray.count > 1 && section < displayedRecentsDataSourceArray.count)
+    {
+        MXKSessionRecentsDataSource *recentsDataSource = [displayedRecentsDataSourceArray objectAtIndex:section];
+        
+        NSString* sectionTitle = recentsDataSource.mxSession.myUser.userId;
+        
+        sectionHeader = [[UIView alloc] initWithFrame:frame];
+        sectionHeader.backgroundColor = [UIColor colorWithRed:0.9 green:0.9 blue:0.9 alpha:1.0];
+        
+        // Add shrink button
+        UIButton *shrinkButton = [UIButton buttonWithType:UIButtonTypeCustom];
+        frame.origin.x = frame.origin.y = 0;
+        shrinkButton.frame = frame;
+        shrinkButton.backgroundColor = [UIColor clearColor];
+        [shrinkButton addTarget:self action:@selector(onButtonPressed:) forControlEvents:UIControlEventTouchUpInside];
+        shrinkButton.tag = section;
+        [sectionHeader addSubview:shrinkButton];
+        sectionHeader.userInteractionEnabled = YES;
+        
+        // Add shrink icon
+        UIImage *chevron;
+        if ([shrinkedRecentsDataSourceArray indexOfObject:recentsDataSource] != NSNotFound)
+        {
+            chevron = [NSBundle mxk_imageFromMXKAssetsBundleWithName:@"disclosure"];
+        }
+        else
+        {
+            chevron = [NSBundle mxk_imageFromMXKAssetsBundleWithName:@"shrink"];
+        }
+        UIImageView *chevronView = [[UIImageView alloc] initWithImage:chevron];
+        chevronView.contentMode = UIViewContentModeCenter;
+        frame = chevronView.frame;
+        frame.origin.x = sectionHeader.frame.size.width - frame.size.width - 8;
+        frame.origin.y = (sectionHeader.frame.size.height - frame.size.height) / 2;
+        chevronView.frame = frame;
+        [sectionHeader addSubview:chevronView];
+        chevronView.autoresizingMask = (UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin);
+        
+        // Add label
+        frame = sectionHeader.frame;
+        frame.origin.x = 5;
+        frame.origin.y = 5;
+        frame.size.width = chevronView.frame.origin.x - 10;
+        frame.size.height -= 10;
+        UILabel *headerLabel = [[UILabel alloc] initWithFrame:frame];
+        headerLabel.font = [UIFont boldSystemFontOfSize:16];
+        headerLabel.backgroundColor = [UIColor clearColor];
+        headerLabel.text = sectionTitle;
+        [sectionHeader addSubview:headerLabel];
+    }
+    
+    return sectionHeader;
+}
+
+- (id<MXKRecentCellDataStoring>)cellDataAtIndexPath:(NSIndexPath *)indexPath
+{
+    if (indexPath.section < displayedRecentsDataSourceArray.count)
+    {
+        MXKSessionRecentsDataSource *recentsDataSource = [displayedRecentsDataSourceArray objectAtIndex:indexPath.section];
+        
+        return [recentsDataSource cellDataAtIndex:indexPath.row];
+    }
+    return nil;
+}
+
+- (CGFloat)cellHeightAtIndexPath:(NSIndexPath *)indexPath
+{
+    if (indexPath.section < displayedRecentsDataSourceArray.count)
+    {
+        MXKSessionRecentsDataSource *recentsDataSource = [displayedRecentsDataSourceArray objectAtIndex:indexPath.section];
+        
+        return [recentsDataSource cellHeightAtIndex:indexPath.row];
+    }
+    return 0;
+}
+
+- (NSIndexPath*)cellIndexPathWithRoomId:(NSString*)roomId andMatrixSession:(MXSession*)matrixSession
+{
+    NSIndexPath *indexPath = nil;
+    
+    // Look for the right data source
+    for (NSInteger section = 0; section < displayedRecentsDataSourceArray.count; section++)
+    {
+        MXKSessionRecentsDataSource *recentsDataSource = displayedRecentsDataSourceArray[section];
+        if (recentsDataSource.mxSession == matrixSession)
+        {
+            // Check whether the source is not shrinked
+            if ([shrinkedRecentsDataSourceArray indexOfObject:recentsDataSource] == NSNotFound)
+            {
+                // Look for the cell
+                for (NSInteger index = 0; index < recentsDataSource.numberOfCells; index ++)
+                {
+                    id<MXKRecentCellDataStoring> recentCellData = [recentsDataSource cellDataAtIndex:index];
+                    if ([roomId isEqualToString:recentCellData.roomIdentifier])
+                    {
+                        // Got it
+                        indexPath = [NSIndexPath indexPathForRow:index inSection:section];
+                        break;
+                    }
+                }
+            }
+            break;
+        }
+    }
+    
+    return indexPath;
+}
+
+#pragma mark - UITableViewDataSource
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+    // Check whether all data sources are ready before rendering recents
+    if (self.state == MXKDataSourceStateReady)
+    {
+        return displayedRecentsDataSourceArray.count;
+    }
+    return 0;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    if (section < displayedRecentsDataSourceArray.count)
+    {
+        MXKSessionRecentsDataSource *recentsDataSource = [displayedRecentsDataSourceArray objectAtIndex:section];
+        
+        // Check whether the source is shrinked
+        if ([shrinkedRecentsDataSourceArray indexOfObject:recentsDataSource] == NSNotFound)
+        {
+            return recentsDataSource.numberOfCells;
+        }
+    }
+    
+    return 0;
+}
+
+- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
+{
+    NSString* sectionTitle = nil;
+    
+    if (displayedRecentsDataSourceArray.count > 1 && section < displayedRecentsDataSourceArray.count)
+    {
+        MXKSessionRecentsDataSource *recentsDataSource = [displayedRecentsDataSourceArray objectAtIndex:section];
+        
+        sectionTitle = recentsDataSource.mxSession.myUser.userId;
+    }
+    
+    return sectionTitle;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    if (indexPath.section < displayedRecentsDataSourceArray.count && self.delegate)
+    {
+        MXKSessionRecentsDataSource *recentsDataSource = [displayedRecentsDataSourceArray objectAtIndex:indexPath.section];
+        
+        id<MXKRecentCellDataStoring> roomData = [recentsDataSource cellDataAtIndex:indexPath.row];
+        
+        NSString *cellIdentifier = [self.delegate cellReuseIdentifierForCellData:roomData];
+        if (cellIdentifier)
+        {
+            UITableViewCell<MXKCellRendering> *cell  = [tableView dequeueReusableCellWithIdentifier:cellIdentifier forIndexPath:indexPath];
+            
+            // Make sure we listen to user actions on the cell
+            cell.delegate = self;
+            
+            // Make the bubble display the data
+            [cell render:roomData];
+            
+            return cell;
+        }
+    }
+    
+    // Return a fake cell to prevent app from crashing.
+    return [[UITableViewCell alloc] init];
+}
+
+- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    // Return NO if you do not want the specified item to be editable.
+    return YES;
+}
+
+- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    if (editingStyle == UITableViewCellEditingStyleDelete)
+    {
+        [self leaveRoomAtIndexPath:indexPath];
+    }
+}
+
+#pragma mark - MXKDataSourceDelegate
+
+- (Class<MXKCellRendering>)cellViewClassForCellData:(MXKCellData*)cellData
+{
+    // Retrieve the class from the delegate here
+    if (self.delegate)
+    {
+        return [self.delegate cellViewClassForCellData:cellData];
+    }
+    
+    return nil;
+}
+
+- (NSString *)cellReuseIdentifierForCellData:(MXKCellData*)cellData
+{
+    // Retrieve the identifier from the delegate here
+    if (self.delegate)
+    {
+        return [self.delegate cellReuseIdentifierForCellData:cellData];
+    }
+    
+    return nil;
+}
+
+- (void)dataSource:(MXKDataSource*)dataSource didCellChange:(id)changes
+{
+    // Keep update readyRecentsDataSourceArray by checking number of cells
+    if (dataSource.state == MXKDataSourceStateReady)
+    {
+        MXKSessionRecentsDataSource *recentsDataSource = (MXKSessionRecentsDataSource*)dataSource;
+        
+        if (recentsDataSource.numberOfCells)
+        {
+            // Check whether the data source must be added
+            if ([displayedRecentsDataSourceArray indexOfObject:recentsDataSource] == NSNotFound)
+            {
+                // Add this data source first
+                [self dataSource:dataSource didStateChange:dataSource.state];
+                return;
+            }
+        }
+        else
+        {
+            // Check whether this data source must be removed
+            if ([displayedRecentsDataSourceArray indexOfObject:recentsDataSource] != NSNotFound)
+            {
+                [displayedRecentsDataSourceArray removeObject:recentsDataSource];
+                
+                // Loop on 'didCellChange' method to let inherited 'MXKRecentsDataSource' class handle this removed data source.
+                [self dataSource:recentsDataSource didCellChange:nil];
+                return;
+            }
+        }
+    }
+    
+    // Notify delegate
+    [self.delegate dataSource:self didCellChange:changes];
+}
+
+- (void)dataSource:(MXKDataSource*)dataSource didStateChange:(MXKDataSourceState)state
+{
+    // Update list of ready data sources
+    MXKSessionRecentsDataSource *recentsDataSource = (MXKSessionRecentsDataSource*)dataSource;
+    if (dataSource.state == MXKDataSourceStateReady && recentsDataSource.numberOfCells)
+    {
+        if ([displayedRecentsDataSourceArray indexOfObject:recentsDataSource] == NSNotFound)
+        {
+            // Add this new recents data source.
+            if (!displayedRecentsDataSourceArray.count)
+            {
+                [displayedRecentsDataSourceArray addObject:recentsDataSource];
+            }
+            else
+            {
+                // To display multiple accounts in a consistent order, we sort the recents data source by considering the account user id (alphabetic order).
+                NSUInteger index;
+                for (index = 0; index < displayedRecentsDataSourceArray.count; index++)
+                {
+                    MXKSessionRecentsDataSource *currentRecentsDataSource = displayedRecentsDataSourceArray[index];
+                    if ([currentRecentsDataSource.mxSession.myUser.userId compare:recentsDataSource.mxSession.myUser.userId] == NSOrderedDescending)
+                    {
+                        break;
+                    }
+                }
+                
+                // Insert this data source
+                [displayedRecentsDataSourceArray insertObject:recentsDataSource atIndex:index];
+            }
+            
+            // Check whether a search session is in progress
+            if (_searchPatternsList)
+            {
+                [recentsDataSource searchWithPatterns:_searchPatternsList];
+            }
+            else
+            {
+                // Loop on 'didCellChange' method to let inherited 'MXKRecentsDataSource' class handle this new added data source.
+                [self dataSource:recentsDataSource didCellChange:nil];
+            }
+        }
+    }
+    else if ([displayedRecentsDataSourceArray indexOfObject:recentsDataSource] != NSNotFound)
+    {
+        [displayedRecentsDataSourceArray removeObject:recentsDataSource];
+        
+        // Loop on 'didCellChange' method to let inherited 'MXKRecentsDataSource' class handle this removed data source.
+        [self dataSource:recentsDataSource didCellChange:nil];
+    }
+    
+    if (self.delegate && [self.delegate respondsToSelector:@selector(dataSource:didStateChange:)])
+    {
+        [self.delegate dataSource:self didStateChange:self.state];
+    }
+}
+
+#pragma mark - Action
+
+- (IBAction)onButtonPressed:(id)sender
+{
+    if ([sender isKindOfClass:[UIButton class]])
+    {
+        UIButton *shrinkButton = (UIButton*)sender;
+        
+        if (shrinkButton.tag < displayedRecentsDataSourceArray.count)
+        {
+            MXKSessionRecentsDataSource *recentsDataSource = [displayedRecentsDataSourceArray objectAtIndex:shrinkButton.tag];
+            
+            NSUInteger index = [shrinkedRecentsDataSourceArray indexOfObject:recentsDataSource];
+            if (index != NSNotFound)
+            {
+                // Disclose the
+                [shrinkedRecentsDataSourceArray removeObjectAtIndex:index];
+            }
+            else
+            {
+                // Shrink the recents from this session
+                [shrinkedRecentsDataSourceArray addObject:recentsDataSource];
+            }
+            
+            // Loop on 'didCellChange' method to let inherited 'MXKRecentsDataSource' class handle change on this data source.
+            [self dataSource:recentsDataSource didCellChange:nil];
+        }
+    }
+}
+
+#pragma mark - room actions
+- (MXRoom*)getRoomAtIndexPath:(NSIndexPath *)indexPath
+{
+    // Leave the selected room
+    id<MXKRecentCellDataStoring> recentCellData = [self cellDataAtIndexPath:indexPath];
+    
+    if (recentCellData)
+    {
+        return [self.mxSession roomWithRoomId:recentCellData.roomIdentifier];
+    }
+    
+    return nil;
+}
+
+- (void)leaveRoomAtIndexPath:(NSIndexPath *)indexPath
+{
+    MXRoom* room = [self getRoomAtIndexPath:indexPath];
+    
+    if (room)
+    {
+        // cancel pending uploads/downloads
+        // they are useless by now
+        [MXMediaManager cancelDownloadsInCacheFolder:room.roomId];
+        
+        // TODO GFO cancel pending uploads related to this room
+        
+        [room leave:^{
+            
+            // Trigger recents table refresh
+            if (self.delegate)
+            {
+                [self.delegate dataSource:self didCellChange:nil];
+            }
+            
+        } failure:^(NSError *error) {
+            
+            MXLogDebug(@"[MXKRecentsDataSource] Failed to leave room (%@) failed", room.roomId);
+            
+            // Notify MatrixKit user
+            NSString *myUserId = room.mxSession.myUser.userId;
+            [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+            
+        }];
+    }
+}
+
+- (void)didMXSessionInviteRoomUpdate:(NSNotification *)notif
+{
+    MXSession *mxSession = notif.object;
+    if ([self.mxSessions indexOfObject:mxSession] != NSNotFound)
+    {
+        // do nothing by default
+        // the inherited classes might require to perform a full or a particial refresh.
+        //[self.delegate dataSource:self didCellChange:nil];
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/RoomList/MXKSessionRecentsDataSource.h b/Riot/Modules/MatrixKit/Models/RoomList/MXKSessionRecentsDataSource.h
new file mode 100644
index 000000000..0748f1e62
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/RoomList/MXKSessionRecentsDataSource.h
@@ -0,0 +1,90 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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/UIKit.h>
+
+#import "MXKConstants.h"
+#import "MXKDataSource.h"
+#import "MXKRecentCellData.h"
+
+@class MXSpace;
+
+/**
+ Identifier to use for cells that display a room in the recents list.
+ */
+extern NSString *const kMXKRecentCellIdentifier;
+
+/**
+ The recents data source based on a unique matrix session.
+ */
+MXK_DEPRECATED_ATTRIBUTE_WITH_MSG("See MXSession.roomListDataManager")
+@interface MXKSessionRecentsDataSource : MXKDataSource {
+
+@protected
+
+    /**
+     The data for the cells served by `MXKSessionRecentsDataSource`.
+     */
+    NSMutableArray *cellDataArray;
+    
+    /**
+     The filtered recents: sub-list of `cellDataArray` defined by `searchWithPatterns:` call.
+     */
+    NSMutableArray *filteredCellDataArray;
+}
+
+/**
+ The current number of cells.
+ */
+@property (nonatomic, readonly) NSInteger numberOfCells;
+
+/**
+ Tell whether there are some unread messages.
+ */
+@property (nonatomic, readonly) BOOL hasUnread;
+
+@property (nonatomic, strong, nullable) MXSpace *currentSpace;
+
+
+#pragma mark - Life cycle
+
+/**
+ Filter the current recents list according to the provided patterns.
+ When patterns are not empty, the search result is stored in `filteredCellDataArray`,
+ this array provides then data for the cells served by `MXKRecentsDataSource`.
+ 
+ @param patternsList the list of patterns (`NSString` instances) to match with. Set nil to cancel search.
+ */
+- (void)searchWithPatterns:(NSArray*)patternsList;
+
+/**
+ Get the data for the cell at the given index.
+
+ @param index the index of the cell in the array
+ @return the cell data
+ */
+- (id<MXKRecentCellDataStoring>)cellDataAtIndex:(NSInteger)index;
+
+/**
+ Get height of the cell at the given index.
+
+ @param index the index of the cell in the array
+ @return the cell height
+ */
+- (CGFloat)cellHeightAtIndex:(NSInteger)index;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/RoomList/MXKSessionRecentsDataSource.m b/Riot/Modules/MatrixKit/Models/RoomList/MXKSessionRecentsDataSource.m
new file mode 100644
index 000000000..bf4c600aa
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/RoomList/MXKSessionRecentsDataSource.m
@@ -0,0 +1,552 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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 "MXKSessionRecentsDataSource.h"
+
+@import MatrixSDK;
+
+#import "MXKRoomDataSourceManager.h"
+
+#import "MXKSwiftHeader.h"
+
+#pragma mark - Constant definitions
+NSString *const kMXKRecentCellIdentifier = @"kMXKRecentCellIdentifier";
+static NSTimeInterval const roomSummaryChangeThrottlerDelay = .5;
+
+
+@interface MXKSessionRecentsDataSource ()
+{
+    MXKRoomDataSourceManager *roomDataSourceManager;
+    
+    /**
+     Internal array used to regulate change notifications.
+     Cell data changes are stored instantly in this array.
+     These changes are reported to the delegate only if no server sync is in progress.
+     */
+    NSMutableArray *internalCellDataArray;
+
+    /**
+     Store the current search patterns list.
+     */
+    NSArray* searchPatternsList;
+    
+    /**
+     Do not react on every summary change
+     */
+    MXThrottler *roomSummaryChangeThrottler;
+    
+    /**
+     Last received suggested rooms per space ID
+     */
+    NSMutableDictionary<NSString*, NSArray<MXSpaceChildInfo *> *> *lastSuggestedRooms;
+    
+    /**
+     Event listener of the current space used to update the UI if an event occurs.
+     */
+    id spaceEventsListener;
+    
+    /**
+     Observer used to reload data when the space service is initialised
+     */
+    id spaceServiceDidInitialiseObserver;
+}
+
+/**
+ Additional suggestedRooms related to the current selected Space
+ */
+@property (nonatomic, strong) NSArray<MXSpaceChildInfo *> *suggestedRooms;
+
+@end
+
+@implementation MXKSessionRecentsDataSource
+
+- (instancetype)initWithMatrixSession:(MXSession *)matrixSession
+{
+    self = [super initWithMatrixSession:matrixSession];
+    if (self)
+    {
+        roomDataSourceManager = [MXKRoomDataSourceManager sharedManagerForMatrixSession:self.mxSession];
+        
+        internalCellDataArray = [NSMutableArray array];
+        filteredCellDataArray = nil;
+        
+        lastSuggestedRooms = [NSMutableDictionary new];
+        
+        // Set default data and view classes
+        [self registerCellDataClass:MXKRecentCellData.class forCellIdentifier:kMXKRecentCellIdentifier];
+        
+        roomSummaryChangeThrottler = [[MXThrottler alloc] initWithMinimumDelay:roomSummaryChangeThrottlerDelay];
+        
+        [[MXKAppSettings standardAppSettings] addObserver:self forKeyPath:@"showAllRoomsInHomeSpace" options:0 context:nil];
+    }
+    return self;
+}
+
+- (void)destroy
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXRoomSummaryDidChangeNotification object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXKRoomDataSourceSyncStatusChanged object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionNewRoomNotification object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionDidLeaveRoomNotification object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionDirectRoomsDidChangeNotification object:nil];
+    
+    if (spaceServiceDidInitialiseObserver) {
+        [[NSNotificationCenter defaultCenter] removeObserver:spaceServiceDidInitialiseObserver];
+    }
+    
+    [roomSummaryChangeThrottler cancelAll];
+    roomSummaryChangeThrottler = nil;
+    
+    cellDataArray = nil;
+    internalCellDataArray = nil;
+    filteredCellDataArray = nil;
+    lastSuggestedRooms = nil;
+    
+    searchPatternsList = nil;
+    
+    [[MXKAppSettings standardAppSettings] removeObserver:self forKeyPath:@"showAllRoomsInHomeSpace" context:nil];
+
+    [super destroy];
+}
+
+- (void)didMXSessionStateChange
+{
+    if (MXSessionStateStoreDataReady <= self.mxSession.state)
+    {
+        // Check whether some data have been already load
+        if (0 == internalCellDataArray.count)
+        {
+            [self loadData];
+        }
+        else if (!roomDataSourceManager.isServerSyncInProgress)
+        {
+            // Sort cell data and notify the delegate
+            [self sortCellDataAndNotifyChanges];
+        }
+    }
+}
+
+- (void)setCurrentSpace:(MXSpace *)currentSpace
+{
+    if (_currentSpace == currentSpace)
+    {
+        return;
+    }
+    
+    if (_currentSpace && spaceEventsListener)
+    {
+        [_currentSpace.room removeListener:spaceEventsListener];
+    }
+    
+    _currentSpace = currentSpace;
+    
+    self.suggestedRooms = _currentSpace ? lastSuggestedRooms[_currentSpace.spaceId] : nil;
+    [self updateSuggestedRooms];
+    
+    MXWeakify(self);
+    spaceEventsListener = [self.currentSpace.room listenToEvents:^(MXEvent *event, MXTimelineDirection direction, MXRoomState *roomState) {
+        MXStrongifyAndReturnIfNil(self);
+        [self updateSuggestedRooms];
+    }];
+}
+
+-(void)setSuggestedRooms:(NSArray<MXSpaceChildInfo *> *)suggestedRooms
+{
+    _suggestedRooms = suggestedRooms;
+    [self loadData];
+}
+
+-(void)updateSuggestedRooms
+{
+    if (self.currentSpace)
+    {
+        NSString *currentSpaceId = self.currentSpace.spaceId;
+        MXWeakify(self);
+        [self.mxSession.spaceService getSpaceChildrenForSpaceWithId:currentSpaceId suggestedOnly:YES limit:5 maxDepth:1 paginationToken:nil success:^(MXSpaceChildrenSummary * _Nonnull childrenSummary) {
+            MXLogDebug(@"[MXKSessionRecentsDataSource] getSpaceChildrenForSpaceWithId %@: %ld found", self.currentSpace.spaceId, childrenSummary.childInfos.count);
+            MXStrongifyAndReturnIfNil(self);
+            self->lastSuggestedRooms[currentSpaceId] = childrenSummary.childInfos;
+            if ([self.currentSpace.spaceId isEqual:currentSpaceId]) {
+                self.suggestedRooms = childrenSummary.childInfos;
+            }
+        } failure:^(NSError * _Nonnull error) {
+            MXLogError(@"[MXKSessionRecentsDataSource] getSpaceChildrenForSpaceWithId failed with error: %@", error);
+        }];
+    }
+}
+
+#pragma mark -
+
+- (NSInteger)numberOfCells
+{
+    if (filteredCellDataArray)
+    {
+        return filteredCellDataArray.count;
+    }
+    return cellDataArray.count;
+}
+
+- (BOOL)hasUnread
+{
+    // Check all current cells
+    // Use numberOfRowsInSection methods so that we take benefit of the filtering
+    for (NSUInteger i = 0; i < self.numberOfCells; i++)
+    {
+        id<MXKRecentCellDataStoring> cellData = [self cellDataAtIndex:i];
+        if (cellData.hasUnread)
+        {
+            return YES;
+        }
+    }
+    return NO;
+}
+
+- (void)searchWithPatterns:(NSArray*)patternsList
+{
+    if (patternsList.count)
+    {
+        searchPatternsList = patternsList;
+        
+        if (filteredCellDataArray)
+        {
+            [filteredCellDataArray removeAllObjects];
+        }
+        else
+        {
+            filteredCellDataArray = [NSMutableArray arrayWithCapacity:cellDataArray.count];
+        }
+        
+        for (id<MXKRecentCellDataStoring> cellData in cellDataArray)
+        {
+            for (NSString* pattern in patternsList)
+            {
+                if (cellData.roomDisplayname && [cellData.roomDisplayname rangeOfString:pattern options:NSCaseInsensitiveSearch].location != NSNotFound)
+                {
+                    [filteredCellDataArray addObject:cellData];
+                    break;
+                }
+            }
+        }
+    }
+    else
+    {
+        filteredCellDataArray = nil;
+        searchPatternsList = nil;
+    }
+    
+    [self.delegate dataSource:self didCellChange:nil];
+}
+
+- (id<MXKRecentCellDataStoring>)cellDataAtIndex:(NSInteger)index
+{
+    if (filteredCellDataArray)
+    {
+        if (index < filteredCellDataArray.count)
+        {
+            return filteredCellDataArray[index];
+        }
+    }
+    else if (index < cellDataArray.count)
+    {
+        return cellDataArray[index];
+    }
+    
+    return nil;
+}
+
+- (CGFloat)cellHeightAtIndex:(NSInteger)index
+{
+    if (self.delegate)
+    {
+        id<MXKRecentCellDataStoring> cellData = [self cellDataAtIndex:index];
+        
+        Class<MXKCellRendering> class = [self.delegate cellViewClassForCellData:cellData];
+        return [class heightForCellData:cellData withMaximumWidth:0];
+    }
+    
+    return 0;
+}
+
+#pragma mark - Events processing
+
+/**
+ Filtering in this method won't have any effect anymore. This class is not maintained.
+ */
+- (void)loadData
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXRoomSummaryDidChangeNotification object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXKRoomDataSourceSyncStatusChanged object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionNewRoomNotification object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionDidLeaveRoomNotification object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXSessionDirectRoomsDidChangeNotification object:nil];
+    
+    if (!self.mxSession.spaceService.isInitialised && !spaceServiceDidInitialiseObserver) {
+        MXWeakify(self);
+        spaceServiceDidInitialiseObserver = [[NSNotificationCenter defaultCenter] addObserverForName:MXSpaceService.didInitialise object:self.mxSession.spaceService queue:nil usingBlock:^(NSNotification * _Nonnull note) {
+            MXStrongifyAndReturnIfNil(self);
+            [self loadData];
+        }];
+    }
+    
+    // Reset the table
+    [internalCellDataArray removeAllObjects];
+    
+    // Retrieve the MXKCellData class to manage the data
+    Class class = [self cellDataClassForCellIdentifier:kMXKRecentCellIdentifier];
+    NSAssert([class conformsToProtocol:@protocol(MXKRecentCellDataStoring)], @"MXKSessionRecentsDataSource only manages MXKCellData that conforms to MXKRecentCellDataStoring protocol");
+
+    NSDate *startDate = [NSDate date];
+    
+    for (MXRoomSummary *roomSummary in self.mxSession.roomsSummaries)
+    {
+        // Filter out private rooms with conference users
+        if (!roomSummary.isConferenceUserRoom // @TODO Abstract this condition with roomSummary.hiddenFromUser
+            && !roomSummary.hiddenFromUser)
+        {
+            id<MXKRecentCellDataStoring> cellData = [[class alloc] initWithRoomSummary:roomSummary dataSource:self];
+            if (cellData)
+            {
+                [internalCellDataArray addObject:cellData];
+            }
+        }
+    }
+    
+    for (MXSpaceChildInfo *childInfo in _suggestedRooms)
+    {
+        id<MXRoomSummaryProtocol> summary = [[MXRoomSummary alloc] initWithSpaceChildInfo:childInfo];
+        id<MXKRecentCellDataStoring> cellData = [[class alloc] initWithRoomSummary:summary
+                                                                        dataSource:self];
+        if (cellData)
+        {
+            [internalCellDataArray addObject:cellData];
+        }
+    }
+
+    MXLogDebug(@"[MXKSessionRecentsDataSource] Loaded %tu recents in %.3fms", self.mxSession.rooms.count, [[NSDate date] timeIntervalSinceDate:startDate] * 1000);
+
+    // Make sure all rooms have a last message
+    [self.mxSession fixRoomsSummariesLastMessage];
+
+    // Report loaded array except if sync is in progress
+    if (!roomDataSourceManager.isServerSyncInProgress)
+    {
+        [self sortCellDataAndNotifyChanges];
+    }
+    
+    // Listen to MXSession rooms count changes
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didMXSessionHaveNewRoom:) name:kMXSessionNewRoomNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didMXSessionDidLeaveRoom:) name:kMXSessionDidLeaveRoomNotification object:nil];
+    
+    // Listen to the direct rooms list
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didDirectRoomsChange:) name:kMXSessionDirectRoomsDidChangeNotification object:nil];
+    
+    // Listen to MXRoomSummary
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didRoomSummaryChanged:) name:kMXRoomSummaryDidChangeNotification object:nil];
+
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didMXSessionStateChange) name:kMXKRoomDataSourceSyncStatusChanged object:nil];
+}
+
+- (void)didDirectRoomsChange:(NSNotification *)notif
+{
+    // Inform the delegate about the update
+    [self.delegate dataSource:self didCellChange:nil];
+}
+
+- (void)didRoomSummaryChanged:(NSNotification *)notif
+{    
+    [roomSummaryChangeThrottler throttle:^{
+        [self didRoomSummaryChanged2:notif];
+    }];
+}
+
+- (void)didRoomSummaryChanged2:(NSNotification *)notif
+{
+    MXRoomSummary *roomSummary = notif.object;
+    if (roomSummary.mxSession == self.mxSession && internalCellDataArray.count)
+    {
+        // Find the index of the related cell data
+        NSInteger index = NSNotFound;
+        for (index = 0; index < internalCellDataArray.count; index++)
+        {
+            id<MXKRecentCellDataStoring> theRoomData = [internalCellDataArray objectAtIndex:index];
+            if (theRoomData.roomSummary == roomSummary)
+            {
+                break;
+            }
+        }
+        
+        if (index < internalCellDataArray.count)
+        {
+            if (roomSummary.hiddenFromUser)
+            {
+                [internalCellDataArray removeObjectAtIndex:index];
+            }
+            else
+            {
+                // Create a new instance to not modify the content of 'cellDataArray' (the copy is not a deep copy).
+                Class class = [self cellDataClassForCellIdentifier:kMXKRecentCellIdentifier];
+                id<MXKRecentCellDataStoring> cellData = [[class alloc] initWithRoomSummary:roomSummary dataSource:self];
+                if (cellData)
+                {
+                    [internalCellDataArray replaceObjectAtIndex:index withObject:cellData];
+                }
+            }
+            
+            // Report change except if sync is in progress
+            if (!roomDataSourceManager.isServerSyncInProgress)
+            {
+                [self sortCellDataAndNotifyChanges];
+            }
+        }
+        else
+        {
+            MXLogDebug(@"[MXKSessionRecentsDataSource] didRoomLastMessageChanged: Cannot find the changed room summary for %@ (%@). It is probably not managed by this recents data source", roomSummary.roomId, roomSummary);
+        }
+    }
+    else
+    {
+        // Inform the delegate that all the room summaries have been updated.
+        [self.delegate dataSource:self didCellChange:nil];
+    }
+}
+
+- (void)didMXSessionHaveNewRoom:(NSNotification *)notif
+{
+    MXSession *mxSession = notif.object;
+    if (mxSession == self.mxSession)
+    {
+        NSString *roomId = notif.userInfo[kMXSessionNotificationRoomIdKey];
+        
+        // Add the room if there is not yet a cell for it
+        id<MXKRecentCellDataStoring> roomData = [self cellDataWithRoomId:roomId];
+        if (nil == roomData)
+        {
+            MXLogDebug(@"MXKSessionRecentsDataSource] Add newly joined room: %@", roomId);
+            
+            // Retrieve the MXKCellData class to manage the data
+            Class class = [self cellDataClassForCellIdentifier:kMXKRecentCellIdentifier];
+
+            MXRoomSummary *roomSummary = [mxSession roomSummaryWithRoomId:roomId];
+            id<MXKRecentCellDataStoring> cellData = [[class alloc] initWithRoomSummary:roomSummary dataSource:self];
+            if (cellData)
+            {
+                [internalCellDataArray addObject:cellData];
+                
+                // Report change except if sync is in progress
+                if (!roomDataSourceManager.isServerSyncInProgress)
+                {
+                    [self sortCellDataAndNotifyChanges];
+                }
+            }
+        }
+    }
+}
+
+- (void)didMXSessionDidLeaveRoom:(NSNotification *)notif
+{
+    MXSession *mxSession = notif.object;
+    if (mxSession == self.mxSession)
+    {
+        NSString *roomId = notif.userInfo[kMXSessionNotificationRoomIdKey];
+        id<MXKRecentCellDataStoring> roomData = [self cellDataWithRoomId:roomId];
+        
+        if (roomData)
+        {
+            MXLogDebug(@"MXKSessionRecentsDataSource] Remove left room: %@", roomId);
+            
+            [internalCellDataArray removeObject:roomData];
+            
+            // Report change except if sync is in progress
+            if (!roomDataSourceManager.isServerSyncInProgress)
+            {
+                [self sortCellDataAndNotifyChanges];
+            }
+        }
+    }
+}
+
+// Order cells
+- (void)sortCellDataAndNotifyChanges
+{
+    // Order them by origin_server_ts
+    [internalCellDataArray sortUsingComparator:^NSComparisonResult(id<MXKRecentCellDataStoring> cellData1, id<MXKRecentCellDataStoring> cellData2)
+    {
+        return [cellData1.roomSummary.lastMessage compareOriginServerTs:cellData2.roomSummary.lastMessage];
+    }];
+    
+    // Snapshot the cell data array
+    cellDataArray = [internalCellDataArray copy];
+    
+    // Update search result if any
+    if (searchPatternsList)
+    {
+        [self searchWithPatterns:searchPatternsList];
+    }
+    
+    // Update here data source state
+    if (state != MXKDataSourceStateReady)
+    {
+        state = MXKDataSourceStateReady;
+        if (self.delegate && [self.delegate respondsToSelector:@selector(dataSource:didStateChange:)])
+        {
+            [self.delegate dataSource:self didStateChange:state];
+        }
+    }
+    
+    // And inform the delegate about the update
+    [self.delegate dataSource:self didCellChange:nil];
+}
+
+// Find the cell data that stores information about the given room id
+- (id<MXKRecentCellDataStoring>)cellDataWithRoomId:(NSString*)roomId
+{
+    id<MXKRecentCellDataStoring> theRoomData;
+    
+    NSMutableArray *dataArray = internalCellDataArray;
+    if (!roomDataSourceManager.isServerSyncInProgress)
+    {
+        dataArray = cellDataArray;
+    }
+    
+    for (id<MXKRecentCellDataStoring> roomData in dataArray)
+    {
+        if ([roomData.roomSummary.roomId isEqualToString:roomId])
+        {
+            theRoomData = roomData;
+            break;
+        }
+    }
+    return theRoomData;
+}
+
+#pragma mark - KVO
+
+- (void)observeValueForKeyPath:(NSString *)keyPath
+                      ofObject:(id)object
+                        change:(NSDictionary *)change
+                       context:(void *)context
+{
+    if (object == [MXKAppSettings standardAppSettings] && [keyPath isEqualToString:@"showAllRoomsInHomeSpace"])
+    {
+        if (self.currentSpace == nil)
+        {
+            [self loadData];
+        }
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/RoomMemberList/MXKRoomMemberCellData.h b/Riot/Modules/MatrixKit/Models/RoomMemberList/MXKRoomMemberCellData.h
new file mode 100644
index 000000000..edd954fd2
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/RoomMemberList/MXKRoomMemberCellData.h
@@ -0,0 +1,33 @@
+/*
+ Copyright 2015 OpenMarket 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/Foundation.h>
+#import <MatrixSDK/MatrixSDK.h>
+
+#import "MXKRoomMemberCellDataStoring.h"
+
+/**
+ `MXKRoomMemberCellData` modelised the data for a `MXKRoomMemberTableViewCell` cell.
+ */
+@interface MXKRoomMemberCellData : MXKCellData <MXKRoomMemberCellDataStoring>
+
+/**
+ The matrix session
+ */
+@property (nonatomic, readonly) MXSession *mxSession;
+
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/RoomMemberList/MXKRoomMemberCellData.m b/Riot/Modules/MatrixKit/Models/RoomMemberList/MXKRoomMemberCellData.m
new file mode 100644
index 000000000..c10c5137f
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/RoomMemberList/MXKRoomMemberCellData.m
@@ -0,0 +1,66 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomMemberCellData.h"
+
+#import "MXKRoomMemberListDataSource.h"
+
+@interface MXKRoomMemberCellData ()
+{
+    MXKRoomMemberListDataSource *roomMemberListDataSource;
+}
+
+@end
+
+@implementation MXKRoomMemberCellData
+@synthesize roomMember;
+@synthesize memberDisplayName, powerLevel, isTyping;
+
+- (instancetype)initWithRoomMember:(MXRoomMember*)member roomState:(MXRoomState*)roomState andRoomMemberListDataSource:(MXKRoomMemberListDataSource*)memberListDataSource
+{
+    self = [self init];
+    if (self)
+    {
+        roomMember = member;
+        roomMemberListDataSource = memberListDataSource;
+        
+        // Report member info from the current room state
+        memberDisplayName = [roomState.members memberName:roomMember.userId];
+        powerLevel = [roomState memberNormalizedPowerLevel:roomMember.userId];
+        isTyping = NO;
+    }
+    
+    return  self;
+}
+
+- (void)updateWithRoomState:(MXRoomState*)roomState
+{
+    memberDisplayName = [roomState.members memberName:roomMember.userId];
+    powerLevel = [roomState memberNormalizedPowerLevel:roomMember.userId];
+}
+
+- (void)dealloc
+{
+    roomMember = nil;
+    roomMemberListDataSource = nil;
+}
+
+- (MXSession*)mxSession
+{
+    return roomMemberListDataSource.mxSession;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/RoomMemberList/MXKRoomMemberCellDataStoring.h b/Riot/Modules/MatrixKit/Models/RoomMemberList/MXKRoomMemberCellDataStoring.h
new file mode 100644
index 000000000..053e9a60c
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/RoomMemberList/MXKRoomMemberCellDataStoring.h
@@ -0,0 +1,67 @@
+/*
+ Copyright 2015 OpenMarket 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/Foundation.h>
+#import <MatrixSDK/MatrixSDK.h>
+
+#import "MXKCellData.h"
+
+@class MXKRoomMemberListDataSource;
+
+/**
+ `MXKRoomMemberCellDataStoring` defines a protocol a class must conform in order to store room member cell data
+ managed by `MXKRoomMemberListDataSource`.
+ */
+@protocol MXKRoomMemberCellDataStoring <NSObject>
+
+
+#pragma mark - Data displayed by a room member cell
+
+/**
+ The member displayed by the cell.
+ */
+@property (nonatomic, readonly) MXRoomMember *roomMember;
+
+/**
+ The member display name
+ */
+@property (nonatomic, readonly) NSString *memberDisplayName;
+
+/**
+ The member power level
+ */
+@property (nonatomic, readonly) CGFloat powerLevel;
+
+/**
+ YES when member is typing in the room
+ */
+@property (nonatomic) BOOL isTyping;
+
+#pragma mark - Public methods
+/**
+ Create a new `MXKCellData` object for a new member cell.
+
+ @param memberListDataSource the `MXKRoomMemberListDataSource` object that will use this instance.
+ @return the newly created instance.
+ */
+- (instancetype)initWithRoomMember:(MXRoomMember*)member roomState:(MXRoomState*)roomState andRoomMemberListDataSource:(MXKRoomMemberListDataSource*)memberListDataSource;
+
+/**
+ Update the member data with the provided roon state.
+ */
+- (void)updateWithRoomState:(MXRoomState*)roomState;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/RoomMemberList/MXKRoomMemberListDataSource.h b/Riot/Modules/MatrixKit/Models/RoomMemberList/MXKRoomMemberListDataSource.h
new file mode 100644
index 000000000..54ffca11c
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/RoomMemberList/MXKRoomMemberListDataSource.h
@@ -0,0 +1,97 @@
+/*
+ Copyright 2015 OpenMarket 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/UIKit.h>
+#import <MatrixSDK/MatrixSDK.h>
+
+#import "MXKDataSource.h"
+#import "MXKRoomMemberCellData.h"
+
+#import "MXKAppSettings.h"
+
+/**
+ Identifier to use for cells that display a room member.
+ */
+extern NSString *const kMXKRoomMemberCellIdentifier;
+
+/**
+ The data source for `MXKRoomMemberListViewController`.
+ */
+@interface MXKRoomMemberListDataSource : MXKDataSource <UITableViewDataSource> {
+
+@protected
+
+    /**
+     The data for the cells served by `MXKRoomMembersDataSource`.
+     */
+    NSMutableArray *cellDataArray;
+    
+    /**
+     The filtered members: sub-list of `cellDataArray` defined by `searchWithPatterns:`.
+     */
+    NSMutableArray *filteredCellDataArray;
+}
+
+/**
+ The id of the room managed by the data source.
+ */
+@property (nonatomic, readonly) NSString *roomId;
+
+/**
+ The settings used to sort/display room members.
+ 
+ By default the shared application settings are considered.
+ */
+@property (nonatomic) MXKAppSettings *settings;
+
+
+#pragma mark - Life cycle
+
+/**
+ Initialise the data source to serve members corresponding to the passed room.
+ 
+ @param roomId the id of the room to get members from.
+ @param mxSession the Matrix session to get data from.
+ @return the newly created instance.
+ */
+- (instancetype)initWithRoomId:(NSString*)roomId andMatrixSession:(MXSession*)mxSession;
+
+/**
+ Filter the current members list according to the provided patterns.
+ When patterns are not empty, the search result is stored in `filteredCellDataArray`,
+ this array provides then data for the cells served by `MXKRoomMembersDataSource`.
+ 
+ @param patternsList the list of patterns (`NSString` instances) to match with. Set nil to cancel search.
+ */
+- (void)searchWithPatterns:(NSArray*)patternsList;
+
+/**
+ Get the data for the cell at the given index.
+
+ @param index the index of the cell in the array
+ @return the cell data
+ */
+- (id<MXKRoomMemberCellDataStoring>)cellDataAtIndex:(NSInteger)index;
+
+/**
+ Get height of the celle at the given index.
+
+ @param index the index of the cell in the array
+ @return the cell height
+ */
+- (CGFloat)cellHeightAtIndex:(NSInteger)index;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/RoomMemberList/MXKRoomMemberListDataSource.m b/Riot/Modules/MatrixKit/Models/RoomMemberList/MXKRoomMemberListDataSource.m
new file mode 100644
index 000000000..ab8b879ae
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/RoomMemberList/MXKRoomMemberListDataSource.m
@@ -0,0 +1,464 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomMemberListDataSource.h"
+
+@import MatrixSDK.MXCallManager;
+
+#import "MXKRoomMemberCellData.h"
+
+
+#pragma mark - Constant definitions
+NSString *const kMXKRoomMemberCellIdentifier = @"kMXKRoomMemberCellIdentifier";
+
+
+@interface MXKRoomMemberListDataSource ()
+{
+    /**
+     The room in which members are listed.
+     */
+    MXRoom *mxRoom;
+
+    /**
+     Cache for loaded room state.
+     */
+    MXRoomState *mxRoomState;
+    
+    /**
+     The members events listener.
+     */
+    id membersListener;
+    
+    /**
+     The typing notification listener in the room.
+     */
+    id typingNotifListener;
+}
+
+@end
+
+@implementation MXKRoomMemberListDataSource
+
+- (instancetype)initWithRoomId:(NSString*)roomId andMatrixSession:(MXSession*)mxSession
+{
+    self = [super initWithMatrixSession:mxSession];
+    if (self)
+    {
+        _roomId = roomId;
+        
+        cellDataArray = [NSMutableArray array];
+        filteredCellDataArray = nil;
+        
+        // Consider the shared app settings by default
+        _settings = [MXKAppSettings standardAppSettings];
+        
+        // Set default data class
+        [self registerCellDataClass:MXKRoomMemberCellData.class forCellIdentifier:kMXKRoomMemberCellIdentifier];
+    }
+    return self;
+}
+
+- (void)destroy
+{
+    cellDataArray = nil;
+    filteredCellDataArray = nil;
+    
+    if (membersListener)
+    {
+        [self.mxSession removeListener:membersListener];
+        membersListener = nil;
+    }
+    
+    if (typingNotifListener)
+    {
+        MXWeakify(self);
+        [mxRoom liveTimeline:^(MXEventTimeline *liveTimeline) {
+            MXStrongifyAndReturnIfNil(self);
+
+            [liveTimeline removeListener:self->typingNotifListener];
+            self->typingNotifListener = nil;
+        }];
+    }
+    
+    [super destroy];
+}
+
+- (void)didMXSessionStateChange
+{
+    if (MXSessionStateStoreDataReady <= self.mxSession.state)
+    {
+        // Check whether the room is not already set
+        if (!mxRoom)
+        {
+            mxRoom = [self.mxSession roomWithRoomId:_roomId];
+            if (mxRoom)
+            {
+                MXWeakify(self);
+                [mxRoom state:^(MXRoomState *roomState) {
+                    MXStrongifyAndReturnIfNil(self);
+
+                    self->mxRoomState = roomState;
+
+                    [self loadData];
+
+                    // Register on typing notif
+                    [self listenTypingNotifications];
+
+                    // Register on members events
+                    [self listenMembersEvents];
+
+                    // Update here data source state
+                    self->state = MXKDataSourceStateReady;
+
+                    // Notify delegate
+                    if (self.delegate)
+                    {
+                        if ([self.delegate respondsToSelector:@selector(dataSource:didStateChange:)])
+                        {
+                            [self.delegate dataSource:self didStateChange:self->state];
+                        }
+                        [self.delegate dataSource:self didCellChange:nil];
+                    }
+                }];
+            }
+            else
+            {
+                MXLogDebug(@"[MXKRoomMemberDataSource] The user does not know the room %@", _roomId);
+                
+                // Update here data source state
+                state = MXKDataSourceStateFailed;
+                
+                // Notify delegate
+                if (self.delegate && [self.delegate respondsToSelector:@selector(dataSource:didStateChange:)])
+                {
+                    [self.delegate dataSource:self didStateChange:state];
+                }
+            }
+        }
+    }
+}
+
+- (void)searchWithPatterns:(NSArray*)patternsList
+{
+    if (patternsList.count)
+    {
+        if (filteredCellDataArray)
+        {
+            [filteredCellDataArray removeAllObjects];
+        }
+        else
+        {
+            filteredCellDataArray = [NSMutableArray arrayWithCapacity:cellDataArray.count];
+        }
+        
+        for (id<MXKRoomMemberCellDataStoring> cellData in cellDataArray)
+        {
+            for (NSString* pattern in patternsList)
+            {
+                if ([[cellData memberDisplayName] rangeOfString:pattern options:NSCaseInsensitiveSearch].location != NSNotFound)
+                {
+                    [filteredCellDataArray addObject:cellData];
+                    break;
+                }
+            }
+        }
+    }
+    else
+    {
+        filteredCellDataArray = nil;
+    }
+    
+    if (self.delegate)
+    {
+        [self.delegate dataSource:self didCellChange:nil];
+    }
+}
+
+- (id<MXKRoomMemberCellDataStoring>)cellDataAtIndex:(NSInteger)index
+{
+    if (filteredCellDataArray)
+    {
+        return filteredCellDataArray[index];
+    }
+    return cellDataArray[index];
+}
+
+- (CGFloat)cellHeightAtIndex:(NSInteger)index
+{
+    if (self.delegate)
+    {
+        id<MXKRoomMemberCellDataStoring> cellData = [self cellDataAtIndex:index];
+        
+        Class<MXKCellRendering> class = [self.delegate cellViewClassForCellData:cellData];
+        return [class heightForCellData:cellData withMaximumWidth:0];
+    }
+    return 0;
+}
+
+#pragma mark - Members processing
+
+- (void)loadData
+{
+    NSArray* membersList = [mxRoomState.members membersWithoutConferenceUser];
+    
+    if (!_settings.showLeftMembersInRoomMemberList)
+    {
+        NSMutableArray* filteredMembers = [[NSMutableArray alloc] init];
+        
+        for (MXRoomMember* member in membersList)
+        {
+            // Filter out left users
+            if (member.membership != MXMembershipLeave)
+            {
+                [filteredMembers addObject:member];
+            }
+        }
+        
+        membersList = filteredMembers;
+    }
+    
+    [cellDataArray removeAllObjects];
+    
+    // Retrieve the MXKCellData class to manage the data
+    Class class = [self cellDataClassForCellIdentifier:kMXKRoomMemberCellIdentifier];
+    NSAssert([class conformsToProtocol:@protocol(MXKRoomMemberCellDataStoring)], @"MXKRoomMemberListDataSource only manages MXKCellData that conforms to MXKRoomMemberCellDataStoring protocol");
+    
+    for (MXRoomMember *member in membersList)
+    {
+        
+        id<MXKRoomMemberCellDataStoring> cellData = [[class alloc] initWithRoomMember:member roomState:mxRoomState andRoomMemberListDataSource:self];
+        if (cellData)
+        {
+            [cellDataArray addObject:cellData];
+        }
+    }
+    
+    [self sortMembers];
+}
+
+- (void)sortMembers
+{
+    NSArray *sortedMembers = [cellDataArray sortedArrayUsingComparator:^NSComparisonResult(id<MXKRoomMemberCellDataStoring> member1, id<MXKRoomMemberCellDataStoring> member2)
+    {
+        
+        // Move banned and left members at the end of the list
+        if (member1.roomMember.membership == MXMembershipLeave || member1.roomMember.membership == MXMembershipBan)
+        {
+            if (member2.roomMember.membership != MXMembershipLeave && member2.roomMember.membership != MXMembershipBan)
+            {
+                return NSOrderedDescending;
+            }
+        }
+        else if (member2.roomMember.membership == MXMembershipLeave || member2.roomMember.membership == MXMembershipBan)
+        {
+            return NSOrderedAscending;
+        }
+        
+        // Move invited members just before left and banned members
+        if (member1.roomMember.membership == MXMembershipInvite)
+        {
+            if (member2.roomMember.membership != MXMembershipInvite)
+            {
+                return NSOrderedDescending;
+            }
+        }
+        else if (member2.roomMember.membership == MXMembershipInvite)
+        {
+            return NSOrderedAscending;
+        }
+        
+        if (self->_settings.sortRoomMembersUsingLastSeenTime)
+        {
+            // Get the users that correspond to these members
+            MXUser *user1 = [self.mxSession userWithUserId:member1.roomMember.userId];
+            MXUser *user2 = [self.mxSession userWithUserId:member2.roomMember.userId];
+            
+            // Move users who are not online or unavailable at the end (before invited users)
+            if ((user1.presence == MXPresenceOnline) || (user1.presence == MXPresenceUnavailable))
+            {
+                if ((user2.presence != MXPresenceOnline) && (user2.presence != MXPresenceUnavailable))
+                {
+                    return NSOrderedAscending;
+                }
+            }
+            else if ((user2.presence == MXPresenceOnline) || (user2.presence == MXPresenceUnavailable))
+            {
+                return NSOrderedDescending;
+            }
+            else
+            {
+                // Here both users are neither online nor unavailable (the lastActive ago is useless)
+                // We will sort them according to their display, by keeping in front the offline users
+                if (user1.presence == MXPresenceOffline)
+                {
+                    if (user2.presence != MXPresenceOffline)
+                    {
+                        return NSOrderedAscending;
+                    }
+                }
+                else if (user2.presence == MXPresenceOffline)
+                {
+                    return NSOrderedDescending;
+                }
+                return [[self->mxRoomState.members memberSortedName:member1.roomMember.userId] compare:[self->mxRoomState.members memberSortedName:member2.roomMember.userId] options:NSCaseInsensitiveSearch];
+            }
+            
+            // Consider user's lastActive ago value
+            if (user1.lastActiveAgo < user2.lastActiveAgo)
+            {
+                return NSOrderedAscending;
+            }
+            else if (user1.lastActiveAgo == user2.lastActiveAgo)
+            {
+                return [[self->mxRoomState.members memberSortedName:member1.roomMember.userId] compare:[self->mxRoomState.members memberSortedName:member2.roomMember.userId] options:NSCaseInsensitiveSearch];
+            }
+            return NSOrderedDescending;
+        }
+        else
+        {
+            // Move user without display name at the end (before invited users)
+            if (member1.roomMember.displayname.length)
+            {
+                if (!member2.roomMember.displayname.length)
+                {
+                    return NSOrderedAscending;
+                }
+            }
+            else if (member2.roomMember.displayname.length)
+            {
+                return NSOrderedDescending;
+            }
+            
+            return [[self->mxRoomState.members memberSortedName:member1.roomMember.userId] compare:[self->mxRoomState.members memberSortedName:member2.roomMember.userId] options:NSCaseInsensitiveSearch];
+        }
+    }];
+    
+    cellDataArray = [NSMutableArray arrayWithArray:sortedMembers];
+}
+
+- (void)listenMembersEvents
+{
+    // Remove the previous live listener
+    if (membersListener)
+    {
+        [self.mxSession removeListener:membersListener];
+    }
+    
+    // Register a listener for events that concern room members
+    NSArray *mxMembersEvents = @[
+                                 kMXEventTypeStringRoomMember,
+                                 kMXEventTypeStringRoomPowerLevels,
+                                 kMXEventTypeStringPresence
+                                 ];
+    membersListener = [self.mxSession listenToEventsOfTypes:mxMembersEvents onEvent:^(MXEvent *event, MXTimelineDirection direction, id customObject)
+    {
+        // consider only live event
+        if (direction == MXTimelineDirectionForwards)
+        {
+            // Check the room Id (if any)
+            if (event.roomId && [event.roomId isEqualToString:self->mxRoom.roomId] == NO)
+            {
+                // This event does not concern the current room members
+                return;
+            }
+            
+            // refresh the whole members list. TODO GFO refresh only the updated members.
+            [self loadData];
+            
+            if (self.delegate)
+            {
+                [self.delegate dataSource:self didCellChange:nil];
+            }
+        }
+    }];
+}
+
+- (void)listenTypingNotifications
+{
+    // Remove the previous live listener
+    if (self->typingNotifListener)
+    {
+        [mxRoom removeListener:self->typingNotifListener];
+    }
+
+    // Add typing notification listener
+    self->typingNotifListener = [mxRoom listenToEventsOfTypes:@[kMXEventTypeStringTypingNotification] onEvent:^(MXEvent *event, MXTimelineDirection direction, MXRoomState *roomState) {
+        // Handle only live events
+        if (direction == MXTimelineDirectionForwards)
+        {
+            // Retrieve typing users list
+            NSMutableArray *typingUsers = [NSMutableArray arrayWithArray:self->mxRoom.typingUsers];
+            // Remove typing info for the current user
+            NSUInteger index = [typingUsers indexOfObject:self.mxSession.myUser.userId];
+            if (index != NSNotFound)
+            {
+                [typingUsers removeObjectAtIndex:index];
+            }
+
+            for (id<MXKRoomMemberCellDataStoring> cellData in self->cellDataArray)
+            {
+                if ([typingUsers indexOfObject:cellData.roomMember.userId] == NSNotFound)
+                {
+                    cellData.isTyping = NO;
+                }
+                else
+                {
+                    cellData.isTyping = YES;
+                }
+            }
+
+            if (self.delegate)
+            {
+                [self.delegate dataSource:self didCellChange:nil];
+            }
+        }
+    }];
+}
+
+#pragma mark - UITableViewDataSource
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    if (filteredCellDataArray)
+    {
+        return filteredCellDataArray.count;
+    }
+    return cellDataArray.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    id<MXKRoomMemberCellDataStoring> roomData = [self cellDataAtIndex:indexPath.row];
+    
+    if (roomData && self.delegate)
+    {
+        NSString *identifier = [self.delegate cellReuseIdentifierForCellData:roomData];
+        if (identifier)
+        {
+            UITableViewCell<MXKCellRendering> *cell  = [tableView dequeueReusableCellWithIdentifier:identifier forIndexPath:indexPath];
+            
+            // Make the bubble display the data
+            [cell render:roomData];
+            
+            return cell;
+        }
+    }
+    
+    // Return a fake cell to prevent app from crashing.
+    return [[UITableViewCell alloc] init];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Search/MXKSearchCellData.h b/Riot/Modules/MatrixKit/Models/Search/MXKSearchCellData.h
new file mode 100644
index 000000000..d92c3b073
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Search/MXKSearchCellData.h
@@ -0,0 +1,25 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKCellData.h"
+#import "MXKSearchCellDataStoring.h"
+
+/**
+ `MXKSearchCellData` modelised the data for a `MXKSearchCell` cell.
+ */
+@interface MXKSearchCellData : MXKCellData <MXKSearchCellDataStoring>
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Search/MXKSearchCellData.m b/Riot/Modules/MatrixKit/Models/Search/MXKSearchCellData.m
new file mode 100644
index 000000000..246dbd87d
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Search/MXKSearchCellData.m
@@ -0,0 +1,69 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKSearchCellData.h"
+
+#import "MXKSearchDataSource.h"
+
+
+@implementation MXKSearchCellData
+@synthesize roomId, senderDisplayName;
+@synthesize searchResult, title, message, date, shouldShowRoomDisplayName, roomDisplayName, attachment, isAttachmentWithThumbnail, attachmentIcon;
+
+- (instancetype)initWithSearchResult:(MXSearchResult *)searchResult2 andSearchDataSource:(MXKSearchDataSource *)searchDataSource
+{
+    self = [super init];
+    if (self)
+    {
+        searchResult = searchResult2;
+
+        if (searchDataSource.roomEventFilter.rooms.count == 1)
+        {
+            // We are displaying a search within a room
+            // As title, display the user id
+            title = searchResult.result.sender;
+            
+            roomId = searchDataSource.roomEventFilter.rooms[0];
+        }
+        else
+        {
+            // We are displaying a search over all user's rooms
+            // As title, display the room name of this search result
+            MXRoom *room = [searchDataSource.mxSession roomWithRoomId:searchResult.result.roomId];
+            if (room)
+            {
+                title = room.summary.displayname;
+            }
+            else
+            {
+                title = searchResult.result.roomId;
+            }
+        }
+
+        date = [searchDataSource.eventFormatter dateStringFromEvent:searchResult.result withTime:YES];
+
+        // Code from [MXEventFormatter stringFromEvent] for the particular case of a text message
+        message = [searchResult.result.content[@"body"] isKindOfClass:[NSString class]] ? searchResult.result.content[@"body"] : nil;
+    }
+    return self;
+}
+
++ (void)cellDataWithSearchResult:(MXSearchResult *)searchResult andSearchDataSource:(MXKSearchDataSource *)searchDataSource onComplete:(void (^)(id<MXKSearchCellDataStoring>))onComplete
+{
+    onComplete([[self alloc] initWithSearchResult:searchResult andSearchDataSource:searchDataSource]);
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Search/MXKSearchCellDataStoring.h b/Riot/Modules/MatrixKit/Models/Search/MXKSearchCellDataStoring.h
new file mode 100644
index 000000000..b5ab3536b
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Search/MXKSearchCellDataStoring.h
@@ -0,0 +1,83 @@
+/*
+ Copyright 2015 OpenMarket 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/Foundation.h>
+#import <MatrixSDK/MatrixSDK.h>
+
+#import "MXKAttachment.h"
+
+@class MXKSearchDataSource;
+
+/**
+ `MXKSearchCellDataStoring` defines a protocol a class must conform in order to store 
+ a search result in a cell data managed by `MXKSearchDataSource`.
+ */
+@protocol MXKSearchCellDataStoring <NSObject>
+
+/**
+ The room id
+ */
+@property (nonatomic) NSString *roomId;
+
+@property (nonatomic, readonly) NSString *title;
+@property (nonatomic, readonly) NSString *message;
+@property (nonatomic, readonly) NSString *date;
+
+// Bulk result returned by MatrixSDK
+@property (nonatomic, readonly) MXSearchResult *searchResult;
+
+/**
+ Tell whether the room display name should be displayed in the cell. NO by default.
+ */
+@property (nonatomic) BOOL shouldShowRoomDisplayName;
+
+/**
+ The room display name.
+ */
+@property (nonatomic) NSString *roomDisplayName;
+
+/**
+ The sender display name.
+ */
+@property (nonatomic) NSString *senderDisplayName;
+
+/**
+ The bubble attachment (if any).
+ */
+@property (nonatomic) MXKAttachment *attachment;
+
+/**
+ YES when the bubble correspond to an attachment displayed with a thumbnail (see image, video).
+ */
+@property (nonatomic, readonly) BOOL isAttachmentWithThumbnail;
+
+/**
+ The default icon relative to the attachment (if any).
+ */
+@property (nonatomic, readonly) UIImage* attachmentIcon;
+
+
+#pragma mark - Public methods
+/**
+ Create a new `MXKCellData` object for a new search result cell.
+
+ @param searchResult Bulk result returned by MatrixSDK.
+ @param searchDataSource the `MXKSearchDataSource` object that will use this instance.
+ @param onComplete a block providing the newly created instance.
+ */
++ (void)cellDataWithSearchResult:(MXSearchResult*)searchResult andSearchDataSource:(MXKSearchDataSource*)searchDataSource onComplete:(void (^)(id<MXKSearchCellDataStoring> cellData))onComplete;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Search/MXKSearchDataSource.h b/Riot/Modules/MatrixKit/Models/Search/MXKSearchDataSource.h
new file mode 100644
index 000000000..5a89c09d1
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Search/MXKSearchDataSource.h
@@ -0,0 +1,108 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKDataSource.h"
+#import "MXKSearchCellDataStoring.h"
+
+#import "MXKEventFormatter.h"
+
+/**
+ String identifying the object used to store and prepare the cell data of a result during a message search.
+ */
+extern NSString *const kMXKSearchCellDataIdentifier;
+
+/**
+ The data source for `MXKSearchViewController` in case of message search.
+ 
+ Use the `initWithMatrixSession:` constructor to search in all user's rooms.
+ Use the `initWithRoomId:andMatrixSession: constructor to search in a specific room.
+ */
+@interface MXKSearchDataSource : MXKDataSource <UITableViewDataSource>
+{
+    @protected
+    /**
+     List of results retrieved from the server.
+     The` MXKSearchDataSource` class stores MXKSearchCellDataStoring objects in it.
+     */
+    NSMutableArray<MXKCellData*> *cellDataArray;
+}
+
+/**
+ The current search.
+ */
+@property (nonatomic, readonly) NSString *searchText;
+
+/**
+ The room events filter which is applied during the messages search.
+ */
+@property (nonatomic) MXRoomEventFilter *roomEventFilter;
+
+/**
+ Total number of results available on the server.
+ */
+@property (nonatomic, readonly) NSUInteger serverCount;
+
+/**
+ The events to display texts formatter.
+ `MXKCellData` instances can use it to format text.
+ */
+@property (nonatomic) MXKEventFormatter *eventFormatter;
+
+/**
+ Flag indicating if there are still results (in the past) to get with paginateBack.
+ */
+@property (nonatomic, readonly) BOOL canPaginate;
+
+/**
+ Tell whether the room display name should be displayed in each result cell. NO by default.
+ */
+@property (nonatomic) BOOL shouldShowRoomDisplayName;
+
+
+/**
+ Launch a message search homeserver side.
+
+ @discussion The result depends on the 'roomEventFilter' propertie.
+ 
+ @param textPattern the text to search in messages data.
+ @param force tell whether the search must be launched even if the text pattern is unchanged.
+ */
+- (void)searchMessages:(NSString*)textPattern force:(BOOL)force;
+
+/**
+ Load more results from the past.
+ */
+- (void)paginateBack;
+
+/**
+ Get the data for the cell at the given index.
+
+ @param index the index of the cell in the array
+ @return the cell data
+ */
+- (MXKCellData*)cellDataAtIndex:(NSInteger)index;
+
+/**
+ Convert the results of a homeserver search requests into cells.
+ 
+ This methods is in charge of filling `cellDataArray`.
+ 
+ @param roomEventResults the homeserver response as provided by MatrixSDK.
+ @param onComplete the block called once complete.
+ */
+- (void)convertHomeserverResultsIntoCells:(MXSearchRoomEventResults*)roomEventResults onComplete:(dispatch_block_t)onComplete;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Models/Search/MXKSearchDataSource.m b/Riot/Modules/MatrixKit/Models/Search/MXKSearchDataSource.m
new file mode 100644
index 000000000..c79dcf217
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Models/Search/MXKSearchDataSource.m
@@ -0,0 +1,275 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKSearchDataSource.h"
+
+#import "MXKSearchCellData.h"
+
+#pragma mark - Constant definitions
+NSString *const kMXKSearchCellDataIdentifier = @"kMXKSearchCellDataIdentifier";
+
+
+@interface MXKSearchDataSource ()
+{
+    /**
+     The current search request.
+     */
+    MXHTTPOperation *searchRequest;
+
+    /**
+     Token that can be used to get the next batch of results in the group, if exists.
+     */
+    NSString *nextBatch;
+}
+
+@end
+
+@implementation MXKSearchDataSource 
+
+- (instancetype)initWithMatrixSession:(MXSession *)mxSession
+{
+    self = [super initWithMatrixSession:mxSession];
+    if (self)
+    {
+        // Set default data and view classes
+        // Cell data
+        [self registerCellDataClass:MXKSearchCellData.class forCellIdentifier:kMXKSearchCellDataIdentifier];
+
+        // Set default MXEvent -> NSString formatter
+        _eventFormatter = [[MXKEventFormatter alloc] initWithMatrixSession:mxSession];
+        
+        _roomEventFilter = [[MXRoomEventFilter alloc] init];
+
+        cellDataArray = [NSMutableArray array];
+    }
+    return self;
+}
+
+- (void)destroy
+{
+    cellDataArray = nil;
+    _eventFormatter = nil;
+    
+    _roomEventFilter = nil;
+    
+    [super destroy];
+}
+
+- (void)searchMessages:(NSString*)textPattern force:(BOOL)force
+{
+    if (force || ![_searchText isEqualToString:textPattern])
+    {
+        // Reset data before making the new search
+        if (searchRequest)
+        {
+            [searchRequest cancel];
+            searchRequest = nil;
+        }
+        
+        _searchText = textPattern;
+        _serverCount = 0;
+        _canPaginate = NO;
+        nextBatch = nil;
+        
+        self.state = MXKDataSourceStatePreparing;
+        [cellDataArray removeAllObjects];
+        
+        if (textPattern.length)
+        {
+            MXLogDebug(@"[MXKSearchDataSource] searchMessages: %@", textPattern);
+            [self doSearch];
+        }
+        else
+        {
+            // Refresh table display.
+            self.state = MXKDataSourceStateReady;
+            [self.delegate dataSource:self didCellChange:nil];
+        }
+    }
+}
+
+- (void)paginateBack
+{
+    MXLogDebug(@"[MXKSearchDataSource] paginateBack");
+
+    self.state = MXKDataSourceStatePreparing;
+    [self doSearch];
+}
+
+- (MXKCellData*)cellDataAtIndex:(NSInteger)index
+{
+    MXKCellData *cellData;
+    if (index < cellDataArray.count)
+    {
+        cellData = cellDataArray[index];
+    }
+
+    return cellData;
+}
+
+- (void)convertHomeserverResultsIntoCells:(MXSearchRoomEventResults*)roomEventResults onComplete:(dispatch_block_t)onComplete
+{
+    // Retrieve the MXKCellData class to manage the data
+    // Note: MXKSearchDataSource only manages MXKCellData that conforms to MXKSearchCellDataStoring protocol
+    // see `[registerCellDataClass:forCellIdentifier:]`
+    Class class = [self cellDataClassForCellIdentifier:kMXKSearchCellDataIdentifier];
+
+    dispatch_group_t group = dispatch_group_create();
+
+    for (MXSearchResult *result in roomEventResults.results)
+    {
+        dispatch_group_enter(group);
+        [class cellDataWithSearchResult:result andSearchDataSource:self onComplete:^(__autoreleasing id<MXKSearchCellDataStoring> cellData) {
+            dispatch_group_leave(group);
+
+            if (cellData)
+            {
+                ((id<MXKSearchCellDataStoring>)cellData).shouldShowRoomDisplayName = self.shouldShowRoomDisplayName;
+
+                // Use profile information as data to display
+                MXSearchUserProfile *userProfile = result.context.profileInfo[result.result.sender];
+                cellData.senderDisplayName = userProfile.displayName;
+
+                [self->cellDataArray insertObject:cellData atIndex:0];
+            }
+        }];
+    }
+
+    dispatch_group_notify(group, dispatch_get_main_queue(), ^{
+        onComplete();
+    });
+}
+
+#pragma mark - Private methods
+
+// Update the MXKDataSource and notify the delegate
+- (void)setState:(MXKDataSourceState)newState
+{
+    state = newState;
+
+    if (self.delegate)
+    {
+        if ([self.delegate respondsToSelector:@selector(dataSource:didStateChange:)])
+        {
+            [self.delegate dataSource:self didStateChange:state];
+        }
+    }
+}
+
+- (void)doSearch
+{
+    // Handle one request at a time
+    if (searchRequest)
+    {
+        return;
+    }
+
+    NSDate *startDate = [NSDate date];
+
+    MXWeakify(self);
+    searchRequest = [self.mxSession.matrixRestClient searchMessagesWithText:_searchText roomEventFilter:_roomEventFilter beforeLimit:0 afterLimit:0 nextBatch:nextBatch success:^(MXSearchRoomEventResults *roomEventResults) {
+        MXStrongifyAndReturnIfNil(self);
+
+        MXLogDebug(@"[MXKSearchDataSource] searchMessages: %@ (%d). Done in %.3fms - Got %tu / %tu messages", self.searchText, self.roomEventFilter.containsURL, [[NSDate date] timeIntervalSinceDate:startDate] * 1000, roomEventResults.results.count, roomEventResults.count);
+
+        self->searchRequest = nil;
+        self->_serverCount = roomEventResults.count;
+        self->nextBatch = roomEventResults.nextBatch;
+        self->_canPaginate = (nil != self->nextBatch);
+
+        // Process HS response to cells data
+        MXWeakify(self);
+        [self convertHomeserverResultsIntoCells:roomEventResults onComplete:^{
+            MXStrongifyAndReturnIfNil(self);
+
+            self.state = MXKDataSourceStateReady;
+
+            // Provide changes information to the delegate
+            NSIndexSet *insertedIndexes;
+            if (roomEventResults.results.count)
+            {
+                insertedIndexes = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, roomEventResults.results.count)];
+            }
+
+            [self.delegate dataSource:self didCellChange:insertedIndexes];
+        }];
+
+    } failure:^(NSError *error) {
+        MXStrongifyAndReturnIfNil(self);
+
+        self->searchRequest = nil;
+        self.state = MXKDataSourceStateFailed;
+    }];
+}
+
+#pragma mark - Override MXKDataSource
+
+- (void)registerCellDataClass:(Class)cellDataClass forCellIdentifier:(NSString *)identifier
+{
+    if ([identifier isEqualToString:kMXKSearchCellDataIdentifier])
+    {
+        // Sanity check
+        NSAssert([cellDataClass conformsToProtocol:@protocol(MXKSearchCellDataStoring)], @"MXKSearchDataSource only manages MXKCellData that conforms to MXKSearchCellDataStoring protocol");
+    }
+    
+    [super registerCellDataClass:cellDataClass forCellIdentifier:identifier];
+}
+
+- (void)cancelAllRequests
+{
+    if (searchRequest)
+    {
+        [searchRequest cancel];
+        searchRequest = nil;
+    }
+
+    [super cancelAllRequests];
+}
+
+#pragma mark - UITableViewDataSource
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return cellDataArray.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    MXKCellData* cellData = [self cellDataAtIndex:indexPath.row];
+
+    NSString *cellIdentifier = [self.delegate cellReuseIdentifierForCellData:cellData];
+    if (cellIdentifier)
+    {
+        UITableViewCell<MXKCellRendering> *cell  = [tableView dequeueReusableCellWithIdentifier:cellIdentifier forIndexPath:indexPath];
+
+        // Make the bubble display the data
+        [cell render:cellData];
+
+        // Disable any interactions defined in the cell
+        // because we want [tableView didSelectRowAtIndexPath:] to be called
+        cell.contentView.userInteractionEnabled = NO;
+
+        // Force background color change on selection
+        cell.selectionStyle = UITableViewCellSelectionStyleDefault;
+
+        return cell;
+    }
+
+    // Return a fake cell to prevent app from crashing.
+    return [[UITableViewCell alloc] init];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorAlertPresentation.h b/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorAlertPresentation.h
new file mode 100644
index 000000000..b5fed5637
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorAlertPresentation.h
@@ -0,0 +1,26 @@
+/*
+ Copyright 2018 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 "MXKErrorPresentation.h"
+
+/**
+ `MXKErrorAlertPresentation` is a concrete implementation of `MXKErrorPresentation` using UIAlertViewController. Display error alert from a view controller.
+ */
+@interface MXKErrorAlertPresentation : NSObject<MXKErrorPresentation>
+
+@end
diff --git a/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorAlertPresentation.m b/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorAlertPresentation.m
new file mode 100644
index 000000000..c8ff3ad96
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorAlertPresentation.m
@@ -0,0 +1,108 @@
+/*
+ Copyright 2018 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 "MXKErrorAlertPresentation.h"
+
+#import "MXKErrorPresentableBuilder.h"
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKSwiftHeader.h"
+
+@interface MXKErrorAlertPresentation()
+
+@property (nonatomic, strong) MXKErrorPresentableBuilder *errorPresentableBuidler;
+
+@end
+
+#pragma mark - Implementation
+
+@implementation MXKErrorAlertPresentation
+
+#pragma mark - Setup & Teardown
+
+- (instancetype)init
+{
+    self = [super init];
+    if (self) {
+        _errorPresentableBuidler = [[MXKErrorPresentableBuilder alloc] init];
+    }
+    return self;
+}
+
+#pragma mark - MXKErrorPresentation
+
+- (void)presentErrorFromViewController:(UIViewController*)viewController
+                                 title:(NSString*)title
+                               message:(NSString*)message
+                              animated:(BOOL)animated
+                               handler:(void (^)(void))handler
+{
+    
+    UIAlertController *alert = [UIAlertController alertControllerWithTitle:title message:message preferredStyle:UIAlertControllerStyleAlert];
+    
+    [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
+                                              style:UIAlertActionStyleDefault
+                                            handler:^(UIAlertAction * _Nonnull action) {
+                                                if (handler)
+                                                {
+                                                    handler();
+                                                }
+                                            }]];
+    
+    [viewController presentViewController:alert animated:animated completion:nil];
+}
+
+- (void)presentErrorFromViewController:(UIViewController*)viewController
+                              forError:(NSError*)error
+                              animated:(BOOL)animated
+                               handler:(void (^)(void))handler
+{
+    id <MXKErrorPresentable> errorPresentable = [self.errorPresentableBuidler errorPresentableFromError:error];
+    
+    if (errorPresentable)
+    {
+        [self presentErrorFromViewController:viewController
+                         forErrorPresentable:errorPresentable
+                                    animated:animated
+                                     handler:handler];
+    }
+}
+
+- (void)presentGenericErrorFromViewController:(UIViewController*)viewController
+                                     animated:(BOOL)animated
+                                      handler:(void (^)(void))handler
+{
+    id <MXKErrorPresentable> errorPresentable = [self.errorPresentableBuidler commonErrorPresentable];
+    
+    [self presentErrorFromViewController:viewController
+                     forErrorPresentable:errorPresentable
+                                animated:animated
+                                 handler:handler];
+}
+
+- (void)presentErrorFromViewController:(UIViewController*)viewController
+                   forErrorPresentable:(id<MXKErrorPresentable>)errorPresentable
+                              animated:(BOOL)animated
+                               handler:(void (^)(void))handler
+{
+    [self presentErrorFromViewController:viewController
+                                   title:errorPresentable.title
+                                 message:errorPresentable.message
+                                animated:animated
+                                 handler:handler];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorPresentable.h b/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorPresentable.h
new file mode 100644
index 000000000..d8d69498c
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorPresentable.h
@@ -0,0 +1,29 @@
+/*
+ Copyright 2018 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.
+ */
+
+/**
+ `MXKErrorPresentable` describe an error to display on screen.
+ */
+@protocol MXKErrorPresentable
+
+@required
+
+@property (strong, nonatomic, readonly) NSString *title;
+@property (strong, nonatomic, readonly) NSString *message;
+
+- (id)initWithTitle:(NSString*)title message:(NSString*)message;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorPresentableBuilder.h b/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorPresentableBuilder.h
new file mode 100644
index 000000000..8760f7fb3
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorPresentableBuilder.h
@@ -0,0 +1,41 @@
+/*
+ Copyright 2018 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 "MXKErrorPresentable.h"
+
+/**
+ `MXKErrorPresentableBuilder` enable to create error to present on screen.
+ */
+@interface MXKErrorPresentableBuilder : NSObject
+
+/**
+ Build a displayable error from a NSError.
+ 
+ @param error an NSError.
+ @return Return nil in case of network request cancellation error otherwise return a presentable error from NSError informations.
+ */
+- (id <MXKErrorPresentable>)errorPresentableFromError:(NSError*)error;
+
+/**
+ Build a common displayable error. Generic error message to present as fallback when error explanation can't be user friendly.
+ 
+ @return Common default error.
+ */
+- (id <MXKErrorPresentable>)commonErrorPresentable;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorPresentableBuilder.m b/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorPresentableBuilder.m
new file mode 100644
index 000000000..10c1aca39
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorPresentableBuilder.m
@@ -0,0 +1,56 @@
+/*
+ Copyright 2018 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 "MXKErrorPresentableBuilder.h"
+
+#import "NSBundle+MatrixKit.h"
+#import "MXKErrorViewModel.h"
+
+#import "MXKSwiftHeader.h"
+
+@implementation MXKErrorPresentableBuilder
+
+- (id <MXKErrorPresentable>)errorPresentableFromError:(NSError*)error
+{
+    // Ignore nil error or connection cancellation error
+    if (!error || ([error.domain isEqualToString:NSURLErrorDomain] && error.code == NSURLErrorCancelled))
+    {
+        return nil;
+    }
+    
+    NSString *title = [error.userInfo valueForKey:NSLocalizedFailureReasonErrorKey];
+    NSString *message = [error.userInfo valueForKey:NSLocalizedDescriptionKey];
+    
+    if (!title)
+    {
+        title = [MatrixKitL10n error];
+    }
+    
+    if (!message)
+    {
+        message = [MatrixKitL10n errorCommonMessage];
+    }
+    
+    return  [[MXKErrorViewModel alloc] initWithTitle:title message:message];
+}
+
+- (id <MXKErrorPresentable>)commonErrorPresentable
+{
+    return  [[MXKErrorViewModel alloc] initWithTitle:[MatrixKitL10n error]
+                                             message:[MatrixKitL10n errorCommonMessage]];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorPresentation.h b/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorPresentation.h
new file mode 100644
index 000000000..03ea60974
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorPresentation.h
@@ -0,0 +1,49 @@
+/*
+ Copyright 2018 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 "MXKErrorPresentable.h"
+
+/**
+ `MXKErrorPresentation` describe an error display handler for presenting error from a view controller.
+ */
+@protocol MXKErrorPresentation
+
+- (void)presentErrorFromViewController:(UIViewController*)viewController
+                                 title:(NSString*)title
+                               message:(NSString*)message
+                              animated:(BOOL)animated
+                               handler:(void (^)(void))handler;
+
+- (void)presentErrorFromViewController:(UIViewController*)viewController
+                              forError:(NSError*)error
+                              animated:(BOOL)animated
+                               handler:(void (^)(void))handler;
+
+- (void)presentGenericErrorFromViewController:(UIViewController*)viewController
+                                     animated:(BOOL)animated
+                                      handler:(void (^)(void))handler;
+
+@required
+
+- (void)presentErrorFromViewController:(UIViewController*)viewController
+                   forErrorPresentable:(id<MXKErrorPresentable>)errorPresentable
+                              animated:(BOOL)animated
+                               handler:(void (^)(void))handler;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorViewModel.h b/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorViewModel.h
new file mode 100644
index 000000000..15aac9350
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorViewModel.h
@@ -0,0 +1,26 @@
+/*
+ Copyright 2018 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 "MXKErrorPresentable.h"
+
+/**
+ `MXKErrorViewModel` is a concrete implementation of `MXKErrorPresentable`  
+ */
+@interface MXKErrorViewModel : NSObject<MXKErrorPresentable>
+
+@end
diff --git a/Riot/Managers/Analytics/DecryptionFailure.m b/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorViewModel.m
similarity index 63%
rename from Riot/Managers/Analytics/DecryptionFailure.m
rename to Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorViewModel.m
index d43b0ec9f..18e54464e 100644
--- a/Riot/Managers/Analytics/DecryptionFailure.m
+++ b/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorViewModel.m
@@ -1,12 +1,12 @@
 /*
  Copyright 2018 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.
@@ -14,24 +14,27 @@
  limitations under the License.
  */
 
-#import "DecryptionFailure.h"
+#import "MXKErrorViewModel.h"
 
-const struct DecryptionFailureReasonStruct DecryptionFailureReason = {
-    .unspecified = @"unspecified_error",
-    .olmKeysNotSent = @"olm_keys_not_sent_error",
-    .olmIndexError = @"olm_index_error",
-    .unexpected = @"unexpected_error"
-};
+@interface MXKErrorViewModel()
 
-@implementation DecryptionFailure
+@property (strong, nonatomic) NSString *title;
+@property (strong, nonatomic) NSString *message;
 
-- (instancetype)init
+@end
+
+@implementation MXKErrorViewModel
+
+- (id)initWithTitle:(NSString*)title message:(NSString*)message
 {
     self = [super init];
+
     if (self)
     {
-        _ts = [NSDate date].timeIntervalSince1970;
+        _title = title;
+        _message = message;
     }
+
     return self;
 }
 
diff --git a/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.h b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.h
new file mode 100644
index 000000000..0df5c3a75
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.h
@@ -0,0 +1,409 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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/Foundation.h>
+
+#import <MatrixSDK/MatrixSDK.h>
+
+#import "MXKAppSettings.h"
+
+@protocol MarkdownToHTMLRendererProtocol;
+/**
+ Formatting result codes.
+ */
+typedef enum : NSUInteger {
+
+    /**
+     The formatting was successful.
+     */
+    MXKEventFormatterErrorNone = 0,
+
+    /**
+     The formatter knows the event type but it encountered data that it does not support.
+     */
+    MXKEventFormatterErrorUnsupported,
+
+    /**
+     The formatter encountered unexpected data in the event.
+     */
+    MXKEventFormatterErrorUnexpected,
+
+    /**
+     The formatter does not support the type of the passed event.
+     */
+    MXKEventFormatterErrorUnknownEventType
+
+} MXKEventFormatterError;
+
+/**
+ `MXKEventFormatter` is an utility class for formating Matrix events into strings which
+ will be displayed to the end user.
+ */
+@interface MXKEventFormatter : NSObject <MXRoomSummaryUpdating>
+{
+@protected
+    /**
+     The matrix session. Used to get contextual data.
+     */
+    MXSession *mxSession;
+    
+    /**
+     The date formatter used to build date string without time information.
+     */
+    NSDateFormatter *dateFormatter;
+    
+    /**
+     The time formatter used to build time string without date information.
+     */
+    NSDateFormatter *timeFormatter;
+    
+    /**
+     The default room summary updater from the MXSession.
+     */
+    MXRoomSummaryUpdater *defaultRoomSummaryUpdater;
+}
+
+/**
+ The settings used to handle room events.
+ 
+ By default the shared application settings are considered.
+ */
+@property (nonatomic) MXKAppSettings *settings;
+
+/**
+ Flag indicating if the formatter must build strings that will be displayed as subtitle.
+ Default is NO.
+ */
+@property (nonatomic) BOOL isForSubtitle;
+
+/**
+ Flags indicating if the formatter must create clickable links for Matrix user ids,
+ room ids, room aliases or event ids.
+ Default is NO.
+ */
+@property (nonatomic) BOOL treatMatrixUserIdAsLink;
+@property (nonatomic) BOOL treatMatrixRoomIdAsLink;
+@property (nonatomic) BOOL treatMatrixRoomAliasAsLink;
+@property (nonatomic) BOOL treatMatrixEventIdAsLink;
+@property (nonatomic) BOOL treatMatrixGroupIdAsLink;
+
+/**
+ Initialise the event formatter.
+
+ @param mxSession the Matrix to retrieve contextual data.
+ @return the newly created instance.
+ */
+- (instancetype)initWithMatrixSession:(MXSession*)mxSession;
+
+/**
+ Initialise the date and time formatters.
+ This formatter could require to be updated after updating the device settings.
+ e.g the time format switches from 24H format to AM/PM.
+ */
+- (void)initDateTimeFormatters;
+
+/**
+ The types of events allowed to be displayed in the room history.
+ No string will be returned by the formatter for the events whose the type doesn't belong to this array.
+ 
+ Default is nil. All messages types are displayed.
+ */
+@property (nonatomic) NSArray<NSString*> *eventTypesFilterForMessages;
+
+@property (nonatomic, strong) id<MarkdownToHTMLRendererProtocol> markdownToHTMLRenderer;
+
+/**
+ Checks whether the event is related to an attachment and if it is supported.
+
+ @param event an event.
+ @return YES if the provided event is related to a supported attachment type.
+ */
+- (BOOL)isSupportedAttachment:(MXEvent*)event;
+
+#pragma mark - Events to strings conversion methods
+/**
+ Compose the event sender display name according to the current room state.
+ 
+ @param event the event to format.
+ @param roomState the room state right before the event.
+ @return the sender display name
+ */
+- (NSString*)senderDisplayNameForEvent:(MXEvent*)event withRoomState:(MXRoomState*)roomState;
+
+/**
+ Compose the event target display name according to the current room state.
+
+ @discussion "target" refers to the room member who is the target of this event (if any), e.g.
+ the invitee, the person being banned, etc.
+
+ @param event the event to format.
+ @param roomState the room state right before the event.
+ @return the target display name (if any)
+ */
+- (NSString*)targetDisplayNameForEvent:(MXEvent*)event withRoomState:(MXRoomState*)roomState;
+
+/**
+ Retrieve the avatar url of the event sender from the current room state.
+ 
+ @param event the event to format.
+ @param roomState the room state right before the event.
+ @return the sender avatar url
+ */
+- (NSString*)senderAvatarUrlForEvent:(MXEvent*)event withRoomState:(MXRoomState*)roomState;
+
+/**
+ Retrieve the avatar url of the event target from the current room state.
+
+ @discussion "target" refers to the room member who is the target of this event (if any), e.g.
+ the invitee, the person being banned, etc.
+
+ @param event the event to format.
+ @param roomState the room state right before the event.
+ @return the target avatar url (if any)
+ */
+- (NSString*)targetAvatarUrlForEvent:(MXEvent*)event withRoomState:(MXRoomState*)roomState;
+
+/**
+ Generate a displayable string representating the event.
+ 
+ @param event the event to format.
+ @param roomState the room state right before the event.
+ @param error the error code. In case of formatting error, the formatter may return non nil string as a proposal.
+ @return the display text for the event.
+ */
+- (NSString*)stringFromEvent:(MXEvent*)event withRoomState:(MXRoomState*)roomState error:(MXKEventFormatterError*)error;
+
+/**
+ Generate a displayable attributed string representating the event.
+
+ @param event the event to format.
+ @param roomState the room state right before the event.
+ @param error the error code. In case of formatting error, the formatter may return non nil string as a proposal.
+ @return the attributed string for the event.
+ */
+- (NSAttributedString*)attributedStringFromEvent:(MXEvent*)event withRoomState:(MXRoomState*)roomState error:(MXKEventFormatterError*)error;
+
+/**
+ Generate a displayable attributed string representating a summary for the provided events.
+
+ @param events the series of events to format.
+ @param roomState the room state right before the first event in the series.
+ @param error the error code. In case of formatting error, the formatter may return non nil string as a proposal.
+ @return the attributed string.
+ */
+- (NSAttributedString*)attributedStringFromEvents:(NSArray<MXEvent*>*)events withRoomState:(MXRoomState*)roomState error:(MXKEventFormatterError*)error;
+
+/**
+ Render a random string into an attributed string with the font and the text color
+ that correspond to the passed event.
+
+ @param string the string to render.
+ @param event the event associated to the string.
+ @return an attributed string.
+ */
+- (NSAttributedString*)renderString:(NSString*)string forEvent:(MXEvent*)event;
+
+/**
+ Render a random html string into an attributed string with the font and the text color
+ that correspond to the passed event.
+
+ @param htmlString the HTLM string to render.
+ @param event the event associated to the string.
+ @param roomState the room state right before the event.
+ @return an attributed string.
+ */
+- (NSAttributedString*)renderHTMLString:(NSString*)htmlString forEvent:(MXEvent*)event withRoomState:(MXRoomState*)roomState;
+
+/**
+ Same as [self renderString:forEvent:] but add a prefix.
+ The prefix will be rendered with 'prefixTextFont' and 'prefixTextColor'.
+ 
+ @param string the string to render.
+ @param prefix the prefix to add.
+ @param event the event associated to the string.
+ @return an attributed string.
+ */
+- (NSAttributedString*)renderString:(NSString*)string withPrefix:(NSString*)prefix forEvent:(MXEvent*)event;
+
+#pragma mark - Conversion tools
+
+/**
+ Convert a Markdown string to HTML.
+ 
+ @param markdownString the string to convert.
+ @return an HTML formatted string.
+ */
+- (NSString*)htmlStringFromMarkdownString:(NSString*)markdownString;
+
+#pragma mark - Timestamp formatting
+
+/**
+ Generate the date in string format corresponding to the date.
+ 
+ @param date The date.
+ @param time The flag used to know if the returned string must include time information or not.
+ @return the string representation of the date.
+ */
+- (NSString*)dateStringFromDate:(NSDate *)date withTime:(BOOL)time;
+
+/**
+ Generate the date in string format corresponding to the timestamp.
+ The returned string is localised according to the current device settings.
+
+ @param timestamp The timestamp in milliseconds since Epoch.
+ @param time The flag used to know if the returned string must include time information or not.
+ @return the string representation of the date.
+ */
+- (NSString*)dateStringFromTimestamp:(uint64_t)timestamp withTime:(BOOL)time;
+
+/**
+ Generate the date in string format corresponding to the event.
+ The returned string is localised according to the current device settings.
+ 
+ @param event The event to format.
+ @param time The flag used to know if the returned string must include time information or not.
+ @return the string representation of the event date.
+ */
+- (NSString*)dateStringFromEvent:(MXEvent*)event withTime:(BOOL)time;
+
+/**
+ Generate the time string of the provided date by considered the current system time formatting.
+ 
+ @param date The date.
+ @return the string representation of the time component of the date.
+ */
+- (NSString*)timeStringFromDate:(NSDate *)date;
+
+
+# pragma mark - Customisation
+/**
+ The list of allowed HTML tags in rendered attributed strings.
+ */
+@property (nonatomic) NSArray<NSString*> *allowedHTMLTags;
+
+/**
+ A block to run on HTML `img` tags when calling `renderHTMLString:forEvent:withRoomState:`.
+ 
+ This block provides the original URL for the image and can be used to download the image locally
+ and return a local file URL for the image to attach to the rendered attributed string.
+ */
+@property (nonatomic, copy) NSURL* (^htmlImageHandler)(NSString *sourceURL, CGFloat width, CGFloat height);
+
+/**
+ The style sheet used by the 'renderHTMLString' method.
+*/
+@property (nonatomic) NSString *defaultCSS;
+
+/**
+ Default color used to display text content of event.
+ Default is [UIColor blackColor].
+ */
+@property (nonatomic) UIColor *defaultTextColor;
+
+/**
+ Default color used to display text content of event when it is displayed as subtitle (related to 'isForSubtitle' property).
+ Default is [UIColor blackColor].
+ */
+@property (nonatomic) UIColor *subTitleTextColor;
+
+/**
+ Color applied on the event description prefix used to display for example the message sender name.
+ Default is [UIColor blackColor].
+ */
+@property (nonatomic) UIColor *prefixTextColor;
+
+/**
+ Color used when the event must be bing to the end user. This happens when the event
+ matches the user's push rules.
+ Default is [UIColor blueColor].
+ */
+@property (nonatomic) UIColor *bingTextColor;
+
+/**
+ Color used to display text content of an event being encrypted.
+ Default is [UIColor lightGrayColor].
+ */
+@property (nonatomic) UIColor *encryptingTextColor;
+
+/**
+ Color used to display text content of an event being sent.
+ Default is [UIColor lightGrayColor].
+ */
+@property (nonatomic) UIColor *sendingTextColor;
+
+/**
+ Color used to display error text.
+ Default is red.
+ */
+@property (nonatomic) UIColor *errorTextColor;
+
+/**
+ Color used to display the side border of HTML blockquotes.
+ Default is a grey.
+ */
+@property (nonatomic) UIColor *htmlBlockquoteBorderColor;
+
+/**
+ Default text font used to display text content of event.
+ Default is SFUIText-Regular 14.
+ */
+@property (nonatomic) UIFont *defaultTextFont;
+
+/**
+ Font applied on the event description prefix used to display for example the message sender name.
+ Default is SFUIText-Regular 14.
+ */
+@property (nonatomic) UIFont *prefixTextFont;
+
+/**
+ Text font used when the event must be bing to the end user. This happens when the event
+ matches the user's push rules.
+ Default is SFUIText-Regular 14.
+ */
+@property (nonatomic) UIFont *bingTextFont;
+
+/**
+ Text font used when the event is a state event.
+ Default is italic SFUIText-Regular 14.
+ */
+@property (nonatomic) UIFont *stateEventTextFont;
+
+/**
+ Text font used to display call notices (invite, answer, hangup).
+ Default is SFUIText-Regular 14.
+ */
+@property (nonatomic) UIFont *callNoticesTextFont;
+
+/**
+ Text font used to display encrypted messages.
+ Default is SFUIText-Regular 14.
+ */
+@property (nonatomic) UIFont *encryptedMessagesTextFont;
+
+/**
+ Text font used to display message containing a single emoji.
+ Default is nil (same font as self.emojiOnlyTextFont).
+ */
+@property (nonatomic) UIFont *singleEmojiTextFont;
+
+/**
+ Text font used to display message containing only emojis.
+ Default is nil (same font as self.defaultTextFont).
+ */
+@property (nonatomic) UIFont *emojiOnlyTextFont;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
new file mode 100644
index 000000000..9177cc5be
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
@@ -0,0 +1,2219 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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 "MXKEventFormatter.h"
+
+@import MatrixSDK;
+@import DTCoreText;
+
+#import "MXEvent+MatrixKit.h"
+#import "NSBundle+MatrixKit.h"
+#import "MXKSwiftHeader.h"
+#import "MXKTools.h"
+#import "MXRoom+Sync.h"
+
+#import "MXKRoomNameStringLocalizer.h"
+
+static NSString *const kHTMLATagRegexPattern = @"<a href=\"(.*?)\">([^<]*)</a>";
+
+@interface MXKEventFormatter ()
+{
+    /**
+     The default CSS converted in DTCoreText object.
+     */
+    DTCSSStylesheet *dtCSS;
+
+    /**
+     Links detector in strings.
+     */
+    NSDataDetector *linkDetector;
+}
+@end
+
+@implementation MXKEventFormatter
+
+- (instancetype)initWithMatrixSession:(MXSession *)matrixSession
+{
+    self = [super init];
+    if (self)
+    {
+        mxSession = matrixSession;
+
+        [self initDateTimeFormatters];
+
+        // Use the same list as matrix-react-sdk ( https://github.com/matrix-org/matrix-react-sdk/blob/24223ae2b69debb33fa22fcda5aeba6fa93c93eb/src/HtmlUtils.js#L25 )
+        _allowedHTMLTags = @[
+                             @"font", // custom to matrix for IRC-style font coloring
+                             @"del", // for markdown
+                             @"body", // added internally by DTCoreText
+                             @"mx-reply",
+                             @"h1", @"h2", @"h3", @"h4", @"h5", @"h6", @"blockquote", @"p", @"a", @"ul", @"ol",
+                             @"nl", @"li", @"b", @"i", @"u", @"strong", @"em", @"strike", @"code", @"hr", @"br", @"div",
+                             @"table", @"thead", @"caption", @"tbody", @"tr", @"th", @"td", @"pre"
+                             ];
+
+        self.defaultCSS = @" \
+            pre,code { \
+                background-color: #eeeeee; \
+                display: inline; \
+                font-family: monospace; \
+                white-space: pre; \
+                -coretext-fontname: Menlo-Regular; \
+                font-size: small; \
+            } \
+            h1,h2 { \
+                font-size: 1.2em; \
+            }"; // match the size of h1/h2 to h3 to stop people shouting.
+
+        // Set default colors
+        _defaultTextColor = [UIColor blackColor];
+        _subTitleTextColor = [UIColor blackColor];
+        _prefixTextColor = [UIColor blackColor];
+        _bingTextColor = [UIColor blueColor];
+        _encryptingTextColor = [UIColor lightGrayColor];
+        _sendingTextColor = [UIColor lightGrayColor];
+        _errorTextColor = [UIColor redColor];
+        _htmlBlockquoteBorderColor = [MXKTools colorWithRGBValue:0xDDDDDD];
+        
+        _defaultTextFont = [UIFont systemFontOfSize:14];
+        _prefixTextFont = [UIFont systemFontOfSize:14];
+        _bingTextFont = [UIFont systemFontOfSize:14];
+        _stateEventTextFont = [UIFont italicSystemFontOfSize:14];
+        _callNoticesTextFont = [UIFont italicSystemFontOfSize:14];
+        _encryptedMessagesTextFont = [UIFont italicSystemFontOfSize:14];
+        
+        _eventTypesFilterForMessages = nil;
+
+        // Consider the shared app settings by default
+        _settings = [MXKAppSettings standardAppSettings];
+
+        defaultRoomSummaryUpdater = [MXRoomSummaryUpdater roomSummaryUpdaterForSession:matrixSession];
+        defaultRoomSummaryUpdater.lastMessageEventTypesAllowList = MXKAppSettings.standardAppSettings.lastMessageEventTypesAllowList;
+        defaultRoomSummaryUpdater.ignoreRedactedEvent = !_settings.showRedactionsInRoomHistory;
+        defaultRoomSummaryUpdater.roomNameStringLocalizer = [MXKRoomNameStringLocalizer new];
+
+        linkDetector = [NSDataDetector dataDetectorWithTypes:NSTextCheckingTypeLink error:nil];
+        
+        _markdownToHTMLRenderer = [MarkdownToHTMLRendererHardBreaks new];
+    }
+    return self;
+}
+
+- (void)initDateTimeFormatters
+{
+    // Prepare internal date formatter
+    dateFormatter = [[NSDateFormatter alloc] init];
+    [dateFormatter setLocale:[[NSLocale alloc] initWithLocaleIdentifier:[[[NSBundle mainBundle] preferredLocalizations] objectAtIndex:0]]];
+    [dateFormatter setFormatterBehavior:NSDateFormatterBehavior10_4];
+    // Set default date format
+    [dateFormatter setDateFormat:@"MMM dd"];
+    
+    // Create a time formatter to get time string by considered the current system time formatting.
+    timeFormatter = [[NSDateFormatter alloc] init];
+    [timeFormatter setDateStyle:NSDateFormatterNoStyle];
+    [timeFormatter setTimeStyle:NSDateFormatterShortStyle];
+}
+
+#pragma mark - Event formatter settings
+
+// Checks whether the event is related to an attachment and if it is supported
+- (BOOL)isSupportedAttachment:(MXEvent*)event
+{
+    BOOL isSupportedAttachment = NO;
+    
+    if (event.eventType == MXEventTypeRoomMessage)
+    {
+        NSString *msgtype;
+        MXJSONModelSetString(msgtype, event.content[@"msgtype"]);
+        
+        NSString *urlField;
+        NSDictionary *fileField;
+        MXJSONModelSetString(urlField, event.content[@"url"]);
+        MXJSONModelSetDictionary(fileField, event.content[@"file"]);
+        
+        BOOL hasUrl = urlField.length;
+        BOOL hasFile = NO;
+        
+        if (fileField)
+        {
+            NSString *fileUrlField;
+            MXJSONModelSetString(fileUrlField, fileField[@"url"]);
+            NSString *fileIvField;
+            MXJSONModelSetString(fileIvField, fileField[@"iv"]);
+            NSDictionary *fileHashesField;
+            MXJSONModelSetDictionary(fileHashesField, fileField[@"hashes"]);
+            NSDictionary *fileKeyField;
+            MXJSONModelSetDictionary(fileKeyField, fileField[@"key"]);
+            
+            hasFile = fileUrlField.length && fileIvField.length && fileHashesField && fileKeyField;
+        }
+        
+        if ([msgtype isEqualToString:kMXMessageTypeImage])
+        {
+            isSupportedAttachment = hasUrl || hasFile;
+        }
+        else if ([msgtype isEqualToString:kMXMessageTypeAudio])
+        {
+            isSupportedAttachment = hasUrl || hasFile;
+        }
+        else if ([msgtype isEqualToString:kMXMessageTypeVideo])
+        {
+            isSupportedAttachment = hasUrl || hasFile;
+        }
+        else if ([msgtype isEqualToString:kMXMessageTypeLocation])
+        {
+            // Not supported yet
+        }
+        else if ([msgtype isEqualToString:kMXMessageTypeFile])
+        {
+            isSupportedAttachment = hasUrl || hasFile;
+        }
+    }
+    else if (event.eventType == MXEventTypeSticker)
+    {
+        NSString *urlField;
+        NSDictionary *fileField;
+        MXJSONModelSetString(urlField, event.content[@"url"]);
+        MXJSONModelSetDictionary(fileField, event.content[@"file"]);
+        
+        BOOL hasUrl = urlField.length;
+        BOOL hasFile = NO;
+        
+        // @TODO: Check whether the encrypted sticker uses the same `file dict than other media
+        if (fileField)
+        {
+            NSString *fileUrlField;
+            MXJSONModelSetString(fileUrlField, fileField[@"url"]);
+            NSString *fileIvField;
+            MXJSONModelSetString(fileIvField, fileField[@"iv"]);
+            NSDictionary *fileHashesField;
+            MXJSONModelSetDictionary(fileHashesField, fileField[@"hashes"]);
+            NSDictionary *fileKeyField;
+            MXJSONModelSetDictionary(fileKeyField, fileField[@"key"]);
+            
+            hasFile = fileUrlField.length && fileIvField.length && fileHashesField && fileKeyField;
+        }
+        
+        isSupportedAttachment = hasUrl || hasFile;
+    }
+    return isSupportedAttachment;
+}
+
+
+#pragma mark event sender/target info
+
+- (NSString*)senderDisplayNameForEvent:(MXEvent*)event withRoomState:(MXRoomState*)roomState
+{
+    // Check whether the sender name is updated by the current event. This happens in case of a
+    // newly joined member. Otherwise, fall back to the current display name defined in the provided
+    // room state (note: this room state is supposed to not take the new event into account).
+    return [self userDisplayNameFromContentInEvent:event withMembershipFilter:@"join"] ?: [roomState.members memberName:event.sender];
+}
+
+- (NSString*)targetDisplayNameForEvent:(MXEvent*)event withRoomState:(MXRoomState*)roomState
+{
+    if (![event.type isEqualToString:kMXEventTypeStringRoomMember])
+    {
+        return nil; // Non-membership events don't have a target
+    }
+    return [self userDisplayNameFromContentInEvent:event withMembershipFilter:nil] ?: [roomState.members memberName:event.stateKey];
+}
+
+- (NSString*)userDisplayNameFromContentInEvent:(MXEvent*)event withMembershipFilter:(NSString *)filter
+{
+    NSString* membership;
+    MXJSONModelSetString(membership, event.content[@"membership"]);
+    NSString* displayname;
+    MXJSONModelSetString(displayname, event.content[@"displayname"]);
+    
+    if (membership && (!filter || [membership isEqualToString:filter]) && [displayname length])
+    {
+        return displayname;
+    }
+
+    return nil;
+}
+
+- (NSString*)senderAvatarUrlForEvent:(MXEvent*)event withRoomState:(MXRoomState*)roomState
+{
+    // Check whether the avatar URL is updated by the current event. This happens in case of a
+    // newly joined member. Otherwise, fall back to the avatar URL defined in the provided room
+    // state (note: this room state is supposed to not take the new event into account).
+    NSString *avatarUrl = [self userAvatarUrlFromContentInEvent:event withMembershipFilter:@"join"] ?: [roomState.members memberWithUserId:event.sender].avatarUrl;
+    
+    // Handle here the case where no avatar is defined
+    return avatarUrl ?: [self fallbackAvatarUrlForUserId:event.sender];
+}
+
+- (NSString*)targetAvatarUrlForEvent:(MXEvent*)event withRoomState:(MXRoomState*)roomState
+{
+    if (![event.type isEqualToString:kMXEventTypeStringRoomMember])
+    {
+        return nil; // Non-membership events don't have a target
+    }
+    NSString *avatarUrl = [self userAvatarUrlFromContentInEvent:event withMembershipFilter:nil] ?: [roomState.members memberWithUserId:event.stateKey].avatarUrl;
+    return avatarUrl ?: [self fallbackAvatarUrlForUserId:event.stateKey];
+}
+
+- (NSString*)userAvatarUrlFromContentInEvent:(MXEvent*)event withMembershipFilter:(NSString *)filter
+{
+    NSString* membership;
+    MXJSONModelSetString(membership, event.content[@"membership"]);
+    NSString* avatarUrl;
+    MXJSONModelSetString(avatarUrl, event.content[@"avatar_url"]);
+    
+    if (membership && (!filter || [membership isEqualToString:filter]) && [avatarUrl length])
+    {
+        // We ignore non mxc avatar url
+        if ([avatarUrl hasPrefix:kMXContentUriScheme])
+        {
+            return avatarUrl;
+        }
+    }
+    
+    return nil;
+}
+
+- (NSString*)fallbackAvatarUrlForUserId:(NSString*)userId {
+    if ([MXSDKOptions sharedInstance].disableIdenticonUseForUserAvatar)
+    {
+        return nil;
+    }
+    return [mxSession.mediaManager urlOfIdenticon:userId];
+}
+
+
+#pragma mark - Events to strings conversion methods
+- (NSString*)stringFromEvent:(MXEvent*)event withRoomState:(MXRoomState*)roomState error:(MXKEventFormatterError*)error
+{
+    NSString *stringFromEvent;
+    NSAttributedString *attributedStringFromEvent = [self attributedStringFromEvent:event withRoomState:roomState error:error];
+    if (*error == MXKEventFormatterErrorNone)
+    {
+        stringFromEvent = attributedStringFromEvent.string;
+    }
+
+    return stringFromEvent;
+}
+
+- (NSAttributedString *)attributedStringFromEvent:(MXEvent *)event withRoomState:(MXRoomState *)roomState error:(MXKEventFormatterError *)error
+{
+    // Check we can output the error
+    NSParameterAssert(error);
+    
+    *error = MXKEventFormatterErrorNone;
+    
+    // Filter the events according to their type.
+    if (_eventTypesFilterForMessages && ([_eventTypesFilterForMessages indexOfObject:event.type] == NSNotFound))
+    {
+        // Ignore this event
+        return nil;
+    }
+    
+    BOOL isEventSenderMyUser = [event.sender isEqualToString:mxSession.myUserId];
+    
+    // Check first whether the event has been redacted
+    NSString *redactedInfo = nil;
+    BOOL isRedacted = (event.redactedBecause != nil);
+    if (isRedacted)
+    {
+        // Check whether redacted information is required
+        if (_settings.showRedactionsInRoomHistory)
+        {
+            MXLogDebug(@"[MXKEventFormatter] Redacted event %@ (%@)", event.description, event.redactedBecause);
+            
+            NSString *redactorId = event.redactedBecause[@"sender"];
+            NSString *redactedBy = @"";
+            // Consider live room state to resolve redactor name if no roomState is provided
+            MXRoomState *aRoomState = roomState ? roomState : [mxSession roomWithRoomId:event.roomId].dangerousSyncState;
+            redactedBy = [aRoomState.members memberName:redactorId];
+            
+            NSString *redactedReason = (event.redactedBecause[@"content"])[@"reason"];
+            if (redactedReason.length)
+            {
+                if ([redactorId isEqualToString:mxSession.myUserId])
+                {
+                    redactedBy = [NSString stringWithFormat:@"%@%@", [MatrixKitL10n noticeEventRedactedByYou], [MatrixKitL10n noticeEventRedactedReason:redactedReason]];
+                }
+                else if (redactedBy.length)
+                {
+                    redactedBy = [NSString stringWithFormat:@"%@%@", [MatrixKitL10n noticeEventRedactedBy:redactedBy], [MatrixKitL10n noticeEventRedactedReason:redactedReason]];
+                }
+                else
+                {
+                    redactedBy = [MatrixKitL10n noticeEventRedactedReason:redactedReason];
+                }
+            }
+            else if ([redactorId isEqualToString:mxSession.myUserId])
+            {
+                redactedBy = [MatrixKitL10n noticeEventRedactedByYou];
+            }
+            else if (redactedBy.length)
+            {
+                redactedBy = [MatrixKitL10n noticeEventRedactedBy:redactedBy];
+            }
+            
+            redactedInfo = [MatrixKitL10n noticeEventRedacted:redactedBy];
+        }
+    }
+    
+    // Prepare returned description
+    NSString *displayText = nil;
+    NSAttributedString *attributedDisplayText = nil;
+    BOOL isRoomDirect = [mxSession roomWithRoomId:event.roomId].isDirect;
+
+    // Prepare the display name of the sender
+    NSString *senderDisplayName;
+    senderDisplayName = roomState ? [self senderDisplayNameForEvent:event withRoomState:roomState] : event.sender;
+    
+    switch (event.eventType)
+    {
+        case MXEventTypeRoomName:
+        {
+            NSString *roomName;
+            MXJSONModelSetString(roomName, event.content[@"name"]);
+            
+            if (isRedacted)
+            {
+                if (!redactedInfo)
+                {
+                    // Here the event is ignored (no display)
+                    return nil;
+                }
+                roomName = redactedInfo;
+            }
+            
+            if (roomName.length)
+            {
+                if (isEventSenderMyUser)
+                {
+                    if (isRoomDirect)
+                    {
+                        displayText = [MatrixKitL10n noticeRoomNameChangedByYouForDm:roomName];
+                    }
+                    else
+                    {
+                        displayText = [MatrixKitL10n noticeRoomNameChangedByYou:roomName];
+                    }
+                }
+                else
+                {
+                    if (isRoomDirect)
+                    {
+                        displayText = [MatrixKitL10n noticeRoomNameChangedForDm:senderDisplayName :roomName];
+                    }
+                    else
+                    {
+                        displayText = [MatrixKitL10n noticeRoomNameChanged:senderDisplayName :roomName];
+                    }
+                }
+            }
+            else
+            {
+                if (isEventSenderMyUser)
+                {
+                    if (isRoomDirect)
+                    {
+                        displayText = [MatrixKitL10n noticeRoomNameRemovedByYouForDm];
+                    }
+                    else
+                    {
+                        displayText = [MatrixKitL10n noticeRoomNameRemovedByYou];
+                    }
+                }
+                else
+                {
+                    if (isRoomDirect)
+                    {
+                        displayText = [MatrixKitL10n noticeRoomNameRemovedForDm:senderDisplayName];
+                    }
+                    else
+                    {
+                        displayText = [MatrixKitL10n noticeRoomNameRemoved:senderDisplayName];
+                    }
+                }
+            }
+            break;
+        }
+        case MXEventTypeRoomTopic:
+        {
+            NSString *roomTopic;
+            MXJSONModelSetString(roomTopic, event.content[@"topic"]);
+            
+            if (isRedacted)
+            {
+                if (!redactedInfo)
+                {
+                    // Here the event is ignored (no display)
+                    return nil;
+                }
+                roomTopic = redactedInfo;
+            }
+            
+            if (roomTopic.length)
+            {
+                if (isEventSenderMyUser)
+                {
+                    displayText = [MatrixKitL10n noticeTopicChangedByYou:roomTopic];
+                }
+                else
+                {
+                    displayText = [MatrixKitL10n noticeTopicChanged:senderDisplayName :roomTopic];
+                }
+            }
+            else
+            {
+                if (isEventSenderMyUser)
+                {
+                    displayText = [MatrixKitL10n noticeRoomTopicRemovedByYou];
+                }
+                else
+                {
+                    displayText = [MatrixKitL10n noticeRoomTopicRemoved:senderDisplayName];
+                }
+            }
+            
+            break;
+        }
+        case MXEventTypeRoomMember:
+        {
+            // Presently only change on membership, display name and avatar are supported
+            
+            // Check whether the sender has updated his profile
+            if (event.isUserProfileChange)
+            {
+                // Is redacted event?
+                if (isRedacted)
+                {
+                    if (!redactedInfo)
+                    {
+                        // Here the event is ignored (no display)
+                        return nil;
+                    }
+                    if (isEventSenderMyUser)
+                    {
+                        displayText = [MatrixKitL10n noticeProfileChangeRedactedByYou:redactedInfo];
+                    }
+                    else
+                    {
+                        displayText = [MatrixKitL10n noticeProfileChangeRedacted:senderDisplayName :redactedInfo];
+                    }
+                }
+                else
+                {
+                    // Check whether the display name has been changed
+                    NSString *displayname;
+                    MXJSONModelSetString(displayname, event.content[@"displayname"]);
+                    NSString *prevDisplayname;
+                    MXJSONModelSetString(prevDisplayname, event.prevContent[@"displayname"]);
+                    
+                    if (!displayname.length)
+                    {
+                        displayname = nil;
+                    }
+                    if (!prevDisplayname.length)
+                    {
+                        prevDisplayname = nil;
+                    }
+                    if ((displayname || prevDisplayname) && ([displayname isEqualToString:prevDisplayname] == NO))
+                    {
+                        if (!prevDisplayname)
+                        {
+                            if (isEventSenderMyUser)
+                            {
+                                displayText = [MatrixKitL10n noticeDisplayNameSetByYou:displayname];
+                            }
+                            else
+                            {
+                                displayText = [MatrixKitL10n noticeDisplayNameSet:event.sender :displayname];
+                            }
+                        }
+                        else if (!displayname)
+                        {
+                            if (isEventSenderMyUser)
+                            {
+                                displayText = [MatrixKitL10n noticeDisplayNameRemovedByYou];
+                            }
+                            else
+                            {
+                                displayText = [MatrixKitL10n noticeDisplayNameRemoved:event.sender];
+                            }
+                        }
+                        else
+                        {
+                            if (isEventSenderMyUser)
+                            {
+                                displayText = [MatrixKitL10n noticeDisplayNameChangedFromByYou:prevDisplayname :displayname];
+                            }
+                            else
+                            {
+                                displayText = [MatrixKitL10n noticeDisplayNameChangedFrom:event.sender :prevDisplayname :displayname];
+                            }
+                        }
+                    }
+                    
+                    // Check whether the avatar has been changed
+                    NSString *avatar;
+                    MXJSONModelSetString(avatar, event.content[@"avatar_url"]);
+                    NSString *prevAvatar;
+                    MXJSONModelSetString(prevAvatar, event.prevContent[@"avatar_url"]);
+                    
+                    if (!avatar.length)
+                    {
+                        avatar = nil;
+                    }
+                    if (!prevAvatar.length)
+                    {
+                        prevAvatar = nil;
+                    }
+                    if ((prevAvatar || avatar) && ([avatar isEqualToString:prevAvatar] == NO))
+                    {
+                        if (displayText)
+                        {
+                            displayText = [NSString stringWithFormat:@"%@ %@", displayText, [MatrixKitL10n noticeAvatarChangedToo]];
+                        }
+                        else
+                        {
+                            if (isEventSenderMyUser)
+                            {
+                                displayText = [MatrixKitL10n noticeAvatarUrlChangedByYou];
+                            }
+                            else
+                            {
+                                displayText = [MatrixKitL10n noticeAvatarUrlChanged:senderDisplayName];
+                            }
+                        }
+                    }
+                }
+            }
+            else
+            {
+                // Retrieve membership
+                NSString* membership;
+                MXJSONModelSetString(membership, event.content[@"membership"]);
+                
+                // Prepare targeted member display name
+                NSString *targetDisplayName = event.stateKey;
+                
+                // Retrieve content displayname
+                NSString *contentDisplayname;
+                MXJSONModelSetString(contentDisplayname, event.content[@"displayname"]);
+                NSString *prevContentDisplayname;
+                MXJSONModelSetString(prevContentDisplayname, event.prevContent[@"displayname"]);
+                
+                // Consider here a membership change
+                if ([membership isEqualToString:@"invite"])
+                {
+                    if (event.content[@"third_party_invite"])
+                    {
+                        if ([event.stateKey isEqualToString:mxSession.myUserId])
+                        {
+                            displayText = [MatrixKitL10n noticeRoomThirdPartyRegisteredInviteByYou:event.content[@"third_party_invite"][@"display_name"]];
+                        }
+                        else
+                        {
+                            displayText = [MatrixKitL10n noticeRoomThirdPartyRegisteredInvite:targetDisplayName :event.content[@"third_party_invite"][@"display_name"]];
+                        }
+                    }
+                    else
+                    {
+                        if ([MXCallManager isConferenceUser:event.stateKey])
+                        {
+                            if (isEventSenderMyUser)
+                            {
+                                displayText = [MatrixKitL10n noticeConferenceCallRequestByYou];
+                            }
+                            else
+                            {
+                                displayText = [MatrixKitL10n noticeConferenceCallRequest:senderDisplayName];
+                            }
+                        }
+                        else
+                        {
+                            // The targeted member display name (if any) is available in content
+                            if (isEventSenderMyUser)
+                            {
+                                displayText = [MatrixKitL10n noticeRoomInviteByYou:targetDisplayName];
+                            }
+                            else if ([targetDisplayName isEqualToString:mxSession.myUserId])
+                            {
+                                displayText = [MatrixKitL10n noticeRoomInviteYou:senderDisplayName];
+                            }
+                            else
+                            {
+                                if (contentDisplayname.length)
+                                {
+                                    targetDisplayName = contentDisplayname;
+                                }
+                                
+                                displayText = [MatrixKitL10n noticeRoomInvite:senderDisplayName :targetDisplayName];
+                            }
+                        }
+                    }
+                }
+                else if ([membership isEqualToString:@"join"])
+                {
+                    if ([MXCallManager isConferenceUser:event.stateKey])
+                    {
+                        displayText = [MatrixKitL10n noticeConferenceCallStarted];
+                    }
+                    else
+                    {
+                        // The targeted member display name (if any) is available in content
+                        if (isEventSenderMyUser)
+                        {
+                            displayText = [MatrixKitL10n noticeRoomJoinByYou];
+                        }
+                        else
+                        {
+                            if (contentDisplayname.length)
+                            {
+                                targetDisplayName = contentDisplayname;
+                            }
+                            
+                            displayText = [MatrixKitL10n noticeRoomJoin:targetDisplayName];
+                        }
+                    }
+                }
+                else if ([membership isEqualToString:@"leave"])
+                {
+                    NSString *prevMembership = nil;
+                    if (event.prevContent)
+                    {
+                        MXJSONModelSetString(prevMembership, event.prevContent[@"membership"]);
+                    }
+                    
+                    // The targeted member display name (if any) is available in prevContent
+                    if (prevContentDisplayname.length)
+                    {
+                        targetDisplayName = prevContentDisplayname;
+                    }
+                    
+                    if ([event.sender isEqualToString:event.stateKey])
+                    {
+                        if ([MXCallManager isConferenceUser:event.stateKey])
+                        {
+                            displayText = [MatrixKitL10n noticeConferenceCallFinished];
+                        }
+                        else
+                        {
+                            if (prevMembership && [prevMembership isEqualToString:@"invite"])
+                            {
+                                if (isEventSenderMyUser)
+                                {
+                                    displayText = [MatrixKitL10n noticeRoomRejectByYou];
+                                }
+                                else
+                                {
+                                    displayText = [MatrixKitL10n noticeRoomReject:targetDisplayName];
+                                }
+                            }
+                            else
+                            {
+                                if (isEventSenderMyUser)
+                                {
+                                    displayText = [MatrixKitL10n noticeRoomLeaveByYou];
+                                }
+                                else
+                                {
+                                    displayText = [MatrixKitL10n noticeRoomLeave:targetDisplayName];
+                                }
+                            }
+                        }
+                    }
+                    else if (prevMembership)
+                    {
+                        if ([prevMembership isEqualToString:@"invite"])
+                        {
+                            if (isEventSenderMyUser)
+                            {
+                                displayText = [MatrixKitL10n noticeRoomWithdrawByYou:targetDisplayName];
+                            }
+                            else
+                            {
+                                displayText = [MatrixKitL10n noticeRoomWithdraw:senderDisplayName :targetDisplayName];
+                            }
+                            if (event.content[@"reason"])
+                            {
+                                displayText = [displayText stringByAppendingString:[MatrixKitL10n noticeRoomReason:event.content[@"reason"]]];
+                            }
+
+                        }
+                        else if ([prevMembership isEqualToString:@"join"])
+                        {
+                            if (isEventSenderMyUser)
+                            {
+                                displayText = [MatrixKitL10n noticeRoomKickByYou:targetDisplayName];
+                            }
+                            else
+                            {
+                                displayText = [MatrixKitL10n noticeRoomKick:senderDisplayName :targetDisplayName];
+                            }
+                            
+                            //  add reason if exists
+                            if (event.content[@"reason"])
+                            {
+                                displayText = [displayText stringByAppendingString:[MatrixKitL10n noticeRoomReason:event.content[@"reason"]]];
+                            }
+                        }
+                        else if ([prevMembership isEqualToString:@"ban"])
+                        {
+                            if (isEventSenderMyUser)
+                            {
+                                displayText = [MatrixKitL10n noticeRoomUnbanByYou:targetDisplayName];
+                            }
+                            else
+                            {
+                                displayText = [MatrixKitL10n noticeRoomUnban:senderDisplayName :targetDisplayName];
+                            }
+                        }
+                    }
+                }
+                else if ([membership isEqualToString:@"ban"])
+                {
+                    // The targeted member display name (if any) is available in prevContent
+                    if (prevContentDisplayname.length)
+                    {
+                        targetDisplayName = prevContentDisplayname;
+                    }
+                    
+                    if (isEventSenderMyUser)
+                    {
+                        displayText = [MatrixKitL10n noticeRoomBanByYou:targetDisplayName];
+                    }
+                    else
+                    {
+                        displayText = [MatrixKitL10n noticeRoomBan:senderDisplayName :targetDisplayName];
+                    }
+                    if (event.content[@"reason"])
+                    {
+                        displayText = [displayText stringByAppendingString:[MatrixKitL10n noticeRoomReason:event.content[@"reason"]]];
+                    }
+                }
+                
+                // Append redacted info if any
+                if (redactedInfo)
+                {
+                    displayText = [NSString stringWithFormat:@"%@ %@", displayText, redactedInfo];
+                }
+            }
+            
+            if (!displayText)
+            {
+                *error = MXKEventFormatterErrorUnexpected;
+            }
+            break;
+        }
+        case MXEventTypeRoomCreate:
+        {
+            NSString *creatorId;
+            MXJSONModelSetString(creatorId, event.content[@"creator"]);
+            
+            if (creatorId)
+            {
+                if ([creatorId isEqualToString:mxSession.myUserId])
+                {
+                    if (isRoomDirect)
+                    {
+                        displayText = [MatrixKitL10n noticeRoomCreatedByYouForDm];
+                    }
+                    else
+                    {
+                        displayText = [MatrixKitL10n noticeRoomCreatedByYou];
+                    }
+                }
+                else
+                {
+                    if (isRoomDirect)
+                    {
+                        displayText = [MatrixKitL10n noticeRoomCreatedForDm:(roomState ? [roomState.members memberName:creatorId] : creatorId)];
+                    }
+                    else
+                    {
+                        displayText = [MatrixKitL10n noticeRoomCreated:(roomState ? [roomState.members memberName:creatorId] : creatorId)];
+                    }
+                }
+                // Append redacted info if any
+                if (redactedInfo)
+                {
+                    displayText = [NSString stringWithFormat:@"%@ %@", displayText, redactedInfo];
+                }
+            }
+            break;
+        }
+        case MXEventTypeRoomJoinRules:
+        {
+            NSString *joinRule;
+            MXJSONModelSetString(joinRule, event.content[@"join_rule"]);
+            
+            if (joinRule)
+            {
+                if ([event.sender isEqualToString:mxSession.myUserId])
+                {
+                    if ([joinRule isEqualToString:kMXRoomJoinRulePublic])
+                    {
+                        if (isRoomDirect)
+                        {
+                            displayText = [MatrixKitL10n noticeRoomJoinRulePublicByYouForDm];
+                        }
+                        else
+                        {
+                            displayText = [MatrixKitL10n noticeRoomJoinRulePublicByYou];
+                        }
+                    }
+                    else if ([joinRule isEqualToString:kMXRoomJoinRuleInvite])
+                    {
+                        if (isRoomDirect)
+                        {
+                            displayText = [MatrixKitL10n noticeRoomJoinRuleInviteByYouForDm];
+                        }
+                        else
+                        {
+                            displayText = [MatrixKitL10n noticeRoomJoinRuleInviteByYou];
+                        }
+                    }
+                }
+                else
+                {
+                    NSString *displayName = roomState ? [roomState.members memberName:event.sender] : event.sender;
+                    if ([joinRule isEqualToString:kMXRoomJoinRulePublic])
+                    {
+                        if (isRoomDirect)
+                        {
+                            displayText = [MatrixKitL10n noticeRoomJoinRulePublicForDm:displayName];
+                        }
+                        else
+                        {
+                            displayText = [MatrixKitL10n noticeRoomJoinRulePublic:displayName];
+                        }
+                    }
+                    else if ([joinRule isEqualToString:kMXRoomJoinRuleInvite])
+                    {
+                        if (isRoomDirect)
+                        {
+                            displayText = [MatrixKitL10n noticeRoomJoinRuleInviteForDm:displayName];
+                        }
+                        else
+                        {
+                            displayText = [MatrixKitL10n noticeRoomJoinRuleInvite:displayName];
+                        }
+                    }
+                }
+                
+                if (!displayText)
+                {
+                    //  use old string for non-handled cases: "knock" and "private"
+                    displayText = [MatrixKitL10n noticeRoomJoinRule:joinRule];
+                }
+                
+                // Append redacted info if any
+                if (redactedInfo)
+                {
+                    displayText = [NSString stringWithFormat:@"%@ %@", displayText, redactedInfo];
+                }
+            }
+            break;
+        }
+        case MXEventTypeRoomPowerLevels:
+        {
+            if (isRoomDirect)
+            {
+                displayText = [MatrixKitL10n noticeRoomPowerLevelIntroForDm];
+            }
+            else
+            {
+                displayText = [MatrixKitL10n noticeRoomPowerLevelIntro];
+            }
+            NSDictionary *users;
+            MXJSONModelSetDictionary(users, event.content[@"users"]);
+            
+            for (NSString *key in users.allKeys)
+            {
+                displayText = [NSString stringWithFormat:@"%@\n\u2022 %@: %@", displayText, key, [users objectForKey:key]];
+            }
+            if (event.content[@"users_default"])
+            {
+                displayText = [NSString stringWithFormat:@"%@\n\u2022 %@: %@", displayText, [MatrixKitL10n default], event.content[@"users_default"]];
+            }
+            
+            displayText = [NSString stringWithFormat:@"%@\n%@", displayText, [MatrixKitL10n noticeRoomPowerLevelActingRequirement]];
+            if (event.content[@"ban"])
+            {
+                displayText = [NSString stringWithFormat:@"%@\n\u2022 ban: %@", displayText, event.content[@"ban"]];
+            }
+            if (event.content[@"kick"])
+            {
+                displayText = [NSString stringWithFormat:@"%@\n\u2022 kick: %@", displayText, event.content[@"kick"]];
+            }
+            if (event.content[@"redact"])
+            {
+                displayText = [NSString stringWithFormat:@"%@\n\u2022 redact: %@", displayText, event.content[@"redact"]];
+            }
+            if (event.content[@"invite"])
+            {
+                displayText = [NSString stringWithFormat:@"%@\n\u2022 invite: %@", displayText, event.content[@"invite"]];
+            }
+            
+            displayText = [NSString stringWithFormat:@"%@\n%@", displayText, [MatrixKitL10n noticeRoomPowerLevelEventRequirement]];
+            
+            NSDictionary *events;
+            MXJSONModelSetDictionary(events, event.content[@"events"]);
+            for (NSString *key in events.allKeys)
+            {
+                displayText = [NSString stringWithFormat:@"%@\n\u2022 %@: %@", displayText, key, [events objectForKey:key]];
+            }
+            if (event.content[@"events_default"])
+            {
+                displayText = [NSString stringWithFormat:@"%@\n\u2022 %@: %@", displayText, @"events_default", event.content[@"events_default"]];
+            }
+            if (event.content[@"state_default"])
+            {
+                displayText = [NSString stringWithFormat:@"%@\n\u2022 %@: %@", displayText, @"state_default", event.content[@"state_default"]];
+            }
+            
+            // Append redacted info if any
+            if (redactedInfo)
+            {
+                displayText = [NSString stringWithFormat:@"%@\n %@", displayText, redactedInfo];
+            }
+            break;
+        }
+        case MXEventTypeRoomAliases:
+        {
+            NSArray *aliases;
+            MXJSONModelSetArray(aliases, event.content[@"aliases"]);
+            if (aliases)
+            {
+                if (isRoomDirect)
+                {
+                    displayText = [MatrixKitL10n noticeRoomAliasesForDm:[aliases componentsJoinedByString:@", "]];
+                }
+                else
+                {
+                    displayText = [MatrixKitL10n noticeRoomAliases:[aliases componentsJoinedByString:@", "]];
+                }
+                // Append redacted info if any
+                if (redactedInfo)
+                {
+                    displayText = [NSString stringWithFormat:@"%@\n %@", displayText, redactedInfo];
+                }
+            }
+            break;
+        }
+        case MXEventTypeRoomRelatedGroups:
+        {
+            NSArray *groups;
+            MXJSONModelSetArray(groups, event.content[@"groups"]);
+            if (groups)
+            {
+                displayText = [MatrixKitL10n noticeRoomRelatedGroups:[groups componentsJoinedByString:@", "]];
+                // Append redacted info if any
+                if (redactedInfo)
+                {
+                    displayText = [NSString stringWithFormat:@"%@\n %@", displayText, redactedInfo];
+                }
+            }
+            break;
+        }
+        case MXEventTypeRoomEncrypted:
+        {
+            // Is redacted?
+            if (isRedacted)
+            {
+                if (!redactedInfo)
+                {
+                    // Here the event is ignored (no display)
+                    return nil;
+                }
+                displayText = redactedInfo;
+            }
+            else
+            {
+                // If the message still appears as encrypted, there was propably an error for decryption
+                // Show this error
+                if (event.decryptionError)
+                {
+                    NSString *errorDescription;
+
+                    if ([event.decryptionError.domain isEqualToString:MXDecryptingErrorDomain]
+                        && [MXKAppSettings standardAppSettings].hideUndecryptableEvents)
+                    {
+                        //  Hide this event, it cannot be decrypted
+                        displayText = nil;
+                    }
+                    else if ([event.decryptionError.domain isEqualToString:MXDecryptingErrorDomain]
+                        && event.decryptionError.code == MXDecryptingErrorUnknownInboundSessionIdCode)
+                    {
+                        // Make the unknown inbound session id error description more user friendly
+                        errorDescription = [MatrixKitL10n noticeCryptoErrorUnknownInboundSessionId];
+                    }
+                    else if ([event.decryptionError.domain isEqualToString:MXDecryptingErrorDomain]
+                           && event.decryptionError.code == MXDecryptingErrorDuplicateMessageIndexCode)
+                    {
+                        // Hide duplicate message warnings
+                        MXLogDebug(@"[MXKEventFormatter] Warning: Duplicate message with error description %@", event.decryptionError);
+                        displayText = nil;
+                    }
+                    else
+                    {
+                        errorDescription = event.decryptionError.localizedDescription;
+                    }
+
+                    if (errorDescription)
+                    {
+                        displayText = [MatrixKitL10n noticeCryptoUnableToDecrypt:errorDescription];
+                    }
+                }
+                else
+                {
+                    displayText = [MatrixKitL10n noticeEncryptedMessage];
+                }
+            }
+            
+            break;
+        }
+        case MXEventTypeRoomEncryption:
+        {
+            NSString *algorithm;
+            MXJSONModelSetString(algorithm, event.content[@"algorithm"]);
+            
+            if (isRedacted)
+            {
+                if (!redactedInfo)
+                {
+                    // Here the event is ignored (no display)
+                    return nil;
+                }
+                algorithm = redactedInfo;
+            }
+            
+            if ([algorithm isEqualToString:kMXCryptoMegolmAlgorithm])
+            {
+                if (isEventSenderMyUser)
+                {
+                    displayText = [MatrixKitL10n noticeEncryptionEnabledOkByYou];
+                }
+                else
+                {
+                    displayText = [MatrixKitL10n noticeEncryptionEnabledOk:senderDisplayName];
+                }
+            }
+            else
+            {
+                if (isEventSenderMyUser)
+                {
+                    displayText = [MatrixKitL10n noticeEncryptionEnabledUnknownAlgorithmByYou:algorithm];
+                }
+                else
+                {
+                    displayText = [MatrixKitL10n noticeEncryptionEnabledUnknownAlgorithm:senderDisplayName :algorithm];
+                }
+            }
+            
+            break;
+        }
+        case MXEventTypeRoomHistoryVisibility:
+        {
+            if (isRedacted)
+            {
+                displayText = redactedInfo;
+            }
+            else
+            {
+                MXRoomHistoryVisibility historyVisibility;
+                MXJSONModelSetString(historyVisibility, event.content[@"history_visibility"]);
+                
+                if (historyVisibility)
+                {
+                    if ([historyVisibility isEqualToString:kMXRoomHistoryVisibilityWorldReadable])
+                    {
+                        if (!isRoomDirect)
+                        {
+                            if (isEventSenderMyUser)
+                            {
+                                displayText = [MatrixKitL10n noticeRoomHistoryVisibleToAnyoneByYou];
+                            }
+                            else
+                            {
+                                displayText = [MatrixKitL10n noticeRoomHistoryVisibleToAnyone:senderDisplayName];
+                            }
+                        }
+                    }
+                    else if ([historyVisibility isEqualToString:kMXRoomHistoryVisibilityShared])
+                    {
+                        if (isEventSenderMyUser)
+                        {
+                            if (isRoomDirect)
+                            {
+                                displayText = [MatrixKitL10n noticeRoomHistoryVisibleToMembersByYouForDm];
+                            }
+                            else
+                            {
+                                displayText = [MatrixKitL10n noticeRoomHistoryVisibleToMembersByYou];
+                            }
+                        }
+                        else
+                        {
+                            if (isRoomDirect)
+                            {
+                                displayText = [MatrixKitL10n noticeRoomHistoryVisibleToMembersForDm:senderDisplayName];
+                            }
+                            else
+                            {
+                                displayText = [MatrixKitL10n noticeRoomHistoryVisibleToMembers:senderDisplayName];
+                            }
+                        }
+                    }
+                    else if ([historyVisibility isEqualToString:kMXRoomHistoryVisibilityInvited])
+                    {
+                        if (isEventSenderMyUser)
+                        {
+                            if (isRoomDirect)
+                            {
+                                displayText = [MatrixKitL10n noticeRoomHistoryVisibleToMembersFromInvitedPointByYouForDm];
+                            }
+                            else
+                            {
+                                displayText = [MatrixKitL10n noticeRoomHistoryVisibleToMembersFromInvitedPointByYou];
+                            }
+                        }
+                        else
+                        {
+                            if (isRoomDirect)
+                            {
+                                displayText = [MatrixKitL10n noticeRoomHistoryVisibleToMembersFromInvitedPointForDm:senderDisplayName];
+                            }
+                            else
+                            {
+                                displayText = [MatrixKitL10n noticeRoomHistoryVisibleToMembersFromInvitedPoint:senderDisplayName];
+                            }
+                        }
+                    }
+                    else if ([historyVisibility isEqualToString:kMXRoomHistoryVisibilityJoined])
+                    {
+                        if (isEventSenderMyUser)
+                        {
+                            if (isRoomDirect)
+                            {
+                                displayText = [MatrixKitL10n noticeRoomHistoryVisibleToMembersFromJoinedPointByYouForDm];
+                            }
+                            else
+                            {
+                                displayText = [MatrixKitL10n noticeRoomHistoryVisibleToMembersFromJoinedPointByYou];
+                            }
+                        }
+                        else
+                        {
+                            if (isRoomDirect)
+                            {
+                                displayText = [MatrixKitL10n noticeRoomHistoryVisibleToMembersFromJoinedPointForDm:senderDisplayName];
+                            }
+                            else
+                            {
+                                displayText = [MatrixKitL10n noticeRoomHistoryVisibleToMembersFromJoinedPoint:senderDisplayName];
+                            }
+                        }
+                    }
+                }
+            }
+            break;
+        }
+        case MXEventTypeRoomMessage:
+        {
+            // Is redacted?
+            if (isRedacted)
+            {
+                if (!redactedInfo)
+                {
+                    // Here the event is ignored (no display)
+                    return nil;
+                }
+                displayText = redactedInfo;
+            }
+            else if (event.isEditEvent)
+            {
+                return nil;
+            }
+            else
+            {
+                NSString *msgtype;
+                MXJSONModelSetString(msgtype, event.content[@"msgtype"]);
+
+                NSString *body;
+                BOOL isHTML = NO;
+                NSString *eventThreadIdentifier = event.threadIdentifier;
+
+                // Use the HTML formatted string if provided
+                if ([event.content[@"format"] isEqualToString:kMXRoomMessageFormatHTML])
+                {
+                    isHTML =YES;
+                    MXJSONModelSetString(body, event.content[@"formatted_body"]);
+                }
+                else if (eventThreadIdentifier)
+                {
+                    isHTML = YES;
+                    MXJSONModelSetString(body, event.content[@"body"]);
+                    MXEvent *threadRootEvent = [mxSession.store eventWithEventId:eventThreadIdentifier
+                                                                          inRoom:event.roomId];
+                    
+                    NSString *threadRootEventContent;
+                    MXJSONModelSetString(threadRootEventContent, threadRootEvent.content[@"body"]);
+                    body = [NSString stringWithFormat:@"<mx-reply><blockquote><a href=\"%@\">In reply to</a> <a href=\"%@\">%@</a><br>%@</blockquote></mx-reply>%@",
+                            [MXTools permalinkToEvent:eventThreadIdentifier inRoom:event.roomId],
+                            [MXTools permalinkToUserWithUserId:threadRootEvent.sender],
+                            threadRootEvent.sender,
+                            threadRootEventContent,
+                            body];
+                    
+                }
+                else
+                {
+                    MXJSONModelSetString(body, event.content[@"body"]);
+                }
+
+                if (body)
+                {
+                    if ([msgtype isEqualToString:kMXMessageTypeImage])
+                    {
+                        body = body? body : [MatrixKitL10n noticeImageAttachment];
+                        // Check attachment validity
+                        if (![self isSupportedAttachment:event])
+                        {
+                            MXLogDebug(@"[MXKEventFormatter] Warning: Unsupported attachment %@", event.description);
+                            body = [MatrixKitL10n noticeInvalidAttachment];
+                            *error = MXKEventFormatterErrorUnsupported;
+                        }
+                    }
+                    else if ([msgtype isEqualToString:kMXMessageTypeAudio])
+                    {
+                        body = body? body : [MatrixKitL10n noticeAudioAttachment];
+                        if (![self isSupportedAttachment:event])
+                        {
+                            MXLogDebug(@"[MXKEventFormatter] Warning: Unsupported attachment %@", event.description);
+                            if (_isForSubtitle || !_settings.showUnsupportedEventsInRoomHistory)
+                            {
+                                body = [MatrixKitL10n noticeInvalidAttachment];
+                            }
+                            else
+                            {
+                                body = [MatrixKitL10n noticeUnsupportedAttachment:event.description];
+                            }
+                            *error = MXKEventFormatterErrorUnsupported;
+                        }
+                    }
+                    else if ([msgtype isEqualToString:kMXMessageTypeVideo])
+                    {
+                        body = body? body : [MatrixKitL10n noticeVideoAttachment];
+                        if (![self isSupportedAttachment:event])
+                        {
+                            MXLogDebug(@"[MXKEventFormatter] Warning: Unsupported attachment %@", event.description);
+                            if (_isForSubtitle || !_settings.showUnsupportedEventsInRoomHistory)
+                            {
+                                body = [MatrixKitL10n noticeInvalidAttachment];
+                            }
+                            else
+                            {
+                                body = [MatrixKitL10n noticeUnsupportedAttachment:event.description];
+                            }
+                            *error = MXKEventFormatterErrorUnsupported;
+                        }
+                    }
+                    else if ([msgtype isEqualToString:kMXMessageTypeLocation])
+                    {
+                        body = body? body : [MatrixKitL10n noticeLocationAttachment];
+                        if (![self isSupportedAttachment:event])
+                        {
+                            MXLogDebug(@"[MXKEventFormatter] Warning: Unsupported attachment %@", event.description);
+                            if (_isForSubtitle || !_settings.showUnsupportedEventsInRoomHistory)
+                            {
+                                body = [MatrixKitL10n noticeInvalidAttachment];
+                            }
+                            else
+                            {
+                                body = [MatrixKitL10n noticeUnsupportedAttachment:event.description];
+                            }
+                            *error = MXKEventFormatterErrorUnsupported;
+                        }
+                    }
+                    else if ([msgtype isEqualToString:kMXMessageTypeFile])
+                    {
+                        body = body? body : [MatrixKitL10n noticeFileAttachment];
+                        // Check attachment validity
+                        if (![self isSupportedAttachment:event])
+                        {
+                            MXLogDebug(@"[MXKEventFormatter] Warning: Unsupported attachment %@", event.description);
+                            body = [MatrixKitL10n noticeInvalidAttachment];
+                            *error = MXKEventFormatterErrorUnsupported;
+                        }
+                    }
+
+                    if (isHTML)
+                    {
+                        // Build the attributed string from the HTML string
+                        attributedDisplayText = [self renderHTMLString:body forEvent:event withRoomState:roomState];
+                    }
+                    else
+                    {
+                        // Build the attributed string with the right font and color for the event
+                        attributedDisplayText = [self renderString:body forEvent:event];
+                    }
+
+                    // Build the full emote string after the body message formatting
+                    if ([msgtype isEqualToString:kMXMessageTypeEmote])
+                    {
+                        __block NSUInteger insertAt = 0;
+
+                        // For replies, look for the end of the parent message
+                        // This helps us insert the emote prefix in the right place
+                        NSDictionary *relatesTo;
+                        MXJSONModelSetDictionary(relatesTo, event.content[@"m.relates_to"]);
+                        if ([relatesTo[@"m.in_reply_to"] isKindOfClass:NSDictionary.class] || event.isInThread)
+                        {
+                            [attributedDisplayText enumerateAttribute:kMXKToolsBlockquoteMarkAttribute
+                                                              inRange:NSMakeRange(0, attributedDisplayText.length)
+                                                              options:(NSAttributedStringEnumerationReverse)
+                                                           usingBlock:^(id value, NSRange range, BOOL *stop) {
+                                insertAt = range.location;
+                                *stop = YES;
+                            }];
+                        }
+
+                        // Always use default font and color for the emote prefix
+                        NSString *emotePrefix = [NSString stringWithFormat:@"* %@ ", senderDisplayName];
+                        NSAttributedString *attributedEmotePrefix =
+                        [[NSAttributedString alloc] initWithString:emotePrefix
+                                                        attributes:@{
+                                                                    NSForegroundColorAttributeName: _defaultTextColor,
+                                                                    NSFontAttributeName: _defaultTextFont
+                                                                    }];
+
+                        // Then, insert the emote prefix at the start of the message
+                        // (location varies depending on whether it was a reply)
+                        NSMutableAttributedString *newAttributedDisplayText =
+                        [[NSMutableAttributedString alloc] initWithAttributedString:attributedDisplayText];
+                        [newAttributedDisplayText insertAttributedString:attributedEmotePrefix
+                                                                 atIndex:insertAt];
+                        attributedDisplayText = newAttributedDisplayText;
+                    }
+                }
+            }
+            break;
+        }
+        case MXEventTypeRoomMessageFeedback:
+        {
+            NSString *type;
+            MXJSONModelSetString(type, event.content[@"type"]);
+            NSString *eventId;
+            MXJSONModelSetString(eventId, event.content[@"target_event_id"]);
+            
+            if (type && eventId)
+            {
+                displayText = [MatrixKitL10n noticeFeedback:eventId :type];
+                // Append redacted info if any
+                if (redactedInfo)
+                {
+                    displayText = [NSString stringWithFormat:@"%@ %@", displayText, redactedInfo];
+                }
+            }
+            break;
+        }
+        case MXEventTypeRoomRedaction:
+        {
+            NSString *eventId = event.redacts;
+            if (isEventSenderMyUser)
+            {
+                displayText = [MatrixKitL10n noticeRedactionByYou:eventId];
+            }
+            else
+            {
+                displayText = [MatrixKitL10n noticeRedaction:senderDisplayName :eventId];
+            }
+            break;
+        }
+        case MXEventTypeRoomThirdPartyInvite:
+        {
+            NSString *displayname;
+            MXJSONModelSetString(displayname, event.content[@"display_name"]);
+            if (displayname)
+            {
+                if (isEventSenderMyUser)
+                {
+                    if (isRoomDirect)
+                    {
+                        displayText = [MatrixKitL10n noticeRoomThirdPartyInviteByYouForDm:displayname];
+                    }
+                    else
+                    {
+                        displayText = [MatrixKitL10n noticeRoomThirdPartyInviteByYou:displayname];
+                    }
+                }
+                else
+                {
+                    if (isRoomDirect)
+                    {
+                        displayText = [MatrixKitL10n noticeRoomThirdPartyInviteForDm:senderDisplayName :displayname];
+                    }
+                    else
+                    {
+                        displayText = [MatrixKitL10n noticeRoomThirdPartyInvite:senderDisplayName :displayname];
+                    }
+                }
+            }
+            else
+            {
+                // Consider the invite has been revoked
+                MXJSONModelSetString(displayname, event.prevContent[@"display_name"]);
+                if (isEventSenderMyUser)
+                {
+                    if (isRoomDirect)
+                    {
+                        displayText = [MatrixKitL10n noticeRoomThirdPartyRevokedInviteByYouForDm:displayname];
+                    }
+                    else
+                    {
+                        displayText = [MatrixKitL10n noticeRoomThirdPartyRevokedInviteByYou:displayname];
+                    }
+                }
+                else
+                {
+                    if (isRoomDirect)
+                    {
+                        displayText = [MatrixKitL10n noticeRoomThirdPartyRevokedInviteForDm:senderDisplayName :displayname];
+                    }
+                    else
+                    {
+                        displayText = [MatrixKitL10n noticeRoomThirdPartyRevokedInvite:senderDisplayName :displayname];
+                    }
+                }
+            }
+            break;
+        }
+        case MXEventTypeCallInvite:
+        {
+            MXCallInviteEventContent *callInviteEventContent = [MXCallInviteEventContent modelFromJSON:event.content];
+
+            if (callInviteEventContent.isVideoCall)
+            {
+                if (isEventSenderMyUser)
+                {
+                    displayText = [MatrixKitL10n noticePlacedVideoCallByYou];
+                }
+                else
+                {
+                    displayText = [MatrixKitL10n noticePlacedVideoCall:senderDisplayName];
+                }
+            }
+            else
+            {
+                if (isEventSenderMyUser)
+                {
+                    displayText = [MatrixKitL10n noticePlacedVoiceCallByYou];
+                }
+                else
+                {
+                    displayText = [MatrixKitL10n noticePlacedVoiceCall:senderDisplayName];
+                }
+            }
+            break;
+        }
+        case MXEventTypeCallAnswer:
+        {
+            if (isEventSenderMyUser)
+            {
+                displayText = [MatrixKitL10n noticeAnsweredVideoCallByYou];
+            }
+            else
+            {
+                displayText = [MatrixKitL10n noticeAnsweredVideoCall:senderDisplayName];
+            }
+            break;
+        }
+        case MXEventTypeCallHangup:
+        {
+            if (isEventSenderMyUser)
+            {
+                displayText = [MatrixKitL10n noticeEndedVideoCallByYou];
+            }
+            else
+            {
+                displayText = [MatrixKitL10n noticeEndedVideoCall:senderDisplayName];
+            }
+            break;
+        }
+        case MXEventTypeCallReject:
+        {
+            if (isEventSenderMyUser)
+            {
+                displayText = [MatrixKitL10n noticeDeclinedVideoCallByYou];
+            }
+            else
+            {
+                displayText = [MatrixKitL10n noticeDeclinedVideoCall:senderDisplayName];
+            }
+            break;
+        }
+        case MXEventTypeSticker:
+        {
+            // Is redacted?
+            if (isRedacted)
+            {
+                if (!redactedInfo)
+                {
+                    // Here the event is ignored (no display)
+                    return nil;
+                }
+                displayText = redactedInfo;
+            }
+            else
+            {
+                NSString *body;
+                MXJSONModelSetString(body, event.content[@"body"]);
+                
+                // Check sticker validity
+                if (![self isSupportedAttachment:event])
+                {
+                    MXLogDebug(@"[MXKEventFormatter] Warning: Unsupported sticker %@", event.description);
+                    body = [MatrixKitL10n noticeInvalidAttachment];
+                    *error = MXKEventFormatterErrorUnsupported;
+                }
+                
+                displayText = body? body : [MatrixKitL10n noticeSticker];
+            }
+            break;
+        }
+        case MXEventTypePollStart:
+        {
+            displayText = [MXEventContentPollStart modelFromJSON:event.content].question;
+            break;
+        }
+        default:
+            *error = MXKEventFormatterErrorUnknownEventType;
+            break;
+    }
+
+    if (!attributedDisplayText && displayText)
+    {
+        // Build the attributed string with the right font and color for the event
+        attributedDisplayText = [self renderString:displayText forEvent:event];
+    }
+    
+    if (!attributedDisplayText)
+    {
+        MXLogDebug(@"[MXKEventFormatter] Warning: Unsupported event %@)", event.description);
+        if (_settings.showUnsupportedEventsInRoomHistory)
+        {
+            if (MXKEventFormatterErrorNone == *error)
+            {
+                *error = MXKEventFormatterErrorUnsupported;
+            }
+            
+            NSString *shortDescription = nil;
+            
+            switch (*error)
+            {
+                case MXKEventFormatterErrorUnsupported:
+                    shortDescription = [MatrixKitL10n noticeErrorUnsupportedEvent];
+                    break;
+                case MXKEventFormatterErrorUnexpected:
+                    shortDescription = [MatrixKitL10n noticeErrorUnexpectedEvent];
+                    break;
+                case MXKEventFormatterErrorUnknownEventType:
+                    shortDescription = [MatrixKitL10n noticeErrorUnknownEventType];
+                    break;
+                    
+                default:
+                    break;
+            }
+            
+            if (!_isForSubtitle)
+            {
+                // Return event content as unsupported event
+                displayText = [NSString stringWithFormat:@"%@: %@", shortDescription, event.description];
+            }
+            else
+            {
+                // Return a short error description
+                displayText = shortDescription;
+            }
+
+            // Build the attributed string with the right font for the event
+            attributedDisplayText = [self renderString:displayText forEvent:event];
+        }
+    }
+    
+    return attributedDisplayText;
+}
+
+- (NSAttributedString*)attributedStringFromEvents:(NSArray<MXEvent*>*)events withRoomState:(MXRoomState*)roomState error:(MXKEventFormatterError*)error
+{
+    // TODO: Do a full summary
+    return nil;
+}
+
+- (NSAttributedString*)renderString:(NSString*)string forEvent:(MXEvent*)event
+{
+    // Sanity check
+    if (!string)
+    {
+        return nil;
+    }
+    
+    NSMutableAttributedString *str = [[NSMutableAttributedString alloc] initWithString:string];
+
+    NSRange wholeString = NSMakeRange(0, str.length);
+
+    // Apply color and font corresponding to the event state
+    [str addAttribute:NSForegroundColorAttributeName value:[self textColorForEvent:event] range:wholeString];
+    [str addAttribute:NSFontAttributeName value:[self fontForEvent:event] range:wholeString];
+
+    // If enabled, make links clickable
+    if (!([[_settings httpLinkScheme] isEqualToString: @"http"] &&
+          [[_settings httpsLinkScheme] isEqualToString: @"https"]))
+    {
+        NSArray *matches = [linkDetector matchesInString:[str string] options:0 range:wholeString];
+        for (NSTextCheckingResult *match in matches)
+        {
+            NSRange matchRange = [match range];
+            NSURL *matchUrl = [match URL];
+            NSURLComponents *url = [[NSURLComponents new] initWithURL:matchUrl resolvingAgainstBaseURL:NO];
+
+            if (url)
+            {
+                if ([url.scheme isEqualToString: @"http"])
+                {
+                    url.scheme = [_settings httpLinkScheme];
+                }
+                else if ([url.scheme isEqualToString: @"https"])
+                {
+                    url.scheme = [_settings httpsLinkScheme];
+                }
+
+                if (url.URL)
+                {
+                    [str addAttribute:NSLinkAttributeName value:url.URL range:matchRange];
+                }
+            }
+        }
+    }
+
+    // Apply additional treatments
+    return [self postRenderAttributedString:str];
+}
+
+- (NSAttributedString*)renderHTMLString:(NSString*)htmlString forEvent:(MXEvent*)event withRoomState:(MXRoomState*)roomState
+{
+    NSString *html = htmlString;
+
+    // Special treatment for "In reply to" message
+    if (event.isReplyEvent || event.isInThread)
+    {
+        html = [self renderReplyTo:html withRoomState:roomState];
+    }
+
+    // Apply the css style that corresponds to the event state
+    UIFont *font = [self fontForEvent:event];
+    
+    // Do some sanitisation before finalizing the string
+    MXWeakify(self);
+    DTHTMLAttributedStringBuilderWillFlushCallback sanitizeCallback = ^(DTHTMLElement *element) {
+        MXStrongifyAndReturnIfNil(self);
+        [element sanitizeWith:self.allowedHTMLTags bodyFont:font imageHandler:self.htmlImageHandler];
+    };
+
+    NSDictionary *options = @{
+                              DTUseiOS6Attributes: @(YES),              // Enable it to be able to display the attributed string in a UITextView
+                              DTDefaultFontFamily: font.familyName,
+                              DTDefaultFontName: font.fontName,
+                              DTDefaultFontSize: @(font.pointSize),
+                              DTDefaultTextColor: [self textColorForEvent:event],
+                              DTDefaultLinkDecoration: @(NO),
+                              DTDefaultStyleSheet: dtCSS,
+                              DTWillFlushBlockCallBack: sanitizeCallback
+                              };
+
+    // Do not use the default HTML renderer of NSAttributedString because this method
+    // runs on the UI thread which we want to avoid because renderHTMLString is called
+    // most of the time from a background thread.
+    // Use DTCoreText HTML renderer instead.
+    // Using DTCoreText, which renders static string, helps to avoid code injection attacks
+    // that could happen with the default HTML renderer of NSAttributedString which is a
+    // webview.
+    NSAttributedString *str = [[NSAttributedString alloc] initWithHTMLData:[html dataUsingEncoding:NSUTF8StringEncoding] options:options documentAttributes:NULL];
+        
+    // Apply additional treatments
+    str = [self postRenderAttributedString:str];
+
+    // Finalize the attributed string by removing DTCoreText artifacts (Trim trailing newlines).
+    str = [MXKTools removeDTCoreTextArtifacts:str];
+
+    // Finalize HTML blockquote blocks marking
+    str = [MXKTools removeMarkedBlockquotesArtifacts:str];
+
+    return str;
+}
+
+/**
+ Special treatment for "In reply to" message.
+
+ According to https://docs.google.com/document/d/1BPd4lBrooZrWe_3s_lHw_e-Dydvc7bXbm02_sV2k6Sc/edit.
+
+ @param htmlString an html string containing a reply-to message.
+ @param roomState the room state right before the event.
+ @return a displayable internationalised html string.
+ */
+- (NSString*)renderReplyTo:(NSString*)htmlString withRoomState:(MXRoomState*)roomState
+{
+    NSString *html = htmlString;
+    
+    static NSRegularExpression *htmlATagRegex;
+    
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        htmlATagRegex = [NSRegularExpression regularExpressionWithPattern:kHTMLATagRegexPattern options:NSRegularExpressionCaseInsensitive error:nil];
+    });
+    
+    __block NSUInteger hrefCount = 0;
+    
+    __block NSRange inReplyToLinkRange = NSMakeRange(NSNotFound, 0);
+    __block NSRange inReplyToTextRange = NSMakeRange(NSNotFound, 0);
+    __block NSRange userIdRange = NSMakeRange(NSNotFound, 0);
+    
+    [htmlATagRegex enumerateMatchesInString:html
+                                    options:0
+                                      range:NSMakeRange(0, html.length)
+                                 usingBlock:^(NSTextCheckingResult *match, NSMatchingFlags flags, BOOL *stop) {
+                                     
+                                     if (hrefCount > 1)
+                                     {
+                                         *stop = YES;
+                                     }
+                                     else if (hrefCount == 0 && match.numberOfRanges >= 2)
+                                     {
+                                        inReplyToLinkRange = [match rangeAtIndex:1];
+                                        inReplyToTextRange = [match rangeAtIndex:2];
+                                     }
+                                     else if (hrefCount == 1 && match.numberOfRanges >= 2)
+                                     {
+                                         userIdRange = [match rangeAtIndex:2];
+                                     }
+                                     
+                                     hrefCount++;
+                                 }];
+    
+    // Note: Take care to replace text starting with the end
+    
+    // Replace <a href=\"https://matrix.to/#/mxid\">mxid</a>
+    // By <a href=\"https://matrix.to/#/mxid\">Display name</a>
+    // To replace the user Matrix ID by his display name when available.
+    // This link is the second <a> HTML node of the html string
+    
+    if (userIdRange.location != NSNotFound)
+    {
+        NSString *userId = [html substringWithRange:userIdRange];
+        
+        NSString *senderDisplayName = [roomState.members memberName:userId];
+        
+        if (senderDisplayName)
+        {
+            html = [html stringByReplacingCharactersInRange:userIdRange withString:senderDisplayName];
+        }
+    }
+    
+    // Replace <mx-reply><blockquote><a href=\"__permalink__\">In reply to</a>
+    // By <mx-reply><blockquote><a href=\"#\">['In reply to' from resources]</a>
+    // To disable the link and to localize the "In reply to" string
+    // This link is the first <a> HTML node of the html string
+    
+    if (inReplyToTextRange.location != NSNotFound)
+    {
+        html = [html stringByReplacingCharactersInRange:inReplyToTextRange withString:[MatrixKitL10n noticeInReplyTo]];
+    }
+    
+    if (inReplyToLinkRange.location != NSNotFound)
+    {
+        html = [html stringByReplacingCharactersInRange:inReplyToLinkRange withString:@"#"];
+    }
+    
+    return html;
+}
+
+- (NSAttributedString*)postRenderAttributedString:(NSAttributedString*)attributedString
+{
+    if (!attributedString)
+    {
+        return nil;
+    }
+    
+    NSInteger enabledMatrixIdsBitMask= 0;
+
+    // If enabled, make user id clickable
+    if (_treatMatrixUserIdAsLink)
+    {
+        enabledMatrixIdsBitMask |= MXKTOOLS_USER_IDENTIFIER_BITWISE;
+    }
+
+    // If enabled, make room id clickable
+    if (_treatMatrixRoomIdAsLink)
+    {
+        enabledMatrixIdsBitMask |= MXKTOOLS_ROOM_IDENTIFIER_BITWISE;
+    }
+
+    // If enabled, make room alias clickable
+    if (_treatMatrixRoomAliasAsLink)
+    {
+        enabledMatrixIdsBitMask |= MXKTOOLS_ROOM_ALIAS_BITWISE;
+    }
+
+    // If enabled, make event id clickable
+    if (_treatMatrixEventIdAsLink)
+    {
+        enabledMatrixIdsBitMask |= MXKTOOLS_EVENT_IDENTIFIER_BITWISE;
+    }
+    
+    // If enabled, make group id clickable
+    if (_treatMatrixGroupIdAsLink)
+    {
+        enabledMatrixIdsBitMask |= MXKTOOLS_GROUP_IDENTIFIER_BITWISE;
+    }
+
+    return [MXKTools createLinksInAttributedString:attributedString forEnabledMatrixIds:enabledMatrixIdsBitMask];
+}
+
+- (NSAttributedString *)renderString:(NSString *)string withPrefix:(NSString *)prefix forEvent:(MXEvent *)event
+{
+    NSMutableAttributedString *str;
+
+    if (prefix)
+    {
+        str = [[NSMutableAttributedString alloc] initWithString:prefix];
+
+        // Apply the prefix font and color on the prefix
+        NSRange prefixRange = NSMakeRange(0, prefix.length);
+        [str addAttribute:NSForegroundColorAttributeName value:_prefixTextColor range:prefixRange];
+        [str addAttribute:NSFontAttributeName value:_prefixTextFont range:prefixRange];
+
+        // And append the string rendered according to event state
+        [str appendAttributedString:[self renderString:string forEvent:event]];
+
+        return str;
+    }
+    else
+    {
+        // Use the legacy method
+        return [self renderString:string forEvent:event];
+    }
+}
+
+- (void)setDefaultCSS:(NSString*)defaultCSS
+{
+    // Make sure we mark HTML blockquote blocks for later computation
+    _defaultCSS = [NSString stringWithFormat:@"%@%@", [MXKTools cssToMarkBlockquotes], defaultCSS];
+
+    dtCSS = [[DTCSSStylesheet alloc] initWithStyleBlock:_defaultCSS];
+}
+
+#pragma mark - MXRoomSummaryUpdating
+- (BOOL)session:(MXSession *)session updateRoomSummary:(MXRoomSummary *)summary withStateEvents:(NSArray<MXEvent *> *)stateEvents roomState:(MXRoomState *)roomState
+{
+    // We build strings containing the sender displayname (ex: "Bob: Hello!")
+    // If a sender changes his displayname, we need to update the lastMessage.
+    MXRoomLastMessage *lastMessage;
+    for (MXEvent *event in stateEvents)
+    {
+        if (event.isUserProfileChange)
+        {
+            if (!lastMessage)
+            {
+                // Load lastMessageEvent on demand to save I/O
+                lastMessage = summary.lastMessage;
+            }
+
+            if ([event.sender isEqualToString:lastMessage.sender])
+            {
+                // The last message must be recomputed
+                [summary resetLastMessage:nil failure:nil commit:YES];
+                break;
+            }
+        }
+        else if (event.eventType == MXEventTypeRoomJoinRules)
+        {
+            summary.joinRule = roomState.joinRule;
+        }
+    }
+
+    return [defaultRoomSummaryUpdater session:session updateRoomSummary:summary withStateEvents:stateEvents roomState:roomState];
+}
+
+- (BOOL)session:(MXSession *)session updateRoomSummary:(MXRoomSummary *)summary withLastEvent:(MXEvent *)event eventState:(MXRoomState *)eventState roomState:(MXRoomState *)roomState
+{
+    // Use the default updater as first pass
+    MXRoomLastMessage *currentlastMessage = summary.lastMessage;
+    BOOL updated = [defaultRoomSummaryUpdater session:session updateRoomSummary:summary withLastEvent:event eventState:eventState roomState:roomState];
+    if (updated)
+    {
+        // Then customise
+
+        // Compute the text message
+        // Note that we use the current room state (roomState) because when we display
+        // users displaynames, we want current displaynames
+        MXKEventFormatterError error;
+        NSString *lastMessageString = [self stringFromEvent:event withRoomState:roomState error:&error];
+        
+        if (0 == lastMessageString.length)
+        {
+            // @TODO: there is a conflict with what [defaultRoomSummaryUpdater updateRoomSummary] did :/
+            updated = NO;
+            // Restore the previous lastMessageEvent
+            [summary updateLastMessage:currentlastMessage];
+        }
+        else
+        {
+            summary.lastMessage.text = lastMessageString;
+            
+            if (summary.lastMessage.others == nil)
+            {
+                summary.lastMessage.others = [NSMutableDictionary dictionary];
+            }
+            
+            // Store the potential error
+            summary.lastMessage.others[@"mxkEventFormatterError"] = @(error);
+            
+            summary.lastMessage.others[@"lastEventDate"] = [self dateStringFromEvent:event withTime:YES];
+
+            // Check whether the sender name has to be added
+            NSString *prefix = nil;
+
+            if (event.eventType == MXEventTypeRoomMessage)
+            {
+                NSString *msgtype = event.content[@"msgtype"];
+                if ([msgtype isEqualToString:kMXMessageTypeEmote] == NO)
+                {
+                    NSString *senderDisplayName = [self senderDisplayNameForEvent:event withRoomState:roomState];
+                    prefix = [NSString stringWithFormat:@"%@: ", senderDisplayName];
+                }
+            }
+            else if (event.eventType == MXEventTypeSticker)
+            {
+                NSString *senderDisplayName = [self senderDisplayNameForEvent:event withRoomState:roomState];
+                prefix = [NSString stringWithFormat:@"%@: ", senderDisplayName];
+            }
+
+            // Compute the attribute text message
+            summary.lastMessage.attributedText = [self renderString:summary.lastMessage.text withPrefix:prefix forEvent:event];
+        }
+    }
+    
+    return updated;
+}
+
+- (BOOL)session:(MXSession *)session updateRoomSummary:(MXRoomSummary *)summary withServerRoomSummary:(MXRoomSyncSummary *)serverRoomSummary roomState:(MXRoomState *)roomState
+{
+    return [defaultRoomSummaryUpdater session:session updateRoomSummary:summary withServerRoomSummary:serverRoomSummary roomState:roomState];
+}
+
+
+#pragma mark - Conversion private methods
+
+/**
+ Get the text color to use according to the event state.
+ 
+ @param event the event.
+ @return the text color.
+ */
+- (UIColor*)textColorForEvent:(MXEvent*)event
+{
+    // Select the text color
+    UIColor *textColor;
+    
+    // Check whether an error occurred during event formatting.
+    if (event.mxkEventFormatterError != MXKEventFormatterErrorNone)
+    {
+        textColor = _errorTextColor;
+    }
+    // Check whether the message is highlighted.
+    else if (event.mxkIsHighlighted || (event.isInThread && ![event.sender isEqualToString:mxSession.myUserId]))
+    {
+        textColor = _bingTextColor;
+    }
+    else
+    {
+        // Consider here the sending state of the event, and the property `isForSubtitle`.
+        switch (event.sentState)
+        {
+            case MXEventSentStateSent:
+                if (_isForSubtitle)
+                {
+                    textColor = _subTitleTextColor;
+                }
+                else
+                {
+                    textColor = _defaultTextColor;
+                }
+                break;
+            case MXEventSentStateEncrypting:
+                textColor = _encryptingTextColor;
+                break;
+            case MXEventSentStatePreparing:
+            case MXEventSentStateUploading:
+            case MXEventSentStateSending:
+                textColor = _sendingTextColor;
+                break;
+            case MXEventSentStateFailed:
+                textColor = _errorTextColor;
+                break;
+            default:
+                if (_isForSubtitle)
+                {
+                    textColor = _subTitleTextColor;
+                }
+                else
+                {
+                    textColor = _defaultTextColor;
+                }
+                break;
+        }
+    }
+    
+    return textColor;
+}
+
+/**
+ Get the text font to use according to the event state.
+
+ @param event the event.
+ @return the text font.
+ */
+- (UIFont*)fontForEvent:(MXEvent*)event
+{
+    // Select text font
+    UIFont *font = _defaultTextFont;
+    if (event.isState)
+    {
+        font = _stateEventTextFont;
+    }
+    else if (event.eventType == MXEventTypeCallInvite || event.eventType == MXEventTypeCallAnswer || event.eventType == MXEventTypeCallHangup)
+    {
+        font = _callNoticesTextFont;
+    }
+    else if (event.mxkIsHighlighted || (event.isInThread && ![event.sender isEqualToString:mxSession.myUserId]))
+    {
+        font = _bingTextFont;
+    }
+    else if (event.eventType == MXEventTypeRoomEncrypted)
+    {
+        font = _encryptedMessagesTextFont;
+    }
+    else if (!_isForSubtitle && event.eventType == MXEventTypeRoomMessage && (_emojiOnlyTextFont || _singleEmojiTextFont))
+    {
+        NSString *message;
+        MXJSONModelSetString(message, event.content[@"body"]);
+
+        if (_emojiOnlyTextFont && [MXKTools isEmojiOnlyString:message])
+        {
+            font = _emojiOnlyTextFont;
+        }
+        else if (_singleEmojiTextFont && [MXKTools isSingleEmojiString:message])
+        {
+            font = _singleEmojiTextFont;
+        }
+    }
+    return font;
+}
+
+#pragma mark - Conversion tools
+
+- (NSString *)htmlStringFromMarkdownString:(NSString *)markdownString
+{
+    NSString *htmlString = [_markdownToHTMLRenderer renderToHTMLWithMarkdown:markdownString];
+
+    // Strip off the trailing newline, if it exists.
+    if ([htmlString hasSuffix:@"\n"])
+    {
+        htmlString = [htmlString substringToIndex:htmlString.length - 1];
+    }
+
+    // Strip start and end <p> tags else you get 'orrible spacing.
+    // But only do this if it's a single paragraph we're dealing with,
+    // otherwise we'll produce some garbage (`something</p><p>another`).
+    if ([htmlString hasPrefix:@"<p>"] && [htmlString hasSuffix:@"</p>"])
+    {
+        NSArray *components = [htmlString componentsSeparatedByString:@"<p>"];
+        NSUInteger paragrapsCount = components.count - 1;
+
+        if (paragrapsCount == 1) {
+            htmlString = [htmlString substringFromIndex:3];
+            htmlString = [htmlString substringToIndex:htmlString.length - 4];
+        }
+    }
+
+    return htmlString;
+}
+
+#pragma mark - Timestamp formatting
+
+- (NSString*)dateStringFromDate:(NSDate *)date withTime:(BOOL)time
+{
+    // Get first date string without time (if a date format is defined, else only time string is returned)
+    NSString *dateString = nil;
+    if (dateFormatter.dateFormat)
+    {
+        dateString = [dateFormatter stringFromDate:date];
+    }
+    
+    if (time)
+    {
+        NSString *timeString = [self timeStringFromDate:date];
+        if (dateString.length)
+        {
+            // Add time string
+            dateString = [NSString stringWithFormat:@"%@ %@", dateString, timeString];
+        }
+        else
+        {
+            dateString = timeString;
+        }
+    }
+    
+    return dateString;
+}
+
+- (NSString*)dateStringFromTimestamp:(uint64_t)timestamp withTime:(BOOL)time
+{
+    NSDate *date = [NSDate dateWithTimeIntervalSince1970:timestamp / 1000];
+    
+    return [self dateStringFromDate:date withTime:time];
+}
+
+- (NSString*)dateStringFromEvent:(MXEvent *)event withTime:(BOOL)time
+{
+    if (event.originServerTs != kMXUndefinedTimestamp)
+    {
+        return [self dateStringFromTimestamp:event.originServerTs withTime:time];
+    }
+    
+    return nil;
+}
+
+- (NSString*)timeStringFromDate:(NSDate *)date
+{
+    NSString *timeString = [timeFormatter stringFromDate:date];
+    
+    return timeString.lowercaseString;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKRoomNameStringLocalizer.h b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKRoomNameStringLocalizer.h
new file mode 100644
index 000000000..3c1f419c8
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKRoomNameStringLocalizer.h
@@ -0,0 +1,26 @@
+/*
+ Copyright 2018 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 <MatrixSDK/MXRoomNameStringLocalizerProtocol.h>
+
+/**
+ The `MXKRoomNameStringLocalizer` implements localization strings for `MXRoomNameStringLocalizerProtocol`.
+ */
+@interface MXKRoomNameStringLocalizer : NSObject <MXRoomNameStringLocalizerProtocol>
+
+@end
diff --git a/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKRoomNameStringLocalizer.m b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKRoomNameStringLocalizer.m
new file mode 100644
index 000000000..904207536
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKRoomNameStringLocalizer.m
@@ -0,0 +1,42 @@
+/*
+ Copyright 2018 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 "MXKRoomNameStringLocalizer.h"
+#import "MXKSwiftHeader.h"
+
+@implementation MXKRoomNameStringLocalizer
+
+- (NSString *)emptyRoom
+{
+    return [MatrixKitL10n roomDisplaynameEmptyRoom];
+}
+
+- (NSString *)twoMembers:(NSString *)firstMember second:(NSString *)secondMember
+{
+    return [MatrixKitL10n roomDisplaynameTwoMembers:firstMember :secondMember];
+}
+
+- (NSString *)moreThanTwoMembers:(NSString *)firstMember count:(NSNumber *)memberCount
+{
+    return [MatrixKitL10n roomDisplaynameMoreThanTwoMembers:firstMember :memberCount.stringValue];
+}
+
+- (NSString *)allOtherMembersLeft:(NSString *)member
+{
+    return [MatrixKitL10n roomDisplaynameAllOtherMembersLeft:member];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Utils/EventFormatter/MarkdownToHTMLRenderer.swift b/Riot/Modules/MatrixKit/Utils/EventFormatter/MarkdownToHTMLRenderer.swift
new file mode 100644
index 000000000..820928fb2
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Utils/EventFormatter/MarkdownToHTMLRenderer.swift
@@ -0,0 +1,52 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C
+
+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 Down
+import libcmark
+
+@objc public protocol MarkdownToHTMLRendererProtocol: NSObjectProtocol {
+    func renderToHTML(markdown: String) -> String?
+}
+
+@objcMembers
+public class MarkdownToHTMLRenderer: NSObject {
+    
+    fileprivate var options: DownOptions = []
+    
+    //  Do not expose an initializer with options, because `DownOptions` is not ObjC compatible.
+    public override init() {
+        super.init()
+    }
+}
+
+extension MarkdownToHTMLRenderer: MarkdownToHTMLRendererProtocol {
+    
+    public func renderToHTML(markdown: String) -> String? {
+        return try? Down(markdownString: markdown).toHTML(options)
+    }
+    
+}
+
+@objcMembers
+public class MarkdownToHTMLRendererHardBreaks: MarkdownToHTMLRenderer {
+    
+    public override init() {
+        super.init()
+        options = .hardBreaks
+    }
+    
+}
diff --git a/Riot/Modules/MatrixKit/Utils/MXKConstants.h b/Riot/Modules/MatrixKit/Utils/MXKConstants.h
new file mode 100644
index 000000000..b580d234e
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Utils/MXKConstants.h
@@ -0,0 +1,41 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2018 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/UIKit.h>
+
+#define MXK_DEPRECATED_ATTRIBUTE                __attribute__((deprecated))
+#define MXK_DEPRECATED_ATTRIBUTE_WITH_MSG(msg)  __attribute((deprecated((msg))))
+
+/**
+ The Matrix iOS Kit version.
+ */
+FOUNDATION_EXPORT NSString *const MatrixKitVersion;
+
+/**
+ Posted when an error is observed at Matrix Kit level.
+ This notification may be used to inform user by showing the error as an alert.
+ The notification object is the NSError instance.
+ 
+ The passed userInfo dictionary may contain:
+ - `kMXKErrorUserIdKey` the matrix identifier of the account concerned by this error.
+ */
+FOUNDATION_EXPORT NSString *const kMXKErrorNotification;
+
+/**
+ The key in notification userInfo dictionary representating the account userId.
+ */
+FOUNDATION_EXPORT NSString *const kMXKErrorUserIdKey;
diff --git a/Riot/Modules/MatrixKit/Utils/MXKConstants.m b/Riot/Modules/MatrixKit/Utils/MXKConstants.m
new file mode 100644
index 000000000..cf6c87873
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Utils/MXKConstants.m
@@ -0,0 +1,23 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2018 New Vector Ltd
+ Copyright 2019 The Matrix.org Foundation C.I.C
+
+ 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 "MXKConstants.h"
+
+NSString *const kMXKErrorNotification = @"kMXKErrorNotification";
+
+NSString *const kMXKErrorUserIdKey = @"kMXKErrorUserIdKey";
diff --git a/Riot/Modules/MatrixKit/Utils/MXKDocumentPickerPresenter.swift b/Riot/Modules/MatrixKit/Utils/MXKDocumentPickerPresenter.swift
new file mode 100644
index 000000000..1f9b9c89c
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Utils/MXKDocumentPickerPresenter.swift
@@ -0,0 +1,80 @@
+/*
+ Copyright 2019 The Matrix.org Foundation C.I.C
+ 
+ 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
+import MobileCoreServices
+
+@objc public protocol MXKDocumentPickerPresenterDelegate {
+    func documentPickerPresenter(_ presenter: MXKDocumentPickerPresenter, didPickDocumentsAt url: URL)
+    func documentPickerPresenterWasCancelled(_ presenter: MXKDocumentPickerPresenter)
+}
+
+/// MXKDocumentPickerPresenter presents a controller that provides access to documents or destinations outside the app’s sandbox.
+/// Internally presents a UIDocumentPickerViewController in UIDocumentPickerMode.import.
+/// Note: You must turn on the iCloud Documents capabilities in Xcode (see https://developer.apple.com/library/archive/documentation/FileManagement/Conceptual/DocumentPickerProgrammingGuide/Introduction/Introduction.html#//apple_ref/doc/uid/TP40014451)
+@objcMembers
+public class MXKDocumentPickerPresenter: NSObject {
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    private weak var presentingViewController: UIViewController?
+    
+    // MARK: Public
+    
+    public weak var delegate: MXKDocumentPickerPresenterDelegate?
+    
+    public var isPresenting: Bool {
+        return self.presentingViewController?.parent != nil
+    }
+    
+    // MARK: - Public
+    
+    /// Presents a document picker view controller modally.
+    ///
+    /// - Parameters:
+    ///   - allowedUTIs: Allowed pickable file UTIs.
+    ///   - viewController: The view controller on which to present the document picker.
+    ///   - animated: Indicate true to animate.
+    ///   - completion: Animation completion.
+    public func presentDocumentPicker(with allowedUTIs: [MXKUTI], from viewController: UIViewController, animated: Bool, completion: (() -> Void)?) {
+        let documentTypes = allowedUTIs.map { return $0.rawValue }
+        let documentPicker = UIDocumentPickerViewController(documentTypes: documentTypes, in: .import)
+        documentPicker.delegate = self
+        viewController.present(documentPicker, animated: animated, completion: completion)
+        self.presentingViewController = viewController
+    }
+}
+
+// MARK - UIDocumentPickerDelegate
+extension MXKDocumentPickerPresenter: UIDocumentPickerDelegate {
+    
+    public func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) {
+        guard let url = urls.first else {
+            return
+        }
+        self.delegate?.documentPickerPresenter(self, didPickDocumentsAt: url)
+    }
+    
+    public func documentPickerWasCancelled(_ controller: UIDocumentPickerViewController) {
+        self.delegate?.documentPickerPresenterWasCancelled(self)
+    }
+    
+    public func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentAt url: URL) {
+        self.delegate?.documentPickerPresenter(self, didPickDocumentsAt: url)
+    }
+}
diff --git a/Riot/Modules/MatrixKit/Utils/MXKResponderRageShaking.h b/Riot/Modules/MatrixKit/Utils/MXKResponderRageShaking.h
new file mode 100644
index 000000000..7c77aad24
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Utils/MXKResponderRageShaking.h
@@ -0,0 +1,47 @@
+/*
+ Copyright 2015 OpenMarket 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/Foundation.h>
+
+/**
+ `MXKResponderRageShaking` defines a protocol an object must conform to handle rage shake
+ on view controllers or other kinds of `UIResponder`.
+ */
+@protocol MXKResponderRageShaking <NSObject>
+
+/**
+ Tells the receiver that a motion event has begun.
+ 
+ @param responder the view controller (or another kind of `UIResponder`) which observed the motion.
+ */
+- (void)startShaking:(UIResponder*)responder;
+
+/**
+ Tells the receiver that a motion event has ended.
+ 
+ @param responder the view controller (or another kind of `UIResponder`) which observed the motion.
+ */
+- (void)stopShaking:(UIResponder*)responder;
+
+/**
+ Ignore pending rage shake related to the provided responder.
+ 
+ @param responder a view controller (or another kind of `UIResponder`).
+ */
+- (void)cancel:(UIResponder*)responder;
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Utils/MXKSoundPlayer.h b/Riot/Modules/MatrixKit/Utils/MXKSoundPlayer.h
new file mode 100644
index 000000000..2643eeac7
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Utils/MXKSoundPlayer.h
@@ -0,0 +1,36 @@
+/*
+ Copyright 2017 Vector Creations 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/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MXKSoundPlayer : NSObject
+
++ (instancetype)sharedInstance;
+
++ (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+- (void)playSoundAt:(NSURL *)url repeat:(BOOL)repeat vibrate:(BOOL)vibrate routeToBuiltInReceiver:(BOOL)useBuiltInReceiver;
+- (void)stopPlayingWithAudioSessionDeactivation:(BOOL)deactivateAudioSession;
+
+- (void)vibrateWithRepeat:(BOOL)repeat;
+- (void)stopVibrating;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Riot/Modules/MatrixKit/Utils/MXKSoundPlayer.m b/Riot/Modules/MatrixKit/Utils/MXKSoundPlayer.m
new file mode 100644
index 000000000..665e31f32
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Utils/MXKSoundPlayer.m
@@ -0,0 +1,145 @@
+/*
+ Copyright 2017 Vector Creations 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 "MXKSoundPlayer.h"
+
+#import <AVFoundation/AVFAudio.h>
+#import <AudioToolbox/AudioServices.h>
+
+static const NSTimeInterval kVibrationInterval = 1.24875;
+
+@interface MXKSoundPlayer () <AVAudioPlayerDelegate>
+
+@property (nonatomic, nullable) AVAudioPlayer *audioPlayer;
+
+@property (nonatomic, getter=isVibrating) BOOL vibrating;
+
+@end
+
+@implementation MXKSoundPlayer
+
++ (instancetype)sharedInstance
+{
+    static MXKSoundPlayer *soundPlayer;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        soundPlayer = [MXKSoundPlayer alloc];
+    });
+    return soundPlayer;
+}
+
+- (void)playSoundAt:(NSURL *)url repeat:(BOOL)repeat vibrate:(BOOL)vibrate routeToBuiltInReceiver:(BOOL)useBuiltInReceiver
+{
+    if (self.audioPlayer)
+    {
+        [self stopPlayingWithAudioSessionDeactivation:NO];
+    }
+    
+    self.audioPlayer = [[AVAudioPlayer alloc] initWithContentsOfURL:url error:nil];
+    
+    if (!self.audioPlayer)
+        return;
+    
+    self.audioPlayer.delegate = self;
+    self.audioPlayer.numberOfLoops = repeat ? -1 : 0;
+    [self.audioPlayer prepareToPlay];
+    
+    // Setup AVAudioSession
+    // We use SoloAmbient instead of Playback category to respect silent mode
+    NSString *audioSessionCategory = useBuiltInReceiver ? AVAudioSessionCategoryPlayAndRecord : AVAudioSessionCategorySoloAmbient;
+    [[AVAudioSession sharedInstance] setCategory:audioSessionCategory error:nil];
+    
+    if (vibrate)
+        [self vibrateWithRepeat:repeat];
+    
+    [self.audioPlayer play];
+}
+
+- (void)stopPlayingWithAudioSessionDeactivation:(BOOL)deactivateAudioSession;
+{
+    if (self.audioPlayer)
+    {
+        [self.audioPlayer stop];
+        self.audioPlayer = nil;
+        
+        if (deactivateAudioSession)
+        {
+            // Release the audio session to allow resuming of background music app
+            [[AVAudioSession sharedInstance] setActive:NO withOptions:AVAudioSessionSetActiveOptionNotifyOthersOnDeactivation error:nil];
+        }
+    }
+    
+    if (self.isVibrating)
+    {
+        [self stopVibrating];
+    }
+}
+
+- (void)vibrateWithRepeat:(BOOL)repeat
+{
+    self.vibrating = YES;
+    
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(kVibrationInterval * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
+        
+        NSNumber *objRepeat = @(repeat);
+        AudioServicesAddSystemSoundCompletion(kSystemSoundID_Vibrate,
+                                              NULL,
+                                              kCFRunLoopCommonModes,
+                                              vibrationCompleted,
+                                              (__bridge_retained void * _Nullable)(objRepeat));
+    });
+}
+
+- (void)stopVibrating
+{
+    self.vibrating = NO;
+    AudioServicesRemoveSystemSoundCompletion(kSystemSoundID_Vibrate);
+}
+
+void vibrationCompleted(SystemSoundID ssID, void* __nullable clientData)
+{
+    NSNumber *objRepeat = (__bridge NSNumber *)clientData;
+    BOOL repeat = [objRepeat boolValue];
+    CFRelease(clientData);
+    
+    MXKSoundPlayer *soundPlayer = [MXKSoundPlayer sharedInstance];
+    
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(kVibrationInterval * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        if (repeat && soundPlayer.isVibrating)
+        {
+            [soundPlayer vibrateWithRepeat:repeat];
+        }
+        else
+        {
+            [soundPlayer stopVibrating];
+        }
+    });
+}
+
+#pragma mark - AVAudioPlayerDelegate
+
+// This method is called only when the end of the player's track is reached.
+// If you call `stop` or `pause` on player this method won't be called
+- (void)audioPlayerDidFinishPlaying:(AVAudioPlayer *)player successfully:(BOOL)flag
+{
+    self.audioPlayer = nil;
+    
+    // Release the audio session to allow resuming of background music app
+    [[AVAudioSession sharedInstance] setActive:NO withOptions:AVAudioSessionSetActiveOptionNotifyOthersOnDeactivation error:nil];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Utils/MXKSwiftHeader.h b/Riot/Modules/MatrixKit/Utils/MXKSwiftHeader.h
new file mode 100644
index 000000000..5821e944b
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Utils/MXKSwiftHeader.h
@@ -0,0 +1,21 @@
+/*
+ Copyright 2020 The Matrix.org Foundation C.I.C
+
+ 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.
+ */
+/* 
+ Never import this file in header files (.h) only in implementation files (.m).
+ If you want to reference a Swift class from the project please use forward declaration in the header file and then import this header in your implementation file.
+*/
+
+#import "GeneratedInterface-Swift.h"
diff --git a/Riot/Modules/MatrixKit/Utils/MXKTools.h b/Riot/Modules/MatrixKit/Utils/MXKTools.h
new file mode 100644
index 000000000..bf6f94a61
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Utils/MXKTools.h
@@ -0,0 +1,426 @@
+/*
+ Copyright 2015 OpenMarket 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/UIKit.h>
+#import <AVFoundation/AVFoundation.h>
+
+#define MXKTOOLS_LARGE_IMAGE_SIZE    1024
+#define MXKTOOLS_MEDIUM_IMAGE_SIZE   768
+#define MXKTOOLS_SMALL_IMAGE_SIZE    512
+
+#define MXKTOOLS_USER_IDENTIFIER_BITWISE  0x01
+#define MXKTOOLS_ROOM_IDENTIFIER_BITWISE  0x02
+#define MXKTOOLS_ROOM_ALIAS_BITWISE       0x04
+#define MXKTOOLS_EVENT_IDENTIFIER_BITWISE 0x08
+#define MXKTOOLS_GROUP_IDENTIFIER_BITWISE 0x10
+
+// Attribute in an NSAttributeString that marks a blockquote block that was in the original HTML string.
+extern NSString *const kMXKToolsBlockquoteMarkAttribute;
+
+/**
+ Structure representing an the size of an image and its file size.
+ */
+typedef struct
+{
+    CGSize imageSize;
+    NSUInteger fileSize;
+    
+} MXKImageCompressionSize;
+
+/**
+ Structure representing the sizes of image (image size and file size) according to
+ different level of compression.
+ */
+
+typedef struct
+{
+    MXKImageCompressionSize small;
+    MXKImageCompressionSize medium;
+    MXKImageCompressionSize large;
+    MXKImageCompressionSize original;
+    
+    CGFloat actualLargeSize;
+    
+} MXKImageCompressionSizes;
+
+@interface MXKTools : NSObject
+
+#pragma mark - Strings
+
+/**
+ Determine if a string contains one emoji and only one.
+ 
+ @param string the string to check.
+ @return YES if YES.
+ */
++ (BOOL)isSingleEmojiString:(NSString*)string;
+
+/**
+ Determine if a string contains only emojis.
+
+ @param string the string to check.
+ @return YES if YES.
+ */
++ (BOOL)isEmojiOnlyString:(NSString*)string;
+
+#pragma mark - Time
+
+/**
+ Format time interval.
+ ex: "5m 31s".
+ 
+ @param secondsInterval time interval in seconds.
+ @return formatted string
+ */
++ (NSString*)formatSecondsInterval:(CGFloat)secondsInterval;
+
+/**
+ Format time interval but rounded to the nearest time unit below.
+ ex: "5s", "1m", "2h" or "3d".
+
+ @param secondsInterval time interval in seconds.
+ @return formatted string
+ */
++ (NSString*)formatSecondsIntervalFloored:(CGFloat)secondsInterval;
+
+#pragma mark - Phone number
+
+/**
+ Return the number used to identify a mobile phone number internationally.
+ 
+ The provided country code is ignored when the phone number is already internationalized, or when it
+ is a valid msisdn.
+ 
+ @param phoneNumber the phone number.
+ @param countryCode the ISO 3166-1 country code representation (required when the phone number is in national format).
+ 
+ @return a valid msisdn or nil if the provided phone number is invalid.
+ */
++ (NSString*)msisdnWithPhoneNumber:(NSString *)phoneNumber andCountryCode:(NSString *)countryCode;
+
+/**
+ Format an MSISDN to a human readable international phone number.
+
+ @param msisdn The MSISDN to format.
+ 
+ @return Human readable international phone number.
+ */
++ (NSString*)readableMSISDN:(NSString*)msisdn;
+
+#pragma mark - Hex color to UIColor conversion
+
+/**
+ Build a UIColor from an hexadecimal color value
+ 
+ @param rgbValue the color expressed in hexa (0xRRGGBB)
+ @return the UIColor
+ */
++ (UIColor*)colorWithRGBValue:(NSUInteger)rgbValue;
+
+/**
+ Build a UIColor from an hexadecimal color value with transparency
+
+ @param argbValue the color expressed in hexa (0xAARRGGBB)
+ @return the UIColor
+ */
++ (UIColor*)colorWithARGBValue:(NSUInteger)argbValue;
+
+/**
+ Return an hexadecimal color value from UIColor
+ 
+ @param color the UIColor
+ @return rgbValue the color expressed in hexa (0xRRGGBB)
+ */
++ (NSUInteger)rgbValueWithColor:(UIColor*)color;
+
+/**
+ Return an hexadecimal color value with transparency from UIColor
+ 
+ @param color the UIColor
+ @return argbValue the color expressed in hexa (0xAARRGGBB)
+ */
++ (NSUInteger)argbValueWithColor:(UIColor*)color;
+
+#pragma mark - Image processing
+
+/**
+ Force image orientation to up
+ 
+ @param imageSrc the original image.
+ @return image with `UIImageOrientationUp` orientation.
+ */
++ (UIImage*)forceImageOrientationUp:(UIImage*)imageSrc;
+
+/**
+ Return struct MXKImageCompressionSizes representing the available compression sizes for the image
+ 
+ @param image the image to get available sizes for
+ @param originalFileSize the size in bytes of the original image file or the image data (0 if this value is unknown).
+ */
++ (MXKImageCompressionSizes)availableCompressionSizesForImage:(UIImage*)image originalFileSize:(NSUInteger)originalFileSize;
+
+/**
+ Compute image size to fit in specific box size (in aspect fit mode)
+ 
+ @param originalSize the original size
+ @param maxSize the box size
+ @param canExpand tell whether the image can be expand or not
+ @return the resized size.
+ */
++ (CGSize)resizeImageSize:(CGSize)originalSize toFitInSize:(CGSize)maxSize canExpand:(BOOL)canExpand;
+
+/**
+ Compute image size to fill specific box size (in aspect fill mode)
+ 
+ @param originalSize the original size
+ @param maxSize the box size
+ @param canExpand tell whether the image can be expand or not
+ @return the resized size.
+ */
++ (CGSize)resizeImageSize:(CGSize)originalSize toFillWithSize:(CGSize)maxSize canExpand:(BOOL)canExpand;
+
+/**
+ Reduce image to fit in the provided size.
+ The aspect ratio is kept.
+ If the image is smaller than the provided size, the image is not recomputed.
+ 
+ @discussion This method call `+ [reduceImage:toFitInSize:useMainScreenScale:]` with `useMainScreenScale` value to `NO`.
+ 
+ @param image the image to modify.
+ @param size to fit in.
+ @return resized image.
+ 
+ @see reduceImage:toFitInSize:useMainScreenScale:
+ */
++ (UIImage *)reduceImage:(UIImage *)image toFitInSize:(CGSize)size;
+
+/**
+ Reduce image to fit in the provided size.
+ The aspect ratio is kept.
+ If the image is smaller than the provided size, the image is not recomputed.
+ 
+ @param image the image to modify.
+ @param size to fit in.
+ @param useMainScreenScale Indicate true to use main screen scale.
+ @return resized image.
+ */
++ (UIImage *)reduceImage:(UIImage *)image toFitInSize:(CGSize)size useMainScreenScale:(BOOL)useMainScreenScale;
+
+/**
+ Reduce image to fit in the provided size.
+ The aspect ratio is kept.
+ 
+ @discussion This method use less memory than `+ [reduceImage:toFitInSize:useMainScreenScale:]`.
+
+ @param imageData The image data.
+ @param size Size to fit in.
+ @return Resized image or nil if the data is not interpreted.
+ */
++ (UIImage*)resizeImageWithData:(NSData*)imageData toFitInSize:(CGSize)size;
+
+/**
+ Resize image to a provided size.
+ 
+ @param image the image to modify.
+ @param size the new size.
+ @return resized image.
+ */
++ (UIImage*)resizeImage:(UIImage *)image toSize:(CGSize)size;
+
+/**
+ Resize image with rounded corners to a provided size.
+ 
+ @param image the image to modify.
+ @param size the new size.
+ @return resized image.
+ */
++ (UIImage*)resizeImageWithRoundedCorners:(UIImage *)image toSize:(CGSize)size;
+
+/**
+ Paint an image with a color.
+ 
+ @discussion
+ All non fully transparent (alpha = 0) will be painted with the provided color.
+ 
+ @param image the image to paint.
+ @param color the color to use.
+ @result a new UIImage object.
+ */
++ (UIImage*)paintImage:(UIImage*)image withColor:(UIColor*)color;
+
+/**
+ Convert a rotation angle to the most suitable image orientation.
+ 
+ @param angle rotation angle in degree.
+ @return image orientation.
+ */
++ (UIImageOrientation)imageOrientationForRotationAngleInDegree:(NSInteger)angle;
+
+/**
+ Draw the image resource in a view and transforms it to a pattern color.
+ The view size is defined by patternSize and will have a "backgroundColor" backgroundColor.
+ The resource image is drawn with the resourceSize size and is centered into its parent view.
+ 
+ @param reourceName the image resource name.
+ @param backgroundColor the pattern background color.
+ @param patternSize the pattern size.
+ @param resourceSize the resource size in the pattern.
+ @return the pattern color which can be used to define the background color of a view in order to display the provided image as its background.
+ */
++ (UIColor*)convertImageToPatternColor:(NSString*)reourceName backgroundColor:(UIColor*)backgroundColor patternSize:(CGSize)patternSize resourceSize:(CGSize)resourceSize;
+
+#pragma mark - Video conversion
+/**
+Creates a `UIAlertController` with appropriate `AVAssetExportPreset` choices for the video passed in.
+ @param videoAsset The video to generate the choices for.
+ @param completion The block called when a preset has been chosen. `presetName` will contain the preset name or `nil` if cancelled.
+*/
++ (UIAlertController*)videoConversionPromptForVideoAsset:(AVAsset *)videoAsset
+                                           withCompletion:(void (^)(NSString * _Nullable presetName))completion;
+
+#pragma mark - App permissions
+
+/**
+ Check permission to access a media.
+ 
+@discussion
+ If the access was not yet granted, a dialog will be shown to the user.
+ If it is the first attempt to access the media, the dialog is the classic iOS one.
+ Else, the dialog will ask the user to manually change the permission in the app settings.
+
+ @param mediaType the media type, either AVMediaTypeVideo or AVMediaTypeAudio.
+ @param manualChangeMessage the message to display if the end user must change the app settings manually.
+ @param viewController the view controller to attach the dialog displaying manualChangeMessage.
+ @param handler the block called with the result of requesting access
+ */
++ (void)checkAccessForMediaType:(NSString *)mediaType
+            manualChangeMessage:(NSString*)manualChangeMessage
+      showPopUpInViewController:(UIViewController*)viewController
+              completionHandler:(void (^)(BOOL granted))handler;
+
+/**
+ Check required permission for the provided call.
+
+ @param isVideoCall flag set to YES in case of video call.
+ @param manualChangeMessageForAudio the message to display if the end user must change the app settings manually for audio.
+ @param manualChangeMessageForVideo the message to display if the end user must change the app settings manually for video
+ @param viewController the view controller to attach the dialog displaying manualChangeMessage.
+ @param handler the block called with the result of requesting access
+ */
++ (void)checkAccessForCall:(BOOL)isVideoCall
+manualChangeMessageForAudio:(NSString*)manualChangeMessageForAudio
+manualChangeMessageForVideo:(NSString*)manualChangeMessageForVideo
+ showPopUpInViewController:(UIViewController*)viewController
+         completionHandler:(void (^)(BOOL granted))handler;
+
+/**
+ Check permission to access Contacts.
+
+ @discussion
+ If the access was not yet granted, a dialog will be shown to the user.
+ If it is the first attempt to access the media, the dialog is the classic iOS one.
+ Else, the dialog will ask the user to manually change the permission in the app settings.
+
+ @param manualChangeMessage the message to display if the end user must change the app settings manually.
+                            If nil, the dialog for displaying manualChangeMessage will not be shown.
+ @param viewController the view controller to attach the dialog displaying manualChangeMessage.
+ @param handler the block called with the result of requesting access
+ */
++ (void)checkAccessForContacts:(NSString*)manualChangeMessage
+     showPopUpInViewController:(UIViewController*)viewController
+             completionHandler:(void (^)(BOOL granted))handler;
+
+/**
+ Check permission to access Contacts.
+
+ @discussion
+ If the access was not yet granted, a dialog will be shown to the user.
+ If it is the first attempt to access the media, the dialog is the classic iOS one.
+ Else, the dialog will ask the user to manually change the permission in the app settings.
+
+ @param manualChangeTitle the title to display if the end user must change the app settings manually.
+ @param manualChangeMessage the message to display if the end user must change the app settings manually.
+                            If nil, the dialog for displaying manualChangeMessage will not be shown.
+ @param viewController the view controller to attach the dialog displaying manualChangeMessage.
+ @param handler the block called with the result of requesting access
+ */
++ (void)checkAccessForContacts:(NSString *)manualChangeTitle
+       withManualChangeMessage:(NSString *)manualChangeMessage
+     showPopUpInViewController:(UIViewController *)viewController
+             completionHandler:(void (^)(BOOL granted))handler;
+
+#pragma mark - HTML processing
+
+/**
+ Removing DTCoreText artifacts:
+ - Trim trailing whitespace and newlines in the string content.
+ - Replace DTImageTextAttachments with a simple NSTextAttachment subclass.
+ 
+ @param attributedString an attributed string.
+ @return the resulting string.
+ */
++ (NSAttributedString*)removeDTCoreTextArtifacts:(NSAttributedString*)attributedString;
+
+/**
+ Make some matrix identifiers clickable in the string content.
+ 
+ @param attributedString an attributed string.
+ @param enabledMatrixIdsBitMask the bitmask used to list the types of matrix id to process (see MXKTOOLS_XXX__BITWISE).
+ @return the resulting string.
+ */
++ (NSAttributedString*)createLinksInAttributedString:(NSAttributedString*)attributedString forEnabledMatrixIds:(NSInteger)enabledMatrixIdsBitMask;
+
+#pragma mark - HTML processing - blockquote display handling
+
+/**
+ Return a CSS to make DTCoreText mark blockquote blocks in the `NSAttributedString` output.
+
+ These blocks  output will have a `DTTextBlocksAttribute` attribute in the `NSAttributedString`
+ that can be used for later computation (in `removeMarkedBlockquotesArtifacts`).
+
+ @return a CSS string.
+ */
++ (NSString*)cssToMarkBlockquotes;
+
+/**
+ Removing DTCoreText artifacts used to mark blockquote blocks.
+
+ @param attributedString an attributed string.
+ @return the resulting string.
+ */
++ (NSAttributedString*)removeMarkedBlockquotesArtifacts:(NSAttributedString*)attributedString;
+
+/**
+ Enumerate all sections of the attributed string that refer to an HTML blockquote block.
+
+ Must be used with `cssToMarkBlockquotes` and `removeMarkedBlockquotesArtifacts`.
+
+ @param attributedString the attributed string.
+ @param block a block called for each HTML blockquote blocks.
+ */
++ (void)enumerateMarkedBlockquotesInAttributedString:(NSAttributedString*)attributedString usingBlock:(void (^)(NSRange range, BOOL *stop))block;
+
+#pragma mark - Push
+
+/**
+ Trim push token in order to log it.
+
+ @param pushToken the token to trim.
+ @return a trimmed description.
+ */
++ (NSString*)logForPushToken:(NSData*)pushToken;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Utils/MXKTools.m b/Riot/Modules/MatrixKit/Utils/MXKTools.m
new file mode 100644
index 000000000..c941fbc98
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Utils/MXKTools.m
@@ -0,0 +1,1227 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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 "MXKTools.h"
+
+@import MatrixSDK;
+@import Contacts;
+@import libPhoneNumber_iOS;
+@import DTCoreText;
+
+#import "MXKConstants.h"
+#import "NSBundle+MatrixKit.h"
+#import "MXKAppSettings.h"
+#import <MatrixSDK/MXTools.h>
+#import "MXKSwiftHeader.h"
+
+#pragma mark - Constants definitions
+
+// Temporary background color used to identify blockquote blocks with DTCoreText.
+#define kMXKToolsBlockquoteMarkColor [UIColor magentaColor]
+
+// Attribute in an NSAttributeString that marks a blockquote block that was in the original HTML string.
+NSString *const kMXKToolsBlockquoteMarkAttribute = @"kMXKToolsBlockquoteMarkAttribute";
+
+#pragma mark - MXKTools static private members
+// The regex used to find matrix ids.
+static NSRegularExpression *userIdRegex;
+static NSRegularExpression *roomIdRegex;
+static NSRegularExpression *roomAliasRegex;
+static NSRegularExpression *eventIdRegex;
+static NSRegularExpression *groupIdRegex;
+// A regex to find http URLs.
+static NSRegularExpression *httpLinksRegex;
+// A regex to find all HTML tags
+static NSRegularExpression *htmlTagsRegex;
+
+@implementation MXKTools
+
++ (void)initialize
+{
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        
+        userIdRegex = [NSRegularExpression regularExpressionWithPattern:kMXToolsRegexStringForMatrixUserIdentifier options:NSRegularExpressionCaseInsensitive error:nil];
+        roomIdRegex = [NSRegularExpression regularExpressionWithPattern:kMXToolsRegexStringForMatrixRoomIdentifier options:NSRegularExpressionCaseInsensitive error:nil];
+        roomAliasRegex = [NSRegularExpression regularExpressionWithPattern:kMXToolsRegexStringForMatrixRoomAlias options:NSRegularExpressionCaseInsensitive error:nil];
+        eventIdRegex = [NSRegularExpression regularExpressionWithPattern:kMXToolsRegexStringForMatrixEventIdentifier options:NSRegularExpressionCaseInsensitive error:nil];
+        groupIdRegex = [NSRegularExpression regularExpressionWithPattern:kMXToolsRegexStringForMatrixGroupIdentifier options:NSRegularExpressionCaseInsensitive error:nil];
+        
+        httpLinksRegex = [NSRegularExpression regularExpressionWithPattern:@"(?i)\\b(https?://.*)\\b" options:NSRegularExpressionCaseInsensitive error:nil];
+        htmlTagsRegex  = [NSRegularExpression regularExpressionWithPattern:@"<(\\w+)[^>]*>" options:NSRegularExpressionCaseInsensitive error:nil];        
+    });
+}
+
+#pragma mark - Strings
+
++ (BOOL)isSingleEmojiString:(NSString *)string
+{
+    return [MXKTools isEmojiString:string singleEmoji:YES];
+}
+
++ (BOOL)isEmojiOnlyString:(NSString *)string
+{
+    return [MXKTools isEmojiString:string singleEmoji:NO];
+}
+
+// Highly inspired from https://stackoverflow.com/a/34659249
++ (BOOL)isEmojiString:(NSString*)string singleEmoji:(BOOL)singleEmoji
+{
+    if (string.length == 0)
+    {
+        return NO;
+    }
+
+    __block BOOL result = YES;
+
+    NSRange stringRange = NSMakeRange(0, [string length]);
+
+    [string enumerateSubstringsInRange:stringRange
+                               options:NSStringEnumerationByComposedCharacterSequences
+                            usingBlock:^(NSString *substring,
+                                         NSRange substringRange,
+                                         NSRange enclosingRange,
+                                         BOOL *stop)
+     {
+         BOOL isEmoji = NO;
+
+         if (singleEmoji && !NSEqualRanges(stringRange, substringRange))
+         {
+             // The string contains several characters. Go out
+             result = NO;
+             *stop = YES;
+             return;
+         }
+
+         const unichar hs = [substring characterAtIndex:0];
+         // Surrogate pair
+         if (0xd800 <= hs &&
+             hs <= 0xdbff)
+         {
+             if (substring.length > 1)
+             {
+                 const unichar ls = [substring characterAtIndex:1];
+                 const int uc = ((hs - 0xd800) * 0x400) + (ls - 0xdc00) + 0x10000;
+                 if (0x1d000 <= uc &&
+                     uc <= 0x1f9ff)
+                 {
+                     isEmoji = YES;
+                 }
+             }
+         }
+         else if (substring.length > 1)
+         {
+             const unichar ls = [substring characterAtIndex:1];
+             if (ls == 0x20e3 ||
+                 ls == 0xfe0f ||
+                 ls == 0xd83c)
+             {
+                 isEmoji = YES;
+             }
+         }
+         else
+         {
+             // Non surrogate
+             if (0x2100 <= hs &&
+                 hs <= 0x27ff)
+             {
+                 isEmoji = YES;
+             }
+             else if (0x2B05 <= hs &&
+                      hs <= 0x2b07)
+             {
+                 isEmoji = YES;
+             }
+             else if (0x2934 <= hs &&
+                      hs <= 0x2935)
+             {
+                 isEmoji = YES;
+             }
+             else if (0x3297 <= hs &&
+                      hs <= 0x3299)
+             {
+                 isEmoji = YES;
+             }
+             else if (hs == 0xa9 ||
+                      hs == 0xae ||
+                      hs == 0x303d ||
+                      hs == 0x3030 ||
+                      hs == 0x2b55 ||
+                      hs == 0x2b1c ||
+                      hs == 0x2b1b ||
+                      hs == 0x2b50)
+             {
+                 isEmoji = YES;
+             }
+         }
+
+         if (!isEmoji)
+         {
+             result = NO;
+             *stop = YES;
+         }
+     }];
+
+    return result;
+}
+
+#pragma mark - Time interval
+
++ (NSString*)formatSecondsInterval:(CGFloat)secondsInterval
+{
+    NSMutableString* formattedString = [[NSMutableString alloc] init];
+    
+    if (secondsInterval < 1)
+    {
+        [formattedString appendFormat:@"< 1%@", [MatrixKitL10n formatTimeS]];
+    }
+    else if (secondsInterval < 60)
+    {
+        [formattedString appendFormat:@"%d%@", (int)secondsInterval, [MatrixKitL10n formatTimeS]];
+    }
+    else if (secondsInterval < 3600)
+    {
+        [formattedString appendFormat:@"%d%@ %2d%@", (int)(secondsInterval/60), [MatrixKitL10n formatTimeM],
+         ((int)secondsInterval) % 60, [MatrixKitL10n formatTimeS]];
+    }
+    else if (secondsInterval >= 3600)
+    {
+        [formattedString appendFormat:@"%d%@ %d%@ %d%@", (int)(secondsInterval / 3600), [MatrixKitL10n formatTimeH],
+         ((int)(secondsInterval) % 3600) / 60, [MatrixKitL10n formatTimeM],
+         (int)(secondsInterval) % 60, [MatrixKitL10n formatTimeS]];
+    }
+    [formattedString appendString:@" left"];
+    
+    return formattedString;
+}
+
++ (NSString *)formatSecondsIntervalFloored:(CGFloat)secondsInterval
+{
+    NSString* formattedString;
+
+    if (secondsInterval < 0)
+    {
+        formattedString = [NSString stringWithFormat:@"0%@", [MatrixKitL10n formatTimeS]];
+    }
+    else
+    {
+        NSUInteger seconds = secondsInterval;
+        if (seconds < 60)
+        {
+            formattedString = [NSString stringWithFormat:@"%tu%@", seconds, [MatrixKitL10n formatTimeS]];
+        }
+        else if (secondsInterval < 3600)
+        {
+            formattedString = [NSString stringWithFormat:@"%tu%@", seconds / 60, [MatrixKitL10n formatTimeM]];
+        }
+        else if (secondsInterval < 86400)
+        {
+            formattedString = [NSString stringWithFormat:@"%tu%@", seconds / 3600, [MatrixKitL10n formatTimeH]];
+        }
+        else
+        {
+            formattedString = [NSString stringWithFormat:@"%tu%@", seconds / 86400, [MatrixKitL10n formatTimeD]];
+        }
+    }
+
+    return formattedString;
+}
+
+#pragma mark - Phone number
+
++ (NSString*)msisdnWithPhoneNumber:(NSString *)phoneNumber andCountryCode:(NSString *)countryCode
+{
+    NSString *msisdn = nil;
+    NBPhoneNumber *phoneNb;
+    
+    if ([phoneNumber hasPrefix:@"+"] || [phoneNumber hasPrefix:@"00"])
+    {
+        phoneNb = [[NBPhoneNumberUtil sharedInstance] parse:phoneNumber defaultRegion:nil error:nil];
+    }
+    else
+    {
+        // Check whether the provided phone number is a valid msisdn.
+        NSString *e164 = [NSString stringWithFormat:@"+%@", phoneNumber];
+        phoneNb = [[NBPhoneNumberUtil sharedInstance] parse:e164 defaultRegion:nil error:nil];
+        
+        if (![[NBPhoneNumberUtil sharedInstance] isValidNumber:phoneNb])
+        {
+            // Consider the phone number as a national one, and use the country code.
+            phoneNb = [[NBPhoneNumberUtil sharedInstance] parse:phoneNumber defaultRegion:countryCode error:nil];
+        }
+    }
+    
+    if ([[NBPhoneNumberUtil sharedInstance] isValidNumber:phoneNb])
+    {
+        NSString *e164 = [[NBPhoneNumberUtil sharedInstance] format:phoneNb numberFormat:NBEPhoneNumberFormatE164 error:nil];
+        
+        if ([e164 hasPrefix:@"+"])
+        {
+            msisdn = [e164 substringFromIndex:1];
+        }
+        else if ([e164 hasPrefix:@"00"])
+        {
+            msisdn = [e164 substringFromIndex:2];
+        }
+    }
+    
+    return msisdn;
+}
+
++ (NSString*)readableMSISDN:(NSString*)msisdn
+{
+    NSString *e164;
+    
+    if (([e164 hasPrefix:@"+"]))
+    {
+        e164 = msisdn;
+    }
+    else
+    {
+        e164 = [NSString stringWithFormat:@"+%@", msisdn];
+    }
+    
+    NBPhoneNumber *phoneNb = [[NBPhoneNumberUtil sharedInstance] parse:e164 defaultRegion:nil error:nil];
+    return [[NBPhoneNumberUtil sharedInstance] format:phoneNb numberFormat:NBEPhoneNumberFormatINTERNATIONAL error:nil];
+}
+
+#pragma mark - Hex color to UIColor conversion
+
++ (UIColor *)colorWithRGBValue:(NSUInteger)rgbValue
+{
+    return [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0];
+}
+
++ (UIColor *)colorWithARGBValue:(NSUInteger)argbValue
+{
+    return [UIColor colorWithRed:((float)((argbValue & 0xFF0000) >> 16))/255.0 green:((float)((argbValue & 0xFF00) >> 8))/255.0 blue:((float)(argbValue & 0xFF))/255.0 alpha:((float)((argbValue & 0xFF000000) >> 24))/255.0];
+}
+
++ (NSUInteger)rgbValueWithColor:(UIColor*)color
+{
+    CGFloat red, green, blue, alpha;
+    
+    [color getRed:&red green:&green blue:&blue alpha:&alpha];
+    
+    NSUInteger rgbValue = ((int)(red * 255) << 16) + ((int)(green * 255) << 8) + (blue * 255);
+    
+    return rgbValue;
+}
+
++ (NSUInteger)argbValueWithColor:(UIColor*)color
+{
+    CGFloat red, green, blue, alpha;
+    
+    [color getRed:&red green:&green blue:&blue alpha:&alpha];
+    
+    NSUInteger argbValue = ((int)(alpha * 255) << 24) + ((int)(red * 255) << 16) + ((int)(green * 255) << 8) + (blue * 255);
+    
+    return argbValue;
+}
+
+#pragma mark - Image
+
++ (UIImage*)forceImageOrientationUp:(UIImage*)imageSrc
+{
+    if ((imageSrc.imageOrientation == UIImageOrientationUp) || (!imageSrc))
+    {
+        // Nothing to do
+        return imageSrc;
+    }
+    
+    // Draw the entire image in a graphics context, respecting the image’s orientation setting
+    UIGraphicsBeginImageContext(imageSrc.size);
+    [imageSrc drawAtPoint:CGPointMake(0, 0)];
+    UIImage *retImage = UIGraphicsGetImageFromCurrentImageContext();
+    UIGraphicsEndImageContext();
+    
+    return retImage;
+}
+
++ (MXKImageCompressionSizes)availableCompressionSizesForImage:(UIImage*)image originalFileSize:(NSUInteger)originalFileSize
+{
+    MXKImageCompressionSizes compressionSizes;
+    memset(&compressionSizes, 0, sizeof(MXKImageCompressionSizes));
+    
+    // Store the original
+    compressionSizes.original.imageSize = image.size;
+    compressionSizes.original.fileSize = originalFileSize ? originalFileSize : UIImageJPEGRepresentation(image, 0.9).length;
+    
+    MXLogDebug(@"[MXKTools] availableCompressionSizesForImage: %f %f - File size: %tu", compressionSizes.original.imageSize.width, compressionSizes.original.imageSize.height, compressionSizes.original.fileSize);
+    
+    compressionSizes.actualLargeSize = MXKTOOLS_LARGE_IMAGE_SIZE;
+    
+    // Compute the file size for each compression level
+    CGFloat maxSize = MAX(compressionSizes.original.imageSize.width, compressionSizes.original.imageSize.height);
+    if (maxSize >= MXKTOOLS_SMALL_IMAGE_SIZE)
+    {
+        compressionSizes.small.imageSize = [MXKTools resizeImageSize:compressionSizes.original.imageSize toFitInSize:CGSizeMake(MXKTOOLS_SMALL_IMAGE_SIZE, MXKTOOLS_SMALL_IMAGE_SIZE) canExpand:NO];
+        
+        compressionSizes.small.fileSize = (NSUInteger)[MXTools roundFileSize:(long long)(compressionSizes.small.imageSize.width * compressionSizes.small.imageSize.height * 0.20)];
+        
+        if (maxSize >= MXKTOOLS_MEDIUM_IMAGE_SIZE)
+        {
+            compressionSizes.medium.imageSize = [MXKTools resizeImageSize:compressionSizes.original.imageSize toFitInSize:CGSizeMake(MXKTOOLS_MEDIUM_IMAGE_SIZE, MXKTOOLS_MEDIUM_IMAGE_SIZE) canExpand:NO];
+            
+            compressionSizes.medium.fileSize = (NSUInteger)[MXTools roundFileSize:(long long)(compressionSizes.medium.imageSize.width * compressionSizes.medium.imageSize.height * 0.20)];
+            
+            if (maxSize >= MXKTOOLS_LARGE_IMAGE_SIZE)
+            {
+                // In case of panorama the large resolution (1024 x ...) is not relevant. We prefer consider the third of the panarama width.
+                compressionSizes.actualLargeSize = maxSize / 3;
+                if (compressionSizes.actualLargeSize < MXKTOOLS_LARGE_IMAGE_SIZE)
+                {
+                    compressionSizes.actualLargeSize = MXKTOOLS_LARGE_IMAGE_SIZE;
+                }
+                else
+                {
+                    // Keep a multiple of predefined large size
+                    compressionSizes.actualLargeSize = floor(compressionSizes.actualLargeSize / MXKTOOLS_LARGE_IMAGE_SIZE) * MXKTOOLS_LARGE_IMAGE_SIZE;
+                }
+                
+                compressionSizes.large.imageSize = [MXKTools resizeImageSize:compressionSizes.original.imageSize toFitInSize:CGSizeMake(compressionSizes.actualLargeSize, compressionSizes.actualLargeSize) canExpand:NO];
+                
+                compressionSizes.large.fileSize = (NSUInteger)[MXTools roundFileSize:(long long)(compressionSizes.large.imageSize.width * compressionSizes.large.imageSize.height * 0.20)];
+            }
+            else
+            {
+                MXLogDebug(@"    - too small to fit in %d", MXKTOOLS_LARGE_IMAGE_SIZE);
+            }
+        }
+        else
+        {
+            MXLogDebug(@"    - too small to fit in %d", MXKTOOLS_MEDIUM_IMAGE_SIZE);
+        }
+    }
+    else
+    {
+        MXLogDebug(@"    - too small to fit in %d", MXKTOOLS_SMALL_IMAGE_SIZE);
+    }
+    
+    return compressionSizes;
+}
+
+
++ (CGSize)resizeImageSize:(CGSize)originalSize toFitInSize:(CGSize)maxSize canExpand:(BOOL)canExpand
+{
+    if ((originalSize.width == 0) || (originalSize.height == 0))
+    {
+        return CGSizeZero;
+    }
+    
+    CGSize resized = originalSize;
+    
+    if ((maxSize.width > 0) && (maxSize.height > 0) && (canExpand || ((originalSize.width > maxSize.width) || (originalSize.height > maxSize.height))))
+    {
+        CGFloat ratioX = maxSize.width  / originalSize.width;
+        CGFloat ratioY = maxSize.height / originalSize.height;
+        
+        CGFloat scale = MIN(ratioX, ratioY);
+        resized.width  *= scale;
+        resized.height *= scale;
+        
+        // padding
+        resized.width  = floorf(resized.width  / 2) * 2;
+        resized.height = floorf(resized.height / 2) * 2;
+    }
+    
+    return resized;
+}
+
++ (CGSize)resizeImageSize:(CGSize)originalSize toFillWithSize:(CGSize)maxSize canExpand:(BOOL)canExpand
+{
+    CGSize resized = originalSize;
+    
+    if ((maxSize.width > 0) && (maxSize.height > 0) && (canExpand || ((originalSize.width > maxSize.width) && (originalSize.height > maxSize.height))))
+    {
+        CGFloat ratioX = maxSize.width  / originalSize.width;
+        CGFloat ratioY = maxSize.height / originalSize.height;
+        
+        CGFloat scale = MAX(ratioX, ratioY);
+        resized.width  *= scale;
+        resized.height *= scale;
+        
+        // padding
+        resized.width  = floorf(resized.width  / 2) * 2;
+        resized.height = floorf(resized.height / 2) * 2;
+    }
+    
+    return resized;
+}
+
++ (UIImage *)reduceImage:(UIImage *)image toFitInSize:(CGSize)size
+{
+    return [self reduceImage:image toFitInSize:size useMainScreenScale:NO];
+}
+
++ (UIImage *)reduceImage:(UIImage *)image toFitInSize:(CGSize)size useMainScreenScale:(BOOL)useMainScreenScale
+{
+    UIImage *resizedImage;
+    
+    // Check whether resize is required
+    if (size.width && size.height)
+    {
+        CGFloat width = image.size.width;
+        CGFloat height = image.size.height;
+        
+        if (width > size.width)
+        {
+            height = (height * size.width) / width;
+            height = floorf(height / 2) * 2;
+            width = size.width;
+        }
+        if (height > size.height)
+        {
+            width = (width * size.height) / height;
+            width = floorf(width / 2) * 2;
+            height = size.height;
+        }
+        
+        if (width != image.size.width || height != image.size.height)
+        {
+            // Create the thumbnail
+            CGSize imageSize = CGSizeMake(width, height);
+            
+            // Convert first the provided size in pixels
+            
+            // The scale factor is set to 0.0 to use the scale factor of the device’s main screen.
+            CGFloat scale = useMainScreenScale ? 0.0 : 1.0;
+            
+            UIGraphicsBeginImageContextWithOptions(imageSize, NO, scale);
+            
+            //            // set to the top quality
+            //            CGContextRef context = UIGraphicsGetCurrentContext();
+            //            CGContextSetInterpolationQuality(context, kCGInterpolationHigh);
+            
+            CGRect thumbnailRect = CGRectMake(0, 0, 0, 0);
+            thumbnailRect.origin = CGPointMake(0.0,0.0);
+            thumbnailRect.size.width  = imageSize.width;
+            thumbnailRect.size.height = imageSize.height;
+            
+            [image drawInRect:thumbnailRect];
+            resizedImage = UIGraphicsGetImageFromCurrentImageContext();
+            UIGraphicsEndImageContext();
+        }
+    }
+    else
+    {
+        resizedImage = image;
+    }
+    
+    return resizedImage;
+}
+
++ (UIImage*)resizeImageWithData:(NSData*)imageData toFitInSize:(CGSize)size
+{
+    // Create the image source
+    CGImageSourceRef imageSource = CGImageSourceCreateWithData((__bridge CFDataRef)imageData, NULL);
+
+    // Take the max dimension of size to fit in
+    CGFloat maxPixelSize = fmax(size.width, size.height);
+
+    //Create thumbnail options
+    CFDictionaryRef options = (__bridge CFDictionaryRef) @{
+                                                           (id) kCGImageSourceCreateThumbnailWithTransform : (id)kCFBooleanTrue,
+                                                           (id) kCGImageSourceCreateThumbnailFromImageAlways : (id)kCFBooleanTrue,
+                                                           (id) kCGImageSourceThumbnailMaxPixelSize : @(maxPixelSize)
+                                                           };
+
+    // Generate the thumbnail
+    CGImageRef resizedImageRef = CGImageSourceCreateThumbnailAtIndex(imageSource, 0, options);
+
+    UIImage *resizedImage = [[UIImage alloc] initWithCGImage:resizedImageRef];
+
+    CGImageRelease(resizedImageRef);
+    CFRelease(imageSource);
+
+    return resizedImage;
+}
+
++ (UIImage*)resizeImage:(UIImage *)image toSize:(CGSize)size
+{
+    UIImage *resizedImage = image;
+    
+    // Check whether resize is required
+    if (size.width && size.height)
+    {
+        // Convert first the provided size in pixels
+        // The scale factor is set to 0.0 to use the scale factor of the device’s main screen.
+        UIGraphicsBeginImageContextWithOptions(size, NO, 0.0);
+        
+        CGContextRef context = UIGraphicsGetCurrentContext();
+        CGContextSetInterpolationQuality(context, kCGInterpolationHigh);
+        
+        [image drawInRect:CGRectMake(0, 0, size.width, size.height)];
+        resizedImage = UIGraphicsGetImageFromCurrentImageContext();
+        
+        UIGraphicsEndImageContext();
+    }
+    
+    return resizedImage;
+}
+
++ (UIImage*)resizeImageWithRoundedCorners:(UIImage *)image toSize:(CGSize)size
+{
+    UIImage *resizedImage = image;
+    
+    // Check whether resize is required
+    if (size.width && size.height)
+    {
+        // Convert first the provided size in pixels
+        // The scale factor is set to 0.0 to use the scale factor of the device’s main screen.
+        UIGraphicsBeginImageContextWithOptions(size, NO, 0.0);
+        
+        CGContextRef context = UIGraphicsGetCurrentContext();
+        CGContextSetInterpolationQuality(context, kCGInterpolationHigh);
+        
+        // Add a clip to round corners
+        [[UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, size.width, size.height) cornerRadius:size.width/2] addClip];
+        
+        [image drawInRect:CGRectMake(0, 0, size.width, size.height)];
+        resizedImage = UIGraphicsGetImageFromCurrentImageContext();
+        
+        UIGraphicsEndImageContext();
+    }
+    
+    return resizedImage;
+}
+
++ (UIImage*)paintImage:(UIImage*)image withColor:(UIColor*)color
+{
+    UIImage *newImage;
+    
+    const CGFloat *colorComponents = CGColorGetComponents(color.CGColor);
+    
+    // Create a new image with the same size
+    UIGraphicsBeginImageContextWithOptions(image.size, 0, 0);
+    
+    CGContextRef gc = UIGraphicsGetCurrentContext();
+    
+    CGRect rect = (CGRect){ .size = image.size};
+    
+    [image drawInRect:rect
+            blendMode:kCGBlendModeNormal
+                alpha:1];
+    
+    // Binarize the image: Transform all colors into the provided color but keep the alpha
+    CGContextSetBlendMode(gc, kCGBlendModeSourceIn);
+    CGContextSetRGBFillColor(gc, colorComponents[0], colorComponents[1], colorComponents[2], colorComponents[3]);
+    CGContextFillRect(gc, rect);
+    
+    // Retrieve the result into an UIImage
+    newImage = UIGraphicsGetImageFromCurrentImageContext();
+    
+    UIGraphicsEndImageContext();
+    
+    return newImage;
+}
+
++ (UIImageOrientation)imageOrientationForRotationAngleInDegree:(NSInteger)angle
+{
+    NSInteger modAngle = angle % 360;
+    
+    UIImageOrientation orientation = UIImageOrientationUp;
+    if (45 <= modAngle && modAngle < 135)
+    {
+        return UIImageOrientationRight;
+    }
+    else if (135 <= modAngle && modAngle < 225)
+    {
+        return UIImageOrientationDown;
+    }
+    else if (225 <= modAngle && modAngle < 315)
+    {
+        return UIImageOrientationLeft;
+    }
+    
+    return orientation;
+}
+
+static NSMutableDictionary* backgroundByImageNameDict;
+
++ (UIColor*)convertImageToPatternColor:(NSString*)resourceName backgroundColor:(UIColor*)backgroundColor patternSize:(CGSize)patternSize resourceSize:(CGSize)resourceSize
+{
+    if (!resourceName)
+    {
+        return backgroundColor;
+    }
+    
+    if (!backgroundByImageNameDict)
+    {
+        backgroundByImageNameDict = [[NSMutableDictionary alloc] init];
+    }
+    
+    NSString* key = [NSString stringWithFormat:@"%@ %f %f", resourceName, patternSize.width, resourceSize.width];
+    
+    UIColor* bgColor = [backgroundByImageNameDict objectForKey:key];
+    
+    if (!bgColor)
+    {
+        UIImageView* backgroundView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, patternSize.width, patternSize.height)];
+        backgroundView.backgroundColor = backgroundColor;
+        
+        CGFloat offsetX = (patternSize.width - resourceSize.width) / 2.0f;
+        CGFloat offsetY = (patternSize.height - resourceSize.height) / 2.0f;
+        
+        UIImageView* resourceImageView = [[UIImageView alloc] initWithFrame:CGRectMake(offsetX, offsetY, resourceSize.width, resourceSize.height)];
+        resourceImageView.backgroundColor = [UIColor clearColor];
+        UIImage *resImage = [UIImage imageNamed:resourceName];
+        if (CGSizeEqualToSize(resImage.size, resourceSize))
+        {
+            resourceImageView.image = resImage;
+        }
+        else
+        {
+            resourceImageView.image = [MXKTools resizeImage:resImage toSize:resourceSize];
+        }
+        
+        
+        [backgroundView addSubview:resourceImageView];
+        
+        // Create a "canvas" (image context) to draw in.
+        UIGraphicsBeginImageContextWithOptions(backgroundView.frame.size, NO, 0);
+        
+        // set to the top quality
+        CGContextRef context = UIGraphicsGetCurrentContext();
+        CGContextSetInterpolationQuality(context, kCGInterpolationHigh);
+        [[backgroundView layer] renderInContext: UIGraphicsGetCurrentContext()];
+        UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
+        UIGraphicsEndImageContext();
+        
+        
+        bgColor = [[UIColor alloc] initWithPatternImage:image];
+        [backgroundByImageNameDict setObject:bgColor forKey:key];
+    }
+    
+    return bgColor;
+}
+
+#pragma mark - Video Conversion
+
++ (UIAlertController*)videoConversionPromptForVideoAsset:(AVAsset *)videoAsset
+                                           withCompletion:(void (^)(NSString * _Nullable presetName))completion
+{
+    UIAlertController *compressionPrompt = [UIAlertController alertControllerWithTitle:[MatrixKitL10n attachmentSizePromptTitle]
+                                                                               message:[MatrixKitL10n attachmentSizePromptMessage]
+                                                                        preferredStyle:UIAlertControllerStyleActionSheet];
+    
+    CGSize naturalSize = [videoAsset tracksWithMediaType:AVMediaTypeVideo].firstObject.naturalSize;
+    
+    // Provide 480p as the baseline preset.
+    NSString *fileSizeString = [MXKTools estimatedFileSizeStringForVideoAsset:videoAsset withPresetName:AVAssetExportPreset640x480];
+    NSString *title = [MatrixKitL10n attachmentSmallWithResolution:@"480p" :fileSizeString];
+    [compressionPrompt addAction:[UIAlertAction actionWithTitle:title
+                                                          style:UIAlertActionStyleDefault
+                                                        handler:^(UIAlertAction * action) {
+        // Call the completion with 480p preset.
+        completion(AVAssetExportPreset640x480);
+    }]];
+    
+    // Allow 720p when the video exceeds 480p.
+    if (naturalSize.height > 480)
+    {
+        NSString *fileSizeString = [MXKTools estimatedFileSizeStringForVideoAsset:videoAsset withPresetName:AVAssetExportPreset1280x720];
+        NSString *title = [MatrixKitL10n attachmentMediumWithResolution:@"720p" :fileSizeString];
+        [compressionPrompt addAction:[UIAlertAction actionWithTitle:title
+                                                              style:UIAlertActionStyleDefault
+                                                            handler:^(UIAlertAction * action) {
+            // Call the completion with 720p preset.
+            completion(AVAssetExportPreset1280x720);
+        }]];
+    }
+    
+    // Allow 1080p when the video exceeds 720p.
+    if (naturalSize.height > 720)
+    {
+        NSString *fileSizeString = [MXKTools estimatedFileSizeStringForVideoAsset:videoAsset withPresetName:AVAssetExportPreset1920x1080];
+        NSString *title = [MatrixKitL10n attachmentLargeWithResolution:@"1080p" :fileSizeString];
+        [compressionPrompt addAction:[UIAlertAction actionWithTitle:title
+                                                              style:UIAlertActionStyleDefault
+                                                            handler:^(UIAlertAction * action) {
+            // Call the completion with 1080p preset.
+            completion(AVAssetExportPreset1920x1080);
+        }]];
+    }
+    
+    [compressionPrompt addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+                                                          style:UIAlertActionStyleCancel
+                                                        handler:^(UIAlertAction * action) {
+        // Cancelled. Call the completion with nil.
+        completion(nil);
+    }]];
+    
+    return compressionPrompt;
+}
+
++ (NSString *)estimatedFileSizeStringForVideoAsset:(AVAsset *)videoAsset withPresetName:(NSString *)presetName
+{
+    AVAssetExportSession *exportSession = [AVAssetExportSession exportSessionWithAsset:videoAsset presetName:presetName];
+    exportSession.timeRange = CMTimeRangeMake(kCMTimeZero, videoAsset.duration);
+    
+    return [MXTools fileSizeToString:exportSession.estimatedOutputFileLength];
+}
+
+#pragma mark - App permissions
+
++ (void)checkAccessForMediaType:(NSString *)mediaType
+            manualChangeMessage:(NSString *)manualChangeMessage
+      showPopUpInViewController:(UIViewController *)viewController
+              completionHandler:(void (^)(BOOL))handler
+{
+    [AVCaptureDevice requestAccessForMediaType:mediaType completionHandler:^(BOOL granted) {
+
+        dispatch_async(dispatch_get_main_queue(), ^{
+
+            if (granted)
+            {
+                handler(YES);
+            }
+            else
+            {
+                // Access not granted to mediaType
+                // Display manualChangeMessage
+                UIAlertController *alert = [UIAlertController alertControllerWithTitle:nil message:manualChangeMessage preferredStyle:UIAlertControllerStyleAlert];
+
+                // On iOS >= 8, add a shortcut to the app settings (This requires the shared application instance)
+                UIApplication *sharedApplication = [UIApplication performSelector:@selector(sharedApplication)];
+                if (sharedApplication && UIApplicationOpenSettingsURLString)
+                {
+                    [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n settings]
+                                                                     style:UIAlertActionStyleDefault
+                                                                   handler:^(UIAlertAction * action) {
+                                                                       
+                                                                       NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
+                                                                       [sharedApplication performSelector:@selector(openURL:) withObject:url];
+                                                                       
+                                                                       // Note: it does not worth to check if the user changes the permission
+                                                                       // because iOS restarts the app in case of change of app privacy settings
+                                                                       handler(NO);
+                                                                       
+                                                                   }]];
+                }
+                
+                [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
+                                                          style:UIAlertActionStyleDefault
+                                                        handler:^(UIAlertAction * action) {
+                                                            
+                                                            handler(NO);
+                                                            
+                                                        }]];
+                
+                [viewController presentViewController:alert animated:YES completion:nil];
+            }
+            
+        });
+    }];
+}
+
++ (void)checkAccessForCall:(BOOL)isVideoCall
+manualChangeMessageForAudio:(NSString*)manualChangeMessageForAudio
+manualChangeMessageForVideo:(NSString*)manualChangeMessageForVideo
+ showPopUpInViewController:(UIViewController*)viewController
+         completionHandler:(void (^)(BOOL granted))handler
+{
+    // Check first microphone permission
+    [MXKTools checkAccessForMediaType:AVMediaTypeAudio manualChangeMessage:manualChangeMessageForAudio showPopUpInViewController:viewController completionHandler:^(BOOL granted) {
+
+        if (granted)
+        {
+            // Check camera permission in case of video call
+            if (isVideoCall)
+            {
+                [MXKTools checkAccessForMediaType:AVMediaTypeVideo manualChangeMessage:manualChangeMessageForVideo showPopUpInViewController:viewController completionHandler:^(BOOL granted) {
+
+                    handler(granted);
+                }];
+            }
+            else
+            {
+                handler(YES);
+            }
+        }
+        else
+        {
+            handler(NO);
+        }
+    }];
+}
+
++ (void)checkAccessForContacts:(NSString *)manualChangeMessage
+     showPopUpInViewController:(UIViewController *)viewController
+             completionHandler:(void (^)(BOOL granted))handler
+{
+    [self checkAccessForContacts:nil withManualChangeMessage:manualChangeMessage showPopUpInViewController:viewController completionHandler:handler];
+}
+
++ (void)checkAccessForContacts:(NSString *)manualChangeTitle
+       withManualChangeMessage:(NSString *)manualChangeMessage
+     showPopUpInViewController:(UIViewController *)viewController
+             completionHandler:(void (^)(BOOL granted))handler
+{
+    // Check if the application is allowed to list the contacts
+    CNAuthorizationStatus authStatus = [CNContactStore authorizationStatusForEntityType:CNEntityTypeContacts];
+    if (authStatus == CNAuthorizationStatusAuthorized)
+    {
+        handler(YES);
+    }
+    else if (authStatus == CNAuthorizationStatusNotDetermined)
+    {
+        // Request address book access
+        [[CNContactStore new] requestAccessForEntityType:CNEntityTypeContacts completionHandler:^(BOOL granted, NSError * _Nullable error) {
+            
+            [MXSDKOptions.sharedInstance.analyticsDelegate trackContactsAccessGranted:granted];
+            
+            dispatch_async(dispatch_get_main_queue(), ^{
+                
+                handler(granted);
+                
+            });
+        }];
+    }
+    else if (authStatus == CNAuthorizationStatusDenied && viewController && manualChangeMessage)
+    {
+        // Access not granted to the local contacts
+        // Display manualChangeMessage
+        UIAlertController *alert = [UIAlertController alertControllerWithTitle:manualChangeTitle message:manualChangeMessage preferredStyle:UIAlertControllerStyleAlert];
+
+        [alert addAction:[UIAlertAction actionWithTitle:MatrixKitL10n.cancel
+                                                  style:UIAlertActionStyleDefault
+                                                handler:^(UIAlertAction * action) {
+            
+            handler(NO);
+            
+        }]];
+        
+        // Add a shortcut to the app settings (This requires the shared application instance)
+        UIApplication *sharedApplication = [UIApplication performSelector:@selector(sharedApplication)];
+        if (sharedApplication)
+        {
+            UIAlertAction *settingsAction = [UIAlertAction actionWithTitle:MatrixKitL10n.settings
+                                                                     style:UIAlertActionStyleDefault
+                                                                   handler:^(UIAlertAction * action) {
+                [MXKAppSettings standardAppSettings].syncLocalContactsPermissionOpenedSystemSettings = YES;
+                // Wait for the setting to be saved as the app could be killed imminently.
+                [[NSUserDefaults standardUserDefaults] synchronize];
+                
+                NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
+                [sharedApplication performSelector:@selector(openURL:) withObject:url];
+                
+                // Note: it does not worth to check if the user changes the permission
+                // because iOS restarts the app in case of change of app privacy settings
+                handler(NO);
+            }];
+            
+            [alert addAction: settingsAction];
+            alert.preferredAction = settingsAction;
+        }
+        
+        [viewController presentViewController:alert animated:YES completion:nil];
+    }
+    else
+    {
+        handler(NO);
+    }
+}
+
+#pragma mark - HTML processing
+
++ (NSAttributedString*)removeDTCoreTextArtifacts:(NSAttributedString*)attributedString
+{
+    NSMutableAttributedString *mutableAttributedString = [[NSMutableAttributedString alloc] initWithAttributedString:attributedString];
+    
+    // DTCoreText adds a newline at the end of plain text ( https://github.com/Cocoanetics/DTCoreText/issues/779 )
+    // or after a blockquote section.
+    // Trim trailing whitespace and newlines in the string content
+    while ([mutableAttributedString.string hasSuffixCharacterFromSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]])
+    {
+        [mutableAttributedString deleteCharactersInRange:NSMakeRange(mutableAttributedString.length - 1, 1)];
+    }
+    
+    // New lines may have also been introduced by the paragraph style
+    // Make sure the last paragraph style has no spacing
+    [mutableAttributedString enumerateAttributesInRange:NSMakeRange(0, mutableAttributedString.length) options:(NSAttributedStringEnumerationReverse) usingBlock:^(NSDictionary *attrs, NSRange range, BOOL *stop) {
+        
+        if (attrs[NSParagraphStyleAttributeName])
+        {
+            NSString *subString = [mutableAttributedString.string substringWithRange:range];
+            NSArray *components = [subString componentsSeparatedByCharactersInSet:[NSCharacterSet newlineCharacterSet]];
+            
+            NSMutableDictionary *updatedAttrs = [NSMutableDictionary dictionaryWithDictionary:attrs];
+            NSMutableParagraphStyle *paragraphStyle = [updatedAttrs[NSParagraphStyleAttributeName] mutableCopy];
+            paragraphStyle.paragraphSpacing = 0;
+            updatedAttrs[NSParagraphStyleAttributeName] = paragraphStyle;
+            
+            if (components.count > 1)
+            {
+                NSString *lastComponent = components.lastObject;
+                
+                NSRange range2 = NSMakeRange(range.location, range.length - lastComponent.length);
+                [mutableAttributedString setAttributes:attrs range:range2];
+                
+                range2 = NSMakeRange(range2.location + range2.length, lastComponent.length);
+                [mutableAttributedString setAttributes:updatedAttrs range:range2];
+            }
+            else
+            {
+                [mutableAttributedString setAttributes:updatedAttrs range:range];
+            }
+        }
+        
+        // Check only the last paragraph
+        *stop = YES;
+    }];
+    
+    // Image rendering failed on an exception until we replace the DTImageTextAttachments with a simple NSTextAttachment subclass
+    // (thanks to https://github.com/Cocoanetics/DTCoreText/issues/863).
+    [mutableAttributedString enumerateAttribute:NSAttachmentAttributeName
+                                        inRange:NSMakeRange(0, mutableAttributedString.length)
+                                        options:0
+                                     usingBlock:^(id value, NSRange range, BOOL *stop) {
+                                         
+                                         if ([value isKindOfClass:DTImageTextAttachment.class])
+                                         {
+                                             DTImageTextAttachment *attachment = (DTImageTextAttachment*)value;
+                                             NSTextAttachment *textAttachment = [[NSTextAttachment alloc] init];
+                                             if (attachment.image)
+                                             {
+                                                 textAttachment.image = attachment.image;
+                                                 
+                                                 CGRect frame = textAttachment.bounds;
+                                                 frame.size = attachment.displaySize;
+                                                 textAttachment.bounds = frame;
+                                             }
+                                             // Note we remove here attachment without image.
+                                             NSAttributedString *attrStringWithImage = [NSAttributedString attributedStringWithAttachment:textAttachment];
+                                             [mutableAttributedString replaceCharactersInRange:range withAttributedString:attrStringWithImage];
+                                         }
+                                     }];
+    
+    return mutableAttributedString;
+}
+
++ (NSAttributedString*)createLinksInAttributedString:(NSAttributedString*)attributedString forEnabledMatrixIds:(NSInteger)enabledMatrixIdsBitMask
+{
+    if (!attributedString)
+    {
+        return nil;
+    }
+    
+    NSMutableAttributedString *postRenderAttributedString;
+    
+    // If enabled, make user id clickable
+    if (enabledMatrixIdsBitMask & MXKTOOLS_USER_IDENTIFIER_BITWISE)
+    {
+        [MXKTools createLinksInAttributedString:attributedString matchingRegex:userIdRegex withWorkingAttributedString:&postRenderAttributedString];
+    }
+    
+    // If enabled, make room id clickable
+    if (enabledMatrixIdsBitMask & MXKTOOLS_ROOM_IDENTIFIER_BITWISE)
+    {
+        [MXKTools createLinksInAttributedString:attributedString matchingRegex:roomIdRegex withWorkingAttributedString:&postRenderAttributedString];
+    }
+    
+    // If enabled, make room alias clickable
+    if (enabledMatrixIdsBitMask & MXKTOOLS_ROOM_ALIAS_BITWISE)
+    {
+        [MXKTools createLinksInAttributedString:attributedString matchingRegex:roomAliasRegex withWorkingAttributedString:&postRenderAttributedString];
+    }
+    
+    // If enabled, make event id clickable
+    if (enabledMatrixIdsBitMask & MXKTOOLS_EVENT_IDENTIFIER_BITWISE)
+    {
+        [MXKTools createLinksInAttributedString:attributedString matchingRegex:eventIdRegex withWorkingAttributedString:&postRenderAttributedString];
+    }
+    
+    // If enabled, make group id clickable
+    if (enabledMatrixIdsBitMask & MXKTOOLS_GROUP_IDENTIFIER_BITWISE)
+    {
+        [MXKTools createLinksInAttributedString:attributedString matchingRegex:groupIdRegex withWorkingAttributedString:&postRenderAttributedString];
+    }
+    
+    return postRenderAttributedString ? postRenderAttributedString : attributedString;
+}
+
++ (void)createLinksInAttributedString:(NSAttributedString*)attributedString matchingRegex:(NSRegularExpression*)regex withWorkingAttributedString:(NSMutableAttributedString* __autoreleasing *)mutableAttributedString
+{
+    __block NSArray *linkMatches;
+    
+    // Enumerate each string matching the regex
+    [regex enumerateMatchesInString:attributedString.string options:0 range:NSMakeRange(0, attributedString.length) usingBlock:^(NSTextCheckingResult *match, NSMatchingFlags flags, BOOL *stop) {
+        
+        // Do not create a link if there is already one on the found match
+        __block BOOL hasAlreadyLink = NO;
+        [attributedString enumerateAttributesInRange:match.range options:0 usingBlock:^(NSDictionary<NSString *,id> * _Nonnull attrs, NSRange range, BOOL * _Nonnull stop) {
+            
+            if (attrs[NSLinkAttributeName])
+            {
+                hasAlreadyLink = YES;
+                *stop = YES;
+            }
+        }];
+        
+        // Do not create a link if the match is part of an http link.
+        // The http link will be automatically generated by the UI afterwards.
+        // So, do not break it now by adding a link on a subset of this http link.
+        if (!hasAlreadyLink)
+        {
+            if (!linkMatches)
+            {
+                // Search for the links in the string only once
+                // Do not use NSDataDetector with NSTextCheckingTypeLink because is not able to
+                // manage URLs with 2 hashes like "https://matrix.to/#/#matrix:matrix.org"
+                // Such URL is not valid but web browsers can open them and users C+P them...
+                // NSDataDetector does not support it but UITextView and UIDataDetectorTypeLink
+                // detect them when they are displayed. So let the UI create the link at display.
+                linkMatches = [httpLinksRegex matchesInString:attributedString.string options:0 range:NSMakeRange(0, attributedString.length)];
+            }
+            
+            for (NSTextCheckingResult *linkMatch in linkMatches)
+            {
+                // If the match is fully in the link, skip it
+                if (NSIntersectionRange(match.range, linkMatch.range).length == match.range.length)
+                {
+                    hasAlreadyLink = YES;
+                    break;
+                }
+            }
+        }
+        
+        if (!hasAlreadyLink)
+        {
+            // Create the output string only if it is necessary because attributed strings cost CPU
+            if (!*mutableAttributedString)
+            {
+                *mutableAttributedString = [[NSMutableAttributedString alloc] initWithAttributedString:attributedString];
+            }
+            
+            // Make the link clickable
+            // Caution: We need here to escape the non-ASCII characters (like '#' in room alias)
+            // to convert the link into a legal URL string.
+            NSString *link = [attributedString.string substringWithRange:match.range];
+            link = [link stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+            [*mutableAttributedString addAttribute:NSLinkAttributeName value:link range:match.range];
+        }
+    }];
+}
+
+#pragma mark - HTML processing - blockquote display handling
+
++ (NSString*)cssToMarkBlockquotes
+{
+    return [NSString stringWithFormat:@"blockquote {background: #%lX; display: block;}", (unsigned long)[MXKTools rgbValueWithColor:kMXKToolsBlockquoteMarkColor]];
+}
+
++ (NSAttributedString*)removeMarkedBlockquotesArtifacts:(NSAttributedString*)attributedString
+{
+    NSMutableAttributedString *mutableAttributedString = [[NSMutableAttributedString alloc] initWithAttributedString:attributedString];
+
+    // Enumerate all sections marked thanks to `cssToMarkBlockquotes`
+    // and apply our own attribute instead.
+
+    // According to blockquotes in the string, DTCoreText can apply 2 policies:
+    //     - define a `DTTextBlocksAttribute` attribute on a <blockquote> block
+    //     - or, just define a `NSBackgroundColorAttributeName` attribute
+
+    // `DTTextBlocksAttribute` case
+    [attributedString enumerateAttribute:DTTextBlocksAttribute
+                                 inRange:NSMakeRange(0, attributedString.length)
+                                 options:0
+                              usingBlock:^(id  _Nullable value, NSRange range, BOOL * _Nonnull stop)
+     {
+         if ([value isKindOfClass:NSArray.class])
+         {
+             NSArray *array = (NSArray*)value;
+             if (array.count > 0 && [array[0] isKindOfClass:DTTextBlock.class])
+             {
+                 DTTextBlock *dtTextBlock = (DTTextBlock *)array[0];
+                 if ([dtTextBlock.backgroundColor isEqual:kMXKToolsBlockquoteMarkColor])
+                 {
+                     // Apply our own attribute
+                     [mutableAttributedString addAttribute:kMXKToolsBlockquoteMarkAttribute value:@(YES) range:range];
+
+                     // Fix a boring behaviour where DTCoreText add a " " string before a string corresponding
+                     // to an HTML blockquote. This " " string has ParagraphStyle.headIndent = 0 which breaks
+                     // the blockquote block indentation
+                     if (range.location > 0)
+                     {
+                         NSRange prevRange = NSMakeRange(range.location - 1, 1);
+
+                         NSRange effectiveRange;
+                         NSParagraphStyle *paragraphStyle = [attributedString attribute:NSParagraphStyleAttributeName
+                                                                                atIndex:prevRange.location
+                                                                         effectiveRange:&effectiveRange];
+
+                         // Check if this is the " " string
+                         if (paragraphStyle && effectiveRange.length == 1 && paragraphStyle.firstLineHeadIndent != 25)
+                         {
+                             // Fix its paragraph style
+                             NSMutableParagraphStyle *newParagraphStyle = [paragraphStyle mutableCopy];
+                             newParagraphStyle.firstLineHeadIndent = 25.0;
+                             newParagraphStyle.headIndent = 25.0;
+
+                             [mutableAttributedString addAttribute:NSParagraphStyleAttributeName value:newParagraphStyle range:prevRange];
+                         }
+                     }
+                 }
+             }
+         }
+     }];
+
+    // `NSBackgroundColorAttributeName` case
+    [mutableAttributedString enumerateAttribute:NSBackgroundColorAttributeName
+                                        inRange:NSMakeRange(0, mutableAttributedString.length)
+                                        options:0
+                                     usingBlock:^(id value, NSRange range, BOOL *stop)
+     {
+
+         if ([value isKindOfClass:UIColor.class] && [(UIColor*)value isEqual:[UIColor magentaColor]])
+         {
+             // Remove the marked background
+             [mutableAttributedString removeAttribute:NSBackgroundColorAttributeName range:range];
+
+             // And apply our own attribute
+             [mutableAttributedString addAttribute:kMXKToolsBlockquoteMarkAttribute value:@(YES) range:range];
+         }
+     }];
+
+    return mutableAttributedString;
+}
+
++ (void)enumerateMarkedBlockquotesInAttributedString:(NSAttributedString*)attributedString usingBlock:(void (^)(NSRange range, BOOL *stop))block
+{
+    [attributedString enumerateAttribute:kMXKToolsBlockquoteMarkAttribute
+                                 inRange:NSMakeRange(0, attributedString.length)
+                                 options:0
+                              usingBlock:^(id  _Nullable value, NSRange range, BOOL * _Nonnull stop)
+     {
+         if ([value isKindOfClass:NSNumber.class] && ((NSNumber*)value).boolValue)
+         {
+             block(range, stop);
+         }
+     }];
+}
+
+#pragma mark - Push
+
+// Trim push token before printing it in logs
++ (NSString*)logForPushToken:(NSData*)pushToken
+{
+    NSUInteger len = ((pushToken.length > 8) ? 8 : pushToken.length / 2);
+    return [NSString stringWithFormat:@"%@...", [pushToken subdataWithRange:NSMakeRange(0, len)]];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Utils/MXKUTI.swift b/Riot/Modules/MatrixKit/Utils/MXKUTI.swift
new file mode 100644
index 000000000..911beec65
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Utils/MXKUTI.swift
@@ -0,0 +1,203 @@
+/*
+ Copyright 2019 The Matrix.org Foundation C.I.C
+ 
+ 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 ImageIO
+import MobileCoreServices
+
+// We do not use the SwiftUTI pod anymore
+// The library is embedded in MatrixKit. See Libs/SwiftUTI/README.md for more details
+//import SwiftUTI
+
+/// MXKUTI represents a Universal Type Identifier (e.g. kUTTypePNG).
+/// See https://developer.apple.com/library/archive/documentation/FileManagement/Conceptual/understanding_utis/understand_utis_conc/understand_utis_conc.html#//apple_ref/doc/uid/TP40001319-CH202-SW5 for more information.
+/// MXKUTI wraps UTI class from SwiftUTI library (https://github.com/mkeiser/SwiftUTI) to make it available for Objective-C.
+@objcMembers
+open class MXKUTI: NSObject, RawRepresentable {
+    
+    public typealias RawValue = String
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    private let utiWrapper: UTI
+    
+    // MARK: Public
+    
+    /// UTI string
+    public var rawValue: String {
+        return utiWrapper.rawValue
+    }
+    
+    /// Return associated prefered file extension (e.g. "png").
+    public var fileExtension: String? {
+        return utiWrapper.fileExtension
+    }
+    
+    /// Return associated prefered mime-type (e.g. "image/png").
+    public var mimeType: String? {
+        return utiWrapper.mimeType
+    }
+    
+    // MARK: - Setup
+    
+    // MARK: Private
+    
+    private init(utiWrapper: UTI) {
+        self.utiWrapper = utiWrapper
+        super.init()
+    }
+    
+    // MARK: Public
+    
+    /// Initialize with UTI String.
+    /// Note: Although this initializer is marked as failable, due to RawRepresentable conformity, it cannot fail.
+    ///
+    /// - Parameter rawValue: UTI String (e.g. "public.png").
+    public required init?(rawValue: String) {
+        let utiWrapper = UTI(rawValue: rawValue)
+        self.utiWrapper = utiWrapper
+        super.init()
+    }
+    
+    /// Initialize with UTI CFString.
+    ///
+    /// - Parameter cfRawValue: UTI CFString (e.g. kUTTypePNG).
+    public convenience init?(cfRawValue: CFString) {
+        self.init(rawValue: cfRawValue as String)
+    }
+    
+    /// Initialize with file extension.
+    ///
+    /// - Parameter fileExtension: A file extesion (e.g. "png").
+    public convenience init(fileExtension: String) {
+        let utiWrapper = UTI(withExtension: fileExtension)
+        self.init(utiWrapper: utiWrapper)
+    }
+    
+    /// Initialize with MIME type.
+    ///
+    /// - Parameter mimeType: A MIME type (e.g. "image/png").
+    public convenience init?(mimeType: String) {
+        let utiWrapper = UTI(withMimeType: mimeType)
+        self.init(utiWrapper: utiWrapper)
+    }
+    
+    /// Check current UTI conformance with another UTI.
+    ///
+    /// - Parameter otherUTI: UTI which to conform with.
+    /// - Returns: true if self conforms to other UTI.
+    public func conforms(to otherUTI: MXKUTI) -> Bool {
+        return self.utiWrapper.conforms(to: otherUTI.utiWrapper)
+    }
+    
+    /// Check whether the current UTI conforms to any UTIs within an array.
+    ///
+    /// - Parameter otherUTIs: UTI which to conform with.
+    /// - Returns: true if self conforms to any of the other UTIs.
+    public func conformsToAny(of otherUTIs: [MXKUTI]) -> Bool {
+        for uti in otherUTIs {
+            if conforms(to: uti) {
+                return true
+            }
+        }
+        
+        return false
+    }
+}
+
+// MARK: - Other convenients initializers
+extension MXKUTI {
+    
+    /// Initialize with image data.
+    ///
+    /// - Parameter imageData: Image data.
+    convenience init?(imageData: Data) {
+        guard let imageSource = CGImageSourceCreateWithData(imageData as CFData, nil),
+            let uti = CGImageSourceGetType(imageSource) else {
+                return nil
+        }
+        self.init(rawValue: uti as String)
+    }
+    
+    /// Initialize with local file URL.
+    /// This method is currently applicable only to URLs for file system resources.
+    ///
+    /// - Parameters:
+    ///   - localFileURL: Local file URL.
+    ///   - loadResourceValues: Indicate true to prefetch `typeIdentifierKey` URLResourceKey
+    convenience init?(localFileURL: URL, loadResourceValues: Bool = true) {
+        if loadResourceValues,
+            let _ = try? FileManager.default.contentsOfDirectory(at: localFileURL.deletingLastPathComponent(), includingPropertiesForKeys: [.typeIdentifierKey], options: []),
+            let uti = try? localFileURL.resourceValues(forKeys: [.typeIdentifierKey]).typeIdentifier {
+            self.init(rawValue: uti)
+        } else if localFileURL.pathExtension.isEmpty == false {
+            let fileExtension = localFileURL.pathExtension
+            self.init(fileExtension: fileExtension)
+        } else {
+            return nil
+        }
+    }
+    
+    public convenience init?(localFileURL: URL) {
+        self.init(localFileURL: localFileURL, loadResourceValues: true)
+    }
+}
+
+// MARK: - Convenients conformance UTIs methods
+extension MXKUTI {
+    public var isImage: Bool {
+        return self.conforms(to: MXKUTI.image)
+    }
+    
+    public var isVideo: Bool {
+        return self.conforms(to: MXKUTI.movie)
+    }
+    
+    public var isFile: Bool {
+        return self.conforms(to: MXKUTI.data)
+    }
+}
+
+// MARK: - Some system defined UTIs
+extension MXKUTI {
+    public static let data = MXKUTI(cfRawValue: kUTTypeData)!
+    public static let text = MXKUTI(cfRawValue: kUTTypeText)!
+    public static let audio = MXKUTI(cfRawValue: kUTTypeAudio)!
+    public static let video = MXKUTI(cfRawValue: kUTTypeVideo)!
+    public static let movie = MXKUTI(cfRawValue: kUTTypeMovie)!
+    public static let image = MXKUTI(cfRawValue: kUTTypeImage)!
+    public static let png = MXKUTI(cfRawValue: kUTTypePNG)!
+    public static let jpeg = MXKUTI(cfRawValue: kUTTypeJPEG)!
+    public static let svg = MXKUTI(cfRawValue: kUTTypeScalableVectorGraphics)!
+    public static let url = MXKUTI(cfRawValue: kUTTypeURL)!
+    public static let fileUrl = MXKUTI(cfRawValue: kUTTypeFileURL)!
+    public static let html = MXKUTI(cfRawValue: kUTTypeHTML)!
+    public static let xml = MXKUTI(cfRawValue: kUTTypeXML)!
+}
+
+// MARK: - Convenience static methods
+extension MXKUTI {
+    
+    public static func mimeType(from fileExtension: String) -> String? {
+        return MXKUTI(fileExtension: fileExtension).mimeType
+    }
+    
+    public static func fileExtension(from mimeType: String) -> String? {
+        return MXKUTI(mimeType: mimeType)?.fileExtension
+    }
+}
diff --git a/Riot/Modules/MatrixKit/Utils/MXKVideoThumbnailGenerator.swift b/Riot/Modules/MatrixKit/Utils/MXKVideoThumbnailGenerator.swift
new file mode 100644
index 000000000..9f999294b
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Utils/MXKVideoThumbnailGenerator.swift
@@ -0,0 +1,76 @@
+/*
+ Copyright 2019 The Matrix.org Foundation C.I.C
+ 
+ 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
+import AVFoundation
+
+/// MXKVideoThumbnailGenerator is a utility class to generate a thumbnail image from a video file.
+@objcMembers
+public class MXKVideoThumbnailGenerator: NSObject {
+    
+    public static let shared = MXKVideoThumbnailGenerator()
+    
+    // MARK - Public
+    
+    /// Generate thumbnail image from a video URL.
+    /// Note: Do not make `maximumSize` optional with default nil value for Objective-C compatibility.
+    ///
+    /// - Parameters:
+    ///   - url: Video URL.
+    ///   - maximumSize: Maximum dimension for generated thumbnail image.
+    /// - Returns: Thumbnail image or nil.
+    public func generateThumbnail(from url: URL, with maximumSize: CGSize) -> UIImage? {
+        let finalSize: CGSize? = maximumSize != .zero ? maximumSize : nil
+        return self.generateThumbnail(from: url, with: finalSize)
+    }    
+    
+    /// Generate thumbnail image from a video URL.
+    ///
+    /// - Parameter url: Video URL.
+    /// - Returns: Thumbnail image or nil.
+    public func generateThumbnail(from url: URL) -> UIImage? {
+        return generateThumbnail(from: url, with: nil)
+    }
+    
+    // MARK - Private
+    
+    /// Generate thumbnail image from a video URL.
+    ///
+    /// - Parameters:
+    ///   - url: Video URL.
+    ///   - maximumSize: Maximum dimension for generated thumbnail image or nil to keep video dimension.
+    /// - Returns: Thumbnail image or nil.
+    private func generateThumbnail(from url: URL, with maximumSize: CGSize?) -> UIImage? {
+        let thumbnailImage: UIImage?
+        
+        let asset = AVAsset(url: url)
+        let assetImageGenerator = AVAssetImageGenerator(asset: asset)
+        assetImageGenerator.appliesPreferredTrackTransform = true
+        if let maximumSize = maximumSize {
+            assetImageGenerator.maximumSize = maximumSize
+        }
+        do {
+            // Generate thumbnail from first video image
+            let image = try assetImageGenerator.copyCGImage(at: .zero, actualTime: nil)
+            thumbnailImage = UIImage(cgImage: image)
+        } catch {
+            MXLog.error(error.localizedDescription)
+            thumbnailImage = nil
+        }
+        
+        return thumbnailImage
+    }
+}
diff --git a/Riot/Modules/MatrixKit/Views/Account/MXKAccountTableViewCell.h b/Riot/Modules/MatrixKit/Views/Account/MXKAccountTableViewCell.h
new file mode 100644
index 000000000..466872958
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/Account/MXKAccountTableViewCell.h
@@ -0,0 +1,43 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCell.h"
+
+#import "MXKImageView.h"
+#import "MXKAccount.h"
+
+/**
+ MXKAccountTableViewCell instance is a table view cell used to display a matrix user.
+ */
+@interface MXKAccountTableViewCell : MXKTableViewCell
+
+/**
+ The displayed account
+ */
+@property (nonatomic) MXKAccount* mxAccount;
+
+/**
+ The default account picture displayed when no picture is defined.
+ */
+@property (nonatomic) UIImage *picturePlaceholder;
+
+@property (strong, nonatomic) IBOutlet MXKImageView* accountPicture;
+
+@property (strong, nonatomic) IBOutlet UILabel* accountDisplayName;
+
+@property (strong, nonatomic) IBOutlet UISwitch* accountSwitchToggle;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/Account/MXKAccountTableViewCell.m b/Riot/Modules/MatrixKit/Views/Account/MXKAccountTableViewCell.m
new file mode 100644
index 000000000..c47f5e4e5
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/Account/MXKAccountTableViewCell.m
@@ -0,0 +1,96 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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 "MXKAccountTableViewCell.h"
+
+@import MatrixSDK.MXMediaManager;
+
+#import "NSBundle+MatrixKit.h"
+
+@implementation MXKAccountTableViewCell
+
+- (void)customizeTableViewCellRendering
+{
+    [super customizeTableViewCellRendering];
+    
+    self.accountPicture.defaultBackgroundColor = [UIColor clearColor];
+}
+
+- (void)setMxAccount:(MXKAccount *)mxAccount
+{
+    UIColor *presenceColor = nil;
+    
+    _accountDisplayName.text = mxAccount.fullDisplayName;
+    
+    if (mxAccount.mxSession)
+    {
+        _accountPicture.mediaFolder = kMXMediaManagerAvatarThumbnailFolder;
+        _accountPicture.enableInMemoryCache = YES;
+        [_accountPicture setImageURI:mxAccount.userAvatarUrl
+                            withType:nil
+                 andImageOrientation:UIImageOrientationUp
+                       toFitViewSize:_accountPicture.frame.size
+                          withMethod:MXThumbnailingMethodCrop
+                        previewImage:self.picturePlaceholder
+                        mediaManager:mxAccount.mxSession.mediaManager];
+        
+        presenceColor = [MXKAccount presenceColor:mxAccount.userPresence];
+    }
+    else
+    {
+        _accountPicture.image = self.picturePlaceholder;
+    }
+    
+    if (presenceColor)
+    {
+        _accountPicture.layer.borderWidth = 2;
+        _accountPicture.layer.borderColor = presenceColor.CGColor;
+    }
+    else
+    {
+        _accountPicture.layer.borderWidth = 0;
+    }
+    
+    _accountSwitchToggle.on = !mxAccount.disabled;
+    if (mxAccount.disabled)
+    {
+        _accountDisplayName.textColor = [UIColor lightGrayColor];
+    }
+    else
+    {
+        _accountDisplayName.textColor = [UIColor blackColor];
+    }
+    
+    _mxAccount = mxAccount;
+}
+
+- (UIImage*)picturePlaceholder
+{
+    return [NSBundle mxk_imageFromMXKAssetsBundleWithName:@"default-profile"];
+}
+
+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+    
+    // Round image view
+    [_accountPicture.layer setCornerRadius:_accountPicture.frame.size.width / 2];
+    _accountPicture.clipsToBounds = YES;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/Account/MXKAccountTableViewCell.xib b/Riot/Modules/MatrixKit/Views/Account/MXKAccountTableViewCell.xib
new file mode 100644
index 000000000..f5696126d
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/Account/MXKAccountTableViewCell.xib
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="odA-la-SwE" customClass="MXKAccountTableViewCell">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="50"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="odA-la-SwE" id="Ice-YN-Ffy">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="49"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="v7q-rw-kph" customClass="MXKImageView">
+                        <rect key="frame" x="5" y="5" width="39" height="39"/>
+                        <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" secondItem="v7q-rw-kph" secondAttribute="height" multiplier="1:1" id="FNp-g0-6gK"/>
+                        </constraints>
+                    </view>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rfi-Fa-7Uq">
+                        <rect key="frame" x="54" y="14" width="536" height="21"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <switch hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="k0G-KZ-5ft">
+                        <rect key="frame" x="543" y="9" width="51" height="31"/>
+                    </switch>
+                </subviews>
+                <constraints>
+                    <constraint firstAttribute="trailing" secondItem="rfi-Fa-7Uq" secondAttribute="trailing" constant="10" id="TxZ-NW-Qjo"/>
+                    <constraint firstAttribute="centerY" secondItem="rfi-Fa-7Uq" secondAttribute="centerY" id="Z4K-cO-leY"/>
+                    <constraint firstAttribute="bottom" secondItem="v7q-rw-kph" secondAttribute="bottom" constant="5" id="ddM-yA-zDv"/>
+                    <constraint firstItem="v7q-rw-kph" firstAttribute="leading" secondItem="Ice-YN-Ffy" secondAttribute="leading" constant="5" id="gWc-fO-98S"/>
+                    <constraint firstAttribute="centerY" secondItem="k0G-KZ-5ft" secondAttribute="centerY" id="iEh-VQ-sVC"/>
+                    <constraint firstAttribute="trailing" secondItem="k0G-KZ-5ft" secondAttribute="trailing" constant="8" id="msS-z1-wdL"/>
+                    <constraint firstItem="rfi-Fa-7Uq" firstAttribute="leading" secondItem="v7q-rw-kph" secondAttribute="trailing" constant="10" id="p61-62-Veh"/>
+                    <constraint firstItem="v7q-rw-kph" firstAttribute="top" secondItem="Ice-YN-Ffy" secondAttribute="top" constant="5" id="yf2-Mb-AeI"/>
+                </constraints>
+            </tableViewCellContentView>
+            <connections>
+                <outlet property="accountDisplayName" destination="rfi-Fa-7Uq" id="Tfu-Fo-eWp"/>
+                <outlet property="accountPicture" destination="v7q-rw-kph" id="Ss6-iD-9vq"/>
+                <outlet property="accountSwitchToggle" destination="k0G-KZ-5ft" id="k4E-FL-XyR"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthInputsEmailCodeBasedView.h b/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthInputsEmailCodeBasedView.h
new file mode 100644
index 000000000..d5406f4d5
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthInputsEmailCodeBasedView.h
@@ -0,0 +1,41 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKAuthInputsView.h"
+
+@interface MXKAuthInputsEmailCodeBasedView : MXKAuthInputsView
+
+/**
+ The input text field related to user id or user login.
+ */
+@property (weak, nonatomic) IBOutlet UITextField *userLoginTextField;
+
+/**
+ The input text field used to fill an email or the related token.
+ */
+@property (weak, nonatomic) IBOutlet UITextField *emailAndTokenTextField;
+
+/**
+ Label used to prompt user to fill the email token.
+ */
+@property (weak, nonatomic) IBOutlet UILabel *promptEmailTokenLabel;
+
+/**
+ The text field related to the display name. This item is displayed in case of registration.
+ */
+@property (weak, nonatomic) IBOutlet UITextField *displayNameTextField;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthInputsEmailCodeBasedView.m b/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthInputsEmailCodeBasedView.m
new file mode 100644
index 000000000..f43aada0d
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthInputsEmailCodeBasedView.m
@@ -0,0 +1,202 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKAuthInputsEmailCodeBasedView.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKSwiftHeader.h"
+
+@implementation MXKAuthInputsEmailCodeBasedView
+
++ (UINib *)nib
+{
+    return [UINib nibWithNibName:NSStringFromClass([MXKAuthInputsEmailCodeBasedView class])
+                          bundle:[NSBundle bundleForClass:[MXKAuthInputsEmailCodeBasedView class]]];
+}
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    
+    _userLoginTextField.placeholder = [MatrixKitL10n loginUserIdPlaceholder];
+    _emailAndTokenTextField.placeholder = [MatrixKitL10n loginEmailPlaceholder];
+    _promptEmailTokenLabel.text = [MatrixKitL10n loginPromptEmailToken];
+    
+    _displayNameTextField.placeholder = [MatrixKitL10n loginDisplayNamePlaceholder];
+}
+
+#pragma mark -
+
+- (BOOL)setAuthSession:(MXAuthenticationSession *)authSession withAuthType:(MXKAuthenticationType)authType;
+{
+    if (type == MXKAuthenticationTypeLogin || type == MXKAuthenticationTypeRegister)
+    {
+        // Validate first the provided session
+        MXAuthenticationSession *validSession = [self validateAuthenticationSession:authSession];
+        
+        if ([super setAuthSession:validSession withAuthType:authType])
+        {
+            // Set initial layout
+            self.userLoginTextField.hidden = NO;
+            self.promptEmailTokenLabel.hidden = YES;
+            
+            if (type == MXKAuthenticationTypeLogin)
+            {
+                self.emailAndTokenTextField.returnKeyType = UIReturnKeyDone;
+                self.displayNameTextField.hidden = YES;
+                
+                self.viewHeightConstraint.constant = self.displayNameTextField.frame.origin.y;
+            }
+            else
+            {
+                self.emailAndTokenTextField.returnKeyType = UIReturnKeyNext;
+                self.displayNameTextField.hidden = NO;
+                
+                self.viewHeightConstraint.constant = 122;
+            }
+            
+            return YES;
+        }
+    }
+    
+    return NO;
+}
+
+- (NSString*)validateParameters
+{
+    NSString *errorMsg = [super validateParameters];
+    
+    if (!errorMsg)
+    {
+        if (!self.areAllRequiredFieldsSet)
+        {
+            errorMsg = [MatrixKitL10n loginInvalidParam];
+        }
+    }
+    
+    return errorMsg;
+}
+
+- (BOOL)areAllRequiredFieldsSet
+{
+    BOOL ret = [super areAllRequiredFieldsSet];
+    
+    // Check required fields //FIXME what are required fields in this authentication flow?
+    ret = (ret && self.userLoginTextField.text.length && self.emailAndTokenTextField.text.length);
+    
+    return ret;
+}
+
+- (void)dismissKeyboard
+{
+    [self.userLoginTextField resignFirstResponder];
+    [self.emailAndTokenTextField resignFirstResponder];
+    [self.displayNameTextField resignFirstResponder];
+    
+    [super dismissKeyboard];
+}
+
+- (void)nextStep
+{
+    // Consider here the email token has been requested with success
+    [super nextStep];
+    
+    self.userLoginTextField.hidden = YES;
+    self.promptEmailTokenLabel.hidden = NO;
+    self.emailAndTokenTextField.placeholder = nil;
+    self.emailAndTokenTextField.returnKeyType = UIReturnKeyDone;
+    
+    self.displayNameTextField.hidden = YES;
+}
+
+- (NSString*)userId
+{
+    return self.userLoginTextField.text;
+}
+
+#pragma mark UITextField delegate
+
+- (BOOL)textFieldShouldReturn:(UITextField*)textField
+{
+    if (textField.returnKeyType == UIReturnKeyDone)
+    {
+        // "Done" key has been pressed
+        [textField resignFirstResponder];
+        
+        // Launch authentication now
+        [self.delegate authInputsViewDidPressDoneKey:self];
+    }
+    else
+    {
+        //"Next" key has been pressed
+        if (textField == self.userLoginTextField)
+        {
+            [self.emailAndTokenTextField becomeFirstResponder];
+        }
+        else if (textField == self.emailAndTokenTextField)
+        {
+            [self.displayNameTextField becomeFirstResponder];
+        }
+    }
+    
+    return YES;
+}
+
+#pragma mark -
+
+- (MXAuthenticationSession*)validateAuthenticationSession:(MXAuthenticationSession*)authSession
+{
+    // Check whether at least one of the listed flow is supported.
+    BOOL isSupported = NO;
+    
+    for (MXLoginFlow *loginFlow in authSession.flows)
+    {
+        // Check whether flow type is defined
+        if ([loginFlow.type isEqualToString:kMXLoginFlowTypeEmailCode])
+        {
+            isSupported = YES;
+            break;
+        }
+        else if (loginFlow.stages.count == 1 && [loginFlow.stages.firstObject isEqualToString:kMXLoginFlowTypeEmailCode])
+        {
+            isSupported = YES;
+            break;
+        }
+    }
+    
+    if (isSupported)
+    {
+        if (authSession.flows.count == 1)
+        {
+            // Return the original session.
+            return authSession;
+        }
+        else
+        {
+            // Keep only the supported flow.
+            MXAuthenticationSession *updatedAuthSession = [[MXAuthenticationSession alloc] init];
+            updatedAuthSession.session = authSession.session;
+            updatedAuthSession.params = authSession.params;
+            updatedAuthSession.flows = @[[MXLoginFlow modelFromJSON:@{@"stages":@[kMXLoginFlowTypeEmailCode]}]];
+            return updatedAuthSession;
+        }
+    }
+    
+    return nil;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthInputsEmailCodeBasedView.xib b/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthInputsEmailCodeBasedView.xib
new file mode 100644
index 000000000..e70ee341a
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthInputsEmailCodeBasedView.xib
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Nmn-Ry-t32" customClass="MXKAuthInputsEmailCodeBasedView">
+            <rect key="frame" x="0.0" y="0.0" width="300" height="122"/>
+            <subviews>
+                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Matrix ID (e.g. @bob:matrix.org or bob)" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="oen-Yq-xJw">
+                    <rect key="frame" x="14" y="8" width="272" height="30"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="30" id="gfu-Ef-79U"/>
+                        <constraint firstAttribute="width" constant="272" id="y4N-L3-qlh"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                    <textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="next"/>
+                    <connections>
+                        <outlet property="delegate" destination="Nmn-Ry-t32" id="Ari-Ab-eGE"/>
+                    </connections>
+                </textField>
+                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Email address" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="mbS-mV-L86" userLabel="Email-Token">
+                    <rect key="frame" x="14" y="46" width="272" height="30"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="30" id="ecT-NT-FqH"/>
+                        <constraint firstAttribute="width" constant="272" id="xkx-sr-F8M"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                    <textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="done" secureTextEntry="YES"/>
+                    <connections>
+                        <outlet property="delegate" destination="Nmn-Ry-t32" id="yrA-lO-OCi"/>
+                    </connections>
+                </textField>
+                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Please enter your email validation token:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vDa-DE-6Bn">
+                    <rect key="frame" x="20" y="8" width="260" height="30"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <textField hidden="YES" opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Display name (e.g. Bob Obson)" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="FVM-ec-tja" userLabel="DisplayName">
+                    <rect key="frame" x="14" y="84" width="272" height="30"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="272" id="1b5-Ej-eUB"/>
+                        <constraint firstAttribute="height" constant="30" id="bEU-4F-cUv"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                    <textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="done" secureTextEntry="YES"/>
+                    <connections>
+                        <outlet property="delegate" destination="Nmn-Ry-t32" id="Q3D-XL-8Ke"/>
+                    </connections>
+                </textField>
+            </subviews>
+            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="FVM-ec-tja" firstAttribute="top" secondItem="mbS-mV-L86" secondAttribute="bottom" constant="8" id="0BV-8c-ZVg"/>
+                <constraint firstAttribute="height" constant="122" id="1nP-RR-5GK"/>
+                <constraint firstAttribute="centerX" secondItem="mbS-mV-L86" secondAttribute="centerX" id="2R2-Du-o97"/>
+                <constraint firstItem="oen-Yq-xJw" firstAttribute="top" secondItem="Nmn-Ry-t32" secondAttribute="top" constant="8" id="BkW-Np-qB3"/>
+                <constraint firstItem="mbS-mV-L86" firstAttribute="top" secondItem="oen-Yq-xJw" secondAttribute="bottom" constant="8" id="TRx-gf-Afp"/>
+                <constraint firstAttribute="centerX" secondItem="FVM-ec-tja" secondAttribute="centerX" id="c9K-6H-ufd"/>
+                <constraint firstItem="mbS-mV-L86" firstAttribute="top" secondItem="vDa-DE-6Bn" secondAttribute="bottom" constant="8" id="cq8-qs-59M"/>
+                <constraint firstItem="vDa-DE-6Bn" firstAttribute="top" secondItem="Nmn-Ry-t32" secondAttribute="top" constant="8" id="eAp-Ob-hFr"/>
+                <constraint firstAttribute="centerX" secondItem="vDa-DE-6Bn" secondAttribute="centerX" id="otm-qx-iNL"/>
+                <constraint firstAttribute="centerX" secondItem="oen-Yq-xJw" secondAttribute="centerX" id="s7Y-qf-yrY"/>
+            </constraints>
+            <nil key="simulatedStatusBarMetrics"/>
+            <nil key="simulatedTopBarMetrics"/>
+            <nil key="simulatedBottomBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="displayNameTextField" destination="FVM-ec-tja" id="pMF-oP-7Jj"/>
+                <outlet property="emailAndTokenTextField" destination="mbS-mV-L86" id="nY5-gT-wGe"/>
+                <outlet property="promptEmailTokenLabel" destination="vDa-DE-6Bn" id="X3w-5E-0Kg"/>
+                <outlet property="userLoginTextField" destination="oen-Yq-xJw" id="OM2-gy-O9P"/>
+                <outlet property="viewHeightConstraint" destination="1nP-RR-5GK" id="s3W-1L-bWN"/>
+            </connections>
+        </view>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthInputsPasswordBasedView.h b/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthInputsPasswordBasedView.h
new file mode 100644
index 000000000..d5d62ace6
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthInputsPasswordBasedView.h
@@ -0,0 +1,46 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKAuthInputsView.h"
+
+@interface MXKAuthInputsPasswordBasedView : MXKAuthInputsView
+
+/**
+ The input text field related to user id or user login.
+ */
+@property (weak, nonatomic) IBOutlet UITextField *userLoginTextField;
+
+/**
+ The input text field used to fill the password.
+ */
+@property (weak, nonatomic) IBOutlet UITextField *passWordTextField;
+
+/**
+ The input text field used to fill an email. This item is optional, it is added in case of registration.
+ */
+@property (weak, nonatomic) IBOutlet UITextField *emailTextField;
+
+/**
+ Label used to display email field information.
+ */
+@property (weak, nonatomic) IBOutlet UILabel *emailInfoLabel;
+
+/**
+ The text field related to the display name. This item is displayed in case of registration.
+ */
+@property (weak, nonatomic) IBOutlet UITextField *displayNameTextField;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthInputsPasswordBasedView.m b/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthInputsPasswordBasedView.m
new file mode 100644
index 000000000..237a7a1cc
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthInputsPasswordBasedView.m
@@ -0,0 +1,253 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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 "MXKAuthInputsPasswordBasedView.h"
+
+#import "MXKTools.h"
+
+#import "MXKAppSettings.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKSwiftHeader.h"
+
+@implementation MXKAuthInputsPasswordBasedView
+
++ (UINib *)nib
+{
+    return [UINib nibWithNibName:NSStringFromClass([MXKAuthInputsPasswordBasedView class])
+                          bundle:[NSBundle bundleForClass:[MXKAuthInputsPasswordBasedView class]]];
+}
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    
+    _userLoginTextField.placeholder = [MatrixKitL10n loginUserIdPlaceholder];
+    _passWordTextField.placeholder = [MatrixKitL10n loginPasswordPlaceholder];
+    _emailTextField.placeholder = [NSString stringWithFormat:@"%@ (%@)", [MatrixKitL10n loginEmailPlaceholder], [MatrixKitL10n loginOptionalField]];
+    _emailInfoLabel.text = [MatrixKitL10n loginEmailInfo];
+    
+    _displayNameTextField.placeholder = [MatrixKitL10n loginDisplayNamePlaceholder];
+}
+
+#pragma mark -
+
+- (BOOL)setAuthSession:(MXAuthenticationSession *)authSession withAuthType:(MXKAuthenticationType)authType;
+{
+    if (type == MXKAuthenticationTypeLogin || type == MXKAuthenticationTypeRegister)
+    {
+        // Validate first the provided session
+        MXAuthenticationSession *validSession = [self validateAuthenticationSession:authSession];
+        
+        if ([super setAuthSession:validSession withAuthType:authType])
+        {
+            if (type == MXKAuthenticationTypeLogin)
+            {
+                self.passWordTextField.returnKeyType = UIReturnKeyDone;
+                self.emailTextField.hidden = YES;
+                self.emailInfoLabel.hidden = YES;
+                self.displayNameTextField.hidden = YES;
+                
+                self.viewHeightConstraint.constant = self.displayNameTextField.frame.origin.y;
+            }
+            else
+            {
+                self.passWordTextField.returnKeyType = UIReturnKeyNext;
+                self.emailTextField.hidden = NO;
+                self.emailInfoLabel.hidden = NO;
+                self.displayNameTextField.hidden = NO;
+                
+                self.viewHeightConstraint.constant = 179;
+            }
+            
+            return YES;
+        }
+    }
+    
+    return NO;
+}
+
+- (NSString*)validateParameters
+{
+    NSString *errorMsg = [super validateParameters];
+    
+    if (!errorMsg)
+    {
+        // Check user login and pass fields
+        if (!self.areAllRequiredFieldsSet)
+        {
+            errorMsg = [MatrixKitL10n loginInvalidParam];
+        }
+    }
+    
+    return errorMsg;
+}
+
+- (void)prepareParameters:(void (^)(NSDictionary *parameters, NSError *error))callback
+{
+    if (callback)
+    {
+        // Sanity check on required fields
+        if (!self.areAllRequiredFieldsSet)
+        {
+            callback(nil, [NSError errorWithDomain:MXKAuthErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey:[MatrixKitL10n loginInvalidParam]}]);
+            return;
+        }
+        
+        // Retrieve the user login and check whether it is an email or a username.
+        // TODO: Update the UI view to support the login based on a mobile phone number.
+        NSString *user = self.userLoginTextField.text;
+        user = [user stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+        BOOL isEmailAddress = [MXTools isEmailAddress:user];
+        
+        NSDictionary *parameters;
+        
+        if (isEmailAddress)
+        {
+            parameters = @{
+                           @"type": kMXLoginFlowTypePassword,
+                           @"identifier": @{
+                                   @"type": kMXLoginIdentifierTypeThirdParty,
+                                   @"medium": kMX3PIDMediumEmail,
+                                   @"address": user
+                                   },
+                           @"password": self.passWordTextField.text
+                           };
+        }
+        else
+        {
+            parameters = @{
+                           @"type": kMXLoginFlowTypePassword,
+                           @"identifier": @{
+                                   @"type": kMXLoginIdentifierTypeUser,
+                                   @"user": user
+                                   },
+                           @"password": self.passWordTextField.text
+                           };
+        }
+        
+        callback(parameters, nil);
+    }
+}
+
+- (BOOL)areAllRequiredFieldsSet
+{
+    BOOL ret = [super areAllRequiredFieldsSet];
+    
+    // Check user login and pass fields
+    ret = (ret && self.userLoginTextField.text.length && self.passWordTextField.text.length);
+    
+    return ret;
+}
+
+- (void)dismissKeyboard
+{
+    [self.userLoginTextField resignFirstResponder];
+    [self.passWordTextField resignFirstResponder];
+    [self.emailTextField resignFirstResponder];
+    [self.displayNameTextField resignFirstResponder];
+    
+    [super dismissKeyboard];
+}
+
+- (NSString*)userId
+{
+    return self.userLoginTextField.text;
+}
+
+- (NSString*)password
+{
+    return self.passWordTextField.text;
+}
+
+#pragma mark UITextField delegate
+
+- (BOOL)textFieldShouldReturn:(UITextField*)textField
+{
+    if (textField.returnKeyType == UIReturnKeyDone)
+    {
+        // "Done" key has been pressed
+        [textField resignFirstResponder];
+        
+        // Launch authentication now
+        [self.delegate authInputsViewDidPressDoneKey:self];
+    }
+    else
+    {
+        //"Next" key has been pressed
+        if (textField == self.userLoginTextField)
+        {
+            [self.passWordTextField becomeFirstResponder];
+        }
+        else if (textField == self.passWordTextField)
+        {
+            [self.displayNameTextField becomeFirstResponder];
+        }
+        else if (textField == self.displayNameTextField)
+        {
+            [self.emailTextField becomeFirstResponder];
+        }
+    }
+    
+    return YES;
+}
+
+#pragma mark -
+
+- (MXAuthenticationSession*)validateAuthenticationSession:(MXAuthenticationSession*)authSession
+{
+    // Check whether at least one of the listed flow is supported.
+    BOOL isSupported = NO;
+    
+    for (MXLoginFlow *loginFlow in authSession.flows)
+    {
+        // Check whether flow type is defined
+        if ([loginFlow.type isEqualToString:kMXLoginFlowTypePassword])
+        {
+            isSupported = YES;
+            break;
+        }
+        else if (loginFlow.stages.count == 1 && [loginFlow.stages.firstObject isEqualToString:kMXLoginFlowTypePassword])
+        {
+            isSupported = YES;
+            break;
+        }
+    }
+    
+    if (isSupported)
+    {
+        if (authSession.flows.count == 1)
+        {
+            // Return the original session.
+            return authSession;
+        }
+        else
+        {
+            // Keep only the supported flow.
+            MXAuthenticationSession *updatedAuthSession = [[MXAuthenticationSession alloc] init];
+            updatedAuthSession.session = authSession.session;
+            updatedAuthSession.params = authSession.params;
+            updatedAuthSession.flows = @[[MXLoginFlow modelFromJSON:@{@"stages":@[kMXLoginFlowTypePassword]}]];
+            return updatedAuthSession;
+        }
+    }
+    
+    return nil;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthInputsPasswordBasedView.xib b/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthInputsPasswordBasedView.xib
new file mode 100644
index 000000000..f19346925
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthInputsPasswordBasedView.xib
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="x74-04-ezp" customClass="MXKAuthInputsPasswordBasedView">
+            <rect key="frame" x="0.0" y="0.0" width="300" height="179"/>
+            <subviews>
+                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Matrix ID (e.g. @bob:matrix.org or bob)" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="i51-ym-i9T">
+                    <rect key="frame" x="14" y="8" width="272" height="30"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="272" id="IhR-uY-MJZ"/>
+                        <constraint firstAttribute="height" constant="30" id="x3j-uC-j0U"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                    <textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="next"/>
+                    <connections>
+                        <outlet property="delegate" destination="x74-04-ezp" id="yCp-R2-dNp"/>
+                    </connections>
+                </textField>
+                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Password" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="6rs-rR-DkS">
+                    <rect key="frame" x="14" y="46" width="272" height="30"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="30" id="Fh2-oZ-UBe"/>
+                        <constraint firstAttribute="width" constant="272" id="pCs-je-5Rd"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                    <textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="done" secureTextEntry="YES"/>
+                    <connections>
+                        <outlet property="delegate" destination="x74-04-ezp" id="t8U-qP-IHU"/>
+                    </connections>
+                </textField>
+                <textField hidden="YES" opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Display name (e.g. Bob Obson)" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="BQM-LP-8Eq" userLabel="DisplayName">
+                    <rect key="frame" x="14" y="84" width="272" height="30"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="30" id="Iwg-IP-ITp"/>
+                        <constraint firstAttribute="width" constant="272" id="ZG2-Aw-XkP"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                    <textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="next" secureTextEntry="YES"/>
+                    <connections>
+                        <outlet property="delegate" destination="x74-04-ezp" id="qkT-a6-G0Y"/>
+                    </connections>
+                </textField>
+                <textField hidden="YES" opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Email address (optional)" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="odF-W1-Vdr" userLabel="Email">
+                    <rect key="frame" x="14" y="126" width="272" height="30"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="272" id="wZg-GR-5XL"/>
+                        <constraint firstAttribute="height" constant="30" id="zVy-8W-zmR"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                    <textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="done" secureTextEntry="YES"/>
+                    <connections>
+                        <outlet property="delegate" destination="x74-04-ezp" id="isi-U5-D9A"/>
+                    </connections>
+                </textField>
+                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="OHZ-Ye-nch" userLabel="EmailInfoLabel">
+                    <rect key="frame" x="14" y="156" width="272" height="15"/>
+                    <string key="text">Specify an email address lets other users find you on Matrix more easily, and will give you a way to reset your password in the future.</string>
+                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <nil key="highlightedColor"/>
+                </label>
+            </subviews>
+            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="i51-ym-i9T" firstAttribute="top" secondItem="x74-04-ezp" secondAttribute="top" constant="8" id="2sO-Wi-AFi"/>
+                <constraint firstItem="BQM-LP-8Eq" firstAttribute="top" secondItem="6rs-rR-DkS" secondAttribute="bottom" constant="8" id="2vZ-NH-f0H"/>
+                <constraint firstAttribute="centerX" secondItem="odF-W1-Vdr" secondAttribute="centerX" id="BbL-ex-otM"/>
+                <constraint firstItem="OHZ-Ye-nch" firstAttribute="leading" secondItem="x74-04-ezp" secondAttribute="leading" constant="14" id="Ctv-P7-FQl"/>
+                <constraint firstItem="6rs-rR-DkS" firstAttribute="top" secondItem="i51-ym-i9T" secondAttribute="bottom" constant="8" id="EJf-md-dcj"/>
+                <constraint firstAttribute="height" constant="179" id="JbD-Ce-bTY"/>
+                <constraint firstItem="OHZ-Ye-nch" firstAttribute="top" secondItem="odF-W1-Vdr" secondAttribute="bottom" id="LTI-Eq-pH6"/>
+                <constraint firstAttribute="centerX" secondItem="i51-ym-i9T" secondAttribute="centerX" id="WKP-y0-Jon"/>
+                <constraint firstAttribute="centerX" secondItem="BQM-LP-8Eq" secondAttribute="centerX" id="aQQ-kb-tLS"/>
+                <constraint firstAttribute="centerX" secondItem="6rs-rR-DkS" secondAttribute="centerX" id="nIk-ev-cFe"/>
+                <constraint firstItem="odF-W1-Vdr" firstAttribute="top" secondItem="BQM-LP-8Eq" secondAttribute="bottom" constant="12" id="qjk-LC-4NN"/>
+                <constraint firstAttribute="centerX" secondItem="OHZ-Ye-nch" secondAttribute="centerX" id="tvZ-5z-KAm"/>
+                <constraint firstAttribute="trailing" secondItem="OHZ-Ye-nch" secondAttribute="trailing" constant="14" id="yQg-6n-P8L"/>
+            </constraints>
+            <nil key="simulatedStatusBarMetrics"/>
+            <nil key="simulatedTopBarMetrics"/>
+            <nil key="simulatedBottomBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="displayNameTextField" destination="BQM-LP-8Eq" id="Ptq-yP-WaZ"/>
+                <outlet property="emailInfoLabel" destination="OHZ-Ye-nch" id="fh6-Sz-X5K"/>
+                <outlet property="emailTextField" destination="odF-W1-Vdr" id="DOS-H7-MZy"/>
+                <outlet property="passWordTextField" destination="6rs-rR-DkS" id="VeL-kt-Fpp"/>
+                <outlet property="userLoginTextField" destination="i51-ym-i9T" id="XKi-6m-tFv"/>
+                <outlet property="viewHeightConstraint" destination="JbD-Ce-bTY" id="09n-jN-RM1"/>
+            </connections>
+        </view>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthInputsView.h b/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthInputsView.h
new file mode 100644
index 000000000..c71b022ae
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthInputsView.h
@@ -0,0 +1,242 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2019 The Matrix.org Foundation C.I.C
+ 
+ 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 <MatrixSDK/MatrixSDK.h>
+
+#import "MXKView.h"
+
+extern NSString *const MXKAuthErrorDomain;
+
+/**
+ Authentication types
+ */
+typedef enum {
+    /**
+     Type used to sign up.
+     */
+    MXKAuthenticationTypeRegister,
+    /**
+     Type used to sign in.
+     */
+    MXKAuthenticationTypeLogin,
+    /**
+     Type used to restore an existing account by reseting the password.
+     */
+    MXKAuthenticationTypeForgotPassword
+    
+} MXKAuthenticationType;
+
+@class MXKAuthInputsView;
+
+/**
+ `MXKAuthInputsView` delegate
+ */
+@protocol MXKAuthInputsViewDelegate <NSObject>
+
+/**
+ Tells the delegate that an alert must be presented.
+ 
+ @param authInputsView the authentication inputs view.
+ @param alert the alert to present.
+ */
+- (void)authInputsView:(MXKAuthInputsView*)authInputsView presentAlertController:(UIAlertController*)alert;
+
+/**
+ For some input fields, the return key of the keyboard is defined as `Done` key.
+ By this method, the delegate is notified when this key is pressed.
+ */
+- (void)authInputsViewDidPressDoneKey:(MXKAuthInputsView *)authInputsView;
+
+@optional
+
+/**
+ The matrix REST Client used to validate third-party identifiers.
+ */
+- (MXRestClient *)authInputsViewThirdPartyIdValidationRestClient:(MXKAuthInputsView *)authInputsView;
+
+/**
+ The identity service used to validate third-party identifiers.
+ */
+- (MXIdentityService *)authInputsViewThirdPartyIdValidationIdentityService:(MXKAuthInputsView *)authInputsView;
+
+/**
+ Tell the delegate to present a view controller modally.
+ 
+ Note: This method is used to display the countries list during the phone number handling.
+ 
+ @param authInputsView the authentication inputs view.
+ @param viewControllerToPresent the view controller to present.
+ @param animated YES to animate the presentation.
+ */
+- (void)authInputsView:(MXKAuthInputsView *)authInputsView presentViewController:(UIViewController*)viewControllerToPresent animated:(BOOL)animated;
+
+/**
+ Tell the delegate to cancel the current operation.
+ */
+- (void)authInputsViewDidCancelOperation:(MXKAuthInputsView *)authInputsView;
+
+/**
+ Tell the delegate to autodiscover the server configuration.
+ */
+- (void)authInputsView:(MXKAuthInputsView *)authInputsView autoDiscoverServerWithDomain:(NSString*)domain;
+
+@end
+
+/**
+ `MXKAuthInputsView` is a base class to handle authentication inputs.
+ */
+@interface MXKAuthInputsView : MXKView <UITextFieldDelegate>
+{
+@protected
+    /**
+     The authentication type (`MXKAuthenticationTypeLogin` by default).
+     */
+    MXKAuthenticationType type;
+    
+    /**
+     The authentication session (nil by default).
+     */
+    MXAuthenticationSession *currentSession;
+    
+    /**
+     Alert used to display inputs error.
+     */
+    UIAlertController *inputsAlert;
+}
+
+/**
+ The view delegate.
+ */
+@property (nonatomic, weak) id <MXKAuthInputsViewDelegate> delegate;
+
+/**
+ The current authentication type (`MXKAuthenticationTypeLogin` by default).
+ */
+@property (nonatomic, readonly) MXKAuthenticationType authType;
+
+/**
+ The current authentication session if any.
+ */
+@property (nonatomic, readonly) MXAuthenticationSession *authSession;
+
+/**
+ The current filled user identifier (nil by default).
+ */
+@property (nonatomic, readonly) NSString *userId;
+
+/**
+ The current filled password (nil by default).
+ */
+@property (nonatomic, readonly) NSString *password;
+
+/**
+ The layout constraint defined on the view height. This height takes into account shown/hidden fields.
+ */
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *viewHeightConstraint;
+
+/**
+ Returns the `UINib` object initialized for the auth inputs view.
+ 
+ @return The initialized `UINib` object or `nil` if there were errors during
+ initialization or the nib file could not be located.
+ */
++ (UINib *)nib;
+
+/**
+ Creates and returns a new `MXKAuthInputsView` object.
+ 
+ @discussion This is the designated initializer for programmatic instantiation.
+ 
+ @return An initialized `MXKAuthInputsView` object if successful, `nil` otherwise.
+ */
++ (instancetype)authInputsView;
+
+/**
+ Finalize the authentication inputs view with a session and a type.
+ Use this method to restore the view in its initial step.
+ 
+ @discussion You may override this method to check/update the flows listed in the provided authentication session.
+ 
+ @param authSession the authentication session returned by the homeserver.
+ @param authType the authentication type (see 'MXKAuthenticationType').
+ @return YES if the provided session and type are supported by the MXKAuthInputsView-inherited class. Note the unsupported flows should be here removed from the stored authentication session (see the resulting session in the property named 'authSession').
+ */
+- (BOOL)setAuthSession:(MXAuthenticationSession *)authSession withAuthType:(MXKAuthenticationType)authType;
+
+/**
+ Check the validity of the required parameters.
+ 
+ @return an error message in case of wrong parameters (nil by default).
+ */
+- (NSString*)validateParameters;
+
+/**
+ Prepare the set of the inputs in order to launch an authentication process.
+ 
+ @param callback the block called when the parameters are prepared. The resulting parameter dictionary is nil
+ if something fails (for example when a parameter or a required input is missing). The failure reason is provided in error parameter (nil by default).
+ */
+- (void)prepareParameters:(void (^)(NSDictionary *parameters, NSError *error))callback;
+
+/**
+ Update the current authentication session by providing the list of successful stages.
+ 
+ @param completedStages the list of stages the client has completed successfully. This is an array of MXLoginFlowType.
+ @param callback the block called when the parameters have been updated for the next stage. The resulting parameter dictionary is nil
+ if something fails (for example when a parameter or a required input is missing). The failure reason is provided in error parameter (nil by default).
+ */
+- (void)updateAuthSessionWithCompletedStages:(NSArray *)completedStages didUpdateParameters:(void (^)(NSDictionary *parameters, NSError *error))callback;
+
+/**
+ Update the current authentication session by providing a set of registration parameters.
+ 
+ @discussion This operation failed if the current authentication type is MXKAuthenticationTypeLogin.
+ 
+ @param registrationParameters a set of parameters to use during the current registration process.
+ @return YES if the provided set of parameters is supported.
+ */
+- (BOOL)setExternalRegistrationParameters:(NSDictionary *)registrationParameters;
+
+/**
+ Update the current authentication session by providing soft logout credentials.
+ */
+@property (nonatomic) MXCredentials *softLogoutCredentials;
+
+/**
+ Tell whether all required fields are set
+ */
+- (BOOL)areAllRequiredFieldsSet;
+
+/**
+ Force dismiss keyboard
+ */
+- (void)dismissKeyboard;
+
+/**
+ Switch in next authentication flow step by updating the layout.
+
+ @discussion This method is supposed to be called only if the current operation succeeds.
+ */
+- (void)nextStep;
+
+/**
+ Dispose any resources and listener.
+ */
+- (void)destroy;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthInputsView.m b/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthInputsView.m
new file mode 100644
index 000000000..3977b6355
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthInputsView.m
@@ -0,0 +1,156 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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 "MXKAuthInputsView.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKSwiftHeader.h"
+
+NSString *const MXKAuthErrorDomain = @"MXKAuthErrorDomain";
+
+@implementation MXKAuthInputsView
+
++ (UINib *)nib
+{
+    // By default, no nib is available.
+    return nil;
+}
+
++ (instancetype)authInputsView
+{
+    // Check whether a xib is defined
+    if ([[self class] nib])
+    {
+        return [[[self class] nib] instantiateWithOwner:nil options:nil].firstObject;
+    }
+    
+    return [[[self class] alloc] init];
+}
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    
+    [self setTranslatesAutoresizingMaskIntoConstraints: NO];
+    
+    type = MXKAuthenticationTypeLogin;
+}
+
+- (instancetype)init
+{
+    self = [super init];
+    if (self)
+    {
+        type = MXKAuthenticationTypeLogin;
+    }
+    return self;
+}
+
+#pragma mark -
+
+- (BOOL)setAuthSession:(MXAuthenticationSession *)authSession withAuthType:(MXKAuthenticationType)authType
+{
+    if (authSession)
+    {
+        type = authType;
+        currentSession = authSession;
+        
+        return YES;
+    }
+    
+    return NO;
+}
+
+- (NSString *)validateParameters
+{
+    // Currently no field to check here
+    return nil;
+}
+
+- (void)prepareParameters:(void (^)(NSDictionary *parameters, NSError *error))callback
+{
+    // Do nothing by default
+    if (callback)
+    {
+        callback (nil, [NSError errorWithDomain:MXKAuthErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey:[MatrixKitL10n notSupportedYet]}]);
+    }
+}
+
+- (void)updateAuthSessionWithCompletedStages:(NSArray *)completedStages didUpdateParameters:(void (^)(NSDictionary *parameters, NSError *error))callback
+{
+    // Do nothing by default
+    if (callback)
+    {
+        callback (nil, [NSError errorWithDomain:MXKAuthErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey:[MatrixKitL10n notSupportedYet]}]);
+    }
+}
+
+- (BOOL)setExternalRegistrationParameters:(NSDictionary *)registrationParameters
+{
+    // Not supported by default
+    return NO;
+}
+
+- (BOOL)areAllRequiredFieldsSet
+{
+    // Currently no field to check here
+    return YES;
+}
+
+- (void)dismissKeyboard
+{
+    
+}
+
+- (void)nextStep
+{
+    
+}
+
+- (void)destroy
+{
+    if (inputsAlert)
+    {
+        [inputsAlert dismissViewControllerAnimated:NO completion:nil];
+        inputsAlert = nil;
+    }
+}
+
+#pragma mark -
+
+- (MXKAuthenticationType)authType
+{
+    return type;
+}
+
+- (MXAuthenticationSession*)authSession
+{
+    return currentSession;
+}
+
+- (NSString*)userId
+{
+    return nil;
+}
+
+- (NSString*)password
+{
+    return nil;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthenticationFallbackWebView.h b/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthenticationFallbackWebView.h
new file mode 100644
index 000000000..404beb42b
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthenticationFallbackWebView.h
@@ -0,0 +1,30 @@
+/*
+ Copyright 2015 OpenMarket 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 <MatrixSDK/MatrixSDK.h>
+#import <WebKit/WebKit.h>
+
+@interface MXKAuthenticationFallbackWebView : WKWebView <WKNavigationDelegate>
+
+/**
+ Open authentication fallback page into the webview.
+ 
+ @param fallbackPage the fallback page hosted by a homeserver.
+ @param success the block called when the user has been successfully logged in or registered.
+ */
+- (void)openFallbackPage:(NSString*)fallbackPage success:(void (^)(MXLoginResponse *loginResponse))success;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthenticationFallbackWebView.m b/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthenticationFallbackWebView.m
new file mode 100644
index 000000000..09c50ffc6
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthenticationFallbackWebView.m
@@ -0,0 +1,181 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKAuthenticationFallbackWebView.h"
+
+// Generic method to make a bridge between JS and the WKWebView
+NSString *kMXKJavascriptSendObjectMessage = @"window.sendObjectMessage = function(parameters) {   \
+var iframe = document.createElement('iframe');                              \
+iframe.setAttribute('src', 'js:' + JSON.stringify(parameters));             \
+\
+document.documentElement.appendChild(iframe);                               \
+iframe.parentNode.removeChild(iframe);                                      \
+iframe = null;                                                              \
+};";
+
+// The function the fallback page calls when the registration is complete
+NSString *kMXKJavascriptOnRegistered = @"window.matrixRegistration.onRegistered = function(homeserverUrl, userId, accessToken) {   \
+sendObjectMessage({  \
+'action': 'onRegistered',           \
+'homeServer': homeserverUrl,        \
+'userId': userId,                   \
+'accessToken': accessToken          \
+});                                     \
+};";
+
+// The function the fallback page calls when the login is complete
+NSString *kMXKJavascriptOnLogin = @"window.matrixLogin.onLogin = function(response) {   \
+sendObjectMessage({  \
+'action': 'onLogin',           \
+'response': response        \
+});                                     \
+};";
+
+@interface MXKAuthenticationFallbackWebView ()
+{
+    // The block called when the login or the registration is successful
+    void (^onSuccess)(MXLoginResponse *);
+    
+    // Activity indicator
+    UIActivityIndicatorView *activityIndicator;
+}
+@end
+
+@implementation MXKAuthenticationFallbackWebView
+
+- (void)dealloc
+{
+    if (activityIndicator)
+    {
+        [activityIndicator removeFromSuperview];
+        activityIndicator = nil;
+    }
+}
+
+- (void)openFallbackPage:(NSString *)fallbackPage success:(void (^)(MXLoginResponse *))success
+{
+    self.navigationDelegate = self;
+    
+    onSuccess = success;
+    
+    // Add activity indicator
+    activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
+    activityIndicator.center = self.center;
+    [self addSubview:activityIndicator];
+    [activityIndicator startAnimating];
+
+    // Delete cookies to launch login process from scratch
+    for(NSHTTPCookie *cookie in [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookies])
+    {
+        [[NSHTTPCookieStorage sharedHTTPCookieStorage] deleteCookie:cookie];
+    }
+    
+    [self loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:fallbackPage]]];
+}
+
+#pragma mark - WKNavigationDelegate
+
+- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation
+{
+    if (activityIndicator)
+    {
+        [activityIndicator stopAnimating];
+        [activityIndicator removeFromSuperview];
+        activityIndicator = nil;
+    }
+    
+    [self evaluateJavaScript:kMXKJavascriptSendObjectMessage completionHandler:^(id _Nullable response, NSError * _Nullable error) {
+        
+    }];
+    [self evaluateJavaScript:kMXKJavascriptOnRegistered completionHandler:^(id _Nullable response, NSError * _Nullable error) {
+        
+    }];
+    [self evaluateJavaScript:kMXKJavascriptOnLogin completionHandler:^(id _Nullable response, NSError * _Nullable error) {
+        
+    }];
+}
+
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler
+{
+    MXLogDebug(@"[MXKAuthenticationFallbackWebView] decidePolicyForNavigationAction");
+    
+    NSString *urlString = navigationAction.request.URL.absoluteString;
+    
+    if ([urlString hasPrefix:@"js:"])
+    {
+        //  do not log urlString, it may have an access token
+        MXLogDebug(@"[MXKAuthenticationFallbackWebView] URL has js: prefix");
+        
+        // Listen only to scheme of the JS-WKWebView bridge
+        NSString *jsonString = [[[urlString componentsSeparatedByString:@"js:"] lastObject]  stringByReplacingPercentEscapesUsingEncoding:NSASCIIStringEncoding];
+        NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
+        
+        NSError *error;
+        NSDictionary *parameters = [NSJSONSerialization JSONObjectWithData:jsonData options:NSJSONReadingMutableContainers
+                                                                     error:&error];
+        
+        if (error)
+        {
+            MXLogDebug(@"[MXKAuthenticationFallbackWebView] Error when parsing json: %@", error);
+        }
+        else
+        {
+            if ([@"onRegistered" isEqualToString:parameters[@"action"]])
+            {
+                // Translate the JS registration event to MXLoginResponse
+                // We cannot use [MXLoginResponse modelFromJSON:] because of https://github.com/matrix-org/synapse/issues/4756
+                // Because of this issue, we cannot get the device_id allocated by the homeserver
+                // TODO: Fix it once the homeserver issue is fixed (filed at https://github.com/vector-im/riot-meta/issues/273).
+                MXLoginResponse *loginResponse = [MXLoginResponse new];
+                loginResponse.homeserver = parameters[@"homeServer"];
+                loginResponse.userId = parameters[@"userId"];
+                loginResponse.accessToken = parameters[@"accessToken"];
+                
+                MXLogDebug(@"[MXKAuthenticationFallbackWebView] Registered on homeserver: %@", loginResponse.homeserver);
+
+                // Sanity check
+                if (loginResponse.homeserver.length && loginResponse.userId.length && loginResponse.accessToken.length)
+                {
+                    MXLogDebug(@"[MXKAuthenticationFallbackWebView] Call success block");
+                    // And inform the client
+                    onSuccess(loginResponse);
+                }
+            }
+            else if ([@"onLogin" isEqualToString:parameters[@"action"]])
+            {
+                // Translate the JS login event to MXLoginResponse
+                MXLoginResponse *loginResponse;
+                MXJSONModelSetMXJSONModel(loginResponse, MXLoginResponse, parameters[@"response"]);
+
+                MXLogDebug(@"[MXKAuthenticationFallbackWebView] Logged in on homeserver: %@", loginResponse.homeserver);
+                
+                // Sanity check
+                if (loginResponse.homeserver.length && loginResponse.userId.length && loginResponse.accessToken.length)
+                {
+                    MXLogDebug(@"[MXKAuthenticationFallbackWebView] Call success block");
+                    // And inform the client
+                    onSuccess(loginResponse);
+                }
+            }
+        }
+        
+        decisionHandler(WKNavigationActionPolicyCancel);
+        return;
+    }
+    decisionHandler(WKNavigationActionPolicyAllow);
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthenticationRecaptchaWebView.h b/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthenticationRecaptchaWebView.h
new file mode 100644
index 000000000..c1beeb558
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthenticationRecaptchaWebView.h
@@ -0,0 +1,33 @@
+/*
+ Copyright 2016 OpenMarket Ltd
+ Copyright 2018 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 <MatrixSDK/MatrixSDK.h>
+
+#import <WebKit/WebKit.h>
+
+@interface MXKAuthenticationRecaptchaWebView : WKWebView
+
+/**
+ Open reCAPTCHA widget into a webview.
+ 
+ @param siteKey the site key.
+ @param homeServer the homeserver URL.
+ @param callback the block called when the user has received reCAPTCHA response.
+ */
+- (void)openRecaptchaWidgetWithSiteKey:(NSString*)siteKey fromHomeServer:(NSString*)homeServer callback:(void (^)(NSString *response))callback;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthenticationRecaptchaWebView.m b/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthenticationRecaptchaWebView.m
new file mode 100644
index 000000000..8e3bfa6fa
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/Authentication/MXKAuthenticationRecaptchaWebView.m
@@ -0,0 +1,126 @@
+/*
+ Copyright 2016 OpenMarket Ltd
+ Copyright 2018 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 "MXKAuthenticationRecaptchaWebView.h"
+
+NSString *kMXKRecaptchaHTMLString = @"<html> \
+<head> \
+<meta name='viewport' content='initial-scale=1.0' /> \
+<script type=\"text/javascript\"> \
+var verifyCallback = function(response) { \
+    /* Generic method to make a bridge between JS and the WKWebView*/ \
+    var iframe = document.createElement('iframe'); \
+    iframe.setAttribute('src', 'js:' + JSON.stringify({'action': 'verifyCallback', 'response': response})); \
+ \
+    document.documentElement.appendChild(iframe); \
+    iframe.parentNode.removeChild(iframe); \
+    iframe = null; \
+}; \
+var onloadCallback = function() { \
+    grecaptcha.render('recaptcha_widget', { \
+        'sitekey' : '%@', \
+        'callback': verifyCallback \
+    }); \
+}; \
+</script> \
+</head> \
+<body> \
+    <div id=\"recaptcha_widget\"></div> \
+    <script src=\"https://www.google.com/recaptcha/api.js?onload=onloadCallback&render=explicit\" async defer> \
+    </script> \
+</body> \
+</html>";
+
+@interface MXKAuthenticationRecaptchaWebView () <WKNavigationDelegate>
+{
+    // The block called when the reCAPTCHA response is received
+    void (^onResponse)(NSString *);
+    
+    // Activity indicator
+    UIActivityIndicatorView *activityIndicator;
+}
+@end
+
+@implementation MXKAuthenticationRecaptchaWebView
+
+- (void)dealloc
+{
+    if (activityIndicator)
+    {
+        [activityIndicator removeFromSuperview];
+        activityIndicator = nil;
+    }
+}
+
+- (void)openRecaptchaWidgetWithSiteKey:(NSString*)siteKey fromHomeServer:(NSString*)homeServer callback:(void (^)(NSString *response))callback
+{
+    self.navigationDelegate = self;
+    
+    onResponse = callback;
+    
+    // Add activity indicator
+    activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
+    activityIndicator.center = self.center;
+    [self addSubview:activityIndicator];
+    [activityIndicator startAnimating];
+    
+    NSString *htmlString = [NSString stringWithFormat:kMXKRecaptchaHTMLString, siteKey];
+    
+    [self loadHTMLString:htmlString baseURL:[NSURL URLWithString:homeServer]];
+}
+
+#pragma mark - WKNavigationDelegate
+
+- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation
+{
+    if (activityIndicator)
+    {
+        [activityIndicator stopAnimating];
+        [activityIndicator removeFromSuperview];
+        activityIndicator = nil;
+    }
+}
+
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler
+{
+    NSString *urlString = navigationAction.request.URL.absoluteString;
+
+    if ([urlString hasPrefix:@"js:"])
+    {
+        // Listen only to scheme of the JS-WKWebView bridge
+        NSString *jsonString = [[[urlString componentsSeparatedByString:@"js:"] lastObject]  stringByReplacingPercentEscapesUsingEncoding:NSASCIIStringEncoding];
+        NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
+
+        NSError *error;
+        NSDictionary *parameters = [NSJSONSerialization JSONObjectWithData:jsonData options:NSJSONReadingMutableContainers
+                                                                     error:&error];
+
+        if (!error)
+        {
+            if ([@"verifyCallback" isEqualToString:parameters[@"action"]])
+            {
+                // Transfer the reCAPTCHA response
+                onResponse(parameters[@"response"]);
+            }
+        }
+        decisionHandler(WKNavigationActionPolicyCancel);
+        return;
+    }
+    decisionHandler(WKNavigationActionPolicyAllow);
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/BarButtonItem/MXKBarButtonItem.h b/Riot/Modules/MatrixKit/Views/BarButtonItem/MXKBarButtonItem.h
new file mode 100644
index 000000000..47549ed8b
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/BarButtonItem/MXKBarButtonItem.h
@@ -0,0 +1,38 @@
+/*
+ Copyright 2018 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.
+ */
+
+#pragma mark - Imports
+
+@import Foundation;
+@import UIKit;
+
+#pragma mark - Types
+
+typedef void (^MXKBarButtonItemAction)(void);
+
+#pragma mark - Interface
+
+/**
+ `MXKBarButtonItem` is a subclass of UIBarButtonItem allowing to use convenient action block instead of action selector.
+ */
+@interface MXKBarButtonItem : UIBarButtonItem
+
+#pragma mark - Instance Methods
+
+- (instancetype)initWithImage:(UIImage *)image style:(UIBarButtonItemStyle)style action:(MXKBarButtonItemAction)action;
+- (instancetype)initWithTitle:(NSString *)title style:(UIBarButtonItemStyle)style action:(MXKBarButtonItemAction)action;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/BarButtonItem/MXKBarButtonItem.m b/Riot/Modules/MatrixKit/Views/BarButtonItem/MXKBarButtonItem.m
new file mode 100644
index 000000000..e04fce515
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/BarButtonItem/MXKBarButtonItem.m
@@ -0,0 +1,67 @@
+/*
+ Copyright 2018 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.
+ */
+
+#pragma mark - Imports
+
+#import "MXKBarButtonItem.h"
+
+#pragma mark - Private Interface
+
+@interface MXKBarButtonItem ()
+
+#pragma mark - Private Properties
+
+@property (nonatomic, copy) MXKBarButtonItemAction actionBlock;
+
+@end
+
+#pragma mark - Implementation
+
+@implementation MXKBarButtonItem
+
+#pragma mark - Public methods
+
+- (instancetype)initWithImage:(UIImage *)image style:(UIBarButtonItemStyle)style action:(MXKBarButtonItemAction)action
+{
+    self = [self initWithImage:image style:style target:self action:@selector(executeAction:)];
+    if (self)
+    {
+        self.actionBlock = action;
+    }
+    return self;
+}
+
+- (instancetype)initWithTitle:(NSString *)title style:(UIBarButtonItemStyle)style action:(MXKBarButtonItemAction)action
+{
+    self = [self initWithTitle:title style:style target:self action:@selector(executeAction:)];
+    if (self)
+    {
+        self.actionBlock = action;
+    }
+    return self;
+}
+
+#pragma mark - Private methods
+
+- (void)executeAction:(id)sender
+{
+    if (self.actionBlock)
+    {
+        self.actionBlock();
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/Contact/MXKContactTableCell.h b/Riot/Modules/MatrixKit/Views/Contact/MXKContactTableCell.h
new file mode 100644
index 000000000..96b2586ba
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/Contact/MXKContactTableCell.h
@@ -0,0 +1,90 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCell.h"
+
+#import "MXKCellRendering.h"
+#import "MXKImageView.h"
+
+/**
+ List the accessory view types for a 'MXKContactTableCell' instance.
+ */
+typedef enum : NSUInteger {
+    /**
+     Don't show accessory view by default.
+     */
+    MXKContactTableCellAccessoryCustom,
+    /**
+     The accessory view is automatically handled. It shown only for contact with matrix identifier(s).
+     */
+    MXKContactTableCellAccessoryMatrixIcon
+    
+} MXKContactTableCellAccessoryType;
+
+
+#pragma mark - MXKCellRenderingDelegate cell tap locations
+
+/**
+ Action identifier used when the user tapped on contact thumbnail view.
+ 
+ The `userInfo` dictionary contains an `NSString` object under the `kMXKContactCellContactIdKey` key, representing the contact id of the tapped avatar.
+ */
+extern NSString *const kMXKContactCellTapOnThumbnailView;
+
+/**
+ Notifications `userInfo` keys
+ */
+extern NSString *const kMXKContactCellContactIdKey;
+
+/**
+ 'MXKContactTableCell' is a base class for displaying a contact.
+ */
+@interface MXKContactTableCell : MXKTableViewCell <MXKCellRendering>
+
+@property (strong, nonatomic) IBOutlet MXKImageView *thumbnailView;
+
+@property (strong, nonatomic) IBOutlet UILabel *contactDisplayNameLabel;
+@property (strong, nonatomic) IBOutlet UILabel *matrixDisplayNameLabel;
+@property (strong, nonatomic) IBOutlet UILabel *matrixIDLabel;
+
+@property (strong, nonatomic) IBOutlet UIView *contactAccessoryView;
+@property (unsafe_unretained, nonatomic) IBOutlet NSLayoutConstraint *contactAccessoryViewHeightConstraint;
+@property (unsafe_unretained, nonatomic) IBOutlet NSLayoutConstraint *contactAccessoryViewWidthConstraint;
+@property (strong, nonatomic) IBOutlet UIImageView *contactAccessoryImageView;
+@property (strong, nonatomic) IBOutlet UIButton *contactAccessoryButton;
+
+/**
+ The default picture displayed when no picture is available.
+ */
+@property (nonatomic) UIImage *picturePlaceholder;
+
+/**
+ The thumbnail display box type ('MXKTableViewCellDisplayBoxTypeDefault' by default)
+ */
+@property (nonatomic) MXKTableViewCellDisplayBoxType thumbnailDisplayBoxType;
+
+/**
+ The accessory view type ('MXKContactTableCellAccessoryCustom' by default)
+ */
+@property (nonatomic) MXKContactTableCellAccessoryType contactAccessoryViewType;
+
+/**
+ Tell whether the matrix presence of the contact is displayed or not (NO by default)
+ */
+@property (nonatomic) BOOL hideMatrixPresence;
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/Contact/MXKContactTableCell.m b/Riot/Modules/MatrixKit/Views/Contact/MXKContactTableCell.m
new file mode 100644
index 000000000..471c8f5af
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/Contact/MXKContactTableCell.m
@@ -0,0 +1,349 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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 "MXKContactTableCell.h"
+
+@import MatrixSDK.MXTools;
+
+#import "MXKContactManager.h"
+#import "MXKAppSettings.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#pragma mark - Constant definitions
+NSString *const kMXKContactCellTapOnThumbnailView = @"kMXKContactCellTapOnThumbnailView";
+
+NSString *const kMXKContactCellContactIdKey = @"kMXKContactCellContactIdKey";
+
+@interface MXKContactTableCell()
+{
+    /**
+     The current displayed contact.
+     */
+    MXKContact *contact;
+    
+    /**
+     The observer of the presence for matrix user.
+     */
+    id mxPresenceObserver;
+}
+@end
+
+@implementation MXKContactTableCell
+@synthesize delegate;
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    
+    self.thumbnailDisplayBoxType = MXKTableViewCellDisplayBoxTypeDefault;
+    
+    // No accessory view by default
+    self.contactAccessoryViewType = MXKContactTableCellAccessoryCustom;
+    
+    self.hideMatrixPresence = NO;
+}
+
+- (void)customizeTableViewCellRendering
+{
+    [super customizeTableViewCellRendering];
+    
+    self.thumbnailView.defaultBackgroundColor = [UIColor clearColor];
+}
+
+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+    
+    if (self.thumbnailDisplayBoxType == MXKTableViewCellDisplayBoxTypeCircle)
+    {
+        // Round image view for thumbnail
+        self.thumbnailView.layer.cornerRadius = self.thumbnailView.frame.size.width / 2;
+        self.thumbnailView.clipsToBounds = YES;
+    }
+    else if (self.thumbnailDisplayBoxType == MXKTableViewCellDisplayBoxTypeRoundedCorner)
+    {
+        self.thumbnailView.layer.cornerRadius = 5;
+        self.thumbnailView.clipsToBounds = YES;
+    }
+    else
+    {
+        self.thumbnailView.layer.cornerRadius = 0;
+        self.thumbnailView.clipsToBounds = NO;
+    }
+}
+
+- (UIImage*)picturePlaceholder
+{
+    return [NSBundle mxk_imageFromMXKAssetsBundleWithName:@"default-profile"];
+}
+
+- (void)setContactAccessoryViewType:(MXKContactTableCellAccessoryType)contactAccessoryViewType
+{
+    _contactAccessoryViewType = contactAccessoryViewType;
+    
+    if (contactAccessoryViewType == MXKContactTableCellAccessoryMatrixIcon)
+    {
+        // Load default matrix icon
+        self.contactAccessoryImageView.image = [NSBundle mxk_imageFromMXKAssetsBundleWithName:@"matrixUser"];
+        self.contactAccessoryImageView.hidden = NO;
+        self.contactAccessoryButton.hidden = YES;
+        
+        // Update accessory view visibility
+        [self refreshMatrixIdentifiers];
+    }
+    else
+    {
+        // Hide accessory view by default
+        self.contactAccessoryView.hidden = YES;
+        self.contactAccessoryImageView.hidden = YES;
+        self.contactAccessoryButton.hidden = YES;
+    }
+}
+
+#pragma mark - MXKCellRendering
+
+- (void)render:(MXKCellData *)cellData
+{
+    // Sanity check: accept only object of MXKContact classes or sub-classes
+    NSParameterAssert([cellData isKindOfClass:[MXKContact class]]);
+    
+    contact = (MXKContact*)cellData;
+    
+    // remove any pending observers
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    if (mxPresenceObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:mxPresenceObserver];
+        mxPresenceObserver = nil;
+    }
+    
+    self.thumbnailView.layer.borderWidth = 0;
+    
+    if (contact)
+    {
+        // Be warned when the thumbnail is updated
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onThumbnailUpdate:) name:kMXKContactThumbnailUpdateNotification object:nil];
+        
+        if (! self.hideMatrixPresence)
+        {
+            // Observe contact presence change
+            mxPresenceObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXKContactManagerMatrixUserPresenceChangeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+                
+                // get the matrix identifiers
+                NSArray* matrixIdentifiers = self->contact.matrixIdentifiers;
+                if (matrixIdentifiers.count > 0)
+                {
+                    // Consider only the first id
+                    NSString *matrixUserID = matrixIdentifiers.firstObject;
+                    if ([matrixUserID isEqualToString:notif.object])
+                    {
+                        [self refreshPresenceUserRing:[MXTools presence:[notif.userInfo objectForKey:kMXKContactManagerMatrixPresenceKey]]];
+                    }
+                }
+            }];
+        }
+        
+        if (!contact.isMatrixContact)
+        {
+            // Be warned when the linked matrix IDs are updated
+            [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onMatrixIdUpdate:)  name:kMXKContactManagerDidUpdateLocalContactMatrixIDsNotification object:nil];
+        }
+        
+        NSArray* matrixIDs = contact.matrixIdentifiers;
+        
+        if (matrixIDs.count)
+        {
+            self.contactDisplayNameLabel.hidden = YES;
+            
+            self.matrixDisplayNameLabel.hidden = NO;
+            self.matrixDisplayNameLabel.text = contact.displayName;
+            self.matrixIDLabel.hidden = NO;
+            self.matrixIDLabel.text = [matrixIDs firstObject];
+        }
+        else
+        {
+            self.contactDisplayNameLabel.hidden = NO;
+            self.contactDisplayNameLabel.text = contact.displayName;
+            
+            self.matrixDisplayNameLabel.hidden = YES;
+            self.matrixIDLabel.hidden = YES;
+        }
+        
+        UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onContactThumbnailTap:)];
+        [tap setNumberOfTouchesRequired:1];
+        [tap setNumberOfTapsRequired:1];
+        [tap setDelegate:self];
+        [self.thumbnailView addGestureRecognizer:tap];
+    }
+    
+    [self refreshContactThumbnail];
+    [self manageMatrixIcon];
+}
+
++ (CGFloat)heightForCellData:(MXKCellData*)cellData withMaximumWidth:(CGFloat)maxWidth
+{
+    // The height is fixed
+    return 50;
+}
+
+- (void)didEndDisplay
+{
+    // remove any pending observers
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    if (mxPresenceObserver) {
+        [[NSNotificationCenter defaultCenter] removeObserver:mxPresenceObserver];
+        mxPresenceObserver = nil;
+    }
+    
+    // Remove all gesture recognizer
+    while (self.thumbnailView.gestureRecognizers.count)
+    {
+        [self.thumbnailView removeGestureRecognizer:self.thumbnailView.gestureRecognizers[0]];
+    }
+    
+    self.delegate = nil;
+    contact = nil;
+}
+
+#pragma mark -
+
+- (void)refreshMatrixIdentifiers
+{
+    // Look for a potential matrix user linked with this contact
+    NSArray* matrixIdentifiers = contact.matrixIdentifiers;
+    
+    if ((matrixIdentifiers.count > 0) && (! self.hideMatrixPresence))
+    {
+        // Consider only the first matrix identifier
+        NSString* matrixUserID = matrixIdentifiers.firstObject;
+        
+        // Consider here all sessions reported into contact manager
+        NSArray* mxSessions = [MXKContactManager sharedManager].mxSessions;
+        for (MXSession *mxSession in mxSessions)
+        {
+            MXUser *mxUser = [mxSession userWithUserId:matrixUserID];
+            if (mxUser)
+            {
+                [self refreshPresenceUserRing:mxUser.presence];
+                break;
+            }
+        }
+    }
+    
+    // Update accessory view visibility
+    if (self.contactAccessoryViewType == MXKContactTableCellAccessoryMatrixIcon)
+    {
+        self.contactAccessoryView.hidden = (!matrixIdentifiers.count);
+    }
+}
+
+- (void)refreshContactThumbnail
+{
+    self.thumbnailView.image = [contact thumbnailWithPreferedSize:self.thumbnailView.frame.size];
+    
+    if (!self.thumbnailView.image)
+    {
+        self.thumbnailView.image = self.picturePlaceholder;
+    }
+}
+
+- (void)refreshPresenceUserRing:(MXPresence)presenceStatus
+{
+    UIColor* ringColor;
+    
+    switch (presenceStatus)
+    {
+        case MXPresenceOnline:
+            ringColor = [[MXKAppSettings standardAppSettings] presenceColorForOnlineUser];
+            break;
+        case MXPresenceUnavailable:
+            ringColor = [[MXKAppSettings standardAppSettings] presenceColorForUnavailableUser];
+            break;
+        case MXPresenceOffline:
+            ringColor = [[MXKAppSettings standardAppSettings] presenceColorForOfflineUser];
+            break;
+        default:
+            ringColor = nil;
+    }
+    
+    // if the thumbnail is defined
+    if (ringColor && (! self.hideMatrixPresence))
+    {
+        self.thumbnailView.layer.borderWidth = 2;
+        self.thumbnailView.layer.borderColor = ringColor.CGColor;
+    }
+    else
+    {
+        // remove the border
+        // else it draws black border
+        self.thumbnailView.layer.borderWidth = 0;
+    }
+}
+
+- (void)manageMatrixIcon
+{
+    // try to update the thumbnail with the matrix thumbnail
+    if (contact.matrixIdentifiers)
+    {
+        [self refreshContactThumbnail];
+    }
+    
+    [self refreshMatrixIdentifiers];
+}
+
+- (void)onMatrixIdUpdate:(NSNotification *)notif
+{
+    // sanity check
+    if ([notif.object isKindOfClass:[NSString class]])
+    {
+        NSString* contactID = notif.object;
+        
+        if ([contactID isEqualToString:contact.contactID])
+        {
+            [self manageMatrixIcon];
+        }
+    }
+}
+
+- (void)onThumbnailUpdate:(NSNotification *)notif
+{
+    // sanity check
+    if ([notif.object isKindOfClass:[NSString class]])
+    {
+        NSString* contactID = notif.object;
+        
+        if ([contactID isEqualToString:contact.contactID])
+        {
+            [self refreshContactThumbnail];
+            
+            [self refreshMatrixIdentifiers];
+        }
+    }
+}
+
+#pragma mark - Action
+
+- (IBAction)onContactThumbnailTap:(id)sender
+{
+    if (self.delegate)
+    {
+        [self.delegate cell:self didRecognizeAction:kMXKContactCellTapOnThumbnailView userInfo:@{kMXKContactCellContactIdKey: contact.contactID}];
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/Contact/MXKContactTableCell.xib b/Riot/Modules/MatrixKit/Views/Contact/MXKContactTableCell.xib
new file mode 100644
index 000000000..5173d1b2f
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/Contact/MXKContactTableCell.xib
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="ChX-Tl-3Zt" customClass="MXKContactTableCell">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="50"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ChX-Tl-3Zt" id="SeD-4h-8Bk">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="49"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <view contentMode="scaleAspectFit" translatesAutoresizingMaskIntoConstraints="NO" id="2UL-NX-Nd1" userLabel="Contact Image View" customClass="MXKImageView">
+                        <rect key="frame" x="8" y="5" width="40" height="40"/>
+                        <color key="backgroundColor" red="0.89720267057418823" green="0.89720267057418823" blue="0.89720267057418823" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <gestureRecognizers/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="40" id="QUm-Hf-dkn"/>
+                            <constraint firstAttribute="width" constant="40" id="z2e-H8-DcL"/>
+                        </constraints>
+                    </view>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Single line" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AqS-OH-Gcq">
+                        <rect key="frame" x="60" y="10" width="510" height="30"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="30" id="zWe-gm-gkP"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Line 1" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MBc-s3-6mn">
+                        <rect key="frame" x="60" y="8" width="510" height="22"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="22" id="7wT-nd-kfp"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Line 2" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dqg-OY-Nhb" userLabel="Line 2">
+                        <rect key="frame" x="60" y="28" width="510" height="18"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="18" id="BEu-8L-a1q"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                        <color key="textColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uMV-DW-X26" userLabel="Accessory View">
+                        <rect key="frame" x="574" y="17" width="16" height="16"/>
+                        <subviews>
+                            <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="BcH-3j-P0i" userLabel="Accessory Image View">
+                                <rect key="frame" x="0.0" y="0.0" width="16" height="16"/>
+                            </imageView>
+                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="j2S-s7-q50" userLabel="Accessory Button">
+                                <rect key="frame" x="-7" y="-7" width="30" height="30"/>
+                                <state key="normal">
+                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                </state>
+                            </button>
+                        </subviews>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="centerY" secondItem="j2S-s7-q50" secondAttribute="centerY" id="3Qb-sa-m7f"/>
+                            <constraint firstAttribute="bottom" secondItem="BcH-3j-P0i" secondAttribute="bottom" id="KIl-sC-FVk"/>
+                            <constraint firstAttribute="centerX" secondItem="j2S-s7-q50" secondAttribute="centerX" id="Wp1-CK-YKk"/>
+                            <constraint firstAttribute="width" constant="16" id="cWZ-C3-LfR"/>
+                            <constraint firstAttribute="trailing" secondItem="BcH-3j-P0i" secondAttribute="trailing" id="mol-ud-P3Q"/>
+                            <constraint firstItem="BcH-3j-P0i" firstAttribute="top" secondItem="uMV-DW-X26" secondAttribute="top" id="sT8-GB-Hzx"/>
+                            <constraint firstItem="BcH-3j-P0i" firstAttribute="leading" secondItem="uMV-DW-X26" secondAttribute="leading" id="wTq-hz-2Wl"/>
+                            <constraint firstAttribute="height" constant="16" id="xAv-oq-PkL"/>
+                        </constraints>
+                    </view>
+                </subviews>
+                <constraints>
+                    <constraint firstAttribute="centerY" secondItem="2UL-NX-Nd1" secondAttribute="centerY" id="2z5-cx-W9f"/>
+                    <constraint firstItem="Dqg-OY-Nhb" firstAttribute="leading" secondItem="2UL-NX-Nd1" secondAttribute="trailing" constant="12" id="5I6-PQ-4Bt"/>
+                    <constraint firstAttribute="centerY" secondItem="AqS-OH-Gcq" secondAttribute="centerY" id="9jE-l2-2tm"/>
+                    <constraint firstAttribute="trailing" secondItem="uMV-DW-X26" secondAttribute="trailing" constant="10" id="DDZ-6z-ppJ"/>
+                    <constraint firstAttribute="centerY" secondItem="uMV-DW-X26" secondAttribute="centerY" id="OFV-RA-kUY"/>
+                    <constraint firstItem="2UL-NX-Nd1" firstAttribute="leading" secondItem="SeD-4h-8Bk" secondAttribute="leading" constant="8" id="Tno-FP-CJJ"/>
+                    <constraint firstItem="MBc-s3-6mn" firstAttribute="width" secondItem="Dqg-OY-Nhb" secondAttribute="width" id="Wk2-qO-Gdj"/>
+                    <constraint firstItem="AqS-OH-Gcq" firstAttribute="leading" secondItem="2UL-NX-Nd1" secondAttribute="trailing" constant="12" id="dSV-cR-GP0"/>
+                    <constraint firstItem="MBc-s3-6mn" firstAttribute="leading" secondItem="2UL-NX-Nd1" secondAttribute="trailing" constant="12" id="f7x-gz-aR7"/>
+                    <constraint firstItem="uMV-DW-X26" firstAttribute="leading" secondItem="Dqg-OY-Nhb" secondAttribute="trailing" constant="4" id="oJV-sA-GzJ"/>
+                    <constraint firstItem="AqS-OH-Gcq" firstAttribute="width" secondItem="MBc-s3-6mn" secondAttribute="width" id="qGv-M1-qC6"/>
+                    <constraint firstItem="MBc-s3-6mn" firstAttribute="top" secondItem="SeD-4h-8Bk" secondAttribute="topMargin" id="qf2-UP-3lW"/>
+                    <constraint firstAttribute="bottomMargin" secondItem="Dqg-OY-Nhb" secondAttribute="bottom" constant="-5" id="tLG-uu-oPr"/>
+                </constraints>
+            </tableViewCellContentView>
+            <connections>
+                <outlet property="contactAccessoryButton" destination="j2S-s7-q50" id="9hP-Zr-kHK"/>
+                <outlet property="contactAccessoryImageView" destination="BcH-3j-P0i" id="Omi-4G-fbt"/>
+                <outlet property="contactAccessoryView" destination="uMV-DW-X26" id="6kX-sp-tuz"/>
+                <outlet property="contactAccessoryViewHeightConstraint" destination="xAv-oq-PkL" id="MGt-PN-Brr"/>
+                <outlet property="contactAccessoryViewWidthConstraint" destination="cWZ-C3-LfR" id="0pP-6i-gop"/>
+                <outlet property="contactDisplayNameLabel" destination="AqS-OH-Gcq" id="Znz-dt-zKJ"/>
+                <outlet property="matrixDisplayNameLabel" destination="MBc-s3-6mn" id="BWe-zO-aM3"/>
+                <outlet property="matrixIDLabel" destination="Dqg-OY-Nhb" id="SlZ-le-uC1"/>
+                <outlet property="thumbnailView" destination="2UL-NX-Nd1" id="uMq-9r-M4G"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/DeviceView/MXKDeviceView.h b/Riot/Modules/MatrixKit/Views/DeviceView/MXKDeviceView.h
new file mode 100644
index 000000000..9e69cc1a7
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/DeviceView/MXKDeviceView.h
@@ -0,0 +1,85 @@
+/*
+ Copyright 2016 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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 <MatrixSDK/MatrixSDK.h>
+
+#import "MXKView.h"
+
+/**
+ MXKDeviceView class may be used to display the information of a user's device.
+ The displayed device may be renamed or removed.
+ */
+
+@class MXKDeviceView;
+@protocol MXKDeviceViewDelegate <NSObject>
+
+/**
+ Tells the delegate that an alert must be presented.
+ 
+ @param deviceView the device view.
+ @param alert the alert to present.
+ */
+- (void)deviceView:(MXKDeviceView*)deviceView presentAlertController:(UIAlertController*)alert;
+
+@optional
+
+/**
+ Tells the delegate to dismiss the device view.
+ 
+ @param deviceView the device view.
+ @param isUpdated tell whether the device was updated (renamed, removed...).
+ */
+- (void)dismissDeviceView:(MXKDeviceView*)deviceView didUpdate:(BOOL)isUpdated;
+
+@end
+
+@interface MXKDeviceView : MXKView <UIGestureRecognizerDelegate>
+
+@property (weak, nonatomic) IBOutlet UIView *bgView;
+@property (weak, nonatomic) IBOutlet UIView *containerView;
+@property (weak, nonatomic) IBOutlet UITextView *textView;
+@property (weak, nonatomic) IBOutlet UIButton *cancelButton;
+@property (weak, nonatomic) IBOutlet UIButton *renameButton;
+@property (weak, nonatomic) IBOutlet UIButton *deleteButton;
+@property (weak, nonatomic) IBOutlet UIActivityIndicatorView *activityIndicator;
+
+/**
+ Initialize a device view to display the information of a user's device.
+ 
+ @param device a user's device.
+ @param session the matrix session.
+ @return the newly created instance.
+ */
+- (instancetype)initWithDevice:(MXDevice*)device andMatrixSession:(MXSession*)session;
+
+/**
+ The delegate.
+ */
+@property (nonatomic, weak) id<MXKDeviceViewDelegate> delegate;
+
+/**
+ The default text color in the text view. [UIColor blackColor] by default.
+ */
+@property (nonatomic) UIColor *defaultTextColor;
+
+/**
+ Action registered on 'UIControlEventTouchUpInside' event for each UIButton instance.
+ */
+- (IBAction)onButtonPressed:(id)sender;
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/DeviceView/MXKDeviceView.m b/Riot/Modules/MatrixKit/Views/DeviceView/MXKDeviceView.m
new file mode 100644
index 000000000..3551e08e2
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/DeviceView/MXKDeviceView.m
@@ -0,0 +1,481 @@
+/*
+ Copyright 2016 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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 "MXKDeviceView.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKConstants.h"
+
+#import "MXKSwiftHeader.h"
+
+static NSAttributedString *verticalWhitespace = nil;
+
+@interface MXKDeviceView ()
+{
+    /**
+     The displayed device
+     */
+    MXDevice *mxDevice;
+    
+    /**
+     The matrix session.
+     */
+    MXSession *mxSession;
+    
+    /**
+     The current alert
+     */
+    UIAlertController *currentAlert;
+    
+    /**
+     Current request in progress.
+     */
+    MXHTTPOperation *mxCurrentOperation;
+}
+@end
+
+@implementation MXKDeviceView
+
++ (UINib *)nib
+{
+    // Check whether a nib file is available
+    NSBundle *mainBundle = [NSBundle mxk_bundleForClass:self.class];
+    
+    NSString *path = [mainBundle pathForResource:NSStringFromClass([self class]) ofType:@"nib"];
+    if (path)
+    {
+        return [UINib nibWithNibName:NSStringFromClass([self class]) bundle:mainBundle];
+    }
+    return [UINib nibWithNibName:NSStringFromClass([MXKDeviceView class]) bundle:[NSBundle mxk_bundleForClass:[MXKDeviceView class]]];
+}
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    
+    // Add tap recognizer to discard the view on bg view tap
+    UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onBgViewTap:)];
+    [tap setNumberOfTouchesRequired:1];
+    [tap setNumberOfTapsRequired:1];
+    [tap setDelegate:self];
+    [self.bgView addGestureRecognizer:tap];
+    
+    // Localize string
+    [_cancelButton setTitle:[MatrixKitL10n ok] forState:UIControlStateNormal];
+    [_cancelButton setTitle:[MatrixKitL10n ok] forState:UIControlStateHighlighted];
+    
+    [_renameButton setTitle:[MatrixKitL10n rename] forState:UIControlStateNormal];
+    [_renameButton setTitle:[MatrixKitL10n rename] forState:UIControlStateHighlighted];
+    
+    [_deleteButton setTitle:[MatrixKitL10n delete] forState:UIControlStateNormal];
+    [_deleteButton setTitle:[MatrixKitL10n delete] forState:UIControlStateHighlighted];
+}
+
+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+    
+    // Scroll to the top the text view content
+    self.textView.contentOffset = CGPointZero;
+}
+
+#pragma mark - Override MXKView
+
+-(void)customizeViewRendering
+{
+    [super customizeViewRendering];
+    
+    _defaultTextColor = [UIColor blackColor];
+    
+    // Add shadow on added view
+    _containerView.layer.cornerRadius = 5;
+    _containerView.layer.shadowOffset = CGSizeMake(0, 1);
+    _containerView.layer.shadowOpacity = 0.5f;
+}
+
+#pragma mark -
+
+- (void)removeFromSuperviewDidUpdate:(BOOL)isUpdated
+{
+    if (currentAlert)
+    {
+        [currentAlert dismissViewControllerAnimated:NO completion:nil];
+        currentAlert = nil;
+    }
+    
+    if (mxCurrentOperation)
+    {
+        [mxCurrentOperation cancel];
+        mxCurrentOperation = nil;
+    }
+    
+    if (self.delegate && [self.delegate respondsToSelector:@selector(dismissDeviceView:didUpdate:)])
+    {
+        [self.delegate dismissDeviceView:self didUpdate:isUpdated];
+    }
+    else
+    {
+        [self removeFromSuperview];
+    }
+}
+
+- (instancetype)initWithDevice:(MXDevice*)device andMatrixSession:(MXSession*)session
+{
+    self = [[[self class] nib] instantiateWithOwner:nil options:nil].firstObject;
+    if (self)
+    {
+        mxDevice = device;
+        mxSession = session;
+        
+        [self setTranslatesAutoresizingMaskIntoConstraints: NO];
+        
+        if (mxDevice)
+        {
+            // Device information
+            NSMutableAttributedString *deviceInformationString = [[NSMutableAttributedString alloc]
+                                                                  initWithString:[MatrixKitL10n deviceDetailsTitle]
+                                                                  attributes:@{NSForegroundColorAttributeName : _defaultTextColor,
+                                                                               NSFontAttributeName: [UIFont boldSystemFontOfSize:15]}];
+            [deviceInformationString appendAttributedString:[MXKDeviceView verticalWhitespace]];
+            
+            [deviceInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                             initWithString:[MatrixKitL10n deviceDetailsName]
+                                                             attributes:@{NSForegroundColorAttributeName : _defaultTextColor,
+                                                                          NSFontAttributeName: [UIFont boldSystemFontOfSize:14]}]];
+            [deviceInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                             initWithString:device.displayName.length ? device.displayName : @""
+                                                             attributes:@{NSForegroundColorAttributeName : _defaultTextColor,
+                                                                          NSFontAttributeName: [UIFont systemFontOfSize:14]}]];
+            [deviceInformationString appendAttributedString:[MXKDeviceView verticalWhitespace]];
+            
+            [deviceInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                             initWithString:[MatrixKitL10n deviceDetailsIdentifier]
+                                                             attributes:@{NSForegroundColorAttributeName : _defaultTextColor,
+                                                                          NSFontAttributeName: [UIFont boldSystemFontOfSize:14]}]];
+            [deviceInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                             initWithString:device.deviceId
+                                                             attributes:@{NSForegroundColorAttributeName : _defaultTextColor,
+                                                                          NSFontAttributeName: [UIFont systemFontOfSize:14]}]];
+            [deviceInformationString appendAttributedString:[MXKDeviceView verticalWhitespace]];
+            
+            [deviceInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                      initWithString:[MatrixKitL10n deviceDetailsLastSeen]
+                                                      attributes:@{NSForegroundColorAttributeName : _defaultTextColor,
+                                                                   NSFontAttributeName: [UIFont boldSystemFontOfSize:14]}]];
+            
+            NSDate *lastSeenDate = [NSDate dateWithTimeIntervalSince1970:device.lastSeenTs/1000];
+            
+            NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+            [dateFormatter setLocale:[[NSLocale alloc] initWithLocaleIdentifier:[[[NSBundle mainBundle] preferredLocalizations] objectAtIndex:0]]];
+            [dateFormatter setDateStyle:NSDateFormatterShortStyle];
+            [dateFormatter setTimeStyle:NSDateFormatterShortStyle];
+            [dateFormatter setFormatterBehavior:NSDateFormatterBehavior10_4];
+            
+            NSString *lastSeen = [MatrixKitL10n deviceDetailsLastSeenFormat:device.lastSeenIp :[dateFormatter stringFromDate:lastSeenDate]];
+            
+            [deviceInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                      initWithString:lastSeen
+                                                      attributes:@{NSForegroundColorAttributeName : _defaultTextColor,
+                                                                   NSFontAttributeName: [UIFont systemFontOfSize:14]}]];
+            [deviceInformationString appendAttributedString:[MXKDeviceView verticalWhitespace]];
+            
+            self.textView.attributedText = deviceInformationString;
+        }
+        else
+        {
+            _textView.text = nil;
+        }
+        
+        // Hide potential activity indicator
+        [_activityIndicator stopAnimating];
+    }
+    
+    return self;
+}
+
+- (void)dealloc
+{
+    mxDevice = nil;
+    mxSession = nil;
+}
+
++ (NSAttributedString *)verticalWhitespace
+{
+    if (verticalWhitespace == nil)
+    {
+        verticalWhitespace = [[NSAttributedString alloc] initWithString:@"\n\n" attributes:@{NSFontAttributeName: [UIFont systemFontOfSize:4]}];
+    }
+    return verticalWhitespace;
+}
+
+#pragma mark - Actions
+
+- (IBAction)onBgViewTap:(UITapGestureRecognizer*)sender
+{
+    [self removeFromSuperviewDidUpdate:NO];
+}
+
+- (IBAction)onButtonPressed:(id)sender
+{
+    if (sender == _cancelButton)
+    {
+        [self removeFromSuperviewDidUpdate:NO];
+    }
+    else if (sender == _renameButton)
+    {
+        [self renameDevice];
+    }
+    else if (sender == _deleteButton)
+    {
+        [self deleteDevice];
+    }
+}
+
+#pragma mark -
+
+- (void)renameDevice
+{
+    if (!self.delegate)
+    {
+        // Ignore
+        MXLogDebug(@"[MXKDeviceView] Rename device failed, delegate is missing");
+        return;
+    }
+    
+    // Prompt the user to enter a device name.
+    [currentAlert dismissViewControllerAnimated:NO completion:nil];
+    __weak typeof(self) weakSelf = self;
+    
+    currentAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n deviceDetailsRenamePromptTitle]
+                                                       message:[MatrixKitL10n deviceDetailsRenamePromptMessage] preferredStyle:UIAlertControllerStyleAlert];
+
+    [currentAlert addTextFieldWithConfigurationHandler:^(UITextField *textField) {
+        
+        textField.secureTextEntry = NO;
+        textField.placeholder = nil;
+        textField.keyboardType = UIKeyboardTypeDefault;
+        if (weakSelf)
+        {
+            typeof(self) self = weakSelf;
+            textField.text = self->mxDevice.displayName;
+        }
+    }];
+    
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+                                              style:UIAlertActionStyleDefault
+                                            handler:^(UIAlertAction * action) {
+                                                
+                                                if (weakSelf)
+                                                {
+                                                    typeof(self) self = weakSelf;
+                                                    self->currentAlert = nil;
+                                                }
+                                                
+                                            }]];
+    
+    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
+                                                     style:UIAlertActionStyleDefault
+                                                   handler:^(UIAlertAction * action) {
+                                                       
+                                                       if (weakSelf)
+                                                       {
+                                                           typeof(self) self = weakSelf;
+                                                           NSString *text = [self->currentAlert textFields].firstObject.text;
+                                                           self->currentAlert = nil;
+                                                           
+                                                           [self.activityIndicator startAnimating];
+                                                           
+                                                           self->mxCurrentOperation = [self->mxSession.matrixRestClient setDeviceName:text forDeviceId:self->mxDevice.deviceId success:^{
+                                                               
+                                                               if (weakSelf)
+                                                               {
+                                                                   typeof(self) self = weakSelf;
+                                                                   
+                                                                   self->mxCurrentOperation = nil;
+                                                                   [self.activityIndicator stopAnimating];
+                                                                   
+                                                                   [self removeFromSuperviewDidUpdate:YES];
+                                                               }
+                                                               
+                                                           } failure:^(NSError *error) {
+                                                               
+                                                               if (weakSelf)
+                                                               {
+                                                                   typeof(self) self = weakSelf;
+                                                                   
+                                                                   // Notify MatrixKit user
+                                                                   NSString *myUserId = self->mxSession.myUser.userId;
+                                                                   [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+                                                                   
+                                                                   self->mxCurrentOperation = nil;
+                                                                   
+                                                                   MXLogDebug(@"[MXKDeviceView] Rename device (%@) failed", self->mxDevice.deviceId);
+                                                                   
+                                                                   [self.activityIndicator stopAnimating];
+                                                                   
+                                                                   [self removeFromSuperviewDidUpdate:NO];
+                                                               }
+                                                               
+                                                           }];
+                                                       }
+                                                       
+                                                   }]];
+    
+    [self.delegate deviceView:self presentAlertController:currentAlert];
+}
+
+- (void)deleteDevice
+{
+    if (!self.delegate)
+    {
+        // Ignore
+        MXLogDebug(@"[MXKDeviceView] Delete device failed, delegate is missing");
+        return;
+    }
+    
+    // Get an authentication session to prepare device deletion
+    [self.activityIndicator startAnimating];
+    
+    mxCurrentOperation = [mxSession.matrixRestClient getSessionToDeleteDeviceByDeviceId:mxDevice.deviceId success:^(MXAuthenticationSession *authSession) {
+        
+        self->mxCurrentOperation = nil;
+
+        // Check whether the password based type is supported
+        BOOL isPasswordBasedTypeSupported = NO;
+        for (MXLoginFlow *loginFlow in authSession.flows)
+        {
+            if ([loginFlow.type isEqualToString:kMXLoginFlowTypePassword] || [loginFlow.stages indexOfObject:kMXLoginFlowTypePassword] != NSNotFound)
+            {
+                isPasswordBasedTypeSupported = YES;
+                break;
+            }
+        }
+        
+        if (isPasswordBasedTypeSupported && authSession.session)
+        {
+            // Prompt for a password
+            [self->currentAlert dismissViewControllerAnimated:NO completion:nil];
+            
+            __weak typeof(self) weakSelf = self;
+            
+            // Prompt the user before deleting the device.
+            self->currentAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n deviceDetailsDeletePromptTitle] message:[MatrixKitL10n deviceDetailsDeletePromptMessage] preferredStyle:UIAlertControllerStyleAlert];
+            
+            
+            [self->currentAlert addTextFieldWithConfigurationHandler:^(UITextField *textField) {
+                
+                textField.secureTextEntry = YES;
+                textField.placeholder = nil;
+                textField.keyboardType = UIKeyboardTypeDefault;
+            }];
+            
+            [self->currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+                                                             style:UIAlertActionStyleDefault
+                                                           handler:^(UIAlertAction * action) {
+                                                               
+                                                               if (weakSelf)
+                                                               {
+                                                                   typeof(self) self = weakSelf;
+                                                                   self->currentAlert = nil;
+                                                                   [self.activityIndicator stopAnimating];
+                                                               }
+                                                               
+                                                           }]];
+            
+            [self->currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n submit]
+                                                             style:UIAlertActionStyleDefault
+                                                           handler:^(UIAlertAction * action) {
+                                                               
+                                                               if (weakSelf)
+                                                               {
+                                                                   typeof(self) self = weakSelf;
+                                                                   UITextField *textField = [self->currentAlert textFields].firstObject;
+                                                                   self->currentAlert = nil;
+                                                                   
+                                                                   NSString *userId = self->mxSession.myUser.userId;
+                                                                   NSDictionary *authParams;
+                                                                   
+                                                                   // Sanity check
+                                                                   if (userId)
+                                                                   {
+                                                                       authParams = @{@"session":authSession.session,
+                                                                                      @"user": userId,
+                                                                                      @"password": textField.text,
+                                                                                      @"type": kMXLoginFlowTypePassword};
+                                                                       
+                                                                   }
+                                                                   
+                                                                   self->mxCurrentOperation = [self->mxSession.matrixRestClient deleteDeviceByDeviceId:self->mxDevice.deviceId authParams:authParams success:^{
+                                                                       
+                                                                       if (weakSelf)
+                                                                       {
+                                                                           typeof(self) self = weakSelf;
+                                                                           
+                                                                           self->mxCurrentOperation = nil;
+                                                                           [self.activityIndicator stopAnimating];
+                                                                           
+                                                                           [self removeFromSuperviewDidUpdate:YES];
+                                                                       }
+                                                                       
+                                                                   } failure:^(NSError *error) {
+                                                    
+                                                                       if (weakSelf)
+                                                                       {
+                                                                           typeof(self) self = weakSelf;
+                                                                           
+                                                                           // Notify MatrixKit user
+                                                                           NSString *myUserId = self->mxSession.myUser.userId;
+                                                                           [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+                                                                           
+                                                                           self->mxCurrentOperation = nil;
+                                                                           
+                                                                           MXLogDebug(@"[MXKDeviceView] Delete device (%@) failed", self->mxDevice.deviceId);
+                                                                           
+                                                                           [self.activityIndicator stopAnimating];
+                                                                           
+                                                                           [self removeFromSuperviewDidUpdate:NO];
+                                                                       }
+                                                                       
+                                                                   }];
+                                                               }
+                                                               
+                                                           }]];
+            
+            [self.delegate deviceView:self presentAlertController:self->currentAlert];
+        }
+        else
+        {
+            MXLogDebug(@"[MXKDeviceView] Delete device (%@) failed, auth session flow type is not supported", self->mxDevice.deviceId);
+            [self.activityIndicator stopAnimating];
+        }
+        
+    } failure:^(NSError *error) {
+        
+        self->mxCurrentOperation = nil;
+        
+        MXLogDebug(@"[MXKDeviceView] Delete device (%@) failed, unable to get auth session", self->mxDevice.deviceId);
+        [self.activityIndicator stopAnimating];
+        
+        // Notify MatrixKit user
+        NSString *myUserId = self->mxSession.myUser.userId;
+        [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+    }];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/DeviceView/MXKDeviceView.xib b/Riot/Modules/MatrixKit/Views/DeviceView/MXKDeviceView.xib
new file mode 100644
index 000000000..17e9bfa40
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/DeviceView/MXKDeviceView.xib
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="8VI-1E-fge" customClass="MXKDeviceView">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <subviews>
+                <view alpha="0.5" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="D7c-Zw-n8I">
+                    <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                    <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="c3W-Ma-n01">
+                    <rect key="frame" x="10" y="74" width="580" height="250"/>
+                    <subviews>
+                        <textView autoresizesSubviews="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" bounces="NO" editable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Vk-Jx-L6Y">
+                            <rect key="frame" x="10" y="10" width="560" height="190"/>
+                            <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+                            <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                            <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                        </textView>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ump-1C-SzI">
+                            <rect key="frame" x="57.5" y="210" width="30" height="30"/>
+                            <state key="normal" title="OK">
+                                <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            </state>
+                            <connections>
+                                <action selector="onButtonPressed:" destination="8VI-1E-fge" eventType="touchUpInside" id="t42-2S-MsY"/>
+                            </connections>
+                        </button>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="o3Z-D3-2S3">
+                            <rect key="frame" x="335" y="210" width="56" height="30"/>
+                            <state key="normal" title="Rename">
+                                <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            </state>
+                            <connections>
+                                <action selector="onButtonPressed:" destination="8VI-1E-fge" eventType="touchUpInside" id="hbe-VP-vE5"/>
+                            </connections>
+                        </button>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qkC-t0-Qd0">
+                            <rect key="frame" x="485" y="210" width="45" height="30"/>
+                            <state key="normal" title="Delete">
+                                <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            </state>
+                            <connections>
+                                <action selector="onButtonPressed:" destination="8VI-1E-fge" eventType="touchUpInside" id="ljK-ul-fY2"/>
+                            </connections>
+                        </button>
+                    </subviews>
+                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <constraints>
+                        <constraint firstItem="3Vk-Jx-L6Y" firstAttribute="leading" secondItem="c3W-Ma-n01" secondAttribute="leading" constant="10" id="ECh-zm-rMb"/>
+                        <constraint firstAttribute="trailing" secondItem="3Vk-Jx-L6Y" secondAttribute="trailing" constant="10" id="J2X-t1-Wuo"/>
+                        <constraint firstItem="qkC-t0-Qd0" firstAttribute="top" secondItem="3Vk-Jx-L6Y" secondAttribute="bottom" constant="10" id="QLy-iD-ead"/>
+                        <constraint firstAttribute="bottom" secondItem="o3Z-D3-2S3" secondAttribute="bottom" constant="10" id="RLg-NE-JtP"/>
+                        <constraint firstAttribute="centerX" secondItem="Ump-1C-SzI" secondAttribute="centerX" multiplier="4" id="anR-Ea-ml6"/>
+                        <constraint firstAttribute="bottom" secondItem="qkC-t0-Qd0" secondAttribute="bottom" constant="10" id="eJw-AZ-Okc"/>
+                        <constraint firstItem="3Vk-Jx-L6Y" firstAttribute="top" secondItem="c3W-Ma-n01" secondAttribute="top" constant="10" id="ej1-zq-aDf"/>
+                        <constraint firstAttribute="centerX" secondItem="o3Z-D3-2S3" secondAttribute="centerX" multiplier="4/5" id="h0U-I5-5dA"/>
+                        <constraint firstAttribute="bottom" secondItem="Ump-1C-SzI" secondAttribute="bottom" constant="10" id="kLj-CN-wSG"/>
+                        <constraint firstAttribute="height" priority="750" constant="250" id="rtj-ON-bkY"/>
+                        <constraint firstAttribute="centerX" secondItem="qkC-t0-Qd0" secondAttribute="centerX" multiplier="4/7" id="s2R-r3-jqz"/>
+                    </constraints>
+                </view>
+                <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="4za-i5-u2D">
+                    <rect key="frame" x="290" y="290" width="20" height="20"/>
+                </activityIndicatorView>
+            </subviews>
+            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="D7c-Zw-n8I" firstAttribute="top" secondItem="8VI-1E-fge" secondAttribute="top" id="9Md-NO-OM3"/>
+                <constraint firstAttribute="trailing" secondItem="c3W-Ma-n01" secondAttribute="trailing" constant="10" id="F6j-Ia-5EQ"/>
+                <constraint firstItem="D7c-Zw-n8I" firstAttribute="leading" secondItem="8VI-1E-fge" secondAttribute="leading" id="Gzh-sa-sB4"/>
+                <constraint firstItem="c3W-Ma-n01" firstAttribute="height" relation="lessThanOrEqual" secondItem="8VI-1E-fge" secondAttribute="height" constant="-20" id="OE8-Ll-IX0"/>
+                <constraint firstItem="4za-i5-u2D" firstAttribute="centerX" secondItem="8VI-1E-fge" secondAttribute="centerX" id="SGT-wg-tcC"/>
+                <constraint firstItem="c3W-Ma-n01" firstAttribute="top" secondItem="8VI-1E-fge" secondAttribute="top" constant="74" id="a6K-LL-lzT"/>
+                <constraint firstItem="4za-i5-u2D" firstAttribute="centerY" secondItem="8VI-1E-fge" secondAttribute="centerY" id="gjb-ga-edx"/>
+                <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="c3W-Ma-n01" secondAttribute="bottom" constant="10" id="oD7-T4-DuW"/>
+                <constraint firstAttribute="bottom" secondItem="D7c-Zw-n8I" secondAttribute="bottom" id="qda-fo-h6c"/>
+                <constraint firstItem="c3W-Ma-n01" firstAttribute="leading" secondItem="8VI-1E-fge" secondAttribute="leading" constant="10" id="ryV-yq-aqs"/>
+                <constraint firstAttribute="trailing" secondItem="D7c-Zw-n8I" secondAttribute="trailing" id="wCd-aV-jjY"/>
+            </constraints>
+            <nil key="simulatedStatusBarMetrics"/>
+            <nil key="simulatedTopBarMetrics"/>
+            <nil key="simulatedBottomBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="activityIndicator" destination="4za-i5-u2D" id="IH9-BZ-e26"/>
+                <outlet property="bgView" destination="D7c-Zw-n8I" id="iQs-LG-SpD"/>
+                <outlet property="cancelButton" destination="Ump-1C-SzI" id="U8M-nT-JiK"/>
+                <outlet property="containerView" destination="c3W-Ma-n01" id="Stk-lk-Wew"/>
+                <outlet property="deleteButton" destination="qkC-t0-Qd0" id="bRu-al-rte"/>
+                <outlet property="renameButton" destination="o3Z-D3-2S3" id="4tr-TC-EcJ"/>
+                <outlet property="textView" destination="3Vk-Jx-L6Y" id="uOw-Bq-neN"/>
+            </connections>
+        </view>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/EncryptionInfoView/MXKEncryptionInfoView.h b/Riot/Modules/MatrixKit/Views/EncryptionInfoView/MXKEncryptionInfoView.h
new file mode 100644
index 000000000..80afc81e1
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/EncryptionInfoView/MXKEncryptionInfoView.h
@@ -0,0 +1,103 @@
+/*
+ Copyright 2016 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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 <MatrixSDK/MatrixSDK.h>
+
+#import "MXKView.h"
+
+@protocol MXKEncryptionInfoViewDelegate;
+
+/**
+ MXKEncryptionInfoView class may be used to display the available information on a encrypted event.
+ The event sender device may be verified, unverified, blocked or unblocked from this view.
+ */
+@interface MXKEncryptionInfoView : MXKView
+
+/**
+ The displayed event
+ */
+@property (nonatomic, readonly) MXEvent *mxEvent;
+
+/**
+ The matrix session.
+ */
+@property (nonatomic, readonly) MXSession *mxSession;
+
+/**
+ The event device info
+ */
+@property (nonatomic, readonly) MXDeviceInfo *mxDeviceInfo;
+
+@property (weak, nonatomic) IBOutlet UITextView *textView;
+@property (weak, nonatomic) IBOutlet UIButton *cancelButton;
+@property (weak, nonatomic) IBOutlet UIButton *verifyButton;
+@property (weak, nonatomic) IBOutlet UIButton *blockButton;
+@property (weak, nonatomic) IBOutlet UIButton *confirmVerifyButton;
+
+@property (nonatomic, weak) id<MXKEncryptionInfoViewDelegate> delegate;
+
+/**
+ Initialise an `MXKEncryptionInfoView` instance based on an encrypted event
+ 
+ @param event the encrypted event.
+ @param session the related matrix session.
+ @return the newly created instance.
+ */
+- (instancetype)initWithEvent:(MXEvent*)event andMatrixSession:(MXSession*)session;
+
+/**
+ Initialise an `MXKEncryptionInfoView` instance based only on a device information.
+ 
+ @param deviceInfo the device information.
+ @param session the related matrix session.
+ @return the newly created instance.
+ */
+- (instancetype)initWithDeviceInfo:(MXDeviceInfo*)deviceInfo andMatrixSession:(MXSession*)session;
+
+/**
+ The default text color in the text view. [UIColor blackColor] by default.
+ */
+@property (nonatomic) UIColor *defaultTextColor;
+
+/**
+ Action registered on 'UIControlEventTouchUpInside' event for each UIButton instance.
+*/
+- (IBAction)onButtonPressed:(id)sender;
+
+@end
+
+
+@protocol MXKEncryptionInfoViewDelegate <NSObject>
+
+/**
+ Called when the user changes the verified state of a device.
+ 
+ @param encryptionInfoView the view.
+ @param deviceInfo the device that has changed.
+ */
+- (void)encryptionInfoView:(MXKEncryptionInfoView*)encryptionInfoView didDeviceInfoVerifiedChange:(MXDeviceInfo*)deviceInfo;
+
+@optional
+
+/**
+ Called when the user close the view without changing value.
+
+ @param encryptionInfoView the view.
+ */
+- (void)encryptionInfoViewDidClose:(MXKEncryptionInfoView*)encryptionInfoView;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/EncryptionInfoView/MXKEncryptionInfoView.m b/Riot/Modules/MatrixKit/Views/EncryptionInfoView/MXKEncryptionInfoView.m
new file mode 100644
index 000000000..a6537cbd5
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/EncryptionInfoView/MXKEncryptionInfoView.m
@@ -0,0 +1,492 @@
+/*
+ Copyright 2016 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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 "MXKEncryptionInfoView.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKConstants.h"
+
+#import "MXKSwiftHeader.h"
+
+static NSAttributedString *verticalWhitespace = nil;
+
+@interface MXKEncryptionInfoView ()
+{    
+    /**
+     Current request in progress.
+     */
+    MXHTTPOperation *mxCurrentOperation;
+    
+}
+@end
+
+@implementation MXKEncryptionInfoView
+
++ (UINib *)nib
+{
+    // Check whether a nib file is available
+    NSBundle *mainBundle = [NSBundle mxk_bundleForClass:self.class];
+    
+    NSString *path = [mainBundle pathForResource:NSStringFromClass([self class]) ofType:@"nib"];
+    if (path)
+    {
+        return [UINib nibWithNibName:NSStringFromClass([self class]) bundle:mainBundle];
+    }
+    return [UINib nibWithNibName:NSStringFromClass([MXKEncryptionInfoView class]) bundle:[NSBundle mxk_bundleForClass:[MXKEncryptionInfoView class]]];
+}
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    
+    // Localize string
+    [_cancelButton setTitle:[MatrixKitL10n ok] forState:UIControlStateNormal];
+    [_cancelButton setTitle:[MatrixKitL10n ok] forState:UIControlStateHighlighted];
+    
+    [_confirmVerifyButton setTitle:[MatrixKitL10n roomEventEncryptionVerifyOk] forState:UIControlStateNormal];
+    [_confirmVerifyButton setTitle:[MatrixKitL10n roomEventEncryptionVerifyOk] forState:UIControlStateHighlighted];
+}
+
+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+    
+    // Scroll to the top the text view content
+    self.textView.contentOffset = CGPointZero;
+}
+
+- (void)removeFromSuperview
+{
+    if (mxCurrentOperation)
+    {
+        [mxCurrentOperation cancel];
+        mxCurrentOperation = nil;
+    }
+    
+    [super removeFromSuperview];
+}
+
+#pragma mark - Override MXKView
+
+-(void)customizeViewRendering
+{
+    [super customizeViewRendering];
+    
+    _defaultTextColor = [UIColor blackColor];
+}
+
+#pragma mark -
+
+- (instancetype)initWithEvent:(MXEvent*)event andMatrixSession:(MXSession*)session
+{
+    self = [[[self class] nib] instantiateWithOwner:nil options:nil].firstObject;
+    if (self)
+    {
+        _mxEvent = event;
+        _mxSession = session;
+        _mxDeviceInfo = nil;
+        
+        [self setTranslatesAutoresizingMaskIntoConstraints: NO];
+        
+        [self updateTextViewText];
+    }
+    
+    return self;
+}
+
+- (instancetype)initWithDeviceInfo:(MXDeviceInfo*)deviceInfo andMatrixSession:(MXSession*)session
+{
+    self = [[[self class] nib] instantiateWithOwner:nil options:nil].firstObject;
+    if (self)
+    {
+        _mxEvent = nil;
+        _mxDeviceInfo = deviceInfo;
+        _mxSession = session;
+        
+        [self setTranslatesAutoresizingMaskIntoConstraints: NO];
+        
+        [self updateTextViewText];
+    }
+    
+    return self;
+}
+
+- (void)dealloc
+{
+    _mxEvent = nil;
+    _mxSession = nil;
+    _mxDeviceInfo = nil;
+}
+
+#pragma mark - 
+
+- (void)updateTextViewText
+{
+    // Prepare the text view content
+    NSMutableAttributedString *textViewAttributedString = [[NSMutableAttributedString alloc]
+                                                           initWithString:[MatrixKitL10n roomEventEncryptionInfoTitle]
+                                                           attributes:@{NSForegroundColorAttributeName: _defaultTextColor,
+                                                                        NSFontAttributeName: [UIFont boldSystemFontOfSize:17]}];
+
+    if (_mxEvent)
+    {
+        NSString *senderId = _mxEvent.sender;
+        
+        if (_mxSession && _mxSession.crypto && !_mxDeviceInfo)
+        {
+            _mxDeviceInfo = [_mxSession.crypto eventDeviceInfo:_mxEvent];
+            
+            if (!_mxDeviceInfo)
+            {
+                // Trigger a server request to get the device information for the event sender
+                mxCurrentOperation = [_mxSession.crypto downloadKeys:@[senderId] forceDownload:NO success:^(MXUsersDevicesMap<MXDeviceInfo *> *usersDevicesInfoMap, NSDictionary<NSString *,MXCrossSigningInfo *> *crossSigningKeysMap) {
+                    
+                    self->mxCurrentOperation = nil;
+                    
+                    // Sanity check: check whether some device information has been retrieved.
+                    self->_mxDeviceInfo = [self.mxSession.crypto eventDeviceInfo:self.mxEvent];
+                    if (self.mxDeviceInfo)
+                    {
+                        [self updateTextViewText];
+                    }
+                    
+                } failure:^(NSError *error) {
+                    
+                    self->mxCurrentOperation = nil;
+
+                    MXLogDebug(@"[MXKEncryptionInfoView] Crypto failed to download device info for user: %@", self.mxEvent.sender);
+                    
+                    // Notify MatrixKit user
+                    NSString *myUserId = self.mxSession.myUser.userId;
+
+                    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+                    
+                }];
+            }
+        }
+        
+        // Event information
+        NSMutableAttributedString *eventInformationString = [[NSMutableAttributedString alloc]
+                                                             initWithString:[MatrixKitL10n roomEventEncryptionInfoEvent]
+                                                             attributes:@{NSForegroundColorAttributeName: _defaultTextColor,
+                                                                          NSFontAttributeName: [UIFont boldSystemFontOfSize:15]}];
+        [eventInformationString appendAttributedString:[MXKEncryptionInfoView verticalWhitespace]];
+        
+        NSString *senderKey = _mxEvent.senderKey;
+        NSString *claimedKey = _mxEvent.keysClaimed[@"ed25519"];
+        NSString *algorithm = _mxEvent.wireContent[@"algorithm"];
+        NSString *sessionId = _mxEvent.wireContent[@"session_id"];
+        
+        NSString *decryptionError;
+        if (_mxEvent.decryptionError)
+        {
+            decryptionError = [NSString stringWithFormat:@"** %@ **", _mxEvent.decryptionError.localizedDescription];
+        }
+        
+        if (!senderKey.length)
+        {
+            senderKey = [MatrixKitL10n roomEventEncryptionInfoEventNone];
+        }
+        if (!claimedKey.length)
+        {
+            claimedKey = [MatrixKitL10n roomEventEncryptionInfoEventNone];
+        }
+        if (!algorithm.length)
+        {
+            algorithm = [MatrixKitL10n roomEventEncryptionInfoEventUnencrypted];
+        }
+        if (!sessionId.length)
+        {
+            sessionId = [MatrixKitL10n roomEventEncryptionInfoEventNone];
+        }
+        
+        [eventInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                        initWithString:[MatrixKitL10n roomEventEncryptionInfoEventUserId]                                                        attributes:@{NSForegroundColorAttributeName: _defaultTextColor,
+                                                                     NSFontAttributeName: [UIFont boldSystemFontOfSize:14]}]];
+        [eventInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                        initWithString:senderId
+                                                        attributes:@{NSForegroundColorAttributeName: _defaultTextColor,
+                                                                     NSFontAttributeName: [UIFont systemFontOfSize:14]}]];
+        [eventInformationString appendAttributedString:[MXKEncryptionInfoView verticalWhitespace]];
+        
+        [eventInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                        initWithString:[MatrixKitL10n roomEventEncryptionInfoEventIdentityKey]
+                                                        attributes:@{NSForegroundColorAttributeName: _defaultTextColor,
+                                                                     NSFontAttributeName: [UIFont boldSystemFontOfSize:14]}]];
+        [eventInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                        initWithString:senderKey
+                                                        attributes:@{NSForegroundColorAttributeName: _defaultTextColor,
+                                                                     NSFontAttributeName: [UIFont systemFontOfSize:14]}]];
+        [eventInformationString appendAttributedString:[MXKEncryptionInfoView verticalWhitespace]];
+        
+        [eventInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                        initWithString:[MatrixKitL10n roomEventEncryptionInfoEventFingerprintKey]
+                                                        attributes:@{NSForegroundColorAttributeName: _defaultTextColor,
+                                                                     NSFontAttributeName: [UIFont boldSystemFontOfSize:14]}]];
+        [eventInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                        initWithString:claimedKey
+                                                        attributes:@{NSForegroundColorAttributeName: _defaultTextColor,
+                                                                     NSFontAttributeName: [UIFont systemFontOfSize:14]}]];
+        [eventInformationString appendAttributedString:[MXKEncryptionInfoView verticalWhitespace]];
+        
+        [eventInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                        initWithString:[MatrixKitL10n roomEventEncryptionInfoEventAlgorithm]
+                                                        attributes:@{NSForegroundColorAttributeName: _defaultTextColor,
+                                                                     NSFontAttributeName: [UIFont boldSystemFontOfSize:14]}]];
+        [eventInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                        initWithString:algorithm
+                                                        attributes:@{NSForegroundColorAttributeName: _defaultTextColor,
+                                                                     NSFontAttributeName: [UIFont systemFontOfSize:14]}]];
+        [eventInformationString appendAttributedString:[MXKEncryptionInfoView verticalWhitespace]];
+        
+        if (decryptionError.length)
+        {
+            [eventInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                            initWithString:[MatrixKitL10n roomEventEncryptionInfoEventDecryptionError]
+                                                            attributes:@{NSForegroundColorAttributeName: _defaultTextColor,
+                                                                         NSFontAttributeName: [UIFont boldSystemFontOfSize:14]}]];
+            [eventInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                            initWithString:decryptionError
+                                                            attributes:@{NSForegroundColorAttributeName: _defaultTextColor,
+                                                                         NSFontAttributeName: [UIFont systemFontOfSize:14]}]];
+            [eventInformationString appendAttributedString:[MXKEncryptionInfoView verticalWhitespace]];
+        }
+        
+        [eventInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                        initWithString:[MatrixKitL10n roomEventEncryptionInfoEventSessionId]
+                                                        attributes:@{NSForegroundColorAttributeName: _defaultTextColor,
+                                                                     NSFontAttributeName: [UIFont boldSystemFontOfSize:14]}]];
+        [eventInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                        initWithString:sessionId
+                                                        attributes:@{NSForegroundColorAttributeName: _defaultTextColor,
+                                                                     NSFontAttributeName: [UIFont systemFontOfSize:14]}]];
+        [eventInformationString appendAttributedString:[MXKEncryptionInfoView verticalWhitespace]];
+        
+        [textViewAttributedString appendAttributedString:eventInformationString];
+    }
+    
+    // Device information
+    NSMutableAttributedString *deviceInformationString = [[NSMutableAttributedString alloc]
+                                                          initWithString:[MatrixKitL10n roomEventEncryptionInfoDevice]
+                                                          attributes:@{NSForegroundColorAttributeName: _defaultTextColor,
+                                                                       NSFontAttributeName: [UIFont boldSystemFontOfSize:15]}];
+    [deviceInformationString appendAttributedString:[MXKEncryptionInfoView verticalWhitespace]];
+    
+    if (_mxDeviceInfo)
+    {
+        NSString *name = _mxDeviceInfo.displayName;
+        NSString *deviceId = _mxDeviceInfo.deviceId;
+        NSMutableAttributedString *verification;
+        NSString *fingerprint = _mxDeviceInfo.fingerprint;
+        
+        // Display here the Verify and Block buttons except if the device is the current one.
+        _verifyButton.hidden = _blockButton.hidden = [_mxDeviceInfo.deviceId isEqualToString:_mxSession.matrixRestClient.credentials.deviceId];
+        
+        switch (_mxDeviceInfo.trustLevel.localVerificationStatus)
+        {
+            case MXDeviceUnknown:
+            case MXDeviceUnverified:
+            {
+                verification = [[NSMutableAttributedString alloc]
+                                initWithString:[MatrixKitL10n roomEventEncryptionInfoDeviceNotVerified]
+                                attributes:@{NSForegroundColorAttributeName: _defaultTextColor,
+                                             NSFontAttributeName: [UIFont boldSystemFontOfSize:14]}];
+                
+                [_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:
+            {
+                verification = [[NSMutableAttributedString alloc]
+                                initWithString:[MatrixKitL10n roomEventEncryptionInfoDeviceVerified]
+                                attributes:@{NSForegroundColorAttributeName: _defaultTextColor,
+                                             NSFontAttributeName: [UIFont systemFontOfSize:14]}];
+                
+                [_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;
+            }
+            case MXDeviceBlocked:
+            {
+                verification = [[NSMutableAttributedString alloc]
+                                initWithString:[MatrixKitL10n roomEventEncryptionInfoDeviceBlocked]
+                                attributes:@{NSForegroundColorAttributeName: _defaultTextColor,
+                                             NSFontAttributeName: [UIFont boldSystemFontOfSize:14]}];
+                
+                [_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;
+            }
+            default:
+                break;
+        }
+        
+        [deviceInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                         initWithString:[MatrixKitL10n roomEventEncryptionInfoDeviceName]
+                                                         attributes:@{NSForegroundColorAttributeName: _defaultTextColor,
+                                                                      NSFontAttributeName: [UIFont boldSystemFontOfSize:14]}]];
+        [deviceInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                         initWithString:(name.length ? name : @"")
+                                                         attributes:@{NSForegroundColorAttributeName: _defaultTextColor,
+                                                                      NSFontAttributeName: [UIFont systemFontOfSize:14]}]];
+        [deviceInformationString appendAttributedString:[MXKEncryptionInfoView verticalWhitespace]];
+        
+        [deviceInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                         initWithString:[MatrixKitL10n roomEventEncryptionInfoDeviceId]                                                             attributes:@{NSForegroundColorAttributeName: _defaultTextColor, NSFontAttributeName: [UIFont boldSystemFontOfSize:14]}]];
+        [deviceInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                         initWithString:deviceId
+                                                         attributes:@{NSForegroundColorAttributeName: _defaultTextColor,
+                                                                      NSFontAttributeName: [UIFont systemFontOfSize:14]}]];
+        [deviceInformationString appendAttributedString:[MXKEncryptionInfoView verticalWhitespace]];
+        
+        [deviceInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                         initWithString:[MatrixKitL10n roomEventEncryptionInfoDeviceVerification]                                                             attributes:@{NSForegroundColorAttributeName: _defaultTextColor, NSFontAttributeName: [UIFont boldSystemFontOfSize:14]}]];
+        [deviceInformationString appendAttributedString:verification];
+        [deviceInformationString appendAttributedString:[MXKEncryptionInfoView verticalWhitespace]];
+        
+        [deviceInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                         initWithString:[MatrixKitL10n roomEventEncryptionInfoDeviceFingerprint]                                                             attributes:@{NSForegroundColorAttributeName: _defaultTextColor, NSFontAttributeName: [UIFont boldSystemFontOfSize:14]}]];
+        [deviceInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                         initWithString:fingerprint
+                                                         attributes:@{NSForegroundColorAttributeName: _defaultTextColor,
+                                                                      NSFontAttributeName: [UIFont systemFontOfSize:14]}]];
+        [deviceInformationString appendAttributedString:[MXKEncryptionInfoView verticalWhitespace]];
+    }
+    else
+    {
+        // Unknown device
+        [deviceInformationString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                         initWithString:[MatrixKitL10n roomEventEncryptionInfoDeviceUnknown]                                                             attributes:@{NSForegroundColorAttributeName: _defaultTextColor, NSFontAttributeName: [UIFont italicSystemFontOfSize:14]}]];
+    }
+    
+    [textViewAttributedString appendAttributedString:deviceInformationString];
+    
+    self.textView.attributedText = textViewAttributedString;
+}
+
++ (NSAttributedString *)verticalWhitespace
+{
+    if (verticalWhitespace == nil)
+    {
+        verticalWhitespace = [[NSAttributedString alloc] initWithString:@"\n\n" attributes:@{NSFontAttributeName: [UIFont systemFontOfSize:4]}];
+    }
+    return verticalWhitespace;
+}
+
+#pragma mark - Actions
+
+- (IBAction)onButtonPressed:(id)sender
+{
+    if (sender == _cancelButton)
+    {
+        [self removeFromSuperview];
+
+        if ([_delegate respondsToSelector:@selector(encryptionInfoViewDidClose:)])
+        {
+            [_delegate encryptionInfoViewDidClose:self];
+        }
+    }
+    // Note: Verify and Block buttons are hidden when the deviceInfo is not available
+    else if (sender == _confirmVerifyButton && _mxDeviceInfo)
+    {
+        [_mxSession.crypto setDeviceVerification:MXDeviceVerified forDevice:_mxDeviceInfo.deviceId ofUser:_mxDeviceInfo.userId success:^{
+
+            // Refresh data
+            _mxDeviceInfo = [self.mxSession.crypto eventDeviceInfo:self.mxEvent];
+            if (self->_delegate)
+            {
+                [self->_delegate encryptionInfoView:self didDeviceInfoVerifiedChange:self.mxDeviceInfo];
+            }
+            [self removeFromSuperview];
+
+        } failure:^(NSError *error) {
+            [self removeFromSuperview];
+        }];
+    }
+    else if (_mxDeviceInfo)
+    {
+        MXDeviceVerification verificationStatus;
+        
+        if (sender == _verifyButton)
+        {
+            verificationStatus = ((_mxDeviceInfo.trustLevel.localVerificationStatus == MXDeviceVerified) ? MXDeviceUnverified : MXDeviceVerified);
+        }
+        else if (sender == _blockButton)
+        {
+            verificationStatus = ((_mxDeviceInfo.trustLevel.localVerificationStatus == MXDeviceBlocked) ? MXDeviceUnverified : MXDeviceBlocked);
+        }
+        else
+        {
+            // Unexpected case
+            MXLogDebug(@"[MXKEncryptionInfoView] Invalid button pressed.");
+            return;
+        }
+        
+        if (verificationStatus == MXDeviceVerified)
+        {
+            // Prompt user
+            NSMutableAttributedString *textViewAttributedString = [[NSMutableAttributedString alloc]
+                                                                   initWithString:[MatrixKitL10n roomEventEncryptionVerifyTitle]                                                                   attributes:@{NSForegroundColorAttributeName: _defaultTextColor,
+                                                                                NSFontAttributeName: [UIFont boldSystemFontOfSize:17]}];
+            
+            NSString *message = [MatrixKitL10n roomEventEncryptionVerifyMessage:_mxDeviceInfo.displayName :_mxDeviceInfo.deviceId :_mxDeviceInfo.fingerprint];
+            
+            [textViewAttributedString appendAttributedString:[[NSMutableAttributedString alloc]
+                                                             initWithString:message
+                                                             attributes:@{NSForegroundColorAttributeName: _defaultTextColor,
+                                                                          NSFontAttributeName: [UIFont systemFontOfSize:14]}]];
+            
+            self.textView.attributedText = textViewAttributedString;
+            
+            [_cancelButton setTitle:[MatrixKitL10n cancel] forState:UIControlStateNormal];
+            [_cancelButton setTitle:[MatrixKitL10n cancel] forState:UIControlStateHighlighted];
+            _verifyButton.hidden = _blockButton.hidden = YES;
+            _confirmVerifyButton.hidden = NO;
+        }
+        else
+        {
+            [_mxSession.crypto setDeviceVerification:verificationStatus forDevice:_mxDeviceInfo.deviceId ofUser:_mxDeviceInfo.userId success:^{
+
+                // Refresh data
+                _mxDeviceInfo = [self.mxSession.crypto eventDeviceInfo:self.mxEvent];
+
+                if (self->_delegate)
+                {
+                    [self->_delegate encryptionInfoView:self didDeviceInfoVerifiedChange:self.mxDeviceInfo];
+                }
+
+                [self removeFromSuperview];
+
+            } failure:^(NSError *error) {
+                [self removeFromSuperview];
+            }];
+        }
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/EncryptionInfoView/MXKEncryptionInfoView.xib b/Riot/Modules/MatrixKit/Views/EncryptionInfoView/MXKEncryptionInfoView.xib
new file mode 100644
index 000000000..a51c3ee77
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/EncryptionInfoView/MXKEncryptionInfoView.xib
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="8VI-1E-fge" customClass="MXKEncryptionInfoView">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <subviews>
+                <textView autoresizesSubviews="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" bounces="NO" editable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Vk-Jx-L6Y">
+                    <rect key="frame" x="10" y="10" width="580" height="540"/>
+                    <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+                    <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
+                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                    <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                </textView>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ump-1C-SzI">
+                    <rect key="frame" x="60" y="560" width="30" height="30"/>
+                    <state key="normal" title="OK">
+                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </state>
+                    <connections>
+                        <action selector="onButtonPressed:" destination="8VI-1E-fge" eventType="touchUpInside" id="t42-2S-MsY"/>
+                    </connections>
+                </button>
+                <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qkC-t0-Qd0">
+                    <rect key="frame" x="355" y="560" width="40" height="30"/>
+                    <state key="normal" title="Verify">
+                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </state>
+                    <connections>
+                        <action selector="onButtonPressed:" destination="8VI-1E-fge" eventType="touchUpInside" id="ljK-ul-fY2"/>
+                    </connections>
+                </button>
+                <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IdO-jn-iTV">
+                    <rect key="frame" x="507" y="560" width="38" height="30"/>
+                    <state key="normal" title="Block">
+                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </state>
+                    <connections>
+                        <action selector="onButtonPressed:" destination="8VI-1E-fge" eventType="touchUpInside" id="j21-e2-e3C"/>
+                    </connections>
+                </button>
+                <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="L4h-aG-8UN">
+                    <rect key="frame" x="506" y="560" width="40" height="30"/>
+                    <state key="normal" title="Verify">
+                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </state>
+                    <connections>
+                        <action selector="onButtonPressed:" destination="8VI-1E-fge" eventType="touchUpInside" id="nKr-w7-ECp"/>
+                    </connections>
+                </button>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="L4h-aG-8UN" firstAttribute="top" secondItem="3Vk-Jx-L6Y" secondAttribute="bottom" constant="10" id="0tX-be-JRZ"/>
+                <constraint firstAttribute="centerX" secondItem="qkC-t0-Qd0" secondAttribute="centerX" multiplier="0.8" id="7iU-9D-miY"/>
+                <constraint firstAttribute="bottom" secondItem="qkC-t0-Qd0" secondAttribute="bottom" constant="10" id="DyR-rX-nt0"/>
+                <constraint firstAttribute="bottom" secondItem="Ump-1C-SzI" secondAttribute="bottom" constant="10" id="Nfo-nh-gvW"/>
+                <constraint firstItem="3Vk-Jx-L6Y" firstAttribute="top" secondItem="8VI-1E-fge" secondAttribute="top" constant="10" id="Oi3-Zq-HKf"/>
+                <constraint firstAttribute="bottom" secondItem="L4h-aG-8UN" secondAttribute="bottom" constant="10" id="Owt-zM-W2X"/>
+                <constraint firstItem="3Vk-Jx-L6Y" firstAttribute="leading" secondItem="8VI-1E-fge" secondAttribute="leading" constant="10" id="Tqb-eF-AIh"/>
+                <constraint firstAttribute="centerX" secondItem="Ump-1C-SzI" secondAttribute="centerX" multiplier="4" id="YMC-ob-tqT"/>
+                <constraint firstAttribute="bottom" secondItem="IdO-jn-iTV" secondAttribute="bottom" constant="10" id="YcV-iN-9WU"/>
+                <constraint firstAttribute="trailing" secondItem="3Vk-Jx-L6Y" secondAttribute="trailing" constant="10" id="ZbI-rp-TR9"/>
+                <constraint firstAttribute="centerX" secondItem="L4h-aG-8UN" secondAttribute="centerX" multiplier="0.57" id="g1v-Mg-fQ6"/>
+                <constraint firstAttribute="centerX" secondItem="IdO-jn-iTV" secondAttribute="centerX" multiplier="0.57" id="gAm-ph-zPW"/>
+            </constraints>
+            <nil key="simulatedStatusBarMetrics"/>
+            <nil key="simulatedTopBarMetrics"/>
+            <nil key="simulatedBottomBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="blockButton" destination="IdO-jn-iTV" id="HI0-ZU-esJ"/>
+                <outlet property="cancelButton" destination="Ump-1C-SzI" id="U8M-nT-JiK"/>
+                <outlet property="confirmVerifyButton" destination="L4h-aG-8UN" id="GX6-dB-JG6"/>
+                <outlet property="textView" destination="3Vk-Jx-L6Y" id="uOw-Bq-neN"/>
+                <outlet property="verifyButton" destination="qkC-t0-Qd0" id="6LD-04-WgO"/>
+            </connections>
+        </view>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/EncryptionKeys/MXKEncryptionKeysExportView.h b/Riot/Modules/MatrixKit/Views/EncryptionKeys/MXKEncryptionKeysExportView.h
new file mode 100644
index 000000000..10b6529a6
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/EncryptionKeys/MXKEncryptionKeysExportView.h
@@ -0,0 +1,69 @@
+/*
+ Copyright 2017 Vector Creations 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/UIKit.h>
+
+@class MXSession, MXKViewController, MXKRoomDataSource;
+
+/**
+ `MXKEncryptionKeysExportView` is a dialog to export encryption keys from
+ the user's crypto store.
+ */
+@interface MXKEncryptionKeysExportView : NSObject
+
+/**
+ The UIAlertController instance which handles the dialog.
+ */
+@property (nonatomic, readonly) UIAlertController *alertController;
+
+/**
+ The minimum length of the passphrase. 1 by default.
+ */
+@property (nonatomic) NSUInteger passphraseMinLength;
+
+/**
+ Create the `MXKEncryptionKeysExportView` instance.
+
+ @param mxSession the mxSession to export keys from.
+ @return the newly created MXKEncryptionKeysExportView instance.
+ */
+- (instancetype)initWithMatrixSession:(MXSession*)mxSession;
+
+/**
+ Show the dialog in a given view controller.
+
+ @param mxkViewController the mxkViewController where to show the dialog.
+ @param keyFile the path where to export keys to.
+ @param onComplete a block called when the operation is done.
+ */
+- (void)showInViewController:(MXKViewController*)mxkViewController toExportKeysToFile:(NSURL*)keyFile onComplete:(void(^)(BOOL success))onComplete;
+
+
+/**
+ Show the dialog in a given view controller.
+
+ @param viewController the UIViewController where to show the dialog.
+ @param keyFile the path where to export keys to.
+ @param onLoading a block called when to show a spinner.
+ @param onComplete a block called when the operation is done.
+ */
+- (void)showInUIViewController:(UIViewController*)viewController
+            toExportKeysToFile:(NSURL*)keyFile
+                     onLoading:(void(^)(BOOL onLoading))onLoading
+                    onComplete:(void(^)(BOOL success))onComplete;
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/EncryptionKeys/MXKEncryptionKeysExportView.m b/Riot/Modules/MatrixKit/Views/EncryptionKeys/MXKEncryptionKeysExportView.m
new file mode 100644
index 000000000..8351571dd
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/EncryptionKeys/MXKEncryptionKeysExportView.m
@@ -0,0 +1,192 @@
+/*
+ Copyright 2017 Vector Creations 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 "MXKEncryptionKeysExportView.h"
+
+#import "MXKViewController.h"
+#import "MXKRoomDataSource.h"
+#import "NSBundle+MatrixKit.h"
+
+#import <MatrixSDK/MatrixSDK.h>
+
+#import "MXKSwiftHeader.h"
+
+@interface MXKEncryptionKeysExportView ()
+{
+    MXSession *mxSession;
+}
+
+@end
+
+@implementation MXKEncryptionKeysExportView
+
+- (instancetype)initWithMatrixSession:(MXSession *)matrixSession
+{
+    self = [super init];
+    if (self)
+    {
+        mxSession = matrixSession;
+        _passphraseMinLength = 1;
+        
+        _alertController = [UIAlertController alertControllerWithTitle:[MatrixKitL10n e2eExportRoomKeys] message:[MatrixKitL10n e2eExportPrompt] preferredStyle:UIAlertControllerStyleAlert];
+    }
+    return self;
+}
+
+
+- (void)showInViewController:(MXKViewController *)mxkViewController toExportKeysToFile:(NSURL *)keyFile onComplete:(void (^)(BOOL success))onComplete
+{
+    [self showInUIViewController:mxkViewController toExportKeysToFile:keyFile onLoading:^(BOOL onLoading) {
+        if (onLoading)
+        {
+            [mxkViewController startActivityIndicator];
+        }
+        else
+        {
+            [mxkViewController stopActivityIndicator];
+        }
+    } onComplete:onComplete];
+}
+
+- (void)showInUIViewController:(UIViewController*)viewController
+            toExportKeysToFile:(NSURL*)keyFile
+                     onLoading:(void(^)(BOOL onLoading))onLoading
+                    onComplete:(void(^)(BOOL success))onComplete
+{
+    __weak typeof(self) weakSelf = self;
+
+    // Finalise the dialog
+    [_alertController addTextFieldWithConfigurationHandler:^(UITextField *textField)
+     {
+         textField.secureTextEntry = YES;
+        textField.placeholder = [MatrixKitL10n e2ePassphraseCreate];
+         [textField resignFirstResponder];
+     }];
+
+    [_alertController addTextFieldWithConfigurationHandler:^(UITextField *textField)
+     {
+         textField.secureTextEntry = YES;
+         textField.placeholder = [MatrixKitL10n e2ePassphraseConfirm];
+         [textField resignFirstResponder];
+     }];
+
+    [_alertController addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+                                                         style:UIAlertActionStyleDefault
+                                                       handler:^(UIAlertAction * action) {
+
+                                                           if (weakSelf)
+                                                           {
+                                                               onComplete(NO);
+                                                           }
+
+                                                       }]];
+
+    [_alertController addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n e2eExport]
+                                                         style:UIAlertActionStyleDefault
+                                                       handler:^(UIAlertAction * action) {
+
+                                                           if (weakSelf)
+                                                           {
+                                                               typeof(self) self = weakSelf;
+
+                                                               // Retrieve the password and confirmation
+                                                               UITextField *textField = [self.alertController textFields].firstObject;
+                                                               NSString *password = textField.text;
+
+                                                               textField = [self.alertController textFields][1];
+                                                               NSString *confirmation = textField.text;
+
+                                                               // Check they are valid
+                                                               if (password.length < self.passphraseMinLength || ![password isEqualToString:confirmation])
+                                                               {
+                                                                   NSString *error;
+                                                                   if (!password.length)
+                                                                   {
+                                                                       error = [MatrixKitL10n e2ePassphraseEmpty];
+                                                                   }
+                                                                   else if (password.length < self.passphraseMinLength)
+                                                                   {
+                                                                       error = [MatrixKitL10n e2ePassphraseTooShort:self.passphraseMinLength];
+                                                                   }
+                                                                   else
+                                                                   {
+                                                                       error = [MatrixKitL10n e2ePassphraseNotMatch];
+                                                                   }
+
+                                                                   UIAlertController *otherAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n error] message:error preferredStyle:UIAlertControllerStyleAlert];
+
+                                                                   [otherAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+
+                                                                       if (weakSelf)
+                                                                       {
+                                                                           onComplete(NO);
+                                                                       }
+
+                                                                   }]];
+
+                                                                   [viewController presentViewController:otherAlert animated:YES completion:nil];
+                                                               }
+                                                               else
+                                                               {
+                                                                   // Start the export process
+                                                                   onLoading(YES);
+
+                                                                   [self->mxSession.crypto exportRoomKeysWithPassword:password success:^(NSData *keyFileData) {
+
+                                                                       if (weakSelf)
+                                                                       {
+                                                                           onLoading(NO);
+
+                                                                           // Write the result to the passed file
+                                                                           [keyFileData writeToURL:keyFile atomically:YES];
+                                                                           onComplete(YES);
+                                                                       }
+
+                                                                   } failure:^(NSError *error) {
+
+                                                                       if (weakSelf)
+                                                                       {
+                                                                           onLoading(NO);
+
+                                                                           // TODO: i18n the error
+                                                                           UIAlertController *otherAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n error] message:error.localizedDescription preferredStyle:UIAlertControllerStyleAlert];
+
+                                                                           [otherAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+
+                                                                               if (weakSelf)
+                                                                               {
+                                                                                   onComplete(NO);
+                                                                               }
+
+                                                                           }]];
+
+                                                                           [viewController presentViewController:otherAlert animated:YES completion:nil];
+                                                                       }
+                                                                   }];
+                                                               }
+                                                           }
+
+                                                       }]];
+
+
+
+    // And show it
+    [viewController presentViewController:_alertController animated:YES completion:nil];
+}
+
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/EncryptionKeys/MXKEncryptionKeysImportView.h b/Riot/Modules/MatrixKit/Views/EncryptionKeys/MXKEncryptionKeysImportView.h
new file mode 100644
index 000000000..397edc5ef
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/EncryptionKeys/MXKEncryptionKeysImportView.h
@@ -0,0 +1,49 @@
+/*
+ Copyright 2017 Vector Creations 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/UIKit.h>
+
+@class MXSession, MXKViewController;
+
+/**
+ `MXKEncryptionKeysImportView` is a dialog to import encryption keys into
+ the user's crypto store.
+ */
+@interface MXKEncryptionKeysImportView : NSObject
+
+/**
+ The UIAlertController instance which handles the dialog.
+ */
+@property (nonatomic, readonly) UIAlertController *alertController;
+
+/**
+ Create the `MXKEncryptionKeysImportView` instance.
+
+ @param mxSession the mxSession to import keys to.
+ @return the newly created MXKEncryptionKeysImportView instance.
+ */
+- (instancetype)initWithMatrixSession:(MXSession*)mxSession;
+
+/**
+ Show the dialog in a given view controller.
+ 
+ @param mxkViewController the mxkViewController where to show the dialog.
+ @param fileURL the url of the keys file.
+ @param onComplete a block called when the operation is done (whatever it succeeded or failed).
+ */
+- (void)showInViewController:(MXKViewController*)mxkViewController toImportKeys:(NSURL*)fileURL onComplete:(void(^)(void))onComplete;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/EncryptionKeys/MXKEncryptionKeysImportView.m b/Riot/Modules/MatrixKit/Views/EncryptionKeys/MXKEncryptionKeysImportView.m
new file mode 100644
index 000000000..154cca7d9
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/EncryptionKeys/MXKEncryptionKeysImportView.m
@@ -0,0 +1,122 @@
+/*
+ Copyright 2017 Vector Creations 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 "MXKEncryptionKeysImportView.h"
+
+#import "MXKViewController.h"
+#import "NSBundle+MatrixKit.h"
+
+#import <MatrixSDK/MatrixSDK.h>
+
+#import "MXKSwiftHeader.h"
+
+@interface MXKEncryptionKeysImportView ()
+{
+    MXSession *mxSession;
+}
+
+@end
+
+@implementation MXKEncryptionKeysImportView
+
+- (instancetype)initWithMatrixSession:(MXSession *)matrixSession
+{
+    self = [super init];
+    if (self)
+    {
+        mxSession = matrixSession;
+        
+        _alertController = [UIAlertController alertControllerWithTitle:[MatrixKitL10n e2eImportRoomKeys] message:[MatrixKitL10n e2eImportPrompt] preferredStyle:UIAlertControllerStyleAlert];
+    }
+    return self;
+}
+
+- (void)showInViewController:(MXKViewController*)mxkViewController toImportKeys:(NSURL*)fileURL onComplete:(void(^)(void))onComplete
+{
+    __weak typeof(self) weakSelf = self;
+
+    // Finalise the dialog
+    [_alertController addTextFieldWithConfigurationHandler:^(UITextField *textField)
+     {
+         textField.secureTextEntry = YES;
+         textField.placeholder = [MatrixKitL10n e2ePassphraseEnter];
+         [textField resignFirstResponder];
+     }];
+    
+    [_alertController addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+                                                         style:UIAlertActionStyleDefault
+                                                       handler:^(UIAlertAction * action) {
+                                                           
+                                                           if (weakSelf)
+                                                           {
+                                                               onComplete();
+                                                           }
+                                                           
+                                                       }]];
+    
+    [_alertController addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n e2eImport]
+                                                         style:UIAlertActionStyleDefault
+                                                       handler:^(UIAlertAction * action) {
+                                                           
+                                                           if (weakSelf)
+                                                           {
+                                                               typeof(self) self = weakSelf;
+                                                               
+                                                               // Retrieve the password
+                                                               UITextField *textField = [self.alertController textFields].firstObject;
+                                                               NSString *password = textField.text;
+                                                               
+                                                               // Start the import process
+                                                               [mxkViewController startActivityIndicator];
+                                                               [self->mxSession.crypto importRoomKeys:[NSData dataWithContentsOfURL:fileURL] withPassword:password success:^(NSUInteger total, NSUInteger imported) {
+                                                                   
+                                                                   if (weakSelf)
+                                                                   {
+                                                                       [mxkViewController stopActivityIndicator];
+                                                                       onComplete();
+                                                                   }
+                                                                   
+                                                               } failure:^(NSError *error) {
+                                                                   
+                                                                   if (weakSelf)
+                                                                   {
+                                                                       [mxkViewController stopActivityIndicator];
+                                                                       
+                                                                       // TODO: i18n the error
+                                                                       UIAlertController *otherAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n error] message:error.localizedDescription preferredStyle:UIAlertControllerStyleAlert];
+                                                                       
+                                                                       [otherAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+                                                                           
+                                                                           if (weakSelf)
+                                                                           {
+                                                                               onComplete();
+                                                                           }
+                                                                           
+                                                                       }]];
+                                                                       
+                                                                       [mxkViewController presentViewController:otherAlert animated:YES completion:nil];                                                                       
+                                                                   }
+                                                                   
+                                                               }];
+                                                           }
+                                                           
+                                                       }]];
+
+    // And show it
+    [mxkViewController presentViewController:_alertController animated:YES completion:nil];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/Group/MXKGroupTableViewCell.h b/Riot/Modules/MatrixKit/Views/Group/MXKGroupTableViewCell.h
new file mode 100644
index 000000000..874023ebb
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/Group/MXKGroupTableViewCell.h
@@ -0,0 +1,39 @@
+/*
+ Copyright 2017 Vector Creations 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 "MXKTableViewCell.h"
+
+#import "MXKCellRendering.h"
+
+#import "MXKGroupCellDataStoring.h"
+
+/**
+ `MXKGroupTableViewCell` instances display a group.
+ */
+@interface MXKGroupTableViewCell : MXKTableViewCell <MXKCellRendering>
+{
+@protected
+    /**
+     The current cell data displayed by the table view cell
+     */
+    id<MXKGroupCellDataStoring> groupCellData;
+}
+
+@property (weak, nonatomic) IBOutlet UILabel *groupName;
+@property (weak, nonatomic) IBOutlet UILabel *groupDescription;
+@property (weak, nonatomic) IBOutlet UILabel *memberCount;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/Group/MXKGroupTableViewCell.m b/Riot/Modules/MatrixKit/Views/Group/MXKGroupTableViewCell.m
new file mode 100644
index 000000000..188a4c493
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/Group/MXKGroupTableViewCell.m
@@ -0,0 +1,92 @@
+/*
+ Copyright 2017 Vector Creations 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 "MXKGroupTableViewCell.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKSwiftHeader.h"
+
+@implementation MXKGroupTableViewCell
+@synthesize delegate;
+
+#pragma mark - Class methods
+
+- (void)render:(MXKCellData *)cellData
+{
+    groupCellData = (id<MXKGroupCellDataStoring>)cellData;
+    if (groupCellData)
+    {
+        // Render the current group values.
+        _groupName.text = groupCellData.groupDisplayname;
+        _groupDescription.text = groupCellData.group.profile.shortDescription;
+        
+        if (_groupDescription.text.length)
+        {
+            _groupDescription.hidden = NO;
+        }
+        else
+        {
+            // Hide and fill the label with a fake description to harmonize the height of all the cells.
+            // This is a drawback of the self-sizing cell.
+            _groupDescription.hidden = YES;
+            _groupDescription.text = @"No description";
+        }
+        
+        if (_memberCount)
+        {
+            if (groupCellData.group.summary.usersSection.totalUserCountEstimate > 1)
+            {
+                _memberCount.text = [MatrixKitL10n numMembersOther:@(groupCellData.group.summary.usersSection.totalUserCountEstimate).stringValue];
+            }
+            else if (groupCellData.group.summary.usersSection.totalUserCountEstimate == 1)
+            {
+                _memberCount.text = [MatrixKitL10n numMembersOne:@(1).stringValue];
+            }
+            else
+            {
+                _memberCount.text = nil;
+            }
+        }
+    }
+    else
+    {
+        _groupName.text = nil;
+        _groupDescription.text = nil;
+        _memberCount.text = nil;
+    }
+}
+
+- (MXKCellData*)renderedCellData
+{
+    return groupCellData;
+}
+
++ (CGFloat)heightForCellData:(MXKCellData *)cellData withMaximumWidth:(CGFloat)maxWidth
+{
+    // The height is fixed
+    //@TODO: change this to handle dynamic font
+    return 70;
+}
+
+- (void)prepareForReuse
+{
+    [super prepareForReuse];
+    
+    groupCellData = nil;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/Group/MXKGroupTableViewCell.xib b/Riot/Modules/MatrixKit/Views/Group/MXKGroupTableViewCell.xib
new file mode 100644
index 000000000..cf6efef01
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/Group/MXKGroupTableViewCell.xib
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="L2L-l5-wPx" customClass="MXKGroupTableViewCell">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="70"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="L2L-l5-wPx" id="aXz-IR-jj5">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="69.5"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="RoomTitle" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Lg1-xQ-AGn">
+                        <rect key="frame" x="8" y="8" width="506" height="23"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="19"/>
+                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="LastEventDescription" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dQt-mN-T6b">
+                        <rect key="frame" x="8" y="42" width="584" height="18"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="xx users" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="360-Go-RcG">
+                        <rect key="frame" x="520" y="8" width="72" height="18"/>
+                        <constraints>
+                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="72" id="uOj-6w-G8q"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="Lg1-xQ-AGn" firstAttribute="leading" secondItem="aXz-IR-jj5" secondAttribute="leading" constant="8" id="3qc-BC-FYt"/>
+                    <constraint firstItem="360-Go-RcG" firstAttribute="leading" secondItem="Lg1-xQ-AGn" secondAttribute="trailing" constant="6" id="8ff-tS-Ulq"/>
+                    <constraint firstItem="dQt-mN-T6b" firstAttribute="leading" secondItem="aXz-IR-jj5" secondAttribute="leading" constant="8" id="UYQ-HG-YP1"/>
+                    <constraint firstItem="360-Go-RcG" firstAttribute="top" secondItem="aXz-IR-jj5" secondAttribute="top" constant="8" id="XyO-tl-6SX"/>
+                    <constraint firstAttribute="trailing" secondItem="360-Go-RcG" secondAttribute="trailing" constant="8" id="YqC-WC-Wqe"/>
+                    <constraint firstAttribute="bottom" secondItem="dQt-mN-T6b" secondAttribute="bottom" constant="9" id="sLb-Q4-AFW"/>
+                    <constraint firstItem="Lg1-xQ-AGn" firstAttribute="top" secondItem="aXz-IR-jj5" secondAttribute="top" constant="8" id="uCT-KE-X09"/>
+                    <constraint firstAttribute="trailing" secondItem="dQt-mN-T6b" secondAttribute="trailing" constant="8" id="ygG-1B-fu3"/>
+                </constraints>
+            </tableViewCellContentView>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <connections>
+                <outlet property="groupDescription" destination="dQt-mN-T6b" id="meF-te-1lf"/>
+                <outlet property="groupName" destination="Lg1-xQ-AGn" id="ABQ-44-bUs"/>
+                <outlet property="memberCount" destination="360-Go-RcG" id="oYv-dg-CoR"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/MXKCellRendering.h b/Riot/Modules/MatrixKit/Views/MXKCellRendering.h
new file mode 100644
index 000000000..60d712910
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKCellRendering.h
@@ -0,0 +1,121 @@
+/*
+ Copyright 2015 OpenMarket 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/Foundation.h>
+
+#import "MXKCellData.h"
+
+@protocol MXKCellRenderingDelegate;
+
+/**
+ `MXKCellRendering` defines a protocol a view must conform to display a cell.
+
+ A cell is a generic term. It can be a UITableViewCell or a UICollectionViewCell or any object
+ expected by the end view controller.
+ */
+@protocol MXKCellRendering <NSObject>
+
+/**
+ *  Returns the `UINib` object initialized for the cell.
+ *
+ *  @return The initialized `UINib` object or `nil` if there were errors during
+ *  initialization or the nib file could not be located.
+ */
++ (UINib *)nib;
+
+/**
+ Configure the cell in order to display the passed data.
+ 
+ The object implementing the `MXKCellRendering` protocol should be able to cast the past object
+ into its original class.
+ 
+ @param cellData the data object to render.
+ */
+- (void)render:(MXKCellData*)cellData;
+
+/**
+ Compute the height of the cell to display the passed data.
+ 
+ @TODO: To support correctly the dynamic fonts, we have to remove this method and
+ its use by enabling self sizing cells at the table view level.
+ When we create a self-sizing table view cell, we need to set the property `estimatedRowHeight` of the table view
+ and use constraints to define the cell’s size.
+ 
+ @param cellData the data object to render.
+ @param maxWidth the maximum available width.
+ @return the cell height
+ */
++ (CGFloat)heightForCellData:(MXKCellData*)cellData withMaximumWidth:(CGFloat)maxWidth;
+
+@optional
+
+/**
+ User's actions delegate.
+ */
+@property (nonatomic, weak) id<MXKCellRenderingDelegate> delegate;
+
+/**
+ This optional getter allow to retrieve the data object currently rendered by the cell.
+ 
+ @return the current rendered data object.
+ */
+- (MXKCellData*)renderedCellData;
+
+/**
+ Reset the cell.
+
+ The cell is no more displayed. This is time to release resources and removing listeners.
+ In case of UITableViewCell or UIContentViewCell object, the cell must reset in a state
+ that it can be reusable.
+ */
+- (void)didEndDisplay;
+
+@end
+
+/**
+`MXKCellRenderingDelegate` defines a protocol used when the user has interactions with
+ the cell view.
+ */
+@protocol MXKCellRenderingDelegate <NSObject>
+
+/**
+ Tells the delegate that a user action (button pressed, tap, long press...) has been observed in the cell.
+
+ The action is described by the `actionIdentifier` param.
+ This identifier is specific and depends to the cell view class implementing MXKCellRendering.
+ 
+ @param cell the cell in which gesture has been observed.
+ @param actionIdentifier an identifier indicating the action type (tap, long press...) and which part of the cell is concerned.
+ @param userInfo a dict containing additional information. It depends on actionIdentifier. May be nil.
+ */
+- (void)cell:(id<MXKCellRendering>)cell didRecognizeAction:(NSString*)actionIdentifier userInfo:(NSDictionary *)userInfo;
+
+/**
+ Asks the delegate if a user action (click on a link) can be done.
+
+ The action is described by the `actionIdentifier` param.
+ This identifier is specific and depends to the cell view class implementing MXKCellRendering.
+
+ @param cell the cell in which gesture has been observed.
+ @param actionIdentifier an identifier indicating the action type (link click) and which part of the cell is concerned.
+ @param userInfo a dict containing additional information. It depends on actionIdentifier. May be nil.
+ @param defaultValue the value to return by default if the action is not handled.
+ @return a boolean value which depends on actionIdentifier.
+ */
+- (BOOL)cell:(id<MXKCellRendering>)cell shouldDoAction:(NSString*)actionIdentifier userInfo:(NSDictionary *)userInfo defaultValue:(BOOL)defaultValue;
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/MXKCollectionViewCell/MXKCollectionViewCell.h b/Riot/Modules/MatrixKit/Views/MXKCollectionViewCell/MXKCollectionViewCell.h
new file mode 100644
index 000000000..3ec4f302f
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKCollectionViewCell/MXKCollectionViewCell.h
@@ -0,0 +1,47 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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/UIKit.h>
+
+/**
+ 'MXKCollectionViewCell' class is used to define custom UICollectionViewCell.
+ Each 'MXKCollectionViewCell-inherited' class has its own 'reuseIdentifier'.
+ */
+@interface MXKCollectionViewCell : UICollectionViewCell
+
+/**
+ Returns the `UINib` object initialized for the cell.
+ 
+ @return The initialized `UINib` object or `nil` if there were errors during
+ initialization or the nib file could not be located.
+ */
++ (UINib *)nib;
+
+/**
+ The default reuseIdentifier of the 'MXKCollectionViewCell-inherited' class.
+ */
++ (NSString*)defaultReuseIdentifier;
+
+/**
+ Customize the rendering of the collection view cell and its subviews (Do nothing by default).
+ This method is called when the view is initialized or prepared for reuse.
+ 
+ Override this method to customize the collection view cell at the application level.
+ */
+- (void)customizeCollectionViewCellRendering;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKCollectionViewCell/MXKCollectionViewCell.m b/Riot/Modules/MatrixKit/Views/MXKCollectionViewCell/MXKCollectionViewCell.m
new file mode 100644
index 000000000..e18f68927
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKCollectionViewCell/MXKCollectionViewCell.m
@@ -0,0 +1,76 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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 "MXKCollectionViewCell.h"
+
+@implementation MXKCollectionViewCell
+
++ (UINib *)nib
+{
+    // Check whether a nib file is available
+    NSBundle *mainBundle = [NSBundle bundleForClass:self.class];
+    NSString *path = [mainBundle pathForResource:NSStringFromClass([self class]) ofType:@"nib"];
+    if (path)
+    {
+        return [UINib nibWithNibName:NSStringFromClass([self class]) bundle:mainBundle];
+    }
+    return nil;
+}
+
++ (NSString*)defaultReuseIdentifier
+{
+    return NSStringFromClass([self class]);
+}
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    
+    [self customizeCollectionViewCellRendering];
+}
+
+- (void)prepareForReuse
+{
+    [super prepareForReuse];
+    
+    [self customizeCollectionViewCellRendering];
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    // Check whether a xib is defined
+    if ([[self class] nib])
+    {
+        self = [[[self class] nib] instantiateWithOwner:nil options:nil].firstObject;
+        self.frame = frame;
+    }
+    else
+    {
+        self = [super initWithFrame:frame];
+        [self customizeCollectionViewCellRendering];
+    }
+    
+    return self;
+}
+
+- (void)customizeCollectionViewCellRendering
+{
+    // Do nothing by default.
+}
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/MXKCollectionViewCell/MXKMediaCollectionViewCell.h b/Riot/Modules/MatrixKit/Views/MXKCollectionViewCell/MXKMediaCollectionViewCell.h
new file mode 100644
index 000000000..932a2b4b7
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKCollectionViewCell/MXKMediaCollectionViewCell.h
@@ -0,0 +1,45 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKCollectionViewCell.h"
+
+#import <AVKit/AVKit.h>
+
+#import "MXKImageView.h"
+
+/**
+ 'MXKMediaCollectionViewCell' class is used to display picture or video thumbnail.
+ */
+@interface MXKMediaCollectionViewCell : MXKCollectionViewCell
+
+@property (weak, nonatomic) IBOutlet UIView *customView;
+@property (weak, nonatomic) IBOutlet MXKImageView *mxkImageView;
+@property (weak, nonatomic) IBOutlet UIImageView *centerIcon;
+@property (weak, nonatomic) IBOutlet UIImageView *bottomLeftIcon;
+@property (weak, nonatomic) IBOutlet UIImageView *bottomRightIcon;
+@property (weak, nonatomic) IBOutlet UIImageView *topRightIcon;
+
+/**
+ A potential player used in the cell.
+ */
+@property (nonatomic) AVPlayerViewController *moviePlayer;
+
+/**
+ A potential observer used to update cell display.
+ */
+@property (nonatomic) id notificationObserver;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKCollectionViewCell/MXKMediaCollectionViewCell.m b/Riot/Modules/MatrixKit/Views/MXKCollectionViewCell/MXKMediaCollectionViewCell.m
new file mode 100644
index 000000000..2f19de586
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKCollectionViewCell/MXKMediaCollectionViewCell.m
@@ -0,0 +1,73 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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 "MXKMediaCollectionViewCell.h"
+
+@implementation MXKMediaCollectionViewCell
+
+- (void)prepareForReuse
+{
+    [super prepareForReuse];
+    [self.moviePlayer.player pause];
+    self.moviePlayer.player = nil;
+    self.moviePlayer = nil;
+    
+    // Restore the cell in reusable state
+    self.mxkImageView.hidden = NO;
+    self.mxkImageView.stretchable = NO;
+    // Cancel potential image download
+    self.mxkImageView.enableInMemoryCache = NO;
+    [self.mxkImageView setImageURI:nil
+                          withType:nil
+               andImageOrientation:UIImageOrientationUp
+                      previewImage:nil
+                      mediaManager:nil];
+    
+    self.customView.hidden = YES;
+    self.centerIcon.hidden = YES;
+    
+    // Remove added view in custon view
+    NSArray *subViews = self.customView.subviews;
+    for (UIView *view in subViews)
+    {
+        [view removeFromSuperview];
+    }
+    
+    // Remove potential media download observer
+    if (self.notificationObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:self.notificationObserver];
+        self.notificationObserver = nil;
+    }
+    
+    // Remove all gesture recognizers
+    while (self.gestureRecognizers.count)
+    {
+        [self removeGestureRecognizer:self.gestureRecognizers[0]];
+    }
+    self.tag = -1;
+}
+
+- (void)dealloc
+{
+    [self.moviePlayer.player pause];
+    self.moviePlayer.player = nil;
+}
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/MXKCollectionViewCell/MXKMediaCollectionViewCell.xib b/Riot/Modules/MatrixKit/Views/MXKCollectionViewCell/MXKMediaCollectionViewCell.xib
new file mode 100644
index 000000000..a9934c689
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKCollectionViewCell/MXKMediaCollectionViewCell.xib
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="eCk-zY-LXq" customClass="MXKMediaCollectionViewCell">
+            <rect key="frame" x="0.0" y="0.0" width="80" height="80"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                <rect key="frame" x="0.0" y="0.0" width="80" height="80"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TP2-Sr-1hA" userLabel="CustomView">
+                        <rect key="frame" x="0.0" y="0.0" width="80" height="80"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </view>
+                    <view contentMode="scaleAspectFit" translatesAutoresizingMaskIntoConstraints="NO" id="T1Q-RS-8o6" customClass="MXKImageView">
+                        <rect key="frame" x="0.0" y="0.0" width="80" height="80"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </view>
+                    <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="l9u-PV-2Kx" userLabel="centerIcon">
+                        <rect key="frame" x="28" y="28" width="25" height="25"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="25" id="fdh-Aa-NDo"/>
+                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="25" id="pCq-on-PJR"/>
+                            <constraint firstAttribute="width" constant="25" id="toX-JA-StF"/>
+                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="25" id="usE-Mq-K8k"/>
+                        </constraints>
+                    </imageView>
+                    <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="YB6-Jv-WMr" userLabel="bottomLeftIcon">
+                        <rect key="frame" x="8" y="53" width="20" height="20"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="20" id="fDo-LF-4CI"/>
+                            <constraint firstAttribute="height" constant="20" id="yQL-WA-w9j"/>
+                        </constraints>
+                    </imageView>
+                    <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="S1K-Sj-lhV" userLabel="topRightIcon">
+                        <rect key="frame" x="52" y="7" width="20" height="20"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="20" id="YJM-RC-2sA"/>
+                            <constraint firstAttribute="height" constant="20" id="ozP-cX-0lT"/>
+                        </constraints>
+                    </imageView>
+                    <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="5Yd-df-HbB" userLabel="bottomRightIcon">
+                        <rect key="frame" x="52" y="53" width="20" height="20"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="20" id="UEZ-5S-KMf"/>
+                            <constraint firstAttribute="width" constant="20" id="bbS-D2-SZi"/>
+                        </constraints>
+                    </imageView>
+                </subviews>
+            </view>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="5Yd-df-HbB" secondAttribute="trailing" priority="750" constant="8" id="2bi-ya-uC0"/>
+                <constraint firstAttribute="trailing" secondItem="T1Q-RS-8o6" secondAttribute="trailing" id="2mi-ZG-4dV"/>
+                <constraint firstItem="YB6-Jv-WMr" firstAttribute="leading" secondItem="eCk-zY-LXq" secondAttribute="leading" priority="750" constant="8" id="43S-Eh-tnF"/>
+                <constraint firstItem="l9u-PV-2Kx" firstAttribute="centerY" secondItem="eCk-zY-LXq" secondAttribute="centerY" id="7oz-CQ-w1O"/>
+                <constraint firstAttribute="bottom" secondItem="T1Q-RS-8o6" secondAttribute="bottom" id="8rM-p9-Vwc"/>
+                <constraint firstItem="T1Q-RS-8o6" firstAttribute="leading" secondItem="eCk-zY-LXq" secondAttribute="leading" id="AET-tr-Wti"/>
+                <constraint firstItem="T1Q-RS-8o6" firstAttribute="top" secondItem="eCk-zY-LXq" secondAttribute="top" id="Fzk-Dy-HI1"/>
+                <constraint firstAttribute="trailing" secondItem="TP2-Sr-1hA" secondAttribute="trailing" id="NWc-zx-iym"/>
+                <constraint firstAttribute="bottom" secondItem="TP2-Sr-1hA" secondAttribute="bottom" id="Psv-4k-pFA"/>
+                <constraint firstAttribute="bottom" secondItem="YB6-Jv-WMr" secondAttribute="bottom" priority="750" constant="7" id="RTC-59-huH"/>
+                <constraint firstAttribute="bottom" secondItem="5Yd-df-HbB" secondAttribute="bottom" priority="750" constant="7" id="S8E-Zu-cIr"/>
+                <constraint firstAttribute="trailing" secondItem="S1K-Sj-lhV" secondAttribute="trailing" priority="750" constant="8" id="XfO-xa-DlO"/>
+                <constraint firstItem="l9u-PV-2Kx" firstAttribute="centerX" secondItem="eCk-zY-LXq" secondAttribute="centerX" id="d32-f1-U3Q"/>
+                <constraint firstItem="TP2-Sr-1hA" firstAttribute="top" secondItem="eCk-zY-LXq" secondAttribute="top" id="eBE-6d-RBK"/>
+                <constraint firstItem="TP2-Sr-1hA" firstAttribute="leading" secondItem="eCk-zY-LXq" secondAttribute="leading" id="lR0-ej-w9L"/>
+                <constraint firstItem="S1K-Sj-lhV" firstAttribute="top" secondItem="eCk-zY-LXq" secondAttribute="top" priority="750" constant="7" id="neN-7y-A6j"/>
+            </constraints>
+            <connections>
+                <outlet property="bottomLeftIcon" destination="YB6-Jv-WMr" id="EAI-25-P6H"/>
+                <outlet property="bottomRightIcon" destination="5Yd-df-HbB" id="X1R-n5-kOH"/>
+                <outlet property="centerIcon" destination="l9u-PV-2Kx" id="5E4-tR-DBr"/>
+                <outlet property="customView" destination="TP2-Sr-1hA" id="eOK-uE-mrx"/>
+                <outlet property="mxkImageView" destination="T1Q-RS-8o6" id="kPS-Hx-zbu"/>
+                <outlet property="topRightIcon" destination="S1K-Sj-lhV" id="yc9-aM-Rjc"/>
+            </connections>
+        </collectionViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/MXKEventDetailsView.h b/Riot/Modules/MatrixKit/Views/MXKEventDetailsView.h
new file mode 100644
index 000000000..4ab17628c
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKEventDetailsView.h
@@ -0,0 +1,32 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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 <MatrixSDK/MatrixSDK.h>
+
+#import "MXKView.h"
+
+@interface MXKEventDetailsView : MXKView
+
+@property (weak, nonatomic) IBOutlet UITextView *textView;
+@property (weak, nonatomic) IBOutlet UIButton *redactButton;
+@property (weak, nonatomic) IBOutlet UIButton *closeButton;
+@property (weak, nonatomic) IBOutlet UIActivityIndicatorView *activityIndicator;
+
+- (instancetype)initWithEvent:(MXEvent*)event andMatrixSession:(MXSession*)session;
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/MXKEventDetailsView.m b/Riot/Modules/MatrixKit/Views/MXKEventDetailsView.m
new file mode 100644
index 000000000..59ed20691
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKEventDetailsView.m
@@ -0,0 +1,204 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2018 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 "MXKEventDetailsView.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKConstants.h"
+
+#import "MXKSwiftHeader.h"
+
+@interface MXKEventDetailsView ()
+{
+    /**
+     The displayed event
+     */
+    MXEvent *mxEvent;
+    
+    /**
+     The matrix session.
+     */
+    MXSession *mxSession;
+}
+@end
+
+@implementation MXKEventDetailsView
+
++ (UINib *)nib
+{
+    // Check whether a nib file is available
+    NSBundle *mainBundle = [NSBundle mxk_bundleForClass:self.class];
+    
+    NSString *path = [mainBundle pathForResource:NSStringFromClass([self class]) ofType:@"nib"];
+    if (path)
+    {
+        return [UINib nibWithNibName:NSStringFromClass([self class]) bundle:mainBundle];
+    }
+    return [UINib nibWithNibName:NSStringFromClass([MXKEventDetailsView class]) bundle:[NSBundle mxk_bundleForClass:[MXKEventDetailsView class]]];
+}
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    
+    // Localize string
+    [_redactButton setTitle:[MatrixKitL10n redact] forState:UIControlStateNormal];
+    [_redactButton setTitle:[MatrixKitL10n redact] forState:UIControlStateHighlighted];
+    [_closeButton setTitle:[MatrixKitL10n close] forState:UIControlStateNormal];
+    [_closeButton setTitle:[MatrixKitL10n close] forState:UIControlStateHighlighted];
+}
+
+- (instancetype)initWithEvent:(MXEvent*)event andMatrixSession:(MXSession*)session
+{
+    self = [[[self class] nib] instantiateWithOwner:nil options:nil].firstObject;
+    if (self)
+    {
+        mxEvent = event;
+        mxSession = session;
+        
+        [self setTranslatesAutoresizingMaskIntoConstraints: NO];
+        
+        // Disable redact button by default
+        _redactButton.enabled = NO;
+        
+        if (mxEvent)
+        {
+            NSMutableDictionary *eventDict = [NSMutableDictionary dictionaryWithDictionary:mxEvent.JSONDictionary];
+            
+            // Remove event type added by SDK
+            [eventDict removeObjectForKey:@"event_type"];
+            // Remove null values and empty dictionaries
+            for (NSString *key in eventDict.allKeys)
+            {
+                if ([[eventDict objectForKey:key] isEqual:[NSNull null]])
+                {
+                    [eventDict removeObjectForKey:key];
+                }
+                else if ([[eventDict objectForKey:key] isKindOfClass:[NSDictionary class]])
+                {
+                    NSDictionary *dict = [eventDict objectForKey:key];
+                    if (!dict.count)
+                    {
+                        [eventDict removeObjectForKey:key];
+                    }
+                    else
+                    {
+                        NSMutableDictionary *updatedDict = [NSMutableDictionary dictionaryWithDictionary:dict];
+                        for (NSString *subKey in dict.allKeys)
+                        {
+                            if ([[dict objectForKey:subKey] isEqual:[NSNull null]])
+                            {
+                                [updatedDict removeObjectForKey:subKey];
+                            }
+                        }
+                        [eventDict setObject:updatedDict forKey:key];
+                    }
+                }
+            }
+            
+            // Set text view content
+            NSError *error;
+            NSData *jsonData = [NSJSONSerialization dataWithJSONObject:eventDict
+                                                               options:NSJSONWritingPrettyPrinted
+                                                                 error:&error];
+            _textView.text = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+            
+            // Check whether the user can redact this event
+            // Do not allow to redact the event that enabled encryption (m.room.encryption)
+            // because it breaks everything
+            if (!mxEvent.isRedactedEvent && mxEvent.eventType != MXEventTypeRoomEncryption)
+            {
+                // Here the event has not been already redacted, check the user's power level
+                MXRoom *mxRoom = [mxSession roomWithRoomId:mxEvent.roomId];
+                if (mxRoom)
+                {
+                    MXWeakify(self);
+                    [mxRoom state:^(MXRoomState *roomState) {
+                        MXStrongifyAndReturnIfNil(self);
+
+                        MXRoomPowerLevels *powerLevels = [roomState powerLevels];
+                        NSInteger userPowerLevel = [powerLevels powerLevelOfUserWithUserID:self->mxSession.myUser.userId];
+                        if (powerLevels.redact)
+                        {
+                            if (userPowerLevel >= powerLevels.redact)
+                            {
+                                self.redactButton.enabled = YES;
+                            }
+                        }
+                        else if (userPowerLevel >= [powerLevels minimumPowerLevelForSendingEventAsMessage:kMXEventTypeStringRoomRedaction])
+                        {
+                            self.redactButton.enabled = YES;
+                        }
+                    }];
+                }
+            }
+        }
+        else
+        {
+            _textView.text = nil;
+        }
+        
+        // Hide potential activity indicator
+        [_activityIndicator stopAnimating];
+    }
+    
+    return self;
+}
+
+- (void)dealloc
+{
+    mxEvent = nil;
+    mxSession = nil;
+}
+
+#pragma mark - Actions
+
+- (IBAction)onButtonPressed:(id)sender
+{
+    if (sender == _redactButton)
+    {
+        MXRoom *mxRoom = [mxSession roomWithRoomId:mxEvent.roomId];
+        if (mxRoom)
+        {
+            [_activityIndicator startAnimating];
+            [mxRoom redactEvent:mxEvent.eventId reason:nil success:^{
+                
+                [self->_activityIndicator stopAnimating];
+                [self removeFromSuperview];
+                
+            } failure:^(NSError *error) {
+                
+                MXLogDebug(@"[MXKEventDetailsView] Redact event (%@) failed", self->mxEvent.eventId);
+                
+                // Notify MatrixKit user
+                NSString *myUserId = mxRoom.mxSession.myUser.userId;
+                [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+                
+                [self->_activityIndicator stopAnimating];
+                
+            }];
+        }
+        
+    }
+    else if (sender == _closeButton)
+    {
+        [self removeFromSuperview];
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKEventDetailsView.xib b/Riot/Modules/MatrixKit/Views/MXKEventDetailsView.xib
new file mode 100644
index 000000000..71685321f
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKEventDetailsView.xib
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="8VI-1E-fge" customClass="MXKEventDetailsView">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <subviews>
+                <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" bounces="NO" editable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Vk-Jx-L6Y">
+                    <rect key="frame" x="10" y="10" width="580" height="540"/>
+                    <color key="backgroundColor" red="0.90000000000000002" green="0.90000000000000002" blue="0.90000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
+                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                    <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                </textView>
+                <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="mcb-vF-Tre">
+                    <rect key="frame" x="290" y="290" width="20" height="20"/>
+                </activityIndicatorView>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ump-1C-SzI">
+                    <rect key="frame" x="126" y="560" width="49" height="30"/>
+                    <state key="normal" title="Redact">
+                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </state>
+                    <connections>
+                        <action selector="onButtonPressed:" destination="8VI-1E-fge" eventType="touchUpInside" id="t42-2S-MsY"/>
+                    </connections>
+                </button>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qkC-t0-Qd0">
+                    <rect key="frame" x="436" y="560" width="39" height="30"/>
+                    <state key="normal" title="Close">
+                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </state>
+                    <connections>
+                        <action selector="onButtonPressed:" destination="8VI-1E-fge" eventType="touchUpInside" id="ljK-ul-fY2"/>
+                    </connections>
+                </button>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="3Vk-Jx-L6Y" firstAttribute="leading" secondItem="8VI-1E-fge" secondAttribute="leading" constant="10" id="1NW-e9-N6b"/>
+                <constraint firstAttribute="centerY" secondItem="mcb-vF-Tre" secondAttribute="centerY" id="6gd-2U-X0P"/>
+                <constraint firstAttribute="centerX" secondItem="qkC-t0-Qd0" secondAttribute="centerX" multiplier="0.66" id="7iU-9D-miY"/>
+                <constraint firstItem="qkC-t0-Qd0" firstAttribute="top" secondItem="3Vk-Jx-L6Y" secondAttribute="bottom" constant="10" id="Ch9-Be-zPy"/>
+                <constraint firstAttribute="bottom" secondItem="qkC-t0-Qd0" secondAttribute="bottom" constant="10" id="DyR-rX-nt0"/>
+                <constraint firstAttribute="bottom" secondItem="Ump-1C-SzI" secondAttribute="bottom" constant="10" id="Nfo-nh-gvW"/>
+                <constraint firstAttribute="trailing" secondItem="3Vk-Jx-L6Y" secondAttribute="trailing" constant="10" id="Tb0-xj-YuB"/>
+                <constraint firstAttribute="centerX" secondItem="Ump-1C-SzI" secondAttribute="centerX" multiplier="2" id="YMC-ob-tqT"/>
+                <constraint firstAttribute="centerX" secondItem="mcb-vF-Tre" secondAttribute="centerX" id="iQ6-t4-4X3"/>
+                <constraint firstItem="3Vk-Jx-L6Y" firstAttribute="top" secondItem="8VI-1E-fge" secondAttribute="top" constant="10" id="paN-Lu-ZgL"/>
+            </constraints>
+            <nil key="simulatedStatusBarMetrics"/>
+            <nil key="simulatedTopBarMetrics"/>
+            <nil key="simulatedBottomBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="activityIndicator" destination="mcb-vF-Tre" id="xpi-vr-YgP"/>
+                <outlet property="closeButton" destination="qkC-t0-Qd0" id="B4g-P8-vHe"/>
+                <outlet property="redactButton" destination="Ump-1C-SzI" id="HUY-kK-FP8"/>
+                <outlet property="textView" destination="3Vk-Jx-L6Y" id="uOw-Bq-neN"/>
+            </connections>
+        </view>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/MXKImageView.h b/Riot/Modules/MatrixKit/Views/MXKImageView.h
new file mode 100644
index 000000000..ddda448c3
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKImageView.h
@@ -0,0 +1,126 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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/UIKit.h>
+#import <MatrixSDK/MatrixSDK.h>
+
+#import "MXKView.h"
+
+@class MXKAttachment;
+
+/**
+ Customize UIView in order to display image defined with remote url. Zooming inside the image (Stretching) is supported.
+ */
+@interface MXKImageView : MXKView <UIScrollViewDelegate>
+
+typedef void (^blockMXKImageView_onClick)(MXKImageView *imageView, NSString* title);
+
+/**
+ Load an image by its Matrix Content URI.
+ The image is loaded from the media cache (if any). If the image is not available yet,
+ it is downloaded from the Matrix media repository only if a media manager instance is provided.
+ 
+ The image extension is extracted from the provided mime type (if any). By default 'image/jpeg' is considered.
+ 
+ @param mxContentURI the Matrix Content URI
+ @param mimeType the media mime type, it is used to define the file extension (may be nil).
+ @param orientation the actual orientation of the encoded image (used UIImageOrientationUp by default).
+ @param previewImage image displayed until the actual image is available.
+ @param mediaManager the media manager instance used to download the image if it is not already in cache.
+ */
+- (void)setImageURI:(NSString *)mxContentURI
+           withType:(NSString *)mimeType
+andImageOrientation:(UIImageOrientation)orientation
+       previewImage:(UIImage*)previewImage
+       mediaManager:(MXMediaManager*)mediaManager;
+
+/**
+ Load an image by its Matrix Content URI to fit a specific view size.
+ 
+ CAUTION: this method is available only for the unencrypted content.
+ 
+ The image is loaded from the media cache (if any). If the image is not available yet,
+ it is downloaded from the Matrix media repository only if a media manager instance is provided.
+ The image extension is extracted from the provided mime type (if any). By default 'image/jpeg' is considered.
+ 
+ @param mxContentURI the Matrix Content URI
+ @param mimeType the media mime type, it is used to define the file extension (may be nil).
+ @param orientation the actual orientation of the encoded image (used UIImageOrientationUp by default).
+ @param previewImage image displayed until the actual image is available.
+ @param mediaManager the media manager instance used to download the image if it is not already in cache.
+ */
+- (void)setImageURI:(NSString *)mxContentURI
+           withType:(NSString *)mimeType
+andImageOrientation:(UIImageOrientation)orientation
+      toFitViewSize:(CGSize)viewSize
+         withMethod:(MXThumbnailingMethod)thumbnailingMethod
+       previewImage:(UIImage*)previewImage
+       mediaManager:(MXMediaManager*)mediaManager;
+
+/**
+ * Load an image attachment into the image viewer and display the full res image.
+ * This method must be used to display encrypted attachments
+ * @param attachment The attachment
+ */
+- (void)setAttachment:(MXKAttachment *)attachment;
+
+/**
+ * Load an attachment into the image viewer and display its thumbnail, if it has one.
+ * This method must be used to display encrypted attachments
+ * @param attachment The attachment
+ */
+- (void)setAttachmentThumb:(MXKAttachment *)attachment;
+
+/**
+ Toggle display to fullscreen.
+ 
+ No change is applied on the status bar here, the caller has to handle it. 
+ */
+- (void)showFullScreen;
+
+/**
+ The default background color.
+ Default is [UIColor blackColor].
+ */
+@property (nonatomic) UIColor *defaultBackgroundColor;
+
+// Use this boolean to hide activity indicator during image downloading
+@property (nonatomic) BOOL hideActivityIndicator;
+
+@property (strong, nonatomic) UIImage *image;
+@property (nonatomic, readonly) UIImageView *imageView;
+
+@property (nonatomic) BOOL stretchable;
+@property (nonatomic, readonly) BOOL fullScreen;
+
+// the image is cached in memory.
+// The medias manager uses a LRU cache.
+// to avoid loading from the file system.
+@property (nonatomic) BOOL enableInMemoryCache;
+
+// mediaManager folder where the image is stored
+@property (nonatomic) NSString* mediaFolder;
+
+// Let the user defines some custom buttons over the tabbar
+- (void)setLeftButtonTitle :leftButtonTitle handler:(blockMXKImageView_onClick)handler;
+- (void)setRightButtonTitle:rightButtonTitle handler:(blockMXKImageView_onClick)handler;
+
+- (void)dismissSelection;
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/MXKImageView.m b/Riot/Modules/MatrixKit/Views/MXKImageView.m
new file mode 100644
index 000000000..92060afc6
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKImageView.m
@@ -0,0 +1,925 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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 "MXKImageView.h"
+#import "MXKPieChartView.h"
+#import "MXKAttachment.h"
+
+#import "MXKTools.h"
+
+@interface MXKImageView ()
+{
+    NSString *mxcURI;
+    NSString *mimeType;
+    UIImageOrientation imageOrientation;
+    
+    // additional settings used in case of thumbnail.
+    CGSize thumbnailViewSize;
+    MXThumbnailingMethod thumbnailMethod;
+    
+    UIImage *currentImage;
+    
+    // the loading view is composed with the spinner and a pie chart
+    // the spinner is display until progress > 0
+    UIView *loadingView;
+    UIActivityIndicatorView *waitingDownloadSpinner;
+    MXKPieChartView *pieChartView;
+    UILabel *progressInfoLabel;
+    
+    // validation buttons
+    UIButton *leftButton;
+    UIButton *rightButton;
+    
+    NSString *leftButtonTitle;
+    NSString *rightButtonTitle;
+    
+    blockMXKImageView_onClick leftHandler;
+    blockMXKImageView_onClick rightHandler;
+    
+    UIView* bottomBarView;
+    
+    // Subviews
+    UIScrollView *scrollView;
+
+    // Current attachment being displayed in the MXKImageView
+    MXKAttachment *currentAttachment;
+}
+@end
+
+@implementation MXKImageView
+@synthesize stretchable, mediaFolder, imageView;
+
+#define CUSTOM_IMAGE_VIEW_BUTTON_WIDTH 100
+
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    
+    [self stopActivityIndicator];
+    
+    if (loadingView)
+    {
+        [loadingView removeFromSuperview];
+        loadingView = nil;
+    }
+    
+    if (bottomBarView)
+    {
+        [bottomBarView removeFromSuperview];
+        bottomBarView = nil;
+    }
+    
+    pieChartView = nil;
+}
+
+#pragma mark - Override MXKView
+
+-(void)customizeViewRendering
+{
+    [super customizeViewRendering];
+    
+    self.backgroundColor = (_defaultBackgroundColor ? _defaultBackgroundColor : [UIColor blackColor]);
+    
+    self.contentMode = UIViewContentModeScaleAspectFit;
+    self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleTopMargin;
+}
+
+#pragma mark -
+
+- (void)startActivityIndicator
+{
+    // create the views if they don't exist
+    if (!waitingDownloadSpinner)
+    {
+        waitingDownloadSpinner = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite];
+        
+        CGRect frame = waitingDownloadSpinner.frame;
+        frame.size.width += 30;
+        frame.size.height += 30;
+        waitingDownloadSpinner.bounds = frame;
+        [waitingDownloadSpinner.layer setCornerRadius:5];
+    }
+    
+    if (!loadingView)
+    {
+        loadingView = [[UIView alloc] init];
+        loadingView.frame = waitingDownloadSpinner.bounds;
+        waitingDownloadSpinner.frame = waitingDownloadSpinner.bounds;
+        [loadingView addSubview:waitingDownloadSpinner];
+        loadingView.backgroundColor = [UIColor clearColor];
+        [self addSubview:loadingView];
+    }
+    
+    if (!pieChartView)
+    {
+        pieChartView = [[MXKPieChartView alloc] init];
+        pieChartView.frame = loadingView.bounds;
+        pieChartView.progress = 0;
+        pieChartView.progressColor = [UIColor colorWithRed:1 green:1 blue:1 alpha:0.25];
+        pieChartView.unprogressColor = [UIColor clearColor];
+        
+        [loadingView addSubview:pieChartView];
+    }
+    
+    // display the download statistics
+    if (_fullScreen && !progressInfoLabel)
+    {
+        progressInfoLabel = [[UILabel alloc] init];
+        progressInfoLabel.backgroundColor = [UIColor whiteColor];
+        progressInfoLabel.textColor = [UIColor blackColor];
+        progressInfoLabel.font = [UIFont systemFontOfSize:8];
+        progressInfoLabel.alpha = 0.25;
+        progressInfoLabel.text = @"";
+        progressInfoLabel.numberOfLines = 0;
+        [progressInfoLabel sizeToFit];
+        [self addSubview:progressInfoLabel];
+    }
+    
+    // initvalue
+    loadingView.hidden = NO;
+    pieChartView.progress = 0;
+    
+    // Adjust color
+    if ([self.backgroundColor isEqual:[UIColor blackColor]])
+    {
+        waitingDownloadSpinner.activityIndicatorViewStyle = UIActivityIndicatorViewStyleWhite;
+        // a preview image could be displayed
+        // ensure that the white spinner is visible
+        // it could be drawn on a white area
+        waitingDownloadSpinner.backgroundColor = [UIColor darkGrayColor];
+        
+    }
+    else
+    {
+        waitingDownloadSpinner.activityIndicatorViewStyle = UIActivityIndicatorViewStyleGray;
+    }
+    
+    // ensure that the spinner is drawn at the top
+    [loadingView.superview bringSubviewToFront:loadingView];
+    
+    // Adjust position
+    CGPoint center = CGPointMake(self.frame.size.width / 2, self.frame.size.height / 2);
+    loadingView.center = center;
+    
+    // Start
+    [waitingDownloadSpinner startAnimating];
+}
+
+- (void)stopActivityIndicator
+{
+    if (waitingDownloadSpinner && waitingDownloadSpinner.isAnimating)
+    {
+        [waitingDownloadSpinner stopAnimating];
+    }
+    
+    pieChartView.progress = 0;
+    loadingView.hidden = YES;
+    
+    if (progressInfoLabel)
+    {
+        [progressInfoLabel removeFromSuperview];
+        progressInfoLabel = nil;
+    }
+}
+
+#pragma mark - setters/getters
+
+- (void)setDefaultBackgroundColor:(UIColor *)defaultBackgroundColor
+{
+    _defaultBackgroundColor = defaultBackgroundColor;
+    [self customizeViewRendering];
+}
+
+- (void)setImage:(UIImage *)anImage
+{
+    // remove the observers
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    
+    currentImage = anImage;
+    imageView.image = anImage;
+
+    [self initScrollZoomFactors];
+}
+
+- (UIImage*)image
+{
+    return currentImage;
+}
+
+- (void)showFullScreen
+{
+    // The full screen display mode is supported only if the shared application instance is available.
+    UIApplication *sharedApplication = [UIApplication performSelector:@selector(sharedApplication)];
+    if (sharedApplication)
+    {
+        _fullScreen = YES;
+        
+        [self initLayout];
+        
+        if (self.superview)
+        {
+            [super removeFromSuperview];
+        }
+        
+        UIWindow *window = [sharedApplication keyWindow];
+        
+        self.frame = window.bounds;
+        [window addSubview:self];
+    }
+}
+
+#pragma mark -
+- (IBAction)onButtonToggle:(id)sender
+{
+    if (sender == leftButton)
+    {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            self->leftHandler(self, self->leftButtonTitle);
+        });
+    }
+    else if (sender == rightButton)
+    {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            self->rightHandler(self, self->rightButtonTitle);
+        });
+    }
+}
+
+// add a generic button to the bottom view
+// return the added UIButton
+- (UIButton*) addbuttonWithTitle:(NSString*)title
+{
+    UIButton* button = [[UIButton alloc] init];
+    [button setTitle:title forState:UIControlStateNormal];
+    [button setTitle:title forState:UIControlStateHighlighted];
+    
+    if (_fullScreen)
+    {
+        // use the same text color as the tabbar
+        [button setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+        [button setTitleColor:[UIColor whiteColor] forState:UIControlStateHighlighted];
+    }
+    // TODO
+    //    else {
+    //        // use the same text color as the tabbar
+    //        [button setTitleColor:[AppDelegate theDelegate].masterTabBarController.tabBar.tintColor forState:UIControlStateNormal];
+    //        [button setTitleColor:[AppDelegate theDelegate].masterTabBarController.tabBar.tintColor forState:UIControlStateHighlighted];
+    //    }
+    
+    // keep the bottomView background color
+    button.backgroundColor = [UIColor clearColor];
+    
+    [button addTarget:self action:@selector(onButtonToggle:) forControlEvents:UIControlEventTouchUpInside];
+    [bottomBarView addSubview:button];
+    
+    return button;
+}
+
+- (void)initScrollZoomFactors
+{
+    // check if the image can be zoomed
+    if (self.image && self.stretchable && imageView.frame.size.width && imageView.frame.size.height)
+    {
+        // ensure that the content size is properly initialized
+        scrollView.contentSize = scrollView.frame.size;
+        
+        // compute the appliable zoom factor
+        // assume that the user does not expect to zoom more than 100%
+        CGSize imageSize = self.image.size;
+        
+        CGFloat scaleX = imageSize.width  / imageView.frame.size.width;
+        CGFloat scaleY = imageSize.height / imageView.frame.size.height;
+        
+        if (scaleX < scaleY)
+        {
+            scaleX = scaleY;
+        }
+        
+        if (scaleX < 1.0)
+        {
+            scaleX = 1.0;
+        }
+        
+        scrollView.zoomScale        = 1.0;
+        scrollView.minimumZoomScale = 1.0;
+        scrollView.maximumZoomScale = scaleX;
+        
+        // update the image frame to ensure that it fits to the scrollview frame
+        imageView.frame = scrollView.bounds;
+    }
+}
+
+- (void)removeFromSuperview
+{
+    [super removeFromSuperview];
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    
+    if (pieChartView)
+    {
+        [self stopActivityIndicator];
+    }
+}
+
+- (void)initLayout
+{
+    // create the subviews if they don't exist
+    if (!scrollView)
+    {
+        scrollView = [[UIScrollView alloc] init];
+        scrollView.delegate = self;
+        scrollView.backgroundColor = [UIColor clearColor];
+        [self addSubview:scrollView];
+        
+        imageView = [[UIImageView alloc] init];
+        imageView.backgroundColor = [UIColor clearColor];
+        imageView.userInteractionEnabled = YES;
+        imageView.contentMode = self.contentMode;
+        [scrollView addSubview:imageView];
+    }
+}
+
+- (void)layoutSubviews
+{
+    // call upper layer
+    [super layoutSubviews];
+    
+    [self initLayout];
+    
+    // the image has been updated
+    if (imageView.image != self.image)
+    {
+        imageView.image = self.image;
+    }
+    
+    CGRect tabBarFrame = CGRectZero;
+    UITabBarController *tabBarController = nil;
+    UIEdgeInsets safeAreaInsets = UIEdgeInsetsZero;
+    
+    if (leftButtonTitle || rightButtonTitle)
+    {
+        UIApplication *sharedApplication = [UIApplication performSelector:@selector(sharedApplication)];
+        if (sharedApplication)
+        {
+            safeAreaInsets = [sharedApplication keyWindow].safeAreaInsets;
+
+            UIViewController *rootViewController = [sharedApplication keyWindow].rootViewController;
+            tabBarController = rootViewController.tabBarController;
+            if (!tabBarController && [rootViewController isKindOfClass:[UITabBarController class]])
+            {
+                tabBarController = (UITabBarController*)rootViewController;
+            }
+        }
+        
+        if (tabBarController)
+        {
+            tabBarFrame = tabBarController.tabBar.frame;
+        }
+        else
+        {
+            // Define a default tabBar frame
+            tabBarFrame = CGRectMake(0, 0, self.frame.size.width, 44 + safeAreaInsets.bottom);
+        }
+    }
+    
+    // update the scrollview frame
+    CGRect oneSelfFrame = self.frame;
+    CGRect scrollViewFrame = CGRectIntegral(scrollView.frame);
+    
+    if (leftButtonTitle || rightButtonTitle)
+    {
+        oneSelfFrame.size.height -= tabBarFrame.size.height;
+    }
+    
+    oneSelfFrame = CGRectIntegral(oneSelfFrame);
+    oneSelfFrame.origin = scrollViewFrame.origin = CGPointZero;
+    
+    // use integral rect to avoid rounded value issue (float precision)
+    if (!CGRectEqualToRect(oneSelfFrame, scrollViewFrame))
+    {
+        scrollView.frame = oneSelfFrame;
+        imageView.frame = oneSelfFrame;
+        
+        [self initScrollZoomFactors];
+    }
+    
+    // check if the dedicated buttons are already added
+    if (leftButtonTitle || rightButtonTitle)
+    {
+        
+        if (!bottomBarView)
+        {
+            bottomBarView = [[UIView alloc] init];
+            
+            if (leftButtonTitle)
+            {
+                leftButton = [self addbuttonWithTitle:leftButtonTitle];
+            }
+            
+            rightButton = [[UIButton alloc] init];
+            
+            if (rightButtonTitle)
+            {
+                rightButton = [self addbuttonWithTitle:rightButtonTitle];
+            }
+            
+            // in fullscreen, display both buttons above the view (do the same if there is no tab bar)
+            if (_fullScreen || tabBarController == nil)
+            {
+                bottomBarView.backgroundColor = [UIColor blackColor];
+                [self addSubview:bottomBarView];
+            }
+            else
+            {
+                // default tabbar background color
+                CGFloat base = 248.0 / 255.0f;
+                bottomBarView.backgroundColor = [UIColor colorWithRed:base green:base blue:base alpha:1.0];
+                
+                // Display them over the tabbar
+                [tabBarController.tabBar addSubview:bottomBarView];
+            }
+        }
+        
+        if (_fullScreen)
+        {
+            tabBarFrame.origin.y = self.frame.size.height - tabBarFrame.size.height;
+        }
+        else
+        {
+            tabBarFrame.origin.y = 0;
+        }
+        bottomBarView.frame = tabBarFrame;
+        
+        if (leftButton)
+        {
+            leftButton.frame = CGRectMake(safeAreaInsets.left, 0, CUSTOM_IMAGE_VIEW_BUTTON_WIDTH, bottomBarView.frame.size.height - safeAreaInsets.bottom);
+        }
+        
+        if (rightButton)
+        {
+            rightButton.frame = CGRectMake(bottomBarView.frame.size.width - CUSTOM_IMAGE_VIEW_BUTTON_WIDTH - safeAreaInsets.right, 0, CUSTOM_IMAGE_VIEW_BUTTON_WIDTH, bottomBarView.frame.size.height - safeAreaInsets.bottom);
+        }
+    }
+    
+    if (!loadingView.hidden)
+    {
+        // ensure that the spinner is drawn at the top
+        [loadingView.superview bringSubviewToFront:loadingView];
+        
+        // Adjust positions
+        CGPoint center = CGPointMake(self.frame.size.width / 2, self.frame.size.height / 2);
+        loadingView.center = center;
+        
+        CGRect progressInfoLabelFrame = progressInfoLabel.frame;
+        progressInfoLabelFrame.origin.x = center.x - (progressInfoLabelFrame.size.width / 2);
+        progressInfoLabelFrame.origin.y = 10 + loadingView.frame.origin.y + loadingView.frame.size.height;
+        progressInfoLabel.frame = progressInfoLabelFrame;
+    }
+}
+
+- (void)setHideActivityIndicator:(BOOL)hideActivityIndicator
+{
+    _hideActivityIndicator = hideActivityIndicator;
+    if (hideActivityIndicator)
+    {
+        [self stopActivityIndicator];
+    }
+    else if (mxcURI)
+    {
+        NSString *downloadId = [MXMediaManager downloadIdForMatrixContentURI:mxcURI inFolder:mediaFolder];
+        if ([MXMediaManager existingDownloaderWithIdentifier:downloadId])
+        {
+            // Loading is in progress, start activity indicator
+            [self startActivityIndicator];
+        }
+    }
+}
+
+- (void)setImageURI:(NSString *)mxContentURI
+           withType:(NSString *)mimeType
+andImageOrientation:(UIImageOrientation)orientation
+       previewImage:(UIImage*)previewImage
+       mediaManager:(MXMediaManager*)mediaManager
+{
+    [self setImageURI:mxContentURI
+             withType:mimeType
+  andImageOrientation:orientation
+          isThumbnail:NO
+         previewImage:previewImage
+         mediaManager:mediaManager];
+}
+
+- (void)setImageURI:(NSString *)mxContentURI
+           withType:(NSString *)mimeType
+andImageOrientation:(UIImageOrientation)orientation
+      toFitViewSize:(CGSize)viewSize
+         withMethod:(MXThumbnailingMethod)thumbnailingMethod
+       previewImage:(UIImage*)previewImage
+       mediaManager:(MXMediaManager*)mediaManager
+{
+    // Store the thumbnail settings
+    thumbnailViewSize = viewSize;
+    thumbnailMethod = thumbnailingMethod;
+    
+    [self setImageURI:mxContentURI
+             withType:mimeType
+  andImageOrientation:orientation
+          isThumbnail:YES
+         previewImage:previewImage
+         mediaManager:mediaManager];
+}
+
+- (void)setImageURI:(NSString *)mxContentURI
+           withType:(NSString *)mimeType
+andImageOrientation:(UIImageOrientation)orientation
+        isThumbnail:(BOOL)isThumbnail
+       previewImage:(UIImage*)previewImage
+       mediaManager:(MXMediaManager*)mediaManager
+{
+    // Remove any pending observers
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+
+    // Reset other data
+    currentAttachment = nil;
+    
+    mxcURI = mxContentURI;
+    if (!mxcURI)
+    {
+        // Set preview by default
+        self.image = previewImage;
+        return;
+    }
+    
+    // Store image orientation
+    imageOrientation = orientation;
+    
+    // Store the mime type used to define the cache path of the image.
+    mimeType = mimeType;
+    if (!mimeType.length)
+    {
+        // Set default mime type if no information is available
+        mimeType = @"image/jpeg";
+    }
+    
+    // Retrieve the image from cache if any
+    NSString *cacheFilePath;
+    if (isThumbnail)
+    {
+        cacheFilePath = [MXMediaManager thumbnailCachePathForMatrixContentURI:mxcURI
+                                                                      andType:mimeType
+                                                                     inFolder:mediaFolder
+                                                                toFitViewSize:thumbnailViewSize
+                                                                   withMethod:thumbnailMethod];
+    }
+    else
+    {
+        cacheFilePath = [MXMediaManager cachePathForMatrixContentURI:mxcURI
+                                                             andType:mimeType
+                                                            inFolder:mediaFolder];
+    }
+    
+    UIImage* image = _enableInMemoryCache ? [MXMediaManager loadThroughCacheWithFilePath:cacheFilePath] : [MXMediaManager loadPictureFromFilePath:cacheFilePath];
+    if (image)
+    {
+        if (imageOrientation != UIImageOrientationUp)
+        {
+            self.image = [UIImage imageWithCGImage:image.CGImage scale:1.0 orientation:imageOrientation];
+        }
+        else
+        {
+            self.image = image;
+        }
+        
+        [self stopActivityIndicator];
+    }
+    else
+    {
+        // Set preview until the image is loaded
+        self.image = previewImage;
+        
+        // Check whether the image download is in progress
+        NSString *downloadId;
+        if (isThumbnail)
+        {
+            downloadId = [MXMediaManager thumbnailDownloadIdForMatrixContentURI:mxcURI
+                                                                       inFolder:mediaFolder
+                                                                  toFitViewSize:thumbnailViewSize
+                                                                     withMethod:thumbnailMethod];
+        }
+        else
+        {
+            downloadId = [MXMediaManager downloadIdForMatrixContentURI:mxcURI inFolder:mediaFolder];
+        }
+        
+        MXMediaLoader* loader = [MXMediaManager existingDownloaderWithIdentifier:downloadId];
+        if (!loader && mediaManager)
+        {
+            // Trigger the download
+            if (isThumbnail)
+            {
+                loader = [mediaManager downloadThumbnailFromMatrixContentURI:mxcURI
+                                                                    withType:mimeType
+                                                                    inFolder:mediaFolder
+                                                               toFitViewSize:thumbnailViewSize
+                                                                  withMethod:thumbnailMethod
+                                                                     success:nil
+                                                                     failure:nil];
+            }
+            else
+            {
+                loader = [mediaManager downloadMediaFromMatrixContentURI:mxcURI
+                                                                withType:mimeType
+                                                                inFolder:mediaFolder];
+            }
+        }
+        
+        if (loader)
+        {
+            // update the progress UI with the current info
+            if (!_hideActivityIndicator)
+            {
+                [self startActivityIndicator];
+            }
+            [self updateProgressUI:loader.statisticsDict];
+            
+            [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXMediaLoaderStateDidChangeNotification object:loader];
+            [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onMediaLoaderStateDidChange:) name:kMXMediaLoaderStateDidChangeNotification object:loader];
+        }
+    }
+}
+
+- (void)setAttachment:(MXKAttachment *)attachment
+{
+    // Remove any pending observers
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    
+    // Set default orientation
+    imageOrientation = UIImageOrientationUp;
+    
+    mediaFolder = attachment.eventRoomId;
+    mxcURI = attachment.contentURL;
+    mimeType = attachment.contentInfo[@"mimetype"];
+    if (!mimeType.length)
+    {
+        // Set default mime type if no information is available
+        mimeType = @"image/jpeg";
+    }
+    
+    // while we wait for the content to download
+    self.image = [attachment getCachedThumbnail];
+    
+    if (!_hideActivityIndicator)
+    {
+        [self startActivityIndicator];
+    }
+
+    currentAttachment = attachment;
+    
+    MXWeakify(self);
+    [attachment getImage:^(MXKAttachment *attachment2, UIImage *img) {
+        MXStrongifyAndReturnIfNil(self);
+
+        if (self->currentAttachment != attachment2)
+        {
+            return;
+        }
+
+        self.image = img;
+        [self stopActivityIndicator];
+        [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXMediaLoaderStateDidChangeNotification object:nil];
+    } failure:^(MXKAttachment *attachment2, NSError *error) {
+        MXLogDebug(@"Unable to fetch image attachment! %@", error);
+        MXStrongifyAndReturnIfNil(self);
+        
+        if (self->currentAttachment != attachment2)
+        {
+            return;
+        }
+
+        [self stopActivityIndicator];
+        [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXMediaLoaderStateDidChangeNotification object:nil];
+    }];
+    
+    // Check whether the image download is in progress
+    NSString *downloadId = attachment.downloadId;
+    MXMediaLoader* loader = [MXMediaManager existingDownloaderWithIdentifier:downloadId];
+    if (loader)
+    {
+        // Observer this loader to display progress
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(checkProgressOnMediaLoaderStateChange:)
+                                                     name:kMXMediaLoaderStateDidChangeNotification
+                                                   object:loader];
+    }
+}
+
+- (void)setAttachmentThumb:(MXKAttachment *)attachment
+{
+    // Remove any pending observers
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    
+    // Store image orientation
+    imageOrientation = attachment.thumbnailOrientation;
+    
+    mediaFolder = attachment.eventRoomId;
+    
+    // Remove the existing image (if any) by using the potential preview.
+    self.image = attachment.previewImage;
+    
+    if (!_hideActivityIndicator)
+    {
+        [self startActivityIndicator];
+    }
+
+    currentAttachment = attachment;
+    
+    MXWeakify(self);
+    [attachment getThumbnail:^(MXKAttachment *attachment2, UIImage *img) {
+        MXStrongifyAndReturnIfNil(self);
+        
+        dispatch_async(dispatch_get_main_queue(), ^{
+
+            if (self->currentAttachment != attachment2)
+            {
+                return;
+            }
+            
+            if (img && self->imageOrientation != UIImageOrientationUp)
+            {
+                self.image = [UIImage imageWithCGImage:img.CGImage scale:1.0 orientation:self->imageOrientation];
+            }
+            else
+            {
+                self.image = img;
+            }
+            [self stopActivityIndicator];
+        });
+            
+    } failure:^(MXKAttachment *attachment2, NSError *error) {
+        MXStrongifyAndReturnIfNil(self);
+        
+        dispatch_async(dispatch_get_main_queue(), ^{
+            if (self->currentAttachment != attachment2)
+            {
+                return;
+            }
+            
+            [self stopActivityIndicator];
+        });
+    }];
+}
+
+- (void)updateProgressUI:(NSDictionary*)downloadStatsDict
+{
+    // Sanity check: updateProgressUI may be called while there is no stats available
+    // This happens when the download failed at the very beginning.
+    if (nil == downloadStatsDict)
+    {
+        return;
+    }
+    
+    NSNumber* progressNumber = [downloadStatsDict valueForKey:kMXMediaLoaderProgressValueKey];
+    
+    if (progressNumber)
+    {
+        pieChartView.progress = progressNumber.floatValue;
+        waitingDownloadSpinner.hidden = YES;
+    }
+    
+    if (progressInfoLabel)
+    {
+        NSNumber* downloadRate = [downloadStatsDict valueForKey:kMXMediaLoaderCurrentDataRateKey];
+        
+        NSNumber* completedBytesCount = [downloadStatsDict valueForKey:kMXMediaLoaderCompletedBytesCountKey];
+        NSNumber* totalBytesCount = [downloadStatsDict valueForKey:kMXMediaLoaderTotalBytesCountKey];
+        
+        NSMutableString* text = [[NSMutableString alloc] init];
+
+        if (completedBytesCount && totalBytesCount)
+        {
+            NSString* progressString = [NSString stringWithFormat:@"%@ / %@", [NSByteCountFormatter stringFromByteCount:completedBytesCount.longLongValue countStyle:NSByteCountFormatterCountStyleFile], [NSByteCountFormatter stringFromByteCount:totalBytesCount.longLongValue countStyle:NSByteCountFormatterCountStyleFile]];
+            
+            [text appendString:progressString];
+        }
+        
+        if (downloadRate)
+        {
+            if (completedBytesCount && totalBytesCount)
+            {
+                CGFloat remainimgTime = ((totalBytesCount.floatValue - completedBytesCount.floatValue)) / downloadRate.floatValue;
+                [text appendFormat:@" (%@)", [MXKTools formatSecondsInterval:remainimgTime]];
+            }
+            
+            [text appendFormat:@"\n %@/s", [NSByteCountFormatter stringFromByteCount:downloadRate.longLongValue countStyle:NSByteCountFormatterCountStyleFile]];
+        }
+        
+        progressInfoLabel.text = text;
+        
+        // on multilines, sizeToFit uses the current width
+        // so reset it
+        progressInfoLabel.frame = CGRectZero;
+        
+        [progressInfoLabel sizeToFit];
+        
+        //
+        CGRect progressInfoLabelFrame = progressInfoLabel.frame;
+        progressInfoLabelFrame.origin.x = self.center.x - (progressInfoLabelFrame.size.width / 2);
+        progressInfoLabelFrame.origin.y = 10 + loadingView.frame.origin.y + loadingView.frame.size.height;
+        progressInfoLabel.frame = progressInfoLabelFrame;
+    }
+}
+
+- (void)onMediaLoaderStateDidChange:(NSNotification *)notif
+{
+    MXMediaLoader *loader = (MXMediaLoader*)notif.object;
+    switch (loader.state) {
+        case MXMediaLoaderStateDownloadInProgress:
+            [self updateProgressUI:loader.statisticsDict];
+            break;
+        case MXMediaLoaderStateDownloadCompleted:
+        {
+            [self stopActivityIndicator];
+            // update the image
+            UIImage* image = [MXMediaManager loadPictureFromFilePath:loader.downloadOutputFilePath];
+            if (image)
+            {
+                if (imageOrientation != UIImageOrientationUp)
+                {
+                    self.image = [UIImage imageWithCGImage:image.CGImage scale:1.0 orientation:imageOrientation];
+                }
+                else
+                {
+                    self.image = image;
+                }
+            }
+            [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXMediaLoaderStateDidChangeNotification object:loader];
+            break;
+        }
+        case MXMediaLoaderStateDownloadFailed:
+        case MXMediaLoaderStateCancelled:
+            [self stopActivityIndicator];
+            [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXMediaLoaderStateDidChangeNotification object:loader];
+            break;
+        default:
+            break;
+    }
+}
+
+- (void)checkProgressOnMediaLoaderStateChange:(NSNotification *)notif
+{
+    MXMediaLoader *loader = (MXMediaLoader*)notif.object;
+    switch (loader.state) {
+        case MXMediaLoaderStateDownloadInProgress:
+            [self updateProgressUI:loader.statisticsDict];
+            break;
+        default:
+            break;
+    }
+}
+
+#pragma mark - buttons management
+
+- (void)setLeftButtonTitle: aLeftButtonTitle handler:(blockMXKImageView_onClick)handler
+{
+    leftButtonTitle = aLeftButtonTitle;
+    leftHandler = handler;
+}
+
+- (void)setRightButtonTitle:aRightButtonTitle handler:(blockMXKImageView_onClick)handler
+{
+    rightButtonTitle = aRightButtonTitle;
+    rightHandler = handler;
+}
+
+- (void)dismissSelection
+{
+    if (bottomBarView)
+    {
+        [bottomBarView removeFromSuperview];
+        bottomBarView = nil;
+    }
+}
+
+#pragma mark - UIScrollViewDelegate
+// require to be able to zoom an image
+- (UIView *)viewForZoomingInScrollView:(UIScrollView *)scrollView
+{
+    return self.stretchable ? imageView : nil;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKMessageTextView.h b/Riot/Modules/MatrixKit/Views/MXKMessageTextView.h
new file mode 100644
index 000000000..12adffc9f
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKMessageTextView.h
@@ -0,0 +1,31 @@
+/*
+ Copyright 2019 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/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ MXKMessageTextView is a UITextView subclass with link detection without text selection.
+ */
+@interface MXKMessageTextView : UITextView
+
+// The last hit test location received by the view.
+@property (nonatomic, readonly) CGPoint lastHitTestLocation;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Riot/Modules/MatrixKit/Views/MXKMessageTextView.m b/Riot/Modules/MatrixKit/Views/MXKMessageTextView.m
new file mode 100644
index 000000000..d68ff2cba
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKMessageTextView.m
@@ -0,0 +1,57 @@
+/*
+ Copyright 2019 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 "MXKMessageTextView.h"
+#import "UITextView+MatrixKit.h"
+
+@interface MXKMessageTextView()
+
+@property (nonatomic, readwrite) CGPoint lastHitTestLocation;
+
+@end
+
+
+@implementation MXKMessageTextView
+
+- (BOOL)canBecomeFirstResponder
+{
+    return NO;
+}
+
+- (BOOL)canPerformAction:(SEL)action withSender:(id)sender
+{
+    return NO;
+}
+
+- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
+{
+    self.lastHitTestLocation = point;
+    return [super hitTest:point withEvent:event];
+}
+
+// Indicate to receive a touch event only if a link is hitted.
+// Otherwise it means that the touch event will pass through and could be received by a view below.
+- (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event
+{
+    if (![super pointInside:point withEvent:event])
+    {
+        return NO;
+    }
+    
+    return [self isThereALinkNearPoint:point];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKPieChartHUD.h b/Riot/Modules/MatrixKit/Views/MXKPieChartHUD.h
new file mode 100644
index 000000000..8a6d22d53
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKPieChartHUD.h
@@ -0,0 +1,26 @@
+/*
+ Copyright 2017 Aram Sargsyan
+ 
+ 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/UIKit.h>
+#import "MXKView.h"
+
+@interface MXKPieChartHUD : MXKView
+
++ (MXKPieChartHUD *)showLoadingHudOnView:(UIView *)view WithMessage:(NSString *)message;
+
+- (void)setProgress:(CGFloat)progress;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKPieChartHUD.m b/Riot/Modules/MatrixKit/Views/MXKPieChartHUD.m
new file mode 100644
index 000000000..7a7718837
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKPieChartHUD.m
@@ -0,0 +1,115 @@
+/*
+ Copyright 2017 Aram Sargsyan
+ 
+ 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 "MXKPieChartHUD.h"
+#import "NSBundle+MatrixKit.h"
+#import "MXKPieChartView.h"
+
+@interface MXKPieChartHUD ()
+
+@property (weak, nonatomic) IBOutlet UIView *hudView;
+@property (weak, nonatomic) IBOutlet MXKPieChartView *pieChartView;
+@property (weak, nonatomic) IBOutlet UILabel *titleLabel;
+
+
+@end
+
+@implementation MXKPieChartHUD
+
+#pragma mark - Lifecycle
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self)
+    {
+        [self configureFromNib];
+    }
+    return self;
+}
+
+- (instancetype)initWithCoder:(NSCoder *)aDecoder
+{
+    self = [super initWithCoder:aDecoder];
+    if (self)
+    {
+        [self configureFromNib];
+    }
+    return self;
+}
+
+- (void)configureFromNib
+{
+    NSBundle *bundle = [NSBundle mxk_bundleForClass:self.class];
+    [bundle loadNibNamed:NSStringFromClass(self.class) owner:self options:nil];
+    [self customizeViewRendering];
+    
+    self.hudView.frame = self.bounds;
+    
+    self.clipsToBounds = YES;
+    self.layer.cornerRadius = 10.0;
+    
+    [self addSubview:self.hudView];
+}
+
+- (void)customizeViewRendering
+{
+    [super customizeViewRendering];
+    
+    self.pieChartView.backgroundColor = [UIColor clearColor];
+    self.pieChartView.progressColor = [UIColor whiteColor];
+    self.pieChartView.unprogressColor = [UIColor clearColor];
+    self.pieChartView.tintColor = [UIColor whiteColor];
+}
+
+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+    
+    [self.pieChartView.layer setCornerRadius:self.pieChartView.frame.size.width / 2];
+}
+
+#pragma mark - Public
+
++ (MXKPieChartHUD *)showLoadingHudOnView:(UIView *)view WithMessage:(NSString *)message
+{
+    MXKPieChartHUD *hud = [[MXKPieChartHUD alloc] init];
+    [view addSubview:hud];
+    
+    hud.translatesAutoresizingMaskIntoConstraints = NO;
+    
+    NSLayoutConstraint *centerXConstraint = [NSLayoutConstraint constraintWithItem:hud attribute:NSLayoutAttributeCenterX relatedBy:NSLayoutRelationEqual toItem:view attribute:NSLayoutAttributeCenterX multiplier:1 constant:0];
+    NSLayoutConstraint *centerYConstraint = [NSLayoutConstraint constraintWithItem:hud attribute:NSLayoutAttributeCenterY relatedBy:NSLayoutRelationEqual toItem:view attribute:NSLayoutAttributeCenterY multiplier:1 constant:0];
+    NSLayoutConstraint *widthConstraint = [NSLayoutConstraint constraintWithItem:hud attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1 constant:160];
+    NSLayoutConstraint *heightConstraint = [NSLayoutConstraint constraintWithItem:hud attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1 constant:105];
+    [NSLayoutConstraint activateConstraints:@[centerXConstraint, centerYConstraint, widthConstraint, heightConstraint]];
+    
+    hud.titleLabel.text = message;
+    
+    return hud;
+}
+
+- (void)setProgress:(CGFloat)progress
+{
+    [UIView animateWithDuration:0.2 animations:^{
+        [self.pieChartView setProgress:progress];
+    }];
+    
+}
+
+
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKPieChartHUD.xib b/Riot/Modules/MatrixKit/Views/MXKPieChartHUD.xib
new file mode 100644
index 000000000..6ceac397b
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKPieChartHUD.xib
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MXKPieChartHUD">
+            <connections>
+                <outlet property="hudView" destination="iN0-l3-epB" id="og8-jA-KD7"/>
+                <outlet property="pieChartView" destination="f4A-bz-ZFE" id="Yuf-mb-gdi"/>
+                <outlet property="titleLabel" destination="bZG-ub-27R" id="BBm-ry-r4b"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="446" height="251"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <view alpha="0.59999999999999998" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kHt-vK-fvg" userLabel="Overlay View">
+                    <rect key="frame" x="0.0" y="0.0" width="446" height="251"/>
+                    <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oXu-qz-7Vy" userLabel="Content View">
+                    <rect key="frame" x="0.0" y="0.0" width="446" height="251"/>
+                    <subviews>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="f4A-bz-ZFE" customClass="MXKPieChartView">
+                            <rect key="frame" x="200.5" y="88" width="45" height="45"/>
+                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            <constraints>
+                                <constraint firstAttribute="width" secondItem="f4A-bz-ZFE" secondAttribute="height" multiplier="1:1" id="M4E-Hv-0LA"/>
+                                <constraint firstAttribute="width" constant="45" id="S4I-la-2tP"/>
+                            </constraints>
+                        </view>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label111" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="bZG-ub-27R">
+                            <rect key="frame" x="10" y="214.5" width="426" height="26.5"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="22"/>
+                            <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstAttribute="bottom" secondItem="bZG-ub-27R" secondAttribute="bottom" constant="10" id="H0V-Q4-weJ"/>
+                        <constraint firstAttribute="trailing" secondItem="bZG-ub-27R" secondAttribute="trailing" priority="750" constant="10" id="MCI-qE-Pih"/>
+                        <constraint firstItem="f4A-bz-ZFE" firstAttribute="centerY" secondItem="oXu-qz-7Vy" secondAttribute="centerY" constant="-15" id="QFo-Ym-MUh"/>
+                        <constraint firstItem="bZG-ub-27R" firstAttribute="leading" secondItem="oXu-qz-7Vy" secondAttribute="leading" priority="750" constant="10" id="WNL-5a-Umv"/>
+                        <constraint firstItem="bZG-ub-27R" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="oXu-qz-7Vy" secondAttribute="leading" constant="10" id="Z4o-fX-dWp"/>
+                        <constraint firstItem="f4A-bz-ZFE" firstAttribute="centerX" secondItem="oXu-qz-7Vy" secondAttribute="centerX" id="i5g-L8-LGJ"/>
+                        <constraint firstItem="bZG-ub-27R" firstAttribute="top" relation="greaterThanOrEqual" secondItem="f4A-bz-ZFE" secondAttribute="bottom" constant="10" id="tGZ-mn-PzZ"/>
+                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="bZG-ub-27R" secondAttribute="trailing" constant="10" id="ucQ-m2-ZQj"/>
+                    </constraints>
+                </view>
+            </subviews>
+            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+            <constraints>
+                <constraint firstAttribute="bottom" secondItem="kHt-vK-fvg" secondAttribute="bottom" id="5VY-8I-dHe"/>
+                <constraint firstAttribute="trailing" secondItem="kHt-vK-fvg" secondAttribute="trailing" id="FHO-W4-hNj"/>
+                <constraint firstAttribute="trailing" secondItem="oXu-qz-7Vy" secondAttribute="trailing" id="KGT-N4-891"/>
+                <constraint firstAttribute="bottom" secondItem="oXu-qz-7Vy" secondAttribute="bottom" id="KpV-xG-hDT"/>
+                <constraint firstItem="oXu-qz-7Vy" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Xbp-ik-gW0"/>
+                <constraint firstItem="kHt-vK-fvg" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="ZjB-mP-gcc"/>
+                <constraint firstItem="oXu-qz-7Vy" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="a99-RH-B6U"/>
+                <constraint firstItem="kHt-vK-fvg" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="vUg-49-vYQ"/>
+            </constraints>
+            <nil key="simulatedStatusBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <point key="canvasLocation" x="-105" y="164.5"/>
+        </view>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/MXKPieChartView.h b/Riot/Modules/MatrixKit/Views/MXKPieChartView.h
new file mode 100644
index 000000000..7eeb2d2fb
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKPieChartView.h
@@ -0,0 +1,35 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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/UIKit.h>
+
+#import "MXKView.h"
+
+@interface MXKPieChartView : MXKView
+
+/**
+ The current progress level in [0, 1] range.
+ The pie chart is automatically hidden if progress <= 0.
+ It is shown for other progress values.
+ */
+@property (nonatomic) CGFloat progress;
+
+@property (strong, nonatomic) UIColor* progressColor;
+@property (strong, nonatomic) UIColor* unprogressColor;
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/MXKPieChartView.m b/Riot/Modules/MatrixKit/Views/MXKPieChartView.m
new file mode 100644
index 000000000..fb2d56e2b
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKPieChartView.m
@@ -0,0 +1,139 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKPieChartView.h"
+
+@interface MXKPieChartView ()
+{
+    // graphical items
+    CAShapeLayer* backgroundContainerLayer;
+    CAShapeLayer* powerContainerLayer;
+}
+@end
+
+@implementation MXKPieChartView
+
+- (void)setProgress:(CGFloat)progress
+{
+    // Consider only positive progress value
+    if (progress <= 0)
+    {
+        _progress = 0;
+        self.hidden = YES;
+    }
+    else
+    {
+        // Ensure that the progress value does not excceed 1.0
+        _progress = MIN(progress, 1.0);
+        self.hidden = NO;
+    }
+    
+    // defines the view settings
+    CGFloat radius = self.frame.size.width / 2;
+    
+    // draw a rounded view
+    [self.layer setCornerRadius:radius];
+    self.backgroundColor = [UIColor clearColor];
+    
+    // draw the pie
+    CALayer* layer = [self layer];
+    
+    // remove any previous drawn layer
+    if (powerContainerLayer)
+    {
+        [powerContainerLayer removeFromSuperlayer];
+        powerContainerLayer = nil;
+    }
+    
+    // define default colors
+    if (!_progressColor)
+    {
+        _progressColor = [UIColor redColor];
+    }
+    
+    if (!_unprogressColor)
+    {
+        _unprogressColor = [UIColor lightGrayColor];
+    }
+    
+    // the background cell color is hidden the cell is selected.
+    // so put in grey the cell background triggers a weird display (the background grey is hidden but not the red part).
+    // add an other layer fixes the UX.
+    if (!backgroundContainerLayer)
+    {
+        backgroundContainerLayer = [CAShapeLayer layer];
+        [backgroundContainerLayer setZPosition:0];
+        [backgroundContainerLayer setStrokeColor:NULL];
+        backgroundContainerLayer.fillColor = _unprogressColor.CGColor;
+        
+        // build the path
+        CGMutablePathRef path = CGPathCreateMutable();
+        CGPathMoveToPoint(path, NULL, radius, radius);
+        
+        CGPathAddArc(path, NULL, radius, radius, radius, 0 , 2 * M_PI, 0);
+        CGPathCloseSubpath(path);
+        
+        [backgroundContainerLayer setPath:path];
+        CFRelease(path);
+        
+        // add the sub layer
+        [layer addSublayer:backgroundContainerLayer];
+    }
+    
+    if (_progress)
+    {
+        // create the filled layer
+        powerContainerLayer = [CAShapeLayer layer];
+        [powerContainerLayer setZPosition:0];
+        [powerContainerLayer setStrokeColor:NULL];
+        
+        // power level is drawn in red
+        powerContainerLayer.fillColor = _progressColor.CGColor;
+        
+        // build the path
+        CGMutablePathRef path = CGPathCreateMutable();
+        CGPathMoveToPoint(path, NULL, radius, radius);
+        
+        CGPathAddArc(path, NULL, radius, radius, radius, -M_PI / 2, (_progress * 2 * M_PI) - (M_PI / 2), 0);
+        CGPathCloseSubpath(path);
+        
+        [powerContainerLayer setPath:path];
+        CFRelease(path);
+        
+        // add the sub layer
+        [layer addSublayer:powerContainerLayer];
+    }
+}
+
+- (void)setProgressColor:(UIColor *)progressColor
+{
+    _progressColor = progressColor;
+    self.progress = _progress;
+}
+
+- (void)setUnprogressColor:(UIColor *)unprogressColor
+{
+    _unprogressColor = unprogressColor;
+    
+    if (backgroundContainerLayer)
+    {
+        [backgroundContainerLayer removeFromSuperlayer];
+        backgroundContainerLayer = nil;
+    }
+    self.progress = _progress;
+}
+
+@end
\ No newline at end of file
diff --git a/Riot/Modules/MatrixKit/Views/MXKReceiptSendersContainer.h b/Riot/Modules/MatrixKit/Views/MXKReceiptSendersContainer.h
new file mode 100644
index 000000000..26a0c19e7
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKReceiptSendersContainer.h
@@ -0,0 +1,99 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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 <MatrixSDK/MatrixSDK.h>
+
+#import "MXKView.h"
+
+typedef NS_ENUM(NSInteger, ReadReceiptsAlignment)
+{
+    /**
+     The latest receipt is displayed on left
+     */
+    ReadReceiptAlignmentLeft = 0,
+    
+    /**
+     The latest receipt is displayed on right
+     */
+    ReadReceiptAlignmentRight = 1,
+};
+
+/**
+ `MXKReceiptSendersContainer` is a view dedicated to display receipt senders by using their avatars.
+ 
+ This container handles automatically the number of visible avatars. A label is added when avatars are not all visible (see 'moreLabel' property).
+ */
+@interface MXKReceiptSendersContainer : MXKView
+
+/**
+ The maximum number of avatars displayed in the container. 3 by default.
+ */
+@property (nonatomic) NSInteger maxDisplayedAvatars;
+
+/**
+ The space between avatars. 2.0 points by default.
+ */
+@property (nonatomic) CGFloat avatarMargin;
+
+/**
+ The label added beside avatars when avatars are not all visible.
+ */
+@property (nonatomic) UILabel* moreLabel;
+
+/**
+ The more label text color (If set to nil `moreLabel.textColor` use `UIColor.blackColor` as default color).
+ */
+@property (nonatomic) UIColor* moreLabelTextColor;
+
+/*
+ The read receipt objects for details required in the details view
+ */
+@property (nonatomic) NSArray <MXReceiptData *> *readReceipts;
+
+/*
+ The array of the room members that will be displayed in the container
+ */
+@property (nonatomic, readonly) NSArray <MXRoomMember *> *roomMembers;
+
+/*
+ The placeholders of the room members that will be shown if the users don't have avatars
+ */
+@property (nonatomic, readonly) NSArray <UIImage *> *placeholders;
+
+/**
+ Initializes an `MXKReceiptSendersContainer` object with a frame and a media manager.
+ 
+ This is the designated initializer.
+ 
+ @param frame the container frame. Note that avatar will be displayed in full height in this container.
+ @param mediaManager the media manager used to download the matrix user's avatar.
+ @return The newly-initialized MXKReceiptSendersContainer instance
+ */
+- (instancetype)initWithFrame:(CGRect)frame andMediaManager:(MXMediaManager*)mediaManager;
+
+/**
+ Refresh the container content by using the provided room members.
+ 
+ @param roomMembers list of room members sorted from the latest receipt to the oldest receipt.
+ @param placeHolders list of placeholders, one by room member. Used when url is nil, or during avatar download.
+ @param alignment (see ReadReceiptsAlignment).
+ */
+- (void)refreshReceiptSenders:(NSArray<MXRoomMember*>*)roomMembers withPlaceHolders:(NSArray<UIImage*>*)placeHolders andAlignment:(ReadReceiptsAlignment)alignment;
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/MXKReceiptSendersContainer.m b/Riot/Modules/MatrixKit/Views/MXKReceiptSendersContainer.m
new file mode 100644
index 000000000..05a8acb81
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKReceiptSendersContainer.m
@@ -0,0 +1,174 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2018 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 "MXKReceiptSendersContainer.h"
+
+#import "MXKImageView.h"
+
+static UIColor* kMoreLabelDefaultcolor;
+
+@interface MXKReceiptSendersContainer ()
+
+@property (nonatomic, readwrite) NSArray <MXRoomMember *> *roomMembers;
+@property (nonatomic, readwrite) NSArray <UIImage *> *placeholders;
+@property (nonatomic) MXMediaManager *mediaManager;
+
+@end
+
+
+@implementation MXKReceiptSendersContainer
+
++ (void)initialize
+{
+    if (self == [MXKReceiptSendersContainer class])
+    {
+        kMoreLabelDefaultcolor = [UIColor blackColor];
+    }
+}
+
+- (instancetype)initWithFrame:(CGRect)frame andMediaManager:(MXMediaManager*)mediaManager
+{
+    self = [super initWithFrame:frame];
+    if (self)
+    {
+        _mediaManager = mediaManager;
+        _maxDisplayedAvatars = 3;
+        _avatarMargin = 2.0;
+        _moreLabel = nil;
+        _moreLabelTextColor = kMoreLabelDefaultcolor;
+    }
+    return self;
+}
+
+- (void)refreshReceiptSenders:(NSArray<MXRoomMember*>*)roomMembers withPlaceHolders:(NSArray<UIImage*>*)placeHolders andAlignment:(ReadReceiptsAlignment)alignment
+{
+    // Store the room members and placeholders for showing in the details view controller
+    self.roomMembers = roomMembers;
+    self.placeholders = placeHolders;
+    
+    // Remove all previous content
+    for (UIView* view in self.subviews)
+    {
+        [view removeFromSuperview];
+    }
+    if (_moreLabel)
+    {
+        [_moreLabel removeFromSuperview];
+        _moreLabel = nil;
+    }
+    
+    CGRect globalFrame = self.frame;
+    CGFloat side = globalFrame.size.height;
+    CGFloat defaultMoreLabelWidth = side < 20 ? 20 : side;
+    unsigned long count;
+    unsigned long maxDisplayableItems = (int)((globalFrame.size.width - defaultMoreLabelWidth - _avatarMargin) / (side + _avatarMargin));
+    
+    maxDisplayableItems = MIN(maxDisplayableItems, _maxDisplayedAvatars);
+    count = MIN(roomMembers.count, maxDisplayableItems);
+    
+    int index;
+    
+    CGFloat xOff = 0;
+    
+    if (alignment == ReadReceiptAlignmentRight)
+    {
+        xOff = globalFrame.size.width - (side + _avatarMargin);
+    }
+    
+    for (index = 0; index < count; index++)
+    {
+        MXRoomMember *roomMember = [roomMembers objectAtIndex:index];
+        UIImage *preview = index < placeHolders.count ? placeHolders[index] : nil;
+        
+        MXKImageView *imageView = [[MXKImageView alloc] initWithFrame:CGRectMake(xOff, 0, side, side)];
+        imageView.defaultBackgroundColor = [UIColor clearColor];
+        imageView.autoresizingMask = UIViewAutoresizingNone;
+        
+        if (alignment == ReadReceiptAlignmentRight)
+        {
+            xOff -= side + _avatarMargin;
+        }
+        else
+        {
+            xOff += side + _avatarMargin;
+        }
+        
+        [self addSubview:imageView];
+        imageView.enableInMemoryCache = YES;
+        
+        [imageView setImageURI:roomMember.avatarUrl
+                      withType:nil
+           andImageOrientation:UIImageOrientationUp
+                 toFitViewSize:CGSizeMake(side, side)
+                    withMethod:MXThumbnailingMethodCrop
+                  previewImage:preview
+                  mediaManager:_mediaManager];
+        
+        [imageView.layer setCornerRadius:imageView.frame.size.width / 2];
+        imageView.clipsToBounds = YES;
+    }
+    
+    // Check whether there are more than expected read receipts
+    if (roomMembers.count > maxDisplayableItems)
+    {
+        // Add a more indicator
+        
+        // In case of right alignment, adjust the current position by considering the default label width
+        if (alignment == ReadReceiptAlignmentRight && side < defaultMoreLabelWidth)
+        {
+            xOff -= (defaultMoreLabelWidth - side);
+        }
+        
+        _moreLabel = [[UILabel alloc] initWithFrame:CGRectMake(xOff, 0, defaultMoreLabelWidth, side)];
+        _moreLabel.text = [NSString stringWithFormat:(alignment == ReadReceiptAlignmentRight) ? @"%tu+" : @"+%tu", roomMembers.count - maxDisplayableItems];
+        _moreLabel.font = [UIFont systemFontOfSize:11];
+        _moreLabel.adjustsFontSizeToFitWidth = YES;
+        _moreLabel.minimumScaleFactor = 0.6;
+        
+        // In case of right alignment, adjust the horizontal position according to the actual label width
+        if (alignment == ReadReceiptAlignmentRight)
+        {
+            [_moreLabel sizeToFit];
+            CGRect frame = _moreLabel.frame;
+            if (frame.size.width < defaultMoreLabelWidth)
+            {
+                frame.origin.x += (defaultMoreLabelWidth - frame.size.width);
+                _moreLabel.frame = frame;
+            }
+        }
+        
+        _moreLabel.textColor = self.moreLabelTextColor ?: kMoreLabelDefaultcolor;
+        [self addSubview:_moreLabel];
+    }
+}
+
+- (void)dealloc
+{
+    NSArray* subviews = self.subviews;
+    for (UIView* view in subviews)
+    {
+        [view removeFromSuperview];
+    }
+    
+    if (_moreLabel)
+    {
+        [_moreLabel removeFromSuperview];
+        _moreLabel = nil;
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKRoomActivitiesView.h b/Riot/Modules/MatrixKit/Views/MXKRoomActivitiesView.h
new file mode 100644
index 000000000..e6a73e00e
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKRoomActivitiesView.h
@@ -0,0 +1,71 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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/UIKit.h>
+
+#import "MXKView.h"
+
+@protocol MXKRoomActivitiesViewDelegate;
+
+/**
+ Customize UIView to display some extra info above the RoomInputToolBar
+ */
+@interface MXKRoomActivitiesView : MXKView
+
+@property (nonatomic) CGFloat height;
+
+@property (weak, nonatomic) id<MXKRoomActivitiesViewDelegate> delegate;
+
+/**
+ Returns the `UINib` object initialized for a `MXKRoomActivitiesView`.
+ 
+ @return The initialized `UINib` object or `nil` if there were errors during initialization
+ or the nib file could not be located.
+ 
+ @discussion You may override this method to provide a customized nib. If you do,
+ you should also override `roomActivitiesView` to return your
+ view controller loaded from your custom nib.
+ */
++ (UINib *)nib;
+
+/**
+ Creates and returns a new `MXKRoomActivitiesView-inherited` object.
+ 
+ @discussion This is the designated initializer for programmatic instantiation.
+ @return An initialized `MXKRoomActivitiesView-inherited` object if successful, `nil` otherwise.
+ */
++ (instancetype)roomActivitiesView;
+
+/**
+ Dispose any resources and listener.
+ */
+- (void)destroy;
+
+@end
+
+@protocol MXKRoomActivitiesViewDelegate <NSObject>
+
+/**
+ Called when the activities view height changes.
+
+ @param roomActivitiesView the MXKRoomActivitiesView instance.
+ @param oldHeight its previous height.
+ @param newHeight its new height.
+ */
+- (void)didChangeHeight:(MXKRoomActivitiesView*)roomActivitiesView oldHeight:(CGFloat)oldHeight newHeight:(CGFloat)newHeight;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKRoomActivitiesView.m b/Riot/Modules/MatrixKit/Views/MXKRoomActivitiesView.m
new file mode 100644
index 000000000..98991cdb4
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKRoomActivitiesView.m
@@ -0,0 +1,58 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomActivitiesView.h"
+
+@implementation MXKRoomActivitiesView
+
++ (UINib *)nib
+{
+    // No 'MXKRoomActivitiesView.xib' has been defined yet
+    return nil;
+}
+
++ (instancetype)roomActivitiesView
+{
+    id instance = nil;
+    
+    if ([[self class] nib])
+    {
+        @try {
+           instance = [[[self class] nib] instantiateWithOwner:nil options:nil].firstObject;
+        }
+        @catch (NSException *exception) {
+        }
+    }
+    
+    if (!instance)
+    {
+        instance = [[self alloc] initWithFrame:CGRectZero];
+    }
+ 
+    return instance;
+}
+
+- (void)destroy
+{
+    _delegate = nil;
+}
+
+- (CGFloat)height
+{
+    return self.frame.size.height;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKRoomCreationView.h b/Riot/Modules/MatrixKit/Views/MXKRoomCreationView.h
new file mode 100644
index 000000000..f269dbe87
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKRoomCreationView.h
@@ -0,0 +1,140 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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 <MatrixSDK/MatrixSDK.h>
+
+#import "MXKView.h"
+
+@class MXKRoomCreationView;
+@protocol MXKRoomCreationViewDelegate <NSObject>
+
+/**
+ Tells the delegate that an alert must be presented.
+ 
+ @param creationView the view.
+ @param alertController the alert to present.
+ */
+- (void)roomCreationView:(MXKRoomCreationView*)creationView presentAlertController:(UIAlertController*)alertController;
+
+/**
+ Tells the delegate to open the room with the provided identifier in a specific matrix session.
+ 
+ @param creationView the view.
+ @param roomId the room identifier.
+ @param mxSession the matrix session in which the room should be available.
+ */
+- (void)roomCreationView:(MXKRoomCreationView*)creationView showRoom:(NSString*)roomId withMatrixSession:(MXSession*)mxSession;
+@end
+
+/**
+ MXKRoomCreationView instance is a cell dedicated to room creation.
+ Add this view in your app to offer room creation option.
+ */
+@interface MXKRoomCreationView : MXKView <UITextFieldDelegate> {
+@protected
+    UIView *inputAccessoryView;
+}
+
+/**
+ *  Returns the `UINib` object initialized for the tool bar view.
+ *
+ *  @return The initialized `UINib` object or `nil` if there were errors during
+ *  initialization or the nib file could not be located.
+ */
++ (UINib *)nib;
+
+/**
+ Creates and returns a new `MXKRoomCreationView-inherited` object.
+ 
+ @discussion This is the designated initializer for programmatic instantiation.
+ @return An initialized `MXKRoomCreationView-inherited` object if successful, `nil` otherwise.
+ */
++ (instancetype)roomCreationView;
+
+/**
+ The delegate.
+ */
+@property (nonatomic, weak) id<MXKRoomCreationViewDelegate> delegate;
+
+/**
+ Hide room name field (NO by default).
+ Set YES this property to disable room name edition and hide the related items.
+ */
+@property (nonatomic, getter=isRoomNameFieldHidden) BOOL roomNameFieldHidden;
+
+/**
+ Hide room alias field (NO by default).
+ Set YES this property to disable room alias edition and hide the related items.
+ */
+@property (nonatomic, getter=isRoomAliasFieldHidden) BOOL roomAliasFieldHidden;
+
+/**
+ Hide room participants field (NO by default).
+ Set YES this property to disable room participants edition and hide the related items.
+ */
+@property (nonatomic, getter=isParticipantsFieldHidden) BOOL participantsFieldHidden;
+
+/**
+ The view height which takes into account potential hidden fields
+ */
+@property (nonatomic) CGFloat actualFrameHeight;
+
+/**
+ */
+@property (nonatomic) NSArray* mxSessions;
+
+/**
+ The custom accessory view associated to all text field of this 'MXKRoomCreationView' instance.
+ This view is actually used to retrieve the keyboard view. Indeed the keyboard view is the superview of
+ this accessory view when a text field become the first responder.
+ */
+@property (readonly) UIView *inputAccessoryView;
+
+/**
+ UI items
+ */
+@property (weak, nonatomic) IBOutlet UILabel *roomNameLabel;
+@property (weak, nonatomic) IBOutlet UILabel *roomAliasLabel;
+@property (weak, nonatomic) IBOutlet UILabel *participantsLabel;
+@property (weak, nonatomic) IBOutlet UITextField *roomNameTextField;
+@property (weak, nonatomic) IBOutlet UITextField *roomAliasTextField;
+@property (weak, nonatomic) IBOutlet UITextField *participantsTextField;
+@property (weak, nonatomic) IBOutlet UISegmentedControl *roomVisibilityControl;
+@property (weak, nonatomic) IBOutlet UIButton *createRoomBtn;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *roomNameFieldTopConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *roomAliasFieldTopConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *participantsFieldTopConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *textFieldLeftConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *createRoomBtnTopConstraint;
+
+/**
+ Action registered to handle text field editing change (UIControlEventEditingChanged).
+ */
+- (IBAction)textFieldEditingChanged:(id)sender;
+
+/**
+ Force dismiss keyboard.
+ */
+- (void)dismissKeyboard;
+
+/**
+ Dispose any resources and listener.
+ */
+- (void)destroy;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKRoomCreationView.m b/Riot/Modules/MatrixKit/Views/MXKRoomCreationView.m
new file mode 100644
index 000000000..d132e8e00
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKRoomCreationView.m
@@ -0,0 +1,578 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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 "MXKRoomCreationView.h"
+
+#import "MXKConstants.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKSwiftHeader.h"
+
+@interface MXKRoomCreationView ()
+{
+    UIAlertController *mxSessionPicker;
+    
+    // Array of homeserver suffix (NSString instance)
+    NSMutableArray *homeServerSuffixArray;
+}
+
+@end
+
+@implementation MXKRoomCreationView
+@synthesize inputAccessoryView;
+
++ (UINib *)nib
+{
+    return [UINib nibWithNibName:NSStringFromClass([MXKRoomCreationView class])
+                          bundle:[NSBundle bundleForClass:[MXKRoomCreationView class]]];
+}
+
++ (instancetype)roomCreationView
+{
+    if ([[self class] nib])
+    {
+        return [[[self class] nib] instantiateWithOwner:nil options:nil].firstObject;
+    }
+    else
+    {
+        return [[self alloc] init];
+    }
+}
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    
+    // Add observer to keep align text fields
+    [_roomNameLabel  addObserver:self forKeyPath:@"text" options:0 context:nil];
+    [_roomAliasLabel  addObserver:self forKeyPath:@"text" options:0 context:nil];
+    [_participantsLabel  addObserver:self forKeyPath:@"text" options:0 context:nil];
+    [self alignTextFields];
+    
+    // Finalize setup
+    [self setTranslatesAutoresizingMaskIntoConstraints: NO];
+    
+    // Add an accessory view to the text views in order to retrieve keyboard view.
+    inputAccessoryView = [[UIView alloc] initWithFrame:CGRectZero];
+    _roomNameTextField.inputAccessoryView = inputAccessoryView;
+    _roomAliasTextField.inputAccessoryView = inputAccessoryView;
+    _participantsTextField.inputAccessoryView = inputAccessoryView;
+    
+    // Localize strings
+    _roomNameLabel.text = [MatrixKitL10n roomCreationNameTitle];
+    _roomNameTextField.placeholder = [MatrixKitL10n roomCreationNamePlaceholder];
+    _roomAliasLabel.text = [MatrixKitL10n roomCreationAliasTitle];
+    _roomAliasTextField.placeholder = [MatrixKitL10n roomCreationAliasPlaceholder];
+    _participantsLabel.text = [MatrixKitL10n roomCreationParticipantsTitle];
+    _participantsTextField.placeholder = [MatrixKitL10n roomCreationParticipantsPlaceholder];
+    
+    [_roomVisibilityControl setTitle:[MatrixKitL10n public] forSegmentAtIndex:0];
+    [_roomVisibilityControl setTitle:[MatrixKitL10n private] forSegmentAtIndex:1];
+    
+    [_createRoomBtn setTitle:[MatrixKitL10n createRoom] forState:UIControlStateNormal];
+    [_createRoomBtn setTitle:[MatrixKitL10n createRoom] forState:UIControlStateHighlighted];
+}
+
+- (void)dealloc
+{
+    [self destroy];
+    
+    inputAccessoryView = nil;
+}
+
+- (void)setRoomNameFieldHidden:(BOOL)roomNameFieldHidden
+{
+    _roomNameFieldHidden = _roomNameTextField.hidden = _roomNameLabel.hidden = roomNameFieldHidden;
+    
+    if (roomNameFieldHidden)
+    {
+        _roomAliasFieldTopConstraint.constant -= _roomNameTextField.frame.size.height + 8;
+        _participantsFieldTopConstraint.constant -= _roomNameTextField.frame.size.height + 8;
+        _createRoomBtnTopConstraint.constant -= _roomNameTextField.frame.size.height + 8;
+    }
+    else
+    {
+        _roomAliasFieldTopConstraint.constant += _roomNameTextField.frame.size.height + 8;
+        _participantsFieldTopConstraint.constant += _roomNameTextField.frame.size.height + 8;
+        _createRoomBtnTopConstraint.constant += _roomNameTextField.frame.size.height + 8;
+    }
+    
+    [self alignTextFields];
+}
+
+- (void)setRoomAliasFieldHidden:(BOOL)roomAliasFieldHidden
+{
+    _roomAliasFieldHidden = _roomAliasTextField.hidden = _roomAliasLabel.hidden = roomAliasFieldHidden;
+    
+    if (roomAliasFieldHidden)
+    {
+        _participantsFieldTopConstraint.constant -= _roomAliasTextField.frame.size.height + 8;
+        _createRoomBtnTopConstraint.constant -= _roomAliasTextField.frame.size.height + 8;
+    }
+    else
+    {
+        _participantsFieldTopConstraint.constant += _roomAliasTextField.frame.size.height + 8;
+        _createRoomBtnTopConstraint.constant += _roomAliasTextField.frame.size.height + 8;
+    }
+    
+    [self alignTextFields];
+}
+
+- (void)setParticipantsFieldHidden:(BOOL)participantsFieldHidden
+{
+    _participantsFieldHidden = _participantsTextField.hidden = _participantsLabel.hidden = participantsFieldHidden;
+    
+    if (participantsFieldHidden)
+    {
+        _createRoomBtnTopConstraint.constant -= _participantsTextField.frame.size.height + 8;
+    }
+    else
+    {
+        _createRoomBtnTopConstraint.constant += _participantsTextField.frame.size.height + 8;
+    }
+    
+    [self alignTextFields];
+}
+
+- (CGFloat)actualFrameHeight
+{
+    return (_createRoomBtnTopConstraint.constant + _createRoomBtn.frame.size.height + 8);
+}
+
+- (void)setMxSessions:(NSArray *)mxSessions
+{
+    _mxSessions = mxSessions;
+    
+    if (mxSessions.count)
+    {
+        homeServerSuffixArray = [NSMutableArray array];
+        
+        for (MXSession *mxSession in mxSessions)
+        {
+            NSString *homeserverSuffix = mxSession.matrixRestClient.homeserverSuffix;
+            if (homeserverSuffix && [homeServerSuffixArray indexOfObject:homeserverSuffix] == NSNotFound)
+            {
+                [homeServerSuffixArray addObject:homeserverSuffix];
+            }
+        }
+    }
+    else
+    {
+        homeServerSuffixArray = nil;
+    }
+    
+    // Update alias placeholder in room creation section
+    if (homeServerSuffixArray.count == 1)
+    {
+        _roomAliasTextField.placeholder = [MatrixKitL10n roomCreationAliasPlaceholderWithHomeserver:homeServerSuffixArray.firstObject];
+    }
+    else
+    {
+        _roomAliasTextField.placeholder = [MatrixKitL10n roomCreationAliasPlaceholder];
+    }
+}
+
+- (void)dismissKeyboard
+{
+    // Hide the keyboard
+    [_roomNameTextField resignFirstResponder];
+    [_roomAliasTextField resignFirstResponder];
+    [_participantsTextField resignFirstResponder];
+}
+
+- (void)destroy
+{
+    self.mxSessions = nil;
+    
+    // Remove observers
+    [_roomNameLabel  removeObserver:self forKeyPath:@"text"];
+    [_roomAliasLabel  removeObserver:self forKeyPath:@"text"];
+    [_participantsLabel  removeObserver:self forKeyPath:@"text"];
+}
+
+- (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event
+{
+    // UIView will be "transparent" for touch events if we return NO
+    return YES;
+}
+
+#pragma mark - Internal methods
+
+- (void)alignTextFields
+{
+    CGFloat maxLabelLenght = 0;
+    
+    if (!_roomNameLabel.hidden)
+    {
+        maxLabelLenght = _roomNameLabel.frame.size.width;
+    }
+    if (!_roomAliasLabel.hidden && maxLabelLenght < _roomAliasLabel.frame.size.width)
+    {
+        maxLabelLenght = _roomAliasLabel.frame.size.width;
+    }
+    if (!_participantsLabel.hidden && maxLabelLenght < _participantsLabel.frame.size.width)
+    {
+        maxLabelLenght = _participantsLabel.frame.size.width;
+    }
+    
+    // Update textField left constraint by adding marging
+    _textFieldLeftConstraint.constant = maxLabelLenght + (2 * 8);
+    
+    [self layoutIfNeeded];
+}
+
+- (NSString*)alias
+{
+    // Extract alias name from alias text field
+    NSString *alias = _roomAliasTextField.text;
+    if (alias.length)
+    {
+        // Remove '#' character
+        alias = [alias substringFromIndex:1];
+        
+        NSString *actualAlias = nil;
+        for (NSString *homeServerSuffix in homeServerSuffixArray)
+        {
+            // Remove homeserver suffix
+            NSRange range = [alias rangeOfString:homeServerSuffix];
+            if (range.location != NSNotFound)
+            {
+                actualAlias = [alias stringByReplacingCharactersInRange:range withString:@""];
+                break;
+            }
+        }
+        
+        if (actualAlias)
+        {
+            alias = actualAlias;
+        }
+        else
+        {
+            MXLogDebug(@"[MXKRoomCreationView] Wrong room alias has been set (%@)", _roomAliasTextField.text);
+            alias = nil;
+        }
+    }
+    
+    if (! alias.length)
+    {
+        alias = nil;
+    }
+    
+    return alias;
+}
+
+- (NSArray*)participantsList
+{
+    NSMutableArray *participants = [NSMutableArray array];
+    
+    if (_participantsTextField.text.length)
+    {
+        NSArray *components = [_participantsTextField.text componentsSeparatedByString:@";"];
+        
+        for (NSString *component in components)
+        {
+            // Remove white space from both ends
+            NSString *user = [component stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+            if (user.length > 1 && [user hasPrefix:@"@"])
+            {
+                [participants addObject:user];
+            }
+        }
+    }
+    
+    if (participants.count == 0)
+    {
+        participants = nil;
+    }
+    
+    return participants;
+}
+
+- (void)selectMatrixSession:(void (^)(MXSession *selectedSession))onSelection
+{
+    if (_mxSessions.count == 1)
+    {
+        if (onSelection)
+        {
+            onSelection(_mxSessions.firstObject);
+        }
+    }
+    else if (_mxSessions.count > 1)
+    {
+        if (mxSessionPicker)
+        {
+            [mxSessionPicker dismissViewControllerAnimated:NO completion:nil];
+        }
+        
+        mxSessionPicker = [UIAlertController alertControllerWithTitle:[MatrixKitL10n selectAccount] message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+        
+        __weak typeof(self) weakSelf = self;
+        
+        for(MXSession *mxSession in _mxSessions)
+        {
+            [mxSessionPicker addAction:[UIAlertAction actionWithTitle:mxSession.myUser.userId
+                                                                style:UIAlertActionStyleDefault
+                                                              handler:^(UIAlertAction * action) {
+                                                                  
+                                                                  if (weakSelf)
+                                                                  {
+                                                                      typeof(self) self = weakSelf;
+                                                                      self->mxSessionPicker = nil;
+                                                                      
+                                                                      if (onSelection)
+                                                                      {
+                                                                          onSelection(mxSession);
+                                                                      }
+                                                                  }
+                                                                  
+                                                              }]];
+        }
+        
+        [mxSessionPicker addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+                                                            style:UIAlertActionStyleDefault
+                                                          handler:^(UIAlertAction * action) {
+                                                              
+                                                              if (weakSelf)
+                                                              {
+                                                                  typeof(self) self = weakSelf;
+                                                                  self->mxSessionPicker = nil;
+                                                              }
+                                                              
+                                                          }]];
+        
+        [mxSessionPicker popoverPresentationController].sourceView = self;
+        [mxSessionPicker popoverPresentationController].sourceRect = self.bounds;
+        
+        if (self.delegate)
+        {
+            [self.delegate roomCreationView:self presentAlertController:mxSessionPicker];
+        }
+    }
+}
+
+#pragma mark - UITextField delegate
+
+- (IBAction)textFieldEditingChanged:(id)sender
+{
+    // Update Create Room button
+    NSString *roomName = _roomNameTextField.text;
+    NSString *roomAlias = _roomAliasTextField.text;
+    NSString *participants = _participantsTextField.text;
+    
+    // Room alias is required to create public room
+    _createRoomBtn.enabled = ((_roomVisibilityControl.selectedSegmentIndex == 0) ? roomAlias.length : (roomName.length || roomAlias.length || participants.length));
+}
+
+- (void)textFieldDidBeginEditing:(UITextField *)textField
+{
+    if (textField == _participantsTextField)
+    {
+        if (textField.text.length == 0)
+        {
+            textField.text = @"@";
+        }
+    }
+    else if (textField == _roomAliasTextField)
+    {
+        if (textField.text.length == 0)
+        {
+            textField.text = @"#";
+        }
+    }
+}
+
+- (void)textFieldDidEndEditing:(UITextField *)textField
+{
+    if (textField == _roomAliasTextField)
+    {
+        if (homeServerSuffixArray.count == 1)
+        {
+            // Check whether homeserver suffix should be added
+            NSRange range = [textField.text rangeOfString:@":"];
+            if (range.location == NSNotFound)
+            {
+                textField.text = [textField.text stringByAppendingString:homeServerSuffixArray.firstObject];
+            }
+        }
+        
+        // Check whether the alias is valid
+        if (!self.alias)
+        {
+            // reset text field
+            textField.text = nil;
+            
+            // Update Create button status
+            _createRoomBtn.enabled = ((_roomVisibilityControl.selectedSegmentIndex == 1) && (_roomNameTextField.text.length || _participantsTextField.text.length));
+        }
+    }
+    else if (textField == _participantsTextField)
+    {
+        NSArray *participants = self.participantsList;
+        textField.text = [participants componentsJoinedByString:@"; "];
+        
+        // Update Create button status
+        _createRoomBtn.enabled = ((_roomVisibilityControl.selectedSegmentIndex == 0) ? _roomAliasTextField.text.length : (_roomNameTextField.text.length || _roomAliasTextField.text.length || _participantsTextField.text.length));
+    }
+}
+
+- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
+{
+    // Auto complete participant IDs
+    if (textField == _participantsTextField)
+    {
+        // Add @ if none
+        if (!textField.text.length || textField.text.length == range.length)
+        {
+            if ([string hasPrefix:@"@"] == NO)
+            {
+                textField.text = [NSString stringWithFormat:@"@%@",string];
+                return NO;
+            }
+        }
+        else if (range.location == textField.text.length)
+        {
+            if ([string isEqualToString:@";"])
+            {
+                // Add '@' character
+                textField.text = [textField.text stringByAppendingString:@"; @"];
+                return NO;
+            }
+        }
+    }
+    else if (textField == _roomAliasTextField)
+    {
+        // Add # if none
+        if (!textField.text.length || textField.text.length == range.length)
+        {
+            if ([string hasPrefix:@"#"] == NO)
+            {
+                if ([string isEqualToString:@":"] && homeServerSuffixArray.count == 1)
+                {
+                    textField.text = [NSString stringWithFormat:@"#%@",homeServerSuffixArray.firstObject];
+                }
+                else
+                {
+                    textField.text = [NSString stringWithFormat:@"#%@",string];
+                }
+                return NO;
+            }
+        }
+        else if (homeServerSuffixArray.count == 1)
+        {
+            // Add homeserver automatically when user adds ':' at the end
+            if (range.location == textField.text.length && [string isEqualToString:@":"])
+            {
+                textField.text = [textField.text stringByAppendingString:homeServerSuffixArray.firstObject];
+                return NO;
+            }
+        }
+    }
+    return YES;
+}
+
+- (BOOL)textFieldShouldReturn:(UITextField*) textField
+{
+    // "Done" key has been pressed
+    [textField resignFirstResponder];
+    return YES;
+}
+
+#pragma mark - Actions
+
+- (IBAction)onButtonPressed:(id)sender
+{
+    [self dismissKeyboard];
+    
+    // Handle multi-sessions here
+    [self selectMatrixSession:^(MXSession *selectedSession)
+    {
+        if (sender == self->_createRoomBtn)
+        {
+            // Disable button to prevent multiple request
+            self->_createRoomBtn.enabled = NO;
+
+            MXRoomCreationParameters *roomCreationParameters = [MXRoomCreationParameters new];
+            
+            roomCreationParameters.name = self->_roomNameTextField.text;
+            if (!roomCreationParameters.name.length)
+            {
+                roomCreationParameters.name = nil;
+            }
+            
+            // Check whether some users must be invited
+            roomCreationParameters.inviteArray = self.participantsList;
+            
+            // Prepare room settings
+            
+            if (self->_roomVisibilityControl.selectedSegmentIndex == 0)
+            {
+                roomCreationParameters.visibility = kMXRoomDirectoryVisibilityPublic;
+            }
+            else
+            {
+                roomCreationParameters.visibility = kMXRoomDirectoryVisibilityPrivate;
+                roomCreationParameters.isDirect = (roomCreationParameters.inviteArray.count == 1);
+            }
+            
+            // Ensure direct chat are created with equal ops on both sides (the trusted_private_chat preset)
+            roomCreationParameters.preset = (roomCreationParameters.isDirect ? kMXRoomPresetTrustedPrivateChat : nil);
+            
+            // Create new room
+            [selectedSession createRoomWithParameters:roomCreationParameters success:^(MXRoom *room) {
+                                    
+                                    // Reset text fields
+                                    self->_roomNameTextField.text = nil;
+                                    self->_roomAliasTextField.text = nil;
+                                    self->_participantsTextField.text = nil;
+                                    
+                                    if (self.delegate)
+                                    {
+                                        // Open created room
+                                        [self.delegate roomCreationView:self showRoom:room.roomId withMatrixSession:selectedSession];
+                                    }
+                                    
+                                } failure:^(NSError *error) {
+                                    
+                                    self->_createRoomBtn.enabled = YES;
+                                    
+                                    MXLogDebug(@"[MXKRoomCreationView] Create room (%@ %@ (%@)) failed", self->_roomNameTextField.text, self.alias, (self->_roomVisibilityControl.selectedSegmentIndex == 0) ? @"Public":@"Private");
+                                    
+                                    // Notify MatrixKit user
+                                    NSString *myUserId = selectedSession.myUser.userId;
+                                    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+                                    
+                                }];
+        }
+    }];
+}
+
+#pragma mark - KVO
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
+{
+    // Check whether one label has been updated
+    if ([@"text" isEqualToString:keyPath] && (object == _roomNameLabel || object == _roomAliasLabel || object == _participantsLabel))
+    {
+        // Update left constraint of the text fields
+        [object sizeToFit];
+        [self alignTextFields];
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKRoomCreationView.xib b/Riot/Modules/MatrixKit/Views/MXKRoomCreationView.xib
new file mode 100644
index 000000000..c70ef4790
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKRoomCreationView.xib
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="pWR-M4-k2c" customClass="MXKRoomCreationView">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="164"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <subviews>
+                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="(e.g. lunchGroup)" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="IVl-ZW-gpm">
+                    <rect key="frame" x="109" y="8" width="483" height="30"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                    <textInputTraits key="textInputTraits" returnKeyType="done"/>
+                    <connections>
+                        <action selector="textFieldEditingChanged:" destination="pWR-M4-k2c" eventType="editingChanged" id="s8S-yT-1Me"/>
+                        <outlet property="delegate" destination="pWR-M4-k2c" id="xKT-ld-5W2"/>
+                    </connections>
+                </textField>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Room name:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VgY-Xe-EWu">
+                    <rect key="frame" x="8" y="12" width="91" height="20"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="(e.g. #foo:homeserver)" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="cQR-iw-qK7">
+                    <rect key="frame" x="109" y="46" width="483" height="30"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                    <textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="done"/>
+                    <connections>
+                        <action selector="textFieldEditingChanged:" destination="pWR-M4-k2c" eventType="editingChanged" id="wug-Ut-Gbb"/>
+                        <outlet property="delegate" destination="pWR-M4-k2c" id="NLj-fO-7S1"/>
+                    </connections>
+                </textField>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Room alias:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yxi-SY-9AS">
+                    <rect key="frame" x="8" y="50" width="83" height="20"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="(e.g. @bob:homeserver1; @john:homeserver2...)" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="ntR-iR-LWI">
+                    <rect key="frame" x="108" y="84" width="484" height="30"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                    <textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="done"/>
+                    <connections>
+                        <action selector="textFieldEditingChanged:" destination="pWR-M4-k2c" eventType="editingChanged" id="yLf-bu-2oI"/>
+                        <outlet property="delegate" destination="pWR-M4-k2c" id="YMU-bj-YZf"/>
+                    </connections>
+                </textField>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Participants:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AXJ-7h-Su1">
+                    <rect key="frame" x="8" y="87" width="91" height="20"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="1" translatesAutoresizingMaskIntoConstraints="NO" id="8rs-if-WjB">
+                    <rect key="frame" x="94" y="125" width="113" height="29"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="113" id="586-hY-v29"/>
+                        <constraint firstAttribute="width" relation="lessThanOrEqual" constant="113" id="7dM-UM-eNl"/>
+                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="113" id="Bjv-y7-dA7"/>
+                    </constraints>
+                    <segments>
+                        <segment title="Public"/>
+                        <segment title="Private"/>
+                    </segments>
+                    <connections>
+                        <action selector="textFieldEditingChanged:" destination="pWR-M4-k2c" eventType="valueChanged" id="47w-qB-srf"/>
+                    </connections>
+                </segmentedControl>
+                <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ega-pA-bej">
+                    <rect key="frame" x="411" y="125" width="89" height="30"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                    <state key="normal" title="Create Room">
+                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </state>
+                    <connections>
+                        <action selector="onButtonPressed:" destination="pWR-M4-k2c" eventType="touchUpInside" id="gXl-ZF-r1N"/>
+                    </connections>
+                </button>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="cQR-iw-qK7" secondAttribute="trailing" constant="8" id="0cB-U1-VZA"/>
+                <constraint firstItem="IVl-ZW-gpm" firstAttribute="top" secondItem="pWR-M4-k2c" secondAttribute="top" constant="8" id="32v-lV-s4o"/>
+                <constraint firstAttribute="centerX" secondItem="8rs-if-WjB" secondAttribute="centerX" multiplier="2" id="7ZV-PE-7jb"/>
+                <constraint firstAttribute="trailing" secondItem="ntR-iR-LWI" secondAttribute="trailing" constant="8" id="8nG-wm-5IR"/>
+                <constraint firstItem="VgY-Xe-EWu" firstAttribute="leading" secondItem="pWR-M4-k2c" secondAttribute="leading" constant="8" id="DdS-cu-Y25"/>
+                <constraint firstItem="IVl-ZW-gpm" firstAttribute="leading" secondItem="pWR-M4-k2c" secondAttribute="leading" constant="109" id="J5j-Fw-qqc"/>
+                <constraint firstItem="ega-pA-bej" firstAttribute="centerY" secondItem="8rs-if-WjB" secondAttribute="centerY" constant="1" id="Kbc-Bj-YBf"/>
+                <constraint firstItem="cQR-iw-qK7" firstAttribute="centerX" secondItem="IVl-ZW-gpm" secondAttribute="centerX" id="Lai-pI-DCS"/>
+                <constraint firstItem="VgY-Xe-EWu" firstAttribute="centerY" secondItem="IVl-ZW-gpm" secondAttribute="centerY" constant="-1" id="Mls-23-azV"/>
+                <constraint firstAttribute="centerX" secondItem="ega-pA-bej" secondAttribute="centerX" multiplier="0.66" id="Nu0-mz-Cvz"/>
+                <constraint firstItem="ntR-iR-LWI" firstAttribute="centerX" secondItem="IVl-ZW-gpm" secondAttribute="centerX" constant="-0.5" id="OPT-zM-9ST"/>
+                <constraint firstItem="ega-pA-bej" firstAttribute="top" secondItem="pWR-M4-k2c" secondAttribute="top" constant="125" id="SYc-Ge-iWE"/>
+                <constraint firstAttribute="trailing" secondItem="IVl-ZW-gpm" secondAttribute="trailing" constant="8" id="Scw-Nj-Uef"/>
+                <constraint firstItem="ntR-iR-LWI" firstAttribute="top" secondItem="pWR-M4-k2c" secondAttribute="top" constant="84" id="ZK5-Z1-Fgq"/>
+                <constraint firstItem="Yxi-SY-9AS" firstAttribute="leading" secondItem="pWR-M4-k2c" secondAttribute="leading" constant="8" id="cax-9B-Qgo"/>
+                <constraint firstItem="cQR-iw-qK7" firstAttribute="centerY" secondItem="Yxi-SY-9AS" secondAttribute="centerY" constant="1" id="g3m-Mp-LHU"/>
+                <constraint firstItem="ntR-iR-LWI" firstAttribute="centerY" secondItem="AXJ-7h-Su1" secondAttribute="centerY" constant="2" id="suf-qu-Xzx"/>
+                <constraint firstItem="AXJ-7h-Su1" firstAttribute="leading" secondItem="pWR-M4-k2c" secondAttribute="leading" constant="8" id="wwP-0Z-cCe"/>
+                <constraint firstItem="cQR-iw-qK7" firstAttribute="top" secondItem="pWR-M4-k2c" secondAttribute="top" constant="46" id="xMf-E2-suf"/>
+            </constraints>
+            <nil key="simulatedStatusBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="createRoomBtn" destination="ega-pA-bej" id="psO-nt-6EI"/>
+                <outlet property="createRoomBtnTopConstraint" destination="SYc-Ge-iWE" id="iqw-pV-pK5"/>
+                <outlet property="participantsFieldTopConstraint" destination="ZK5-Z1-Fgq" id="FKM-Yu-PZ0"/>
+                <outlet property="participantsLabel" destination="AXJ-7h-Su1" id="Obs-td-uG8"/>
+                <outlet property="participantsTextField" destination="ntR-iR-LWI" id="vfZ-AE-sPH"/>
+                <outlet property="roomAliasFieldTopConstraint" destination="xMf-E2-suf" id="bgv-5X-sAL"/>
+                <outlet property="roomAliasLabel" destination="Yxi-SY-9AS" id="y2a-fF-YO7"/>
+                <outlet property="roomAliasTextField" destination="cQR-iw-qK7" id="Xmy-Gb-A8S"/>
+                <outlet property="roomNameFieldTopConstraint" destination="32v-lV-s4o" id="Uee-1k-lhQ"/>
+                <outlet property="roomNameLabel" destination="VgY-Xe-EWu" id="36a-Vw-KBs"/>
+                <outlet property="roomNameTextField" destination="IVl-ZW-gpm" id="Q0R-2X-NPw"/>
+                <outlet property="roomVisibilityControl" destination="8rs-if-WjB" id="0bS-Xd-YKE"/>
+                <outlet property="textFieldLeftConstraint" destination="J5j-Fw-qqc" id="5lB-MS-5G6"/>
+            </connections>
+            <point key="canvasLocation" x="215" y="464"/>
+        </view>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCell.h b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCell.h
new file mode 100644
index 000000000..a05455e31
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCell.h
@@ -0,0 +1,82 @@
+/*
+ Copyright 2015 OpenMarket 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/UIKit.h>
+
+#import "MXKCellData.h"
+
+/**
+ List the display box types for the cell subviews.
+ */
+typedef enum : NSUInteger {
+    /**
+     By default the view display box is unchanged.
+     */
+    MXKTableViewCellDisplayBoxTypeDefault,
+    /**
+     Define a circle box based on the smaller size of the view frame, some portion of content may be clipped.
+     */
+    MXKTableViewCellDisplayBoxTypeCircle,
+    /**
+     Round the corner of the display box of the view.
+     */
+    MXKTableViewCellDisplayBoxTypeRoundedCorner
+    
+} MXKTableViewCellDisplayBoxType;
+
+/**
+ 'MXKTableViewCell' class is used to define custom UITableViewCell.
+ Each 'MXKTableViewCell-inherited' class has its own 'reuseIdentifier'.
+ */
+@interface MXKTableViewCell : UITableViewCell
+{
+@protected
+    NSString *mxkReuseIdentifier;
+}
+
+/**
+ Returns the `UINib` object initialized for the cell.
+ 
+ @return The initialized `UINib` object or `nil` if there were errors during
+ initialization or the nib file could not be located.
+ */
++ (UINib *)nib;
+
+/**
+ The default reuseIdentifier of the 'MXKTableViewCell-inherited' class.
+ */
++ (NSString*)defaultReuseIdentifier;
+
+/**
+ Override [UITableViewCell initWithStyle:reuseIdentifier:] to load cell content from nib file (if any), 
+ and handle reuse identifier.
+ */
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier;
+
+/**
+ Customize the rendering of the table view cell and its subviews (Do nothing by default).
+ This method is called when the view is initialized or prepared for reuse.
+ 
+ Override this method to customize the table view cell at the application level.
+ */
+- (void)customizeTableViewCellRendering;
+
+/**
+ The current cell data displayed by the table view cell
+ */
+@property (weak, nonatomic, readonly) MXKCellData *mxkCellData;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCell.m b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCell.m
new file mode 100644
index 000000000..081bef6bc
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCell.m
@@ -0,0 +1,100 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCell.h"
+#import "NSBundle+MatrixKit.h"
+
+@implementation MXKTableViewCell
+
++ (UINib *)nib
+{
+    // Check whether a nib file is available
+    NSBundle *mainBundle = [NSBundle mxk_bundleForClass:self.class];
+    
+    NSString *path = [mainBundle pathForResource:NSStringFromClass([self class]) ofType:@"nib"];
+    if (path)
+    {
+        return [UINib nibWithNibName:NSStringFromClass([self class]) bundle:mainBundle];
+    }
+    return nil;
+}
+
++ (NSString*)defaultReuseIdentifier
+{
+    return NSStringFromClass([self class]);
+}
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    
+    [self customizeTableViewCellRendering];
+}
+
+- (void)prepareForReuse
+{
+    [super prepareForReuse];
+    
+    [self customizeTableViewCellRendering];
+}
+
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
+{
+    // Check whether a xib is defined
+    if ([[self class] nib])
+    {
+        self = [[[self class] nib] instantiateWithOwner:nil options:nil].firstObject;
+    }
+    else
+    {
+        self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
+        [self customizeTableViewCellRendering];
+    }
+    
+    if (reuseIdentifier.length)
+    {
+        // The provided identifier is not always conserved in the new created cell.
+        // This depends how the method [initWithStyle:reuseIdentifier:] is trigerred.
+        // Trick: we store a copy of this identifier.
+        mxkReuseIdentifier = reuseIdentifier;
+    }
+    else
+    {
+        mxkReuseIdentifier = [[self class] defaultReuseIdentifier];
+    }
+    
+    return self;
+}
+
+- (NSString*)reuseIdentifier
+{
+    NSString *identifier = super.reuseIdentifier;
+    
+    if (!identifier.length)
+    {
+        identifier = mxkReuseIdentifier;
+    }
+    
+    return identifier;
+}
+
+- (void)customizeTableViewCellRendering
+{
+    // Do nothing by default.
+}
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithButton.h b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithButton.h
new file mode 100644
index 000000000..daa880d3d
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithButton.h
@@ -0,0 +1,27 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCell.h"
+
+/**
+ 'MXKTableViewCellWithButton' inherits 'MXKTableViewCell' class.
+ It constains a 'UIButton' centered in cell content view.
+ */
+@interface MXKTableViewCellWithButton : MXKTableViewCell
+
+@property (strong, nonatomic) IBOutlet UIButton *mxkButton;
+
+@end
\ No newline at end of file
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithButton.m b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithButton.m
new file mode 100644
index 000000000..25cfc0245
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithButton.m
@@ -0,0 +1,34 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCellWithButton.h"
+
+@implementation MXKTableViewCellWithButton
+
+- (void)prepareForReuse
+{
+    [super prepareForReuse];
+
+    // TODO: Code commented for a quick fix for https://github.com/vector-im/riot-ios/issues/1323
+    // This line was a fix for https://github.com/vector-im/riot-ios/issues/1354
+    // but it creates a regression that is worse than the bug it fixes.
+    // self.mxkButton.titleLabel.text = nil;
+
+    [self.mxkButton removeTarget:nil action:nil forControlEvents:UIControlEventAllEvents];
+    self.mxkButton.accessibilityIdentifier = nil;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithButton.xib b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithButton.xib
new file mode 100644
index 000000000..7df7dbb6d
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithButton.xib
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="20U-7H-xmi" customClass="MXKTableViewCellWithButton">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="20U-7H-xmi" id="cFw-g7-Cgn">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ycy-33-7Zq">
+                        <rect key="frame" x="276" y="7" width="49" height="30"/>
+                        <state key="normal" title="Submit">
+                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </state>
+                    </button>
+                </subviews>
+                <constraints>
+                    <constraint firstAttribute="centerY" secondItem="Ycy-33-7Zq" secondAttribute="centerY" id="6kh-Pa-47V"/>
+                    <constraint firstAttribute="centerX" secondItem="Ycy-33-7Zq" secondAttribute="centerX" id="uAj-IK-F0I"/>
+                </constraints>
+            </tableViewCellContentView>
+            <connections>
+                <outlet property="mxkButton" destination="Ycy-33-7Zq" id="rQt-Th-xOb"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithButtons.h b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithButtons.h
new file mode 100644
index 000000000..17f5df957
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithButtons.h
@@ -0,0 +1,36 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCell.h"
+
+/**
+ 'MXKTableViewCellWithButtons' inherits 'MXKTableViewCell' class.
+ It displays several buttons with the system style in a UITableViewCell. All buttons have the same width and they are horizontally aligned.
+ They are vertically centered.
+ */
+@interface MXKTableViewCellWithButtons : MXKTableViewCell
+
+/**
+ The number of buttons
+ */
+@property (nonatomic) NSUInteger mxkButtonNumber;
+
+/**
+ The current array of buttons
+ */
+@property (nonatomic) NSArray *mxkButtons;
+
+@end
\ No newline at end of file
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithButtons.m b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithButtons.m
new file mode 100644
index 000000000..ac5db6c4f
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithButtons.m
@@ -0,0 +1,156 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCellWithButtons.h"
+
+@interface MXKTableViewCellWithButtons ()
+{
+    NSMutableArray *buttonArray;
+}
+@end
+
+@implementation MXKTableViewCellWithButtons
+
+- (void)setMxkButtonNumber:(NSUInteger)buttonNumber
+{
+    if (_mxkButtonNumber == buttonNumber)
+    {
+        return;
+    }
+    
+    _mxkButtonNumber = buttonNumber;
+    buttonArray = [NSMutableArray arrayWithCapacity:buttonNumber];
+    
+    CGFloat containerWidth = self.contentView.frame.size.width / buttonNumber;
+    UIView *previousContainer = nil;
+    NSLayoutConstraint *leftConstraint;
+    NSLayoutConstraint *rightConstraint;
+    NSLayoutConstraint *widthConstraint;
+    NSLayoutConstraint *topConstraint;
+    NSLayoutConstraint *bottomConstraint;
+    
+    for (NSInteger index = 0; index < buttonNumber; index++)
+    {
+        UIView *buttonContainer = [[UIView alloc] initWithFrame:CGRectMake(index * containerWidth, 0, containerWidth, self.contentView.frame.size.height)];
+        buttonContainer.backgroundColor = [UIColor clearColor];
+        [self.contentView addSubview:buttonContainer];
+        
+        // Add container constraints
+        buttonContainer.translatesAutoresizingMaskIntoConstraints = NO;
+        if (!previousContainer)
+        {
+            leftConstraint = [NSLayoutConstraint constraintWithItem:buttonContainer
+                                                          attribute:NSLayoutAttributeLeading
+                                                          relatedBy:NSLayoutRelationEqual
+                                                             toItem:self.contentView
+                                                          attribute:NSLayoutAttributeLeading
+                                                         multiplier:1
+                                                           constant:0];
+            widthConstraint = [NSLayoutConstraint constraintWithItem:buttonContainer
+                                                           attribute:NSLayoutAttributeWidth
+                                                           relatedBy:NSLayoutRelationEqual
+                                                              toItem:self.contentView
+                                                           attribute:NSLayoutAttributeWidth
+                                                          multiplier:(1.0 / buttonNumber)
+                                                            constant:0];
+        }
+        else
+        {
+            leftConstraint = [NSLayoutConstraint constraintWithItem:buttonContainer
+                                                          attribute:NSLayoutAttributeLeading
+                                                          relatedBy:NSLayoutRelationEqual
+                                                             toItem:previousContainer
+                                                          attribute:NSLayoutAttributeTrailing
+                                                         multiplier:1
+                                                           constant:0];
+            widthConstraint = [NSLayoutConstraint constraintWithItem:buttonContainer
+                                                           attribute:NSLayoutAttributeWidth
+                                                           relatedBy:NSLayoutRelationEqual
+                                                              toItem:previousContainer
+                                                           attribute:NSLayoutAttributeWidth
+                                                          multiplier:1
+                                                            constant:0];
+        }
+        
+        topConstraint = [NSLayoutConstraint constraintWithItem:buttonContainer
+                                                        attribute:NSLayoutAttributeTop
+                                                        relatedBy:NSLayoutRelationEqual
+                                                           toItem:self.contentView
+                                                        attribute:NSLayoutAttributeTop
+                                                       multiplier:1
+                                                         constant:0];
+        
+        bottomConstraint = [NSLayoutConstraint constraintWithItem:buttonContainer
+                                                         attribute:NSLayoutAttributeBottom
+                                                         relatedBy:NSLayoutRelationEqual
+                                                            toItem:self.contentView
+                                                         attribute:NSLayoutAttributeBottom
+                                                        multiplier:1
+                                                          constant:0];
+
+        [NSLayoutConstraint activateConstraints:@[leftConstraint, widthConstraint, topConstraint, bottomConstraint]];
+        previousContainer = buttonContainer;
+        
+        // Add Button
+        UIButton *button = [UIButton buttonWithType:UIButtonTypeSystem];
+        button.frame = CGRectMake(10, 8, containerWidth - 20, buttonContainer.frame.size.height - 16);
+        [buttonContainer addSubview:button];
+        [buttonArray addObject:button];
+        
+        // Add button constraints
+        button.translatesAutoresizingMaskIntoConstraints = NO;
+        leftConstraint = [NSLayoutConstraint constraintWithItem:button
+                                                      attribute:NSLayoutAttributeLeading
+                                                      relatedBy:NSLayoutRelationEqual
+                                                         toItem:buttonContainer
+                                                      attribute:NSLayoutAttributeLeading
+                                                     multiplier:1
+                                                       constant:10];
+        rightConstraint = [NSLayoutConstraint constraintWithItem:button
+                                                      attribute:NSLayoutAttributeTrailing
+                                                      relatedBy:NSLayoutRelationEqual
+                                                         toItem:buttonContainer
+                                                      attribute:NSLayoutAttributeTrailing
+                                                     multiplier:1
+                                                       constant:-10];
+        
+        topConstraint = [NSLayoutConstraint constraintWithItem:button
+                                                     attribute:NSLayoutAttributeTop
+                                                     relatedBy:NSLayoutRelationEqual
+                                                        toItem:buttonContainer
+                                                     attribute:NSLayoutAttributeTop
+                                                    multiplier:1
+                                                      constant:8];
+        
+        bottomConstraint = [NSLayoutConstraint constraintWithItem:button
+                                                        attribute:NSLayoutAttributeBottom
+                                                        relatedBy:NSLayoutRelationEqual
+                                                           toItem:buttonContainer
+                                                        attribute:NSLayoutAttributeBottom
+                                                       multiplier:1
+                                                         constant:-8];
+        
+        [NSLayoutConstraint activateConstraints:@[leftConstraint, rightConstraint, topConstraint, bottomConstraint]];
+    }
+}
+
+- (NSArray*)mxkButtons
+{
+    return [NSArray arrayWithArray:buttonArray];
+}
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndButton.h b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndButton.h
new file mode 100644
index 000000000..89076126a
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndButton.h
@@ -0,0 +1,38 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCell.h"
+
+/**
+ 'MXKTableViewCellWithLabelAndButton' inherits 'MXKTableViewCell' class.
+ It constains a 'UILabel' and a 'UIButton' vertically centered.
+ */
+@interface MXKTableViewCellWithLabelAndButton : MXKTableViewCell
+
+@property (strong, nonatomic) IBOutlet UILabel *mxkLabel;
+@property (strong, nonatomic) IBOutlet UIButton *mxkButton;
+
+/**
+ Leading/Trailing constraints define here spacing to nearest neighbor (no relative to margin)
+ */
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkLabelLeadingConstraint;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkButtonLeadingConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkButtonTrailingConstraint;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkButtonProportionalWidthToMxkButtonConstraint;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndButton.m b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndButton.m
new file mode 100644
index 000000000..a34c8ba80
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndButton.m
@@ -0,0 +1,22 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCellWithLabelAndButton.h"
+
+@implementation MXKTableViewCellWithLabelAndButton
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndButton.xib b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndButton.xib
new file mode 100644
index 000000000..83f6075d5
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndButton.xib
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="aCf-VI-ocb" customClass="MXKTableViewCellWithLabelAndButton">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="aCf-VI-ocb" id="Eg5-vl-rni">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xx4-AP-OQs">
+                        <rect key="frame" x="8" y="11" width="411" height="21"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nTw-zr-xt2">
+                        <rect key="frame" x="427" y="7" width="165" height="30"/>
+                        <state key="normal" title="Button">
+                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </state>
+                    </button>
+                </subviews>
+                <constraints>
+                    <constraint firstAttribute="centerY" secondItem="Xx4-AP-OQs" secondAttribute="centerY" id="A2R-gN-0sW"/>
+                    <constraint firstItem="Xx4-AP-OQs" firstAttribute="leading" secondItem="Eg5-vl-rni" secondAttribute="leading" constant="8" id="Wih-ke-1dd"/>
+                    <constraint firstAttribute="trailing" secondItem="nTw-zr-xt2" secondAttribute="trailing" constant="8" id="f4b-wS-uFy"/>
+                    <constraint firstAttribute="centerY" secondItem="nTw-zr-xt2" secondAttribute="centerY" id="gyq-nC-R4z"/>
+                    <constraint firstItem="nTw-zr-xt2" firstAttribute="width" secondItem="Xx4-AP-OQs" secondAttribute="width" multiplier="0.4" id="ill-js-N8j"/>
+                    <constraint firstItem="nTw-zr-xt2" firstAttribute="leading" secondItem="Xx4-AP-OQs" secondAttribute="trailing" constant="8" id="s8d-Y5-xZR"/>
+                </constraints>
+            </tableViewCellContentView>
+            <connections>
+                <outlet property="mxkButton" destination="nTw-zr-xt2" id="I8D-FA-NHu"/>
+                <outlet property="mxkButtonLeadingConstraint" destination="s8d-Y5-xZR" id="yFz-3Q-x4B"/>
+                <outlet property="mxkButtonProportionalWidthToMxkButtonConstraint" destination="ill-js-N8j" id="XNz-6f-8V1"/>
+                <outlet property="mxkButtonTrailingConstraint" destination="f4b-wS-uFy" id="W7t-7z-PeJ"/>
+                <outlet property="mxkLabel" destination="Xx4-AP-OQs" id="LI1-Yq-PW8"/>
+                <outlet property="mxkLabelLeadingConstraint" destination="Wih-ke-1dd" id="2dO-ba-i74"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndImageView.h b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndImageView.h
new file mode 100644
index 000000000..c985c0f7d
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndImageView.h
@@ -0,0 +1,44 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCell.h"
+
+/**
+ 'MXKTableViewCellWithLabelAndImageView' inherits 'MXKTableViewCell' class.
+ It constains a 'UILabel' and a 'UIImageView' vertically centered.
+ */
+@interface MXKTableViewCellWithLabelAndImageView : MXKTableViewCell
+
+@property (strong, nonatomic) IBOutlet UILabel *mxkLabel;
+@property (strong, nonatomic) IBOutlet UIImageView *mxkImageView;
+
+/**
+ Leading/Trailing constraints define here spacing to nearest neighbor (no relative to margin)
+ */
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkLabelLeadingConstraint;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkImageViewLeadingConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkImageViewTrailingConstraint;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkImageViewWidthConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkImageViewHeightConstraint;
+
+/**
+ The image view display box type ('MXKTableViewCellDisplayBoxTypeDefault' by default)
+ */
+@property (nonatomic) MXKTableViewCellDisplayBoxType mxkImageViewDisplayBoxType;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndImageView.m b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndImageView.m
new file mode 100644
index 000000000..5c89806e6
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndImageView.m
@@ -0,0 +1,44 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCellWithLabelAndImageView.h"
+
+@implementation MXKTableViewCellWithLabelAndImageView
+
+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+    
+    if (self.mxkImageViewDisplayBoxType == MXKTableViewCellDisplayBoxTypeCircle)
+    {
+        // Round image view for thumbnail
+        _mxkImageView.layer.cornerRadius = _mxkImageView.frame.size.width / 2;
+        _mxkImageView.clipsToBounds = YES;
+    }
+    else if (self.mxkImageViewDisplayBoxType == MXKTableViewCellDisplayBoxTypeRoundedCorner)
+    {
+        _mxkImageView.layer.cornerRadius = 5;
+        _mxkImageView.clipsToBounds = YES;
+    }
+    else
+    {
+        _mxkImageView.layer.cornerRadius = 0;
+        _mxkImageView.clipsToBounds = NO;
+    }
+}
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndImageView.xib b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndImageView.xib
new file mode 100644
index 000000000..249476e98
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndImageView.xib
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="aCf-VI-ocb" customClass="MXKTableViewCellWithLabelAndImageView">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="aCf-VI-ocb" id="Eg5-vl-rni">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xx4-AP-OQs">
+                        <rect key="frame" x="8" y="11" width="543" height="21"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="F9Q-h1-mTt">
+                        <rect key="frame" x="559" y="5" width="33" height="33"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="33" id="Mbb-3z-EJx"/>
+                            <constraint firstAttribute="height" constant="33" id="SN2-B2-NSE"/>
+                        </constraints>
+                    </imageView>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="F9Q-h1-mTt" firstAttribute="centerY" secondItem="Eg5-vl-rni" secondAttribute="centerY" id="2I6-r3-K1d"/>
+                    <constraint firstItem="Xx4-AP-OQs" firstAttribute="leading" secondItem="Eg5-vl-rni" secondAttribute="leading" constant="8" id="Wih-ke-1dd"/>
+                    <constraint firstItem="F9Q-h1-mTt" firstAttribute="leading" secondItem="Xx4-AP-OQs" secondAttribute="trailing" priority="750" constant="8" id="mXu-V2-6Sm"/>
+                    <constraint firstAttribute="trailing" secondItem="F9Q-h1-mTt" secondAttribute="trailing" constant="8" id="v4T-uD-LAm"/>
+                    <constraint firstAttribute="centerY" secondItem="Xx4-AP-OQs" secondAttribute="centerY" id="v6O-QC-moW"/>
+                </constraints>
+            </tableViewCellContentView>
+            <connections>
+                <outlet property="mxkImageView" destination="F9Q-h1-mTt" id="4Lx-au-5RN"/>
+                <outlet property="mxkImageViewHeightConstraint" destination="SN2-B2-NSE" id="Zql-LZ-nsj"/>
+                <outlet property="mxkImageViewLeadingConstraint" destination="mXu-V2-6Sm" id="Ecf-aj-MJv"/>
+                <outlet property="mxkImageViewTrailingConstraint" destination="v4T-uD-LAm" id="HLK-AJ-Gj9"/>
+                <outlet property="mxkImageViewWidthConstraint" destination="Mbb-3z-EJx" id="10m-q5-Yok"/>
+                <outlet property="mxkLabel" destination="Xx4-AP-OQs" id="PHz-Lv-lrf"/>
+                <outlet property="mxkLabelLeadingConstraint" destination="Wih-ke-1dd" id="tyK-6D-jiQ"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndMXKImageView.h b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndMXKImageView.h
new file mode 100644
index 000000000..6119dfbb0
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndMXKImageView.h
@@ -0,0 +1,46 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCell.h"
+
+#import "MXKImageView.h"
+
+/**
+ 'MXKTableViewCellWithLabelAndMXKImageView' inherits 'MXKTableViewCell' class.
+ It constains a 'UILabel' and a 'MXKImageView' vertically centered.
+ */
+@interface MXKTableViewCellWithLabelAndMXKImageView : MXKTableViewCell
+
+@property (strong, nonatomic) IBOutlet UILabel *mxkLabel;
+@property (strong, nonatomic) IBOutlet MXKImageView *mxkImageView;
+
+/**
+ Leading/Trailing constraints define here spacing to nearest neighbor (no relative to margin)
+ */
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkLabelLeadingConstraint;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkImageViewLeadingConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkImageViewTrailingConstraint;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkImageViewWidthConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkImageViewHeightConstraint;
+
+/**
+ The MXKImageView display box type ('MXKTableViewCellDisplayBoxTypeDefault' by default)
+ */
+@property (nonatomic) MXKTableViewCellDisplayBoxType mxkImageViewDisplayBoxType;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndMXKImageView.m b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndMXKImageView.m
new file mode 100644
index 000000000..bfffb2d38
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndMXKImageView.m
@@ -0,0 +1,44 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCellWithLabelAndMXKImageView.h"
+
+@implementation MXKTableViewCellWithLabelAndMXKImageView
+
+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+    
+    if (self.mxkImageViewDisplayBoxType == MXKTableViewCellDisplayBoxTypeCircle)
+    {
+        // Round image view for thumbnail
+        _mxkImageView.layer.cornerRadius = _mxkImageView.frame.size.width / 2;
+        _mxkImageView.clipsToBounds = YES;
+    }
+    else if (self.mxkImageViewDisplayBoxType == MXKTableViewCellDisplayBoxTypeRoundedCorner)
+    {
+        _mxkImageView.layer.cornerRadius = 5;
+        _mxkImageView.clipsToBounds = YES;
+    }
+    else
+    {
+        _mxkImageView.layer.cornerRadius = 0;
+        _mxkImageView.clipsToBounds = NO;
+    }
+}
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndMXKImageView.xib b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndMXKImageView.xib
new file mode 100644
index 000000000..92d745d55
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndMXKImageView.xib
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="aCf-VI-ocb" customClass="MXKTableViewCellWithLabelAndMXKImageView">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="aCf-VI-ocb" id="Eg5-vl-rni">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xx4-AP-OQs">
+                        <rect key="frame" x="8" y="11" width="538" height="21"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7Ts-eR-MZV" userLabel="Mxk ImageView" customClass="MXKImageView">
+                        <rect key="frame" x="554" y="5" width="33" height="33"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="33" id="Ejk-bJ-0MB"/>
+                            <constraint firstAttribute="height" constant="33" id="m9S-XK-OTa"/>
+                        </constraints>
+                    </view>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="Xx4-AP-OQs" firstAttribute="leading" secondItem="Eg5-vl-rni" secondAttribute="leading" constant="8" id="Wih-ke-1dd"/>
+                    <constraint firstAttribute="trailing" secondItem="7Ts-eR-MZV" secondAttribute="trailing" constant="13" id="atK-Pp-aD8"/>
+                    <constraint firstItem="7Ts-eR-MZV" firstAttribute="leading" secondItem="Xx4-AP-OQs" secondAttribute="trailing" constant="8" id="mm9-sU-77x"/>
+                    <constraint firstAttribute="centerY" secondItem="Xx4-AP-OQs" secondAttribute="centerY" id="v6O-QC-moW"/>
+                </constraints>
+            </tableViewCellContentView>
+            <constraints>
+                <constraint firstItem="7Ts-eR-MZV" firstAttribute="centerY" secondItem="aCf-VI-ocb" secondAttribute="centerY" id="lgB-TU-fX3"/>
+            </constraints>
+            <connections>
+                <outlet property="mxkImageView" destination="7Ts-eR-MZV" id="ALS-2d-HUG"/>
+                <outlet property="mxkImageViewHeightConstraint" destination="m9S-XK-OTa" id="hRs-A7-Zrx"/>
+                <outlet property="mxkImageViewLeadingConstraint" destination="mm9-sU-77x" id="nNv-Ns-zdz"/>
+                <outlet property="mxkImageViewTrailingConstraint" destination="atK-Pp-aD8" id="kr5-ot-BDV"/>
+                <outlet property="mxkImageViewWidthConstraint" destination="Ejk-bJ-0MB" id="fgn-XC-e4o"/>
+                <outlet property="mxkLabel" destination="Xx4-AP-OQs" id="PHz-Lv-lrf"/>
+                <outlet property="mxkLabelLeadingConstraint" destination="Wih-ke-1dd" id="ONt-IX-CEx"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSlider.h b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSlider.h
new file mode 100644
index 000000000..cc10e1bb5
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSlider.h
@@ -0,0 +1,42 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCell.h"
+
+/**
+ 'MXKTableViewCellWithLabelAndSlider' inherits 'MXKTableViewCell' class.
+ It constains a 'UILabel' and a 'UISlider'.
+ */
+@interface MXKTableViewCellWithLabelAndSlider : MXKTableViewCell
+
+@property (nonatomic) IBOutlet UILabel *mxkLabel;
+@property (nonatomic) IBOutlet UISlider *mxkSlider;
+
+/**
+ Leading/Trailing constraints define here spacing to nearest neighbor (no relative to margin)
+ */
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkLabelTopConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkLabelLeadingConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkLabelTrailingConstraint;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkSliderTopConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkSliderLeadingConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkSliderTrailingConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkSliderBottomConstraint;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkSliderHeightConstraint;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSlider.m b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSlider.m
new file mode 100644
index 000000000..171f8d86c
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSlider.m
@@ -0,0 +1,22 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCellWithLabelAndSlider.h"
+
+@implementation MXKTableViewCellWithLabelAndSlider
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSlider.xib b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSlider.xib
new file mode 100644
index 000000000..4c5f752e1
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSlider.xib
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="88" id="lA9-3N-IIx" customClass="MXKTableViewCellWithLabelAndSlider">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="88"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="lA9-3N-IIx" id="Vc0-lB-zV6">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="87"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="584" translatesAutoresizingMaskIntoConstraints="NO" id="k24-l4-6rr">
+                        <rect key="frame" x="8" y="8" width="584" height="34"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="34" id="FNq-mS-rjp"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="gcY-FQ-8r8">
+                        <rect key="frame" x="6" y="49" width="588" height="31"/>
+                        <color key="minimumTrackTintColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="maximumTrackTintColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </slider>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="k24-l4-6rr" firstAttribute="top" secondItem="Vc0-lB-zV6" secondAttribute="top" constant="8" id="2hw-Fl-Xrg"/>
+                    <constraint firstAttribute="bottom" secondItem="gcY-FQ-8r8" secondAttribute="bottom" constant="8" id="9Om-Ak-gtM"/>
+                    <constraint firstItem="gcY-FQ-8r8" firstAttribute="leading" secondItem="Vc0-lB-zV6" secondAttribute="leading" constant="8" id="FkG-hh-eyX"/>
+                    <constraint firstItem="k24-l4-6rr" firstAttribute="leading" secondItem="Vc0-lB-zV6" secondAttribute="leading" constant="8" id="OLf-mB-0l0"/>
+                    <constraint firstAttribute="trailing" secondItem="k24-l4-6rr" secondAttribute="trailing" constant="8" id="PFM-WC-USa"/>
+                    <constraint firstItem="gcY-FQ-8r8" firstAttribute="top" secondItem="k24-l4-6rr" secondAttribute="bottom" constant="7" id="aEh-bN-jLX"/>
+                    <constraint firstAttribute="trailing" secondItem="gcY-FQ-8r8" secondAttribute="trailing" constant="8" id="mo8-a8-N8Q"/>
+                </constraints>
+            </tableViewCellContentView>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <connections>
+                <outlet property="mxkLabel" destination="k24-l4-6rr" id="y0D-Mw-0um"/>
+                <outlet property="mxkLabelLeadingConstraint" destination="OLf-mB-0l0" id="ET4-n2-A2u"/>
+                <outlet property="mxkLabelTopConstraint" destination="2hw-Fl-Xrg" id="t7n-aA-lql"/>
+                <outlet property="mxkLabelTrailingConstraint" destination="PFM-WC-USa" id="MPu-eZ-Utj"/>
+                <outlet property="mxkSlider" destination="gcY-FQ-8r8" id="uhT-97-E4d"/>
+                <outlet property="mxkSliderBottomConstraint" destination="9Om-Ak-gtM" id="A7D-Tr-5Xg"/>
+                <outlet property="mxkSliderHeightConstraint" destination="FNq-mS-rjp" id="0vO-0U-iqS"/>
+                <outlet property="mxkSliderLeadingConstraint" destination="FkG-hh-eyX" id="gCG-SE-H49"/>
+                <outlet property="mxkSliderTopConstraint" destination="aEh-bN-jLX" id="6Y5-0U-7Ma"/>
+                <outlet property="mxkSliderTrailingConstraint" destination="mo8-a8-N8Q" id="G8j-DF-rZr"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSubLabel.h b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSubLabel.h
new file mode 100644
index 000000000..5dd17657c
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSubLabel.h
@@ -0,0 +1,39 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCell.h"
+
+/**
+ 'MXKTableViewCellWithLabelAndSubLabel' inherits 'MXKTableViewCell' class.
+ It constains two 'UILabel' instances.
+ */
+@interface MXKTableViewCellWithLabelAndSubLabel : MXKTableViewCell
+
+@property (strong, nonatomic) IBOutlet UILabel* mxkLabel;
+@property (strong, nonatomic) IBOutlet UILabel* mxkSublabel;
+
+/**
+ Leading/Trailing constraints define here spacing to nearest neighbor (no relative to margin)
+ */
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkLabelTopConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkLabelLeadingConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkLabelTrailingConstraint;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkSublabelLeadingConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkSublabelTrailingConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkSublabelBottomConstraint;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSubLabel.m b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSubLabel.m
new file mode 100644
index 000000000..6b52aabf0
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSubLabel.m
@@ -0,0 +1,21 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCellWithLabelAndSubLabel.h"
+
+@implementation MXKTableViewCellWithLabelAndSubLabel
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSubLabel.xib b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSubLabel.xib
new file mode 100644
index 000000000..725ef0db4
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSubLabel.xib
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="odA-la-SwE" customClass="MXKTableViewCellWithLabelAndSubLabel">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="odA-la-SwE" id="Ice-YN-Ffy">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rfi-Fa-7Uq">
+                        <rect key="frame" x="8" y="6" width="584" height="18"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sublabel" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bFk-PP-KQ8">
+                        <rect key="frame" x="8" y="22" width="584" height="15"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="bFk-PP-KQ8" firstAttribute="leading" secondItem="Ice-YN-Ffy" secondAttribute="leading" constant="8" id="EIU-NZ-lLo"/>
+                    <constraint firstItem="rfi-Fa-7Uq" firstAttribute="top" secondItem="Ice-YN-Ffy" secondAttribute="top" constant="6" id="RhT-OU-fAa"/>
+                    <constraint firstAttribute="bottom" secondItem="bFk-PP-KQ8" secondAttribute="bottom" constant="6" id="XUy-p8-Cn5"/>
+                    <constraint firstItem="rfi-Fa-7Uq" firstAttribute="leading" secondItem="Ice-YN-Ffy" secondAttribute="leading" constant="8" id="czr-je-LwV"/>
+                    <constraint firstAttribute="trailing" secondItem="rfi-Fa-7Uq" secondAttribute="trailing" constant="8" id="pnn-m6-Idk"/>
+                    <constraint firstAttribute="trailing" secondItem="bFk-PP-KQ8" secondAttribute="trailing" constant="8" id="tlW-4P-80L"/>
+                </constraints>
+            </tableViewCellContentView>
+            <connections>
+                <outlet property="mxkLabel" destination="rfi-Fa-7Uq" id="F0V-zy-oHR"/>
+                <outlet property="mxkLabelLeadingConstraint" destination="czr-je-LwV" id="RiL-Rk-lx8"/>
+                <outlet property="mxkLabelTopConstraint" destination="RhT-OU-fAa" id="tDf-zZ-FDk"/>
+                <outlet property="mxkLabelTrailingConstraint" destination="pnn-m6-Idk" id="fXH-jC-dc5"/>
+                <outlet property="mxkSublabel" destination="bFk-PP-KQ8" id="w63-Pz-7Fc"/>
+                <outlet property="mxkSublabelBottomConstraint" destination="XUy-p8-Cn5" id="ula-Yb-yTz"/>
+                <outlet property="mxkSublabelLeadingConstraint" destination="EIU-NZ-lLo" id="KF2-oE-8yn"/>
+                <outlet property="mxkSublabelTrailingConstraint" destination="tlW-4P-80L" id="uP5-iq-D1f"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSwitch.h b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSwitch.h
new file mode 100644
index 000000000..7c8a45b00
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSwitch.h
@@ -0,0 +1,35 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCell.h"
+
+/**
+ 'MXKTableViewCellWithLabelAndSwitch' inherits 'MXKTableViewCell' class.
+ It constains a 'UILabel' and a 'UISwitch' vertically centered.
+ */
+@interface MXKTableViewCellWithLabelAndSwitch : MXKTableViewCell
+
+@property (strong, nonatomic) IBOutlet UILabel *mxkLabel;
+@property (strong, nonatomic) IBOutlet UISwitch *mxkSwitch;
+
+/**
+ Leading/Trailing constraints define here spacing to nearest neighbor (no relative to margin)
+ */
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkLabelLeadingConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkSwitchLeadingConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkSwitchTrailingConstraint;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSwitch.m b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSwitch.m
new file mode 100644
index 000000000..a321d8385
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSwitch.m
@@ -0,0 +1,22 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCellWithLabelAndSwitch.h"
+
+@implementation MXKTableViewCellWithLabelAndSwitch
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSwitch.xib b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSwitch.xib
new file mode 100644
index 000000000..1bf5c96de
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndSwitch.xib
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="aCf-VI-ocb" customClass="MXKTableViewCellWithLabelAndSwitch">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="aCf-VI-ocb" id="Eg5-vl-rni">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9dA-E8-w3v">
+                        <rect key="frame" x="543" y="6" width="51" height="31"/>
+                    </switch>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xx4-AP-OQs">
+                        <rect key="frame" x="8" y="11" width="42" height="21"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="9dA-E8-w3v" firstAttribute="centerY" secondItem="Eg5-vl-rni" secondAttribute="centerY" id="HHv-PY-RDK"/>
+                    <constraint firstAttribute="bottomMargin" secondItem="Xx4-AP-OQs" secondAttribute="bottom" constant="3" id="Ikz-iJ-l4h"/>
+                    <constraint firstItem="Xx4-AP-OQs" firstAttribute="top" secondItem="Eg5-vl-rni" secondAttribute="topMargin" constant="3" id="Vem-3Z-NyP"/>
+                    <constraint firstItem="Xx4-AP-OQs" firstAttribute="leading" secondItem="Eg5-vl-rni" secondAttribute="leading" constant="8" id="Wih-ke-1dd"/>
+                    <constraint firstItem="9dA-E8-w3v" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Xx4-AP-OQs" secondAttribute="trailing" constant="8" id="hms-8a-BYd"/>
+                    <constraint firstAttribute="trailing" secondItem="9dA-E8-w3v" secondAttribute="trailing" constant="8" id="oN3-Ph-hS5"/>
+                </constraints>
+            </tableViewCellContentView>
+            <connections>
+                <outlet property="mxkLabel" destination="Xx4-AP-OQs" id="jTM-zE-gtP"/>
+                <outlet property="mxkLabelLeadingConstraint" destination="Wih-ke-1dd" id="b2U-OW-efL"/>
+                <outlet property="mxkSwitch" destination="9dA-E8-w3v" id="sko-Dh-EsF"/>
+                <outlet property="mxkSwitchLeadingConstraint" destination="hms-8a-BYd" id="ACm-RB-bE8"/>
+                <outlet property="mxkSwitchTrailingConstraint" destination="oN3-Ph-hS5" id="Y17-Ii-c3Y"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndTextField.h b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndTextField.h
new file mode 100644
index 000000000..516f0dc61
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndTextField.h
@@ -0,0 +1,47 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCell.h"
+
+/**
+ 'MXKTableViewCellWithLabelAndTextField' inherits 'MXKTableViewCell' class.
+ It constains a 'UILabel' and a 'UITextField' vertically centered.
+ */
+@interface MXKTableViewCellWithLabelAndTextField : MXKTableViewCell <UITextFieldDelegate>
+{
+@protected
+    UIView *inputAccessoryView;
+}
+
+@property (strong, nonatomic) IBOutlet UILabel *mxkLabel;
+@property (strong, nonatomic) IBOutlet UITextField *mxkTextField;
+
+/**
+ The custom accessory view associated with the text field. This view is
+ actually used to retrieve the keyboard view. Indeed the keyboard view is the superview of
+ the accessory view when the text field become the first responder.
+ */
+@property (readonly) UIView *inputAccessoryView;
+
+/**
+ Leading/Trailing constraints define here spacing to nearest neighbor (no relative to margin)
+ */
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkLabelLeadingConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkLabelMinWidthConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkTextFieldLeadingConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkTextFieldTrailingConstraint;
+
+@end
\ No newline at end of file
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndTextField.m b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndTextField.m
new file mode 100644
index 000000000..23911441f
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndTextField.m
@@ -0,0 +1,58 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCellWithLabelAndTextField.h"
+
+@implementation MXKTableViewCellWithLabelAndTextField
+@synthesize inputAccessoryView;
+
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
+{
+    self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
+    if (self)
+    {
+        // Add an accessory view to the text view in order to retrieve keyboard view.
+        inputAccessoryView = [[UIView alloc] initWithFrame:CGRectZero];
+        _mxkTextField.inputAccessoryView = inputAccessoryView;
+    }
+    
+    return self;
+}
+
+- (void)dealloc
+{
+    inputAccessoryView = nil;
+}
+
+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+    
+    // Fix the minimum width of the label in order to keep it visible when the textfield width is increasing.
+    [_mxkLabel sizeToFit];
+    _mxkLabelMinWidthConstraint.constant = _mxkLabel.frame.size.width;
+}
+
+#pragma mark - UITextField delegate
+
+- (BOOL)textFieldShouldReturn:(UITextField*)textField
+{
+    // "Done" key has been pressed
+    [self.mxkTextField resignFirstResponder];
+    return YES;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndTextField.xib b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndTextField.xib
new file mode 100644
index 000000000..285424726
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndTextField.xib
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="5Je-1y-foH" customClass="MXKTableViewCellWithLabelAndTextField">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5Je-1y-foH" id="hCm-wd-Yup">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="14" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="SBE-PS-i6p">
+                        <rect key="frame" x="58" y="7" width="534" height="30"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                        <textInputTraits key="textInputTraits" returnKeyType="done"/>
+                        <connections>
+                            <outlet property="delegate" destination="5Je-1y-foH" id="Nie-b5-gB9"/>
+                        </connections>
+                    </textField>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="584" translatesAutoresizingMaskIntoConstraints="NO" id="DE7-uC-Oz2">
+                        <rect key="frame" x="8" y="11" width="42" height="21"/>
+                        <color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="10" id="Qzq-Ej-Wdb"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+                <constraints>
+                    <constraint firstAttribute="trailing" secondItem="SBE-PS-i6p" secondAttribute="trailing" constant="8" id="7NM-6p-4fc"/>
+                    <constraint firstItem="SBE-PS-i6p" firstAttribute="centerY" secondItem="DE7-uC-Oz2" secondAttribute="centerY" id="LEG-PI-Zmz"/>
+                    <constraint firstAttribute="centerY" secondItem="DE7-uC-Oz2" secondAttribute="centerY" id="PU3-ZA-23J"/>
+                    <constraint firstItem="SBE-PS-i6p" firstAttribute="leading" secondItem="DE7-uC-Oz2" secondAttribute="trailing" constant="8" id="h1v-HS-kzp"/>
+                    <constraint firstItem="DE7-uC-Oz2" firstAttribute="leading" secondItem="hCm-wd-Yup" secondAttribute="leading" constant="8" id="qse-r7-x6e"/>
+                </constraints>
+            </tableViewCellContentView>
+            <connections>
+                <outlet property="mxkLabel" destination="DE7-uC-Oz2" id="CTb-my-hkV"/>
+                <outlet property="mxkLabelLeadingConstraint" destination="qse-r7-x6e" id="WiE-p0-3PB"/>
+                <outlet property="mxkLabelMinWidthConstraint" destination="Qzq-Ej-Wdb" id="SJc-IC-N5T"/>
+                <outlet property="mxkTextField" destination="SBE-PS-i6p" id="jLi-27-mbO"/>
+                <outlet property="mxkTextFieldLeadingConstraint" destination="h1v-HS-kzp" id="Sx7-JU-SeG"/>
+                <outlet property="mxkTextFieldTrailingConstraint" destination="7NM-6p-4fc" id="tBw-Gt-9pm"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelTextFieldAndButton.h b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelTextFieldAndButton.h
new file mode 100644
index 000000000..332c37013
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelTextFieldAndButton.h
@@ -0,0 +1,58 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCell.h"
+
+/**
+ 'MXKTableViewCellWithLabelTextFieldAndButton' inherits 'MXKTableViewCell' class.
+ It constains a 'UILabel' on the first line. The second line is composed with a 'UITextField' and a 'UIButton'
+ vertically aligned.
+ */
+@interface MXKTableViewCellWithLabelTextFieldAndButton : MXKTableViewCell <UITextFieldDelegate>
+{
+@protected
+    UIView *inputAccessoryView;
+}
+
+@property (strong, nonatomic) IBOutlet UILabel *mxkLabel;
+@property (strong, nonatomic) IBOutlet UITextField *mxkTextField;
+@property (strong, nonatomic) IBOutlet UIButton *mxkButton;
+
+/**
+ The custom accessory view associated with the text field. This view is
+ actually used to retrieve the keyboard view. Indeed the keyboard view is the superview of
+ the accessory view when the text field become the first responder.
+ */
+@property (readonly) UIView *inputAccessoryView;
+
+/**
+ Leading/Trailing constraints define here spacing to nearest neighbor (no relative to margin)
+ */
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkLabelTopConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkLabelLeadingConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkLabelTrailingConstraint;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkTextFieldLeadingConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkTextFieldTopConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkTextFieldBottomConstraint;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkButtonLeadingConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkButtonTrailingConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkButtonMinWidthConstraint;
+
+- (IBAction)textFieldEditingChanged:(id)sender;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelTextFieldAndButton.m b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelTextFieldAndButton.m
new file mode 100644
index 000000000..6a0d9f7fd
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelTextFieldAndButton.m
@@ -0,0 +1,57 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCellWithLabelTextFieldAndButton.h"
+
+@implementation MXKTableViewCellWithLabelTextFieldAndButton
+@synthesize inputAccessoryView;
+
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
+{
+    self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
+    if (self)
+    {
+        // Add an accessory view to the text view in order to retrieve keyboard view.
+        inputAccessoryView = [[UIView alloc] initWithFrame:CGRectZero];
+        _mxkTextField.inputAccessoryView = inputAccessoryView;
+    }
+    
+    return self;
+}
+
+- (void)dealloc
+{
+    inputAccessoryView = nil;
+}
+
+#pragma mark - UITextField delegate
+
+- (BOOL)textFieldShouldReturn:(UITextField*)textField
+{
+    // "Done" key has been pressed
+    [self.mxkTextField resignFirstResponder];
+    return YES;
+}
+
+#pragma mark - Action
+
+- (IBAction)textFieldEditingChanged:(id)sender
+{
+    self.mxkButton.enabled = (self.mxkTextField.text.length != 0);
+}
+
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelTextFieldAndButton.xib b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelTextFieldAndButton.xib
new file mode 100644
index 000000000..0042c591f
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelTextFieldAndButton.xib
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="70" id="R1k-d9-UZq" customClass="MXKTableViewCellWithLabelTextFieldAndButton">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="70"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="R1k-d9-UZq" id="TrF-Sd-htc">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="69"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="HwF-3u-e5Q">
+                        <rect key="frame" x="8" y="33" width="527" height="30"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                        <textInputTraits key="textInputTraits" returnKeyType="done"/>
+                        <connections>
+                            <action selector="textFieldEditingChanged:" destination="R1k-d9-UZq" eventType="editingChanged" id="LeA-rJ-pcV"/>
+                            <outlet property="delegate" destination="R1k-d9-UZq" id="X6b-0x-2HJ"/>
+                        </connections>
+                    </textField>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KoB-y6-MAj">
+                        <rect key="frame" x="543" y="33" width="49" height="30"/>
+                        <constraints>
+                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="40" id="8Yl-vg-asf"/>
+                        </constraints>
+                        <state key="normal" title="Submit">
+                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </state>
+                    </button>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="14" translatesAutoresizingMaskIntoConstraints="NO" id="9Ez-M7-s8I">
+                        <rect key="frame" x="8" y="8" width="584" height="21"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="KoB-y6-MAj" firstAttribute="centerY" secondItem="HwF-3u-e5Q" secondAttribute="centerY" id="0j3-Pg-l0f"/>
+                    <constraint firstAttribute="trailing" secondItem="KoB-y6-MAj" secondAttribute="trailing" constant="8" id="Bed-gz-IoV"/>
+                    <constraint firstItem="9Ez-M7-s8I" firstAttribute="top" secondItem="TrF-Sd-htc" secondAttribute="top" constant="8" id="UiT-hp-y64"/>
+                    <constraint firstAttribute="bottom" secondItem="HwF-3u-e5Q" secondAttribute="bottom" constant="6" id="VBI-N7-ubO"/>
+                    <constraint firstAttribute="trailing" secondItem="9Ez-M7-s8I" secondAttribute="trailing" constant="8" id="cKm-EC-j6C"/>
+                    <constraint firstItem="HwF-3u-e5Q" firstAttribute="top" secondItem="9Ez-M7-s8I" secondAttribute="bottom" constant="4" id="hsT-zv-aFU"/>
+                    <constraint firstItem="HwF-3u-e5Q" firstAttribute="leading" secondItem="TrF-Sd-htc" secondAttribute="leading" constant="8" id="uYR-ZY-FTK"/>
+                    <constraint firstItem="KoB-y6-MAj" firstAttribute="leading" secondItem="HwF-3u-e5Q" secondAttribute="trailing" constant="8" id="vZw-2I-IYg"/>
+                    <constraint firstItem="9Ez-M7-s8I" firstAttribute="leading" secondItem="TrF-Sd-htc" secondAttribute="leading" constant="8" id="z1S-ho-Niu"/>
+                </constraints>
+            </tableViewCellContentView>
+            <connections>
+                <outlet property="mxkButton" destination="KoB-y6-MAj" id="HtV-Hu-sJB"/>
+                <outlet property="mxkButtonLeadingConstraint" destination="vZw-2I-IYg" id="tSD-e8-387"/>
+                <outlet property="mxkButtonMinWidthConstraint" destination="8Yl-vg-asf" id="Ysh-Vs-QYO"/>
+                <outlet property="mxkButtonTrailingConstraint" destination="Bed-gz-IoV" id="3KC-1v-buQ"/>
+                <outlet property="mxkLabel" destination="9Ez-M7-s8I" id="RAD-Qz-GHK"/>
+                <outlet property="mxkLabelLeadingConstraint" destination="z1S-ho-Niu" id="nPj-Hs-eA6"/>
+                <outlet property="mxkLabelTopConstraint" destination="UiT-hp-y64" id="Fq9-DJ-zQN"/>
+                <outlet property="mxkLabelTrailingConstraint" destination="cKm-EC-j6C" id="nA3-he-Wll"/>
+                <outlet property="mxkTextField" destination="HwF-3u-e5Q" id="aTc-9G-9BE"/>
+                <outlet property="mxkTextFieldBottomConstraint" destination="VBI-N7-ubO" id="iwS-Hp-9EQ"/>
+                <outlet property="mxkTextFieldLeadingConstraint" destination="uYR-ZY-FTK" id="kOH-F3-xGk"/>
+                <outlet property="mxkTextFieldTopConstraint" destination="hsT-zv-aFU" id="n5u-Lo-TOd"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithPicker.h b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithPicker.h
new file mode 100644
index 000000000..d9224a404
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithPicker.h
@@ -0,0 +1,35 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCell.h"
+
+/**
+ 'MXKTableViewCellWithPicker' inherits 'MXKTableViewCell' class.
+ It constains a 'UIPickerView' vertically centered.
+ */
+@interface MXKTableViewCellWithPicker : MXKTableViewCell
+
+@property (strong, nonatomic) IBOutlet UIPickerView* mxkPickerView;
+
+/**
+ Leading/Trailing constraints define here spacing to nearest neighbor (no relative to margin)
+ */
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkPickerViewLeadingConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkPickerViewTopConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkPickerViewBottomConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkPickerViewTrailingConstraint;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithPicker.m b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithPicker.m
new file mode 100644
index 000000000..79800813d
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithPicker.m
@@ -0,0 +1,22 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCellWithPicker.h"
+
+@implementation MXKTableViewCellWithPicker
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithPicker.xib b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithPicker.xib
new file mode 100644
index 000000000..081fe0e3a
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithPicker.xib
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="164" id="q82-Um-cU7" customClass="MXKTableViewCellWithPicker">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="164"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="q82-Um-cU7" id="aBM-uR-U5E">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="163"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <pickerView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hrr-rd-eoA">
+                        <rect key="frame" x="8" y="8" width="584" height="147"/>
+                    </pickerView>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="hrr-rd-eoA" firstAttribute="top" secondItem="aBM-uR-U5E" secondAttribute="top" constant="8" id="J6o-ID-bDs"/>
+                    <constraint firstAttribute="trailing" secondItem="hrr-rd-eoA" secondAttribute="trailing" constant="8" id="SSs-GG-jvP"/>
+                    <constraint firstItem="hrr-rd-eoA" firstAttribute="leading" secondItem="aBM-uR-U5E" secondAttribute="leading" constant="8" id="V0R-Eb-PWo"/>
+                    <constraint firstAttribute="bottom" secondItem="hrr-rd-eoA" secondAttribute="bottom" constant="8" id="h2E-4o-qec"/>
+                </constraints>
+            </tableViewCellContentView>
+            <connections>
+                <outlet property="mxkPickerView" destination="hrr-rd-eoA" id="HBG-aN-sZg"/>
+                <outlet property="mxkPickerViewBottomConstraint" destination="h2E-4o-qec" id="2eo-oT-tUZ"/>
+                <outlet property="mxkPickerViewLeadingConstraint" destination="V0R-Eb-PWo" id="uBh-Jo-oOn"/>
+                <outlet property="mxkPickerViewTopConstraint" destination="J6o-ID-bDs" id="pEK-EQ-1IJ"/>
+                <outlet property="mxkPickerViewTrailingConstraint" destination="SSs-GG-jvP" id="8JI-Zy-LfB"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithSearchBar.h b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithSearchBar.h
new file mode 100644
index 000000000..f7e399637
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithSearchBar.h
@@ -0,0 +1,35 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCell.h"
+
+/**
+ 'MXKTableViewCellWithSearchBar' inherits 'MXKTableViewCell' class.
+ It constains a 'UISearchBar' vertically centered.
+ */
+@interface MXKTableViewCellWithSearchBar : MXKTableViewCell
+
+@property (strong, nonatomic) IBOutlet UISearchBar *mxkSearchBar;
+
+/**
+ Leading/Trailing constraints define here spacing to nearest neighbor (no relative to margin)
+ */
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkSearchBarLeadingConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkSearchBarTopConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkSearchBarBottomConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkSearchBarTrailingConstraint;
+
+@end
\ No newline at end of file
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithSearchBar.m b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithSearchBar.m
new file mode 100644
index 000000000..24fc295eb
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithSearchBar.m
@@ -0,0 +1,22 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCellWithSearchBar.h"
+
+@implementation MXKTableViewCellWithSearchBar
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithSearchBar.xib b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithSearchBar.xib
new file mode 100644
index 000000000..d068674c5
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithSearchBar.xib
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="20U-7H-xmi" customClass="MXKTableViewCellWithSearchBar">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="20U-7H-xmi" id="cFw-g7-Cgn">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <searchBar contentMode="redraw" translatesAutoresizingMaskIntoConstraints="NO" id="HgP-TQ-bd1">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                        <textInputTraits key="textInputTraits"/>
+                    </searchBar>
+                </subviews>
+                <constraints>
+                    <constraint firstAttribute="bottom" secondItem="HgP-TQ-bd1" secondAttribute="bottom" id="9RG-MY-amb"/>
+                    <constraint firstItem="HgP-TQ-bd1" firstAttribute="top" secondItem="cFw-g7-Cgn" secondAttribute="top" id="csH-4b-32a"/>
+                    <constraint firstItem="HgP-TQ-bd1" firstAttribute="leading" secondItem="cFw-g7-Cgn" secondAttribute="leading" id="duA-9h-WEA"/>
+                    <constraint firstAttribute="trailing" secondItem="HgP-TQ-bd1" secondAttribute="trailing" id="y0I-NU-96o"/>
+                </constraints>
+            </tableViewCellContentView>
+            <connections>
+                <outlet property="mxkSearchBar" destination="HgP-TQ-bd1" id="2YT-dI-X4U"/>
+                <outlet property="mxkSearchBarBottomConstraint" destination="9RG-MY-amb" id="CFM-k7-uGe"/>
+                <outlet property="mxkSearchBarLeadingConstraint" destination="duA-9h-WEA" id="5vm-V4-Qsu"/>
+                <outlet property="mxkSearchBarTopConstraint" destination="csH-4b-32a" id="NHJ-WR-9Hm"/>
+                <outlet property="mxkSearchBarTrailingConstraint" destination="y0I-NU-96o" id="lb1-cE-sE0"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithTextFieldAndButton.h b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithTextFieldAndButton.h
new file mode 100644
index 000000000..3d9d195fe
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithTextFieldAndButton.h
@@ -0,0 +1,50 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCell.h"
+
+/**
+ 'MXKTableViewCellWithTextFieldAndButton' inherits 'MXKTableViewCell' class.
+ It constains a 'UITextField' and a 'UIButton' vertically centered.
+ */
+@interface MXKTableViewCellWithTextFieldAndButton : MXKTableViewCell <UITextFieldDelegate>
+{
+@protected
+    UIView *inputAccessoryView;
+}
+
+@property (strong, nonatomic) IBOutlet UITextField *mxkTextField;
+@property (strong, nonatomic) IBOutlet UIButton *mxkButton;
+
+/**
+ The custom accessory view associated with the text field. This view is
+ actually used to retrieve the keyboard view. Indeed the keyboard view is the superview of
+ the accessory view when the text field become the first responder.
+ */
+@property (readonly) UIView *inputAccessoryView;
+
+/**
+ Leading/Trailing constraints define here spacing to nearest neighbor (no relative to margin)
+ */
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkTextFieldLeadingConstraint;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkButtonLeadingConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkButtonTrailingConstraint;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkButtonMinWidthConstraint;
+
+- (IBAction)textFieldEditingChanged:(id)sender;
+@end
\ No newline at end of file
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithTextFieldAndButton.m b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithTextFieldAndButton.m
new file mode 100644
index 000000000..29ef52a56
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithTextFieldAndButton.m
@@ -0,0 +1,57 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCellWithTextFieldAndButton.h"
+
+@implementation MXKTableViewCellWithTextFieldAndButton
+@synthesize inputAccessoryView;
+
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
+{
+    self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
+    if (self)
+    {
+        // Add an accessory view to the text view in order to retrieve keyboard view.
+        inputAccessoryView = [[UIView alloc] initWithFrame:CGRectZero];
+        _mxkTextField.inputAccessoryView = inputAccessoryView;
+    }
+    
+    return self;
+}
+
+- (void)dealloc
+{
+    inputAccessoryView = nil;
+}
+
+#pragma mark - UITextField delegate
+
+- (BOOL)textFieldShouldReturn:(UITextField*)textField
+{
+    // "Done" key has been pressed
+    [self.mxkTextField resignFirstResponder];
+    return YES;
+}
+
+#pragma mark - Action
+
+- (IBAction)textFieldEditingChanged:(id)sender
+{
+    self.mxkButton.enabled = (self.mxkTextField.text.length != 0);
+}
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithTextFieldAndButton.xib b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithTextFieldAndButton.xib
new file mode 100644
index 000000000..ca70d76e6
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithTextFieldAndButton.xib
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="20U-7H-xmi" customClass="MXKTableViewCellWithTextFieldAndButton">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="20U-7H-xmi" id="cFw-g7-Cgn">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="XWh-rM-iqf">
+                        <rect key="frame" x="8" y="7" width="527" height="30"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                        <textInputTraits key="textInputTraits" returnKeyType="done"/>
+                        <connections>
+                            <action selector="textFieldEditingChanged:" destination="20U-7H-xmi" eventType="editingChanged" id="XUA-5O-AC8"/>
+                            <outlet property="delegate" destination="20U-7H-xmi" id="IIR-M2-klm"/>
+                        </connections>
+                    </textField>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ycy-33-7Zq">
+                        <rect key="frame" x="543" y="7" width="49" height="30"/>
+                        <constraints>
+                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="40" id="bvf-cL-4kz"/>
+                        </constraints>
+                        <state key="normal" title="Submit">
+                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </state>
+                    </button>
+                </subviews>
+                <constraints>
+                    <constraint firstAttribute="trailing" secondItem="Ycy-33-7Zq" secondAttribute="trailing" constant="8" id="PaG-vi-8XK"/>
+                    <constraint firstAttribute="centerY" secondItem="XWh-rM-iqf" secondAttribute="centerY" id="TMe-P5-cPy"/>
+                    <constraint firstAttribute="centerY" secondItem="Ycy-33-7Zq" secondAttribute="centerY" id="WRy-Ga-ivi"/>
+                    <constraint firstItem="XWh-rM-iqf" firstAttribute="leading" secondItem="cFw-g7-Cgn" secondAttribute="leading" constant="8" id="Ydc-ON-VIq"/>
+                    <constraint firstItem="Ycy-33-7Zq" firstAttribute="leading" secondItem="XWh-rM-iqf" secondAttribute="trailing" constant="8" id="vw8-zU-VJt"/>
+                </constraints>
+            </tableViewCellContentView>
+            <connections>
+                <outlet property="mxkButton" destination="Ycy-33-7Zq" id="fwp-cx-faQ"/>
+                <outlet property="mxkButtonLeadingConstraint" destination="vw8-zU-VJt" id="Lep-jf-4Sa"/>
+                <outlet property="mxkButtonMinWidthConstraint" destination="bvf-cL-4kz" id="Q0x-ro-SjH"/>
+                <outlet property="mxkButtonTrailingConstraint" destination="PaG-vi-8XK" id="fYB-xQ-ppJ"/>
+                <outlet property="mxkTextField" destination="XWh-rM-iqf" id="2Bm-Ks-lAr"/>
+                <outlet property="mxkTextFieldLeadingConstraint" destination="Ydc-ON-VIq" id="Jap-J5-Vno"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithTextView.h b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithTextView.h
new file mode 100644
index 000000000..e3ef4f366
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithTextView.h
@@ -0,0 +1,35 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCell.h"
+
+/**
+ 'MXKTableViewCellWithTextView' inherits 'MXKTableViewCell' class.
+ It constains a 'UITextView' vertically centered.
+ */
+@interface MXKTableViewCellWithTextView : MXKTableViewCell
+
+@property (strong, nonatomic) IBOutlet UITextView *mxkTextView;
+
+/**
+ Leading/Trailing constraints define here spacing to nearest neighbor (no relative to margin)
+ */
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkTextViewLeadingConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkTextViewTopConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkTextViewBottomConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkTextViewTrailingConstraint;
+
+@end
\ No newline at end of file
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithTextView.m b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithTextView.m
new file mode 100644
index 000000000..5f306b073
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithTextView.m
@@ -0,0 +1,22 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCellWithTextView.h"
+
+@implementation MXKTableViewCellWithTextView
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithTextView.xib b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithTextView.xib
new file mode 100644
index 000000000..6095702d8
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithTextView.xib
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="s7g-kx-9uy" customClass="MXKTableViewCellWithTextView">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="s7g-kx-9uy" id="mT3-eb-yVs">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VW8-Lj-jTg">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
+                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                        <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                    </textView>
+                </subviews>
+                <constraints>
+                    <constraint firstAttribute="trailing" secondItem="VW8-Lj-jTg" secondAttribute="trailing" id="4IP-hg-2gT"/>
+                    <constraint firstItem="VW8-Lj-jTg" firstAttribute="top" secondItem="mT3-eb-yVs" secondAttribute="top" id="KfR-At-oco"/>
+                    <constraint firstItem="VW8-Lj-jTg" firstAttribute="leading" secondItem="mT3-eb-yVs" secondAttribute="leading" id="RzU-IB-SOg"/>
+                    <constraint firstAttribute="bottom" secondItem="VW8-Lj-jTg" secondAttribute="bottom" id="cGd-Tr-QQc"/>
+                </constraints>
+            </tableViewCellContentView>
+            <connections>
+                <outlet property="mxkTextView" destination="VW8-Lj-jTg" id="5ET-Yw-VFe"/>
+                <outlet property="mxkTextViewBottomConstraint" destination="cGd-Tr-QQc" id="S9q-zW-dMh"/>
+                <outlet property="mxkTextViewLeadingConstraint" destination="RzU-IB-SOg" id="iq3-pW-vbQ"/>
+                <outlet property="mxkTextViewTopConstraint" destination="KfR-At-oco" id="I7f-NE-FSb"/>
+                <outlet property="mxkTextViewTrailingConstraint" destination="4IP-hg-2gT" id="mlo-8q-mmg"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewHeaderFooterView/MXKTableViewHeaderFooterView.h b/Riot/Modules/MatrixKit/Views/MXKTableViewHeaderFooterView/MXKTableViewHeaderFooterView.h
new file mode 100644
index 000000000..d19ce5ce6
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewHeaderFooterView/MXKTableViewHeaderFooterView.h
@@ -0,0 +1,50 @@
+/*
+ Copyright 2017 Vector Creations 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/UIKit.h>
+
+/**
+ 'MXKTableViewHeaderFooterView' class is used to define custom UITableViewHeaderFooterView (Either the header or footer for a section).
+ Each 'MXKTableViewHeaderFooterView-inherited' class has its own 'reuseIdentifier'.
+ */
+@interface MXKTableViewHeaderFooterView : UITableViewHeaderFooterView
+{
+@protected
+    NSString *mxkReuseIdentifier;
+}
+
+/**
+ Returns the `UINib` object initialized for the header/footer view.
+ 
+ @return The initialized `UINib` object or `nil` if there were errors during
+ initialization or the nib file could not be located.
+ */
++ (UINib *)nib;
+
+/**
+ The default reuseIdentifier of the 'MXKTableViewHeaderFooterView-inherited' class.
+ */
++ (NSString*)defaultReuseIdentifier;
+
+/**
+ Customize the rendering of the header/footer view and its subviews (Do nothing by default).
+ This method is called when the view is initialized or prepared for reuse.
+ 
+ Override this method to customize the view at the application level.
+ */
+- (void)customizeTableViewHeaderFooterViewRendering;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewHeaderFooterView/MXKTableViewHeaderFooterView.m b/Riot/Modules/MatrixKit/Views/MXKTableViewHeaderFooterView/MXKTableViewHeaderFooterView.m
new file mode 100644
index 000000000..c1b128be0
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewHeaderFooterView/MXKTableViewHeaderFooterView.m
@@ -0,0 +1,100 @@
+/*
+ Copyright 2017 Vector Creations 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 "MXKTableViewHeaderFooterView.h"
+#import "NSBundle+MatrixKit.h"
+
+@implementation MXKTableViewHeaderFooterView
+
++ (UINib *)nib
+{
+    // Check whether a nib file is available
+    NSBundle *mainBundle = [NSBundle mxk_bundleForClass:self.class];
+    
+    NSString *path = [mainBundle pathForResource:NSStringFromClass([self class]) ofType:@"nib"];
+    if (path)
+    {
+        return [UINib nibWithNibName:NSStringFromClass([self class]) bundle:mainBundle];
+    }
+    return nil;
+}
+
++ (NSString*)defaultReuseIdentifier
+{
+    return NSStringFromClass([self class]);
+}
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    
+    [self customizeTableViewHeaderFooterViewRendering];
+}
+
+- (void)prepareForReuse
+{
+    [super prepareForReuse];
+    
+    [self customizeTableViewHeaderFooterViewRendering];
+}
+
+- (instancetype)initWithReuseIdentifier:(NSString *)reuseIdentifier
+{
+    // Check whether a xib is defined
+    if ([[self class] nib])
+    {
+        self = [[[self class] nib] instantiateWithOwner:nil options:nil].firstObject;
+    }
+    else
+    {
+        self = [super initWithReuseIdentifier:reuseIdentifier];
+        [self customizeTableViewHeaderFooterViewRendering];
+    }
+    
+    if (reuseIdentifier.length)
+    {
+        // The provided identifier is not always conserved in the new created view.
+        // This depends how the method [initWithStyle:reuseIdentifier:] is trigerred.
+        // Trick: we store a copy of this identifier.
+        mxkReuseIdentifier = reuseIdentifier;
+    }
+    else
+    {
+        mxkReuseIdentifier = [[self class] defaultReuseIdentifier];
+    }
+    
+    return self;
+}
+
+- (NSString*)reuseIdentifier
+{
+    NSString *identifier = super.reuseIdentifier;
+    
+    if (!identifier.length)
+    {
+        identifier = mxkReuseIdentifier;
+    }
+    
+    return identifier;
+}
+
+- (void)customizeTableViewHeaderFooterViewRendering
+{
+    // Do nothing by default.
+}
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewHeaderFooterView/MXKTableViewHeaderFooterWithLabel.h b/Riot/Modules/MatrixKit/Views/MXKTableViewHeaderFooterView/MXKTableViewHeaderFooterWithLabel.h
new file mode 100644
index 000000000..c5b5f71c1
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewHeaderFooterView/MXKTableViewHeaderFooterWithLabel.h
@@ -0,0 +1,37 @@
+/*
+ Copyright 2017 Vector Creations 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 "MXKTableViewHeaderFooterView.h"
+
+/**
+ 'MXKTableViewHeaderFooterWithLabel' inherits 'MXKTableViewHeaderFooterView' class.
+ It constains a 'UILabel' vertically centered in which the dymanic fonts is enabled.
+ The height of this header is dynamically adapted to its content.
+ */
+@interface MXKTableViewHeaderFooterWithLabel : MXKTableViewHeaderFooterView
+
+@property (strong, nonatomic) IBOutlet UIView  *mxkContentView;
+@property (strong, nonatomic) IBOutlet UILabel *mxkLabel;
+
+/**
+ The following constraints are defined between the label and the content view (no relative to margin)
+ */
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkLabelLeadingConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkLabelTrailingConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkLabelTopConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mxkLabelBottomConstraint;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewHeaderFooterView/MXKTableViewHeaderFooterWithLabel.m b/Riot/Modules/MatrixKit/Views/MXKTableViewHeaderFooterView/MXKTableViewHeaderFooterWithLabel.m
new file mode 100644
index 000000000..302617ad3
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewHeaderFooterView/MXKTableViewHeaderFooterWithLabel.m
@@ -0,0 +1,22 @@
+/*
+ Copyright 2017 Vector Creations 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 "MXKTableViewHeaderFooterWithLabel.h"
+
+@implementation MXKTableViewHeaderFooterWithLabel
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/MXKTableViewHeaderFooterView/MXKTableViewHeaderFooterWithLabel.xib b/Riot/Modules/MatrixKit/Views/MXKTableViewHeaderFooterView/MXKTableViewHeaderFooterWithLabel.xib
new file mode 100644
index 000000000..1a3c4428c
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKTableViewHeaderFooterView/MXKTableViewHeaderFooterWithLabel.xib
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="rhl-fS-u8R" customClass="MXKTableViewHeaderFooterWithLabel">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="35"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <subviews>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="j90-ws-D6K">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="35"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7rK-Dm-IG7">
+                            <rect key="frame" x="20" y="5" width="43.5" height="25"/>
+                            <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
+                            <nil key="textColor"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstAttribute="bottom" secondItem="7rK-Dm-IG7" secondAttribute="bottom" constant="5" id="Ctq-V4-4zl"/>
+                        <constraint firstItem="7rK-Dm-IG7" firstAttribute="leading" secondItem="j90-ws-D6K" secondAttribute="leading" constant="20" id="ca1-y3-mIH"/>
+                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="7rK-Dm-IG7" secondAttribute="trailing" constant="20" id="rCq-5g-qb7"/>
+                        <constraint firstItem="7rK-Dm-IG7" firstAttribute="top" secondItem="j90-ws-D6K" secondAttribute="top" constant="5" id="whi-qQ-5Ip"/>
+                    </constraints>
+                </view>
+            </subviews>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <constraints>
+                <constraint firstItem="j90-ws-D6K" firstAttribute="leading" secondItem="rhl-fS-u8R" secondAttribute="leading" id="4nU-II-QuY"/>
+                <constraint firstAttribute="trailing" secondItem="j90-ws-D6K" secondAttribute="trailing" id="7X5-zE-KV1"/>
+                <constraint firstItem="j90-ws-D6K" firstAttribute="top" secondItem="rhl-fS-u8R" secondAttribute="top" id="KUH-sL-8rz"/>
+                <constraint firstAttribute="bottom" secondItem="j90-ws-D6K" secondAttribute="bottom" id="kAv-oI-Jqg"/>
+            </constraints>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="mxkContentView" destination="j90-ws-D6K" id="kf6-b6-hyN"/>
+                <outlet property="mxkLabel" destination="7rK-Dm-IG7" id="qhW-tx-LDx"/>
+                <outlet property="mxkLabelBottomConstraint" destination="Ctq-V4-4zl" id="g3z-6r-3cf"/>
+                <outlet property="mxkLabelLeadingConstraint" destination="ca1-y3-mIH" id="bPn-cL-yI4"/>
+                <outlet property="mxkLabelTopConstraint" destination="whi-qQ-5Ip" id="Qqw-7f-02n"/>
+                <outlet property="mxkLabelTrailingConstraint" destination="rCq-5g-qb7" id="gza-94-zui"/>
+            </connections>
+        </view>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/MXKView.h b/Riot/Modules/MatrixKit/Views/MXKView.h
new file mode 100644
index 000000000..1531a7923
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKView.h
@@ -0,0 +1,34 @@
+/*
+ Copyright 2017 Vector Creations 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/UIKit.h>
+
+/**
+ `MXKView` is a base class used to add some functionalities to the UIView class.
+ */
+@interface MXKView : UIView
+
+/**
+ Customize the rendering of the view and its subviews (Do nothing by default).
+ This method is called automatically when the view is initialized or loaded from an Interface Builder archive (or nib file).
+ 
+ Override this method to customize the view instance at the application level.
+ It may be used to handle different rendering themes. In this case this method should be called whenever the theme has changed.
+ */
+- (void)customizeViewRendering;
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/MXKView.m b/Riot/Modules/MatrixKit/Views/MXKView.m
new file mode 100644
index 000000000..52e43cff8
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/MXKView.m
@@ -0,0 +1,53 @@
+/*
+ Copyright 2017 Vector Creations 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 "MXKView.h"
+
+@implementation MXKView
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self)
+    {
+        [self customizeViewRendering];
+    }
+    return self;
+}
+
+- (instancetype)initWithCoder:(NSCoder *)aDecoder
+{
+    self = [super initWithCoder:aDecoder];
+    if (self)
+    {
+        [self customizeViewRendering];
+    }
+    return self;
+}
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    
+    [self customizeViewRendering];
+}
+
+- (void)customizeViewRendering
+{
+    // Do nothing by default.
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/PushRule/MXKPushRuleCreationTableViewCell.h b/Riot/Modules/MatrixKit/Views/PushRule/MXKPushRuleCreationTableViewCell.h
new file mode 100644
index 000000000..20e9f453b
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/PushRule/MXKPushRuleCreationTableViewCell.h
@@ -0,0 +1,67 @@
+/*
+ Copyright 2015 OpenMarket 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 <MatrixSDK/MatrixSDK.h>
+
+#import "MXKTableViewCell.h"
+
+/**
+ MXPushRuleCreationTableViewCell instance is a table view cell used to create a new push rule.
+ */
+@interface MXKPushRuleCreationTableViewCell : MXKTableViewCell <UITextFieldDelegate, UIPickerViewDataSource, UIPickerViewDelegate>
+
+/**
+ The category the created push rule will belongs to (MXPushRuleKindContent by default).
+ */
+@property (nonatomic) MXPushRuleKind mxPushRuleKind;
+
+/**
+ The related matrix session
+ */
+@property (nonatomic) MXSession* mxSession;
+
+/**
+ The graphics items
+ */
+@property (strong, nonatomic) IBOutlet UITextField* inputTextField;
+
+@property (unsafe_unretained, nonatomic) IBOutlet UISegmentedControl *actionSegmentedControl;
+@property (unsafe_unretained, nonatomic) IBOutlet UISwitch *soundSwitch;
+@property (unsafe_unretained, nonatomic) IBOutlet UISwitch *highlightSwitch;
+
+@property (strong, nonatomic) IBOutlet UIButton* addButton;
+
+@property (strong, nonatomic) IBOutlet UIPickerView* roomPicker;
+@property (unsafe_unretained, nonatomic) IBOutlet UIButton *roomPickerDoneButton;
+
+/**
+ Force dismiss keyboard.
+ */
+- (void)dismissKeyboard;
+
+/**
+ Action registered to handle text field editing change (UIControlEventEditingChanged).
+ */
+- (IBAction)textFieldEditingChanged:(id)sender;
+
+/**
+ Action registered on the following events:
+ - 'UIControlEventTouchUpInside' for UIButton instances.
+ - 'UIControlEventValueChanged' for UISwitch and UISegmentedControl instances.
+ */
+- (IBAction)onButtonPressed:(id)sender;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/PushRule/MXKPushRuleCreationTableViewCell.m b/Riot/Modules/MatrixKit/Views/PushRule/MXKPushRuleCreationTableViewCell.m
new file mode 100644
index 000000000..b0929edc9
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/PushRule/MXKPushRuleCreationTableViewCell.m
@@ -0,0 +1,208 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKPushRuleCreationTableViewCell.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKSwiftHeader.h"
+
+@interface MXKPushRuleCreationTableViewCell ()
+{
+    /**
+     Snapshot of matrix session rooms used in room picker (in case of MXPushRuleKindRoom)
+     */
+    NSArray* rooms;
+}
+@end
+
+@implementation MXKPushRuleCreationTableViewCell
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    
+    self.mxPushRuleKind = MXPushRuleKindContent;
+}
+
+- (void)setMxPushRuleKind:(MXPushRuleKind)mxPushRuleKind
+{
+    switch (mxPushRuleKind)
+    {
+        case MXPushRuleKindContent:
+            _inputTextField.placeholder = [MatrixKitL10n notificationSettingsWordToMatch];
+            _inputTextField.autocorrectionType = UITextAutocorrectionTypeDefault;
+            break;
+        case MXPushRuleKindRoom:
+            _inputTextField.placeholder = [MatrixKitL10n notificationSettingsSelectRoom];
+            break;
+        case MXPushRuleKindSender:
+            _inputTextField.placeholder = [MatrixKitL10n notificationSettingsSenderHint];
+            _inputTextField.autocorrectionType = UITextAutocorrectionTypeNo;
+            break;
+        default:
+            break;
+    }
+    
+    _inputTextField.hidden = NO;
+    _roomPicker.hidden = YES;
+    _roomPickerDoneButton.hidden = YES;
+    
+    _mxPushRuleKind = mxPushRuleKind;
+}
+
+- (void)dismissKeyboard
+{
+    [_inputTextField resignFirstResponder];
+}
+
+#pragma mark - UITextField delegate
+
+- (IBAction)textFieldEditingChanged:(id)sender
+{
+    // Update Add Room button
+    if (_inputTextField.text.length)
+    {
+        _addButton.enabled = YES;
+    }
+    else
+    {
+        _addButton.enabled = NO;
+    }
+}
+
+- (BOOL)textFieldShouldBeginEditing:(UITextField *)textField
+{
+    if (textField == _inputTextField && _mxPushRuleKind == MXPushRuleKindRoom)
+    {
+        _inputTextField.hidden = YES;
+        _roomPicker.hidden = NO;
+        _roomPickerDoneButton.hidden = NO;
+        return NO;
+    }
+    
+    return YES;
+}
+
+- (void)textFieldDidBeginEditing:(UITextField *)textField
+{
+    if (textField == _inputTextField && _mxPushRuleKind == MXPushRuleKindSender)
+    {
+        if (textField.text.length == 0)
+        {
+            textField.text = @"@";
+        }
+    }
+}
+
+- (BOOL)textFieldShouldReturn:(UITextField*) textField
+{
+    // "Done" key has been pressed
+    [textField resignFirstResponder];
+    return YES;
+}
+
+#pragma mark - Actions
+
+- (IBAction)onButtonPressed:(id)sender
+{
+    [self dismissKeyboard];
+    
+    if (sender == _addButton)
+    {
+        // Disable button to prevent multiple request
+        _addButton.enabled = NO;
+        
+        if (_mxPushRuleKind == MXPushRuleKindContent)
+        {
+            [_mxSession.notificationCenter addContentRule:_inputTextField.text
+                                                   notify:(_actionSegmentedControl.selectedSegmentIndex == 0)
+                                                    sound:_soundSwitch.on
+                                                highlight:_highlightSwitch.on];
+        }
+        else if (_mxPushRuleKind == MXPushRuleKindRoom)
+        {
+            MXRoom* room;
+            NSInteger row = [_roomPicker selectedRowInComponent:0];
+            if ((row >= 0) && (row < rooms.count))
+            {
+                room = [rooms objectAtIndex:row];
+            }
+            
+            if (room)
+            {
+                [_mxSession.notificationCenter addRoomRule:room.roomId
+                                                    notify:(_actionSegmentedControl.selectedSegmentIndex == 0)
+                                                     sound:_soundSwitch.on
+                                                 highlight:_highlightSwitch.on];
+            }
+            
+        }
+        else if (_mxPushRuleKind == MXPushRuleKindSender)
+        {
+            [_mxSession.notificationCenter addSenderRule:_inputTextField.text
+                                                notify:(_actionSegmentedControl.selectedSegmentIndex == 0)
+                                                 sound:_soundSwitch.on
+                                             highlight:_highlightSwitch.on];
+        }
+        
+        
+        _inputTextField.text = nil;
+    }
+    else if (sender == _roomPickerDoneButton)
+    {
+        NSInteger row = [_roomPicker selectedRowInComponent:0];
+        // sanity check
+        if ((row >= 0) && (row < rooms.count))
+        {
+            MXRoom* room = [rooms objectAtIndex:row];
+            _inputTextField.text = room.summary.displayname;
+            _addButton.enabled = YES;
+        }
+        
+        _inputTextField.hidden = NO;
+        _roomPicker.hidden = YES;
+        _roomPickerDoneButton.hidden = YES;
+    }
+}
+
+#pragma mark - UIPickerViewDataSource
+
+- (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView
+{
+    return 1;
+}
+
+- (NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component
+{
+    rooms = [_mxSession.rooms sortedArrayUsingComparator:^NSComparisonResult(MXRoom* firstRoom, MXRoom* secondRoom) {
+        
+        // Alphabetic order
+        return [firstRoom.summary.displayname compare:secondRoom.summary.displayname options:NSCaseInsensitiveSearch];
+    }];
+
+    return rooms.count;
+}
+
+#pragma mark - UIPickerViewDelegate
+
+- (NSString *)pickerView:(UIPickerView *)pickerView titleForRow:(NSInteger)row forComponent:(NSInteger)component
+{
+    MXRoom* room = [rooms objectAtIndex:row];
+    return room.summary.displayname;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/PushRule/MXKPushRuleCreationTableViewCell.xib b/Riot/Modules/MatrixKit/Views/PushRule/MXKPushRuleCreationTableViewCell.xib
new file mode 100644
index 000000000..a3b574312
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/PushRule/MXKPushRuleCreationTableViewCell.xib
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="100" id="odA-la-SwE" customClass="MXKPushRuleCreationTableViewCell">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="120"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="odA-la-SwE" id="Ice-YN-Ffy">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="119"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Wwh-3Z-z7F" userLabel="input Text Field">
+                        <rect key="frame" x="8" y="8" width="546" height="30"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                        <textInputTraits key="textInputTraits" returnKeyType="done"/>
+                        <connections>
+                            <action selector="textFieldEditingChanged:" destination="odA-la-SwE" eventType="editingChanged" id="ivl-8t-XsA"/>
+                            <outlet property="delegate" destination="odA-la-SwE" id="Xax-eN-mqc"/>
+                        </connections>
+                    </textField>
+                    <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="contactAdd" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sMf-pD-nYN" userLabel="add Button">
+                        <rect key="frame" x="562" y="8" width="30" height="30"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="30" id="9xs-Pn-KoC"/>
+                            <constraint firstAttribute="height" constant="30" id="PdY-qO-X5W"/>
+                        </constraints>
+                        <state key="normal">
+                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </state>
+                        <connections>
+                            <action selector="onButtonPressed:" destination="odA-la-SwE" eventType="touchUpInside" id="ml4-uK-KMC"/>
+                        </connections>
+                    </button>
+                    <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="4Bt-EK-JDS">
+                        <rect key="frame" x="8" y="46" width="273" height="29"/>
+                        <segments>
+                            <segment title="Always Notify"/>
+                            <segment title="Never Notify"/>
+                        </segments>
+                        <connections>
+                            <action selector="onButtonPressed:" destination="odA-la-SwE" eventType="valueChanged" id="PtA-K2-021"/>
+                        </connections>
+                    </segmentedControl>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sound:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bRv-hA-dFH">
+                        <rect key="frame" x="357.5" y="87" width="45.5" height="17"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="lwC-Mg-bJ2" userLabel="sound Switch">
+                        <rect key="frame" x="411" y="80" width="51" height="31"/>
+                        <connections>
+                            <action selector="onButtonPressed:" destination="odA-la-SwE" eventType="valueChanged" id="okw-8q-GHg"/>
+                        </connections>
+                    </switch>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Highlight:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aQf-3y-ZeE">
+                        <rect key="frame" x="468" y="87" width="63" height="17"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="2lY-ne-Uzm" userLabel="highlight Switch">
+                        <rect key="frame" x="539" y="80" width="51" height="31"/>
+                        <connections>
+                            <action selector="onButtonPressed:" destination="odA-la-SwE" eventType="valueChanged" id="pIo-K0-3Vj"/>
+                        </connections>
+                    </switch>
+                    <pickerView hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4YJ-sM-Eyq" userLabel="Room Picker View">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="119.5"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <connections>
+                            <outlet property="dataSource" destination="odA-la-SwE" id="SoZ-Lh-rcQ"/>
+                            <outlet property="delegate" destination="odA-la-SwE" id="YPx-UY-MPp"/>
+                        </connections>
+                    </pickerView>
+                    <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="na4-JH-zWr">
+                        <rect key="frame" x="563" y="0.0" width="37" height="30"/>
+                        <state key="normal" title="Done"/>
+                        <connections>
+                            <action selector="onButtonPressed:" destination="odA-la-SwE" eventType="touchUpInside" id="z4A-OA-GOO"/>
+                        </connections>
+                    </button>
+                </subviews>
+                <constraints>
+                    <constraint firstAttribute="bottom" secondItem="2lY-ne-Uzm" secondAttribute="bottom" constant="8" id="4uG-g4-RI4"/>
+                    <constraint firstItem="4Bt-EK-JDS" firstAttribute="width" relation="greaterThanOrEqual" secondItem="Wwh-3Z-z7F" secondAttribute="width" multiplier="0.5" id="6lL-rQ-mkF"/>
+                    <constraint firstItem="Wwh-3Z-z7F" firstAttribute="leading" secondItem="Ice-YN-Ffy" secondAttribute="leading" constant="8" id="782-mf-jUX"/>
+                    <constraint firstAttribute="trailing" secondItem="4YJ-sM-Eyq" secondAttribute="trailing" id="AKi-Nk-Ms8"/>
+                    <constraint firstItem="sMf-pD-nYN" firstAttribute="centerY" secondItem="Wwh-3Z-z7F" secondAttribute="centerY" id="CcL-nP-nGq"/>
+                    <constraint firstItem="lwC-Mg-bJ2" firstAttribute="leading" secondItem="bRv-hA-dFH" secondAttribute="trailing" constant="8" id="G1v-5M-3j6"/>
+                    <constraint firstItem="2lY-ne-Uzm" firstAttribute="leading" secondItem="aQf-3y-ZeE" secondAttribute="trailing" constant="8" id="Ibh-BF-E33"/>
+                    <constraint firstItem="bRv-hA-dFH" firstAttribute="centerY" secondItem="lwC-Mg-bJ2" secondAttribute="centerY" id="MZl-5M-vEN"/>
+                    <constraint firstItem="Wwh-3Z-z7F" firstAttribute="top" secondItem="Ice-YN-Ffy" secondAttribute="top" constant="8" id="OCq-8g-V8a"/>
+                    <constraint firstItem="2lY-ne-Uzm" firstAttribute="centerY" secondItem="lwC-Mg-bJ2" secondAttribute="centerY" id="QjH-Dg-ioK"/>
+                    <constraint firstItem="4YJ-sM-Eyq" firstAttribute="leading" secondItem="Ice-YN-Ffy" secondAttribute="leading" id="Qwu-hZ-j55"/>
+                    <constraint firstItem="aQf-3y-ZeE" firstAttribute="leading" secondItem="lwC-Mg-bJ2" secondAttribute="trailing" constant="8" id="RQP-g9-afW"/>
+                    <constraint firstItem="sMf-pD-nYN" firstAttribute="leading" secondItem="Wwh-3Z-z7F" secondAttribute="trailing" constant="8" id="T94-hg-JLi"/>
+                    <constraint firstItem="aQf-3y-ZeE" firstAttribute="centerY" secondItem="2lY-ne-Uzm" secondAttribute="centerY" id="WOc-OU-60a"/>
+                    <constraint firstAttribute="trailing" secondItem="na4-JH-zWr" secondAttribute="trailing" id="b6f-dP-HI4"/>
+                    <constraint firstItem="na4-JH-zWr" firstAttribute="top" secondItem="Ice-YN-Ffy" secondAttribute="top" id="cCI-wg-eqv"/>
+                    <constraint firstItem="4YJ-sM-Eyq" firstAttribute="top" secondItem="Ice-YN-Ffy" secondAttribute="top" id="ca3-mx-Lsd"/>
+                    <constraint firstAttribute="centerY" secondItem="4Bt-EK-JDS" secondAttribute="centerY" id="g9a-O2-NG3"/>
+                    <constraint firstAttribute="trailing" secondItem="sMf-pD-nYN" secondAttribute="trailing" constant="8" id="imD-jM-dTY"/>
+                    <constraint firstItem="4Bt-EK-JDS" firstAttribute="leading" secondItem="Ice-YN-Ffy" secondAttribute="leading" constant="8" id="lFI-Gm-IJE"/>
+                    <constraint firstAttribute="bottom" secondItem="4YJ-sM-Eyq" secondAttribute="bottom" id="mUK-bs-iv0"/>
+                    <constraint firstAttribute="trailing" secondItem="2lY-ne-Uzm" secondAttribute="trailing" constant="12" id="mzL-Jd-jiR"/>
+                </constraints>
+            </tableViewCellContentView>
+            <connections>
+                <outlet property="actionSegmentedControl" destination="4Bt-EK-JDS" id="rV5-NL-F4o"/>
+                <outlet property="addButton" destination="sMf-pD-nYN" id="kbu-pj-Phj"/>
+                <outlet property="highlightSwitch" destination="2lY-ne-Uzm" id="28l-f6-PBF"/>
+                <outlet property="inputTextField" destination="Wwh-3Z-z7F" id="xv5-7G-Pqj"/>
+                <outlet property="roomPicker" destination="4YJ-sM-Eyq" id="NKT-cO-AGo"/>
+                <outlet property="roomPickerDoneButton" destination="na4-JH-zWr" id="lCs-qp-Hdr"/>
+                <outlet property="soundSwitch" destination="lwC-Mg-bJ2" id="3aE-oH-UYx"/>
+            </connections>
+            <point key="canvasLocation" x="391" y="402"/>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/PushRule/MXKPushRuleTableViewCell.h b/Riot/Modules/MatrixKit/Views/PushRule/MXKPushRuleTableViewCell.h
new file mode 100644
index 000000000..b569cb7c3
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/PushRule/MXKPushRuleTableViewCell.h
@@ -0,0 +1,57 @@
+/*
+ Copyright 2015 OpenMarket 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 <MatrixSDK/MatrixSDK.h>
+
+#import "MXKTableViewCell.h"
+
+/**
+ MKPushRuleTableViewCell instance is a table view cell used to display a notification rule.
+ */
+@interface MXKPushRuleTableViewCell : MXKTableViewCell
+
+/**
+ The displayed rule
+ */
+@property (nonatomic) MXPushRule* mxPushRule;
+
+/**
+ The related matrix session
+ */
+@property (nonatomic) MXSession* mxSession;
+
+/**
+ The graphics items
+ */
+@property (strong, nonatomic) IBOutlet UIButton* controlButton;
+
+@property (strong, nonatomic) IBOutlet UIButton* deleteButton;
+@property (unsafe_unretained, nonatomic) IBOutlet NSLayoutConstraint *deleteButtonWidthConstraint;
+
+@property (strong, nonatomic) IBOutlet UILabel* ruleDescription;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *ruleDescriptionBottomConstraint;
+@property (unsafe_unretained, nonatomic) IBOutlet NSLayoutConstraint *ruleDescriptionLeftConstraint;
+
+
+@property (strong, nonatomic) IBOutlet UILabel* ruleActions;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *ruleActionsHeightConstraint;
+
+/**
+ Action registered on `UIControlEventTouchUpInside` event for both buttons.
+ */
+- (IBAction)onButtonPressed:(id)sender;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/PushRule/MXKPushRuleTableViewCell.m b/Riot/Modules/MatrixKit/Views/PushRule/MXKPushRuleTableViewCell.m
new file mode 100644
index 000000000..221c16c2c
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/PushRule/MXKPushRuleTableViewCell.m
@@ -0,0 +1,174 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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 "MXKPushRuleTableViewCell.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKSwiftHeader.h"
+
+@implementation MXKPushRuleTableViewCell
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    [_controlButton setImage:[NSBundle mxk_imageFromMXKAssetsBundleWithName:@"icon_pause"] forState:UIControlStateNormal];
+    [_controlButton setImage:[NSBundle mxk_imageFromMXKAssetsBundleWithName:@"icon_pause"] forState:UIControlStateHighlighted];
+    
+    [_deleteButton setImage:[NSBundle mxk_imageFromMXKAssetsBundleWithName:@"icon_minus"] forState:UIControlStateNormal];
+    [_deleteButton setImage:[NSBundle mxk_imageFromMXKAssetsBundleWithName:@"icon_minus"] forState:UIControlStateHighlighted];
+}
+
+- (void)customizeTableViewCellRendering
+{
+    [super customizeTableViewCellRendering];
+    
+    _controlButton.backgroundColor = [UIColor clearColor];
+    
+    _deleteButton.backgroundColor = [UIColor clearColor];
+    
+    _ruleDescription.numberOfLines = 0;
+}
+
+- (void)setMxPushRule:(MXPushRule *)mxPushRule
+{
+    // Set the right control icon
+    if (mxPushRule.enabled)
+    {
+        [_controlButton setImage:[NSBundle mxk_imageFromMXKAssetsBundleWithName:@"icon_pause"] forState:UIControlStateNormal];
+        [_controlButton setImage:[NSBundle mxk_imageFromMXKAssetsBundleWithName:@"icon_pause"] forState:UIControlStateHighlighted];
+    }
+    else
+    {
+        [_controlButton setImage:[NSBundle mxk_imageFromMXKAssetsBundleWithName:@"icon_play"] forState:UIControlStateNormal];
+        [_controlButton setImage:[NSBundle mxk_imageFromMXKAssetsBundleWithName:@"icon_play"] forState:UIControlStateHighlighted];
+    }
+    
+    // Prepare rule description (use rule id by default)
+    NSString *description = mxPushRule.ruleId;
+    
+    switch (mxPushRule.kind)
+    {
+        case MXPushRuleKindContent:
+            description = mxPushRule.pattern;
+            break;
+        case MXPushRuleKindRoom:
+        {
+            MXRoom *room = [_mxSession roomWithRoomId:mxPushRule.ruleId];
+            if (room)
+            {
+                description = [MatrixKitL10n notificationSettingsRoomRuleTitle:room.summary.displayname];
+            }
+            break;
+        }
+        default:
+            break;
+    }
+    
+    _ruleDescription.text = description;
+    
+    // Delete button and rule actions are hidden for predefined rules
+    if (mxPushRule.isDefault)
+    {
+        if (!_deleteButton.hidden)
+        {
+            _deleteButton.hidden = YES;
+            // Adjust layout by updating constraint
+            _ruleDescriptionLeftConstraint.constant -= _deleteButtonWidthConstraint.constant;
+        }
+        
+        if (!_ruleActions.isHidden)
+        {
+            _ruleActions.hidden = YES;
+            // Adjust layout by updating constraint
+            _ruleDescriptionBottomConstraint.constant -= _ruleActionsHeightConstraint.constant;
+        }
+    }
+    else
+    {
+        if (_deleteButton.hidden)
+        {
+            _deleteButton.hidden = NO;
+            // Adjust layout by updating constraint
+            _ruleDescriptionLeftConstraint.constant += _deleteButtonWidthConstraint.constant;
+        }
+        
+        // Prepare rule actions description
+        NSString *notify;
+        NSString *sound = @"";
+        NSString *highlight = @"";
+        for (MXPushRuleAction *ruleAction in mxPushRule.actions)
+        {
+            if (ruleAction.actionType == MXPushRuleActionTypeDontNotify)
+            {
+                notify = [MatrixKitL10n notificationSettingsNeverNotify];
+                sound = @"";
+                highlight = @"";
+                break;
+            }
+            else if (ruleAction.actionType == MXPushRuleActionTypeNotify || ruleAction.actionType == MXPushRuleActionTypeCoalesce)
+            {
+                notify = [MatrixKitL10n notificationSettingsAlwaysNotify];
+            }
+            else if (ruleAction.actionType == MXPushRuleActionTypeSetTweak)
+            {
+                if ([ruleAction.parameters[@"set_tweak"] isEqualToString:@"sound"])
+                {
+                    sound = [NSString stringWithFormat:@", %@", [MatrixKitL10n notificationSettingsCustomSound]];
+                }
+                else if ([ruleAction.parameters[@"set_tweak"] isEqualToString:@"highlight"])
+                {
+                    // Check the highlight tweak "value"
+                    // If not present, highlight. Else check its value before highlighting
+                    if (nil == ruleAction.parameters[@"value"] || YES == [ruleAction.parameters[@"value"] boolValue])
+                    {
+                        highlight = [NSString stringWithFormat:@", %@", [MatrixKitL10n notificationSettingsHighlight]];
+                    }
+                }
+            }
+        }
+        
+        if (notify.length)
+        {
+            _ruleActions.text = [NSString stringWithFormat:@"%@%@%@", notify, sound, highlight];
+        }
+        
+        if (_ruleActions.isHidden)
+        {
+            _ruleActions.hidden = NO;
+            // Adjust layout by updating constraint
+            _ruleDescriptionBottomConstraint.constant += _ruleActionsHeightConstraint.constant;
+        }
+    }
+    
+    _mxPushRule = mxPushRule;
+}
+
+- (IBAction)onButtonPressed:(id)sender
+{
+    if (sender == _controlButton)
+    {
+        // Swap enable state
+        [_mxSession.notificationCenter enableRule:_mxPushRule isEnabled:!_mxPushRule.enabled];
+    }
+    else if (sender == _deleteButton)
+    {
+        [_mxSession.notificationCenter removeRule:_mxPushRule];
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/PushRule/MXKPushRuleTableViewCell.xib b/Riot/Modules/MatrixKit/Views/PushRule/MXKPushRuleTableViewCell.xib
new file mode 100644
index 000000000..b78c75b9a
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/PushRule/MXKPushRuleTableViewCell.xib
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="odA-la-SwE" customClass="MXKPushRuleTableViewCell">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="50"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="odA-la-SwE" id="Ice-YN-Ffy">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="49"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iWG-aB-Kvb" userLabel="controlButton">
+                        <rect key="frame" x="5" y="10" width="30" height="30"/>
+                        <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="30" id="VuV-aZ-asl"/>
+                            <constraint firstAttribute="width" constant="30" id="ZYK-wP-XQL"/>
+                        </constraints>
+                        <connections>
+                            <action selector="onButtonPressed:" destination="odA-la-SwE" eventType="touchUpInside" id="vDk-Tj-qOK"/>
+                        </connections>
+                    </button>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rfi-Fa-7Uq" userLabel="ruleDescription">
+                        <rect key="frame" x="43" y="5" width="552" height="39"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="you-3G-2zC" userLabel="ruleActions">
+                        <rect key="frame" x="73" y="25" width="522" height="19"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="19" id="BuO-WH-nQ1"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="italicSystem" pointSize="12"/>
+                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Wyh-BC-Nxb" userLabel="deleteButton">
+                        <rect key="frame" x="35" y="10" width="30" height="30"/>
+                        <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="30" id="fKT-Ta-DCC"/>
+                            <constraint firstAttribute="height" constant="30" id="mpD-eM-ruI"/>
+                        </constraints>
+                        <state key="normal">
+                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </state>
+                        <connections>
+                            <action selector="onButtonPressed:" destination="odA-la-SwE" eventType="touchUpInside" id="Cm7-6b-yuZ"/>
+                        </connections>
+                    </button>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="iWG-aB-Kvb" firstAttribute="leading" secondItem="Ice-YN-Ffy" secondAttribute="leading" constant="5" id="0Zg-Ll-azQ"/>
+                    <constraint firstItem="you-3G-2zC" firstAttribute="leading" secondItem="Wyh-BC-Nxb" secondAttribute="trailing" constant="8" id="EZs-yR-hRf"/>
+                    <constraint firstItem="rfi-Fa-7Uq" firstAttribute="leading" secondItem="iWG-aB-Kvb" secondAttribute="trailing" constant="8" id="LNA-AM-aNX"/>
+                    <constraint firstItem="Wyh-BC-Nxb" firstAttribute="leading" secondItem="iWG-aB-Kvb" secondAttribute="trailing" id="LrI-UV-gDa"/>
+                    <constraint firstAttribute="centerY" secondItem="Wyh-BC-Nxb" secondAttribute="centerY" id="QB6-fg-4Gf"/>
+                    <constraint firstAttribute="trailing" secondItem="you-3G-2zC" secondAttribute="trailing" constant="5" id="QoB-AS-kZD"/>
+                    <constraint firstAttribute="bottom" secondItem="you-3G-2zC" secondAttribute="bottom" constant="5" id="Y2g-No-qFm"/>
+                    <constraint firstAttribute="centerY" secondItem="iWG-aB-Kvb" secondAttribute="centerY" id="eBs-sy-U6v"/>
+                    <constraint firstItem="rfi-Fa-7Uq" firstAttribute="top" secondItem="Ice-YN-Ffy" secondAttribute="top" constant="5" id="fAO-c4-ldm"/>
+                    <constraint firstAttribute="bottom" secondItem="rfi-Fa-7Uq" secondAttribute="bottom" constant="5" id="tTB-2B-aYK"/>
+                    <constraint firstAttribute="trailing" secondItem="rfi-Fa-7Uq" secondAttribute="trailing" constant="5" id="v0c-zI-8LX"/>
+                </constraints>
+            </tableViewCellContentView>
+            <connections>
+                <outlet property="controlButton" destination="iWG-aB-Kvb" id="WOl-F1-EyR"/>
+                <outlet property="deleteButton" destination="Wyh-BC-Nxb" id="7e8-Us-uiS"/>
+                <outlet property="deleteButtonWidthConstraint" destination="fKT-Ta-DCC" id="kMc-It-JbI"/>
+                <outlet property="ruleActions" destination="you-3G-2zC" id="1C0-Dy-1hO"/>
+                <outlet property="ruleActionsHeightConstraint" destination="BuO-WH-nQ1" id="AOJ-jc-L94"/>
+                <outlet property="ruleDescription" destination="rfi-Fa-7Uq" id="9uR-Bq-QFM"/>
+                <outlet property="ruleDescriptionBottomConstraint" destination="tTB-2B-aYK" id="BBj-Lf-Nz3"/>
+                <outlet property="ruleDescriptionLeftConstraint" destination="LNA-AM-aNX" id="rSS-9A-sVP"/>
+            </connections>
+            <point key="canvasLocation" x="213" y="415"/>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/ReadReceipts/MXKReadReceiptTableViewCell.h b/Riot/Modules/MatrixKit/Views/ReadReceipts/MXKReadReceiptTableViewCell.h
new file mode 100644
index 000000000..cc7c3708d
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/ReadReceipts/MXKReadReceiptTableViewCell.h
@@ -0,0 +1,29 @@
+/*
+ Copyright 2017 Aram Sargsyan
+ 
+ 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/UIKit.h>
+#import "MXKTableViewCell.h"
+
+@class MXKImageView;
+
+
+@interface MXKReadReceiptTableViewCell : MXKTableViewCell
+
+@property (weak, nonatomic) IBOutlet MXKImageView *avatarImageView;
+@property (weak, nonatomic) IBOutlet UILabel *displayNameLabel;
+@property (weak, nonatomic) IBOutlet UILabel *receiptDescriptionLabel;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/ReadReceipts/MXKReadReceiptTableViewCell.m b/Riot/Modules/MatrixKit/Views/ReadReceipts/MXKReadReceiptTableViewCell.m
new file mode 100644
index 000000000..56216a1ce
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/ReadReceipts/MXKReadReceiptTableViewCell.m
@@ -0,0 +1,44 @@
+/*
+ Copyright 2017 Aram Sargsyan
+ 
+ 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 "MXKReadReceiptTableViewCell.h"
+#import "MXKImageView.h"
+
+@implementation MXKReadReceiptTableViewCell
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    self.avatarImageView.enableInMemoryCache = YES;
+}
+
+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+    if (self.avatarImageView) {
+        //Make imageView round
+        self.avatarImageView.layer.cornerRadius = CGRectGetWidth(self.avatarImageView.frame)/2;
+        self.avatarImageView.clipsToBounds = YES;
+    }
+}
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated
+{
+    [super setSelected:selected animated:animated];
+    // Configure the view for the selected state
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/ReadReceipts/MXKReadReceiptTableViewCell.xib b/Riot/Modules/MatrixKit/Views/ReadReceipts/MXKReadReceiptTableViewCell.xib
new file mode 100644
index 000000000..f006664aa
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/ReadReceipts/MXKReadReceiptTableViewCell.xib
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="T3q-NP-L2Q" customClass="MXKReadReceiptTableViewCell">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="74"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="T3q-NP-L2Q" id="NZF-Mc-lUr">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="73.5"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Shf-ua-Pvi" userLabel="Avatar Image View" customClass="MXKImageView">
+                        <rect key="frame" x="13" y="15" width="42" height="42"/>
+                        <color key="backgroundColor" red="0.89720267060000003" green="0.89720267060000003" blue="0.89720267060000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <accessibility key="accessibilityConfiguration" identifier="MemberAvatar"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="42" id="Crv-MV-FXN"/>
+                            <constraint firstAttribute="width" constant="42" id="Zpq-4a-tJO"/>
+                        </constraints>
+                    </view>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Display name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="81S-Eu-hhs" userLabel="Display Name Label">
+                        <rect key="frame" x="69" y="14" width="105" height="21"/>
+                        <accessibility key="accessibilityConfiguration" identifier="MemberDisplayName"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="21" id="0nc-Ih-8ma"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" weight="medium" pointSize="17"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hYv-c6-BwP">
+                        <rect key="frame" x="69" y="39" width="523" height="20"/>
+                        <accessibility key="accessibilityConfiguration" identifier="ContactInformationLabel"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="20" id="Okh-b1-vgp"/>
+                        </constraints>
+                        <attributedString key="attributedText">
+                            <fragment content="Receipt description">
+                                <attributes>
+                                    <color key="NSColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                                    <font key="NSFont" size="15" name=".SFNSText"/>
+                                    <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                                </attributes>
+                            </fragment>
+                        </attributedString>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="81S-Eu-hhs" firstAttribute="top" secondItem="NZF-Mc-lUr" secondAttribute="top" constant="14" id="0FY-mW-Ezp"/>
+                    <constraint firstItem="hYv-c6-BwP" firstAttribute="leading" secondItem="Shf-ua-Pvi" secondAttribute="trailing" constant="14" id="DOK-TI-C9o"/>
+                    <constraint firstItem="Shf-ua-Pvi" firstAttribute="leading" secondItem="NZF-Mc-lUr" secondAttribute="leading" constant="13" id="KaH-46-6EX"/>
+                    <constraint firstItem="Shf-ua-Pvi" firstAttribute="top" secondItem="NZF-Mc-lUr" secondAttribute="top" constant="15" id="Oy7-id-PWO"/>
+                    <constraint firstItem="81S-Eu-hhs" firstAttribute="leading" secondItem="Shf-ua-Pvi" secondAttribute="trailing" constant="14" id="h7T-GG-Roz"/>
+                    <constraint firstItem="hYv-c6-BwP" firstAttribute="top" secondItem="81S-Eu-hhs" secondAttribute="bottom" constant="4" id="hx7-bN-rVo"/>
+                    <constraint firstAttribute="trailingMargin" secondItem="hYv-c6-BwP" secondAttribute="trailing" id="te4-DP-E42"/>
+                </constraints>
+            </tableViewCellContentView>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <accessibility key="accessibilityConfiguration" identifier="ContactTableViewCell"/>
+            <connections>
+                <outlet property="avatarImageView" destination="Shf-ua-Pvi" id="ISY-lV-obs"/>
+                <outlet property="displayNameLabel" destination="81S-Eu-hhs" id="cRn-w0-jFZ"/>
+                <outlet property="receiptDescriptionLabel" destination="hYv-c6-BwP" id="HSj-gj-jcQ"/>
+            </connections>
+            <point key="canvasLocation" x="109" y="125"/>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomBubbleTableViewCell.h b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomBubbleTableViewCell.h
new file mode 100644
index 000000000..60cad3248
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomBubbleTableViewCell.h
@@ -0,0 +1,328 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2018 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 "MXKTableViewCell.h"
+#import "MXKCellRendering.h"
+#import "MXKReceiptSendersContainer.h"
+
+#import <WebKit/WebKit.h>
+
+@class MXKImageView;
+@class MXKPieChartView;
+@class MXKRoomBubbleCellData;
+
+#pragma mark - MXKCellRenderingDelegate cell tap locations
+
+/**
+ Action identifier used when the user tapped on message text view.
+ 
+ The `userInfo` dictionary contains an `MXEvent` object under the `kMXKRoomBubbleCellEventKey` key, representing the tapped event.
+ */
+extern NSString *const kMXKRoomBubbleCellTapOnMessageTextView;
+
+/**
+ Action identifier used when the user tapped on user name label.
+ 
+ The `userInfo` dictionary contains an `NSString` object under the `kMXKRoomBubbleCellUserIdKey` key, representing the user id of the tapped name label.
+ */
+extern NSString *const kMXKRoomBubbleCellTapOnSenderNameLabel;
+
+/**
+ Action identifier used when the user tapped on avatar view.
+ 
+ The `userInfo` dictionary contains an `NSString` object under the `kMXKRoomBubbleCellUserIdKey` key, representing the user id of the tapped avatar.
+ */
+extern NSString *const kMXKRoomBubbleCellTapOnAvatarView;
+
+/**
+ Action identifier used when the user tapped on date/time container.
+ 
+ The `userInfo` is nil.
+ */
+extern NSString *const kMXKRoomBubbleCellTapOnDateTimeContainer;
+
+/**
+ Action identifier used when the user tapped on attachment view.
+ 
+ The `userInfo` is nil. The attachment can be retrieved via MXKRoomBubbleTableViewCell.attachmentView.
+ */
+extern NSString *const kMXKRoomBubbleCellTapOnAttachmentView;
+
+/**
+ Action identifier used when the user tapped on overlay container.
+ 
+ The `userInfo` is nil
+ */
+extern NSString *const kMXKRoomBubbleCellTapOnOverlayContainer;
+
+/**
+ Action identifier used when the user tapped on content view.
+ 
+ The `userInfo` dictionary may contain an `MXEvent` object under the `kMXKRoomBubbleCellEventKey` key, representing the event displayed at the level of the tapped line. This dictionary is empty if no event correspond to the tapped position.
+ */
+extern NSString *const kMXKRoomBubbleCellTapOnContentView;
+
+/**
+ Action identifier used when the user pressed unsent button displayed in front of an unsent event.
+ 
+ The `userInfo` dictionary contains an `MXEvent` object under the `kMXKRoomBubbleCellEventKey` key, representing the unsent event.
+ */
+extern NSString *const kMXKRoomBubbleCellUnsentButtonPressed;
+
+/**
+ Action identifier used when the user long pressed on a displayed event.
+ 
+ The `userInfo` dictionary contains an `MXEvent` object under the `kMXKRoomBubbleCellEventKey` key, representing the selected event.
+ */
+extern NSString *const kMXKRoomBubbleCellLongPressOnEvent;
+
+/**
+ Action identifier used when the user long pressed on progress view.
+ 
+ The `userInfo` is nil. The progress view can be retrieved via MXKRoomBubbleTableViewCell.progressView.
+ */
+extern NSString *const kMXKRoomBubbleCellLongPressOnProgressView;
+
+/**
+ Action identifier used when the user long pressed on avatar view.
+ 
+ The `userInfo` dictionary contains an `NSString` object under the `kMXKRoomBubbleCellUserIdKey` key, representing the user id of the concerned avatar.
+ */
+extern NSString *const kMXKRoomBubbleCellLongPressOnAvatarView;
+
+/**
+ Action identifier used when the user clicked on a link.
+
+ This action is sent via the MXKCellRenderingDelegate `shouldDoAction` operation.
+
+ The `userInfo` dictionary contains a `NSURL` object under the `kMXKRoomBubbleCellUrl` key, representing the url the user wants to open. And a NSNumber wrapping `UITextItemInteraction` raw value, representing the type of interaction expected with the URL, under the `kMXKRoomBubbleCellUrlItemInteraction` key.
+
+ The shouldDoAction implementation must return NO to prevent the system (safari) from opening the link.
+ 
+ @discussion: If the link refers to a room alias/id, a user id or an event id, the non-ASCII characters (like '#' in room alias) has been
+ escaped to be able to convert it into a legal URL string.
+ */
+extern NSString *const kMXKRoomBubbleCellShouldInteractWithURL;
+
+/**
+ Notifications `userInfo` keys
+ */
+extern NSString *const kMXKRoomBubbleCellUserIdKey;
+extern NSString *const kMXKRoomBubbleCellEventKey;
+extern NSString *const kMXKRoomBubbleCellEventIdKey;
+extern NSString *const kMXKRoomBubbleCellReceiptsContainerKey;
+extern NSString *const kMXKRoomBubbleCellUrl;
+extern NSString *const kMXKRoomBubbleCellUrlItemInteraction;
+
+#pragma mark - MXKRoomBubbleTableViewCell
+
+/**
+ `MXKRoomBubbleTableViewCell` is a base class for displaying a room bubble.
+ 
+ This class is used to handle a maximum of items which may be present in bubbles display (like the user's picture view, the message text view...).
+ To optimize bubbles rendering, we advise to define a .xib for each kind of bubble layout (with or without sender's information, with or without attachment...).
+ Each inherited class should define only the actual displayed items.
+ */
+@interface MXKRoomBubbleTableViewCell : MXKTableViewCell <MXKCellRendering, UITextViewDelegate, WKNavigationDelegate>
+{
+@protected
+    /**
+     The current bubble data displayed by the table view cell
+     */
+    MXKRoomBubbleCellData *bubbleData;
+}
+
+/**
+ The current bubble data displayed by the table view cell
+ */
+@property (strong, nonatomic, readonly) MXKRoomBubbleCellData *bubbleData;
+
+/**
+ Option to highlight or not the content of message text view (May be used in case of text selection).
+ NO by default.
+ */
+@property (nonatomic) BOOL allTextHighlighted;
+
+/**
+ Tell whether the animation should start automatically in case of animated gif (NO by default).
+ */
+@property (nonatomic) BOOL isAutoAnimatedGif;
+
+/**
+ The default picture displayed when no picture is available.
+ */
+@property (nonatomic) UIImage *picturePlaceholder;
+
+/**
+ The list of the temporary subviews that should be removed before reusing the cell (nil by default).
+ */
+@property (nonatomic) NSMutableArray<UIView*> *tmpSubviews;
+
+/**
+ The read receipts alignment.
+ By default, they are left aligned.
+ */
+@property (nonatomic) ReadReceiptsAlignment readReceiptsAlignment;
+
+@property (weak, nonatomic) IBOutlet UILabel *userNameLabel;
+@property (weak, nonatomic) IBOutlet UIView *userNameTapGestureMaskView;
+@property (strong, nonatomic) IBOutlet MXKImageView *pictureView;
+@property (weak, nonatomic) IBOutlet UITextView  *messageTextView;
+@property (strong, nonatomic) IBOutlet MXKImageView *attachmentView;
+@property (strong, nonatomic) IBOutlet UIImageView *playIconView;
+@property (strong, nonatomic) IBOutlet UIImageView *fileTypeIconView;
+@property (weak, nonatomic) IBOutlet UIView *bubbleInfoContainer;
+@property (weak, nonatomic) IBOutlet UIView *bubbleOverlayContainer;
+
+/**
+ The container view in which the encryption information may be displayed
+ */
+@property (weak, nonatomic) IBOutlet UIView *encryptionStatusContainerView;
+
+@property (weak, nonatomic) IBOutlet UIView *progressView;
+@property (weak, nonatomic) IBOutlet UILabel *statsLabel;
+@property (weak, nonatomic) IBOutlet MXKPieChartView *progressChartView;
+
+/**
+ The constraints which defines the relationship between messageTextView and its superview.
+ The defined constant are supposed >= 0.
+ */
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *msgTextViewTopConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *msgTextViewBottomConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *msgTextViewLeadingConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *msgTextViewTrailingConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *msgTextViewWidthConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *msgTextViewMinHeightConstraint;
+
+/**
+ The constraints which defines the relationship between attachmentView and its superview
+ The defined constant are supposed >= 0.
+ */
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *attachViewWidthConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *attachViewMinHeightConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *attachViewTopConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *attachViewBottomConstraint;
+
+/**
+ The constraints which defines the relationship between bubbleInfoContainer and its superview
+ The defined constant are supposed >= 0.
+ */
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *bubbleInfoContainerTopConstraint;
+
+/**
+ The read marker view and its layout constraints (nil by default).
+ */
+@property (nonatomic) UIView *readMarkerView;
+@property (nonatomic) NSLayoutConstraint *readMarkerViewTopConstraint;
+@property (nonatomic) NSLayoutConstraint *readMarkerViewLeadingConstraint;
+@property (nonatomic) NSLayoutConstraint *readMarkerViewTrailingConstraint;
+@property (nonatomic) NSLayoutConstraint *readMarkerViewHeightConstraint;
+
+/**
+ The potential webview used to render an attachment (for example an animated gif).
+ */
+@property (nonatomic) WKWebView *attachmentWebView;
+
+/**
+ Called during the designated initializer of the UITableViewCell class to set the default
+ properties values.
+ 
+ You should not call this method directly.
+ 
+ Subclasses can override this method as needed to customize the initialization.
+ */
+- (void)finalizeInit;
+
+/**
+ Handle progressView display.
+ */
+- (void)startProgressUI;
+- (void)updateProgressUI:(NSDictionary*)statisticsDict;
+
+#pragma mark - Original Xib values
+
+/**
+ Get an original instance of the `MXKRoomBubbleTableViewCell` child class.
+
+ @return an instance of the child class caller which has the original Xib values.
+ */
++ (MXKRoomBubbleTableViewCell*)cellWithOriginalXib;
+
+/**
+ Disable the handling of the long press on event (see kMXKRoomBubbleCellLongPressOnEvent). NO by default.
+ 
+ CAUTION: Changing this flag only impact the new created cells (existing 'MXKRoomBubbleTableViewCell' instances are unchanged).
+ */
++ (void)disableLongPressGestureOnEvent:(BOOL)disable;
+
+/**
+ Method used during [MXKCellRendering render:] to check the provided `cellData`
+ and prepare the protected `bubbleData`.
+ Do not override it.
+
+ @param cellData the data object to render.
+ */
+- (void)prepareRender:(MXKCellData*)cellData;
+
+/**
+ Refresh the flair information added to the sender display name.
+ */
+- (void)renderSenderFlair;
+
+/**
+ Highlight text message related to a specific event in the displayed message.
+ 
+ @param eventId the id of the event to highlight (use nil to cancel highlighting).
+ */
+- (void)highlightTextMessageForEvent:(NSString*)eventId;
+
+/**
+ The top position of an event in the cell.
+ 
+ A cell can display several events. The method returns the vertical position of a given
+ event in the cell.
+ 
+ @return the y position (in pixel) of the event in the cell.
+ */
+- (CGFloat)topPositionOfEvent:(NSString*)eventId;
+
+/**
+ The bottom position of an event in the cell.
+ 
+ A cell can display several events. The method returns the vertical position of the bottom part
+ of a given event in the cell.
+ 
+ @return the y position (in pixel) of the bottom part of the event in the cell.
+ */
+- (CGFloat)bottomPositionOfEvent:(NSString*)eventId;
+
+/**
+ Restore `attachViewBottomConstraint` constant to default value.
+ */
+- (void)resetAttachmentViewBottomConstraintConstant;
+
+/**
+ Redeclare heightForCellData:withMaximumWidth: method from MXKCellRendering to use it as a class method in Swift and not a static method.
+ */
++ (CGFloat)heightForCellData:(MXKCellData*)cellData withMaximumWidth:(CGFloat)maxWidth;
+
+/**
+ Setup outlets views. Useful to call when cell subclass does not use a xib otherwise this method is called automatically in `awakeFromNib`.
+ */
+- (void)setupViews;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomBubbleTableViewCell.m b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomBubbleTableViewCell.m
new file mode 100644
index 000000000..b550a1ef1
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomBubbleTableViewCell.m
@@ -0,0 +1,1563 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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 "MXKRoomBubbleTableViewCell.h"
+
+#import "MXKImageView.h"
+#import "MXKPieChartView.h"
+#import "MXKRoomBubbleCellData.h"
+#import "MXKTools.h"
+
+#import "MXKConstants.h"
+
+#import "NSBundle+MatrixKit.h"
+#import "MXRoom+Sync.h"
+#import "MXKMessageTextView.h"
+#import "UITextView+MatrixKit.h"
+
+#pragma mark - Constant definitions
+NSString *const kMXKRoomBubbleCellTapOnMessageTextView = @"kMXKRoomBubbleCellTapOnMessageTextView";
+NSString *const kMXKRoomBubbleCellTapOnSenderNameLabel = @"kMXKRoomBubbleCellTapOnSenderNameLabel";
+NSString *const kMXKRoomBubbleCellTapOnAvatarView = @"kMXKRoomBubbleCellTapOnAvatarView";
+NSString *const kMXKRoomBubbleCellTapOnDateTimeContainer = @"kMXKRoomBubbleCellTapOnDateTimeContainer";
+NSString *const kMXKRoomBubbleCellTapOnAttachmentView = @"kMXKRoomBubbleCellTapOnAttachmentView";
+NSString *const kMXKRoomBubbleCellTapOnOverlayContainer = @"kMXKRoomBubbleCellTapOnOverlayContainer";
+NSString *const kMXKRoomBubbleCellTapOnContentView = @"kMXKRoomBubbleCellTapOnContentView";
+
+NSString *const kMXKRoomBubbleCellUnsentButtonPressed = @"kMXKRoomBubbleCellUnsentButtonPressed";
+
+NSString *const kMXKRoomBubbleCellLongPressOnEvent = @"kMXKRoomBubbleCellLongPressOnEvent";
+NSString *const kMXKRoomBubbleCellLongPressOnProgressView = @"kMXKRoomBubbleCellLongPressOnProgressView";
+NSString *const kMXKRoomBubbleCellLongPressOnAvatarView = @"kMXKRoomBubbleCellLongPressOnAvatarView";
+NSString *const kMXKRoomBubbleCellShouldInteractWithURL = @"kMXKRoomBubbleCellShouldInteractWithURL";
+
+NSString *const kMXKRoomBubbleCellUserIdKey = @"kMXKRoomBubbleCellUserIdKey";
+NSString *const kMXKRoomBubbleCellEventKey = @"kMXKRoomBubbleCellEventKey";
+NSString *const kMXKRoomBubbleCellEventIdKey = @"kMXKRoomBubbleCellEventIdKey";
+NSString *const kMXKRoomBubbleCellReceiptsContainerKey = @"kMXKRoomBubbleCellReceiptsContainerKey";
+NSString *const kMXKRoomBubbleCellUrl = @"kMXKRoomBubbleCellUrl";
+NSString *const kMXKRoomBubbleCellUrlItemInteraction = @"kMXKRoomBubbleCellUrlItemInteraction";
+
+static BOOL _disableLongPressGestureOnEvent;
+
+@interface MXKRoomBubbleTableViewCell () <UIGestureRecognizerDelegate>
+{
+    // The list of UIViews used to fix the display of side borders for HTML blockquotes
+    NSMutableArray<UIView*> *htmlBlockquoteSideBorderViews;
+}
+
+@property (nonatomic, weak) UIView *messageTextBackgroundView;
+@property (nonatomic) double attachmentViewBottomConstraintDefaultConstant;
+
+@end
+
+@implementation MXKRoomBubbleTableViewCell
+@synthesize delegate, bubbleData, readReceiptsAlignment;
+@synthesize mxkCellData;
+
++ (instancetype)roomBubbleTableViewCell
+{
+    MXKRoomBubbleTableViewCell *instance = nil;
+    
+    // Check whether a xib is defined
+    if ([[self class] nib])
+    {
+        @try {
+            instance = [[[self class] nib] instantiateWithOwner:nil options:nil].firstObject;
+        }
+        @catch (NSException *exception) {
+        }
+    }
+    
+    if (!instance)
+    {
+        instance = [[self alloc] init];
+    }
+    
+    return instance;
+}
+
++ (void)disableLongPressGestureOnEvent:(BOOL)disable
+{
+    _disableLongPressGestureOnEvent = disable;
+}
+
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(nullable NSString *)reuseIdentifier
+{
+    self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
+    if (self)
+    {
+        [self finalizeInit];
+    }
+    return self;
+}
+- (nullable instancetype)initWithCoder:(NSCoder *)aDecoder
+{
+    self = [super initWithCoder:aDecoder];
+    if (self)
+    {
+        [self finalizeInit];
+    }
+    return self;
+}
+
+- (void)finalizeInit
+{
+    self.readReceiptsAlignment = ReadReceiptAlignmentLeft;
+    _allTextHighlighted = NO;
+    _isAutoAnimatedGif = NO;
+}
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    
+    [self setupViews];
+}
+
+- (void)setupViews
+{
+    if (self.userNameLabel)
+    {
+        // Listen to name tap
+        UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onSenderNameTap:)];
+        [tapGesture setNumberOfTouchesRequired:1];
+        [tapGesture setNumberOfTapsRequired:1];
+        [tapGesture setDelegate:self];
+        
+        if (self.userNameTapGestureMaskView)
+        {
+            [self.userNameTapGestureMaskView addGestureRecognizer:tapGesture];
+        }
+        else
+        {
+            [self.userNameLabel addGestureRecognizer:tapGesture];
+            self.userNameLabel.userInteractionEnabled = YES;
+        }
+    }
+    
+    if (self.pictureView)
+    {
+        self.pictureView.mediaFolder = kMXMediaManagerAvatarThumbnailFolder;
+        
+        // Listen to avatar tap
+        UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onAvatarTap:)];
+        [tapGesture setNumberOfTouchesRequired:1];
+        [tapGesture setNumberOfTapsRequired:1];
+        [tapGesture setDelegate:self];
+        [self.pictureView addGestureRecognizer:tapGesture];
+        self.pictureView.userInteractionEnabled = YES;
+        
+        // Add a long gesture recognizer on avatar (in order to display for example the member details)
+        UILongPressGestureRecognizer *longPress = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(onLongPressGesture:)];
+        [self.pictureView addGestureRecognizer:longPress];
+    }
+    
+    if (self.messageTextView)
+    {
+        // Listen to textView tap
+        UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onMessageTap:)];
+        [tapGesture setNumberOfTouchesRequired:1];
+        [tapGesture setNumberOfTapsRequired:1];
+        [tapGesture setDelegate:self];
+        [self.messageTextView addGestureRecognizer:tapGesture];
+        self.messageTextView.userInteractionEnabled = YES;
+
+        // Recognise and make tappable phone numbers, address, etc.
+        self.messageTextView.dataDetectorTypes = UIDataDetectorTypeAll;
+
+        // Listen to link click
+        self.messageTextView.delegate = self;
+        
+        if (_disableLongPressGestureOnEvent == NO)
+        {
+            // Add a long gesture recognizer on text view (in order to display for example the event details)
+            UILongPressGestureRecognizer *longPress = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(onLongPressGesture:)];
+            longPress.delegate = self;
+            
+            // MXKMessageTextView does not catch touches outside of links. Add a background view to handle long touch.
+            if ([self.messageTextView isKindOfClass:[MXKMessageTextView class]])
+            {
+                UIView *messageTextBackgroundView = [[UIView alloc] initWithFrame:self.messageTextView.frame];
+                messageTextBackgroundView.backgroundColor = [UIColor clearColor];
+                [self.contentView insertSubview:messageTextBackgroundView belowSubview:self.messageTextView];
+                messageTextBackgroundView.translatesAutoresizingMaskIntoConstraints = NO;
+                [messageTextBackgroundView.leftAnchor constraintEqualToAnchor:self.messageTextView.leftAnchor].active = YES;
+                [messageTextBackgroundView.rightAnchor constraintEqualToAnchor:self.messageTextView.rightAnchor].active = YES;
+                [messageTextBackgroundView.topAnchor constraintEqualToAnchor:self.messageTextView.topAnchor].active = YES;
+                [messageTextBackgroundView.bottomAnchor constraintEqualToAnchor:self.messageTextView.bottomAnchor].active = YES;
+                
+                [messageTextBackgroundView addGestureRecognizer:longPress];
+                
+                self.messageTextBackgroundView = messageTextBackgroundView;
+            }
+            else
+            {
+                [self.messageTextView addGestureRecognizer:longPress];
+            }
+        }
+    }
+    
+    if (self.playIconView)
+    {
+        self.playIconView.image = [NSBundle mxk_imageFromMXKAssetsBundleWithName:@"play"];
+    }
+    
+    if (self.bubbleOverlayContainer)
+    {
+        // Add tap recognizer on overlay container
+        UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onOverlayTap:)];
+        [tapGesture setNumberOfTouchesRequired:1];
+        [tapGesture setNumberOfTapsRequired:1];
+        [tapGesture setDelegate:self];
+        [self.bubbleOverlayContainer addGestureRecognizer:tapGesture];
+    }
+    
+    // Listen to content view tap by default
+    UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onContentViewTap:)];
+    [tapGesture setNumberOfTouchesRequired:1];
+    [tapGesture setNumberOfTapsRequired:1];
+    [tapGesture setDelegate:self];
+    [self.contentView addGestureRecognizer:tapGesture];
+    
+    if (_disableLongPressGestureOnEvent == NO)
+    {
+        // Add a long gesture recognizer on text view (in order to display for example the event details)
+        UILongPressGestureRecognizer *longPressGestureRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(onLongPressGesture:)];
+        longPressGestureRecognizer.delegate = self;
+        [self.contentView addGestureRecognizer:longPressGestureRecognizer];
+    }
+    
+    [self setupConstraintsConstantDefaultValues];
+}
+
+- (void)customizeTableViewCellRendering
+{
+    [super customizeTableViewCellRendering];
+    
+    // Clear the default background color of a MXKImageView instance
+    self.pictureView.defaultBackgroundColor = [UIColor clearColor];
+}
+
+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+    
+    if (self.pictureView)
+    {
+        // Round image view
+        [self.pictureView.layer setCornerRadius:self.pictureView.frame.size.width / 2];
+        self.pictureView.clipsToBounds = YES;
+    }
+}
+
+/**
+ Manually add a side border for HTML blockquotes.
+
+ @discussion
+ `NSAttributedString` and `UITextView` classes do not support it natively. This
+ method add an `UIView` to the `UITextView` that implements this border.
+
+ @param canRetry YES if the method can retry later if the UI is not yet ready.
+ */
+- (void)fixHTMLBlockQuoteRendering:(BOOL)canRetry
+{
+    if (self.messageTextView && htmlBlockquoteSideBorderViews.count == 0)
+    {
+        __weak typeof(self) weakSelf = self;
+        dispatch_async(dispatch_get_main_queue(), ^{
+
+            if (weakSelf)
+            {
+                typeof(self) self = weakSelf;
+                [MXKTools enumerateMarkedBlockquotesInAttributedString:self.messageTextView.attributedText
+                                                            usingBlock:^(NSRange range, BOOL *stop)
+                 {
+                     // Compute the UITextRange of the blockquote
+                     UITextPosition *beginning = self.messageTextView.beginningOfDocument;
+                     UITextPosition *start = [self.messageTextView positionFromPosition:beginning offset:range.location];
+                     UITextPosition *end = [self.messageTextView positionFromPosition:start offset:range.length];
+                     UITextRange *textRange = [self.messageTextView textRangeFromPosition:start toPosition:end];
+
+                     // Get the rect area of this blockquote within the cell
+                     // There can be several rects in case of multilines. Hence, the merge
+                     NSArray<UITextSelectionRect*> *array = [self.messageTextView selectionRectsForRange:textRange];
+                     CGRect textRect = CGRectNull;
+                     for (UITextSelectionRect *rect in array)
+                     {
+                         if (rect.rect.size.width)
+                         {
+                             textRect = CGRectUnion(textRect, rect.rect);
+                         }
+                     }
+
+                     if (!CGRectIsNull(textRect))
+                     {
+                         // Add a left border with a height that covers all the blockquote block height
+                         // TODO: Manage RTL language
+                         UIView *sideBorderView = [[UIView alloc] initWithFrame:CGRectMake(5, textRect.origin.y, 4, textRect.size.height)];
+                         sideBorderView.backgroundColor = self.bubbleData.eventFormatter.htmlBlockquoteBorderColor;
+                         [sideBorderView setTranslatesAutoresizingMaskIntoConstraints:NO];
+                         
+                         [self.messageTextView addSubview:sideBorderView];
+
+                         if (!self->htmlBlockquoteSideBorderViews)
+                         {
+                             self->htmlBlockquoteSideBorderViews = [NSMutableArray array];
+                         }
+
+                         [self->htmlBlockquoteSideBorderViews addObject:sideBorderView];
+                     }
+                     else if (canRetry)
+                     {
+                         // Have not found rect area that corresponds to the blockquote
+                         // Try again later when the UI is more ready. Try it only once
+                         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                             [self fixHTMLBlockQuoteRendering:NO];
+                         });
+                     }
+                 }];
+            }
+        });
+    }
+}
+
+- (void)dealloc
+{
+    // remove any pending observers
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    
+    delegate = nil;
+}
+
+- (UIImage*)picturePlaceholder
+{
+    return [NSBundle mxk_imageFromMXKAssetsBundleWithName:@"default-profile"];
+}
+
+- (void)setIsAutoAnimatedGif:(BOOL)isAutoAnimatedGif
+{
+    _isAutoAnimatedGif = isAutoAnimatedGif;
+    
+    [self renderGif];
+}
+
+- (void)setAllTextHighlighted:(BOOL)allTextHighlighted
+{
+    _allTextHighlighted = allTextHighlighted;
+    
+    if (self.messageTextView && bubbleData.textMessage.length != 0)
+    {
+        if (_allTextHighlighted)
+        {
+            NSMutableAttributedString *highlightedString = [[NSMutableAttributedString alloc] initWithAttributedString:bubbleData.attributedTextMessage];
+            UIColor *color = self.tintColor ? self.tintColor : [UIColor lightGrayColor];
+            [highlightedString addAttribute:NSBackgroundColorAttributeName value:color range:NSMakeRange(0, highlightedString.length)];
+            self.messageTextView.attributedText = highlightedString;
+        }
+        else
+        {
+            self.messageTextView.attributedText = bubbleData.attributedTextMessage;
+        }
+    }
+}
+
+- (void)highlightTextMessageForEvent:(NSString*)eventId
+{
+    if (self.messageTextView)
+    {
+        if (eventId.length)
+        {
+            self.messageTextView.attributedText = [bubbleData attributedTextMessageWithHighlightedEvent:eventId tintColor:self.tintColor];
+        }
+        else
+        {
+            // Restore original string
+            self.messageTextView.attributedText = bubbleData.attributedTextMessage;
+        }
+    }
+}
+
+- (CGFloat)topPositionOfEvent:(NSString*)eventId
+{
+    CGFloat topPositionOfEvent = 0;
+
+    // Retrieve the component that hosts the event
+    MXKRoomBubbleComponent *theComponent;
+    for (MXKRoomBubbleComponent *component in bubbleData.bubbleComponents)
+    {
+        if ([component.event.eventId isEqualToString:eventId])
+        {
+            theComponent = component;
+            break;
+        }
+    }
+
+    if (theComponent)
+    {
+        topPositionOfEvent = theComponent.position.y + self.msgTextViewTopConstraint.constant;
+    }
+    return topPositionOfEvent;
+}
+
+- (CGFloat)bottomPositionOfEvent:(NSString*)eventId
+{
+    CGFloat bottomPositionOfEvent = self.frame.size.height - self.msgTextViewBottomConstraint.constant;
+    
+    // Parse each component by the end of the array in order to compute the bottom position.
+    NSArray *bubbleComponents = bubbleData.bubbleComponents;
+    NSInteger index = bubbleComponents.count;
+    
+    while (index --)
+    {
+        MXKRoomBubbleComponent *component = bubbleComponents[index];
+        if ([component.event.eventId isEqualToString:eventId])
+        {
+            break;
+        }
+        else
+        {
+            // Update the bottom position
+            bottomPositionOfEvent = component.position.y + self.msgTextViewTopConstraint.constant;
+        }
+    }
+    return bottomPositionOfEvent;
+}
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated
+{
+    [super setSelected:selected animated:animated];
+    
+    // Configure the view for the selected state
+}
+
+- (void)render:(MXKCellData *)cellData
+{
+    [self prepareRender:cellData];
+    
+    if (bubbleData)
+    {
+        // Check conditions to display the message sender name
+        if (self.userNameLabel)
+        {
+            // Display sender's name except if the name appears in the displayed text (see emote and membership events)
+            if (bubbleData.shouldHideSenderName == NO)
+            {
+                if (bubbleData.senderFlair)
+                {
+                    [self renderSenderFlair];
+                }
+                else
+                {
+                    self.userNameLabel.text = bubbleData.senderDisplayName;
+                }
+                
+                
+                self.userNameLabel.hidden = NO;
+                self.userNameTapGestureMaskView.userInteractionEnabled = YES;
+            }
+            else
+            {
+                self.userNameLabel.hidden = YES;
+                self.userNameTapGestureMaskView.userInteractionEnabled = NO;
+            }
+        }
+        
+        // Check whether the sender's picture is actually displayed before loading it.
+        if (self.pictureView)
+        {
+            self.pictureView.enableInMemoryCache = YES;
+            // Consider here the sender avatar is stored unencrypted on Matrix media repo
+            [self.pictureView setImageURI:bubbleData.senderAvatarUrl
+                                 withType:nil
+                      andImageOrientation:UIImageOrientationUp
+                            toFitViewSize:self.pictureView.frame.size
+                               withMethod:MXThumbnailingMethodCrop
+                             previewImage:bubbleData.senderAvatarPlaceholder ? bubbleData.senderAvatarPlaceholder : self.picturePlaceholder
+                             mediaManager:bubbleData.mxSession.mediaManager];
+        }
+        
+        if (self.attachmentView && bubbleData.isAttachmentWithThumbnail)
+        {
+            // Set attached media folders
+            self.attachmentView.mediaFolder = bubbleData.roomId;
+            
+            self.attachmentView.backgroundColor = [UIColor clearColor];
+            
+            // Retrieve the suitable content size for the attachment thumbnail
+            CGSize contentSize = bubbleData.contentSize;
+            
+            // Update image view frame in order to center loading wheel (if any)
+            CGRect frame = self.attachmentView.frame;
+            frame.size.width = contentSize.width;
+            frame.size.height = contentSize.height;
+            self.attachmentView.frame = frame;
+            
+            // Set play icon visibility
+            self.playIconView.hidden = (bubbleData.attachment.type != MXKAttachmentTypeVideo);
+            
+            // Hide by default file type icon
+            self.fileTypeIconView.hidden = YES;
+            
+            // Display the attachment thumbnail
+            [self.attachmentView setAttachmentThumb:bubbleData.attachment];
+            
+            if (bubbleData.attachment.contentURL)
+            {
+                // Add tap recognizer to open attachment
+                UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onAttachmentTap:)];
+                [tap setNumberOfTouchesRequired:1];
+                [tap setNumberOfTapsRequired:1];
+                [tap setDelegate:self];
+                [self.attachmentView addGestureRecognizer:tap];
+            }
+            
+            [self startProgressUI];
+            
+            // Adjust Attachment width constant
+            self.attachViewWidthConstraint.constant = contentSize.width;
+            
+            // Add a long gesture recognizer on progressView to cancel the current operation (Note: only the download can be cancelled).
+            UILongPressGestureRecognizer *longPress = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(onLongPressGesture:)];
+            [self.progressView addGestureRecognizer:longPress];
+            
+            if (_disableLongPressGestureOnEvent == NO)
+            {
+                // Add a long gesture recognizer on attachment view in order to display for example the event details
+                longPress = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(onLongPressGesture:)];
+                [self.attachmentView addGestureRecognizer:longPress];
+            }
+            
+            // Handle here the case of the attached gif
+            [self renderGif];
+        }
+        else if (self.messageTextView)
+        {
+            // Compute message content size
+            bubbleData.maxTextViewWidth = self.frame.size.width - (self.msgTextViewLeadingConstraint.constant + self.msgTextViewTrailingConstraint.constant);
+            CGSize contentSize = bubbleData.contentSize;
+            
+            // Prepare displayed text message
+            NSAttributedString* newText = nil;
+            
+            // Underline attached file name
+            if (self.isBubbleDataContainsFileAttachment)
+            {
+                NSMutableAttributedString *updatedText = [[NSMutableAttributedString alloc] initWithAttributedString:bubbleData.attributedTextMessage];
+                [updatedText addAttribute:NSUnderlineStyleAttributeName value:[NSNumber numberWithInteger:NSUnderlineStyleSingle] range:NSMakeRange(0, updatedText.length)];
+                
+                newText = updatedText;
+            }
+            else
+            {
+                newText = bubbleData.attributedTextMessage;
+            }
+            
+            // update the text only if it is required
+            // updating a text is quite long (even with the same text).
+            if (![self.messageTextView.attributedText isEqualToAttributedString:newText])
+            {
+                self.messageTextView.attributedText = newText;
+
+                if (bubbleData.displayFix & MXKRoomBubbleComponentDisplayFixHtmlBlockquote)
+                {
+                    [self fixHTMLBlockQuoteRendering:YES];
+                }
+            }
+            
+            // Update msgTextView width constraint to align correctly the text
+            if (self.msgTextViewWidthConstraint.constant != contentSize.width)
+            {
+                self.msgTextViewWidthConstraint.constant = contentSize.width;
+            }
+        }
+        
+        // Check and update each component position (used to align timestamps label in front of events, and to handle tap gesture on events)
+        [bubbleData prepareBubbleComponentsPosition];
+        
+        // Handle here timestamp display (only if a container has been defined)
+        if (self.bubbleInfoContainer)
+        {
+            if ((bubbleData.showBubbleDateTime && !bubbleData.useCustomDateTimeLabel)
+                || (bubbleData.showBubbleReceipts && !bubbleData.useCustomReceipts))
+            {
+                // Add datetime label for each component
+                self.bubbleInfoContainer.hidden = NO;
+                
+                // ensure that older subviews are removed
+                // They should be (they are removed when the is not anymore used).
+                // But, it seems that is not always true.
+                NSArray* views = [self.bubbleInfoContainer subviews];
+                for(UIView* view in views)
+                {
+                    [view removeFromSuperview];
+                }
+                
+                for (MXKRoomBubbleComponent *component in bubbleData.bubbleComponents)
+                {
+                    if (component.event.sentState != MXEventSentStateFailed)
+                    {
+                        CGFloat timeLabelOffset = 0;
+                        
+                        if (component.date && bubbleData.showBubbleDateTime && !bubbleData.useCustomDateTimeLabel)
+                        {
+                            UILabel *dateTimeLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, component.position.y, self.bubbleInfoContainer.frame.size.width , 15)];
+                            
+                            dateTimeLabel.text = [bubbleData.eventFormatter dateStringFromDate:component.date withTime:YES];
+                            if (bubbleData.isIncoming)
+                            {
+                                dateTimeLabel.textAlignment = NSTextAlignmentRight;
+                            }
+                            else
+                            {
+                                dateTimeLabel.textAlignment = NSTextAlignmentLeft;
+                            }
+                            dateTimeLabel.textColor = [UIColor lightGrayColor];
+                            dateTimeLabel.font = [UIFont systemFontOfSize:11];
+                            dateTimeLabel.adjustsFontSizeToFitWidth = YES;
+                            dateTimeLabel.minimumScaleFactor = 0.6;
+                            
+                            [dateTimeLabel setTranslatesAutoresizingMaskIntoConstraints:NO];
+                            [self.bubbleInfoContainer addSubview:dateTimeLabel];
+                            // Force dateTimeLabel in full width (to handle auto-layout in case of screen rotation)
+                            NSLayoutConstraint *leftConstraint = [NSLayoutConstraint constraintWithItem:dateTimeLabel
+                                                                                              attribute:NSLayoutAttributeLeading
+                                                                                              relatedBy:NSLayoutRelationEqual
+                                                                                                 toItem:self.bubbleInfoContainer
+                                                                                              attribute:NSLayoutAttributeLeading
+                                                                                             multiplier:1.0
+                                                                                               constant:0];
+                            NSLayoutConstraint *rightConstraint = [NSLayoutConstraint constraintWithItem:dateTimeLabel
+                                                                                               attribute:NSLayoutAttributeTrailing
+                                                                                               relatedBy:NSLayoutRelationEqual
+                                                                                                  toItem:self.bubbleInfoContainer
+                                                                                               attribute:NSLayoutAttributeTrailing
+                                                                                              multiplier:1.0
+                                                                                                constant:0];
+                            // Vertical constraints are required for iOS > 8
+                            NSLayoutConstraint *topConstraint = [NSLayoutConstraint constraintWithItem:dateTimeLabel
+                                                                                             attribute:NSLayoutAttributeTop
+                                                                                             relatedBy:NSLayoutRelationEqual
+                                                                                                toItem:self.bubbleInfoContainer
+                                                                                             attribute:NSLayoutAttributeTop
+                                                                                            multiplier:1.0
+                                                                                              constant:component.position.y];
+                            NSLayoutConstraint *heightConstraint = [NSLayoutConstraint constraintWithItem:dateTimeLabel
+                                                                                                attribute:NSLayoutAttributeHeight
+                                                                                                relatedBy:NSLayoutRelationEqual
+                                                                                                   toItem:nil
+                                                                                                attribute:NSLayoutAttributeNotAnAttribute
+                                                                                               multiplier:1.0
+                                                                                                 constant:15];
+                            [NSLayoutConstraint activateConstraints:@[leftConstraint, rightConstraint, topConstraint, heightConstraint]];
+                            
+                            timeLabelOffset += 15;
+                        }
+                        
+                        if (bubbleData.showBubbleReceipts && !bubbleData.useCustomReceipts)
+                        {
+                            NSMutableArray* roomMembers = nil;
+                            NSMutableArray* placeholders = nil;
+                            NSArray<MXReceiptData*> *receipts = bubbleData.readReceipts[component.event.eventId];
+                            
+                            // Check whether some receipts are found
+                            if (receipts.count)
+                            {
+                                MXRoom* room = [bubbleData.mxSession roomWithRoomId:bubbleData.roomId];
+                                if (room)
+                                {
+                                    // Retrieve the corresponding room members
+                                    roomMembers = [[NSMutableArray alloc] initWithCapacity:receipts.count];
+                                    placeholders = [[NSMutableArray alloc] initWithCapacity:receipts.count];
+
+                                    MXRoomMembers *stateRoomMembers = room.dangerousSyncState.members;
+                                    for (MXReceiptData* data in receipts)
+                                    {
+                                        MXRoomMember * roomMember = [stateRoomMembers memberWithUserId:data.userId];
+                                        if (roomMember)
+                                        {
+                                            [roomMembers addObject:roomMember];
+                                            [placeholders addObject:self.picturePlaceholder];
+                                        }
+                                    }
+                                }
+                            }
+                            
+                            if (roomMembers.count)
+                            {
+                                MXKReceiptSendersContainer* avatarsContainer = [[MXKReceiptSendersContainer alloc] initWithFrame:CGRectMake(0, component.position.y + timeLabelOffset, self.bubbleInfoContainer.frame.size.width , 15) andMediaManager:bubbleData.mxSession.mediaManager];
+                                
+                                [avatarsContainer refreshReceiptSenders:roomMembers withPlaceHolders:placeholders andAlignment:self.readReceiptsAlignment];
+                                
+                                [self.bubbleInfoContainer addSubview:avatarsContainer];
+                                
+                                // Force dateTimeLabel in full width (to handle auto-layout in case of screen rotation)
+                                NSLayoutConstraint *leftConstraint = [NSLayoutConstraint constraintWithItem:avatarsContainer
+                                                                                                  attribute:NSLayoutAttributeLeading
+                                                                                                  relatedBy:NSLayoutRelationEqual
+                                                                                                     toItem:self.bubbleInfoContainer
+                                                                                                  attribute:NSLayoutAttributeLeading
+                                                                                                 multiplier:1.0
+                                                                                                   constant:0];
+                                NSLayoutConstraint *rightConstraint = [NSLayoutConstraint constraintWithItem:avatarsContainer
+                                                                                                   attribute:NSLayoutAttributeTrailing
+                                                                                                   relatedBy:NSLayoutRelationEqual
+                                                                                                      toItem:self.bubbleInfoContainer
+                                                                                                   attribute:NSLayoutAttributeTrailing
+                                                                                                  multiplier:1.0
+                                                                                                    constant:0];
+                                // Vertical constraints are required for iOS > 8
+                                NSLayoutConstraint *topConstraint = [NSLayoutConstraint constraintWithItem:avatarsContainer
+                                                                                                 attribute:NSLayoutAttributeTop
+                                                                                                 relatedBy:NSLayoutRelationEqual
+                                                                                                    toItem:self.bubbleInfoContainer
+                                                                                                 attribute:NSLayoutAttributeTop
+                                                                                                multiplier:1.0
+                                                                                                  constant:(component.position.y + timeLabelOffset)];
+                                
+                                NSLayoutConstraint *heightConstraint = [NSLayoutConstraint constraintWithItem:avatarsContainer
+                                                                                                    attribute:NSLayoutAttributeHeight
+                                                                                                    relatedBy:NSLayoutRelationEqual
+                                                                                                       toItem:nil
+                                                                                                    attribute:NSLayoutAttributeNotAnAttribute
+                                                                                                   multiplier:1.0
+                                                                                                     constant:15];
+                                
+                                [NSLayoutConstraint activateConstraints:@[leftConstraint, rightConstraint, topConstraint, heightConstraint]];
+                            }
+                        }
+                    }
+                }
+            }
+            else
+            {
+                self.bubbleInfoContainer.hidden = YES;
+            }
+        }
+    }
+}
+
+- (void)prepareRender:(MXKCellData *)cellData
+{
+    // Sanity check: accept only object of MXKRoomBubbleCellData classes or sub-classes
+    NSParameterAssert([cellData isKindOfClass:[MXKRoomBubbleCellData class]]);
+    
+    bubbleData = (MXKRoomBubbleCellData*)cellData;
+    mxkCellData = cellData;
+}
+
+- (void)renderSenderFlair
+{
+    NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@  ", bubbleData.senderDisplayName]];
+    
+    NSUInteger index = 0;
+    
+    for (MXGroup *group in bubbleData.senderFlair)
+    {
+        NSString *mxcAvatarURI = group.profile.avatarUrl;
+        NSString *cacheFilePath = [MXMediaManager thumbnailCachePathForMatrixContentURI:mxcAvatarURI andType:@"image/jpeg" inFolder:kMXMediaManagerDefaultCacheFolder toFitViewSize:CGSizeMake(12, 12) withMethod:MXThumbnailingMethodCrop];
+        
+        // Check whether the avatar url is valid
+        if (cacheFilePath)
+        {
+            UIImage *image = [MXMediaManager loadThroughCacheWithFilePath:cacheFilePath];
+            if (image)
+            {
+                NSTextAttachment *textAttachment = [[NSTextAttachment alloc] init];
+                textAttachment.image = [MXKTools resizeImageWithRoundedCorners:image toSize:CGSizeMake(12, 12)];
+                NSAttributedString *attrStringWithImage = [NSAttributedString attributedStringWithAttachment:textAttachment];
+                [attributedString appendAttributedString:attrStringWithImage];
+                [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:@" "]];
+            }
+            else
+            {
+                NSString *downloadId = [MXMediaManager thumbnailDownloadIdForMatrixContentURI:mxcAvatarURI
+                                                                                     inFolder:kMXMediaManagerDefaultCacheFolder
+                                                                                toFitViewSize:CGSizeMake(12, 12)
+                                                                                   withMethod:MXThumbnailingMethodCrop];
+                // Check whether the download is in progress.
+                MXMediaLoader* loader = [MXMediaManager existingDownloaderWithIdentifier:downloadId];
+                if (loader)
+                {
+                    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXMediaLoaderStateDidChangeNotification object:loader];
+                    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onFlairDownloadStateChange:) name:kMXMediaLoaderStateDidChangeNotification object:loader];
+                }
+                else
+                {
+                    MXWeakify(self);
+                    [bubbleData.mxSession.mediaManager downloadThumbnailFromMatrixContentURI:mxcAvatarURI
+                                                                                    withType:@"image/jpeg"
+                                                                                    inFolder:kMXMediaManagerDefaultCacheFolder
+                                                                               toFitViewSize:CGSizeMake(12, 12)
+                                                                                  withMethod:MXThumbnailingMethodCrop
+                                                                                     success:^(NSString *outputFilePath) {
+                                                                                         // Refresh sender flair
+                                                                                         MXStrongifyAndReturnIfNil(self);
+                                                                                         [self renderSenderFlair];
+                                                                                     }
+                                                                                     failure:nil];
+                }
+            }
+            
+            index++;
+            if (index == 3)
+            {
+                if (bubbleData.senderFlair.count > 3)
+                {
+                    NSAttributedString *more = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@"+%tu", (bubbleData.senderFlair.count - 3)] attributes:@{NSFontAttributeName: [UIFont systemFontOfSize:11.0], NSBaselineOffsetAttributeName:@(+2)}];
+                    [attributedString appendAttributedString:more];
+                }
+                break;
+            }
+        }
+    }
+    
+    self.userNameLabel.attributedText = attributedString;
+}
+
+- (void)renderGif
+{
+    if (self.attachmentView && bubbleData.attachment)
+    {
+        NSString *mimetype = nil;
+        if (bubbleData.attachment.thumbnailInfo)
+        {
+            mimetype = bubbleData.attachment.thumbnailInfo[@"mimetype"];
+        }
+        else if (bubbleData.attachment.contentInfo)
+        {
+            mimetype = bubbleData.attachment.contentInfo[@"mimetype"];
+        }
+        
+        if ([mimetype isEqualToString:@"image/gif"])
+        {
+            if (_isAutoAnimatedGif)
+            {
+                // Hide the file type icon, and the progress UI
+                self.fileTypeIconView.hidden = YES;
+                [self stopProgressUI];
+                [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXMediaLoaderStateDidChangeNotification object:nil];
+                
+                // Animated gif is displayed in a webview added on the attachment view
+                self.attachmentWebView = [[WKWebView alloc] initWithFrame:self.attachmentView.bounds];
+                self.attachmentWebView.opaque = NO;
+                self.attachmentWebView.backgroundColor = [UIColor clearColor];
+                self.attachmentWebView.contentMode = UIViewContentModeScaleAspectFit;
+                self.attachmentWebView.autoresizingMask = (UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin);
+                self.attachmentWebView.userInteractionEnabled = NO;
+                self.attachmentWebView.hidden = YES;
+                [self.attachmentView addSubview:self.attachmentWebView];
+                
+                __weak WKWebView *weakAnimatedGifViewer = self.attachmentWebView;
+                __weak typeof(self) weakSelf = self;
+                
+                void (^onDownloaded)(NSData *) = ^(NSData *data){
+                    
+                    if (weakAnimatedGifViewer && weakAnimatedGifViewer.superview)
+                    {
+                        WKWebView *strongAnimatedGifViewer = weakAnimatedGifViewer;
+                        strongAnimatedGifViewer.navigationDelegate = weakSelf;
+                        [strongAnimatedGifViewer loadData:data MIMEType:@"image/gif" characterEncodingName:@"UTF-8" baseURL:[NSURL URLWithString:@"http://"]];
+                    }
+                };
+                
+                void (^onFailure)(NSError *) = ^(NSError *error){
+                    
+                    MXLogDebug(@"[MXKRoomBubbleTableViewCell] gif download failed");
+                    // Notify the end user
+                    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error];
+                };
+                
+                [bubbleData.attachment getAttachmentData:^(NSData *data) {
+                    onDownloaded(data);
+                } failure:^(NSError *error) {
+                    onFailure(error);
+                }];
+            }
+            else
+            {
+                self.fileTypeIconView.image = [NSBundle mxk_imageFromMXKAssetsBundleWithName:@"filetype-gif"];
+                self.fileTypeIconView.hidden = NO;
+                
+                // Check whether a download is in progress
+                [self startProgressUI];
+            }
+        }
+    }
+}
+
++ (CGFloat)heightForCellData:(MXKCellData*)cellData withMaximumWidth:(CGFloat)maxWidth
+{
+    // Sanity check: accept only object of MXKRoomBubbleCellData classes or sub-classes
+    NSParameterAssert([cellData isKindOfClass:[MXKRoomBubbleCellData class]]);
+    
+    MXKRoomBubbleCellData *bubbleData = (MXKRoomBubbleCellData*)cellData;
+    MXKRoomBubbleTableViewCell* cell = [self cellWithOriginalXib];
+    CGFloat rowHeight = cell.frame.size.height;
+    
+    if (cell.attachmentView && bubbleData.isAttachmentWithThumbnail)
+    {
+        // retrieve the suggested image view height
+        rowHeight = bubbleData.contentSize.height;
+        
+        // Check here the minimum height defined in cell view for text message
+        if (cell.attachViewMinHeightConstraint && rowHeight < cell.attachViewMinHeightConstraint.constant)
+        {
+            rowHeight = cell.attachViewMinHeightConstraint.constant;
+        }
+        
+        // Finalize the row height by adding the vertical constraints.
+        rowHeight += cell.attachViewTopConstraint.constant + cell.attachViewBottomConstraint.constant;
+    }
+    else if (cell.messageTextView)
+    {
+        // Update maximum width available for the textview
+        bubbleData.maxTextViewWidth = maxWidth - (cell.msgTextViewLeadingConstraint.constant + cell.msgTextViewTrailingConstraint.constant);
+        
+        // Retrieve the suggested height of the message content
+        rowHeight = bubbleData.contentSize.height;
+        
+        // Consider here the minimum height defined in cell view for text message
+        if (cell.msgTextViewMinHeightConstraint && rowHeight < cell.msgTextViewMinHeightConstraint.constant)
+        {
+            rowHeight = cell.msgTextViewMinHeightConstraint.constant;
+        }
+        
+        // Finalize the row height by adding the top and bottom constraints of the message text view in cell
+        rowHeight += cell.msgTextViewTopConstraint.constant + cell.msgTextViewBottomConstraint.constant;
+    }
+    
+    return rowHeight;
+}
+
+- (void)prepareForReuse
+{
+    [super prepareForReuse];
+    
+    [self didEndDisplay];
+}
+
+- (void)didEndDisplay
+{
+    bubbleData = nil;
+
+    for (UIView *sideBorder in htmlBlockquoteSideBorderViews)
+    {
+        [sideBorder removeFromSuperview];
+    }
+    [htmlBlockquoteSideBorderViews removeAllObjects];
+    htmlBlockquoteSideBorderViews = nil;
+
+    if (_attachmentWebView)
+    {
+        [_attachmentWebView removeFromSuperview];
+        _attachmentWebView.navigationDelegate = nil;
+        _attachmentWebView = nil;
+    }
+    
+    if (_readMarkerView)
+    {
+        [_readMarkerView removeFromSuperview];
+        _readMarkerView = nil;
+        _readMarkerViewTopConstraint = nil;
+        _readMarkerViewLeadingConstraint = nil;
+        _readMarkerViewTrailingConstraint = nil;
+        _readMarkerViewHeightConstraint = nil;
+    }
+    
+    if (self.attachmentView)
+    {
+        // Remove all gesture recognizer
+        while (self.attachmentView.gestureRecognizers.count)
+        {
+            [self.attachmentView removeGestureRecognizer:self.attachmentView.gestureRecognizers[0]];
+        }
+        
+        // Prevent the cell from displaying again the image in case of reuse.
+        self.attachmentView.image = nil;
+    }
+    
+    // Remove potential dateTime (or unsent) label(s)
+    if (self.bubbleInfoContainer && self.bubbleInfoContainer.subviews.count > 0)
+    {
+        NSArray* subviews = self.bubbleInfoContainer.subviews;
+             
+        for (UIView *view in subviews)
+        {
+            [view removeFromSuperview];
+        }
+    }
+    self.bubbleInfoContainer.hidden = YES;
+    
+    // Remove temporary subviews
+    if (self.tmpSubviews)
+    {
+        for (UIView *view in self.tmpSubviews)
+        {
+            [view removeFromSuperview];
+        }
+        self.tmpSubviews = nil;
+    }
+    
+    // Remove potential overlay subviews
+    if (self.bubbleOverlayContainer)
+    {
+        NSArray* subviews = self.bubbleOverlayContainer.subviews;
+        
+        for (UIView *view in subviews)
+        {
+            [view removeFromSuperview];
+        }
+        
+        self.bubbleOverlayContainer.hidden = YES;
+    }
+    
+    if (self.progressView)
+    {
+        [self stopProgressUI];
+        
+        // Remove long tap gesture on the progressView
+        while (self.progressView.gestureRecognizers.count)
+        {
+            [self.progressView removeGestureRecognizer:self.progressView.gestureRecognizers[0]];
+        }
+    }
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    
+    delegate = nil;
+    
+    self.readReceiptsAlignment = ReadReceiptAlignmentLeft;
+    _allTextHighlighted = NO;
+    _isAutoAnimatedGif = NO;
+    
+    [self resetConstraintsConstantToDefault];
+}
+
+- (BOOL)shouldInteractWithURL:(NSURL *)URL urlItemInteraction:(UITextItemInteraction)urlItemInteraction associatedEvent:(MXEvent*)associatedEvent
+{
+    return [self shouldInteractWithURL:URL urlItemInteractionValue:@(urlItemInteraction) associatedEvent:associatedEvent];
+}
+
+- (BOOL)shouldInteractWithURL:(NSURL *)URL urlItemInteractionValue:(NSNumber*)urlItemInteractionValue associatedEvent:(MXEvent*)associatedEvent
+{    
+    NSMutableDictionary *userInfo = [@{
+                               kMXKRoomBubbleCellUrl:URL,
+                               kMXKRoomBubbleCellUrlItemInteraction:urlItemInteractionValue
+                               } mutableCopy];
+    
+    if (associatedEvent)
+    {
+        userInfo[kMXKRoomBubbleCellEventKey] = associatedEvent;
+    }
+    
+    return [delegate cell:self shouldDoAction:kMXKRoomBubbleCellShouldInteractWithURL userInfo:userInfo defaultValue:YES];
+}
+
+- (BOOL)isBubbleDataContainsFileAttachment
+{
+    return bubbleData.attachment
+    && (bubbleData.attachment.type == MXKAttachmentTypeFile || bubbleData.attachment.type == MXKAttachmentTypeAudio || bubbleData.attachment.type == MXKAttachmentTypeVoiceMessage)
+    && bubbleData.attachment.contentURL
+    && bubbleData.attachment.contentInfo;
+}
+
+- (MXKRoomBubbleComponent*)closestBubbleComponentForGestureRecognizer:(UIGestureRecognizer*)gestureRecognizer locationInView:(UIView*)view
+{
+    CGPoint tapPoint = [gestureRecognizer locationInView:view];
+    MXKRoomBubbleComponent *tappedComponent;
+    
+    if (tapPoint.y >= 0 && tapPoint.y <= view.frame.size.height)
+    {
+        tappedComponent = [self closestBubbleComponentAtPosition:tapPoint];
+    }
+    
+    return tappedComponent;
+}
+
+- (MXKRoomBubbleComponent*)closestBubbleComponentAtPosition:(CGPoint)position
+{
+    MXKRoomBubbleComponent *tappedComponent;
+    
+    NSArray *bubbleComponents = bubbleData.bubbleComponents;
+    
+    for (MXKRoomBubbleComponent *component in bubbleComponents)
+    {
+        // Ignore components without display (For example redacted event or state events)
+        if (!component.attributedTextMessage)
+        {
+            continue;
+        }
+        
+        if (component.position.y > position.y)
+        {
+            break;
+        }
+        
+        tappedComponent = component;
+    }
+    
+    return tappedComponent;
+}
+
+- (void)setupConstraintsConstantDefaultValues
+{
+    self.attachmentViewBottomConstraintDefaultConstant = self.attachViewBottomConstraint.constant;
+}
+
+- (void)resetAttachmentViewBottomConstraintConstant
+{
+    self.attachViewBottomConstraint.constant = self.attachmentViewBottomConstraintDefaultConstant;
+}
+
+- (void)resetConstraintsConstantToDefault
+{
+    [self resetAttachmentViewBottomConstraintConstant];
+}
+
+#pragma mark - Attachment progress handling
+
+- (void)updateProgressUI:(NSDictionary*)statisticsDict
+{
+    self.progressView.hidden = !statisticsDict;
+    
+    NSNumber* downloadRate = [statisticsDict valueForKey:kMXMediaLoaderCurrentDataRateKey];
+    
+    NSNumber* completedBytesCount = [statisticsDict valueForKey:kMXMediaLoaderCompletedBytesCountKey];
+    NSNumber* totalBytesCount = [statisticsDict valueForKey:kMXMediaLoaderTotalBytesCountKey];
+    
+    NSMutableString* text = [[NSMutableString alloc] init];
+    
+    if (completedBytesCount && totalBytesCount)
+    {
+        NSString* progressString = [NSString stringWithFormat:@"%@ / %@", [NSByteCountFormatter stringFromByteCount:completedBytesCount.longLongValue countStyle:NSByteCountFormatterCountStyleFile], [NSByteCountFormatter stringFromByteCount:totalBytesCount.longLongValue countStyle:NSByteCountFormatterCountStyleFile]];
+        
+        [text appendString:progressString];
+    }
+    
+    if (downloadRate && downloadRate.longLongValue)
+    {
+        [text appendFormat:@"\n%@/s", [NSByteCountFormatter stringFromByteCount:downloadRate.longLongValue countStyle:NSByteCountFormatterCountStyleFile]];
+        
+        if (completedBytesCount && totalBytesCount)
+        {
+            CGFloat remainimgTime = ((totalBytesCount.floatValue - completedBytesCount.floatValue)) / downloadRate.floatValue;
+            [text appendFormat:@"\n%@", [MXKTools formatSecondsInterval:remainimgTime]];
+        }
+    }
+    
+    self.statsLabel.text = text;
+    
+    NSNumber* progressNumber = [statisticsDict valueForKey:kMXMediaLoaderProgressValueKey];
+    
+    if (progressNumber)
+    {
+        self.progressChartView.progress = progressNumber.floatValue;
+    }
+}
+
+- (void)onAttachmentLoaderStateChange:(NSNotification *)notif
+{
+    MXMediaLoader *loader = (MXMediaLoader*)notif.object;
+    switch (loader.state) {
+        case MXMediaLoaderStateDownloadInProgress:
+            [self updateProgressUI:loader.statisticsDict];
+            break;
+        case MXMediaLoaderStateDownloadCompleted:
+        case MXMediaLoaderStateDownloadFailed:
+        case MXMediaLoaderStateCancelled:
+            [self stopProgressUI];
+            // remove the observer
+            [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXMediaLoaderStateDidChangeNotification object:loader];
+            break;
+        default:
+            break;
+    }
+}
+
+- (void)onFlairDownloadStateChange:(NSNotification *)notif
+{
+    MXMediaLoader *loader = (MXMediaLoader*)notif.object;
+    switch (loader.state) {
+        case MXMediaLoaderStateDownloadCompleted:
+            [self renderSenderFlair];
+            [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXMediaLoaderStateDidChangeNotification object:loader];
+            break;
+        case MXMediaLoaderStateDownloadFailed:
+        case MXMediaLoaderStateCancelled:
+            [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXMediaLoaderStateDidChangeNotification object:loader];
+            break;
+        default:
+            break;
+    }
+}
+
+- (void)startProgressUI
+{
+    self.progressView.hidden = YES;
+    
+    // there is an attachment URL
+    if (bubbleData.attachment.contentURL)
+    {
+        // remove any pending observers
+        [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXMediaLoaderStateDidChangeNotification object:nil];
+        
+        // check if there is a download in progress
+        MXMediaLoader *loader = [MXMediaManager existingDownloaderWithIdentifier:bubbleData.attachment.downloadId];
+        if (loader)
+        {
+            // defines the text to display
+            [self updateProgressUI:loader.statisticsDict];
+            
+            // anyway listen to the progress event
+            [[NSNotificationCenter defaultCenter] addObserver:self
+                                                     selector:@selector(onAttachmentLoaderStateChange:)
+                                                         name:kMXMediaLoaderStateDidChangeNotification
+                                                       object:loader];
+        }
+    }
+}
+
+- (void)stopProgressUI
+{
+    self.progressView.hidden = YES;
+    
+    // do not remove the observer here
+    // the download could restart without recomposing the cell
+}
+
+#pragma mark - Original Xib values
+
+/**
+ `childClasses` hosts one instance of each child classes of `MXKRoomBubbleTableViewCell`.
+ The key is the child class name. The value, the instance.
+ */
+static NSMutableDictionary *childClasses;
+
++ (MXKRoomBubbleTableViewCell*)cellWithOriginalXib
+{
+    MXKRoomBubbleTableViewCell *cellWithOriginalXib;
+    
+    @synchronized(self)
+    {
+        if (childClasses == nil)
+        {
+            childClasses = [NSMutableDictionary dictionary];
+        }
+        
+        // To save memory, use only one original instance per child class
+        cellWithOriginalXib = childClasses[NSStringFromClass(self.class)];
+        if (nil == cellWithOriginalXib)
+        {
+            cellWithOriginalXib = [self roomBubbleTableViewCell];
+            
+            childClasses[NSStringFromClass(self.class)] = cellWithOriginalXib;
+        }
+    }
+    return cellWithOriginalXib;
+}
+
+#pragma mark - User actions
+
+- (IBAction)onMessageTap:(UITapGestureRecognizer*)sender
+{
+    if (delegate)
+    {
+        // Check whether the current displayed text corresponds to an attached file
+        // NOTE: This assumes that a cell with attachment has only one `MXKRoomBubbleComponent`
+        if (self.isBubbleDataContainsFileAttachment)
+        {
+            [delegate cell:self didRecognizeAction:kMXKRoomBubbleCellTapOnAttachmentView userInfo:nil];
+        }
+        else
+        {
+            NSURL *tappedUrl;
+            
+            // Hyperlinks in UITextView does not respond instantly to touch.
+            // To overcome this, check manually if a link has been touched in UITextView when performing a quick tap.
+            // Otherwise UITextViewDelegate method `- (BOOL)textView:shouldInteractWithURL:inRange:interaction:` is still called for long press and force touch.
+            if ([sender.view isEqual:self.messageTextView])
+            {
+                UITextView *textView = self.messageTextView;
+                CGPoint tapLocation = [sender locationInView:textView];
+                UITextPosition *textPosition = [textView closestPositionToPoint:tapLocation];
+                NSDictionary *attributes = [textView textStylingAtPosition:textPosition inDirection:UITextStorageDirectionForward];
+                
+                // The value of `NSLinkAttributeName` attribute could be an NSURL or an NSString object.
+                id tappedURLObject = attributes[NSLinkAttributeName];
+                
+                if (tappedURLObject)
+                {
+                    if ([tappedURLObject isKindOfClass:[NSURL class]])
+                    {
+                        tappedUrl = (NSURL*)tappedURLObject;
+                    }
+                    else if ([tappedURLObject isKindOfClass:[NSString class]])
+                    {
+                        tappedUrl = [NSURL URLWithString:(NSString*)tappedURLObject];
+                    }
+                }
+            }
+            
+            MXKRoomBubbleComponent *tappedComponent = [self closestBubbleComponentForGestureRecognizer:sender locationInView:sender.view];
+            MXEvent *tappedEvent = tappedComponent.event;
+            
+            // If a link has been touched warn delegate immediately.
+            if (tappedUrl)
+            {
+                [self shouldInteractWithURL:tappedUrl urlItemInteraction:UITextItemInteractionInvokeDefaultAction associatedEvent:tappedEvent];
+            }
+            else
+            {
+                [delegate cell:self didRecognizeAction:kMXKRoomBubbleCellTapOnMessageTextView userInfo:(tappedEvent ? @{kMXKRoomBubbleCellEventKey:tappedEvent} : nil)];
+            }
+        }
+    }
+}
+
+- (IBAction)onSenderNameTap:(UITapGestureRecognizer*)sender
+{
+    if (delegate)
+    {
+        [delegate cell:self didRecognizeAction:kMXKRoomBubbleCellTapOnSenderNameLabel userInfo:@{kMXKRoomBubbleCellUserIdKey: bubbleData.senderId}];
+    }
+}
+
+- (IBAction)onAvatarTap:(UITapGestureRecognizer*)sender
+{
+    if (delegate)
+    {
+        [delegate cell:self didRecognizeAction:kMXKRoomBubbleCellTapOnAvatarView userInfo:@{kMXKRoomBubbleCellUserIdKey: bubbleData.senderId}];
+    }
+}
+
+- (IBAction)onAttachmentTap:(UITapGestureRecognizer*)sender
+{
+    if (delegate)
+    {
+        [delegate cell:self didRecognizeAction:kMXKRoomBubbleCellTapOnAttachmentView userInfo:nil];
+    }
+}
+
+- (IBAction)showHideDateTime:(id)sender
+{
+    if (delegate)
+    {
+        [delegate cell:self didRecognizeAction:kMXKRoomBubbleCellTapOnDateTimeContainer userInfo:nil];
+    }
+}
+
+- (IBAction)onOverlayTap:(UITapGestureRecognizer*)sender
+{
+    if (delegate)
+    {
+        [delegate cell:self didRecognizeAction:kMXKRoomBubbleCellTapOnOverlayContainer userInfo:nil];
+    }
+}
+
+- (IBAction)onContentViewTap:(UITapGestureRecognizer*)sender
+{
+    if (delegate)
+    {
+        // Check whether a bubble component is displayed at the level of the tapped line.
+        MXKRoomBubbleComponent *tappedComponent = nil;
+        
+        if (self.attachmentView)
+        {
+            // Check whether the user tapped on the side of the attachment.
+            tappedComponent = [self closestBubbleComponentForGestureRecognizer:sender locationInView:self.attachmentView];
+        }
+        else if (self.messageTextView)
+        {
+            // NOTE: A tap on messageTextView using `MXKMessageTextView` class fallback here if the user does not tap on a link.
+            
+            // Use the same hack as `onMessageTap:`, check whether the current displayed text corresponds to an attached file
+            // NOTE: This assumes that a cell with attachment has only one `MXKRoomBubbleComponent`
+            if (self.isBubbleDataContainsFileAttachment)
+            {
+                // This assume that an attachment use one cell in the application using MatrixKit
+                // This condition is a fix to handle
+                [delegate cell:self didRecognizeAction:kMXKRoomBubbleCellTapOnAttachmentView userInfo:nil];
+            }
+            else
+            {
+                // Check whether the user tapped in front of a text component.
+                tappedComponent = [self closestBubbleComponentForGestureRecognizer:sender locationInView:self.messageTextView];
+            }
+        }
+        else
+        {
+            tappedComponent = [self.bubbleData getFirstBubbleComponentWithDisplay];
+        }
+        
+        [delegate cell:self didRecognizeAction:kMXKRoomBubbleCellTapOnContentView userInfo:(tappedComponent ? @{kMXKRoomBubbleCellEventKey:tappedComponent.event} : nil)];
+    }
+}
+
+- (IBAction)onLongPressGesture:(UILongPressGestureRecognizer*)longPressGestureRecognizer
+{
+    if (longPressGestureRecognizer.state == UIGestureRecognizerStateBegan && delegate)
+    {
+        UIView* view = longPressGestureRecognizer.view;
+        
+        // Check the view on which long press has been detected
+        if (view == self.progressView)
+        {
+            [delegate cell:self didRecognizeAction:kMXKRoomBubbleCellLongPressOnProgressView userInfo:nil];
+        }
+        else if (view == self.messageTextView || view == self.messageTextBackgroundView || view == self.attachmentView)
+        {
+            MXKRoomBubbleComponent *tappedComponent = [self closestBubbleComponentForGestureRecognizer:longPressGestureRecognizer locationInView:view];
+            MXEvent *selectedEvent = tappedComponent.event;
+            
+            if (selectedEvent)
+            {
+                [delegate cell:self didRecognizeAction:kMXKRoomBubbleCellLongPressOnEvent userInfo:@{kMXKRoomBubbleCellEventKey:selectedEvent}];
+            }
+        }
+        else if (view == self.pictureView)
+        {
+            [delegate cell:self didRecognizeAction:kMXKRoomBubbleCellLongPressOnAvatarView userInfo:@{kMXKRoomBubbleCellUserIdKey: bubbleData.senderId}];
+        }
+        else if (view == self.contentView)
+        {
+            // Check whether a bubble component is displayed at the level of the tapped line.
+            MXKRoomBubbleComponent *tappedComponent = nil;
+            
+            if (self.attachmentView)
+            {
+                // Check whether the user tapped on the side of the attachment.
+                tappedComponent = [self closestBubbleComponentForGestureRecognizer:longPressGestureRecognizer locationInView:self.attachmentView];
+            }
+            else if (self.messageTextView)
+            {
+                // Check whether the user tapped in front of a text component.
+                tappedComponent = [self closestBubbleComponentForGestureRecognizer:longPressGestureRecognizer locationInView:self.messageTextView];
+            }
+            else
+            {
+                tappedComponent = [self.bubbleData getFirstBubbleComponentWithDisplay];
+            }
+            
+            [delegate cell:self didRecognizeAction:kMXKRoomBubbleCellLongPressOnEvent userInfo:(tappedComponent ? @{kMXKRoomBubbleCellEventKey:tappedComponent.event} : nil)];
+        }
+    }
+}
+
+#pragma mark - UITextView delegate
+
+- (BOOL)textView:(UITextView *)textView shouldInteractWithURL:(NSURL *)URL inRange:(NSRange)characterRange interaction:(UITextItemInteraction)interaction
+{
+    BOOL shouldInteractWithURL = YES;
+    
+    if (delegate && URL)
+    {
+        MXEvent *associatedEvent;
+        
+        if ([textView isMemberOfClass:[MXKMessageTextView class]])
+        {
+            MXKMessageTextView *mxkMessageTextView = (MXKMessageTextView *)textView;
+            MXKRoomBubbleComponent *bubbleComponent = [self closestBubbleComponentAtPosition:mxkMessageTextView.lastHitTestLocation];
+            associatedEvent = bubbleComponent.event;
+        }
+        
+        // Ask the delegate if iOS can open the link
+        shouldInteractWithURL = [self shouldInteractWithURL:URL urlItemInteraction:interaction associatedEvent:associatedEvent];
+    }
+    
+    return shouldInteractWithURL;
+}
+
+// Delegate method only called on iOS 9. iOS 10+ use method above.
+- (BOOL)textView:(UITextView *)textView shouldInteractWithURL:(NSURL *)URL inRange:(NSRange)characterRange
+{
+    BOOL shouldInteractWithURL = YES;
+    
+    if (delegate && URL)
+    {
+        MXEvent *associatedEvent;
+        
+        if ([textView isMemberOfClass:[MXKMessageTextView class]])
+        {
+            MXKMessageTextView *mxkMessageTextView = (MXKMessageTextView *)textView;
+            MXKRoomBubbleComponent *bubbleComponent = [self closestBubbleComponentAtPosition:mxkMessageTextView.lastHitTestLocation];
+            associatedEvent = bubbleComponent.event;
+        }
+        
+        // Ask the delegate if iOS can open the link
+        shouldInteractWithURL = [self shouldInteractWithURL:URL urlItemInteractionValue:@(0) associatedEvent:associatedEvent];
+    }
+    
+    return shouldInteractWithURL;
+}
+
+#pragma mark - WKNavigationDelegate
+
+- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation
+{
+    if (webView == _attachmentWebView && self.attachmentView)
+    {
+        // The attachment webview is ready to replace the attachment view.
+        _attachmentWebView.hidden = NO;
+        self.attachmentView.image = nil;
+    }
+}
+
+#pragma mark - UIGestureRecognizerDelegate
+
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch
+{
+    UIView *recognizerView = gestureRecognizer.view;
+    
+    if ([recognizerView isDescendantOfView:self.contentView])
+    {
+        UIView *touchedView = touch.view;
+        
+        if ([touchedView isKindOfClass:[UIButton class]])
+        {
+            return NO;
+        }
+        
+        // Prevent gesture recognizer to be recognized by a custom view added to the cell contentView and with user interaction enabled
+        for (UIView *tmpSubview in self.tmpSubviews)
+        {
+            if (tmpSubview.isUserInteractionEnabled && [tmpSubview isDescendantOfView:self.contentView])
+            {
+                CGPoint touchedPoint = [touch locationInView:tmpSubview];
+                
+                if (CGRectContainsPoint(tmpSubview.bounds, touchedPoint))
+                {
+                    return NO;
+                }
+            }
+        }
+        
+        // Prevent gesture recognizer to be recognized when user hits a link in a UITextView, let UITextViewDelegate handle links.
+        if ([touchedView isKindOfClass:[UITextView class]])
+        {
+            UITextView *textView = (UITextView*)touchedView;
+            CGPoint touchLocation = [touch locationInView:textView];
+            
+            return [textView isThereALinkNearPoint:touchLocation] == NO;
+        }
+    }
+    
+    return YES;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomEmptyBubbleTableViewCell.h b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomEmptyBubbleTableViewCell.h
new file mode 100644
index 000000000..72a541cba
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomEmptyBubbleTableViewCell.h
@@ -0,0 +1,25 @@
+/*
+ Copyright 2017 Vector Creations 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 "MXKRoomBubbleTableViewCell.h"
+
+/**
+ `MXKRoomEmptyBubbleTableViewCell` displays an empty bubbles without user's information.
+ This kind of bubble may be used to localize an event without display in the room history.
+ */
+@interface MXKRoomEmptyBubbleTableViewCell : MXKRoomBubbleTableViewCell
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomEmptyBubbleTableViewCell.m b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomEmptyBubbleTableViewCell.m
new file mode 100644
index 000000000..54ce13bc6
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomEmptyBubbleTableViewCell.m
@@ -0,0 +1,21 @@
+/*
+ Copyright 2017 Vector Creations 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 "MXKRoomEmptyBubbleTableViewCell.h"
+
+@implementation MXKRoomEmptyBubbleTableViewCell
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomEmptyBubbleTableViewCell.xib b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomEmptyBubbleTableViewCell.xib
new file mode 100644
index 000000000..bfcfca2e5
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomEmptyBubbleTableViewCell.xib
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="pad-g3-2YJ" customClass="MXKRoomEmptyBubbleTableViewCell">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="8"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="pad-g3-2YJ" id="fCg-ju-gnG">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="7"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+            </tableViewCellContentView>
+            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIOSBubbleTableViewCell.h b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIOSBubbleTableViewCell.h
new file mode 100644
index 000000000..6f558f091
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIOSBubbleTableViewCell.h
@@ -0,0 +1,26 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCell.h"
+
+#import "MXKCellRendering.h"
+
+/**
+ `MXKRoomIOSBubbleTableViewCell` instances mimic bubbles in the stock iOS messages application.
+ */
+@interface MXKRoomIOSBubbleTableViewCell : MXKTableViewCell <MXKCellRendering>
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIOSBubbleTableViewCell.m b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIOSBubbleTableViewCell.m
new file mode 100644
index 000000000..7766a3294
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIOSBubbleTableViewCell.m
@@ -0,0 +1,45 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomIOSBubbleTableViewCell.h"
+
+#import "MXKRoomBubbleCellDataStoring.h"
+
+@implementation MXKRoomIOSBubbleTableViewCell
+
+- (void)render:(MXKCellData *)cellData
+{
+    id<MXKRoomBubbleCellDataStoring> bubbleData = (id<MXKRoomBubbleCellDataStoring>)cellData;
+    if (bubbleData)
+    {
+        self.textLabel.attributedText = bubbleData.attributedTextMessage;
+    }
+    else
+    {
+        self.textLabel.text = @"";
+    }
+    
+    // Light custo for now... @TODO
+    self.layer.cornerRadius = 20;
+    self.backgroundColor = [UIColor blueColor];
+}
+
++ (CGFloat)heightForCellData:(MXKCellData *)cellData withMaximumWidth:(CGFloat)maxWidth
+{
+    return 44;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIOSOutgoingBubbleTableViewCell.h b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIOSOutgoingBubbleTableViewCell.h
new file mode 100644
index 000000000..49d42ba45
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIOSOutgoingBubbleTableViewCell.h
@@ -0,0 +1,36 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomOutgoingBubbleTableViewCell.h"
+
+/**
+ `MXKRoomIOSBubbleTableViewCell` instances mimic bubbles in the stock iOS messages application.
+ It is dedicated to outgoing messages.
+ It subclasses `MXKRoomOutgoingBubbleTableViewCell` to take benefit of the available mechanic.
+ */
+@interface MXKRoomIOSOutgoingBubbleTableViewCell : MXKRoomOutgoingBubbleTableViewCell
+
+/**
+ The green bubble displayed in background.
+ */
+@property (weak, nonatomic) IBOutlet UIImageView *bubbleImageView;
+
+/**
+ The width constraint on this backgroung green bubble.
+ */
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *bubbleImageViewWidthConstraint;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIOSOutgoingBubbleTableViewCell.m b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIOSOutgoingBubbleTableViewCell.m
new file mode 100644
index 000000000..cb45c7426
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIOSOutgoingBubbleTableViewCell.m
@@ -0,0 +1,130 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomIOSOutgoingBubbleTableViewCell.h"
+
+#import "MXKRoomBubbleCellData.h"
+
+#import "MXEvent+MatrixKit.h"
+#import "MXKTools.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKImageView.h"
+
+#define OUTGOING_BUBBLE_COLOR 0x00e34d
+
+@implementation MXKRoomIOSOutgoingBubbleTableViewCell
+
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
+{
+    self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
+    if (self)
+    {
+        // Create the strechable background bubble
+        self.bubbleImageView.image = self.class.bubbleImage;
+    }
+    
+    return self;
+}
+
+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+}
+
+- (void)render:(MXKCellData *)cellData
+{
+    [super render:cellData];
+    
+    // Reset values
+    self.bubbleImageView.hidden = NO;
+    
+    // Customise the data precomputed by the legacy classes
+    // Replace black color in texts by the white color expected for outgoing messages.
+    NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithAttributedString:self.messageTextView.attributedText];
+    
+    // Change all attributes one by one
+    [attributedString enumerateAttributesInRange:NSMakeRange(0, attributedString.length) options:0 usingBlock:^(NSDictionary *attrs, NSRange range, BOOL *stop)
+    {
+        
+        // Replace only black colored texts
+        if (attrs[NSForegroundColorAttributeName] == self->bubbleData.eventFormatter.defaultTextColor)
+        {
+            
+            // By white
+            NSMutableDictionary *newAttrs = [NSMutableDictionary dictionaryWithDictionary:attrs];
+            newAttrs[NSForegroundColorAttributeName] = [UIColor whiteColor];
+            
+            [attributedString setAttributes:newAttrs range:range];
+        }
+    }];
+    
+    self.messageTextView.attributedText = attributedString;
+    
+    // Update the bubble width to include the text view
+    self.bubbleImageViewWidthConstraint.constant = bubbleData.contentSize.width + 17;
+    
+    // Limit bubble width
+    if (self.bubbleImageViewWidthConstraint.constant < 46)
+    {
+        self.bubbleImageViewWidthConstraint.constant = 46;
+    }
+    
+    // Mask the image with the bubble
+    if (bubbleData.attachment && bubbleData.attachment.type != MXKAttachmentTypeFile && bubbleData.attachment.type != MXKAttachmentTypeAudio)
+    {
+        self.bubbleImageView.hidden = YES;
+        
+        UIImageView *rightBubbleImageView = [[UIImageView alloc] initWithImage:self.class.bubbleImage];
+        rightBubbleImageView.frame = CGRectMake(0, 0, self.bubbleImageViewWidthConstraint.constant, bubbleData.contentSize.height + self.attachViewTopConstraint.constant - 4);
+        
+        self.attachmentView.layer.mask = rightBubbleImageView.layer;
+    }
+}
+
++ (CGFloat)heightForCellData:(MXKCellData *)cellData withMaximumWidth:(CGFloat)maxWidth
+{
+    CGFloat rowHeight = [super heightForCellData:cellData withMaximumWidth:maxWidth];
+    
+    CGFloat height = self.cellWithOriginalXib.frame.size.height;
+    
+    // Use the xib height as the minimal height
+    if (rowHeight < height)
+    {
+        rowHeight = height;
+    }
+    
+    return rowHeight;
+}
+
+/**
+ Create the strechable background bubble.
+ 
+ @return the bubble image.
+ */
++ (UIImage *)bubbleImage
+{
+    UIImage *rightBubbleImage = [NSBundle mxk_imageFromMXKAssetsBundleWithName:@"bubble_ios_messages_right"];
+
+    rightBubbleImage = [MXKTools paintImage:rightBubbleImage
+                                  withColor:[MXKTools colorWithRGBValue:OUTGOING_BUBBLE_COLOR]];
+    
+    UIEdgeInsets edgeInsets = UIEdgeInsetsMake(17, 22, 17, 27);
+    return [rightBubbleImage resizableImageWithCapInsets:edgeInsets];
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIOSOutgoingBubbleTableViewCell.xib b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIOSOutgoingBubbleTableViewCell.xib
new file mode 100644
index 000000000..042b9ec58
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIOSOutgoingBubbleTableViewCell.xib
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="pad-g3-2YJ" customClass="MXKRoomIOSOutgoingBubbleTableViewCell">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="40"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="pad-g3-2YJ" id="fCg-ju-gnG">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="39"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Ktd-ms-tAu" userLabel="Bubble Image View">
+                        <rect key="frame" x="160" y="2" width="422" height="35"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="422" id="ptG-QV-Cix"/>
+                        </constraints>
+                    </imageView>
+                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="text message" translatesAutoresizingMaskIntoConstraints="NO" id="tgO-Rv-C7R">
+                        <rect key="frame" x="74" y="3" width="495" height="36"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                        <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                        <dataDetectorType key="dataDetectorTypes" link="YES"/>
+                    </textView>
+                    <view contentMode="scaleAspectFit" translatesAutoresizingMaskIntoConstraints="NO" id="SIW-l4-PfI" userLabel="Attachment View" customClass="MXKImageView">
+                        <rect key="frame" x="160" y="2" width="422" height="35"/>
+                        <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="192" id="iGr-e7-bde"/>
+                        </constraints>
+                        <variation key="default">
+                            <mask key="constraints">
+                                <exclude reference="iGr-e7-bde"/>
+                            </mask>
+                        </variation>
+                    </view>
+                    <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ZC1-hT-7fs">
+                        <rect key="frame" x="355" y="4" width="32" height="32"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="32" id="MOQ-Xi-18w"/>
+                            <constraint firstAttribute="height" constant="32" id="pGM-pf-SiP"/>
+                        </constraints>
+                    </imageView>
+                    <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="Mqf-7a-bsm">
+                        <rect key="frame" x="361" y="10" width="20" height="20"/>
+                    </activityIndicatorView>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LVJ-Av-zVs" userLabel="showHideDateTime">
+                        <rect key="frame" x="0.0" y="0.0" width="74" height="39"/>
+                        <state key="normal">
+                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </state>
+                        <connections>
+                            <action selector="showHideDateTime:" destination="pad-g3-2YJ" eventType="touchUpInside" id="Ztw-z5-zlU"/>
+                        </connections>
+                    </button>
+                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="a51-cR-7FE" userLabel="bubbleInfoContainer">
+                        <rect key="frame" x="8" y="10" width="66" height="29"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                    </view>
+                    <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="apW-hM-veR" userLabel="ProgressView">
+                        <rect key="frame" x="18" y="-16" width="100" height="71"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="text" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" minimumFontSize="4" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="DYj-Mb-me4" userLabel="Progress stats">
+                                <rect key="frame" x="0.0" y="61" width="100" height="10"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="8"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oec-kb-Tsz" customClass="MXKPieChartView">
+                                <rect key="frame" x="30" y="0.0" width="40" height="41"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="40" id="6tZ-ag-7TT"/>
+                                    <constraint firstAttribute="width" constant="40" id="duC-38-cLC"/>
+                                </constraints>
+                            </view>
+                        </subviews>
+                        <gestureRecognizers/>
+                        <constraints>
+                            <constraint firstItem="Oec-kb-Tsz" firstAttribute="top" secondItem="apW-hM-veR" secondAttribute="top" id="49H-ch-qkC"/>
+                            <constraint firstAttribute="height" constant="70" id="GhG-zB-k3A"/>
+                            <constraint firstAttribute="centerX" secondItem="Oec-kb-Tsz" secondAttribute="centerX" id="KZy-2p-KaW"/>
+                            <constraint firstItem="DYj-Mb-me4" firstAttribute="leading" secondItem="apW-hM-veR" secondAttribute="leading" id="UxL-bV-5Ca"/>
+                            <constraint firstAttribute="bottom" secondItem="DYj-Mb-me4" secondAttribute="bottom" id="YFp-gQ-NFz"/>
+                            <constraint firstAttribute="width" constant="100" id="Zr4-5T-h9g"/>
+                            <constraint firstAttribute="trailing" secondItem="DYj-Mb-me4" secondAttribute="trailing" id="ehN-ME-1U1"/>
+                            <constraint firstAttribute="centerX" secondItem="DYj-Mb-me4" secondAttribute="centerX" id="nuq-lO-8pT"/>
+                        </constraints>
+                    </view>
+                </subviews>
+                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                <constraints>
+                    <constraint firstItem="SIW-l4-PfI" firstAttribute="centerX" secondItem="Mqf-7a-bsm" secondAttribute="centerX" id="1b6-1l-hg0"/>
+                    <constraint firstItem="tgO-Rv-C7R" firstAttribute="leading" secondItem="LVJ-Av-zVs" secondAttribute="trailing" id="45B-ph-Sc3"/>
+                    <constraint firstAttribute="bottom" secondItem="tgO-Rv-C7R" secondAttribute="bottom" id="7C3-Tl-mMq"/>
+                    <constraint firstItem="tgO-Rv-C7R" firstAttribute="top" secondItem="fCg-ju-gnG" secondAttribute="top" constant="3" id="8Sy-eu-tYs"/>
+                    <constraint firstItem="SIW-l4-PfI" firstAttribute="width" secondItem="Ktd-ms-tAu" secondAttribute="width" id="AjE-jd-r7q"/>
+                    <constraint firstAttribute="trailing" secondItem="SIW-l4-PfI" secondAttribute="trailing" constant="8" id="D8p-mV-ytb"/>
+                    <constraint firstItem="a51-cR-7FE" firstAttribute="leading" secondItem="fCg-ju-gnG" secondAttribute="leading" constant="8" id="E3x-h8-GPF"/>
+                    <constraint firstItem="SIW-l4-PfI" firstAttribute="bottom" secondItem="Ktd-ms-tAu" secondAttribute="bottom" id="ET2-rD-uVQ"/>
+                    <constraint firstItem="LVJ-Av-zVs" firstAttribute="leading" secondItem="fCg-ju-gnG" secondAttribute="leading" id="Hve-E3-z5N"/>
+                    <constraint firstAttribute="bottom" secondItem="LVJ-Av-zVs" secondAttribute="bottom" id="IKr-Dc-HKz"/>
+                    <constraint firstAttribute="trailingMargin" secondItem="Ktd-ms-tAu" secondAttribute="trailing" constant="10" id="LEJ-mA-aF4"/>
+                    <constraint firstItem="apW-hM-veR" firstAttribute="leading" secondItem="fCg-ju-gnG" secondAttribute="leading" constant="18" id="LFn-vp-m0v"/>
+                    <constraint firstItem="tgO-Rv-C7R" firstAttribute="leading" secondItem="a51-cR-7FE" secondAttribute="trailing" id="PJ9-Px-DPH"/>
+                    <constraint firstItem="SIW-l4-PfI" firstAttribute="top" secondItem="fCg-ju-gnG" secondAttribute="top" constant="18" id="QDm-tP-KWa"/>
+                    <constraint firstItem="SIW-l4-PfI" firstAttribute="top" secondItem="Ktd-ms-tAu" secondAttribute="top" id="W0E-eV-LGg"/>
+                    <constraint firstAttribute="bottom" secondItem="SIW-l4-PfI" secondAttribute="bottom" id="fMN-Th-SOT"/>
+                    <constraint firstItem="a51-cR-7FE" firstAttribute="top" secondItem="fCg-ju-gnG" secondAttribute="top" constant="10" id="fQv-07-Pgx"/>
+                    <constraint firstItem="SIW-l4-PfI" firstAttribute="centerY" secondItem="ZC1-hT-7fs" secondAttribute="centerY" id="ffI-vh-SW3"/>
+                    <constraint firstAttribute="bottom" secondItem="Ktd-ms-tAu" secondAttribute="bottom" constant="2" id="haQ-G8-eZD"/>
+                    <constraint firstItem="tgO-Rv-C7R" firstAttribute="leading" secondItem="fCg-ju-gnG" secondAttribute="leading" constant="74" id="hwr-aa-TB4"/>
+                    <constraint firstItem="SIW-l4-PfI" firstAttribute="centerX" secondItem="ZC1-hT-7fs" secondAttribute="centerX" id="jah-TA-P0P"/>
+                    <constraint firstItem="Ktd-ms-tAu" firstAttribute="top" secondItem="fCg-ju-gnG" secondAttribute="top" constant="2" id="ltB-ic-svk"/>
+                    <constraint firstItem="LVJ-Av-zVs" firstAttribute="top" secondItem="fCg-ju-gnG" secondAttribute="top" id="pYO-hi-P72"/>
+                    <constraint firstItem="SIW-l4-PfI" firstAttribute="centerY" secondItem="Mqf-7a-bsm" secondAttribute="centerY" id="sKJ-ny-LjM"/>
+                    <constraint firstAttribute="bottom" secondItem="a51-cR-7FE" secondAttribute="bottom" id="viZ-Sx-3RW"/>
+                    <constraint firstItem="apW-hM-veR" firstAttribute="centerY" secondItem="SIW-l4-PfI" secondAttribute="centerY" id="wmh-x1-U32"/>
+                    <constraint firstAttribute="trailing" secondItem="tgO-Rv-C7R" secondAttribute="trailing" constant="31" id="xYz-lp-c7K"/>
+                    <constraint firstItem="SIW-l4-PfI" firstAttribute="leading" secondItem="Ktd-ms-tAu" secondAttribute="leading" id="zvi-c3-uqP"/>
+                </constraints>
+                <variation key="default">
+                    <mask key="constraints">
+                        <exclude reference="D8p-mV-ytb"/>
+                        <exclude reference="QDm-tP-KWa"/>
+                        <exclude reference="fMN-Th-SOT"/>
+                    </mask>
+                </variation>
+            </tableViewCellContentView>
+            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+            <connections>
+                <outlet property="activityIndicator" destination="Mqf-7a-bsm" id="toi-nL-eJa"/>
+                <outlet property="attachViewTopConstraint" destination="QDm-tP-KWa" id="Ku6-FC-jqo"/>
+                <outlet property="attachViewWidthConstraint" destination="iGr-e7-bde" id="uD4-aU-1Ru"/>
+                <outlet property="attachmentView" destination="SIW-l4-PfI" id="L4H-ub-pPI"/>
+                <outlet property="bubbleImageView" destination="Ktd-ms-tAu" id="I0r-5F-rhe"/>
+                <outlet property="bubbleImageViewWidthConstraint" destination="ptG-QV-Cix" id="TUH-dw-uqF"/>
+                <outlet property="bubbleInfoContainer" destination="a51-cR-7FE" id="wrR-cU-DVm"/>
+                <outlet property="bubbleInfoContainerTopConstraint" destination="fQv-07-Pgx" id="82c-KH-Wop"/>
+                <outlet property="messageTextView" destination="tgO-Rv-C7R" id="LZ5-hQ-AbQ"/>
+                <outlet property="msgTextViewBottomConstraint" destination="7C3-Tl-mMq" id="5Ff-xL-G1i"/>
+                <outlet property="msgTextViewLeadingConstraint" destination="hwr-aa-TB4" id="A1E-ap-Ug6"/>
+                <outlet property="msgTextViewTopConstraint" destination="8Sy-eu-tYs" id="7yx-oJ-KBP"/>
+                <outlet property="msgTextViewTrailingConstraint" destination="xYz-lp-c7K" id="hc2-Cg-is4"/>
+                <outlet property="playIconView" destination="ZC1-hT-7fs" id="zeH-8B-gxw"/>
+                <outlet property="progressChartView" destination="Oec-kb-Tsz" id="uoq-6v-6Tm"/>
+                <outlet property="progressView" destination="apW-hM-veR" id="Iy8-ca-hMi"/>
+                <outlet property="statsLabel" destination="DYj-Mb-me4" id="CbG-5V-unO"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingAttachmentBubbleCell.h b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingAttachmentBubbleCell.h
new file mode 100644
index 000000000..6819e8d6d
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingAttachmentBubbleCell.h
@@ -0,0 +1,24 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomIncomingBubbleTableViewCell.h"
+
+/**
+ `MXKRoomIncomingAttachmentBubbleCell` displays incoming attachment bubbles with sender's information.
+ */
+@interface MXKRoomIncomingAttachmentBubbleCell : MXKRoomIncomingBubbleTableViewCell
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingAttachmentBubbleCell.m b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingAttachmentBubbleCell.m
new file mode 100644
index 000000000..ecb9eaa3a
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingAttachmentBubbleCell.m
@@ -0,0 +1,21 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomIncomingAttachmentBubbleCell.h"
+
+@implementation MXKRoomIncomingAttachmentBubbleCell
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingAttachmentBubbleCell.xib b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingAttachmentBubbleCell.xib
new file mode 100644
index 000000000..ee13c949d
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingAttachmentBubbleCell.xib
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="WmY-Jw-mqv" customClass="MXKRoomIncomingAttachmentBubbleCell">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="50"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WmY-Jw-mqv" id="ef1-Tq-U3Z">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="49"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <view clipsSubviews="YES" contentMode="scaleAspectFill" translatesAutoresizingMaskIntoConstraints="NO" id="hgp-Z5-rAj" userLabel="Picture View" customClass="MXKImageView">
+                        <rect key="frame" x="8" y="5" width="40" height="40"/>
+                        <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="40" id="NQk-ck-Lo8"/>
+                            <constraint firstAttribute="height" constant="40" id="dNT-QU-CUG"/>
+                        </constraints>
+                    </view>
+                    <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="zwq-eh-8Fb" userLabel="typingBadge">
+                        <rect key="frame" x="5" y="0.0" width="20" height="20"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="20" id="7ni-rb-ovL"/>
+                            <constraint firstAttribute="height" constant="20" id="mcu-rQ-hnj"/>
+                        </constraints>
+                    </imageView>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="User name:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="8" translatesAutoresizingMaskIntoConstraints="NO" id="q9c-0p-QyP">
+                        <rect key="frame" x="51" y="3" width="480" height="20"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="20" placeholder="YES" id="5ZO-W1-tS2"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                        <color key="textColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <view contentMode="scaleAspectFit" translatesAutoresizingMaskIntoConstraints="NO" id="5IE-JS-uf3" userLabel="Attachment View" customClass="MXKImageView">
+                        <rect key="frame" x="51" y="18" width="192" height="23"/>
+                        <color key="backgroundColor" red="0.93725490196078431" green="0.93725490196078431" blue="0.95686274509803926" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="192" id="9zO-jU-qTb"/>
+                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="23" id="C5F-6D-LZx"/>
+                        </constraints>
+                    </view>
+                    <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="K9X-gn-noF" userLabel="File Type Image View">
+                        <rect key="frame" x="51" y="18" width="32" height="32"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="32" id="OE8-oh-B7Q"/>
+                            <constraint firstAttribute="height" constant="32" id="jJB-zj-fbT"/>
+                        </constraints>
+                    </imageView>
+                    <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Cot-3X-2cU" userLabel="Play Icon Image View">
+                        <rect key="frame" x="131" y="14" width="32" height="32"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="32" id="8io-Wk-GzF"/>
+                            <constraint firstAttribute="width" constant="32" id="aeJ-j3-rfX"/>
+                        </constraints>
+                    </imageView>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kwd-hP-feC" userLabel="showHideDateTime">
+                        <rect key="frame" x="531" y="0.0" width="69" height="49"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="69" id="9vA-4g-EE5"/>
+                        </constraints>
+                        <state key="normal">
+                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </state>
+                        <connections>
+                            <action selector="showHideDateTime:" destination="WmY-Jw-mqv" eventType="touchUpInside" id="jYV-nj-p60"/>
+                        </connections>
+                    </button>
+                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IOg-Kt-8vW" userLabel="bubbleInfoContainer">
+                        <rect key="frame" x="531" y="18" width="61" height="31"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="61" id="tLr-6k-ArA"/>
+                        </constraints>
+                    </view>
+                    <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fdx-qs-8en" userLabel="ProgressView">
+                        <rect key="frame" x="487" y="-5" width="100" height="70"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="rate" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" minimumFontSize="4" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="eU5-iK-u8i" userLabel="Progress stats">
+                                <rect key="frame" x="0.0" y="60" width="100" height="10"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="8"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hJj-TC-pxK" customClass="MXKPieChartView">
+                                <rect key="frame" x="30" y="0.0" width="40" height="40"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="40" id="Cpt-s4-tlK"/>
+                                    <constraint firstAttribute="height" constant="40" id="Jb4-9E-tG0"/>
+                                </constraints>
+                            </view>
+                        </subviews>
+                        <gestureRecognizers/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="70" id="5w2-Hm-hZx"/>
+                            <constraint firstAttribute="centerX" secondItem="eU5-iK-u8i" secondAttribute="centerX" id="APi-aE-mLc"/>
+                            <constraint firstItem="eU5-iK-u8i" firstAttribute="leading" secondItem="fdx-qs-8en" secondAttribute="leading" id="Njw-3a-E9Y"/>
+                            <constraint firstAttribute="bottom" secondItem="eU5-iK-u8i" secondAttribute="bottom" id="QMO-g9-QVE"/>
+                            <constraint firstAttribute="centerX" secondItem="hJj-TC-pxK" secondAttribute="centerX" id="laR-Vg-ol3"/>
+                            <constraint firstItem="hJj-TC-pxK" firstAttribute="top" secondItem="fdx-qs-8en" secondAttribute="top" id="ovD-8p-4dP"/>
+                            <constraint firstAttribute="width" constant="100" id="ryE-fW-SgG"/>
+                            <constraint firstAttribute="trailing" secondItem="eU5-iK-u8i" secondAttribute="trailing" id="teG-8q-BOX"/>
+                        </constraints>
+                    </view>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GGt-zb-6zg">
+                        <rect key="frame" x="48" y="0.0" width="486" height="26"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                    </view>
+                </subviews>
+                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                <constraints>
+                    <constraint firstItem="hgp-Z5-rAj" firstAttribute="top" secondItem="ef1-Tq-U3Z" secondAttribute="top" constant="5" id="2Ih-ga-N9s"/>
+                    <constraint firstItem="kwd-hP-feC" firstAttribute="top" secondItem="ef1-Tq-U3Z" secondAttribute="top" id="5bB-HV-WAA"/>
+                    <constraint firstItem="5IE-JS-uf3" firstAttribute="leading" secondItem="hgp-Z5-rAj" secondAttribute="trailing" constant="3" id="6mM-Ag-m0K"/>
+                    <constraint firstItem="5IE-JS-uf3" firstAttribute="top" secondItem="ef1-Tq-U3Z" secondAttribute="top" constant="18" id="96U-67-5TP"/>
+                    <constraint firstAttribute="trailing" secondItem="q9c-0p-QyP" secondAttribute="trailing" constant="69" id="Bkh-h2-JOQ"/>
+                    <constraint firstItem="GGt-zb-6zg" firstAttribute="leading" secondItem="q9c-0p-QyP" secondAttribute="leading" constant="-3" id="CsE-Bf-Wq7"/>
+                    <constraint firstItem="5IE-JS-uf3" firstAttribute="centerY" secondItem="Cot-3X-2cU" secondAttribute="centerY" id="H5t-l6-fL1"/>
+                    <constraint firstItem="q9c-0p-QyP" firstAttribute="top" secondItem="ef1-Tq-U3Z" secondAttribute="top" constant="3" id="Ixr-7h-f8j"/>
+                    <constraint firstItem="GGt-zb-6zg" firstAttribute="trailing" secondItem="q9c-0p-QyP" secondAttribute="trailing" constant="3" id="Ku9-ad-hb4"/>
+                    <constraint firstAttribute="bottom" secondItem="kwd-hP-feC" secondAttribute="bottom" id="LQg-cI-Nkn"/>
+                    <constraint firstAttribute="bottom" secondItem="5IE-JS-uf3" secondAttribute="bottom" constant="8" id="SHN-tC-zsJ"/>
+                    <constraint firstAttribute="bottom" secondItem="IOg-Kt-8vW" secondAttribute="bottom" id="TPw-iE-nii"/>
+                    <constraint firstItem="IOg-Kt-8vW" firstAttribute="top" secondItem="ef1-Tq-U3Z" secondAttribute="top" constant="18" id="XSL-TG-m62"/>
+                    <constraint firstItem="q9c-0p-QyP" firstAttribute="leading" secondItem="hgp-Z5-rAj" secondAttribute="trailing" constant="3" id="YWK-C2-15w"/>
+                    <constraint firstItem="GGt-zb-6zg" firstAttribute="top" secondItem="q9c-0p-QyP" secondAttribute="top" constant="-3" id="cqf-j2-9vP"/>
+                    <constraint firstItem="zwq-eh-8Fb" firstAttribute="leading" secondItem="ef1-Tq-U3Z" secondAttribute="leading" constant="5" id="dgK-4e-UuE"/>
+                    <constraint firstAttribute="trailing" secondItem="kwd-hP-feC" secondAttribute="trailing" id="f2V-Ka-kU3"/>
+                    <constraint firstAttribute="trailing" secondItem="IOg-Kt-8vW" secondAttribute="trailing" constant="8" id="hQV-lO-7aQ"/>
+                    <constraint firstItem="GGt-zb-6zg" firstAttribute="bottom" secondItem="q9c-0p-QyP" secondAttribute="bottom" constant="3" id="kYd-0y-Rcu"/>
+                    <constraint firstItem="5IE-JS-uf3" firstAttribute="leading" secondItem="K9X-gn-noF" secondAttribute="leading" id="p93-5h-lvW"/>
+                    <constraint firstItem="5IE-JS-uf3" firstAttribute="centerX" secondItem="Cot-3X-2cU" secondAttribute="centerX" id="sF7-QL-vdj"/>
+                    <constraint firstItem="zwq-eh-8Fb" firstAttribute="top" secondItem="ef1-Tq-U3Z" secondAttribute="top" id="tUd-UR-lzA"/>
+                    <constraint firstItem="hgp-Z5-rAj" firstAttribute="leading" secondItem="ef1-Tq-U3Z" secondAttribute="leading" constant="8" id="tuw-aU-ncu"/>
+                    <constraint firstItem="5IE-JS-uf3" firstAttribute="centerY" secondItem="fdx-qs-8en" secondAttribute="centerY" id="v0F-Ts-14P"/>
+                    <constraint firstItem="5IE-JS-uf3" firstAttribute="top" secondItem="K9X-gn-noF" secondAttribute="top" id="wkX-zQ-iQS"/>
+                    <constraint firstAttribute="trailing" secondItem="fdx-qs-8en" secondAttribute="trailing" constant="13" id="xKk-Gz-moE"/>
+                </constraints>
+            </tableViewCellContentView>
+            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+            <connections>
+                <outlet property="attachViewBottomConstraint" destination="SHN-tC-zsJ" id="cG0-a7-eHa"/>
+                <outlet property="attachViewMinHeightConstraint" destination="C5F-6D-LZx" id="frk-Ox-WbA"/>
+                <outlet property="attachViewTopConstraint" destination="96U-67-5TP" id="Ugm-cH-32E"/>
+                <outlet property="attachViewWidthConstraint" destination="9zO-jU-qTb" id="fOO-VW-fe1"/>
+                <outlet property="attachmentView" destination="5IE-JS-uf3" id="imT-1z-hR1"/>
+                <outlet property="bubbleInfoContainer" destination="IOg-Kt-8vW" id="TAw-QY-Y9e"/>
+                <outlet property="bubbleInfoContainerTopConstraint" destination="XSL-TG-m62" id="qVf-vJ-4aP"/>
+                <outlet property="fileTypeIconView" destination="K9X-gn-noF" id="4Pj-bc-3gk"/>
+                <outlet property="pictureView" destination="hgp-Z5-rAj" id="rKM-QG-RJN"/>
+                <outlet property="playIconView" destination="Cot-3X-2cU" id="KEF-KK-Og1"/>
+                <outlet property="progressChartView" destination="hJj-TC-pxK" id="Zz3-s5-Qqr"/>
+                <outlet property="progressView" destination="fdx-qs-8en" id="V7E-pn-Xze"/>
+                <outlet property="statsLabel" destination="eU5-iK-u8i" id="MSm-kU-RSY"/>
+                <outlet property="typingBadge" destination="zwq-eh-8Fb" id="4vs-Dk-vWt"/>
+                <outlet property="userNameLabel" destination="q9c-0p-QyP" id="JId-R7-LoM"/>
+                <outlet property="userNameTapGestureMaskView" destination="GGt-zb-6zg" id="uV1-Jm-vLT"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingAttachmentWithoutSenderInfoBubbleCell.h b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingAttachmentWithoutSenderInfoBubbleCell.h
new file mode 100644
index 000000000..3d4bbb06b
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingAttachmentWithoutSenderInfoBubbleCell.h
@@ -0,0 +1,24 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomIncomingAttachmentBubbleCell.h"
+
+/**
+ `MXKRoomIncomingAttachmentWithoutSenderInfoBubbleCell` displays incoming message bubbles without sender's information.
+ */
+@interface MXKRoomIncomingAttachmentWithoutSenderInfoBubbleCell : MXKRoomIncomingAttachmentBubbleCell
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingAttachmentWithoutSenderInfoBubbleCell.m b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingAttachmentWithoutSenderInfoBubbleCell.m
new file mode 100644
index 000000000..6171e49da
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingAttachmentWithoutSenderInfoBubbleCell.m
@@ -0,0 +1,21 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomIncomingAttachmentWithoutSenderInfoBubbleCell.h"
+
+@implementation MXKRoomIncomingAttachmentWithoutSenderInfoBubbleCell
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingAttachmentWithoutSenderInfoBubbleCell.xib b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingAttachmentWithoutSenderInfoBubbleCell.xib
new file mode 100644
index 000000000..0dd044e50
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingAttachmentWithoutSenderInfoBubbleCell.xib
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="WmY-Jw-mqv" customClass="MXKRoomIncomingAttachmentWithoutSenderInfoBubbleCell">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="50"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WmY-Jw-mqv" id="ef1-Tq-U3Z">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="49"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <view contentMode="scaleAspectFit" translatesAutoresizingMaskIntoConstraints="NO" id="5IE-JS-uf3" userLabel="Attachment View" customClass="MXKImageView">
+                        <rect key="frame" x="51" y="8" width="192" height="33"/>
+                        <color key="backgroundColor" red="0.93725490196078431" green="0.93725490196078431" blue="0.95686274509803926" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="192" id="9zO-jU-qTb"/>
+                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="33" id="Uqr-7d-0dv"/>
+                        </constraints>
+                    </view>
+                    <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="K9X-gn-noF" userLabel="File Type Image View">
+                        <rect key="frame" x="51" y="8" width="32" height="32"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="32" id="OE8-oh-B7Q"/>
+                            <constraint firstAttribute="height" constant="32" id="jJB-zj-fbT"/>
+                        </constraints>
+                    </imageView>
+                    <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Cot-3X-2cU" userLabel="Play Icon Image View">
+                        <rect key="frame" x="131" y="9" width="32" height="32"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="32" id="8io-Wk-GzF"/>
+                            <constraint firstAttribute="width" constant="32" id="aeJ-j3-rfX"/>
+                        </constraints>
+                    </imageView>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kwd-hP-feC" userLabel="showHideDateTime">
+                        <rect key="frame" x="531" y="0.0" width="69" height="49"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="69" id="9vA-4g-EE5"/>
+                        </constraints>
+                        <state key="normal">
+                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </state>
+                        <connections>
+                            <action selector="showHideDateTime:" destination="WmY-Jw-mqv" eventType="touchUpInside" id="jYV-nj-p60"/>
+                        </connections>
+                    </button>
+                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IOg-Kt-8vW" userLabel="bubbleInfoContainer">
+                        <rect key="frame" x="531" y="8" width="61" height="41"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="61" id="tLr-6k-ArA"/>
+                        </constraints>
+                    </view>
+                    <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fdx-qs-8en" userLabel="ProgressView">
+                        <rect key="frame" x="487" y="-10" width="100" height="70"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="rate" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" minimumFontSize="4" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="eU5-iK-u8i" userLabel="Progress stats">
+                                <rect key="frame" x="0.0" y="60" width="100" height="10"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="8"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hJj-TC-pxK" customClass="MXKPieChartView">
+                                <rect key="frame" x="30" y="0.0" width="40" height="40"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="40" id="Cpt-s4-tlK"/>
+                                    <constraint firstAttribute="height" constant="40" id="Jb4-9E-tG0"/>
+                                </constraints>
+                            </view>
+                        </subviews>
+                        <gestureRecognizers/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="70" id="5w2-Hm-hZx"/>
+                            <constraint firstAttribute="centerX" secondItem="eU5-iK-u8i" secondAttribute="centerX" id="APi-aE-mLc"/>
+                            <constraint firstItem="eU5-iK-u8i" firstAttribute="leading" secondItem="fdx-qs-8en" secondAttribute="leading" id="Njw-3a-E9Y"/>
+                            <constraint firstAttribute="bottom" secondItem="eU5-iK-u8i" secondAttribute="bottom" id="QMO-g9-QVE"/>
+                            <constraint firstAttribute="centerX" secondItem="hJj-TC-pxK" secondAttribute="centerX" id="laR-Vg-ol3"/>
+                            <constraint firstItem="hJj-TC-pxK" firstAttribute="top" secondItem="fdx-qs-8en" secondAttribute="top" id="ovD-8p-4dP"/>
+                            <constraint firstAttribute="width" constant="100" id="ryE-fW-SgG"/>
+                            <constraint firstAttribute="trailing" secondItem="eU5-iK-u8i" secondAttribute="trailing" id="teG-8q-BOX"/>
+                        </constraints>
+                    </view>
+                </subviews>
+                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                <constraints>
+                    <constraint firstItem="kwd-hP-feC" firstAttribute="top" secondItem="ef1-Tq-U3Z" secondAttribute="top" id="5bB-HV-WAA"/>
+                    <constraint firstItem="5IE-JS-uf3" firstAttribute="top" secondItem="ef1-Tq-U3Z" secondAttribute="top" constant="8" id="96U-67-5TP"/>
+                    <constraint firstItem="5IE-JS-uf3" firstAttribute="centerY" secondItem="Cot-3X-2cU" secondAttribute="centerY" id="H5t-l6-fL1"/>
+                    <constraint firstAttribute="bottom" secondItem="kwd-hP-feC" secondAttribute="bottom" id="LQg-cI-Nkn"/>
+                    <constraint firstAttribute="bottom" secondItem="5IE-JS-uf3" secondAttribute="bottom" constant="8" id="SHN-tC-zsJ"/>
+                    <constraint firstAttribute="bottom" secondItem="IOg-Kt-8vW" secondAttribute="bottom" id="TPw-iE-nii"/>
+                    <constraint firstItem="IOg-Kt-8vW" firstAttribute="top" secondItem="ef1-Tq-U3Z" secondAttribute="top" constant="8" id="XSL-TG-m62"/>
+                    <constraint firstItem="5IE-JS-uf3" firstAttribute="leading" secondItem="ef1-Tq-U3Z" secondAttribute="leading" constant="51" id="bSL-lG-ued"/>
+                    <constraint firstAttribute="trailing" secondItem="kwd-hP-feC" secondAttribute="trailing" id="f2V-Ka-kU3"/>
+                    <constraint firstAttribute="trailing" secondItem="IOg-Kt-8vW" secondAttribute="trailing" constant="8" id="hQV-lO-7aQ"/>
+                    <constraint firstItem="5IE-JS-uf3" firstAttribute="leading" secondItem="K9X-gn-noF" secondAttribute="leading" id="p93-5h-lvW"/>
+                    <constraint firstItem="5IE-JS-uf3" firstAttribute="centerX" secondItem="Cot-3X-2cU" secondAttribute="centerX" id="sF7-QL-vdj"/>
+                    <constraint firstItem="5IE-JS-uf3" firstAttribute="centerY" secondItem="fdx-qs-8en" secondAttribute="centerY" id="v0F-Ts-14P"/>
+                    <constraint firstItem="5IE-JS-uf3" firstAttribute="top" secondItem="K9X-gn-noF" secondAttribute="top" id="wkX-zQ-iQS"/>
+                    <constraint firstAttribute="trailing" secondItem="fdx-qs-8en" secondAttribute="trailing" constant="13" id="xKk-Gz-moE"/>
+                </constraints>
+            </tableViewCellContentView>
+            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+            <connections>
+                <outlet property="attachViewBottomConstraint" destination="SHN-tC-zsJ" id="cG0-a7-eHa"/>
+                <outlet property="attachViewMinHeightConstraint" destination="Uqr-7d-0dv" id="UIs-4K-np5"/>
+                <outlet property="attachViewTopConstraint" destination="96U-67-5TP" id="Ugm-cH-32E"/>
+                <outlet property="attachViewWidthConstraint" destination="9zO-jU-qTb" id="fOO-VW-fe1"/>
+                <outlet property="attachmentView" destination="5IE-JS-uf3" id="imT-1z-hR1"/>
+                <outlet property="bubbleInfoContainer" destination="IOg-Kt-8vW" id="TAw-QY-Y9e"/>
+                <outlet property="bubbleInfoContainerTopConstraint" destination="XSL-TG-m62" id="qVf-vJ-4aP"/>
+                <outlet property="fileTypeIconView" destination="K9X-gn-noF" id="4Pj-bc-3gk"/>
+                <outlet property="playIconView" destination="Cot-3X-2cU" id="KEF-KK-Og1"/>
+                <outlet property="progressChartView" destination="hJj-TC-pxK" id="Zz3-s5-Qqr"/>
+                <outlet property="progressView" destination="fdx-qs-8en" id="V7E-pn-Xze"/>
+                <outlet property="statsLabel" destination="eU5-iK-u8i" id="MSm-kU-RSY"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingBubbleTableViewCell.h b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingBubbleTableViewCell.h
new file mode 100644
index 000000000..27d886cbe
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingBubbleTableViewCell.h
@@ -0,0 +1,29 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomBubbleTableViewCell.h"
+
+/**
+ `MXKRoomIncomingBubbleTableViewCell` inherits from 'MXKRoomBubbleTableViewCell' class in order to handle specific
+ options related to incoming messages (like typing badge).
+
+ In order to optimize bubbles rendering, we advise to define a .xib for each layout.
+ */
+@interface MXKRoomIncomingBubbleTableViewCell : MXKRoomBubbleTableViewCell
+
+@property (weak, nonatomic) IBOutlet UIImageView *typingBadge;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingBubbleTableViewCell.m b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingBubbleTableViewCell.m
new file mode 100644
index 000000000..0f3c85106
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingBubbleTableViewCell.m
@@ -0,0 +1,65 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomIncomingBubbleTableViewCell.h"
+
+#import "MXKRoomBubbleCellData.h"
+
+#import "NSBundle+MatrixKit.h"
+
+@implementation MXKRoomIncomingBubbleTableViewCell
+
+- (void)finalizeInit
+{
+    [super finalizeInit];
+    self.readReceiptsAlignment = ReadReceiptAlignmentRight;
+}
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    self.typingBadge.image = [NSBundle mxk_imageFromMXKAssetsBundleWithName:@"icon_keyboard"];
+}
+
+- (void)render:(MXKCellData *)cellData
+{
+    [super render:cellData];
+    
+    if (bubbleData)
+    {
+        // Handle here typing badge (if any)
+        if (self.typingBadge)
+        {
+            if (bubbleData.isTyping)
+            {
+                self.typingBadge.hidden = NO;
+                [self.typingBadge.superview bringSubviewToFront:self.typingBadge];
+            }
+            else
+            {
+                self.typingBadge.hidden = YES;
+            }
+        }
+    }
+}
+
+- (void)didEndDisplay
+{
+    [super didEndDisplay];
+    self.readReceiptsAlignment = ReadReceiptAlignmentRight;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingTextMsgBubbleCell.h b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingTextMsgBubbleCell.h
new file mode 100644
index 000000000..9fe96c917
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingTextMsgBubbleCell.h
@@ -0,0 +1,24 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomIncomingBubbleTableViewCell.h"
+
+/**
+ `MXKRoomIncomingTextMsgBubbleCell` displays incoming message bubbles with sender's information.
+ */
+@interface MXKRoomIncomingTextMsgBubbleCell : MXKRoomIncomingBubbleTableViewCell
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingTextMsgBubbleCell.m b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingTextMsgBubbleCell.m
new file mode 100644
index 000000000..253e7141f
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingTextMsgBubbleCell.m
@@ -0,0 +1,21 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomIncomingTextMsgBubbleCell.h"
+
+@implementation MXKRoomIncomingTextMsgBubbleCell
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingTextMsgBubbleCell.xib b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingTextMsgBubbleCell.xib
new file mode 100644
index 000000000..311dc21a7
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingTextMsgBubbleCell.xib
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="WmY-Jw-mqv" customClass="MXKRoomIncomingTextMsgBubbleCell">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="50"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WmY-Jw-mqv" id="ef1-Tq-U3Z">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="49.5"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <view clipsSubviews="YES" contentMode="scaleAspectFill" translatesAutoresizingMaskIntoConstraints="NO" id="hgp-Z5-rAj" userLabel="Picture View" customClass="MXKImageView">
+                        <rect key="frame" x="8" y="5" width="40" height="40"/>
+                        <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="40" id="NQk-ck-Lo8"/>
+                            <constraint firstAttribute="height" constant="40" id="dNT-QU-CUG"/>
+                        </constraints>
+                    </view>
+                    <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="zwq-eh-8Fb" userLabel="typingBadge">
+                        <rect key="frame" x="5" y="0.0" width="20" height="20"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="20" id="7ni-rb-ovL"/>
+                            <constraint firstAttribute="height" constant="20" id="mcu-rQ-hnj"/>
+                        </constraints>
+                    </imageView>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="User name:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="8" translatesAutoresizingMaskIntoConstraints="NO" id="q9c-0p-QyP">
+                        <rect key="frame" x="51" y="3" width="480" height="20"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="20" placeholder="YES" id="5ZO-W1-tS2"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                        <color key="textColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="text message" translatesAutoresizingMaskIntoConstraints="NO" id="HTH-5n-MSU" customClass="MXKMessageTextView">
+                        <rect key="frame" x="51" y="10" width="97" height="39.5"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="97" id="9EQ-AP-La0"/>
+                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="39" id="ZZt-rc-tVJ"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                        <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                        <dataDetectorType key="dataDetectorTypes" link="YES"/>
+                    </textView>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kwd-hP-feC" userLabel="showHideDateTime">
+                        <rect key="frame" x="531" y="0.0" width="69" height="49.5"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="69" id="9vA-4g-EE5"/>
+                        </constraints>
+                        <state key="normal">
+                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </state>
+                        <connections>
+                            <action selector="showHideDateTime:" destination="WmY-Jw-mqv" eventType="touchUpInside" id="jYV-nj-p60"/>
+                        </connections>
+                    </button>
+                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IOg-Kt-8vW" userLabel="bubbleInfoContainer">
+                        <rect key="frame" x="531" y="10" width="61" height="39.5"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="61" id="tLr-6k-ArA"/>
+                        </constraints>
+                    </view>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L3N-gy-H1n">
+                        <rect key="frame" x="48" y="0.0" width="486" height="26"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                    </view>
+                </subviews>
+                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                <constraints>
+                    <constraint firstItem="hgp-Z5-rAj" firstAttribute="top" secondItem="ef1-Tq-U3Z" secondAttribute="top" constant="5" id="2Ih-ga-N9s"/>
+                    <constraint firstItem="kwd-hP-feC" firstAttribute="top" secondItem="ef1-Tq-U3Z" secondAttribute="top" id="5bB-HV-WAA"/>
+                    <constraint firstItem="L3N-gy-H1n" firstAttribute="leading" secondItem="q9c-0p-QyP" secondAttribute="leading" constant="-3" id="7gc-A2-DNj"/>
+                    <constraint firstAttribute="trailing" secondItem="q9c-0p-QyP" secondAttribute="trailing" constant="69" id="Bkh-h2-JOQ"/>
+                    <constraint firstItem="L3N-gy-H1n" firstAttribute="trailing" secondItem="q9c-0p-QyP" secondAttribute="trailing" constant="3" id="FLX-Dd-CqO"/>
+                    <constraint firstItem="L3N-gy-H1n" firstAttribute="bottom" secondItem="q9c-0p-QyP" secondAttribute="bottom" constant="3" id="IpR-cp-Yod"/>
+                    <constraint firstItem="q9c-0p-QyP" firstAttribute="top" secondItem="ef1-Tq-U3Z" secondAttribute="top" constant="3" id="Ixr-7h-f8j"/>
+                    <constraint firstAttribute="bottom" secondItem="kwd-hP-feC" secondAttribute="bottom" id="LQg-cI-Nkn"/>
+                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="HTH-5n-MSU" secondAttribute="trailing" constant="69" id="Shz-6S-kGd"/>
+                    <constraint firstAttribute="bottom" secondItem="IOg-Kt-8vW" secondAttribute="bottom" id="TPw-iE-nii"/>
+                    <constraint firstItem="IOg-Kt-8vW" firstAttribute="top" secondItem="ef1-Tq-U3Z" secondAttribute="top" constant="10" id="XSL-TG-m62"/>
+                    <constraint firstItem="q9c-0p-QyP" firstAttribute="leading" secondItem="hgp-Z5-rAj" secondAttribute="trailing" constant="3" id="YWK-C2-15w"/>
+                    <constraint firstItem="zwq-eh-8Fb" firstAttribute="leading" secondItem="ef1-Tq-U3Z" secondAttribute="leading" constant="5" id="dgK-4e-UuE"/>
+                    <constraint firstAttribute="trailing" secondItem="kwd-hP-feC" secondAttribute="trailing" id="f2V-Ka-kU3"/>
+                    <constraint firstAttribute="trailing" secondItem="IOg-Kt-8vW" secondAttribute="trailing" constant="8" id="hQV-lO-7aQ"/>
+                    <constraint firstItem="HTH-5n-MSU" firstAttribute="top" secondItem="ef1-Tq-U3Z" secondAttribute="top" constant="10" id="mkw-3s-H8B"/>
+                    <constraint firstAttribute="bottom" secondItem="HTH-5n-MSU" secondAttribute="bottom" id="oTk-3F-SEC"/>
+                    <constraint firstItem="zwq-eh-8Fb" firstAttribute="top" secondItem="ef1-Tq-U3Z" secondAttribute="top" id="tUd-UR-lzA"/>
+                    <constraint firstItem="L3N-gy-H1n" firstAttribute="top" secondItem="q9c-0p-QyP" secondAttribute="top" constant="-3" id="tXi-p0-wft"/>
+                    <constraint firstItem="hgp-Z5-rAj" firstAttribute="leading" secondItem="ef1-Tq-U3Z" secondAttribute="leading" constant="8" id="tuw-aU-ncu"/>
+                    <constraint firstItem="HTH-5n-MSU" firstAttribute="leading" secondItem="ef1-Tq-U3Z" secondAttribute="leading" constant="51" id="uig-Xh-7m6"/>
+                </constraints>
+            </tableViewCellContentView>
+            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+            <connections>
+                <outlet property="bubbleInfoContainer" destination="IOg-Kt-8vW" id="TAw-QY-Y9e"/>
+                <outlet property="bubbleInfoContainerTopConstraint" destination="XSL-TG-m62" id="qVf-vJ-4aP"/>
+                <outlet property="messageTextView" destination="HTH-5n-MSU" id="YN4-iK-gNc"/>
+                <outlet property="msgTextViewBottomConstraint" destination="oTk-3F-SEC" id="o0p-3S-hM4"/>
+                <outlet property="msgTextViewLeadingConstraint" destination="uig-Xh-7m6" id="kgj-3v-ECW"/>
+                <outlet property="msgTextViewMinHeightConstraint" destination="ZZt-rc-tVJ" id="hDD-TL-PFM"/>
+                <outlet property="msgTextViewTopConstraint" destination="mkw-3s-H8B" id="lON-oG-Xx9"/>
+                <outlet property="msgTextViewTrailingConstraint" destination="Shz-6S-kGd" id="5ib-m6-Lna"/>
+                <outlet property="msgTextViewWidthConstraint" destination="9EQ-AP-La0" id="wgi-Yc-sTT"/>
+                <outlet property="pictureView" destination="hgp-Z5-rAj" id="rKM-QG-RJN"/>
+                <outlet property="typingBadge" destination="zwq-eh-8Fb" id="4vs-Dk-vWt"/>
+                <outlet property="userNameLabel" destination="q9c-0p-QyP" id="JId-R7-LoM"/>
+                <outlet property="userNameTapGestureMaskView" destination="L3N-gy-H1n" id="1Eb-Vn-fSP"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingTextMsgWithoutSenderInfoBubbleCell.h b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingTextMsgWithoutSenderInfoBubbleCell.h
new file mode 100644
index 000000000..41c3be5cf
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingTextMsgWithoutSenderInfoBubbleCell.h
@@ -0,0 +1,24 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomIncomingTextMsgBubbleCell.h"
+
+/**
+ `MXKRoomIncomingTextMsgWithoutSenderInfoBubbleCell` displays incoming message bubbles without sender's information.
+ */
+@interface MXKRoomIncomingTextMsgWithoutSenderInfoBubbleCell : MXKRoomIncomingTextMsgBubbleCell
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingTextMsgWithoutSenderInfoBubbleCell.m b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingTextMsgWithoutSenderInfoBubbleCell.m
new file mode 100644
index 000000000..4dd146546
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingTextMsgWithoutSenderInfoBubbleCell.m
@@ -0,0 +1,21 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomIncomingTextMsgWithoutSenderInfoBubbleCell.h"
+
+@implementation MXKRoomIncomingTextMsgWithoutSenderInfoBubbleCell
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingTextMsgWithoutSenderInfoBubbleCell.xib b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingTextMsgWithoutSenderInfoBubbleCell.xib
new file mode 100644
index 000000000..93308ad9a
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomIncomingTextMsgWithoutSenderInfoBubbleCell.xib
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="WmY-Jw-mqv" customClass="MXKRoomIncomingTextMsgWithoutSenderInfoBubbleCell">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="35"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WmY-Jw-mqv" id="ef1-Tq-U3Z">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="34.5"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="text message" translatesAutoresizingMaskIntoConstraints="NO" id="HTH-5n-MSU" customClass="MXKMessageTextView">
+                        <rect key="frame" x="51" y="0.0" width="97" height="34.5"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="29" id="SHB-dF-A5J"/>
+                            <constraint firstAttribute="width" constant="97" id="aQ3-Pg-LVD"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                        <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                        <dataDetectorType key="dataDetectorTypes" link="YES"/>
+                    </textView>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kwd-hP-feC" userLabel="showHideDateTime">
+                        <rect key="frame" x="531" y="0.0" width="69" height="34.5"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="69" id="9vA-4g-EE5"/>
+                        </constraints>
+                        <state key="normal">
+                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </state>
+                        <connections>
+                            <action selector="showHideDateTime:" destination="WmY-Jw-mqv" eventType="touchUpInside" id="jYV-nj-p60"/>
+                        </connections>
+                    </button>
+                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IOg-Kt-8vW" userLabel="bubbleInfoContainer">
+                        <rect key="frame" x="531" y="0.0" width="61" height="34.5"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="61" id="tLr-6k-ArA"/>
+                        </constraints>
+                    </view>
+                </subviews>
+                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                <constraints>
+                    <constraint firstItem="kwd-hP-feC" firstAttribute="top" secondItem="ef1-Tq-U3Z" secondAttribute="top" id="5bB-HV-WAA"/>
+                    <constraint firstAttribute="bottom" secondItem="kwd-hP-feC" secondAttribute="bottom" id="LQg-cI-Nkn"/>
+                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="HTH-5n-MSU" secondAttribute="trailing" constant="69" id="Shz-6S-kGd"/>
+                    <constraint firstAttribute="bottom" secondItem="IOg-Kt-8vW" secondAttribute="bottom" id="TPw-iE-nii"/>
+                    <constraint firstItem="IOg-Kt-8vW" firstAttribute="top" secondItem="ef1-Tq-U3Z" secondAttribute="top" id="XSL-TG-m62"/>
+                    <constraint firstAttribute="trailing" secondItem="kwd-hP-feC" secondAttribute="trailing" id="f2V-Ka-kU3"/>
+                    <constraint firstAttribute="trailing" secondItem="IOg-Kt-8vW" secondAttribute="trailing" constant="8" id="hQV-lO-7aQ"/>
+                    <constraint firstItem="HTH-5n-MSU" firstAttribute="top" secondItem="ef1-Tq-U3Z" secondAttribute="top" id="mkw-3s-H8B"/>
+                    <constraint firstAttribute="bottom" secondItem="HTH-5n-MSU" secondAttribute="bottom" id="oTk-3F-SEC"/>
+                    <constraint firstItem="HTH-5n-MSU" firstAttribute="leading" secondItem="ef1-Tq-U3Z" secondAttribute="leading" constant="51" id="uig-Xh-7m6"/>
+                </constraints>
+            </tableViewCellContentView>
+            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+            <connections>
+                <outlet property="bubbleInfoContainer" destination="IOg-Kt-8vW" id="TAw-QY-Y9e"/>
+                <outlet property="bubbleInfoContainerTopConstraint" destination="XSL-TG-m62" id="qVf-vJ-4aP"/>
+                <outlet property="messageTextView" destination="HTH-5n-MSU" id="YN4-iK-gNc"/>
+                <outlet property="msgTextViewBottomConstraint" destination="oTk-3F-SEC" id="86P-vn-8mz"/>
+                <outlet property="msgTextViewLeadingConstraint" destination="uig-Xh-7m6" id="kgj-3v-ECW"/>
+                <outlet property="msgTextViewMinHeightConstraint" destination="SHB-dF-A5J" id="RjV-W7-QaK"/>
+                <outlet property="msgTextViewTopConstraint" destination="mkw-3s-H8B" id="lON-oG-Xx9"/>
+                <outlet property="msgTextViewTrailingConstraint" destination="Shz-6S-kGd" id="5ib-m6-Lna"/>
+                <outlet property="msgTextViewWidthConstraint" destination="aQ3-Pg-LVD" id="JPV-up-dzy"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingAttachmentBubbleCell.h b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingAttachmentBubbleCell.h
new file mode 100644
index 000000000..222d626af
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingAttachmentBubbleCell.h
@@ -0,0 +1,26 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomOutgoingBubbleTableViewCell.h"
+
+/**
+ `MXKRoomOutgoingAttachmentBubbleCell` displays outgoing attachment bubbles.
+ */
+@interface MXKRoomOutgoingAttachmentBubbleCell : MXKRoomOutgoingBubbleTableViewCell
+
+@property (weak, nonatomic) IBOutlet UIActivityIndicatorView *activityIndicator;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingAttachmentBubbleCell.m b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingAttachmentBubbleCell.m
new file mode 100644
index 000000000..9a3e1cfe1
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingAttachmentBubbleCell.m
@@ -0,0 +1,144 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2018 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 "MXKRoomOutgoingAttachmentBubbleCell.h"
+
+#import "MXEvent+MatrixKit.h"
+
+#import "MXKRoomBubbleCellData.h"
+#import "MXKImageView.h"
+#import "MXKPieChartView.h"
+
+@implementation MXKRoomOutgoingAttachmentBubbleCell
+
+- (void)dealloc
+{
+    [self stopAnimating];
+}
+
+- (void)render:(MXKCellData *)cellData
+{
+    [super render:cellData];
+    
+    if (bubbleData)
+    {
+        // Do not display activity indicator on outgoing attachments (These attachments are supposed to be stored locally)
+        // Some download may append to retrieve the actual thumbnail after posting an image.
+        self.attachmentView.hideActivityIndicator = YES;
+        
+        // Check if the attachment is uploading
+        MXKRoomBubbleComponent *component = bubbleData.bubbleComponents.firstObject;
+        if (component.event.sentState == MXEventSentStatePreparing || component.event.sentState == MXEventSentStateEncrypting || component.event.sentState == MXEventSentStateUploading)
+        {
+            // Retrieve the uploadId embedded in the fake url
+            bubbleData.uploadId = component.event.content[@"url"];
+            
+            self.attachmentView.alpha = 0.5;
+            
+            // Start showing upload progress
+            [self startUploadAnimating];
+        }
+        else if (component.event.sentState == MXEventSentStateSending)
+        {
+            self.attachmentView.alpha = 0.5;
+            [self.activityIndicator startAnimating];
+        }
+        else if (component.event.sentState == MXEventSentStateFailed)
+        {
+            self.attachmentView.alpha = 0.5;
+            [self.activityIndicator stopAnimating];
+        }
+        else
+        {
+            self.attachmentView.alpha = 1;
+            [self.activityIndicator stopAnimating];
+        }
+    }
+}
+
+- (void)didEndDisplay
+{
+    [super didEndDisplay];
+    
+    // Hide potential loading wheel
+    [self stopAnimating];
+}
+
+-(void)startUploadAnimating
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXMediaLoaderStateDidChangeNotification object:nil];
+    
+    [self.activityIndicator startAnimating];
+    
+    MXMediaLoader *uploader = [MXMediaManager existingUploaderWithId:bubbleData.uploadId];
+    if (uploader)
+    {
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onMediaLoaderStateDidChange:) name:kMXMediaLoaderStateDidChangeNotification object:uploader];
+        
+        if (uploader.statisticsDict)
+        {
+            [self.activityIndicator stopAnimating];
+            [self updateProgressUI:uploader.statisticsDict];
+            
+            // Check whether the upload is ended
+            if (self.progressChartView.progress == 1.0)
+            {
+                [self stopAnimating];
+            }
+        }
+    }
+    else
+    {
+        self.progressView.hidden = YES;
+    }
+}
+
+-(void)stopAnimating
+{
+    self.progressView.hidden = YES;
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kMXMediaLoaderStateDidChangeNotification object:nil];
+    [self.activityIndicator stopAnimating];
+}
+
+- (void)onMediaLoaderStateDidChange:(NSNotification *)notif
+{
+    MXMediaLoader *loader = (MXMediaLoader*)notif.object;
+    
+    // Consider only the progress of the current upload.
+    if ([loader.uploadId isEqualToString:bubbleData.uploadId])
+    {
+        switch (loader.state) {
+            case MXMediaLoaderStateUploadInProgress:
+            {
+                [self.activityIndicator stopAnimating];
+                [self updateProgressUI:loader.statisticsDict];
+                
+                // the upload is ended
+                if (self.progressChartView.progress == 1.0)
+                {
+                    [self stopAnimating];
+                }
+                break;
+            }
+            default:
+                break;
+        }
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingAttachmentBubbleCell.xib b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingAttachmentBubbleCell.xib
new file mode 100644
index 000000000..d4246c3e3
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingAttachmentBubbleCell.xib
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="pad-g3-2YJ" customClass="MXKRoomOutgoingAttachmentBubbleCell">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="50"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="pad-g3-2YJ" id="fCg-ju-gnG">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="49"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <view clipsSubviews="YES" contentMode="scaleAspectFill" translatesAutoresizingMaskIntoConstraints="NO" id="ezT-Dl-ESR" userLabel="Picture View" customClass="MXKImageView">
+                        <rect key="frame" x="552" y="5" width="40" height="40"/>
+                        <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="40" id="JHc-dD-geb"/>
+                            <constraint firstAttribute="height" constant="40" id="lFb-Jo-C7R"/>
+                        </constraints>
+                    </view>
+                    <view contentMode="scaleAspectFit" translatesAutoresizingMaskIntoConstraints="NO" id="SIW-l4-PfI" userLabel="Attachment View" customClass="MXKImageView">
+                        <rect key="frame" x="357" y="18" width="192" height="23"/>
+                        <color key="backgroundColor" red="0.93725490196078431" green="0.93725490196078431" blue="0.95686274509803926" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="192" id="iGr-e7-bde"/>
+                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="23" id="kGW-IH-XnB"/>
+                        </constraints>
+                    </view>
+                    <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="KGx-6M-GER" userLabel="File Type Image View">
+                        <rect key="frame" x="357" y="18" width="32" height="32"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="32" id="QGB-Md-MLn"/>
+                            <constraint firstAttribute="width" constant="32" id="h7Q-f3-gtz"/>
+                        </constraints>
+                    </imageView>
+                    <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ZC1-hT-7fs" userLabel="Play Icon Image View">
+                        <rect key="frame" x="437" y="14" width="32" height="32"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="32" id="MOQ-Xi-18w"/>
+                            <constraint firstAttribute="height" constant="32" id="pGM-pf-SiP"/>
+                        </constraints>
+                    </imageView>
+                    <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="Mqf-7a-bsm">
+                        <rect key="frame" x="443" y="20" width="20" height="20"/>
+                    </activityIndicatorView>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LVJ-Av-zVs" userLabel="showHideDateTime">
+                        <rect key="frame" x="0.0" y="0.0" width="69" height="49"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="69" id="ghQ-Qb-BBg"/>
+                        </constraints>
+                        <state key="normal">
+                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </state>
+                        <connections>
+                            <action selector="showHideDateTime:" destination="pad-g3-2YJ" eventType="touchUpInside" id="Ztw-z5-zlU"/>
+                        </connections>
+                    </button>
+                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="a51-cR-7FE" userLabel="bubbleInfoContainer">
+                        <rect key="frame" x="8" y="18" width="61" height="31"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="61" id="fDy-iL-hrD"/>
+                        </constraints>
+                    </view>
+                    <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="apW-hM-veR" userLabel="ProgressView">
+                        <rect key="frame" x="18" y="-5" width="100" height="70"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="text" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" minimumFontSize="4" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="DYj-Mb-me4" userLabel="Progress stats">
+                                <rect key="frame" x="0.0" y="60" width="100" height="10"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="8"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oec-kb-Tsz" customClass="MXKPieChartView">
+                                <rect key="frame" x="30" y="0.0" width="40" height="40"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="40" id="6tZ-ag-7TT"/>
+                                    <constraint firstAttribute="width" constant="40" id="duC-38-cLC"/>
+                                </constraints>
+                            </view>
+                        </subviews>
+                        <gestureRecognizers/>
+                        <constraints>
+                            <constraint firstItem="Oec-kb-Tsz" firstAttribute="top" secondItem="apW-hM-veR" secondAttribute="top" id="49H-ch-qkC"/>
+                            <constraint firstAttribute="height" constant="70" id="GhG-zB-k3A"/>
+                            <constraint firstAttribute="centerX" secondItem="Oec-kb-Tsz" secondAttribute="centerX" id="KZy-2p-KaW"/>
+                            <constraint firstItem="DYj-Mb-me4" firstAttribute="leading" secondItem="apW-hM-veR" secondAttribute="leading" id="UxL-bV-5Ca"/>
+                            <constraint firstAttribute="bottom" secondItem="DYj-Mb-me4" secondAttribute="bottom" id="YFp-gQ-NFz"/>
+                            <constraint firstAttribute="width" constant="100" id="Zr4-5T-h9g"/>
+                            <constraint firstAttribute="trailing" secondItem="DYj-Mb-me4" secondAttribute="trailing" id="ehN-ME-1U1"/>
+                            <constraint firstAttribute="centerX" secondItem="DYj-Mb-me4" secondAttribute="centerX" id="nuq-lO-8pT"/>
+                        </constraints>
+                    </view>
+                </subviews>
+                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                <constraints>
+                    <constraint firstItem="SIW-l4-PfI" firstAttribute="centerX" secondItem="Mqf-7a-bsm" secondAttribute="centerX" id="1b6-1l-hg0"/>
+                    <constraint firstAttribute="trailing" secondItem="ezT-Dl-ESR" secondAttribute="trailing" constant="8" id="3Pd-Qy-Xva"/>
+                    <constraint firstItem="ezT-Dl-ESR" firstAttribute="leading" secondItem="SIW-l4-PfI" secondAttribute="trailing" constant="3" id="9z3-D2-2SS"/>
+                    <constraint firstItem="a51-cR-7FE" firstAttribute="leading" secondItem="fCg-ju-gnG" secondAttribute="leading" constant="8" id="E3x-h8-GPF"/>
+                    <constraint firstItem="LVJ-Av-zVs" firstAttribute="leading" secondItem="fCg-ju-gnG" secondAttribute="leading" id="Hve-E3-z5N"/>
+                    <constraint firstAttribute="bottom" secondItem="LVJ-Av-zVs" secondAttribute="bottom" id="IKr-Dc-HKz"/>
+                    <constraint firstItem="apW-hM-veR" firstAttribute="leading" secondItem="fCg-ju-gnG" secondAttribute="leading" constant="18" id="LFn-vp-m0v"/>
+                    <constraint firstItem="SIW-l4-PfI" firstAttribute="top" secondItem="fCg-ju-gnG" secondAttribute="top" constant="18" id="QDm-tP-KWa"/>
+                    <constraint firstItem="ezT-Dl-ESR" firstAttribute="top" secondItem="fCg-ju-gnG" secondAttribute="top" constant="5" id="aHl-KA-68x"/>
+                    <constraint firstAttribute="bottom" secondItem="SIW-l4-PfI" secondAttribute="bottom" constant="8" id="fMN-Th-SOT"/>
+                    <constraint firstItem="a51-cR-7FE" firstAttribute="top" secondItem="fCg-ju-gnG" secondAttribute="top" constant="18" id="fQv-07-Pgx"/>
+                    <constraint firstItem="SIW-l4-PfI" firstAttribute="centerY" secondItem="ZC1-hT-7fs" secondAttribute="centerY" id="ffI-vh-SW3"/>
+                    <constraint firstItem="SIW-l4-PfI" firstAttribute="leading" secondItem="KGx-6M-GER" secondAttribute="leading" id="j1U-XX-IZW"/>
+                    <constraint firstItem="SIW-l4-PfI" firstAttribute="centerX" secondItem="ZC1-hT-7fs" secondAttribute="centerX" id="jah-TA-P0P"/>
+                    <constraint firstItem="SIW-l4-PfI" firstAttribute="top" secondItem="KGx-6M-GER" secondAttribute="top" id="loA-GI-HkT"/>
+                    <constraint firstItem="LVJ-Av-zVs" firstAttribute="top" secondItem="fCg-ju-gnG" secondAttribute="top" id="pYO-hi-P72"/>
+                    <constraint firstItem="SIW-l4-PfI" firstAttribute="centerY" secondItem="Mqf-7a-bsm" secondAttribute="centerY" id="sKJ-ny-LjM"/>
+                    <constraint firstAttribute="bottom" secondItem="a51-cR-7FE" secondAttribute="bottom" id="viZ-Sx-3RW"/>
+                    <constraint firstItem="apW-hM-veR" firstAttribute="centerY" secondItem="SIW-l4-PfI" secondAttribute="centerY" id="wmh-x1-U32"/>
+                </constraints>
+            </tableViewCellContentView>
+            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+            <connections>
+                <outlet property="activityIndicator" destination="Mqf-7a-bsm" id="toi-nL-eJa"/>
+                <outlet property="attachViewBottomConstraint" destination="fMN-Th-SOT" id="WVk-1p-S0P"/>
+                <outlet property="attachViewMinHeightConstraint" destination="kGW-IH-XnB" id="97f-NR-EDv"/>
+                <outlet property="attachViewTopConstraint" destination="QDm-tP-KWa" id="Ku6-FC-jqo"/>
+                <outlet property="attachViewWidthConstraint" destination="iGr-e7-bde" id="uD4-aU-1Ru"/>
+                <outlet property="attachmentView" destination="SIW-l4-PfI" id="L4H-ub-pPI"/>
+                <outlet property="bubbleInfoContainer" destination="a51-cR-7FE" id="wrR-cU-DVm"/>
+                <outlet property="bubbleInfoContainerTopConstraint" destination="fQv-07-Pgx" id="82c-KH-Wop"/>
+                <outlet property="fileTypeIconView" destination="KGx-6M-GER" id="MXF-4w-mY7"/>
+                <outlet property="pictureView" destination="ezT-Dl-ESR" id="YsO-Kp-xaD"/>
+                <outlet property="playIconView" destination="ZC1-hT-7fs" id="zeH-8B-gxw"/>
+                <outlet property="progressChartView" destination="Oec-kb-Tsz" id="uoq-6v-6Tm"/>
+                <outlet property="progressView" destination="apW-hM-veR" id="Iy8-ca-hMi"/>
+                <outlet property="statsLabel" destination="DYj-Mb-me4" id="CbG-5V-unO"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingAttachmentWithoutSenderInfoBubbleCell.h b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingAttachmentWithoutSenderInfoBubbleCell.h
new file mode 100644
index 000000000..61522176f
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingAttachmentWithoutSenderInfoBubbleCell.h
@@ -0,0 +1,24 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomOutgoingAttachmentBubbleCell.h"
+
+/**
+ `MXKRoomOutgoingAttachmentWithoutSenderInfoBubbleCell` displays outgoing attachment with thumbnail, without user's name.
+ */
+@interface MXKRoomOutgoingAttachmentWithoutSenderInfoBubbleCell : MXKRoomOutgoingAttachmentBubbleCell
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingAttachmentWithoutSenderInfoBubbleCell.m b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingAttachmentWithoutSenderInfoBubbleCell.m
new file mode 100644
index 000000000..eb9f8ac67
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingAttachmentWithoutSenderInfoBubbleCell.m
@@ -0,0 +1,21 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomOutgoingAttachmentWithoutSenderInfoBubbleCell.h"
+
+@implementation MXKRoomOutgoingAttachmentWithoutSenderInfoBubbleCell
+
+@end
\ No newline at end of file
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingAttachmentWithoutSenderInfoBubbleCell.xib b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingAttachmentWithoutSenderInfoBubbleCell.xib
new file mode 100644
index 000000000..e02de0455
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingAttachmentWithoutSenderInfoBubbleCell.xib
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="pad-g3-2YJ" customClass="MXKRoomOutgoingAttachmentWithoutSenderInfoBubbleCell">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="50"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="pad-g3-2YJ" id="fCg-ju-gnG">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="49"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <view contentMode="scaleAspectFit" translatesAutoresizingMaskIntoConstraints="NO" id="SIW-l4-PfI" userLabel="Attachment View" customClass="MXKImageView">
+                        <rect key="frame" x="357" y="8" width="192" height="33"/>
+                        <color key="backgroundColor" red="0.93725490196078431" green="0.93725490196078431" blue="0.95686274509803926" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="192" id="iGr-e7-bde"/>
+                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="33" id="nSK-Ug-3Q4"/>
+                        </constraints>
+                    </view>
+                    <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="KGx-6M-GER" userLabel="File Type Image View">
+                        <rect key="frame" x="357" y="8" width="32" height="32"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="32" id="QGB-Md-MLn"/>
+                            <constraint firstAttribute="width" constant="32" id="h7Q-f3-gtz"/>
+                        </constraints>
+                    </imageView>
+                    <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ZC1-hT-7fs" userLabel="Play Icon Image View">
+                        <rect key="frame" x="437" y="9" width="32" height="32"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="32" id="MOQ-Xi-18w"/>
+                            <constraint firstAttribute="height" constant="32" id="pGM-pf-SiP"/>
+                        </constraints>
+                    </imageView>
+                    <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="Mqf-7a-bsm">
+                        <rect key="frame" x="443" y="15" width="20" height="20"/>
+                    </activityIndicatorView>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LVJ-Av-zVs" userLabel="showHideDateTime">
+                        <rect key="frame" x="0.0" y="0.0" width="69" height="49"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="69" id="ghQ-Qb-BBg"/>
+                        </constraints>
+                        <state key="normal">
+                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </state>
+                        <connections>
+                            <action selector="showHideDateTime:" destination="pad-g3-2YJ" eventType="touchUpInside" id="Ztw-z5-zlU"/>
+                        </connections>
+                    </button>
+                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="a51-cR-7FE" userLabel="bubbleInfoContainer">
+                        <rect key="frame" x="8" y="8" width="61" height="41"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="61" id="fDy-iL-hrD"/>
+                        </constraints>
+                    </view>
+                    <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="apW-hM-veR" userLabel="ProgressView">
+                        <rect key="frame" x="18" y="-10" width="100" height="70"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="text" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" minimumFontSize="4" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="DYj-Mb-me4" userLabel="Progress stats">
+                                <rect key="frame" x="0.0" y="60" width="100" height="10"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="8"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oec-kb-Tsz" customClass="MXKPieChartView">
+                                <rect key="frame" x="30" y="0.0" width="40" height="40"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="40" id="6tZ-ag-7TT"/>
+                                    <constraint firstAttribute="width" constant="40" id="duC-38-cLC"/>
+                                </constraints>
+                            </view>
+                        </subviews>
+                        <gestureRecognizers/>
+                        <constraints>
+                            <constraint firstItem="Oec-kb-Tsz" firstAttribute="top" secondItem="apW-hM-veR" secondAttribute="top" id="49H-ch-qkC"/>
+                            <constraint firstAttribute="height" constant="70" id="GhG-zB-k3A"/>
+                            <constraint firstAttribute="centerX" secondItem="Oec-kb-Tsz" secondAttribute="centerX" id="KZy-2p-KaW"/>
+                            <constraint firstItem="DYj-Mb-me4" firstAttribute="leading" secondItem="apW-hM-veR" secondAttribute="leading" id="UxL-bV-5Ca"/>
+                            <constraint firstAttribute="bottom" secondItem="DYj-Mb-me4" secondAttribute="bottom" id="YFp-gQ-NFz"/>
+                            <constraint firstAttribute="width" constant="100" id="Zr4-5T-h9g"/>
+                            <constraint firstAttribute="trailing" secondItem="DYj-Mb-me4" secondAttribute="trailing" id="ehN-ME-1U1"/>
+                            <constraint firstAttribute="centerX" secondItem="DYj-Mb-me4" secondAttribute="centerX" id="nuq-lO-8pT"/>
+                        </constraints>
+                    </view>
+                </subviews>
+                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                <constraints>
+                    <constraint firstItem="SIW-l4-PfI" firstAttribute="centerX" secondItem="Mqf-7a-bsm" secondAttribute="centerX" id="1b6-1l-hg0"/>
+                    <constraint firstItem="a51-cR-7FE" firstAttribute="leading" secondItem="fCg-ju-gnG" secondAttribute="leading" constant="8" id="E3x-h8-GPF"/>
+                    <constraint firstItem="LVJ-Av-zVs" firstAttribute="leading" secondItem="fCg-ju-gnG" secondAttribute="leading" id="Hve-E3-z5N"/>
+                    <constraint firstAttribute="bottom" secondItem="LVJ-Av-zVs" secondAttribute="bottom" id="IKr-Dc-HKz"/>
+                    <constraint firstItem="apW-hM-veR" firstAttribute="leading" secondItem="fCg-ju-gnG" secondAttribute="leading" constant="18" id="LFn-vp-m0v"/>
+                    <constraint firstItem="SIW-l4-PfI" firstAttribute="top" secondItem="fCg-ju-gnG" secondAttribute="top" constant="8" id="QDm-tP-KWa"/>
+                    <constraint firstAttribute="bottom" secondItem="SIW-l4-PfI" secondAttribute="bottom" constant="8" id="fMN-Th-SOT"/>
+                    <constraint firstItem="SIW-l4-PfI" firstAttribute="centerY" secondItem="ZC1-hT-7fs" secondAttribute="centerY" id="ffI-vh-SW3"/>
+                    <constraint firstItem="SIW-l4-PfI" firstAttribute="leading" secondItem="KGx-6M-GER" secondAttribute="leading" id="j1U-XX-IZW"/>
+                    <constraint firstItem="SIW-l4-PfI" firstAttribute="centerX" secondItem="ZC1-hT-7fs" secondAttribute="centerX" id="jah-TA-P0P"/>
+                    <constraint firstItem="SIW-l4-PfI" firstAttribute="top" secondItem="KGx-6M-GER" secondAttribute="top" id="loA-GI-HkT"/>
+                    <constraint firstItem="LVJ-Av-zVs" firstAttribute="top" secondItem="fCg-ju-gnG" secondAttribute="top" id="pYO-hi-P72"/>
+                    <constraint firstItem="SIW-l4-PfI" firstAttribute="centerY" secondItem="Mqf-7a-bsm" secondAttribute="centerY" id="sKJ-ny-LjM"/>
+                    <constraint firstAttribute="bottom" secondItem="a51-cR-7FE" secondAttribute="bottom" id="viZ-Sx-3RW"/>
+                    <constraint firstAttribute="trailing" secondItem="SIW-l4-PfI" secondAttribute="trailing" constant="51" id="wgx-Zr-5R6"/>
+                    <constraint firstItem="apW-hM-veR" firstAttribute="centerY" secondItem="SIW-l4-PfI" secondAttribute="centerY" id="wmh-x1-U32"/>
+                    <constraint firstItem="a51-cR-7FE" firstAttribute="top" secondItem="fCg-ju-gnG" secondAttribute="top" constant="8" id="xop-v3-Xh2"/>
+                </constraints>
+            </tableViewCellContentView>
+            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+            <connections>
+                <outlet property="activityIndicator" destination="Mqf-7a-bsm" id="toi-nL-eJa"/>
+                <outlet property="attachViewBottomConstraint" destination="fMN-Th-SOT" id="fw0-N9-RUj"/>
+                <outlet property="attachViewMinHeightConstraint" destination="nSK-Ug-3Q4" id="rfM-Ha-vVp"/>
+                <outlet property="attachViewTopConstraint" destination="QDm-tP-KWa" id="Ku6-FC-jqo"/>
+                <outlet property="attachViewWidthConstraint" destination="iGr-e7-bde" id="uD4-aU-1Ru"/>
+                <outlet property="attachmentView" destination="SIW-l4-PfI" id="L4H-ub-pPI"/>
+                <outlet property="bubbleInfoContainer" destination="a51-cR-7FE" id="wrR-cU-DVm"/>
+                <outlet property="fileTypeIconView" destination="KGx-6M-GER" id="MXF-4w-mY7"/>
+                <outlet property="playIconView" destination="ZC1-hT-7fs" id="zeH-8B-gxw"/>
+                <outlet property="progressChartView" destination="Oec-kb-Tsz" id="uoq-6v-6Tm"/>
+                <outlet property="progressView" destination="apW-hM-veR" id="Iy8-ca-hMi"/>
+                <outlet property="statsLabel" destination="DYj-Mb-me4" id="CbG-5V-unO"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingBubbleTableViewCell.h b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingBubbleTableViewCell.h
new file mode 100644
index 000000000..dd9d05285
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingBubbleTableViewCell.h
@@ -0,0 +1,27 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomBubbleTableViewCell.h"
+
+/**
+ `MXKRoomOutgoingBubbleTableViewCell` inherits from 'MXKRoomBubbleTableViewCell' class in order to handle specific
+ options related to outgoing messages (like unsent labels, upload progress in case of attachment).
+ 
+ In order to optimize bubbles rendering, we advise to define a .xib for each layout.
+ */
+@interface MXKRoomOutgoingBubbleTableViewCell : MXKRoomBubbleTableViewCell
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingBubbleTableViewCell.m b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingBubbleTableViewCell.m
new file mode 100644
index 000000000..9c74f6aff
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingBubbleTableViewCell.m
@@ -0,0 +1,117 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomOutgoingBubbleTableViewCell.h"
+
+#import "MXEvent+MatrixKit.h"
+
+#import "NSBundle+Matrixkit.h"
+
+#import "MXKRoomBubbleCellData.h"
+
+#import "MXKSwiftHeader.h"
+
+@implementation MXKRoomOutgoingBubbleTableViewCell
+
+- (void)render:(MXKCellData *)cellData
+{
+    [super render:cellData];
+    
+    if (bubbleData)
+    {
+        // Add unsent label for failed components (except if the app customizes it) 
+        if (self.bubbleInfoContainer && (bubbleData.useCustomUnsentButton == NO))
+        {
+            for (MXKRoomBubbleComponent *component in bubbleData.bubbleComponents)
+            {
+                if (component.event.sentState == MXEventSentStateFailed)
+                {
+                    UIButton *unsentButton = [[UIButton alloc] initWithFrame:CGRectMake(0, component.position.y, 58 , 20)];
+                    
+                    [unsentButton setTitle:[MatrixKitL10n unsent] forState:UIControlStateNormal];
+                    [unsentButton setTitle:[MatrixKitL10n unsent] forState:UIControlStateSelected];
+                    [unsentButton setTitleColor:[UIColor redColor] forState:UIControlStateNormal];
+                    [unsentButton setTitleColor:[UIColor redColor] forState:UIControlStateSelected];
+                    
+                    unsentButton.backgroundColor = [UIColor whiteColor];
+                    unsentButton.titleLabel.font =  [UIFont systemFontOfSize:14];
+                    
+                    [unsentButton addTarget:self action:@selector(onResendToggle:) forControlEvents:UIControlEventTouchUpInside];
+                    
+                    [self.bubbleInfoContainer addSubview:unsentButton];
+                    self.bubbleInfoContainer.hidden = NO;
+                    self.bubbleInfoContainer.userInteractionEnabled = YES;
+                    
+                    // ensure that bubbleInfoContainer is at front to catch the tap event
+                    [self.bubbleInfoContainer.superview bringSubviewToFront:self.bubbleInfoContainer];
+                }
+            }
+        }
+    }
+}
+
+- (void)didEndDisplay
+{
+    [super didEndDisplay];
+    
+    self.bubbleInfoContainer.userInteractionEnabled = NO;
+}
+
+#pragma mark - User actions
+
+- (IBAction)onResendToggle:(id)sender
+{
+    if ([sender isKindOfClass:[UIButton class]] && self.delegate)
+    {
+        MXEvent *selectedEvent = nil;
+        
+        NSArray *bubbleComponents = bubbleData.bubbleComponents;
+        
+        if (bubbleComponents.count == 1)
+        {
+            MXKRoomBubbleComponent *component = [bubbleComponents firstObject];
+            selectedEvent = component.event;
+        }
+        else if (bubbleComponents.count)
+        {
+            // Here the selected view is a textView (attachment has no more than one component)
+            
+            // Look for the selected component
+            UIButton *unsentButton = (UIButton *)sender;
+            for (MXKRoomBubbleComponent *component in bubbleComponents)
+            {
+                // Ignore components without display.
+                if (!component.attributedTextMessage)
+                {
+                    continue;
+                }
+                
+                if (unsentButton.frame.origin.y == component.position.y)
+                {
+                    selectedEvent = component.event;
+                    break;
+                }
+            }
+        }
+        
+        if (selectedEvent)
+        {
+            [self.delegate cell:self didRecognizeAction:kMXKRoomBubbleCellUnsentButtonPressed userInfo:@{kMXKRoomBubbleCellEventKey:selectedEvent}];
+        }
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingTextMsgBubbleCell.h b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingTextMsgBubbleCell.h
new file mode 100644
index 000000000..f6665daeb
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingTextMsgBubbleCell.h
@@ -0,0 +1,24 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomOutgoingBubbleTableViewCell.h"
+
+/**
+ `MXKRoomOutgoingTextMsgBubbleCell` displays outgoing message bubbles with user's picture.
+ */
+@interface MXKRoomOutgoingTextMsgBubbleCell : MXKRoomOutgoingBubbleTableViewCell
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingTextMsgBubbleCell.m b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingTextMsgBubbleCell.m
new file mode 100644
index 000000000..232813182
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingTextMsgBubbleCell.m
@@ -0,0 +1,21 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomOutgoingTextMsgBubbleCell.h"
+
+@implementation MXKRoomOutgoingTextMsgBubbleCell
+
+@end
\ No newline at end of file
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingTextMsgBubbleCell.xib b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingTextMsgBubbleCell.xib
new file mode 100644
index 000000000..e6a54821f
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingTextMsgBubbleCell.xib
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="pad-g3-2YJ" customClass="MXKRoomOutgoingTextMsgBubbleCell">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="50"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="pad-g3-2YJ" id="fCg-ju-gnG">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="49.5"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <view clipsSubviews="YES" contentMode="scaleAspectFill" translatesAutoresizingMaskIntoConstraints="NO" id="ezT-Dl-ESR" userLabel="Picture View" customClass="MXKImageView">
+                        <rect key="frame" x="552" y="5" width="40" height="40"/>
+                        <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="40" id="JHc-dD-geb"/>
+                            <constraint firstAttribute="height" constant="40" id="lFb-Jo-C7R"/>
+                        </constraints>
+                    </view>
+                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="text message" translatesAutoresizingMaskIntoConstraints="NO" id="tgO-Rv-C7R" customClass="MXKMessageTextView">
+                        <rect key="frame" x="452" y="10" width="97" height="39.5"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="39" id="2xF-Uv-zZv"/>
+                            <constraint firstAttribute="width" constant="97" id="ghN-E7-j4d"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                        <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                        <dataDetectorType key="dataDetectorTypes" link="YES"/>
+                    </textView>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LVJ-Av-zVs" userLabel="showHideDateTime">
+                        <rect key="frame" x="0.0" y="0.0" width="69" height="49.5"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="69" id="ghQ-Qb-BBg"/>
+                        </constraints>
+                        <state key="normal">
+                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </state>
+                        <connections>
+                            <action selector="showHideDateTime:" destination="pad-g3-2YJ" eventType="touchUpInside" id="Ztw-z5-zlU"/>
+                        </connections>
+                    </button>
+                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="a51-cR-7FE" userLabel="bubbleInfoContainer">
+                        <rect key="frame" x="8" y="10" width="61" height="39.5"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="61" id="fDy-iL-hrD"/>
+                        </constraints>
+                    </view>
+                </subviews>
+                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                <constraints>
+                    <constraint firstAttribute="trailing" secondItem="ezT-Dl-ESR" secondAttribute="trailing" constant="8" id="3Pd-Qy-Xva"/>
+                    <constraint firstAttribute="bottom" secondItem="tgO-Rv-C7R" secondAttribute="bottom" id="7C3-Tl-mMq"/>
+                    <constraint firstItem="tgO-Rv-C7R" firstAttribute="top" secondItem="fCg-ju-gnG" secondAttribute="top" constant="10" id="8Sy-eu-tYs"/>
+                    <constraint firstItem="a51-cR-7FE" firstAttribute="leading" secondItem="fCg-ju-gnG" secondAttribute="leading" constant="8" id="E3x-h8-GPF"/>
+                    <constraint firstItem="LVJ-Av-zVs" firstAttribute="leading" secondItem="fCg-ju-gnG" secondAttribute="leading" id="Hve-E3-z5N"/>
+                    <constraint firstAttribute="bottom" secondItem="LVJ-Av-zVs" secondAttribute="bottom" id="IKr-Dc-HKz"/>
+                    <constraint firstItem="ezT-Dl-ESR" firstAttribute="top" secondItem="fCg-ju-gnG" secondAttribute="top" constant="5" id="aHl-KA-68x"/>
+                    <constraint firstItem="a51-cR-7FE" firstAttribute="top" secondItem="fCg-ju-gnG" secondAttribute="top" constant="10" id="fQv-07-Pgx"/>
+                    <constraint firstItem="tgO-Rv-C7R" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="fCg-ju-gnG" secondAttribute="leading" constant="69" id="hwr-aa-TB4"/>
+                    <constraint firstItem="LVJ-Av-zVs" firstAttribute="top" secondItem="fCg-ju-gnG" secondAttribute="top" id="pYO-hi-P72"/>
+                    <constraint firstAttribute="bottom" secondItem="a51-cR-7FE" secondAttribute="bottom" id="viZ-Sx-3RW"/>
+                    <constraint firstAttribute="trailing" secondItem="tgO-Rv-C7R" secondAttribute="trailing" constant="51" id="xYz-lp-c7K"/>
+                </constraints>
+            </tableViewCellContentView>
+            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+            <connections>
+                <outlet property="bubbleInfoContainer" destination="a51-cR-7FE" id="wrR-cU-DVm"/>
+                <outlet property="bubbleInfoContainerTopConstraint" destination="fQv-07-Pgx" id="82c-KH-Wop"/>
+                <outlet property="messageTextView" destination="tgO-Rv-C7R" id="LZ5-hQ-AbQ"/>
+                <outlet property="msgTextViewBottomConstraint" destination="7C3-Tl-mMq" id="wCR-UC-iq8"/>
+                <outlet property="msgTextViewLeadingConstraint" destination="hwr-aa-TB4" id="c9j-8p-cpx"/>
+                <outlet property="msgTextViewMinHeightConstraint" destination="2xF-Uv-zZv" id="t2t-18-GqU"/>
+                <outlet property="msgTextViewTopConstraint" destination="8Sy-eu-tYs" id="7yx-oJ-KBP"/>
+                <outlet property="msgTextViewTrailingConstraint" destination="xYz-lp-c7K" id="ubt-P4-J2o"/>
+                <outlet property="msgTextViewWidthConstraint" destination="ghN-E7-j4d" id="Dic-6M-yCy"/>
+                <outlet property="pictureView" destination="ezT-Dl-ESR" id="YsO-Kp-xaD"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h
new file mode 100644
index 000000000..685471b71
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h
@@ -0,0 +1,24 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomOutgoingTextMsgBubbleCell.h"
+
+/**
+ `MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell` displays outgoing message bubbles without user's name.
+ */
+@interface MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell : MXKRoomOutgoingTextMsgBubbleCell
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.m b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.m
new file mode 100644
index 000000000..41250df3f
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.m
@@ -0,0 +1,21 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h"
+
+@implementation MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell
+
+@end
\ No newline at end of file
diff --git a/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.xib b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.xib
new file mode 100644
index 000000000..b626c5077
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomBubbleList/MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.xib
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="pad-g3-2YJ" customClass="MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="35"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="pad-g3-2YJ" id="fCg-ju-gnG">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="34.5"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="text message" translatesAutoresizingMaskIntoConstraints="NO" id="tgO-Rv-C7R" customClass="MXKMessageTextView">
+                        <rect key="frame" x="452" y="0.0" width="97" height="34.5"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="97" id="QpI-TQ-x5C"/>
+                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="34" id="ur4-ZU-uyL"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                        <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                        <dataDetectorType key="dataDetectorTypes" link="YES"/>
+                    </textView>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LVJ-Av-zVs" userLabel="showHideDateTime">
+                        <rect key="frame" x="0.0" y="0.0" width="69" height="34.5"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="69" id="ghQ-Qb-BBg"/>
+                        </constraints>
+                        <state key="normal">
+                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </state>
+                        <connections>
+                            <action selector="showHideDateTime:" destination="pad-g3-2YJ" eventType="touchUpInside" id="Ztw-z5-zlU"/>
+                        </connections>
+                    </button>
+                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="a51-cR-7FE" userLabel="bubbleInfoContainer">
+                        <rect key="frame" x="8" y="0.0" width="61" height="34.5"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="61" id="fDy-iL-hrD"/>
+                        </constraints>
+                    </view>
+                </subviews>
+                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                <constraints>
+                    <constraint firstAttribute="bottom" secondItem="tgO-Rv-C7R" secondAttribute="bottom" id="7C3-Tl-mMq"/>
+                    <constraint firstItem="tgO-Rv-C7R" firstAttribute="top" secondItem="fCg-ju-gnG" secondAttribute="top" id="8Sy-eu-tYs"/>
+                    <constraint firstItem="a51-cR-7FE" firstAttribute="leading" secondItem="fCg-ju-gnG" secondAttribute="leading" constant="8" id="E3x-h8-GPF"/>
+                    <constraint firstItem="LVJ-Av-zVs" firstAttribute="leading" secondItem="fCg-ju-gnG" secondAttribute="leading" id="Hve-E3-z5N"/>
+                    <constraint firstAttribute="bottom" secondItem="LVJ-Av-zVs" secondAttribute="bottom" id="IKr-Dc-HKz"/>
+                    <constraint firstItem="a51-cR-7FE" firstAttribute="top" secondItem="fCg-ju-gnG" secondAttribute="top" id="fQv-07-Pgx"/>
+                    <constraint firstItem="tgO-Rv-C7R" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="fCg-ju-gnG" secondAttribute="leading" constant="69" id="hwr-aa-TB4"/>
+                    <constraint firstItem="LVJ-Av-zVs" firstAttribute="top" secondItem="fCg-ju-gnG" secondAttribute="top" id="pYO-hi-P72"/>
+                    <constraint firstAttribute="bottom" secondItem="a51-cR-7FE" secondAttribute="bottom" id="viZ-Sx-3RW"/>
+                    <constraint firstAttribute="trailing" secondItem="tgO-Rv-C7R" secondAttribute="trailing" constant="51" id="xYz-lp-c7K"/>
+                </constraints>
+            </tableViewCellContentView>
+            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+            <connections>
+                <outlet property="bubbleInfoContainer" destination="a51-cR-7FE" id="wrR-cU-DVm"/>
+                <outlet property="bubbleInfoContainerTopConstraint" destination="fQv-07-Pgx" id="82c-KH-Wop"/>
+                <outlet property="messageTextView" destination="tgO-Rv-C7R" id="LZ5-hQ-AbQ"/>
+                <outlet property="msgTextViewBottomConstraint" destination="7C3-Tl-mMq" id="ReW-nS-1Jc"/>
+                <outlet property="msgTextViewLeadingConstraint" destination="hwr-aa-TB4" id="c9j-8p-cpx"/>
+                <outlet property="msgTextViewMinHeightConstraint" destination="ur4-ZU-uyL" id="gIe-dR-6cb"/>
+                <outlet property="msgTextViewTopConstraint" destination="8Sy-eu-tYs" id="7yx-oJ-KBP"/>
+                <outlet property="msgTextViewTrailingConstraint" destination="xYz-lp-c7K" id="ubt-P4-J2o"/>
+                <outlet property="msgTextViewWidthConstraint" destination="QpI-TQ-x5C" id="6JK-pz-IWm"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarView.h b/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarView.h
new file mode 100644
index 000000000..3572b95e5
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarView.h
@@ -0,0 +1,358 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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/UIKit.h>
+
+#import <Photos/Photos.h>
+
+#import "MXKView.h"
+
+/**
+ List the predefined modes to handle the size of attached images
+ */
+typedef enum : NSUInteger
+{
+    /**
+     Prompt the user to select the compression level
+     */
+    MXKRoomInputToolbarCompressionModePrompt,
+    
+    /**
+     The compression level is fixed for the following modes
+     */
+    MXKRoomInputToolbarCompressionModeSmall,
+    MXKRoomInputToolbarCompressionModeMedium,
+    MXKRoomInputToolbarCompressionModeLarge,
+    
+    /**
+     No compression, the original image is sent
+     */
+    MXKRoomInputToolbarCompressionModeNone
+    
+} MXKRoomInputToolbarCompressionMode;
+
+
+@class MXKRoomInputToolbarView;
+@protocol MXKRoomInputToolbarViewDelegate <NSObject>
+
+/**
+ Tells the delegate that an alert must be presented.
+ 
+ @param toolbarView the room input toolbar view.
+ @param alertController the alert to present.
+ */
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView presentAlertController:(UIAlertController*)alertController;
+
+/**
+ Tells the delegate that the visibility of the status bar must be changed.
+ 
+ @param toolbarView the room input toolbar view.
+ @param isHidden tell whether the status bar must be hidden or not.
+ */
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView hideStatusBar:(BOOL)isHidden;
+
+@optional
+
+/**
+ Tells the delegate that the user is typing or has finished typing.
+ 
+ @param toolbarView the room input toolbar view
+ @param typing YES if the user is typing inside the message composer.
+ */
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView isTyping:(BOOL)typing;
+
+/**
+ Tells the delegate that toolbar height has been updated.
+ 
+ @param toolbarView the room input toolbar view.
+ @param height the updated height of toolbar view.
+ @param completion a block object to be executed when height change is taken into account.
+ */
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView heightDidChanged:(CGFloat)height completion:(void (^)(BOOL finished))completion;
+
+/**
+ Tells the delegate that the user wants to send a text message.
+ 
+ @param toolbarView the room input toolbar view.
+ @param textMessage the string to send.
+ */
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView sendTextMessage:(NSString*)textMessage;
+
+/**
+ Tells the delegate that the user wants to send an image.
+ 
+ @param toolbarView the room input toolbar view.
+ @param image the UIImage hosting the image data to send.
+ */
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView sendImage:(UIImage*)image;
+
+/**
+ Tells the delegate that the user wants to send an image.
+ 
+ @param toolbarView the room input toolbar view.
+ @param imageData the full-sized image data of the image.
+ @param mimetype image mime type
+ */
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView sendImage:(NSData*)imageData withMimeType:(NSString*)mimetype;
+
+/**
+ Tells the delegate that the user wants to send a video.
+ 
+ @param toolbarView the room input toolbar view.
+ @param videoLocalURL the local filesystem path of the video to send.
+ @param videoThumbnail the UIImage hosting a video thumbnail.
+ */
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView sendVideo:(NSURL*)videoLocalURL withThumbnail:(UIImage*)videoThumbnail;
+
+/**
+ Tells the delegate that the user wants to send a video.
+ 
+ @param toolbarView the room input toolbar view.
+ @param videoAsset the AVAsset that represents the video to send.
+ @param videoThumbnail the UIImage hosting a video thumbnail.
+ */
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView sendVideoAsset:(AVAsset*)videoAsset withThumbnail:(UIImage*)videoThumbnail;
+
+/**
+ Tells the delegate that the user wants to send a file.
+ 
+ @param toolbarView the room input toolbar view.
+ @param fileLocalURL the local filesystem path of the file to send.
+ @param mimetype file mime type
+ */
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView sendFile:(NSURL*)fileLocalURL withMimeType:(NSString*)mimetype;
+
+/**
+ Tells the delegate that the user wants invite a matrix user.
+ 
+ Note: `Invite matrix user` option is displayed in actions list only if the delegate implements this method.
+ 
+ @param toolbarView the room input toolbar view.
+ @param mxUserId the Matrix user id.
+ */
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView inviteMatrixUser:(NSString*)mxUserId;
+
+/**
+ Tells the delegate that the user wants to place a voice or a video call.
+ 
+ @param toolbarView the room input toolbar view.
+ @param video YES to make a video call.
+ */
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView placeCallWithVideo:(BOOL)video;
+
+/**
+ Tells the delegate that the user wants to hangup the current call.
+
+ @param toolbarView the room input toolbar view.
+ */
+- (void)roomInputToolbarViewHangupCall:(MXKRoomInputToolbarView*)toolbarView;
+
+/**
+ Tells the delegate to present a view controller modally.
+ 
+ Note: Media attachment is available only if the delegate implements this method.
+ 
+ @param toolbarView the room input toolbar view.
+ @param viewControllerToPresent the view controller to present.
+ */
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView presentViewController:(UIViewController*)viewControllerToPresent;
+
+/**
+ Tells the delegate to dismiss the view controller that was presented modally
+ 
+ @param toolbarView the room input toolbar view.
+ @param flag Pass YES to animate the transition.
+ @param completion The block to execute after the view controller is dismissed.
+ */
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView dismissViewControllerAnimated:(BOOL)flag completion:(void (^)(void))completion;
+
+/**
+ Tells the delegate to start or stop an activity indicator.
+ 
+ @param toolbarView the room input toolbar view
+ @param isAnimating YES if the activity indicator should run.
+ */
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView updateActivityIndicator:(BOOL)isAnimating;
+
+@end
+
+/**
+ `MXKRoomInputToolbarView` instance is a view used to handle all kinds of available inputs
+ for a room (message composer, attachments selection...).
+ 
+ By default the right button of the toolbar offers the following options: attach media, invite new members.
+ By default the left button is used to send the content of the message composer.
+ By default 'messageComposerContainer' is empty.
+ */
+@interface MXKRoomInputToolbarView : MXKView <UIImagePickerControllerDelegate, UINavigationControllerDelegate> {
+    /**
+     The message composer container view. Your own message composer may be added inside this container.
+     */
+    UIView *messageComposerContainer;
+    
+@protected
+    UIView *inputAccessoryView;
+}
+
+/**
+ *  Returns the `UINib` object initialized for the tool bar view.
+ *
+ *  @return The initialized `UINib` object or `nil` if there were errors during
+ *  initialization or the nib file could not be located.
+ */
++ (UINib *)nib;
+
+/**
+ Creates and returns a new `MXKRoomInputToolbarView-inherited` object.
+ 
+ @discussion This is the designated initializer for programmatic instantiation.
+ @return An initialized `MXKRoomInputToolbarView-inherited` object if successful, `nil` otherwise.
+ */
++ (instancetype)roomInputToolbarView;
+
+/**
+ The delegate notified when inputs are ready.
+ */
+@property (weak, nonatomic) id<MXKRoomInputToolbarViewDelegate> delegate;
+
+/**
+  A custom button displayed on the left of the toolbar view.
+ */
+@property (weak, nonatomic) IBOutlet UIButton *leftInputToolbarButton;
+
+/**
+ A custom button displayed on the right of the toolbar view.
+ */
+@property (weak, nonatomic) IBOutlet UIButton *rightInputToolbarButton;
+
+/**
+ Layout constraint between the top of the message composer container and the top of its superview.
+ The first view is the container, the second is the superview.
+ */
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *messageComposerContainerTopConstraint;
+
+/**
+ Layout constraint between the bottom of the message composer container and the bottom of its superview.
+ The first view is the superview, the second is the container.
+ */
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *messageComposerContainerBottomConstraint;
+
+/**
+ Tell whether the sent images and videos should be automatically saved in the user's photos library. NO by default.
+ */
+@property (nonatomic) BOOL enableAutoSaving;
+
+/**
+ Tell whether the text is editable. YES by default.
+ */
+@property(nonatomic, getter=isEditable) BOOL editable;
+
+/**
+ `onTouchUpInside` action is registered on `Touch Up Inside` event for both buttons (left and right input toolbar buttons).
+ Override this method to customize user interaction handling
+ 
+ @param button the event sender
+ */
+- (IBAction)onTouchUpInside:(UIButton*)button;
+
+/**
+ Handle image attachment
+ Save the image in user's photos library when 'isPhotoLibraryAsset' flag is NO and auto saving is enabled.
+ 
+ @param imageData the full-sized image data of the selected image.
+ @param mimetype the image MIME type (nil if unknown).
+ @param compressionMode the compression mode to apply on this image. This option is considered only for jpeg image.
+ @param isPhotoLibraryAsset tell whether the image has been selected from the user's photos library or not.
+ */
+- (void)sendSelectedImage:(NSData*)imageData withMimeType:(NSString *)mimetype andCompressionMode:(MXKRoomInputToolbarCompressionMode)compressionMode isPhotoLibraryAsset:(BOOL)isPhotoLibraryAsset;
+
+/**
+ Handle video attachment.
+ Save the video in user's photos library when 'isPhotoLibraryAsset' flag is NO and auto saving is enabled.
+ 
+ @param selectedVideo the local url of the video to send.
+ @param isPhotoLibraryAsset tell whether the video has been selected from user's photos library.
+ */
+- (void)sendSelectedVideo:(NSURL*)selectedVideo isPhotoLibraryAsset:(BOOL)isPhotoLibraryAsset;
+
+/**
+ Handle video attachment.
+ Save the video in user's photos library when 'isPhotoLibraryAsset' flag is NO and auto saving is enabled.
+ 
+ @param selectedVideo an AVAsset that represents the video to send.
+ @param isPhotoLibraryAsset tell whether the video has been selected from user's photos library.
+ */
+- (void)sendSelectedVideoAsset:(AVAsset*)selectedVideo isPhotoLibraryAsset:(BOOL)isPhotoLibraryAsset;
+
+/**
+ Handle multiple media attachments according to the compression mode.
+ 
+ @param assets the selected assets.
+ @param compressionMode the compression mode to apply on the media. This option is considered only for jpeg image.
+ */
+- (void)sendSelectedAssets:(NSArray<PHAsset*>*)assets withCompressionMode:(MXKRoomInputToolbarCompressionMode)compressionMode;
+
+/**
+ The maximum height of the toolbar.
+ A value <= 0 means no limit.
+ */
+@property CGFloat maxHeight;
+
+/**
+ The current text message in message composer.
+ */
+@property NSString *textMessage;
+
+/**
+ The string that should be displayed when there is no other text in message composer.
+ This property may be ignored when message composer does not support placeholder display.
+ */
+@property (nonatomic) NSString *placeholder;
+
+/**
+ The custom accessory view associated with the message composer. This view is
+ actually used to retrieve the keyboard view. Indeed the keyboard view is the superview of
+ the accessory view when the message composer become the first responder.
+ */
+@property (readonly) UIView *inputAccessoryView;
+
+/**
+ Display the keyboard.
+ */
+- (BOOL)becomeFirstResponder;
+
+/**
+ Force dismiss keyboard.
+ */
+- (void)dismissKeyboard;
+
+/**
+ Dispose any resources and listener.
+ */
+- (void)destroy;
+
+/**
+ Paste a text in textMessage.
+ 
+ The text is pasted at the current cursor location in the message composer or it
+ replaces the currently selected text.
+ 
+ @param text the text to paste.
+ */
+- (void)pasteText:(NSString*)text;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarView.m b/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarView.m
new file mode 100644
index 000000000..4c3924d96
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarView.m
@@ -0,0 +1,1399 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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 "MXKRoomInputToolbarView.h"
+#import "MXKSwiftHeader.h"
+#import "MXKAppSettings.h"
+
+@import MatrixSDK.MXMediaManager;
+@import MediaPlayer;
+@import MobileCoreServices;
+@import Photos;
+
+#import "MXKImageView.h"
+
+#import "MXKTools.h"
+
+#import "NSBundle+MatrixKit.h"
+#import "MXKConstants.h"
+
+@interface MXKRoomInputToolbarView()
+{
+    /**
+     Alert used to list options.
+     */
+    UIAlertController *optionsListView;
+    
+    /**
+     Current media picker
+     */
+    UIImagePickerController *mediaPicker;
+    
+    /**
+     Array of validation views (MXKImageView instances)
+     */
+    NSMutableArray *validationViews;
+    
+    /**
+     Handle images attachment
+     */
+    UIAlertController *compressionPrompt;
+    NSMutableArray *pendingImages;
+}
+
+@property (nonatomic) IBOutlet UIView *messageComposerContainer;
+
+@end
+
+@implementation MXKRoomInputToolbarView
+@synthesize messageComposerContainer, inputAccessoryView;
+
++ (UINib *)nib
+{
+    return [UINib nibWithNibName:NSStringFromClass([MXKRoomInputToolbarView class])
+                          bundle:[NSBundle bundleForClass:[MXKRoomInputToolbarView class]]];
+}
+
++ (instancetype)roomInputToolbarView
+{
+    if ([[self class] nib])
+    {
+        return [[[self class] nib] instantiateWithOwner:nil options:nil].firstObject;
+    }
+    else
+    {
+        return [[self alloc] init];
+    }
+}
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    
+    // Finalize setup
+    [self setTranslatesAutoresizingMaskIntoConstraints: NO];
+    
+    // Disable send button
+    self.rightInputToolbarButton.enabled = NO;
+    
+    // Enable text edition by default
+    self.editable = YES;
+    
+    // Localize string
+    [_rightInputToolbarButton setTitle:[MatrixKitL10n send] forState:UIControlStateNormal];
+    [_rightInputToolbarButton setTitle:[MatrixKitL10n send] forState:UIControlStateHighlighted];
+    
+    validationViews = [NSMutableArray array];
+}
+
+- (void)dealloc
+{
+    inputAccessoryView = nil;
+    
+    [self destroy];
+}
+
+#pragma mark - Override MXKView
+
+-(void)customizeViewRendering
+{
+    [super customizeViewRendering];
+    
+    // Reset default container background color
+    messageComposerContainer.backgroundColor = [UIColor clearColor];
+    
+    // Set default toolbar background color
+    self.backgroundColor = [UIColor colorWithRed:0.9 green:0.9 blue:0.9 alpha:1.0];
+}
+
+#pragma mark -
+
+- (IBAction)onTouchUpInside:(UIButton*)button
+{
+    if (button == self.leftInputToolbarButton)
+    {
+        if (optionsListView)
+        {
+            [optionsListView dismissViewControllerAnimated:NO completion:nil];
+            optionsListView = nil;
+        }
+        
+        // Option button has been pressed
+        // List available options
+        __weak typeof(self) weakSelf = self;
+        
+        // Check whether media attachment is supported
+        if ([self.delegate respondsToSelector:@selector(roomInputToolbarView:presentViewController:)])
+        {
+            optionsListView = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+            
+            [optionsListView addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n attachMedia]
+                                                                style:UIAlertActionStyleDefault
+                                                              handler:^(UIAlertAction * action) {
+                                                                  
+                                                                  if (weakSelf)
+                                                                  {
+                                                                      typeof(self) self = weakSelf;
+                                                                      self->optionsListView = nil;
+                                                                      
+                                                                      // Open media gallery
+                                                                      self->mediaPicker = [[UIImagePickerController alloc] init];
+                                                                      self->mediaPicker.delegate = self;
+                                                                      self->mediaPicker.sourceType = UIImagePickerControllerSourceTypePhotoLibrary;
+                                                                      self->mediaPicker.allowsEditing = NO;
+                                                                      self->mediaPicker.mediaTypes = [NSArray arrayWithObjects:(NSString *)kUTTypeImage, (NSString *)kUTTypeMovie, nil];
+                                                                      [self.delegate roomInputToolbarView:self presentViewController:self->mediaPicker];
+                                                                  }
+                                                                  
+                                                              }]];
+            
+            [optionsListView addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n captureMedia]
+                                                                style:UIAlertActionStyleDefault
+                                                              handler:^(UIAlertAction * action) {
+                                                                  
+                                                                  if (weakSelf)
+                                                                  {
+                                                                      typeof(self) self = weakSelf;
+                                                                      self->optionsListView = nil;
+                                                                      
+                                                                      // Open Camera
+                                                                      self->mediaPicker = [[UIImagePickerController alloc] init];
+                                                                      self->mediaPicker.delegate = self;
+                                                                      self->mediaPicker.sourceType = UIImagePickerControllerSourceTypeCamera;
+                                                                      self->mediaPicker.allowsEditing = NO;
+                                                                      self->mediaPicker.mediaTypes = [NSArray arrayWithObjects:(NSString *)kUTTypeImage, (NSString *)kUTTypeMovie, nil];
+                                                                      [self.delegate roomInputToolbarView:self presentViewController:self->mediaPicker];
+                                                                  }
+                                                                  
+                                                              }]];
+        }
+        else
+        {
+            MXLogDebug(@"[MXKRoomInputToolbarView] Attach media is not supported");
+        }
+        
+        // Check whether user invitation is supported
+        if ([self.delegate respondsToSelector:@selector(roomInputToolbarView:inviteMatrixUser:)])
+        {
+            if (!optionsListView)
+            {
+                optionsListView = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+            }
+            
+            [optionsListView addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n inviteUser]
+                                                                style:UIAlertActionStyleDefault
+                                                              handler:^(UIAlertAction * action) {
+                                                                  
+                                                                  if (weakSelf)
+                                                                  {
+                                                                      typeof(self) self = weakSelf;
+                                                                      
+                                                                      // Ask for userId to invite
+                                                                      self->optionsListView = [UIAlertController alertControllerWithTitle:[MatrixKitL10n userIdTitle] message:nil preferredStyle:UIAlertControllerStyleAlert];
+                                                                      
+                                                                      
+                                                                      [self->optionsListView addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+                                                                          
+                                                                          if (weakSelf)
+                                                                          {
+                                                                              typeof(self) self = weakSelf;
+                                                                              self->optionsListView = nil;
+                                                                          }
+                                                                          
+                                                                      }]];
+                                                                      
+                                                                      [self->optionsListView addTextFieldWithConfigurationHandler:^(UITextField *textField) {
+                                                                          
+                                                                           textField.secureTextEntry = NO;
+                                                                           textField.placeholder = [MatrixKitL10n userIdPlaceholder];
+                                                                          
+                                                                       }];
+                                                                      
+                                                                      [self->optionsListView addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n invite] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+                                                                          
+                                                                          if (weakSelf)
+                                                                          {
+                                                                              typeof(self) self = weakSelf;
+                                                                              
+                                                                              UITextField *textField = [self->optionsListView textFields].firstObject;
+                                                                              NSString *userId = textField.text;
+                                                                              
+                                                                              self->optionsListView = nil;
+                                                                              
+                                                                              if (userId.length)
+                                                                              {
+                                                                                  [self.delegate roomInputToolbarView:self inviteMatrixUser:userId];
+                                                                              }
+                                                                          }
+                                                                          
+                                                                      }]];
+                                                                      
+                                                                      [self.delegate roomInputToolbarView:self presentAlertController:self->optionsListView];
+                                                                  }
+                                                                  
+                                                              }]];
+        }
+        else
+        {
+            MXLogDebug(@"[MXKRoomInputToolbarView] Invitation is not supported");
+        }
+        
+        if (optionsListView)
+        {
+            
+            [self->optionsListView addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+                
+                if (weakSelf)
+                {
+                    typeof(self) self = weakSelf;
+                    self->optionsListView = nil;
+                }
+                
+            }]];
+            
+            [optionsListView popoverPresentationController].sourceView = button;
+            [optionsListView popoverPresentationController].sourceRect = button.bounds;
+            [self.delegate roomInputToolbarView:self presentAlertController:optionsListView];
+        }
+        else
+        {
+            MXLogDebug(@"[MXKRoomInputToolbarView] No option is supported");
+        }
+    }
+    else if (button == self.rightInputToolbarButton && self.textMessage.length)
+    {
+        // This forces an autocorrect event to happen when "Send" is pressed, which is necessary to accept a pending correction on send
+        self.textMessage = [NSString stringWithFormat:@"%@ ", self.textMessage];
+        self.textMessage = [self.textMessage substringToIndex:[self.textMessage length]-1];
+
+        NSString *message = self.textMessage;
+        
+        // Reset message, disable view animation during the update to prevent placeholder distorsion.
+        [UIView setAnimationsEnabled:NO];
+        self.textMessage = nil;
+        [UIView setAnimationsEnabled:YES];
+        
+        // Send button has been pressed
+        if (message.length && [self.delegate respondsToSelector:@selector(roomInputToolbarView:sendTextMessage:)])
+        {
+            [self.delegate roomInputToolbarView:self sendTextMessage:message];
+        }
+    }
+}
+
+- (void)setPlaceholder:(NSString *)inPlaceholder
+{
+    _placeholder = inPlaceholder;
+}
+
+- (BOOL)becomeFirstResponder
+{
+    return NO;
+}
+
+- (void)dismissKeyboard
+{
+    
+}
+
+- (void)dismissCompressionPrompt
+{
+    if (compressionPrompt)
+    {
+        [compressionPrompt dismissViewControllerAnimated:NO completion:nil];
+        compressionPrompt = nil;
+    }
+    
+    if (pendingImages.count)
+    {
+        NSData *firstImage = pendingImages.firstObject;
+        [pendingImages removeObjectAtIndex:0];
+        [self sendImage:firstImage withCompressionMode:MXKRoomInputToolbarCompressionModePrompt];
+    }
+}
+
+- (void)destroy
+{
+    [self dismissValidationViews];
+    validationViews = nil;
+    
+    if (optionsListView)
+    {
+        [optionsListView dismissViewControllerAnimated:NO completion:nil];
+        optionsListView = nil;
+    }
+    
+    [self dismissMediaPicker];
+    
+    self.delegate = nil;
+    
+    pendingImages = nil;
+    [self dismissCompressionPrompt];
+}
+
+- (void)pasteText:(NSString *)text
+{
+    // We cannot do more than appending text to self.textMessage
+    // Let 'MXKRoomInputToolbarView' children classes do the job
+    self.textMessage = [NSString stringWithFormat:@"%@%@", self.textMessage, text];
+}
+
+
+#pragma mark - MXKFileSizes
+
+/**
+ Structure representing the file sizes of a media according to different level of
+ compression.
+ */
+typedef struct
+{
+    NSUInteger small;
+    NSUInteger medium;
+    NSUInteger large;
+    NSUInteger original;
+
+} MXKFileSizes;
+
+void MXKFileSizes_init(MXKFileSizes *sizes)
+{
+    memset(sizes, 0, sizeof(MXKFileSizes));
+}
+
+MXKFileSizes MXKFileSizes_add(MXKFileSizes sizes1, MXKFileSizes sizes2)
+{
+    MXKFileSizes sizes;
+    sizes.small = sizes1.small + sizes2.small;
+    sizes.medium = sizes1.medium + sizes2.medium;
+    sizes.large = sizes1.large + sizes2.large;
+    sizes.original = sizes1.original + sizes2.original;
+
+    return sizes;
+}
+
+NSString* MXKFileSizes_description(MXKFileSizes sizes)
+{
+    return [NSString stringWithFormat:@"small: %tu - medium: %tu - large: %tu - original: %tu", sizes.small, sizes.medium, sizes.large, sizes.original];
+}
+
+- (void)availableCompressionSizesForAsset:(PHAsset*)asset onComplete:(void(^)(MXKFileSizes sizes))onComplete
+{
+    __block MXKFileSizes sizes;
+    MXKFileSizes_init(&sizes);
+
+    if (asset.mediaType == PHAssetMediaTypeImage)
+    {
+        PHImageRequestOptions *options = [[PHImageRequestOptions alloc] init];
+        options.synchronous = NO;
+        options.networkAccessAllowed = YES;
+        
+        [[PHImageManager defaultManager] requestImageDataForAsset:asset options:options resultHandler:^(NSData * _Nullable imageData, NSString * _Nullable dataUTI, UIImageOrientation orientation, NSDictionary * _Nullable info) {
+            
+            if (imageData)
+            {
+                MXLogDebug(@"[MXKRoomInputToolbarView] availableCompressionSizesForAsset: Got image data");
+                
+                UIImage *image = [UIImage imageWithData:imageData];
+                
+                MXKImageCompressionSizes compressionSizes = [MXKTools availableCompressionSizesForImage:image originalFileSize:imageData.length];
+                
+                sizes.small = compressionSizes.small.fileSize;
+                sizes.medium = compressionSizes.medium.fileSize;
+                sizes.large = compressionSizes.large.fileSize;
+                sizes.original = compressionSizes.original.fileSize;
+                
+                onComplete(sizes);
+            }
+            else
+            {
+                MXLogDebug(@"[MXKRoomInputToolbarView] availableCompressionSizesForAsset: Failed to get image data");
+                
+                // Notify user
+                NSError *error = info[@"PHImageErrorKey"];
+                if (error.userInfo[NSUnderlyingErrorKey])
+                {
+                    error = error.userInfo[NSUnderlyingErrorKey];
+                }
+                [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error];
+                
+                onComplete(sizes);
+            }
+            
+        }];
+    }
+    else if (asset.mediaType == PHAssetMediaTypeVideo)
+    {
+        PHVideoRequestOptions *options = [[PHVideoRequestOptions alloc] init];
+        options.networkAccessAllowed = YES;
+        
+        [[PHImageManager defaultManager] requestAVAssetForVideo:asset options:options resultHandler:^(AVAsset *asset, AVAudioMix *audioMix, NSDictionary *info) {
+            
+            if ([asset isKindOfClass:[AVURLAsset class]])
+            {
+                MXLogDebug(@"[MXKRoomInputToolbarView] availableCompressionSizesForAsset: Got video data");
+                AVURLAsset* urlAsset = (AVURLAsset*)asset;
+
+                NSNumber *size;
+                [urlAsset.URL getResourceValue:&size forKey:NSURLFileSizeKey error:nil];
+
+                sizes.original = size.unsignedIntegerValue;
+                sizes.small = sizes.original;
+                sizes.medium = sizes.original;
+                sizes.large = sizes.original;
+
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    onComplete(sizes);
+                });
+            }
+            else
+            {
+                MXLogDebug(@"[MXKRoomInputToolbarView] availableCompressionSizesForAsset: Failed to get video data");
+                
+                // Notify user
+                NSError *error = info[@"PHImageErrorKey"];
+                if (error.userInfo[NSUnderlyingErrorKey])
+                {
+                    error = error.userInfo[NSUnderlyingErrorKey];
+                }
+                
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    
+                    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error];
+                    onComplete(sizes);
+                    
+                });
+            }
+            
+        }];
+    }
+    else
+    {
+        MXLogDebug(@"[MXKRoomInputToolbarView] availableCompressionSizesForAsset: unexpected media type");
+        onComplete(sizes);
+    }
+}
+
+
+- (void)availableCompressionSizesForAssets:(NSMutableArray<PHAsset*>*)checkedAssets index:(NSUInteger)index appendTo:(MXKFileSizes)sizes onComplete:(void(^)(NSArray<PHAsset*>*checkedAssets, MXKFileSizes fileSizes))onComplete
+{
+    [self availableCompressionSizesForAsset:checkedAssets[index] onComplete:^(MXKFileSizes assetSizes) {
+        
+        MXKFileSizes intermediateSizes;
+        NSUInteger nextIndex;
+        
+        if (assetSizes.original == 0)
+        {
+            // Ignore this asset
+            [checkedAssets removeObjectAtIndex:index];
+            intermediateSizes = sizes;
+            nextIndex = index;
+        }
+        else
+        {
+            intermediateSizes = MXKFileSizes_add(sizes, assetSizes);
+            nextIndex = index + 1;
+        }
+
+        if (nextIndex == checkedAssets.count)
+        {
+            // Filter the sizes that are similar
+            if (intermediateSizes.medium >= intermediateSizes.large || intermediateSizes.large >= intermediateSizes.original)
+            {
+                intermediateSizes.large = 0;
+            }
+            if (intermediateSizes.small >= intermediateSizes.medium || intermediateSizes.medium >= intermediateSizes.original)
+            {
+                intermediateSizes.medium = 0;
+            }
+            if (intermediateSizes.small >= intermediateSizes.original)
+            {
+                intermediateSizes.small = 0;
+            }
+
+            onComplete(checkedAssets, intermediateSizes);
+        }
+        else
+        {
+            [self availableCompressionSizesForAssets:checkedAssets index:nextIndex appendTo:intermediateSizes onComplete:onComplete];
+        }
+    }];
+}
+
+- (void)availableCompressionSizesForAssets:(NSArray<PHAsset*>*)assets onComplete:(void(^)(NSArray<PHAsset*>*checkedAssets, MXKFileSizes fileSizes))onComplete
+{
+    __block MXKFileSizes sizes;
+    MXKFileSizes_init(&sizes);
+    
+    NSMutableArray<PHAsset*> *checkedAssets = [NSMutableArray arrayWithArray:assets];
+
+    [self availableCompressionSizesForAssets:checkedAssets index:0 appendTo:sizes onComplete:onComplete];
+}
+
+#pragma mark - Attachment handling
+
+- (void)sendSelectedImage:(NSData*)imageData withMimeType:(NSString *)mimetype andCompressionMode:(MXKRoomInputToolbarCompressionMode)compressionMode isPhotoLibraryAsset:(BOOL)isPhotoLibraryAsset
+{
+    // Check condition before saving this media in user's library
+    if (_enableAutoSaving && !isPhotoLibraryAsset)
+    {
+        // Save the original image in user's photos library
+        UIImage *image = [UIImage imageWithData:imageData];
+        [MXMediaManager saveImageToPhotosLibrary:image success:nil failure:nil];
+    }
+
+    // Send data without compression if the image type is not jpeg
+    // Force compression for a heic image so that we generate jpeg from it
+    if (mimetype
+        && [mimetype isEqualToString:@"image/jpeg"] == NO
+        && [mimetype isEqualToString:@"image/heic"] == NO
+        && [self.delegate respondsToSelector:@selector(roomInputToolbarView:sendImage:withMimeType:)])
+    {
+        [self.delegate roomInputToolbarView:self sendImage:imageData withMimeType:mimetype];
+    }
+    else
+    {
+        if ([self.delegate respondsToSelector:@selector(roomInputToolbarView:sendImage:)])
+        {
+            [self sendImage:imageData withCompressionMode:compressionMode];
+        }
+        else
+        {
+            MXLogDebug(@"[MXKRoomInputToolbarView] Attach image is not supported");
+        }
+    }
+}
+
+- (void)sendImage:(NSData*)imageData withCompressionMode:(MXKRoomInputToolbarCompressionMode)compressionMode
+{
+    if (optionsListView)
+    {
+        [optionsListView dismissViewControllerAnimated:NO completion:nil];
+        optionsListView = nil;
+    }
+    
+    if (compressionPrompt && compressionMode == MXKRoomInputToolbarCompressionModePrompt)
+    {
+        // Delay the image sending
+        if (!pendingImages)
+        {
+            pendingImages = [NSMutableArray arrayWithObject:imageData];
+        }
+        else
+        {
+            [pendingImages addObject:imageData];
+        }
+        return;
+    }
+
+    // Get available sizes for this image
+    UIImage *image = [UIImage imageWithData:imageData];
+    MXKImageCompressionSizes compressionSizes = [MXKTools availableCompressionSizesForImage:image originalFileSize:imageData.length];
+
+    // Apply the compression mode
+    if (compressionMode == MXKRoomInputToolbarCompressionModePrompt
+        && (compressionSizes.small.fileSize || compressionSizes.medium.fileSize || compressionSizes.large.fileSize))
+    {
+        __weak typeof(self) weakSelf = self;
+        
+        compressionPrompt = [UIAlertController alertControllerWithTitle:[MatrixKitL10n attachmentSizePromptTitle]
+                                                                message:[MatrixKitL10n attachmentSizePromptMessage]
+                                                         preferredStyle:UIAlertControllerStyleActionSheet];
+        
+        if (compressionSizes.small.fileSize)
+        {
+            NSString *fileSizeString = [MXTools fileSizeToString:compressionSizes.small.fileSize];
+
+            NSString *title = [MatrixKitL10n attachmentSmall:fileSizeString];
+            
+            [compressionPrompt addAction:[UIAlertAction actionWithTitle:title
+                                                                  style:UIAlertActionStyleDefault
+                                                                handler:^(UIAlertAction * action) {
+                                                                    
+                                                                    if (weakSelf)
+                                                                    {
+                                                                        typeof(self) self = weakSelf;
+                                                                        
+                                                                        // Send the small image
+                                                                        UIImage *smallImage = [MXKTools reduceImage:image toFitInSize:CGSizeMake(MXKTOOLS_SMALL_IMAGE_SIZE, MXKTOOLS_SMALL_IMAGE_SIZE)];
+                                                                        [self.delegate roomInputToolbarView:self sendImage:smallImage];
+                                                                        
+                                                                        [self dismissCompressionPrompt];
+                                                                    }
+                                                                    
+                                                                }]];
+        }
+        
+        if (compressionSizes.medium.fileSize)
+        {
+            NSString *fileSizeString = [MXTools fileSizeToString:compressionSizes.medium.fileSize];
+
+            NSString *title = [MatrixKitL10n attachmentMedium:fileSizeString];
+            
+            [compressionPrompt addAction:[UIAlertAction actionWithTitle:title
+                                                                  style:UIAlertActionStyleDefault
+                                                                handler:^(UIAlertAction * action) {
+                                                                    
+                                                                    if (weakSelf)
+                                                                    {
+                                                                        typeof(self) self = weakSelf;
+                                                                        
+                                                                        // Send the medium image
+                                                                        UIImage *mediumImage = [MXKTools reduceImage:image toFitInSize:CGSizeMake(MXKTOOLS_MEDIUM_IMAGE_SIZE, MXKTOOLS_MEDIUM_IMAGE_SIZE)];
+                                                                        [self.delegate roomInputToolbarView:self sendImage:mediumImage];
+                                                                        
+                                                                        [self dismissCompressionPrompt];
+                                                                    }
+                                                                    
+                                                                }]];
+        }
+        
+        if (compressionSizes.large.fileSize)
+        {
+            NSString *fileSizeString = [MXTools fileSizeToString:compressionSizes.large.fileSize];
+
+            NSString *title = [MatrixKitL10n attachmentLarge:fileSizeString];
+            
+            [compressionPrompt addAction:[UIAlertAction actionWithTitle:title
+                                                                  style:UIAlertActionStyleDefault
+                                                                handler:^(UIAlertAction * action) {
+                                                                    
+                                                                    if (weakSelf)
+                                                                    {
+                                                                        typeof(self) self = weakSelf;
+                                                                        
+                                                                        // Send the large image
+                                                                        UIImage *largeImage = [MXKTools reduceImage:image toFitInSize:CGSizeMake(compressionSizes.actualLargeSize, compressionSizes.actualLargeSize)];
+                                                                        [self.delegate roomInputToolbarView:self sendImage:largeImage];
+                                                                        
+                                                                        [self dismissCompressionPrompt];
+                                                                    }
+                                                                    
+                                                                }]];
+        }
+        
+        NSString *fileSizeString = [MXTools fileSizeToString:compressionSizes.original.fileSize];
+        
+        NSString *title = [MatrixKitL10n attachmentOriginal:fileSizeString];
+        
+        [compressionPrompt addAction:[UIAlertAction actionWithTitle:title
+                                                              style:UIAlertActionStyleDefault
+                                                            handler:^(UIAlertAction * action) {
+                                                                
+                                                                if (weakSelf)
+                                                                {
+                                                                    typeof(self) self = weakSelf;
+                                                                    
+                                                                    // Send the original image
+                                                                    [self.delegate roomInputToolbarView:self sendImage:image];
+                                                                    
+                                                                    [self dismissCompressionPrompt];
+                                                                }
+                                                                
+                                                            }]];
+        
+        [compressionPrompt addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+                                                              style:UIAlertActionStyleCancel
+                                                            handler:^(UIAlertAction * action) {
+                                                                
+                                                                if (weakSelf)
+                                                                {
+                                                                    typeof(self) self = weakSelf;
+                                                                    
+                                                                    [self dismissCompressionPrompt];
+                                                                }
+                                                                
+                                                            }]];
+        
+        [compressionPrompt popoverPresentationController].sourceView = self;
+        [compressionPrompt popoverPresentationController].sourceRect = self.bounds;
+        [self.delegate roomInputToolbarView:self presentAlertController:compressionPrompt];
+    }
+    else
+    {
+        // By default the original image is sent
+        UIImage *finalImage = image;
+        
+        switch (compressionMode)
+        {
+            case MXKRoomInputToolbarCompressionModePrompt:
+                // Here the image size is too small to need compression - send the original image
+                break;
+                
+            case MXKRoomInputToolbarCompressionModeSmall:
+                if (compressionSizes.small.fileSize)
+                {
+                    finalImage = [MXKTools reduceImage:image toFitInSize:CGSizeMake(MXKTOOLS_SMALL_IMAGE_SIZE, MXKTOOLS_SMALL_IMAGE_SIZE)];
+                }
+                break;
+                
+            case MXKRoomInputToolbarCompressionModeMedium:
+                if (compressionSizes.medium.fileSize)
+                {
+                    finalImage = [MXKTools reduceImage:image toFitInSize:CGSizeMake(MXKTOOLS_MEDIUM_IMAGE_SIZE, MXKTOOLS_MEDIUM_IMAGE_SIZE)];
+                }
+                break;
+                
+            case MXKRoomInputToolbarCompressionModeLarge:
+                if (compressionSizes.large.fileSize)
+                {
+                    finalImage = [MXKTools reduceImage:image toFitInSize:CGSizeMake(compressionSizes.actualLargeSize, compressionSizes.actualLargeSize)];
+                }
+                break;
+                
+            default:
+                // no compression, send original
+                break;
+        }
+        
+        // Send the image
+        [self.delegate roomInputToolbarView:self sendImage:finalImage];
+    }
+}
+
+- (void)sendSelectedVideo:(NSURL*)selectedVideo isPhotoLibraryAsset:(BOOL)isPhotoLibraryAsset
+{
+    AVURLAsset *videoAsset = [AVURLAsset assetWithURL:selectedVideo];
+    [self sendSelectedVideoAsset:videoAsset isPhotoLibraryAsset:isPhotoLibraryAsset];
+}
+
+- (void)sendSelectedVideoAsset:(AVAsset*)selectedVideo isPhotoLibraryAsset:(BOOL)isPhotoLibraryAsset
+{
+    // Check condition before saving this media in user's library
+    if (_enableAutoSaving && !isPhotoLibraryAsset)
+    {
+        if ([selectedVideo isKindOfClass:[AVURLAsset class]])
+        {
+            AVURLAsset *urlAsset = (AVURLAsset*)selectedVideo;
+            [MXMediaManager saveMediaToPhotosLibrary:[urlAsset URL] isImage:NO success:nil failure:nil];
+        }
+        else
+        {
+            MXLogError(@"[RoomInputToolbarView] Unable to save video, incorrect asset type.")
+        }
+    }
+    
+    if ([self.delegate respondsToSelector:@selector(roomInputToolbarView:sendVideoAsset:withThumbnail:)])
+    {
+        // Retrieve the video frame at 1 sec to define the video thumbnail
+        AVAssetImageGenerator *assetImageGenerator = [AVAssetImageGenerator assetImageGeneratorWithAsset:selectedVideo];
+        assetImageGenerator.appliesPreferredTrackTransform = YES;
+        CMTime time = CMTimeMake(1, 1);
+        CGImageRef imageRef = [assetImageGenerator copyCGImageAtTime:time actualTime:NULL error:nil];
+        
+        // Finalize video attachment
+        UIImage* videoThumbnail = [[UIImage alloc] initWithCGImage:imageRef];
+        CFRelease(imageRef);
+        
+        [self.delegate roomInputToolbarView:self sendVideoAsset:selectedVideo withThumbnail:videoThumbnail];
+    }
+    else
+    {
+        MXLogDebug(@"[RoomInputToolbarView] Attach video is not supported");
+    }
+}
+
+- (void)sendSelectedAssets:(NSArray<PHAsset*>*)assets withCompressionMode:(MXKRoomInputToolbarCompressionMode)compressionMode
+{
+    // Get data about the selected assets
+    if (assets.count)
+    {
+        if ([self.delegate respondsToSelector:@selector(roomInputToolbarView:updateActivityIndicator:)])
+        {
+            [self.delegate roomInputToolbarView:self updateActivityIndicator:YES];
+        }
+        
+        [self availableCompressionSizesForAssets:assets onComplete:^(NSArray<PHAsset*>*checkedAssets, MXKFileSizes fileSizes) {
+            
+            if ([self.delegate respondsToSelector:@selector(roomInputToolbarView:updateActivityIndicator:)])
+            {
+                [self.delegate roomInputToolbarView:self updateActivityIndicator:NO];
+            }
+            
+            if (checkedAssets.count)
+            {
+                [self sendSelectedAssets:checkedAssets withFileSizes:fileSizes andCompressionMode:compressionMode];
+            }
+            
+        }];
+    }
+}
+
+- (void)sendSelectedAssets:(NSArray<PHAsset*>*)assets withFileSizes:(MXKFileSizes)fileSizes andCompressionMode:(MXKRoomInputToolbarCompressionMode)compressionMode
+{
+    if (compressionMode == MXKRoomInputToolbarCompressionModePrompt
+        && (fileSizes.small || fileSizes.medium || fileSizes.large))
+    {
+        // Ask the user for the compression value
+        compressionPrompt = [UIAlertController alertControllerWithTitle:[MatrixKitL10n attachmentSizePromptTitle]
+                                                                message:[MatrixKitL10n attachmentSizePromptMessage]
+                                                         preferredStyle:UIAlertControllerStyleActionSheet];
+        
+        __weak typeof(self) weakSelf = self;
+
+        if (fileSizes.small)
+        {
+            NSString *title = [MatrixKitL10n attachmentSmall:[MXTools fileSizeToString:fileSizes.small]];
+            
+            [compressionPrompt addAction:[UIAlertAction actionWithTitle:title
+                                                                  style:UIAlertActionStyleDefault
+                                                                handler:^(UIAlertAction * action) {
+                                                                    
+                                                                    if (weakSelf)
+                                                                    {
+                                                                        typeof(self) self = weakSelf;
+                                                                        
+                                                                        [self dismissCompressionPrompt];
+                                                                        
+                                                                        [self sendSelectedAssets:assets withFileSizes:fileSizes andCompressionMode:MXKRoomInputToolbarCompressionModeSmall];
+                                                                    }
+                                                                    
+                                                                }]];
+        }
+
+        if (fileSizes.medium)
+        {
+            NSString *title = [MatrixKitL10n attachmentMedium:[MXTools fileSizeToString:fileSizes.medium]];
+            
+            [compressionPrompt addAction:[UIAlertAction actionWithTitle:title
+                                                                  style:UIAlertActionStyleDefault
+                                                                handler:^(UIAlertAction * action) {
+                                                                    
+                                                                    if (weakSelf)
+                                                                    {
+                                                                        typeof(self) self = weakSelf;
+                                                                        
+                                                                        [self dismissCompressionPrompt];
+                                                                        
+                                                                        [self sendSelectedAssets:assets withFileSizes:fileSizes andCompressionMode:MXKRoomInputToolbarCompressionModeMedium];
+                                                                    }
+                                                                    
+                                                                }]];
+        }
+
+        if (fileSizes.large)
+        {
+            NSString *title = [MatrixKitL10n attachmentLarge:[MXTools fileSizeToString:fileSizes.large]];
+            
+            [compressionPrompt addAction:[UIAlertAction actionWithTitle:title
+                                                                  style:UIAlertActionStyleDefault
+                                                                handler:^(UIAlertAction * action) {
+                                                                    
+                                                                    if (weakSelf)
+                                                                    {
+                                                                        typeof(self) self = weakSelf;
+                                                                        
+                                                                        [self dismissCompressionPrompt];
+                                                                        
+                                                                        [self sendSelectedAssets:assets withFileSizes:fileSizes andCompressionMode:MXKRoomInputToolbarCompressionModeLarge];
+                                                                    }
+                                                                    
+                                                                }]];
+        }
+
+        NSString *title = [MatrixKitL10n attachmentOriginal:[MXTools fileSizeToString:fileSizes.original]];
+        
+        [compressionPrompt addAction:[UIAlertAction actionWithTitle:title
+                                                              style:UIAlertActionStyleDefault
+                                                            handler:^(UIAlertAction * action) {
+                                                                
+                                                                if (weakSelf)
+                                                                {
+                                                                    typeof(self) self = weakSelf;
+                                                                    
+                                                                    [self dismissCompressionPrompt];
+                                                                    
+                                                                    [self sendSelectedAssets:assets withFileSizes:fileSizes andCompressionMode:MXKRoomInputToolbarCompressionModeNone];
+                                                                }
+                                                                
+                                                            }]];
+        
+        [compressionPrompt addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+                                                              style:UIAlertActionStyleCancel
+                                                            handler:^(UIAlertAction * action) {
+                                                                
+                                                                if (weakSelf)
+                                                                {
+                                                                    typeof(self) self = weakSelf;
+                                                                    
+                                                                    [self dismissCompressionPrompt];
+                                                                }
+                                                                
+                                                            }]];
+        
+        [compressionPrompt popoverPresentationController].sourceView = self;
+        [compressionPrompt popoverPresentationController].sourceRect = self.bounds;
+        [self.delegate roomInputToolbarView:self presentAlertController:compressionPrompt];
+    }
+    else
+    {
+        // Send all media with the selected compression mode
+        for (PHAsset *asset in assets)
+        {
+            if (asset.mediaType == PHAssetMediaTypeImage)
+            {
+                // Retrieve the full sized image data
+                PHImageRequestOptions *options = [[PHImageRequestOptions alloc] init];
+                options.synchronous = NO;
+                options.networkAccessAllowed = YES;
+                
+                [[PHImageManager defaultManager] requestImageDataForAsset:asset options:options resultHandler:^(NSData * _Nullable imageData, NSString * _Nullable dataUTI, UIImageOrientation orientation, NSDictionary * _Nullable info) {
+                    
+                    if (imageData)
+                    {
+                        MXLogDebug(@"[MXKRoomInputToolbarView] sendSelectedAssets: Got image data");
+                        
+                        CFStringRef uti = (__bridge CFStringRef)dataUTI;
+                        NSString *mimeType = (__bridge_transfer NSString *) UTTypeCopyPreferredTagWithClass(uti, kUTTagClassMIMEType);
+                        
+                        [self sendSelectedImage:imageData withMimeType:mimeType andCompressionMode:compressionMode isPhotoLibraryAsset:YES];
+                    }
+                    else
+                    {
+                        MXLogDebug(@"[MXKRoomInputToolbarView] sendSelectedAssets: Failed to get image data");
+                        
+                        // Notify user
+                        NSError *error = info[@"PHImageErrorKey"];
+                        if (error.userInfo[NSUnderlyingErrorKey])
+                        {
+                            error = error.userInfo[NSUnderlyingErrorKey];
+                        }
+                        [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error];
+                    }
+                    
+                }];
+            }
+            else if (asset.mediaType == PHAssetMediaTypeVideo)
+            {
+                PHVideoRequestOptions *options = [[PHVideoRequestOptions alloc] init];
+                options.networkAccessAllowed = YES;
+                
+                [[PHImageManager defaultManager] requestAVAssetForVideo:asset options:options resultHandler:^(AVAsset *asset, AVAudioMix *audioMix, NSDictionary *info) {
+                    
+                    if ([asset isKindOfClass:[AVURLAsset class]])
+                    {
+                        MXLogDebug(@"[MXKRoomInputToolbarView] sendSelectedAssets: Got video data");
+                        AVURLAsset* urlAsset = (AVURLAsset*)asset;
+                        
+                        dispatch_async(dispatch_get_main_queue(), ^{
+                            
+                            [self sendSelectedVideo:urlAsset.URL isPhotoLibraryAsset:YES];
+                            
+                        });
+                    }
+                    else
+                    {
+                        MXLogDebug(@"[MXKRoomInputToolbarView] sendSelectedAssets: Failed to get video data");
+                        
+                        // Notify user
+                        NSError *error = info[@"PHImageErrorKey"];
+                        if (error.userInfo[NSUnderlyingErrorKey])
+                        {
+                            error = error.userInfo[NSUnderlyingErrorKey];
+                        }
+                        
+                        dispatch_async(dispatch_get_main_queue(), ^{
+                            
+                            [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error];
+                            
+                        });
+                    }
+                    
+                }];
+            }
+        }
+    }
+}
+
+#pragma mark - UIImagePickerControllerDelegate
+
+- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info
+{
+    [self dismissMediaPicker];
+    
+    NSString *mediaType = [info objectForKey:UIImagePickerControllerMediaType];
+    if ([mediaType isEqualToString:(NSString *)kUTTypeImage])
+    {
+        UIImage *selectedImage = [info objectForKey:UIImagePickerControllerOriginalImage];
+        if (selectedImage)
+        {
+            // Media picker does not offer a preview
+            // so add a preview to let the user validates his selection
+            if (picker.sourceType == UIImagePickerControllerSourceTypePhotoLibrary)
+            {
+                __weak typeof(self) weakSelf = self;
+                
+                MXKImageView *imageValidationView = [[MXKImageView alloc] initWithFrame:CGRectZero];
+                imageValidationView.stretchable = YES;
+                
+                // the user validates the image
+                [imageValidationView setRightButtonTitle:[MatrixKitL10n ok] handler:^(MXKImageView* imageView, NSString* buttonTitle)
+                 {
+                     if (weakSelf)
+                     {
+                         typeof(self) self = weakSelf;
+                         
+                         // Dismiss the image view
+                         [self dismissValidationViews];
+                         
+                         NSURL *imageLocalURL = [info objectForKey:UIImagePickerControllerReferenceURL];
+                         if (imageLocalURL)
+                         {
+                             CFStringRef uti = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, (__bridge CFStringRef)[imageLocalURL.path pathExtension] , NULL);
+                             NSString *mimetype = (__bridge_transfer NSString *) UTTypeCopyPreferredTagWithClass(uti, kUTTagClassMIMEType);
+                             CFRelease(uti);
+                             
+                             NSData *imageData = [NSData dataWithContentsOfFile:imageLocalURL.path];
+                             
+                             // attach the selected image
+                             [self sendSelectedImage:imageData withMimeType:mimetype andCompressionMode:MXKRoomInputToolbarCompressionModePrompt isPhotoLibraryAsset:YES];
+                         }
+                     }
+                     
+                 }];
+                
+                // the user wants to use an other image
+                [imageValidationView setLeftButtonTitle:[MatrixKitL10n cancel] handler:^(MXKImageView* imageView, NSString* buttonTitle)
+                 {
+                     if (weakSelf)
+                     {
+                         typeof(self) self = weakSelf;
+                         
+                         // dismiss the image view
+                         [self dismissValidationViews];
+                         
+                         // Open again media gallery
+                         self->mediaPicker = [[UIImagePickerController alloc] init];
+                         self->mediaPicker.delegate = self;
+                         self->mediaPicker.sourceType = picker.sourceType;
+                         self->mediaPicker.allowsEditing = NO;
+                         self->mediaPicker.mediaTypes = picker.mediaTypes;
+                         [self.delegate roomInputToolbarView:self presentViewController:self->mediaPicker];
+                     }
+                 }];
+                
+                imageValidationView.image = selectedImage;
+                
+                [validationViews addObject:imageValidationView];
+                [imageValidationView showFullScreen];
+                [self.delegate roomInputToolbarView:self hideStatusBar:YES];
+            }
+            else
+            {
+                // Suggest compression before sending image
+                NSData *imageData = UIImageJPEGRepresentation(selectedImage, 0.9);
+                [self sendSelectedImage:imageData withMimeType:nil andCompressionMode:MXKRoomInputToolbarCompressionModePrompt isPhotoLibraryAsset:NO];
+            }
+        }
+    }
+    else if ([mediaType isEqualToString:(NSString *)kUTTypeMovie])
+    {
+        NSURL* selectedVideo = [info objectForKey:UIImagePickerControllerMediaURL];
+        
+        [self sendSelectedVideo:selectedVideo isPhotoLibraryAsset:(picker.sourceType == UIImagePickerControllerSourceTypePhotoLibrary)];
+    }
+}
+
+- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker
+{
+    [self dismissMediaPicker];
+}
+
+- (void)dismissValidationViews
+{
+    if (validationViews.count)
+    {
+        for (MXKImageView *validationView in validationViews)
+        {
+            [validationView dismissSelection];
+            [validationView removeFromSuperview];
+        }
+        
+        [validationViews removeAllObjects];
+        
+        // Restore status bar
+        [self.delegate roomInputToolbarView:self hideStatusBar:NO];
+    }
+}
+
+- (void)dismissValidationView:(MXKImageView*)validationView
+{
+    [validationView dismissSelection];
+    [validationView removeFromSuperview];
+    
+    if (validationViews.count)
+    {
+        [validationViews removeObject:validationView];
+        
+        if (!validationViews.count)
+        {
+            // Restore status bar
+            [self.delegate roomInputToolbarView:self hideStatusBar:NO];
+        }
+    }
+}
+
+- (void)dismissMediaPicker
+{
+    if (mediaPicker)
+    {
+        mediaPicker.delegate = nil;
+        
+        if ([self.delegate respondsToSelector:@selector(roomInputToolbarView:dismissViewControllerAnimated:completion:)])
+        {
+            [self.delegate roomInputToolbarView:self dismissViewControllerAnimated:NO completion:^{
+                self->mediaPicker = nil;
+            }];
+        }
+    }
+}
+
+#pragma mark - Clipboard - Handle image/data paste from general pasteboard
+
+- (void)paste:(id)sender
+{
+    UIPasteboard *pasteboard = MXKPasteboardManager.shared.pasteboard;
+    if (pasteboard.numberOfItems)
+    {
+        [self dismissValidationViews];
+        [self dismissKeyboard];
+        
+        __weak typeof(self) weakSelf = self;
+        
+        for (NSDictionary* dict in pasteboard.items)
+        {
+            NSArray* allKeys = dict.allKeys;
+            for (NSString* key in allKeys)
+            {
+                NSString* MIMEType = (__bridge_transfer NSString *) UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)key, kUTTagClassMIMEType);
+                if ([MIMEType hasPrefix:@"image/"] && [self.delegate respondsToSelector:@selector(roomInputToolbarView:sendImage:)])
+                {
+                    UIImage *pasteboardImage;
+                    if ([[dict objectForKey:key] isKindOfClass:UIImage.class])
+                    {
+                        pasteboardImage = [dict objectForKey:key];
+                    }
+                    // WebP images from Safari appear on the pasteboard as NSData rather than UIImages.
+                    else if ([[dict objectForKey:key] isKindOfClass:NSData.class])
+                    {
+                        pasteboardImage = [UIImage imageWithData:[dict objectForKey:key]];
+                    }
+                    else {
+                        MXLogError(@"[MXKRoomInputToolbarView] Unsupported image format %@ for mimetype %@ pasted.", MIMEType, NSStringFromClass([[dict objectForKey:key] class]));
+                    }
+                    
+                    if (pasteboardImage)
+                    {
+                        MXKImageView *imageValidationView = [[MXKImageView alloc] initWithFrame:CGRectZero];
+                        imageValidationView.stretchable = YES;
+                        
+                        // the user validates the image
+                        [imageValidationView setRightButtonTitle:[MatrixKitL10n ok] handler:^(MXKImageView* imageView, NSString* buttonTitle)
+                         {
+                             if (weakSelf)
+                             {
+                                 typeof(self) self = weakSelf;
+                                 [self dismissValidationView:imageView];
+                                 [self.delegate roomInputToolbarView:self sendImage:pasteboardImage];
+                             }
+                         }];
+                        
+                        // the user wants to use an other image
+                        [imageValidationView setLeftButtonTitle:[MatrixKitL10n cancel] handler:^(MXKImageView* imageView, NSString* buttonTitle)
+                         {
+                             // Dismiss the image validation view.
+                             if (weakSelf)
+                             {
+                                 typeof(self) self = weakSelf;
+                                 [self dismissValidationView:imageView];
+                             }
+                         }];
+                        
+                        imageValidationView.image = pasteboardImage;
+                        
+                        [validationViews addObject:imageValidationView];
+                        [imageValidationView showFullScreen];
+                        [self.delegate roomInputToolbarView:self hideStatusBar:YES];
+                    }
+                    
+                    break;
+                }
+                else if ([MIMEType hasPrefix:@"video/"] && [self.delegate respondsToSelector:@selector(roomInputToolbarView:sendVideo:withThumbnail:)])
+                {
+                    NSData *pasteboardVideoData = [dict objectForKey:key];
+                    // Get a unique cache path to store this video
+                    NSString *cacheFilePath = [MXMediaManager temporaryCachePathInFolder:nil withType:MIMEType];
+                    
+                    if ([MXMediaManager writeMediaData:pasteboardVideoData toFilePath:cacheFilePath])
+                    {
+                        NSURL *videoLocalURL = [NSURL fileURLWithPath:cacheFilePath isDirectory:NO];
+                        
+                        // Retrieve the video frame at 1 sec to define the video thumbnail
+                        AVURLAsset *urlAsset = [[AVURLAsset alloc] initWithURL:videoLocalURL options:nil];
+                        AVAssetImageGenerator *assetImageGenerator = [AVAssetImageGenerator assetImageGeneratorWithAsset:urlAsset];
+                        assetImageGenerator.appliesPreferredTrackTransform = YES;
+                        CMTime time = CMTimeMake(1, 1);
+                        CGImageRef imageRef = [assetImageGenerator copyCGImageAtTime:time actualTime:NULL error:nil];
+                        UIImage* videoThumbnail = [[UIImage alloc] initWithCGImage:imageRef];
+                        CFRelease (imageRef);
+                        
+                        MXKImageView *videoValidationView = [[MXKImageView alloc] initWithFrame:CGRectZero];
+                        videoValidationView.stretchable = YES;
+                        
+                        // the user validates the image
+                        [videoValidationView setRightButtonTitle:[MatrixKitL10n ok] handler:^(MXKImageView* imageView, NSString* buttonTitle)
+                         {
+                             if (weakSelf)
+                             {
+                                 typeof(self) self = weakSelf;
+                                 [self dismissValidationView:imageView];
+                                 
+                                 [self.delegate roomInputToolbarView:self sendVideo:videoLocalURL withThumbnail:videoThumbnail];
+                             }
+                         }];
+                        
+                        // the user wants to use an other image
+                        [videoValidationView setLeftButtonTitle:[MatrixKitL10n cancel] handler:^(MXKImageView* imageView, NSString* buttonTitle)
+                         {
+                             // Dismiss the video validation view.
+                             if (weakSelf)
+                             {
+                                 typeof(self) self = weakSelf;
+                                 [self dismissValidationView:imageView];
+                             }
+                         }];
+                        
+                        videoValidationView.image = videoThumbnail;
+                        
+                        [validationViews addObject:videoValidationView];
+                        [videoValidationView showFullScreen];
+                        [self.delegate roomInputToolbarView:self hideStatusBar:YES];
+                        
+                        // Add video icon
+                        UIImageView *videoIconView = [[UIImageView alloc] initWithImage:[NSBundle mxk_imageFromMXKAssetsBundleWithName:@"icon_video"]];
+                        videoIconView.center = videoValidationView.center;
+                        videoIconView.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleTopMargin;
+                        [videoValidationView addSubview:videoIconView];
+                    }
+                    break;
+                }
+                else if ([MIMEType hasPrefix:@"application/"] && [self.delegate respondsToSelector:@selector(roomInputToolbarView:sendFile:withMimeType:)])
+                {
+                    NSData *pasteboardDocumentData = [dict objectForKey:key];
+                    // Get a unique cache path to store this data
+                    NSString *cacheFilePath = [MXMediaManager temporaryCachePathInFolder:nil withType:MIMEType];
+                    
+                    if ([MXMediaManager writeMediaData:pasteboardDocumentData toFilePath:cacheFilePath])
+                    {
+                        NSURL *localURL = [NSURL fileURLWithPath:cacheFilePath isDirectory:NO];
+                        
+                        MXKImageView *docValidationView = [[MXKImageView alloc] initWithFrame:CGRectZero];
+                        docValidationView.stretchable = YES;
+                        
+                        // the user validates the image
+                        [docValidationView setRightButtonTitle:[MatrixKitL10n ok] handler:^(MXKImageView* imageView, NSString* buttonTitle)
+                         {
+                             if (weakSelf)
+                             {
+                                 typeof(self) self = weakSelf;
+                                 [self dismissValidationView:imageView];
+                                 
+                                 [self.delegate roomInputToolbarView:self sendFile:localURL withMimeType:MIMEType];
+                             }
+                         }];
+                        
+                        // the user wants to use an other image
+                        [docValidationView setLeftButtonTitle:[MatrixKitL10n cancel] handler:^(MXKImageView* imageView, NSString* buttonTitle)
+                         {
+                             // Dismiss the validation view.
+                             if (weakSelf)
+                             {
+                                 typeof(self) self = weakSelf;
+                                 [self dismissValidationView:imageView];
+                             }
+                         }];
+                        
+                        docValidationView.image = nil;
+                        
+                        [validationViews addObject:docValidationView];
+                        [docValidationView showFullScreen];
+                        [self.delegate roomInputToolbarView:self hideStatusBar:YES];
+                        
+                        // Create a fake name based on fileData to keep the same name for the same file.
+                        NSString *dataHash = [pasteboardDocumentData mx_MD5];
+                        if (dataHash.length > 7)
+                        {
+                            // Crop
+                            dataHash = [dataHash substringToIndex:7];
+                        }
+                        NSString *extension = [MXTools fileExtensionFromContentType:MIMEType];
+                        NSString *filename = [NSString stringWithFormat:@"file_%@%@", dataHash, extension];
+                        
+                        // Display this file name
+                        UITextView *fileNameTextView = [[UITextView alloc] initWithFrame:CGRectZero];
+                        fileNameTextView.text = filename;
+                        fileNameTextView.font = [UIFont systemFontOfSize:17];
+                        [fileNameTextView sizeToFit];
+                        fileNameTextView.center = docValidationView.center;
+                        fileNameTextView.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleTopMargin;
+                        
+                        docValidationView.backgroundColor = [UIColor whiteColor];
+                        [docValidationView addSubview:fileNameTextView];
+                    }
+                    break;
+                }
+            }
+        }
+    }
+}
+
+- (BOOL)canPerformAction:(SEL)action withSender:(id)sender
+{
+    if (action == @selector(paste:) && MXKAppSettings.standardAppSettings.messageDetailsAllowPastingMedia)
+    {
+        // Check whether some data listed in general pasteboard can be paste
+        UIPasteboard *pasteboard = MXKPasteboardManager.shared.pasteboard;
+        if (pasteboard.numberOfItems)
+        {
+            for (NSDictionary* dict in pasteboard.items)
+            {
+                NSArray* allKeys = dict.allKeys;
+                for (NSString* key in allKeys)
+                {
+                    NSString* MIMEType = (__bridge_transfer NSString *) UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)key, kUTTagClassMIMEType);
+                    
+                    if ([MIMEType hasPrefix:@"image/"] && [self.delegate respondsToSelector:@selector(roomInputToolbarView:sendImage:)])
+                    {
+                        return YES;
+                    }
+                    
+                    if ([MIMEType hasPrefix:@"video/"] && [self.delegate respondsToSelector:@selector(roomInputToolbarView:sendVideo:withThumbnail:)])
+                    {
+                        return YES;
+                    }
+                    
+                    if ([MIMEType hasPrefix:@"application/"] && [self.delegate respondsToSelector:@selector(roomInputToolbarView:sendFile:withMimeType:)])
+                    {
+                        return YES;
+                    }
+                }
+            }
+        }
+    }
+    return NO;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarView.xib b/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarView.xib
new file mode 100644
index 000000000..a4821a346
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarView.xib
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MXKRoomInputToolbarView">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="41"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="contactAdd" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hga-l8-Wua" userLabel="left Button">
+                    <rect key="frame" x="8" y="0.0" width="35" height="41"/>
+                    <constraints>
+                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="35" id="ptO-BQ-NhS"/>
+                    </constraints>
+                    <state key="normal">
+                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </state>
+                    <connections>
+                        <action selector="onTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="WbU-WH-gwL"/>
+                    </connections>
+                </button>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Owf-M8-qJi" userLabel="right Button">
+                    <rect key="frame" x="552" y="0.0" width="44" height="41"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="44" id="9FZ-CI-diT"/>
+                    </constraints>
+                    <state key="normal" title="Send">
+                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </state>
+                    <connections>
+                        <action selector="onTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="Cxg-BO-TfK"/>
+                    </connections>
+                </button>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QWp-NV-uh5" userLabel="Message Composer Container">
+                    <rect key="frame" x="51" y="4" width="497" height="33"/>
+                    <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                </view>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="Owf-M8-qJi" secondAttribute="trailing" constant="4" id="2M8-Gu-0f6"/>
+                <constraint firstItem="QWp-NV-uh5" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="4" id="570-8j-VYY"/>
+                <constraint firstAttribute="bottom" secondItem="QWp-NV-uh5" secondAttribute="bottom" constant="4" id="9Ya-0H-03W"/>
+                <constraint firstItem="Hga-l8-Wua" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="8" id="Bc8-T7-wmA"/>
+                <constraint firstItem="Hga-l8-Wua" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Cvk-xZ-ODy"/>
+                <constraint firstItem="Owf-M8-qJi" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="SV8-U3-8dd"/>
+                <constraint firstAttribute="bottom" secondItem="Hga-l8-Wua" secondAttribute="bottom" id="Slr-2H-laO"/>
+                <constraint firstItem="Owf-M8-qJi" firstAttribute="leading" secondItem="QWp-NV-uh5" secondAttribute="trailing" constant="4" id="UEd-gb-jgR"/>
+                <constraint firstItem="QWp-NV-uh5" firstAttribute="leading" secondItem="Hga-l8-Wua" secondAttribute="trailing" constant="8" id="cCr-Am-M7d"/>
+                <constraint firstAttribute="bottom" secondItem="Owf-M8-qJi" secondAttribute="bottom" id="ycc-x9-PAv"/>
+            </constraints>
+            <nil key="simulatedStatusBarMetrics"/>
+            <nil key="simulatedTopBarMetrics"/>
+            <nil key="simulatedBottomBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="leftInputToolbarButton" destination="Hga-l8-Wua" id="jaa-D6-e6X"/>
+                <outlet property="messageComposerContainer" destination="QWp-NV-uh5" id="APR-B5-ogC"/>
+                <outlet property="messageComposerContainerBottomConstraint" destination="9Ya-0H-03W" id="dFh-N3-eDb"/>
+                <outlet property="messageComposerContainerTopConstraint" destination="570-8j-VYY" id="dbB-W8-bro"/>
+                <outlet property="rightInputToolbarButton" destination="Owf-M8-qJi" id="UQH-fw-chf"/>
+            </connections>
+        </view>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarViewWithHPGrowingText.h b/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarViewWithHPGrowingText.h
new file mode 100644
index 000000000..b10b54fa6
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarViewWithHPGrowingText.h
@@ -0,0 +1,33 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomInputToolbarView.h"
+
+#import <HPGrowingTextView/HPGrowingTextView.h>
+
+/**
+ `MXKRoomInputToolbarViewWithHPGrowingText` is a MXKRoomInputToolbarView-inherited class in which message
+ composer is based on `HPGrowingTextView`.
+ 
+ Toolbar buttons are not overridden by this class. We keep the default implementation.
+ */
+@interface MXKRoomInputToolbarViewWithHPGrowingText : MXKRoomInputToolbarView <HPGrowingTextViewDelegate>
+{
+@protected
+    HPGrowingTextView *growingTextView;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarViewWithHPGrowingText.m b/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarViewWithHPGrowingText.m
new file mode 100644
index 000000000..fe5f87ff7
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarViewWithHPGrowingText.m
@@ -0,0 +1,187 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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 "MXKRoomInputToolbarViewWithHPGrowingText.h"
+
+@interface MXKRoomInputToolbarViewWithHPGrowingText()
+{
+    // HPGrowingTextView triggers growingTextViewDidChange event when it recomposes itself
+    // Save the last edited text to prevent unexpected typing events
+    NSString* lastEditedText;
+}
+
+/**
+ Message composer defined in `messageComposerContainer`.
+ */
+@property (nonatomic) IBOutlet HPGrowingTextView *growingTextView;
+
+@end
+
+@implementation MXKRoomInputToolbarViewWithHPGrowingText
+@synthesize growingTextView;
+
++ (UINib *)nib
+{
+    return [UINib nibWithNibName:NSStringFromClass([MXKRoomInputToolbarViewWithHPGrowingText class])
+                          bundle:[NSBundle bundleForClass:[MXKRoomInputToolbarViewWithHPGrowingText class]]];
+}
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    
+    // Handle message composer based on HPGrowingTextView use
+    growingTextView.delegate = self;
+    
+    [growingTextView setTranslatesAutoresizingMaskIntoConstraints: NO];
+    
+    // Add an accessory view to the text view in order to retrieve keyboard view.
+    inputAccessoryView = [[UIView alloc] initWithFrame:CGRectZero];
+    growingTextView.internalTextView.inputAccessoryView = self.inputAccessoryView;
+    
+    // on IOS 8, the growing textview animation could trigger weird UI animations
+    // indeed, the messages tableView can be refreshed while its height is updated (e.g. when setting a message)
+    growingTextView.animateHeightChange = NO;
+    
+    lastEditedText = nil;
+}
+
+- (void)dealloc
+{
+    [self destroy];
+}
+
+-(void)customizeViewRendering
+{
+    [super customizeViewRendering];
+    
+    // set text input font
+    growingTextView.font = [UIFont systemFontOfSize:14];
+    
+    // draw a rounded border around the textView
+    growingTextView.layer.cornerRadius = 5;
+    growingTextView.layer.borderWidth = 1;
+    growingTextView.layer.borderColor = [UIColor lightGrayColor].CGColor;
+    growingTextView.clipsToBounds = YES;
+    growingTextView.backgroundColor = [UIColor whiteColor];
+}
+
+- (void)destroy
+{
+    if (growingTextView)
+    {
+        growingTextView.delegate = nil;
+        growingTextView = nil;
+    }
+    
+    [super destroy];
+}
+
+- (void)setMaxHeight:(CGFloat)maxHeight
+{
+    growingTextView.maxHeight = maxHeight - (self.messageComposerContainerTopConstraint.constant + self.messageComposerContainerBottomConstraint.constant);
+    [growingTextView refreshHeight];
+    
+    super.maxHeight = maxHeight;
+}
+
+- (NSString*)textMessage
+{
+    return growingTextView.text;
+}
+
+- (void)setTextMessage:(NSString *)textMessage
+{
+    growingTextView.text = textMessage;
+    self.rightInputToolbarButton.enabled = textMessage.length;    
+}
+
+- (void)pasteText:(NSString *)text
+{
+    self.textMessage = [growingTextView.text stringByReplacingCharactersInRange:growingTextView.selectedRange withString:text];
+}
+
+- (void)setPlaceholder:(NSString *)inPlaceholder
+{
+    [super setPlaceholder:inPlaceholder];
+    growingTextView.placeholder = inPlaceholder;
+}
+
+- (BOOL)becomeFirstResponder
+{
+    return [growingTextView becomeFirstResponder];
+}
+
+- (void)dismissKeyboard
+{
+    [growingTextView resignFirstResponder];
+}
+
+#pragma mark - HPGrowingTextView delegate
+
+- (void)growingTextViewDidEndEditing:(HPGrowingTextView *)sender
+{
+    if ([self.delegate respondsToSelector:@selector(roomInputToolbarView:isTyping:)])
+    {
+        [self.delegate roomInputToolbarView:self isTyping:NO];
+    }
+}
+
+- (void)growingTextViewDidChange:(HPGrowingTextView *)sender
+{
+    NSString *msg = growingTextView.text;
+    
+    // HPGrowingTextView triggers growingTextViewDidChange event when it recomposes itself.
+    // Save the last edited text to prevent unexpected typing events
+    if (![lastEditedText isEqualToString:msg])
+    {
+        lastEditedText = msg;
+        if (msg.length)
+        {
+            if ([self.delegate respondsToSelector:@selector(roomInputToolbarView:isTyping:)])
+            {
+                [self.delegate roomInputToolbarView:self isTyping:YES];
+            }
+            self.rightInputToolbarButton.enabled = YES;
+        }
+        else
+        {
+            if ([self.delegate respondsToSelector:@selector(roomInputToolbarView:isTyping:)])
+            {
+                [self.delegate roomInputToolbarView:self isTyping:NO];
+            }
+            self.rightInputToolbarButton.enabled = NO;
+        }
+    }
+}
+
+- (void)growingTextView:(HPGrowingTextView *)growingTextView willChangeHeight:(float)height
+{
+    // Update growing text's superview (toolbar view)
+    CGFloat updatedHeight = height + (self.messageComposerContainerTopConstraint.constant + self.messageComposerContainerBottomConstraint.constant);
+    if ([self.delegate respondsToSelector:@selector(roomInputToolbarView:heightDidChanged:completion:)])
+    {
+        [self.delegate roomInputToolbarView:self heightDidChanged:updatedHeight completion:nil];
+    }
+}
+
+- (BOOL)growingTextView:(HPGrowingTextView *)growingTextView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text
+{
+    return self.isEditable;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarViewWithHPGrowingText.xib b/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarViewWithHPGrowingText.xib
new file mode 100644
index 000000000..3f4117499
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarViewWithHPGrowingText.xib
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MXKRoomInputToolbarViewWithHPGrowingText">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="41"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="contactAdd" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hga-l8-Wua" userLabel="left Button">
+                    <rect key="frame" x="8" y="0.0" width="35" height="41"/>
+                    <constraints>
+                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="35" id="ptO-BQ-NhS"/>
+                    </constraints>
+                    <state key="normal">
+                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </state>
+                    <connections>
+                        <action selector="onTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="jVG-We-DmS"/>
+                    </connections>
+                </button>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Owf-M8-qJi" userLabel="right Button">
+                    <rect key="frame" x="552" y="0.0" width="44" height="41"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="44" id="9FZ-CI-diT"/>
+                    </constraints>
+                    <state key="normal" title="Send">
+                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </state>
+                    <connections>
+                        <action selector="onTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="jed-Mz-rxe"/>
+                    </connections>
+                </button>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QWp-NV-uh5" userLabel="Message Composer Container">
+                    <rect key="frame" x="51" y="4" width="497" height="33"/>
+                    <subviews>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pkf-YH-tco" customClass="HPGrowingTextView">
+                            <rect key="frame" x="0.0" y="0.0" width="497" height="33"/>
+                            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <constraints>
+                        <constraint firstAttribute="bottom" secondItem="pkf-YH-tco" secondAttribute="bottom" id="L3A-Oo-Ml2"/>
+                        <constraint firstItem="pkf-YH-tco" firstAttribute="top" secondItem="QWp-NV-uh5" secondAttribute="top" id="VPn-k0-0vc"/>
+                        <constraint firstItem="pkf-YH-tco" firstAttribute="leading" secondItem="QWp-NV-uh5" secondAttribute="leading" id="mXj-f3-DcT"/>
+                        <constraint firstAttribute="trailing" secondItem="pkf-YH-tco" secondAttribute="trailing" id="n4K-Do-gHr"/>
+                    </constraints>
+                </view>
+            </subviews>
+            <color key="backgroundColor" red="0.89720267057418823" green="0.89720267057418823" blue="0.89720267057418823" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="Owf-M8-qJi" secondAttribute="trailing" constant="4" id="2M8-Gu-0f6"/>
+                <constraint firstItem="QWp-NV-uh5" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="4" id="570-8j-VYY"/>
+                <constraint firstAttribute="bottom" secondItem="QWp-NV-uh5" secondAttribute="bottom" constant="4" id="9Ya-0H-03W"/>
+                <constraint firstItem="Hga-l8-Wua" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="8" id="Bc8-T7-wmA"/>
+                <constraint firstItem="Hga-l8-Wua" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Cvk-xZ-ODy"/>
+                <constraint firstItem="Owf-M8-qJi" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="SV8-U3-8dd"/>
+                <constraint firstAttribute="bottom" secondItem="Hga-l8-Wua" secondAttribute="bottom" id="Slr-2H-laO"/>
+                <constraint firstItem="Owf-M8-qJi" firstAttribute="leading" secondItem="QWp-NV-uh5" secondAttribute="trailing" constant="4" id="UEd-gb-jgR"/>
+                <constraint firstItem="QWp-NV-uh5" firstAttribute="leading" secondItem="Hga-l8-Wua" secondAttribute="trailing" constant="8" id="cCr-Am-M7d"/>
+                <constraint firstAttribute="bottom" secondItem="Owf-M8-qJi" secondAttribute="bottom" id="ycc-x9-PAv"/>
+            </constraints>
+            <nil key="simulatedStatusBarMetrics"/>
+            <nil key="simulatedTopBarMetrics"/>
+            <nil key="simulatedBottomBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="growingTextView" destination="pkf-YH-tco" id="VeP-WI-6Xh"/>
+                <outlet property="leftInputToolbarButton" destination="Hga-l8-Wua" id="zbm-3b-hoY"/>
+                <outlet property="messageComposerContainer" destination="QWp-NV-uh5" id="7EX-Un-ZIe"/>
+                <outlet property="messageComposerContainerBottomConstraint" destination="9Ya-0H-03W" id="226-iu-6tU"/>
+                <outlet property="messageComposerContainerTopConstraint" destination="570-8j-VYY" id="VKv-Qh-PCs"/>
+                <outlet property="rightInputToolbarButton" destination="Owf-M8-qJi" id="seO-ly-Bgg"/>
+            </connections>
+        </view>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarViewWithSimpleTextView.h b/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarViewWithSimpleTextView.h
new file mode 100644
index 000000000..22299422f
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarViewWithSimpleTextView.h
@@ -0,0 +1,32 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomInputToolbarView.h"
+
+/**
+ `MXKRoomInputToolbarViewWithSimpleTextView` is a MXKRoomInputToolbarView-inherited class in which message
+ composer is a UITextView instance with a fixed heigth.
+ 
+ Toolbar buttons are not overridden by this class. We keep the default implementation.
+ */
+@interface MXKRoomInputToolbarViewWithSimpleTextView : MXKRoomInputToolbarView <UITextViewDelegate>
+
+/**
+  Message composer defined in `messageComposerContainer`.
+ */
+@property (weak, nonatomic) IBOutlet UITextView *messageComposerTextView;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarViewWithSimpleTextView.m b/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarViewWithSimpleTextView.m
new file mode 100644
index 000000000..3cdb38eda
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarViewWithSimpleTextView.m
@@ -0,0 +1,123 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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 "MXKRoomInputToolbarViewWithSimpleTextView.h"
+
+@implementation MXKRoomInputToolbarViewWithSimpleTextView
+
++ (UINib *)nib
+{
+    return [UINib nibWithNibName:NSStringFromClass([MXKRoomInputToolbarViewWithSimpleTextView class])
+                          bundle:[NSBundle bundleForClass:[MXKRoomInputToolbarViewWithSimpleTextView class]]];
+}
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    
+    // Add an accessory view to the text view in order to retrieve keyboard view.
+    inputAccessoryView = [[UIView alloc] initWithFrame:CGRectZero];
+    self.messageComposerTextView.inputAccessoryView = self.inputAccessoryView;
+}
+
+-(void)customizeViewRendering
+{
+    [super customizeViewRendering];
+    
+    // Set default message composer background color
+    self.messageComposerTextView.backgroundColor = [UIColor whiteColor];
+}
+
+- (NSString*)textMessage
+{
+    return _messageComposerTextView.text;
+}
+
+- (void)setTextMessage:(NSString *)textMessage
+{
+    _messageComposerTextView.text = textMessage;
+    self.rightInputToolbarButton.enabled = textMessage.length;
+}
+
+- (void)pasteText:(NSString *)text
+{
+    self.textMessage = [_messageComposerTextView.text stringByReplacingCharactersInRange:_messageComposerTextView.selectedRange withString:text];
+}
+
+- (BOOL)becomeFirstResponder
+{
+    return [_messageComposerTextView becomeFirstResponder];
+}
+
+- (void)dismissKeyboard
+{
+    if (_messageComposerTextView)
+    {
+        [_messageComposerTextView resignFirstResponder];
+    }
+}
+
+#pragma mark - UITextViewDelegate
+
+- (void)textViewDidEndEditing:(UITextView *)textView
+{
+    if ([self.delegate respondsToSelector:@selector(roomInputToolbarView:isTyping:)])
+    {
+        [self.delegate roomInputToolbarView:self isTyping:NO];
+    }
+}
+
+- (void)textViewDidChange:(UITextView *)textView
+{
+    NSString *msg = textView.text;
+    
+    if (msg.length)
+    {
+        if ([self.delegate respondsToSelector:@selector(roomInputToolbarView:isTyping:)])
+        {
+            [self.delegate roomInputToolbarView:self isTyping:YES];
+        }
+        self.rightInputToolbarButton.enabled = YES;
+    }
+    else
+    {
+        if ([self.delegate respondsToSelector:@selector(roomInputToolbarView:isTyping:)])
+        {
+            [self.delegate roomInputToolbarView:self isTyping:NO];
+        }
+        self.rightInputToolbarButton.enabled = NO;
+    }
+}
+
+- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text
+{
+    if (!self.isEditable)
+    {
+        return NO;
+    }
+    
+    // Hanlde here `Done` key pressed
+    if([text isEqualToString:@"\n"])
+    {
+        [textView resignFirstResponder];
+        return NO;
+    }
+    
+    return YES;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarViewWithSimpleTextView.xib b/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarViewWithSimpleTextView.xib
new file mode 100644
index 000000000..d01e943be
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarViewWithSimpleTextView.xib
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MXKRoomInputToolbarViewWithSimpleTextView">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="41"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="contactAdd" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hga-l8-Wua" userLabel="left Button">
+                    <rect key="frame" x="8" y="0.0" width="35" height="41"/>
+                    <constraints>
+                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="35" id="ptO-BQ-NhS"/>
+                    </constraints>
+                    <state key="normal">
+                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </state>
+                    <connections>
+                        <action selector="onTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="mKx-fF-gCc"/>
+                    </connections>
+                </button>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Owf-M8-qJi" userLabel="right Button">
+                    <rect key="frame" x="556" y="0.0" width="36" height="41"/>
+                    <constraints>
+                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="35" id="9FZ-CI-diT"/>
+                    </constraints>
+                    <state key="normal" title="Send">
+                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </state>
+                    <connections>
+                        <action selector="onTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="NBz-Y3-Fnd"/>
+                    </connections>
+                </button>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QWp-NV-uh5" userLabel="Message Composer Container">
+                    <rect key="frame" x="51" y="4" width="497" height="33"/>
+                    <subviews>
+                        <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="24Y-ae-xvw">
+                            <rect key="frame" x="0.0" y="0.0" width="497" height="33"/>
+                            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                            <textInputTraits key="textInputTraits" autocapitalizationType="sentences" returnKeyType="done"/>
+                            <connections>
+                                <outlet property="delegate" destination="iN0-l3-epB" id="b2v-6r-Ket"/>
+                            </connections>
+                        </textView>
+                    </subviews>
+                    <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <constraints>
+                        <constraint firstAttribute="bottom" secondItem="24Y-ae-xvw" secondAttribute="bottom" id="Orh-Lx-4pU"/>
+                        <constraint firstItem="24Y-ae-xvw" firstAttribute="leading" secondItem="QWp-NV-uh5" secondAttribute="leading" id="e9C-Ki-9vO"/>
+                        <constraint firstAttribute="trailing" secondItem="24Y-ae-xvw" secondAttribute="trailing" id="flk-jG-qWQ"/>
+                        <constraint firstItem="24Y-ae-xvw" firstAttribute="top" secondItem="QWp-NV-uh5" secondAttribute="top" id="urH-zt-PuK"/>
+                    </constraints>
+                </view>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="Owf-M8-qJi" secondAttribute="trailing" constant="8" id="2M8-Gu-0f6"/>
+                <constraint firstItem="QWp-NV-uh5" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="4" id="570-8j-VYY"/>
+                <constraint firstAttribute="bottom" secondItem="QWp-NV-uh5" secondAttribute="bottom" constant="4" id="9Ya-0H-03W"/>
+                <constraint firstItem="Hga-l8-Wua" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="8" id="Bc8-T7-wmA"/>
+                <constraint firstItem="Hga-l8-Wua" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Cvk-xZ-ODy"/>
+                <constraint firstItem="Owf-M8-qJi" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="SV8-U3-8dd"/>
+                <constraint firstAttribute="bottom" secondItem="Hga-l8-Wua" secondAttribute="bottom" id="Slr-2H-laO"/>
+                <constraint firstItem="Owf-M8-qJi" firstAttribute="leading" secondItem="QWp-NV-uh5" secondAttribute="trailing" constant="8" id="UEd-gb-jgR"/>
+                <constraint firstItem="QWp-NV-uh5" firstAttribute="leading" secondItem="Hga-l8-Wua" secondAttribute="trailing" constant="8" id="cCr-Am-M7d"/>
+                <constraint firstAttribute="bottom" secondItem="Owf-M8-qJi" secondAttribute="bottom" id="ycc-x9-PAv"/>
+            </constraints>
+            <nil key="simulatedStatusBarMetrics"/>
+            <nil key="simulatedTopBarMetrics"/>
+            <nil key="simulatedBottomBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="leftInputToolbarButton" destination="Hga-l8-Wua" id="KSc-TM-g5i"/>
+                <outlet property="messageComposerContainer" destination="QWp-NV-uh5" id="7BM-Ni-5BB"/>
+                <outlet property="messageComposerContainerBottomConstraint" destination="9Ya-0H-03W" id="67R-BO-8aU"/>
+                <outlet property="messageComposerContainerTopConstraint" destination="570-8j-VYY" id="vbj-Ud-SLi"/>
+                <outlet property="messageComposerTextView" destination="24Y-ae-xvw" id="Sbt-Gf-WvF"/>
+                <outlet property="rightInputToolbarButton" destination="Owf-M8-qJi" id="nvK-y3-iE5"/>
+            </connections>
+        </view>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/RoomList/MXKInterleavedRecentTableViewCell.h b/Riot/Modules/MatrixKit/Views/RoomList/MXKInterleavedRecentTableViewCell.h
new file mode 100644
index 000000000..b6dc414fd
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomList/MXKInterleavedRecentTableViewCell.h
@@ -0,0 +1,28 @@
+/*
+ Copyright 2015 OpenMarket 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/UIKit.h>
+
+#import "MXKRecentTableViewCell.h"
+
+/**
+ `MXKInterleavedRecentTableViewCell` instances display a room in the context of the recents list.
+ */
+@interface MXKInterleavedRecentTableViewCell : MXKRecentTableViewCell
+
+@property (weak, nonatomic) IBOutlet UIView* userFlag;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomList/MXKInterleavedRecentTableViewCell.m b/Riot/Modules/MatrixKit/Views/RoomList/MXKInterleavedRecentTableViewCell.m
new file mode 100644
index 000000000..a4b17d16e
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomList/MXKInterleavedRecentTableViewCell.m
@@ -0,0 +1,64 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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 "MXKInterleavedRecentTableViewCell.h"
+
+#import "MXKSessionRecentsDataSource.h"
+
+#import "MXKAccountManager.h"
+
+@implementation MXKInterleavedRecentTableViewCell
+
+#pragma mark - Class methods
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+
+    CAShapeLayer *userFlagMaskLayer = [[CAShapeLayer alloc] init];
+    userFlagMaskLayer.frame = _userFlag.bounds;
+    
+    UIBezierPath *path = [[UIBezierPath alloc] init];
+    [path moveToPoint:CGPointMake(0, 0)];
+    [path addLineToPoint:CGPointMake(_userFlag.frame.size.width, _userFlag.frame.size.height)];
+    [path addLineToPoint:CGPointMake(_userFlag.frame.size.width, 0)];
+    [path closePath];
+    
+    userFlagMaskLayer.path = path.CGPath;
+    _userFlag.layer.mask = userFlagMaskLayer;
+}
+
+- (void)render:(MXKCellData *)cellData
+{
+    [super render:cellData];
+    
+    // Highlight the room owner by using his tint color.
+    if (roomCellData)
+    {
+        MXKAccount *account = [[MXKAccountManager sharedManager] accountForUserId:roomCellData.mxSession.myUserId];
+        if (account)
+        {
+            _userFlag.backgroundColor = account.userTintColor;
+        }
+        else
+        {
+            _userFlag.backgroundColor = [UIColor clearColor];
+        }
+    }
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomList/MXKInterleavedRecentTableViewCell.xib b/Riot/Modules/MatrixKit/Views/RoomList/MXKInterleavedRecentTableViewCell.xib
new file mode 100644
index 000000000..51e427937
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomList/MXKInterleavedRecentTableViewCell.xib
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="L2L-l5-wPx" customClass="MXKInterleavedRecentTableViewCell">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="70"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="L2L-l5-wPx" id="aXz-IR-jj5">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="69"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="RoomTitle" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Lg1-xQ-AGn">
+                        <rect key="frame" x="8" y="8" width="506" height="23"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="19"/>
+                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="LastEventDescription" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dQt-mN-T6b">
+                        <rect key="frame" x="8" y="42" width="584" height="18"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Oct 12 18:15" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="360-Go-RcG">
+                        <rect key="frame" x="520" y="8" width="70" height="15"/>
+                        <constraints>
+                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="70" id="gIq-if-W1j"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HGL-DQ-ggW" userLabel="User Flag">
+                        <rect key="frame" x="585" y="0.0" width="15" height="15"/>
+                        <color key="backgroundColor" red="0.85659327649999994" green="0.0" blue="0.0086100643710000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="15" id="7tB-c8-gcm"/>
+                            <constraint firstAttribute="height" constant="15" id="OGT-6C-aJE"/>
+                        </constraints>
+                    </view>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="Lg1-xQ-AGn" firstAttribute="leading" secondItem="aXz-IR-jj5" secondAttribute="leading" constant="8" id="3qc-BC-FYt"/>
+                    <constraint firstItem="HGL-DQ-ggW" firstAttribute="top" secondItem="aXz-IR-jj5" secondAttribute="top" id="EkK-TH-gq3"/>
+                    <constraint firstItem="360-Go-RcG" firstAttribute="leading" secondItem="Lg1-xQ-AGn" secondAttribute="trailing" constant="6" id="Mgl-SA-zTT"/>
+                    <constraint firstAttribute="trailing" secondItem="HGL-DQ-ggW" secondAttribute="trailing" id="U7B-DW-Irn"/>
+                    <constraint firstItem="dQt-mN-T6b" firstAttribute="leading" secondItem="aXz-IR-jj5" secondAttribute="leading" constant="8" id="UYQ-HG-YP1"/>
+                    <constraint firstItem="360-Go-RcG" firstAttribute="top" secondItem="aXz-IR-jj5" secondAttribute="top" constant="8" id="XyO-tl-6SX"/>
+                    <constraint firstAttribute="trailing" secondItem="360-Go-RcG" secondAttribute="trailing" constant="10" id="YqC-WC-Wqe"/>
+                    <constraint firstAttribute="bottom" secondItem="dQt-mN-T6b" secondAttribute="bottom" constant="9" id="sLb-Q4-AFW"/>
+                    <constraint firstItem="Lg1-xQ-AGn" firstAttribute="top" secondItem="aXz-IR-jj5" secondAttribute="top" constant="8" id="uCT-KE-X09"/>
+                    <constraint firstAttribute="trailing" secondItem="dQt-mN-T6b" secondAttribute="trailing" constant="8" id="ygG-1B-fu3"/>
+                </constraints>
+            </tableViewCellContentView>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <connections>
+                <outlet property="lastEventDate" destination="360-Go-RcG" id="Sj9-Ur-tEZ"/>
+                <outlet property="lastEventDescription" destination="dQt-mN-T6b" id="4OL-5b-Xr0"/>
+                <outlet property="roomTitle" destination="Lg1-xQ-AGn" id="qMk-8c-q6L"/>
+                <outlet property="userFlag" destination="HGL-DQ-ggW" id="RmM-bH-OPT"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/RoomList/MXKPublicRoomTableViewCell.h b/Riot/Modules/MatrixKit/Views/RoomList/MXKPublicRoomTableViewCell.h
new file mode 100644
index 000000000..c868bffd5
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomList/MXKPublicRoomTableViewCell.h
@@ -0,0 +1,36 @@
+/*
+ Copyright 2015 OpenMarket 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 <MatrixSDK/MatrixSDK.h>
+
+#import "MXKTableViewCell.h"
+
+@interface MXKPublicRoomTableViewCell : MXKTableViewCell
+
+@property (weak, nonatomic) IBOutlet UILabel *roomDisplayName;
+@property (weak, nonatomic) IBOutlet UILabel *memberCount;
+@property (weak, nonatomic) IBOutlet UILabel *roomTopic;
+
+@property (nonatomic, getter=isHighlightedPublicRoom) BOOL highlightedPublicRoom;
+
+/**
+ Configure the cell in order to display the public room.
+ 
+ @param publicRoom the public room to render.
+ */
+- (void)render:(MXPublicRoom*)publicRoom;
+
+@end
\ No newline at end of file
diff --git a/Riot/Modules/MatrixKit/Views/RoomList/MXKPublicRoomTableViewCell.m b/Riot/Modules/MatrixKit/Views/RoomList/MXKPublicRoomTableViewCell.m
new file mode 100644
index 000000000..d6321f100
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomList/MXKPublicRoomTableViewCell.m
@@ -0,0 +1,75 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKPublicRoomTableViewCell.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKSwiftHeader.h"
+
+@implementation MXKPublicRoomTableViewCell
+
+- (void)render:(MXPublicRoom*)publicRoom
+{
+    // Check whether this public room has topic
+    if (publicRoom.topic)
+    {
+        _roomTopic.hidden = NO;
+        _roomTopic.text = [MXTools stripNewlineCharacters:publicRoom.topic];
+    }
+    else
+    {
+        _roomTopic.hidden = YES;
+    }
+    
+    // Set room display name
+    _roomDisplayName.text = [publicRoom displayname];
+    
+    // Set member count
+    if (publicRoom.numJoinedMembers > 1)
+    {
+        _memberCount.text = [MatrixKitL10n numMembersOther:@(publicRoom.numJoinedMembers).stringValue];
+    }
+    else if (publicRoom.numJoinedMembers == 1)
+    {
+        _memberCount.text = [MatrixKitL10n numMembersOne:@(1).stringValue];
+    }
+    else
+    {
+        _memberCount.text = nil;
+    }
+}
+
+- (void)setHighlightedPublicRoom:(BOOL)highlightedPublicRoom
+{
+    // Highlight?
+    if (highlightedPublicRoom)
+    {
+        _roomDisplayName.font = [UIFont boldSystemFontOfSize:20];
+        _roomTopic.font = [UIFont boldSystemFontOfSize:17];
+        self.backgroundColor = [UIColor colorWithRed:1.0 green:1.0 blue:0.9 alpha:1.0];
+    }
+    else
+    {
+        _roomDisplayName.font = [UIFont systemFontOfSize:19];
+        _roomTopic.font = [UIFont systemFontOfSize:16];
+        self.backgroundColor = [UIColor clearColor];
+    }
+    _highlightedPublicRoom = highlightedPublicRoom;
+}
+
+@end
+
diff --git a/Riot/Modules/MatrixKit/Views/RoomList/MXKPublicRoomTableViewCell.xib b/Riot/Modules/MatrixKit/Views/RoomList/MXKPublicRoomTableViewCell.xib
new file mode 100644
index 000000000..9577dfaa8
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomList/MXKPublicRoomTableViewCell.xib
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="60" id="1og-XA-I5R" customClass="MXKPublicRoomTableViewCell">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="60"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1og-XA-I5R" id="yko-nD-HEt">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="59"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="roomDisplayName" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Sv7-ni-jpf">
+                        <rect key="frame" x="8" y="8" width="504" height="23"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="19"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="topic" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bDg-7n-8BT" userLabel="roomTopic">
+                        <rect key="frame" x="8" y="31" width="584" height="20"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="xx users" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WXs-b0-uGi">
+                        <rect key="frame" x="520" y="11" width="72" height="18"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="WXs-b0-uGi" firstAttribute="centerY" secondItem="Sv7-ni-jpf" secondAttribute="centerY" id="087-FX-uvV"/>
+                    <constraint firstAttribute="trailing" secondItem="WXs-b0-uGi" secondAttribute="trailing" constant="8" id="OD0-ei-aHz"/>
+                    <constraint firstItem="bDg-7n-8BT" firstAttribute="top" secondItem="Sv7-ni-jpf" secondAttribute="bottom" id="QbM-0u-MAT"/>
+                    <constraint firstItem="bDg-7n-8BT" firstAttribute="leading" secondItem="yko-nD-HEt" secondAttribute="leading" constant="8" id="Ro4-dk-HjK"/>
+                    <constraint firstItem="Sv7-ni-jpf" firstAttribute="leading" secondItem="yko-nD-HEt" secondAttribute="leading" constant="8" id="bfl-he-c33"/>
+                    <constraint firstItem="Sv7-ni-jpf" firstAttribute="top" secondItem="yko-nD-HEt" secondAttribute="top" constant="8" id="dTb-SA-ePQ"/>
+                    <constraint firstAttribute="trailing" secondItem="bDg-7n-8BT" secondAttribute="trailing" constant="8" id="fSL-au-CJv"/>
+                    <constraint firstAttribute="bottom" secondItem="bDg-7n-8BT" secondAttribute="bottom" constant="8" id="qdM-vi-lSq"/>
+                    <constraint firstItem="WXs-b0-uGi" firstAttribute="leading" secondItem="Sv7-ni-jpf" secondAttribute="trailing" constant="8" id="vj9-dw-ogx"/>
+                    <constraint firstAttribute="trailing" secondItem="Sv7-ni-jpf" secondAttribute="trailing" constant="88" id="y1t-fl-0na"/>
+                </constraints>
+            </tableViewCellContentView>
+            <connections>
+                <outlet property="memberCount" destination="WXs-b0-uGi" id="eN4-QZ-jhu"/>
+                <outlet property="roomDisplayName" destination="Sv7-ni-jpf" id="4bX-M6-mjD"/>
+                <outlet property="roomTopic" destination="bDg-7n-8BT" id="8bh-pT-n2L"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/RoomList/MXKRecentTableViewCell.h b/Riot/Modules/MatrixKit/Views/RoomList/MXKRecentTableViewCell.h
new file mode 100644
index 000000000..98cd4f962
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomList/MXKRecentTableViewCell.h
@@ -0,0 +1,39 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCell.h"
+
+#import "MXKCellRendering.h"
+
+#import "MXKRecentCellDataStoring.h"
+
+/**
+ `MXKRecentTableViewCell` instances display a room in the context of the recents list.
+ */
+@interface MXKRecentTableViewCell : MXKTableViewCell <MXKCellRendering>
+{
+@protected
+    /**
+     The current cell data displayed by the table view cell
+     */
+    id<MXKRecentCellDataStoring> roomCellData;
+}
+
+@property (weak, nonatomic) IBOutlet UILabel *roomTitle;
+@property (weak, nonatomic) IBOutlet UILabel *lastEventDescription;
+@property (weak, nonatomic) IBOutlet UILabel *lastEventDate;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomList/MXKRecentTableViewCell.m b/Riot/Modules/MatrixKit/Views/RoomList/MXKRecentTableViewCell.m
new file mode 100644
index 000000000..3fdce7f75
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomList/MXKRecentTableViewCell.m
@@ -0,0 +1,99 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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 "MXKRecentTableViewCell.h"
+
+#import "MXKSessionRecentsDataSource.h"
+
+@implementation MXKRecentTableViewCell
+@synthesize delegate;
+
+#pragma mark - Class methods
+
+- (void)render:(MXKCellData *)cellData
+{
+    roomCellData = (id<MXKRecentCellDataStoring>)cellData;
+    if (roomCellData)
+    {
+        
+        // Report computed values as is
+        _roomTitle.text = roomCellData.roomDisplayname;
+        _lastEventDate.text = roomCellData.lastEventDate;
+        
+        // Manage lastEventAttributedTextMessage optional property
+        if ([roomCellData respondsToSelector:@selector(lastEventAttributedTextMessage)])
+        {
+            _lastEventDescription.attributedText = roomCellData.lastEventAttributedTextMessage;
+        }
+        else
+        {
+            _lastEventDescription.text = roomCellData.lastEventTextMessage;
+        }
+        
+        // Set in bold public room name
+        if ([roomCellData.roomSummary.joinRule isEqualToString:kMXRoomJoinRulePublic])
+        {
+            _roomTitle.font = [UIFont boldSystemFontOfSize:20];
+        }
+        else
+        {
+            _roomTitle.font = [UIFont systemFontOfSize:19];
+        }
+        
+        // Set background color and unread count
+        if (roomCellData.hasUnread)
+        {
+            if (0 < roomCellData.highlightCount)
+            {
+                self.backgroundColor = [UIColor colorWithRed:0.9 green:0.9 blue:1 alpha:1.0];
+            }
+            else
+            {
+                self.backgroundColor = [UIColor colorWithRed:1 green:0.9 blue:0.9 alpha:1.0];
+            }
+        }
+        else
+        {
+            self.backgroundColor = [UIColor clearColor];
+        }
+        
+    }
+    else
+    {
+        _lastEventDescription.text = @"";
+    }
+}
+
+- (MXKCellData*)renderedCellData
+{
+    return roomCellData;
+}
+
++ (CGFloat)heightForCellData:(MXKCellData *)cellData withMaximumWidth:(CGFloat)maxWidth
+{
+    // The height is fixed
+    return 70;
+}
+
+- (void)prepareForReuse
+{
+    [super prepareForReuse];
+    
+    roomCellData = nil;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomList/MXKRecentTableViewCell.xib b/Riot/Modules/MatrixKit/Views/RoomList/MXKRecentTableViewCell.xib
new file mode 100644
index 000000000..9d3dd58c5
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomList/MXKRecentTableViewCell.xib
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="L2L-l5-wPx" customClass="MXKRecentTableViewCell">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="70"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="L2L-l5-wPx" id="aXz-IR-jj5">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="69"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="RoomTitle" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Lg1-xQ-AGn">
+                        <rect key="frame" x="8" y="8" width="508" height="23"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="19"/>
+                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="LastEventDescription" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dQt-mN-T6b">
+                        <rect key="frame" x="8" y="42" width="584" height="18"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Oct 12 18:15" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="360-Go-RcG">
+                        <rect key="frame" x="522" y="8" width="70" height="15"/>
+                        <constraints>
+                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="70" id="uOj-6w-G8q"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="Lg1-xQ-AGn" firstAttribute="leading" secondItem="aXz-IR-jj5" secondAttribute="leading" constant="8" id="3qc-BC-FYt"/>
+                    <constraint firstItem="360-Go-RcG" firstAttribute="leading" secondItem="Lg1-xQ-AGn" secondAttribute="trailing" constant="6" id="8ff-tS-Ulq"/>
+                    <constraint firstItem="dQt-mN-T6b" firstAttribute="leading" secondItem="aXz-IR-jj5" secondAttribute="leading" constant="8" id="UYQ-HG-YP1"/>
+                    <constraint firstItem="360-Go-RcG" firstAttribute="top" secondItem="aXz-IR-jj5" secondAttribute="top" constant="8" id="XyO-tl-6SX"/>
+                    <constraint firstAttribute="trailing" secondItem="360-Go-RcG" secondAttribute="trailing" constant="8" id="YqC-WC-Wqe"/>
+                    <constraint firstAttribute="bottom" secondItem="dQt-mN-T6b" secondAttribute="bottom" constant="9" id="sLb-Q4-AFW"/>
+                    <constraint firstItem="Lg1-xQ-AGn" firstAttribute="top" secondItem="aXz-IR-jj5" secondAttribute="top" constant="8" id="uCT-KE-X09"/>
+                    <constraint firstAttribute="trailing" secondItem="dQt-mN-T6b" secondAttribute="trailing" constant="8" id="ygG-1B-fu3"/>
+                </constraints>
+            </tableViewCellContentView>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <connections>
+                <outlet property="lastEventDate" destination="360-Go-RcG" id="JGU-FE-TFH"/>
+                <outlet property="lastEventDescription" destination="dQt-mN-T6b" id="sh8-ZK-nJ7"/>
+                <outlet property="roomTitle" destination="Lg1-xQ-AGn" id="Kz8-2x-4Rs"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/RoomMemberList/MXKRoomMemberTableViewCell.h b/Riot/Modules/MatrixKit/Views/RoomMemberList/MXKRoomMemberTableViewCell.h
new file mode 100644
index 000000000..ce99f5076
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomMemberList/MXKRoomMemberTableViewCell.h
@@ -0,0 +1,66 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCell.h"
+#import "MXKCellRendering.h"
+
+@class MXKImageView;
+@class MXKPieChartView;
+@class MXSession;
+
+/**
+ `MXKRoomMemberTableViewCell` instances display a user in the context of the room member list.
+ */
+@interface MXKRoomMemberTableViewCell : MXKTableViewCell <MXKCellRendering> {
+
+@protected
+    /**
+     */
+    MXSession *mxSession;
+    
+    /**
+     */
+    NSString *memberId;
+    
+    /**
+     YES when last activity time is displayed and must be refreshed regularly.
+     */
+    BOOL shouldUpdateActivityInfo;
+}
+
+@property (strong, nonatomic) IBOutlet MXKImageView *pictureView;
+@property (weak, nonatomic) IBOutlet UILabel *userLabel;
+@property (weak, nonatomic) IBOutlet UIView *powerContainer;
+@property (weak, nonatomic) IBOutlet UIImageView *typingBadge;
+
+/**
+ The default picture displayed when no picture is available.
+ */
+@property (nonatomic) UIImage *picturePlaceholder;
+
+/**
+ Update last activity information if any.
+ */
+- (void)updateActivityInfo;
+
+/**
+ Stringify the last activity date/time of the member.
+ 
+ @return a string which described the last activity time of the member.
+ */
+- (NSString*)lastActiveTime;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomMemberList/MXKRoomMemberTableViewCell.m b/Riot/Modules/MatrixKit/Views/RoomMemberList/MXKRoomMemberTableViewCell.m
new file mode 100644
index 000000000..d312f27c1
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomMemberList/MXKRoomMemberTableViewCell.m
@@ -0,0 +1,299 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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 "MXKRoomMemberTableViewCell.h"
+
+@import MatrixSDK;
+
+#import "MXKAccount.h"
+#import "MXKImageView.h"
+#import "MXKPieChartView.h"
+#import "MXKRoomMemberCellDataStoring.h"
+#import "MXKRoomMemberListDataSource.h"
+#import "MXKTools.h"
+
+#import "NSBundle+MatrixKit.h"
+
+#import "MXKSwiftHeader.h"
+
+@interface MXKRoomMemberTableViewCell ()
+{
+    NSRange lastSeenRange;
+    
+    MXKPieChartView* pieChartView;
+}
+
+@end
+
+@implementation MXKRoomMemberTableViewCell
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    
+    self.typingBadge.image = [NSBundle mxk_imageFromMXKAssetsBundleWithName:@"icon_keyboard"];
+}
+
+- (void)customizeTableViewCellRendering
+{
+    [super customizeTableViewCellRendering];
+    
+    self.pictureView.defaultBackgroundColor = [UIColor clearColor];
+}
+
+- (UIImage*)picturePlaceholder
+{
+    return [NSBundle mxk_imageFromMXKAssetsBundleWithName:@"default-profile"];
+}
+
+- (void)render:(MXKCellData *)cellData
+{
+    // Sanity check: accept only object of MXKRoomMemberCellData classes or sub-classes
+    NSParameterAssert([cellData isKindOfClass:[MXKRoomMemberCellData class]]);
+    
+    MXKRoomMemberCellData *memberCellData = (MXKRoomMemberCellData*)cellData;
+    if (memberCellData)
+    {
+        mxSession = memberCellData.mxSession;
+        memberId = memberCellData.roomMember.userId;
+        
+        self.userLabel.text = memberCellData.memberDisplayName;
+        
+        // Disable by default activity update mechanism (This is required in case of a reused cell).
+        shouldUpdateActivityInfo = NO;
+        
+        // User thumbnail
+        self.pictureView.mediaFolder = kMXMediaManagerAvatarThumbnailFolder;
+        self.pictureView.enableInMemoryCache = YES;
+        // Consider here the member avatar is stored unencrypted on Matrix media repo
+        [self.pictureView setImageURI:memberCellData.roomMember.avatarUrl
+                             withType:nil
+                  andImageOrientation:UIImageOrientationUp
+                        toFitViewSize:self.pictureView.frame.size
+                           withMethod:MXThumbnailingMethodCrop
+                         previewImage:self.picturePlaceholder
+                         mediaManager:mxSession.mediaManager];
+        
+        // Shade invited users
+        if (memberCellData.roomMember.membership == MXMembershipInvite)
+        {
+            for (UIView *view in self.subviews)
+            {
+                view.alpha = 0.3;
+            }
+        }
+        else
+        {
+            for (UIView *view in self.subviews)
+            {
+                view.alpha = 1;
+            }
+        }
+        
+        // Display the power level pie
+        [self setPowerContainerValue:memberCellData.powerLevel];
+        
+        // Prepare presence string and thumbnail border color
+        NSString* presenceText = nil;
+        UIColor* thumbnailBorderColor = nil;
+        
+        // Customize banned and left (kicked) members
+        if (memberCellData.roomMember.membership == MXMembershipLeave || memberCellData.roomMember.membership == MXMembershipBan)
+        {
+            self.backgroundColor = [UIColor colorWithRed:0.8 green:0.8 blue:0.8 alpha:1.0];
+            presenceText = (memberCellData.roomMember.membership == MXMembershipLeave) ? [MatrixKitL10n membershipLeave] : [MatrixKitL10n membershipBan];
+        }
+        else
+        {
+            self.backgroundColor = [UIColor whiteColor];
+            
+            // get the user presence and his thumbnail border color
+            if (memberCellData.roomMember.membership == MXMembershipInvite)
+            {
+                thumbnailBorderColor = [UIColor lightGrayColor];
+                presenceText = [MatrixKitL10n membershipInvite];
+            }
+            else
+            {
+                // Get the user that corresponds to this member
+                MXUser *user = [mxSession userWithUserId:memberId];
+                // existing user ?
+                if (user)
+                {
+                    thumbnailBorderColor = [MXKAccount presenceColor:user.presence];
+                    presenceText = [self lastActiveTime];
+                    // Keep last seen range to update it
+                    lastSeenRange = NSMakeRange(self.userLabel.text.length + 2, presenceText.length);
+                    shouldUpdateActivityInfo = (presenceText.length != 0);
+                }
+            }
+        }
+        
+        // if the thumbnail is defined
+        if (thumbnailBorderColor)
+        {
+            self.pictureView.layer.borderWidth = 2;
+            self.pictureView.layer.borderColor = thumbnailBorderColor.CGColor;
+        }
+        else
+        {
+            // remove the border
+            // else it draws black border
+            self.pictureView.layer.borderWidth = 0;
+        }
+        
+        // and the presence text (if any)
+        if (presenceText)
+        {
+            NSString* extraText = [NSString stringWithFormat:@"(%@)", presenceText];
+            self.userLabel.text = [NSString stringWithFormat:@"%@ %@", self.userLabel.text, extraText];
+            
+            NSRange range = [self.userLabel.text rangeOfString:extraText];
+            UIFont* font = self.userLabel.font;
+            
+            // Create the attributes
+            NSDictionary *attrs = [NSDictionary dictionaryWithObjectsAndKeys:
+                                   font, NSFontAttributeName,
+                                   self.userLabel.textColor, NSForegroundColorAttributeName, nil];
+            
+            NSDictionary *subAttrs = [NSDictionary dictionaryWithObjectsAndKeys:
+                                      font, NSFontAttributeName,
+                                      [UIColor lightGrayColor], NSForegroundColorAttributeName, nil];
+            
+            // Create the attributed string (text + attributes)
+            NSMutableAttributedString *attributedText =[[NSMutableAttributedString alloc] initWithString:self.userLabel.text attributes:attrs];
+            [attributedText setAttributes:subAttrs range:range];
+            
+            // Set it in our UILabel and we are done!
+            [self.userLabel setAttributedText:attributedText];
+        }
+        
+        // Set typing badge visibility
+        if (memberCellData.isTyping)
+        {
+            self.typingBadge.hidden = NO;
+            [self.typingBadge.superview bringSubviewToFront:self.typingBadge];
+        }
+        else
+        {
+            self.typingBadge.hidden = YES;
+        }
+    }
+}
+
++ (CGFloat)heightForCellData:(MXKCellData *)cellData withMaximumWidth:(CGFloat)maxWidth
+{
+    // The height is fixed
+    return 50;
+}
+
+- (NSString*)lastActiveTime
+{
+    NSString* lastActiveTime = nil;
+    
+    // Get the user that corresponds to this member
+    MXUser *user = [mxSession userWithUserId:memberId];
+    if (user)
+    {
+        // Prepare last active ago string
+        lastActiveTime = [MXKTools formatSecondsIntervalFloored:(user.lastActiveAgo / 1000)];
+        
+        // Check presence
+        switch (user.presence)
+        {
+            case MXPresenceOffline:
+            {
+                lastActiveTime = [MatrixKitL10n offline];
+                break;
+            }
+            case MXPresenceUnknown:
+            {
+                lastActiveTime = nil;
+                break;
+            }
+            case MXPresenceOnline:
+            case MXPresenceUnavailable:
+            default:
+                break;
+        }
+        
+    }
+    
+    return lastActiveTime;
+}
+
+- (void)setPowerContainerValue:(CGFloat)progress
+{
+    // no power level -> hide the pie
+    if (0 == progress)
+    {
+        self.powerContainer.hidden = YES;
+        return;
+    }
+    
+    // display it
+    self.powerContainer.hidden = NO;
+    self.powerContainer.backgroundColor = [UIColor clearColor];
+    
+    if (!pieChartView)
+    {
+        pieChartView = [[MXKPieChartView alloc] initWithFrame:self.powerContainer.bounds];
+        [self.powerContainer addSubview:pieChartView];
+    }
+    
+    pieChartView.progress = progress;
+}
+
+- (void)updateActivityInfo
+{
+    // Check whether update is required.
+    if (shouldUpdateActivityInfo)
+    {
+        NSString *lastSeen = [self lastActiveTime];
+        NSMutableAttributedString *attributedText = [[NSMutableAttributedString alloc] initWithAttributedString:self.userLabel.attributedText];
+        if (lastSeen.length)
+        {
+            [attributedText replaceCharactersInRange:lastSeenRange withString:lastSeen];
+            
+            // Update last seen range
+            lastSeenRange.length = lastSeen.length;
+        }
+        else
+        {
+            // remove presence info
+            lastSeenRange.location -= 1;
+            lastSeenRange.length += 2;
+            [attributedText deleteCharactersInRange:lastSeenRange];
+            
+            shouldUpdateActivityInfo = NO;
+        }
+        
+        [self.userLabel setAttributedText:attributedText];
+    }
+}
+
+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+    
+    // Round image view
+    [_pictureView.layer setCornerRadius:_pictureView.frame.size.width / 2];
+    _pictureView.clipsToBounds = YES;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomMemberList/MXKRoomMemberTableViewCell.xib b/Riot/Modules/MatrixKit/Views/RoomMemberList/MXKRoomMemberTableViewCell.xib
new file mode 100644
index 000000000..1f0178c9a
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomMemberList/MXKRoomMemberTableViewCell.xib
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="50" id="aXI-hs-gNf" customClass="MXKRoomMemberTableViewCell">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="50"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="aXI-hs-gNf" id="q4T-pF-CuP">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="49"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CJC-M2-3cz" customClass="MXKImageView">
+                        <rect key="frame" x="8" y="5" width="40" height="40"/>
+                        <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" secondItem="CJC-M2-3cz" secondAttribute="height" multiplier="1:1" id="bly-Ea-Vvq"/>
+                        </constraints>
+                    </view>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="userLabel" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iFy-OK-xut" userLabel="userLabel">
+                        <rect key="frame" x="56" y="5" width="520" height="34"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="W5Z-3a-LW2" userLabel="PowerContainer">
+                        <rect key="frame" x="578" y="18" width="14" height="14"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="14" id="7fi-W6-3Sa"/>
+                            <constraint firstAttribute="width" constant="14" id="imM-WQ-Qgf"/>
+                        </constraints>
+                    </view>
+                    <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="YAu-wP-WnM" userLabel="typingBadge">
+                        <rect key="frame" x="5" y="0.0" width="20" height="20"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="20" id="dFN-Im-pSS"/>
+                            <constraint firstAttribute="width" constant="20" id="scT-z6-Uun"/>
+                        </constraints>
+                    </imageView>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="YAu-wP-WnM" firstAttribute="leading" secondItem="q4T-pF-CuP" secondAttribute="leading" constant="5" id="5ft-Pb-UJN"/>
+                    <constraint firstAttribute="trailingMargin" secondItem="W5Z-3a-LW2" secondAttribute="trailing" id="74P-LT-vkG"/>
+                    <constraint firstAttribute="bottom" secondItem="CJC-M2-3cz" secondAttribute="bottom" constant="4" id="9qa-86-pGV"/>
+                    <constraint firstItem="iFy-OK-xut" firstAttribute="top" secondItem="q4T-pF-CuP" secondAttribute="top" constant="5" id="A3N-Wc-aBt"/>
+                    <constraint firstItem="YAu-wP-WnM" firstAttribute="top" secondItem="q4T-pF-CuP" secondAttribute="top" id="CZT-v2-b58"/>
+                    <constraint firstAttribute="centerY" secondItem="W5Z-3a-LW2" secondAttribute="centerY" id="IZJ-Xf-g1s"/>
+                    <constraint firstItem="iFy-OK-xut" firstAttribute="leading" secondItem="CJC-M2-3cz" secondAttribute="trailing" constant="8" id="Iq2-M3-vu0"/>
+                    <constraint firstItem="CJC-M2-3cz" firstAttribute="top" secondItem="q4T-pF-CuP" secondAttribute="top" constant="5" id="MZl-z6-Jxx"/>
+                    <constraint firstItem="CJC-M2-3cz" firstAttribute="leading" secondItem="q4T-pF-CuP" secondAttribute="leading" constant="8" id="TJZ-CX-NiF"/>
+                    <constraint firstAttribute="bottom" secondItem="iFy-OK-xut" secondAttribute="bottom" constant="10" id="fKg-iv-O1W"/>
+                    <constraint firstAttribute="trailing" secondItem="iFy-OK-xut" secondAttribute="trailing" constant="24" id="sVQ-oi-McX"/>
+                </constraints>
+            </tableViewCellContentView>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <connections>
+                <outlet property="pictureView" destination="CJC-M2-3cz" id="AZY-ZP-KSE"/>
+                <outlet property="powerContainer" destination="W5Z-3a-LW2" id="Ssq-sC-S6p"/>
+                <outlet property="typingBadge" destination="YAu-wP-WnM" id="6PS-4m-cB4"/>
+                <outlet property="userLabel" destination="iFy-OK-xut" id="2Jp-tX-5Jl"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/RoomTitle/MXKRoomTitleView.h b/Riot/Modules/MatrixKit/Views/RoomTitle/MXKRoomTitleView.h
new file mode 100644
index 000000000..6b3b3f8de
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomTitle/MXKRoomTitleView.h
@@ -0,0 +1,120 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations 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 <MatrixSDK/MatrixSDK.h>
+
+#import "MXKView.h"
+
+@class MXKRoomTitleView;
+@protocol MXKRoomTitleViewDelegate <NSObject>
+
+/**
+ Tells the delegate that an alert must be presented.
+ 
+ @param titleView the room title view.
+ @param alertController the alert to present.
+ */
+- (void)roomTitleView:(MXKRoomTitleView*)titleView presentAlertController:(UIAlertController*)alertController;
+
+/**
+ Asks the delegate if editing should begin
+
+ @param titleView the room title view.
+ @return  YES if an editing session should be initiated; otherwise, NO to disallow editing.
+ */
+- (BOOL)roomTitleViewShouldBeginEditing:(MXKRoomTitleView*)titleView;
+
+@optional
+
+/**
+ Tells the delegate that the saving of user's changes is in progress or is finished.
+ 
+ @param titleView the room title view.
+ @param saving YES if a request is running to save user's changes.
+ */
+- (void)roomTitleView:(MXKRoomTitleView*)titleView isSaving:(BOOL)saving;
+
+@end
+
+/**
+ 'MXKRoomTitleView' instance displays editable room display name.
+ */
+@interface MXKRoomTitleView : MXKView <UITextFieldDelegate>
+{
+@protected
+    /**
+     Potential alert.
+     */
+    UIAlertController *currentAlert;
+    
+    /**
+     Test fields input accessory.
+     */
+    UIView *inputAccessoryView;
+}
+
+@property (weak, nonatomic) IBOutlet UITextField *displayNameTextField;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *displayNameTextFieldTopConstraint;
+
+@property (strong, nonatomic) MXRoom *mxRoom;
+@property (nonatomic) BOOL editable;
+@property (nonatomic) BOOL isEditing;
+
+/**
+ *  Returns the `UINib` object initialized for the room title view.
+ *
+ *  @return The initialized `UINib` object or `nil` if there were errors during
+ *  initialization or the nib file could not be located.
+ */
++ (UINib *)nib;
+
+/**
+ Creates and returns a new `MXKRoomTitleView-inherited` object.
+ 
+ @discussion This is the designated initializer for programmatic instantiation.
+ @return An initialized `MXKRoomTitleView-inherited` object if successful, `nil` otherwise.
+ */
++ (instancetype)roomTitleView;
+
+/**
+ The delegate notified when inputs are ready.
+ */
+@property (weak, nonatomic) id<MXKRoomTitleViewDelegate> delegate;
+
+/**
+ The custom accessory view associated to all text field of this 'MXKRoomTitleView' instance.
+ This view is actually used to retrieve the keyboard view. Indeed the keyboard view is the superview of
+ this accessory view when a text field become the first responder.
+ */
+@property (readonly) UIView *inputAccessoryView;
+
+/**
+ Dismiss keyboard.
+ */
+- (void)dismissKeyboard;
+
+/**
+ Force title view refresh.
+ */
+- (void)refreshDisplay;
+
+/**
+ Dispose view resources and listener.
+ */
+- (void)destroy;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomTitle/MXKRoomTitleView.m b/Riot/Modules/MatrixKit/Views/RoomTitle/MXKRoomTitleView.m
new file mode 100644
index 000000000..5ea74fc37
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomTitle/MXKRoomTitleView.m
@@ -0,0 +1,279 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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 "MXKRoomTitleView.h"
+
+#import "MXKConstants.h"
+
+#import "NSBundle+MatrixKit.h"
+#import "MXRoom+Sync.h"
+
+#import "MXKSwiftHeader.h"
+
+@interface MXKRoomTitleView ()
+{
+    // Observer kMXRoomSummaryDidChangeNotification to keep updated the room name.
+    __weak id mxRoomSummaryDidChangeObserver;
+}
+@end
+
+@implementation MXKRoomTitleView
+@synthesize inputAccessoryView;
+
++ (UINib *)nib
+{
+    return [UINib nibWithNibName:NSStringFromClass([MXKRoomTitleView class])
+                          bundle:[NSBundle bundleForClass:[MXKRoomTitleView class]]];
+}
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    
+    [self setTranslatesAutoresizingMaskIntoConstraints: NO];
+    
+    // Add an accessory view to the text view in order to retrieve keyboard view.
+    inputAccessoryView = [[UIView alloc] initWithFrame:CGRectZero];
+    self.displayNameTextField.inputAccessoryView = inputAccessoryView;
+    
+    self.displayNameTextField.enabled = NO;
+    self.displayNameTextField.returnKeyType = UIReturnKeyDone;
+    self.displayNameTextField.hidden = YES;
+}
+
++ (instancetype)roomTitleView
+{
+    return [[[self class] nib] instantiateWithOwner:nil options:nil].firstObject;
+}
+
+- (void)dealloc
+{
+    inputAccessoryView = nil;
+}
+
+#pragma mark - Override MXKView
+
+-(void)customizeViewRendering
+{
+    [super customizeViewRendering];
+    
+    self.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+}
+
+#pragma mark -
+
+- (void)refreshDisplay
+{
+    if (_mxRoom)
+    {
+        // Replace empty string by nil : avoid having the placeholder 'Room name" when there is no displayname
+        self.displayNameTextField.text = (_mxRoom.summary.displayname.length) ? _mxRoom.summary.displayname : nil;
+    }
+    else
+    {
+        self.displayNameTextField.text = [MatrixKitL10n roomPleaseSelect];
+        self.displayNameTextField.enabled = NO;
+    }
+    self.displayNameTextField.hidden = NO;
+}
+
+- (void)destroy
+{
+    self.delegate = nil;
+    self.mxRoom = nil;
+    
+    if (mxRoomSummaryDidChangeObserver)
+    {
+        [NSNotificationCenter.defaultCenter removeObserver:mxRoomSummaryDidChangeObserver];
+        mxRoomSummaryDidChangeObserver = nil;
+    }
+}
+
+- (void)dismissKeyboard
+{
+    // Hide the keyboard
+    [self.displayNameTextField resignFirstResponder];
+}
+
+#pragma mark -
+
+- (void)setMxRoom:(MXRoom *)mxRoom
+{
+    // Check whether the room is actually changed
+    if (_mxRoom != mxRoom)
+    {
+        // Remove potential listener
+        if (mxRoomSummaryDidChangeObserver)
+        {
+            [[NSNotificationCenter defaultCenter] removeObserver:mxRoomSummaryDidChangeObserver];
+            mxRoomSummaryDidChangeObserver = nil;
+        }
+        
+        if (mxRoom)
+        {
+            MXWeakify(self);
+            
+            // Register a listener to handle the room name change
+            mxRoomSummaryDidChangeObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXRoomSummaryDidChangeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+                
+                MXStrongifyAndReturnIfNil(self);
+                
+                // Check whether the text field is editing before refreshing title view
+                if (!self.isEditing)
+                {
+                    [self refreshDisplay];
+                }
+                
+            }];
+        }
+        _mxRoom = mxRoom;
+    }
+    // Force refresh
+    [self refreshDisplay];
+}
+
+- (void)setEditable:(BOOL)editable
+{
+    self.displayNameTextField.enabled = editable;
+}
+
+- (BOOL)isEditing
+{
+    return self.displayNameTextField.isEditing;
+}
+
+#pragma mark - UITextField delegate
+
+- (BOOL)textFieldShouldBeginEditing:(UITextField *)textField
+{
+    // check if the deleaget allows the edition
+    if (!self.delegate || [self.delegate roomTitleViewShouldBeginEditing:self])
+    {
+        NSString *alertMsg = nil;
+        
+        if (textField == self.displayNameTextField)
+        {
+            // Check whether the user has enough power to rename the room
+            MXRoomPowerLevels *powerLevels = _mxRoom.dangerousSyncState.powerLevels;
+
+            NSInteger userPowerLevel = [powerLevels powerLevelOfUserWithUserID:_mxRoom.mxSession.myUser.userId];
+            if (userPowerLevel >= [powerLevels minimumPowerLevelForSendingEventAsStateEvent:kMXEventTypeStringRoomName])
+            {
+                // Only the room name is edited here, update the text field with the room name
+                textField.text = _mxRoom.summary.displayname;
+                textField.backgroundColor = [UIColor whiteColor];
+            }
+            else
+            {
+                alertMsg = [MatrixKitL10n roomErrorNameEditionNotAuthorized];
+            }
+        }
+        
+        if (alertMsg)
+        {
+            // Alert user
+            __weak typeof(self) weakSelf = self;
+            if (currentAlert)
+            {
+                [currentAlert dismissViewControllerAnimated:NO completion:nil];
+            }
+            
+            currentAlert = [UIAlertController alertControllerWithTitle:nil message:alertMsg preferredStyle:UIAlertControllerStyleAlert];
+            
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+                                                      style:UIAlertActionStyleDefault
+                                                    handler:^(UIAlertAction * action) {
+                                                        
+                                                        typeof(self) self = weakSelf;
+                                                        self->currentAlert = nil;
+                                                        
+                                                    }]];
+            
+            [self.delegate roomTitleView:self presentAlertController:currentAlert];
+            return NO;
+        }
+        return YES;
+    }
+    else
+    {
+        return NO;
+    }
+}
+
+- (void)textFieldDidEndEditing:(UITextField *)textField
+{
+    if (textField == self.displayNameTextField)
+    {
+        textField.backgroundColor = [UIColor clearColor];
+        
+        NSString *roomName = textField.text;
+        if ((roomName.length || _mxRoom.summary.displayname.length) && [roomName isEqualToString:_mxRoom.summary.displayname] == NO)
+        {
+            if ([self.delegate respondsToSelector:@selector(roomTitleView:isSaving:)])
+            {
+                [self.delegate roomTitleView:self isSaving:YES];
+            }
+            
+            __weak typeof(self) weakSelf = self;
+            [_mxRoom setName:roomName success:^{
+                
+                if (weakSelf)
+                {
+                    typeof(weakSelf)strongSelf = weakSelf;
+                    if ([strongSelf.delegate respondsToSelector:@selector(roomTitleView:isSaving:)])
+                    {
+                        [strongSelf.delegate roomTitleView:strongSelf isSaving:NO];
+                    }
+                }
+                
+            } failure:^(NSError *error) {
+                
+                if (weakSelf)
+                {
+                    typeof(weakSelf)strongSelf = weakSelf;
+                    if ([strongSelf.delegate respondsToSelector:@selector(roomTitleView:isSaving:)])
+                    {
+                        [strongSelf.delegate roomTitleView:strongSelf isSaving:NO];
+                    }
+                    
+                    // Revert change
+                    textField.text = strongSelf.mxRoom.summary.displayname;
+                    MXLogDebug(@"[MXKRoomTitleView] Rename room failed");
+                    // Notify MatrixKit user
+                    NSString *myUserId = strongSelf.mxRoom.mxSession.myUser.userId;
+                    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+                }
+                
+            }];
+        }
+        else
+        {
+            // No change on room name, restore title with room displayName
+            textField.text = _mxRoom.summary.displayname;
+        }
+    }
+}
+
+- (BOOL)textFieldShouldReturn:(UITextField*) textField
+{
+    // "Done" key has been pressed
+    [textField resignFirstResponder];
+    return YES;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomTitle/MXKRoomTitleView.xib b/Riot/Modules/MatrixKit/Views/RoomTitle/MXKRoomTitleView.xib
new file mode 100644
index 000000000..8746fee25
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomTitle/MXKRoomTitleView.xib
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="Wek-LA-v7p" customClass="MXKRoomTitleView">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <subviews>
+                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Room Name" textAlignment="center" minimumFontSize="14" translatesAutoresizingMaskIntoConstraints="NO" id="hag-WW-XxJ">
+                    <rect key="frame" x="0.0" y="5" width="600" height="21"/>
+                    <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <textInputTraits key="textInputTraits" returnKeyType="next"/>
+                    <connections>
+                        <outlet property="delegate" destination="Wek-LA-v7p" id="J7I-R9-BkF"/>
+                    </connections>
+                </textField>
+            </subviews>
+            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="hag-WW-XxJ" secondAttribute="trailing" id="LaZ-Yg-BjR"/>
+                <constraint firstItem="hag-WW-XxJ" firstAttribute="leading" secondItem="Wek-LA-v7p" secondAttribute="leading" id="MyD-YH-Cln"/>
+                <constraint firstItem="hag-WW-XxJ" firstAttribute="top" secondItem="Wek-LA-v7p" secondAttribute="top" constant="5" id="c4c-HK-oti"/>
+            </constraints>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="displayNameTextField" destination="hag-WW-XxJ" id="1AJ-rc-7Rg"/>
+                <outlet property="displayNameTextFieldTopConstraint" destination="c4c-HK-oti" id="ygV-sQ-MdW"/>
+            </connections>
+        </view>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/RoomTitle/MXKRoomTitleViewWithTopic.h b/Riot/Modules/MatrixKit/Views/RoomTitle/MXKRoomTitleViewWithTopic.h
new file mode 100644
index 000000000..31a2c8894
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomTitle/MXKRoomTitleViewWithTopic.h
@@ -0,0 +1,36 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKRoomTitleView.h"
+
+/**
+ 'MXKRoomTitleViewWithTopic' inherits 'MXKRoomTitleView' to add an editable room topic field.
+ */
+@interface MXKRoomTitleViewWithTopic : MXKRoomTitleView <UIGestureRecognizerDelegate>{
+}
+
+@property (weak, nonatomic) IBOutlet UITextField *topicTextField;
+
+@property (nonatomic) BOOL hiddenTopic;
+
+/**
+ Stop topic animation.
+ 
+ @return YES if the animation has been stopped.
+ */
+- (BOOL)stopTopicAnimation;
+
+@end
\ No newline at end of file
diff --git a/Riot/Modules/MatrixKit/Views/RoomTitle/MXKRoomTitleViewWithTopic.m b/Riot/Modules/MatrixKit/Views/RoomTitle/MXKRoomTitleViewWithTopic.m
new file mode 100644
index 000000000..9fbe1dec9
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomTitle/MXKRoomTitleViewWithTopic.m
@@ -0,0 +1,520 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2018 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 "MXKRoomTitleViewWithTopic.h"
+
+#import "MXKConstants.h"
+
+#import "NSBundle+MatrixKit.h"
+#import "MXRoom+Sync.h"
+
+#import "MXKSwiftHeader.h"
+
+@interface MXKRoomTitleViewWithTopic ()
+{
+    id roomTopicListener;
+    
+    // the topic can be animated if it is longer than the screen size
+    UIScrollView* scrollView;
+    UILabel* label;
+    UIView* topicTextFieldMaskView;
+    
+    // do not start the topic animation asap
+    NSTimer * animationTimer;
+}
+@end
+
+@implementation MXKRoomTitleViewWithTopic
+
++ (UINib *)nib
+{
+    return [UINib nibWithNibName:NSStringFromClass([MXKRoomTitleViewWithTopic class])
+                          bundle:[NSBundle bundleForClass:[MXKRoomTitleViewWithTopic class]]];
+}
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    
+    // Add an accessory view to the text view in order to retrieve keyboard view.
+    self.topicTextField.inputAccessoryView = inputAccessoryView;
+    
+    self.displayNameTextField.returnKeyType = UIReturnKeyNext;
+    self.topicTextField.enabled = NO;
+    self.topicTextField.returnKeyType = UIReturnKeyDone;
+    self.hiddenTopic = YES;
+}
+
+- (void)refreshDisplay
+{
+    [super refreshDisplay];
+    
+    if (self.mxRoom)
+    {
+        // Remove new line characters
+        NSString *topic = [MXTools stripNewlineCharacters:self.mxRoom.summary.topic];
+        // replace empty string by nil: avoid having the placeholder when there is no topic
+        self.topicTextField.text = (topic.length ? topic : nil);
+    }
+    else
+    {
+        self.topicTextField.text = nil;
+    }
+    
+    self.hiddenTopic = (!self.topicTextField.text.length);
+}
+
+- (void)destroy
+{
+    // stop any animation
+    [self stopTopicAnimation];
+    
+    [super destroy];
+}
+
+- (void)dismissKeyboard
+{
+    // Hide the keyboard
+    [self.topicTextField resignFirstResponder];
+    
+    // restart the animation
+    [self stopTopicAnimation];
+    
+    [super dismissKeyboard];
+}
+
+#pragma mark -
+
+- (void)setMxRoom:(MXRoom *)mxRoom
+{
+    // Make sure we can access synchronously to self.mxRoom and mxRoom data
+    // to avoid race conditions
+    MXWeakify(self);
+    [mxRoom.mxSession preloadRoomsData:self.mxRoom ? @[self.mxRoom.roomId, mxRoom.roomId] : @[mxRoom.roomId] onComplete:^{
+        MXStrongifyAndReturnIfNil(self);
+
+        // Check whether the room is actually changed
+        if (self.mxRoom != mxRoom)
+        {
+            // Remove potential listener
+            if (self->roomTopicListener && self.mxRoom)
+            {
+                MXWeakify(self);
+                [self.mxRoom liveTimeline:^(MXEventTimeline *liveTimeline) {
+                    MXStrongifyAndReturnIfNil(self);
+
+                    [liveTimeline removeListener:self->roomTopicListener];
+                    self->roomTopicListener = nil;
+                }];
+            }
+
+            if (mxRoom)
+            {
+                // Register a listener to handle messages related to room name
+                self->roomTopicListener = [mxRoom listenToEventsOfTypes:@[kMXEventTypeStringRoomTopic] onEvent:^(MXEvent *event, MXTimelineDirection direction, MXRoomState *roomState) {
+
+                    // Consider only live events
+                    if (direction == MXTimelineDirectionForwards)
+                    {
+                        [self refreshDisplay];
+                    }
+                }];
+            }
+        }
+
+        super.mxRoom = mxRoom;
+    }];
+}
+
+- (void)setEditable:(BOOL)editable
+{
+    self.topicTextField.enabled = editable;
+    
+    super.editable = editable;
+}
+
+- (void)setHiddenTopic:(BOOL)hiddenTopic
+{
+    [self stopTopicAnimation];
+    if (hiddenTopic)
+    {
+        self.topicTextField.hidden = YES;
+        self.displayNameTextFieldTopConstraint.constant = 10;
+    }
+    else
+    {
+        self.topicTextField.hidden = NO;
+        self.displayNameTextFieldTopConstraint.constant = 0;
+    }
+}
+
+- (BOOL)isEditing
+{
+    return (super.isEditing || self.topicTextField.isEditing);
+}
+
+#pragma mark -
+
+// start with delay
+- (void)startTopicAnimation
+{
+    // stop any pending timer
+    if (animationTimer)
+    {
+        [animationTimer invalidate];
+        animationTimer = nil;
+    }
+    
+    // already animated the topic
+    if (scrollView)
+    {
+        return;
+    }
+    
+    // compute the text width
+    UIFont* font = self.topicTextField.font;
+    
+    // see font description
+    if (!font)
+    {
+        font = [UIFont systemFontOfSize:12];
+    }
+    
+    NSDictionary *attributes = @{NSFontAttributeName: font};
+    
+    CGSize stringSize = CGSizeMake(CGFLOAT_MAX, self.topicTextField.frame.size.height);
+    
+    stringSize  = [self.topicTextField.text boundingRectWithSize:stringSize
+                                                         options:NSStringDrawingUsesLineFragmentOrigin|NSStringDrawingUsesFontLeading
+                                                      attributes:attributes
+                                                         context:nil].size;
+    
+    // does not need to animate the text
+    if (stringSize.width < self.topicTextField.frame.size.width)
+    {
+        return;
+    }
+    
+    // put the text in a scrollView to animat it
+    scrollView = [[UIScrollView alloc] initWithFrame: self.topicTextField.frame];
+    label = [[UILabel alloc] initWithFrame:self.topicTextField.frame];
+    label.text = self.topicTextField.text;
+    label.textColor = self.topicTextField.textColor;
+    label.font = self.topicTextField.font;
+    
+    // move to the top left
+    CGRect topicTextFieldFrame = self.topicTextField.frame;
+    topicTextFieldFrame.origin = CGPointZero;
+    label.frame = topicTextFieldFrame;
+    
+    self.topicTextField.hidden = YES;
+    [scrollView addSubview:label];
+    [self insertSubview:scrollView belowSubview:topicTextFieldMaskView];
+    
+    // update the size
+    [label sizeToFit];
+    
+    // offset
+    CGPoint offset = scrollView.contentOffset;
+    offset.x = label.frame.size.width - scrollView.frame.size.width;
+    
+    // duration (magic computation to give more time if the text is longer)
+    CGFloat duration  = label.frame.size.width / scrollView.frame.size.width * 3;
+    
+    // animate the topic once to display its full content
+    [UIView animateWithDuration:duration delay:0 options:UIViewAnimationOptionAutoreverse | UIViewAnimationOptionCurveLinear animations:^{
+        [self->scrollView setContentOffset:offset animated:NO];
+    } completion:^(BOOL finished)
+    {
+        [self stopTopicAnimation];
+    }];
+}
+
+- (BOOL)stopTopicAnimation
+{
+    // stop running timers
+    if (animationTimer)
+    {
+        [animationTimer invalidate];
+        animationTimer = nil;
+    }
+    
+    // if there is an animation is progress
+    if (scrollView)
+    {
+        self.topicTextField.hidden = NO;
+        
+        [scrollView.layer removeAllAnimations];
+        [scrollView removeFromSuperview];
+        scrollView = nil;
+        label = nil;
+        
+        [self addSubview:self.topicTextField];
+        
+        // must be done to be able to restart the animation
+        // the Z order is not kept
+        [self bringSubviewToFront:topicTextFieldMaskView];
+        
+        return YES;
+    }
+    
+    return NO;
+}
+
+- (void)editTopic
+{
+    [self stopTopicAnimation];
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [self.topicTextField becomeFirstResponder];
+    });
+}
+
+- (void)layoutSubviews
+{
+    // add a mask to trap the tap events
+    // it is faster (and simpliest) than subclassing the scrollview or the textField
+    // any other gesture could also be trapped here
+    if (!topicTextFieldMaskView)
+    {
+        topicTextFieldMaskView = [[UIView alloc]  initWithFrame:self.topicTextField.frame];
+        topicTextFieldMaskView.backgroundColor = [UIColor clearColor];
+        [self addSubview:topicTextFieldMaskView];
+        
+        // tap -> switch to text edition
+        UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(editTopic)];
+        [tap setNumberOfTouchesRequired:1];
+        [tap setNumberOfTapsRequired:1];
+        [tap setDelegate:self];
+        [topicTextFieldMaskView addGestureRecognizer:tap];
+        
+        // long tap -> animate the topic
+        UILongPressGestureRecognizer *longPress = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(startTopicAnimation)];
+        [topicTextFieldMaskView addGestureRecognizer:longPress];
+    }
+    
+    
+    // mother class call
+    [super layoutSubviews];
+}
+
+- (void)setFrame:(CGRect)frame
+{
+    // mother class call
+    [super setFrame:frame];
+    
+    // stop any running animation if the frame is updated (screen rotation for example)
+    if (!CGRectEqualToRect(CGRectIntegral(frame), CGRectIntegral(self.frame)))
+    {
+        // stop any running application
+        [self stopTopicAnimation];
+    }
+    
+    // update the mask frame
+    if (self.topicTextField.hidden)
+    {
+        topicTextFieldMaskView.frame = CGRectZero;
+    }
+    else
+    {
+        topicTextFieldMaskView.frame = self.topicTextField.frame;
+    }
+    
+    // topicTextField switches becomes the first responder or it is not anymore the first responder
+    if (self.topicTextField.isFirstResponder != (topicTextFieldMaskView.hidden))
+    {
+        topicTextFieldMaskView.hidden = self.topicTextField.isFirstResponder;
+        
+        // move topicTextFieldMaskView to the foreground
+        // when topicTextField has been the first responder, it lets a view over topicTextFieldMaskView
+        // so restore the expected Z order
+        if (!topicTextFieldMaskView.hidden)
+        {
+            [self bringSubviewToFront:topicTextFieldMaskView];
+        }
+    }
+}
+
+#pragma mark - UITextField delegate
+
+- (BOOL)textFieldShouldBeginEditing:(UITextField *)textField
+{
+    // check if the deleaget allows the edition
+    if (!self.delegate || [self.delegate roomTitleViewShouldBeginEditing:self])
+    {
+        NSString *alertMsg = nil;
+        
+        if (textField == self.displayNameTextField)
+        {
+            // Check whether the user has enough power to rename the room
+            MXRoomPowerLevels *powerLevels = self.mxRoom.dangerousSyncState.powerLevels;
+            NSInteger userPowerLevel = [powerLevels powerLevelOfUserWithUserID:self.mxRoom.mxSession.myUser.userId];
+            if (userPowerLevel >= [powerLevels minimumPowerLevelForSendingEventAsStateEvent:kMXEventTypeStringRoomName])
+            {
+                // Only the room name is edited here, update the text field with the room name
+                textField.text = self.mxRoom.summary.displayname;
+                textField.backgroundColor = [UIColor whiteColor];
+            }
+            else
+            {
+                alertMsg = [MatrixKitL10n roomErrorNameEditionNotAuthorized];
+            }
+            
+            // Check whether the user is allowed to change room topic
+            if (userPowerLevel >= [powerLevels minimumPowerLevelForSendingEventAsStateEvent:kMXEventTypeStringRoomTopic])
+            {
+                // Show topic text field even if the current value is nil
+                self.hiddenTopic = NO;
+                if (alertMsg)
+                {
+                    // Here the user can only update the room topic, switch on room topic field (without displaying alert)
+                    alertMsg = nil;
+                    [self.topicTextField becomeFirstResponder];
+                    return NO;
+                }
+            }
+        }
+        else if (textField == self.topicTextField)
+        {
+            // Check whether the user has enough power to edit room topic
+            MXRoomPowerLevels *powerLevels = self.mxRoom.dangerousSyncState.powerLevels;
+            NSInteger userPowerLevel = [powerLevels powerLevelOfUserWithUserID:self.mxRoom.mxSession.myUser.userId];
+            if (userPowerLevel >= [powerLevels minimumPowerLevelForSendingEventAsStateEvent:kMXEventTypeStringRoomTopic])
+            {
+                textField.backgroundColor = [UIColor whiteColor];
+                [self stopTopicAnimation];
+            }
+            else
+            {
+                alertMsg = [MatrixKitL10n roomErrorTopicEditionNotAuthorized];
+            }
+        }
+        
+        if (alertMsg)
+        {
+            // Alert user
+            __weak typeof(self) weakSelf = self;
+            if (currentAlert)
+            {
+                [currentAlert dismissViewControllerAnimated:NO completion:nil];
+            }
+            currentAlert = [UIAlertController alertControllerWithTitle:nil message:alertMsg preferredStyle:UIAlertControllerStyleAlert];
+            
+            [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+                                                             style:UIAlertActionStyleDefault
+                                                           handler:^(UIAlertAction * action) {
+                                                               
+                                                               typeof(self) self = weakSelf;
+                                                               self->currentAlert = nil;
+                                                               
+                                                           }]];
+            
+            [self.delegate roomTitleView:self presentAlertController:currentAlert];
+            return NO;
+        }
+        return YES;
+    }
+    else
+    {
+        return NO;
+    }
+}
+
+- (void)textFieldDidEndEditing:(UITextField *)textField
+{
+    if (textField == self.topicTextField)
+    {
+        textField.backgroundColor = [UIColor clearColor];
+        
+        NSString *topic = textField.text;
+        if ((topic.length || self.mxRoom.summary.topic.length) && [topic isEqualToString:self.mxRoom.summary.topic] == NO)
+        {
+            if ([self.delegate respondsToSelector:@selector(roomTitleView:isSaving:)])
+            {
+                [self.delegate roomTitleView:self isSaving:YES];
+            }
+            __weak typeof(self) weakSelf = self;
+            [self.mxRoom setTopic:topic success:^{
+                
+                if (weakSelf)
+                {
+                    typeof(weakSelf)strongSelf = weakSelf;
+                    if ([strongSelf.delegate respondsToSelector:@selector(roomTitleView:isSaving:)])
+                    {
+                        [strongSelf.delegate roomTitleView:strongSelf isSaving:NO];
+                    }
+                    
+                    // Hide topic field if empty
+                    strongSelf.hiddenTopic = !textField.text.length;
+                }
+                
+            } failure:^(NSError *error) {
+                
+                if (weakSelf)
+                {
+                    typeof(weakSelf)strongSelf = weakSelf;
+                    if ([strongSelf.delegate respondsToSelector:@selector(roomTitleView:isSaving:)])
+                    {
+                        [strongSelf.delegate roomTitleView:strongSelf isSaving:NO];
+                    }
+                    
+                    // Revert change
+                    NSString *topic = [MXTools stripNewlineCharacters:strongSelf.mxRoom.summary.topic];
+                    textField.text = (topic.length ? topic : nil);
+                    
+                    // Hide topic field if empty
+                    strongSelf.hiddenTopic = !textField.text.length;
+                    
+                    MXLogDebug(@"[MXKRoomTitleViewWithTopic] Topic room change failed");
+                    // Notify MatrixKit user
+                    NSString *myUserId = strongSelf.mxRoom.mxSession.myUser.userId;
+                    [[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
+                }
+                
+            }];
+        }
+        else
+        {
+            // Hide topic field if empty
+            self.hiddenTopic = !topic.length;
+        }
+    }
+    else
+    {
+        // Let super handle displayName text field
+        [super textFieldDidEndEditing:textField];
+    }
+}
+
+- (BOOL)textFieldShouldReturn:(UITextField*) textField
+{
+    if (textField == self.displayNameTextField)
+    {
+        // "Next" key has been pressed
+        [self.topicTextField becomeFirstResponder];
+    }
+    else
+    {
+        // "Done" key has been pressed
+        [textField resignFirstResponder];
+    }
+    return YES;
+}
+
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/RoomTitle/MXKRoomTitleViewWithTopic.xib b/Riot/Modules/MatrixKit/Views/RoomTitle/MXKRoomTitleViewWithTopic.xib
new file mode 100644
index 000000000..1d354955b
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/RoomTitle/MXKRoomTitleViewWithTopic.xib
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="BkF-x3-7fX" customClass="MXKRoomTitleViewWithTopic">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <subviews>
+                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Room Name" textAlignment="center" minimumFontSize="14" translatesAutoresizingMaskIntoConstraints="NO" id="6uH-I3-RQg">
+                    <rect key="frame" x="0.0" y="0.0" width="600" height="21"/>
+                    <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <textInputTraits key="textInputTraits" returnKeyType="next"/>
+                    <connections>
+                        <outlet property="delegate" destination="BkF-x3-7fX" id="xX7-jB-9va"/>
+                    </connections>
+                </textField>
+                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Topic" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Cb9-hb-6f0">
+                    <rect key="frame" x="0.0" y="24" width="600" height="16"/>
+                    <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                    <textInputTraits key="textInputTraits" returnKeyType="done"/>
+                    <connections>
+                        <outlet property="delegate" destination="BkF-x3-7fX" id="8qe-OH-aKS"/>
+                    </connections>
+                </textField>
+            </subviews>
+            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstAttribute="bottom" secondItem="Cb9-hb-6f0" secondAttribute="bottom" constant="4" id="1N3-4y-mDx"/>
+                <constraint firstAttribute="trailing" secondItem="Cb9-hb-6f0" secondAttribute="trailing" id="G6O-Le-cFA"/>
+                <constraint firstItem="Cb9-hb-6f0" firstAttribute="leading" secondItem="BkF-x3-7fX" secondAttribute="leading" id="NJY-h8-w2I"/>
+                <constraint firstItem="6uH-I3-RQg" firstAttribute="top" secondItem="BkF-x3-7fX" secondAttribute="top" id="Piq-rp-Pae"/>
+                <constraint firstAttribute="trailing" secondItem="6uH-I3-RQg" secondAttribute="trailing" id="WT3-JF-1GG"/>
+                <constraint firstItem="6uH-I3-RQg" firstAttribute="leading" secondItem="BkF-x3-7fX" secondAttribute="leading" id="czp-h4-Nl6"/>
+            </constraints>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="displayNameTextField" destination="6uH-I3-RQg" id="MfX-LQ-C2K"/>
+                <outlet property="displayNameTextFieldTopConstraint" destination="Piq-rp-Pae" id="jnL-Hz-TWn"/>
+                <outlet property="topicTextField" destination="Cb9-hb-6f0" id="uRc-er-1Fq"/>
+            </connections>
+        </view>
+    </objects>
+</document>
diff --git a/Riot/Modules/MatrixKit/Views/Search/MXKSearchTableViewCell.h b/Riot/Modules/MatrixKit/Views/Search/MXKSearchTableViewCell.h
new file mode 100644
index 000000000..562e7b87a
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/Search/MXKSearchTableViewCell.h
@@ -0,0 +1,34 @@
+/*
+ Copyright 2015 OpenMarket 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 "MXKTableViewCell.h"
+
+#import "MXKCellRendering.h"
+#import "MXKImageView.h"
+
+/**
+ Each `MXKSearchTableViewCell` instance displays a search result.
+ */
+@interface MXKSearchTableViewCell : MXKTableViewCell <MXKCellRendering>
+
+@property (weak, nonatomic) IBOutlet UILabel *title;
+@property (weak, nonatomic) IBOutlet UILabel *message;
+@property (weak, nonatomic) IBOutlet UILabel *date;
+
+@property (weak, nonatomic) IBOutlet MXKImageView *attachmentImageView;
+@property (weak, nonatomic) IBOutlet UIImageView *iconImage;
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/Search/MXKSearchTableViewCell.m b/Riot/Modules/MatrixKit/Views/Search/MXKSearchTableViewCell.m
new file mode 100644
index 000000000..0c5617acd
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/Search/MXKSearchTableViewCell.m
@@ -0,0 +1,74 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2018 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 "MXKSearchTableViewCell.h"
+
+@import MatrixSDK.MXMediaManager;
+
+#import "MXKSearchCellDataStoring.h"
+
+@implementation MXKSearchTableViewCell
+
+#pragma mark - Class methods
+
+- (void)render:(MXKCellData *)cellData
+{
+    // Sanity check: accept only object of MXKRoomBubbleCellData classes or sub-classes
+    NSParameterAssert([cellData conformsToProtocol:@protocol(MXKSearchCellDataStoring)]);
+    
+    id<MXKSearchCellDataStoring> searchCellData = (id<MXKSearchCellDataStoring>)cellData;
+    if (searchCellData)
+    {
+        _title.text = searchCellData.title;
+        _date.text = searchCellData.date;
+        _message.text = searchCellData.message;
+        
+        if (_attachmentImageView)
+        {
+            _attachmentImageView.image = nil;
+            self.attachmentImageView.defaultBackgroundColor = [UIColor clearColor];
+            
+            if (searchCellData.isAttachmentWithThumbnail)
+            {
+                [self.attachmentImageView setAttachmentThumb:searchCellData.attachment];
+                self.attachmentImageView.defaultBackgroundColor = [UIColor whiteColor];
+            }
+        }
+        
+        if (_iconImage)
+        {
+            _iconImage.image = searchCellData.attachmentIcon;
+        }
+    }
+    else
+    {
+        _title.text = nil;
+        _date.text = nil;
+        _message.text = @"";
+        
+        _attachmentImageView.image = nil;
+        _iconImage.image = nil;
+    }
+}
+
++ (CGFloat)heightForCellData:(MXKCellData *)cellData withMaximumWidth:(CGFloat)maxWidth
+{
+    // The height is fixed
+    return 70;
+}
+
+@end
diff --git a/Riot/Modules/MatrixKit/Views/Search/MXKSearchTableViewCell.xib b/Riot/Modules/MatrixKit/Views/Search/MXKSearchTableViewCell.xib
new file mode 100644
index 000000000..94b9f51f8
--- /dev/null
+++ b/Riot/Modules/MatrixKit/Views/Search/MXKSearchTableViewCell.xib
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="L2L-l5-wPx" customClass="MXKSearchTableViewCell">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="70"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="L2L-l5-wPx" id="aXz-IR-jj5">
+                <rect key="frame" x="0.0" y="0.0" width="600" height="69"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Lg1-xQ-AGn">
+                        <rect key="frame" x="8" y="8" width="508" height="24"/>
+                        <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
+                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Message" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dQt-mN-T6b">
+                        <rect key="frame" x="8" y="42" width="584" height="18"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Oct 12 18:15" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="360-Go-RcG">
+                        <rect key="frame" x="522" y="8" width="70" height="15"/>
+                        <constraints>
+                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="70" id="uOj-6w-G8q"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="Lg1-xQ-AGn" firstAttribute="leading" secondItem="aXz-IR-jj5" secondAttribute="leading" constant="8" id="3qc-BC-FYt"/>
+                    <constraint firstItem="360-Go-RcG" firstAttribute="leading" secondItem="Lg1-xQ-AGn" secondAttribute="trailing" constant="6" id="8ff-tS-Ulq"/>
+                    <constraint firstItem="dQt-mN-T6b" firstAttribute="leading" secondItem="aXz-IR-jj5" secondAttribute="leading" constant="8" id="UYQ-HG-YP1"/>
+                    <constraint firstItem="360-Go-RcG" firstAttribute="top" secondItem="aXz-IR-jj5" secondAttribute="top" constant="8" id="XyO-tl-6SX"/>
+                    <constraint firstAttribute="trailing" secondItem="360-Go-RcG" secondAttribute="trailing" constant="8" id="YqC-WC-Wqe"/>
+                    <constraint firstAttribute="bottom" secondItem="dQt-mN-T6b" secondAttribute="bottom" constant="9" id="sLb-Q4-AFW"/>
+                    <constraint firstItem="Lg1-xQ-AGn" firstAttribute="top" secondItem="aXz-IR-jj5" secondAttribute="top" constant="8" id="uCT-KE-X09"/>
+                    <constraint firstAttribute="trailing" secondItem="dQt-mN-T6b" secondAttribute="trailing" constant="8" id="ygG-1B-fu3"/>
+                </constraints>
+            </tableViewCellContentView>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <connections>
+                <outlet property="date" destination="360-Go-RcG" id="JGU-FE-TFH"/>
+                <outlet property="message" destination="dQt-mN-T6b" id="sh8-ZK-nJ7"/>
+                <outlet property="title" destination="Lg1-xQ-AGn" id="Kz8-2x-4Rs"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.h b/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.h
index 32424d8eb..0d8479d1d 100644
--- a/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.h
+++ b/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 #import <Photos/Photos.h>
 
diff --git a/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.m b/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.m
index fc3755331..c01c845e6 100644
--- a/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.m
+++ b/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.m
@@ -19,7 +19,7 @@
 
 #import <MobileCoreServices/MobileCoreServices.h>
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface MediaAlbumContentViewController ()
 {
@@ -163,9 +163,6 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"MediaAlbumContent"];
     
     self.navigationItem.title = _assetsCollection.localizedTitle;
     
diff --git a/Riot/Modules/MediaPicker/MediaPickerViewController.h b/Riot/Modules/MediaPicker/MediaPickerViewController.h
index 71487e1ea..a032ec2eb 100644
--- a/Riot/Modules/MediaPicker/MediaPickerViewController.h
+++ b/Riot/Modules/MediaPicker/MediaPickerViewController.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 #import "MediaAlbumContentViewController.h"
 
diff --git a/Riot/Modules/MediaPicker/MediaPickerViewController.m b/Riot/Modules/MediaPicker/MediaPickerViewController.m
index bd38cd2a8..190af4d17 100644
--- a/Riot/Modules/MediaPicker/MediaPickerViewController.m
+++ b/Riot/Modules/MediaPicker/MediaPickerViewController.m
@@ -17,7 +17,7 @@
 
 #import "MediaPickerViewController.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import <Photos/Photos.h>
 
@@ -29,8 +29,6 @@
 
 #import "MediaAlbumTableCell.h"
 
-#import <MatrixKit/MatrixKit.h>
-
 @interface MediaPickerViewController () <UICollectionViewDataSource, UICollectionViewDelegate, UICollectionViewDelegateFlowLayout, MediaAlbumContentViewControllerDelegate>
 
 {
@@ -214,9 +212,6 @@
     [super viewWillAppear:animated];
     
     [self userInterfaceThemeDidChange];
-
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"MediaPicker"];
     
     if (!userAlbumsQueue)
     {
diff --git a/Riot/Modules/MediaPicker/Views/MediaAlbumTableCell.h b/Riot/Modules/MediaPicker/Views/MediaAlbumTableCell.h
index 40cd11bec..835ef6afc 100644
--- a/Riot/Modules/MediaPicker/Views/MediaAlbumTableCell.h
+++ b/Riot/Modules/MediaPicker/Views/MediaAlbumTableCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  'MediaAlbumTableCell' is a base class for displaying a user album.
diff --git a/Riot/Modules/MediaPicker/Views/MediaAlbumTableCell.m b/Riot/Modules/MediaPicker/Views/MediaAlbumTableCell.m
index 2f2f1e40a..0ca5d5f38 100644
--- a/Riot/Modules/MediaPicker/Views/MediaAlbumTableCell.m
+++ b/Riot/Modules/MediaPicker/Views/MediaAlbumTableCell.m
@@ -18,7 +18,7 @@
 #import "MediaAlbumTableCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @implementation MediaAlbumTableCell
 
diff --git a/Riot/Modules/People/InviteFriendsPresenter.swift b/Riot/Modules/People/InviteFriendsPresenter.swift
index 325b7cf71..ad8995746 100644
--- a/Riot/Modules/People/InviteFriendsPresenter.swift
+++ b/Riot/Modules/People/InviteFriendsPresenter.swift
@@ -73,5 +73,7 @@ final class InviteFriendsPresenter: NSObject {
         }
         
         self.presentingViewController?.present(viewController, animated: animated, completion: nil)
+        
+        Analytics.shared.trackScreen(.inviteFriends, duration: nil)
     }
 }
diff --git a/Riot/Modules/People/PeopleViewController.m b/Riot/Modules/People/PeopleViewController.m
index ed9aaca76..ace78de54 100644
--- a/Riot/Modules/People/PeopleViewController.m
+++ b/Riot/Modules/People/PeopleViewController.m
@@ -24,7 +24,7 @@
 #import "RecentTableViewCell.h"
 #import "InviteRecentTableViewCell.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface PeopleViewController () <SpaceMembersCoordinatorBridgePresenterDelegate>
 {
@@ -51,7 +51,7 @@
     
     directRoomsSectionNumber = 0;
     
-    self.screenName = @"People";
+    self.screenTimer = [[AnalyticsScreenTimer alloc] initWithScreen:AnalyticsScreenPeople];
 }
 
 - (void)viewDidLoad
@@ -140,7 +140,7 @@
     // Check whether the recents data source is correctly configured.
     if (recentsDataSource.recentsDataSourceMode == RecentsDataSourceModePeople)
     {
-        [self scrollToTheTopTheNextRoomWithMissedNotificationsInSection:recentsDataSource.conversationSection];
+        [self scrollToTheTopTheNextRoomWithMissedNotificationsInSection:recentsDataSource.peopleSection];
     }
 }
 
diff --git a/Riot/Modules/People/Views/InviteRecentTableViewCell.h b/Riot/Modules/People/Views/InviteRecentTableViewCell.h
index 314f7f7e8..f3fe96891 100644
--- a/Riot/Modules/People/Views/InviteRecentTableViewCell.h
+++ b/Riot/Modules/People/Views/InviteRecentTableViewCell.h
@@ -14,8 +14,6 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
-
 #import "RecentTableViewCell.h"
 
 /**
diff --git a/Riot/Modules/People/Views/InviteRecentTableViewCell.m b/Riot/Modules/People/Views/InviteRecentTableViewCell.m
index 738c8cb4a..d0ab6a9e3 100644
--- a/Riot/Modules/People/Views/InviteRecentTableViewCell.m
+++ b/Riot/Modules/People/Views/InviteRecentTableViewCell.m
@@ -22,7 +22,7 @@
 #import "MXEvent.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #pragma mark - Constant definitions
 
diff --git a/Riot/Modules/PublicRoomList/DataSources/PublicRoomsDirectoryDataSource.h b/Riot/Modules/PublicRoomList/DataSources/PublicRoomsDirectoryDataSource.h
index 750daac05..6fce1d92b 100644
--- a/Riot/Modules/PublicRoomList/DataSources/PublicRoomsDirectoryDataSource.h
+++ b/Riot/Modules/PublicRoomList/DataSources/PublicRoomsDirectoryDataSource.h
@@ -17,7 +17,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "MatrixKit/MatrixKit.h"
+#import "MatrixKit.h"
 
 /**
  `PublicRoomsDirectoryDataSource` is a base class to display public rooms directory.
diff --git a/Riot/Modules/PublicRoomList/DataSources/PublicRoomsDirectoryDataSource.m b/Riot/Modules/PublicRoomList/DataSources/PublicRoomsDirectoryDataSource.m
index db260be11..de80ee7b8 100644
--- a/Riot/Modules/PublicRoomList/DataSources/PublicRoomsDirectoryDataSource.m
+++ b/Riot/Modules/PublicRoomList/DataSources/PublicRoomsDirectoryDataSource.m
@@ -19,7 +19,7 @@
 
 #import "PublicRoomTableViewCell.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #pragma mark - Constants definitions
 
diff --git a/Riot/Modules/PublicRoomList/Views/PublicRoomTableViewCell.h b/Riot/Modules/PublicRoomList/Views/PublicRoomTableViewCell.h
index e0f145028..02b82820b 100644
--- a/Riot/Modules/PublicRoomList/Views/PublicRoomTableViewCell.h
+++ b/Riot/Modules/PublicRoomList/Views/PublicRoomTableViewCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @interface PublicRoomTableViewCell : MXKPublicRoomTableViewCell
 
diff --git a/Riot/Modules/PublicRoomList/Views/PublicRoomTableViewCell.m b/Riot/Modules/PublicRoomList/Views/PublicRoomTableViewCell.m
index 4195b241b..b6b65a2d4 100644
--- a/Riot/Modules/PublicRoomList/Views/PublicRoomTableViewCell.m
+++ b/Riot/Modules/PublicRoomList/Views/PublicRoomTableViewCell.m
@@ -21,7 +21,7 @@
 #import "AvatarGenerator.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @implementation PublicRoomTableViewCell
 
diff --git a/Riot/Modules/Room/Attachements/AttachmentsViewController.h b/Riot/Modules/Room/Attachements/AttachmentsViewController.h
index dae04e21f..069ea957c 100644
--- a/Riot/Modules/Room/Attachements/AttachmentsViewController.h
+++ b/Riot/Modules/Room/Attachements/AttachmentsViewController.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @interface AttachmentsViewController : MXKAttachmentsViewController
 
diff --git a/Riot/Modules/Room/Attachements/AttachmentsViewController.m b/Riot/Modules/Room/Attachements/AttachmentsViewController.m
index caeec8984..31bb29519 100644
--- a/Riot/Modules/Room/Attachements/AttachmentsViewController.m
+++ b/Riot/Modules/Room/Attachements/AttachmentsViewController.m
@@ -17,7 +17,7 @@
 
 #import "AttachmentsViewController.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface AttachmentsViewController ()
 {
@@ -73,14 +73,6 @@
     return ThemeService.shared.theme.statusBarStyle;
 }
 
-- (void)viewWillAppear:(BOOL)animated
-{
-    [super viewWillAppear:animated];
-
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"AttachmentsViewer"];
-}
-
 - (void)destroy
 {
     [super destroy];
diff --git a/Riot/Modules/Room/BubbleReactions/BubbleReactionsViewSizer.m b/Riot/Modules/Room/BubbleReactions/BubbleReactionsViewSizer.m
index 21caa32e5..a2c40fd6d 100644
--- a/Riot/Modules/Room/BubbleReactions/BubbleReactionsViewSizer.m
+++ b/Riot/Modules/Room/BubbleReactions/BubbleReactionsViewSizer.m
@@ -17,7 +17,7 @@ limitations under the License.
 #import "BubbleReactionsViewSizer.h"
 #import <MatrixSDK/MatrixSDK.h>
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @implementation BubbleReactionsViewSizer
 
diff --git a/Riot/Modules/Room/CellData/RoomBubbleCellData.h b/Riot/Modules/Room/CellData/RoomBubbleCellData.h
index ebbf94aaa..ca0058be5 100644
--- a/Riot/Modules/Room/CellData/RoomBubbleCellData.h
+++ b/Riot/Modules/Room/CellData/RoomBubbleCellData.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 extern NSString *const URLPreviewDidUpdateNotification;
 
@@ -31,7 +31,8 @@ typedef NS_ENUM(NSInteger, RoomBubbleCellDataTag)
     RoomBubbleCellDataTagKeyVerificationConclusion,
     RoomBubbleCellDataTagCall,
     RoomBubbleCellDataTagGroupCall,
-    RoomBubbleCellDataTagRoomCreationIntro
+    RoomBubbleCellDataTagRoomCreationIntro,
+    RoomBubbleCellDataTagPoll
 };
 
 /**
diff --git a/Riot/Modules/Room/CellData/RoomBubbleCellData.m b/Riot/Modules/Room/CellData/RoomBubbleCellData.m
index a71e6d72e..4c9e9a4e2 100644
--- a/Riot/Modules/Room/CellData/RoomBubbleCellData.m
+++ b/Riot/Modules/Room/CellData/RoomBubbleCellData.m
@@ -23,8 +23,7 @@
 #import "Tools.h"
 #import "BubbleReactionsViewSizer.h"
 
-#import "Riot-Swift.h"
-#import <MatrixKit/MXKSwiftHeader.h>
+#import "GeneratedInterface-Swift.h"
 
 static NSAttributedString *timestampVerticalWhitespace = nil;
 
@@ -150,6 +149,15 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
                 
                 // Show timestamps always on right
                 self.displayTimestampForSelectedComponentOnLeftWhenPossible = NO;
+                break;
+            }
+            case MXEventTypePollStart:
+            {
+                self.tag = RoomBubbleCellDataTagPoll;
+                self.collapsable = NO;
+                self.collapsed = NO;
+                
+                break;
             }
             case MXEventTypeCustom:
             {
@@ -260,6 +268,11 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
         return NO;
     }
     
+    if (self.tag == RoomBubbleCellDataTagPoll)
+    {
+        return NO;
+    }
+    
     return [super hasNoDisplay];
 }
 
@@ -418,7 +431,9 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
 {
     __block NSInteger firstVisibleComponentIndex = NSNotFound;
     
-    if (self.attachment && self.bubbleComponents.count)
+    BOOL isPoll = (self.events.firstObject.eventType == MXEventTypePollStart);
+    
+    if ((isPoll || self.attachment) && self.bubbleComponents.count)
     {
         firstVisibleComponentIndex = 0;
     }
@@ -827,10 +842,15 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
         case RoomBubbleCellDataTagRoomCreationIntro:
             shouldAddEvent = NO;
             break;
+        case RoomBubbleCellDataTagPoll:
+            shouldAddEvent = NO;
+            break;
         default:
             break;
     }
     
+    // If the current bubbleData supports adding events then check
+    // if the incoming event can be added in
     if (shouldAddEvent)
     {
         switch (event.eventType)
@@ -874,6 +894,9 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
             case MXEventTypeCallReject:
                 shouldAddEvent = NO;
                 break;
+            case MXEventTypePollStart:
+                shouldAddEvent = NO;
+                break;
             case MXEventTypeCustom:
             {
                 if ([event.type isEqualToString:kWidgetMatrixEventTypeString]
diff --git a/Riot/Modules/Room/DataSources/RoomDataSource.h b/Riot/Modules/Room/DataSources/RoomDataSource.h
index 725171572..28af89097 100644
--- a/Riot/Modules/Room/DataSources/RoomDataSource.h
+++ b/Riot/Modules/Room/DataSources/RoomDataSource.h
@@ -15,7 +15,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 #import "WidgetManager.h"
 
diff --git a/Riot/Modules/Room/DataSources/RoomDataSource.m b/Riot/Modules/Room/DataSources/RoomDataSource.m
index a83ba10da..f160a851f 100644
--- a/Riot/Modules/Room/DataSources/RoomDataSource.m
+++ b/Riot/Modules/Room/DataSources/RoomDataSource.m
@@ -23,7 +23,7 @@
 #import "MXKRoomBubbleTableViewCell+Riot.h"
 #import "AvatarGenerator.h"
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "MXRoom+Riot.h"
 
diff --git a/Riot/Modules/Room/EditHistory/EditHistoryViewModel.swift b/Riot/Modules/Room/EditHistory/EditHistoryViewModel.swift
index 2f9b4f0d0..ea27098e1 100644
--- a/Riot/Modules/Room/EditHistory/EditHistoryViewModel.swift
+++ b/Riot/Modules/Room/EditHistory/EditHistoryViewModel.swift
@@ -105,7 +105,7 @@ final class EditHistoryViewModel: EditHistoryViewModelType {
         
         self.update(viewState: .loading)
         
-        self.operation = self.aggregations.replaceEvents(forEvent: self.event.eventId, isEncrypted: self.event.isEncrypted, inRoom: self.roomId, from: self.nextBatch, limit: Pagination.count, success: { [weak self] (response) in
+        self.operation = self.aggregations.replaceEvents(forEvent: self.event.eventId, isEncrypted: self.event.isEncrypted, inRoom: self.roomId, from: self.nextBatch, limit: Int(Pagination.count), success: { [weak self] (response) in
             guard let sself = self else {
                 return
             }
diff --git a/Riot/Modules/Room/Files/RoomFilesViewController.h b/Riot/Modules/Room/Files/RoomFilesViewController.h
index 3173c2d0a..92b799344 100644
--- a/Riot/Modules/Room/Files/RoomFilesViewController.h
+++ b/Riot/Modules/Room/Files/RoomFilesViewController.h
@@ -14,7 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
+
+@class AnalyticsScreenTimer;
 
 /**
  This view controller displays the attachments of a room. Only one matrix session is handled by this view controller.
@@ -23,4 +25,9 @@ limitations under the License.
 
 @property (nonatomic) BOOL showCancelBarButtonItem;
 
+/**
+ The screen timer used for analytics if they've been enabled. The default value is nil.
+ */
+@property (nonatomic) AnalyticsScreenTimer *screenTimer;
+
 @end
diff --git a/Riot/Modules/Room/Files/RoomFilesViewController.m b/Riot/Modules/Room/Files/RoomFilesViewController.m
index 5712ecffe..077311835 100644
--- a/Riot/Modules/Room/Files/RoomFilesViewController.m
+++ b/Riot/Modules/Room/Files/RoomFilesViewController.m
@@ -19,7 +19,7 @@
 
 #import "FilesSearchTableViewCell.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "AttachmentsViewController.h"
 
@@ -110,6 +110,14 @@
     [UIView setAnimationsEnabled:NO];
     [self roomInputToolbarView:self.inputToolbarView heightDidChanged:0 completion:nil];
     [UIView setAnimationsEnabled:YES];
+    
+    [self.screenTimer start];
+}
+
+- (void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear:animated];
+    [self.screenTimer stop];
 }
 
 - (void)userInterfaceThemeDidChange
diff --git a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.h b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.h
index 9881e328b..18f6bef28 100644
--- a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.h
+++ b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 #import "DeviceTableViewCell.h"
 
diff --git a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
index aab1f1653..687587dfe 100644
--- a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
+++ b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
@@ -18,7 +18,7 @@
 
 #import "RoomMemberDetailsViewController.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "RoomMemberTitleView.h"
 
@@ -89,7 +89,9 @@
 @property (weak, nonatomic) IBOutlet UIImageView *roomMemberAvatarBadgeImageView;
 
 @property (weak, nonatomic) IBOutlet UILabel *roomMemberNameLabel;
-@property (weak, nonatomic) IBOutlet UIView *roomMemberNameLabelMask;
+@property (weak, nonatomic) IBOutlet UIView *roomMemberNameContainerView;
+
+@property (weak, nonatomic) IBOutlet UILabel *roomMemberUserIdLabel;
 
 @property (weak, nonatomic) IBOutlet UILabel *roomMemberStatusLabel;
 
@@ -102,6 +104,8 @@
 
 @property(nonatomic, strong) UserVerificationCoordinatorBridgePresenter *userVerificationCoordinatorBridgePresenter;
 
+@property(nonatomic) AnalyticsScreenTimer *screenTimer;
+
 @end
 
 @implementation RoomMemberDetailsViewController
@@ -137,6 +141,8 @@
     
     // Keep visible the status bar by default.
     isStatusBarHidden = NO;
+    
+    self.screenTimer = [[AnalyticsScreenTimer alloc] initWithScreen:AnalyticsScreenUser];
 }
 
 - (void)viewDidLoad
@@ -148,17 +154,10 @@
     memberTitleView.delegate = self;
         
     // Define directly the navigation titleView with the custom title view instance. Do not use anymore a container.
-    self.navigationItem.titleView = memberTitleView;
-    
-    // Add tap gesture on member's name
-    UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTapGesture:)];
-    [tap setNumberOfTouchesRequired:1];
-    [tap setNumberOfTapsRequired:1];
-    [tap setDelegate:self];
-    [self.roomMemberNameLabelMask addGestureRecognizer:tap];
-    self.roomMemberNameLabelMask.userInteractionEnabled = YES;
+    self.navigationItem.titleView = memberTitleView;    
     
     // Add tap to show the room member avatar in fullscreen
+    UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTapGesture:)];
     tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTapGesture:)];
     [tap setNumberOfTouchesRequired:1];
     [tap setNumberOfTapsRequired:1];
@@ -211,6 +210,7 @@
     
     self.memberHeaderView.backgroundColor = ThemeService.shared.theme.baseColor;
     self.roomMemberNameLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
+    self.roomMemberUserIdLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
 
     self.roomMemberStatusLabel.textColor = ThemeService.shared.theme.tintColor;
     self.roomMemberPowerLevelLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
@@ -243,9 +243,6 @@
 {
     [super viewWillAppear:animated];
 
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"RoomMemberDetails"];
-
     [self userInterfaceThemeDidChange];
 
     // Hide the bottom border of the navigation bar to display the expander header
@@ -268,6 +265,18 @@
     self.bottomImageView.hidden = YES;
 }
 
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    [self.screenTimer start];
+}
+
+- (void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear:animated];
+    [self.screenTimer stop];
+}
+
 - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id <UIViewControllerTransitionCoordinator>)coordinator
 {
     [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
@@ -348,8 +357,12 @@
 - (void)updateMemberInfo
 {
     if (self.mxRoomMember)
-    {
-        self.roomMemberNameLabel.text = self.mxRoomMember.displayname ? self.mxRoomMember.displayname : self.mxRoomMember.userId;
+    {        
+        self.roomMemberNameContainerView.hidden = !self.mxRoomMember.displayname;
+        
+        self.roomMemberNameLabel.text = self.mxRoomMember.displayname; 
+        
+        self.roomMemberUserIdLabel.text = self.mxRoomMember.userId;    
         
         // Update member power level
         MXWeakify(self);
@@ -1257,20 +1270,7 @@
 {
     UIView *view = tapGestureRecognizer.view;
     
-    if (view == self.roomMemberNameLabelMask && self.mxRoomMember.displayname)
-    {
-        if ([self.roomMemberNameLabel.text isEqualToString:self.mxRoomMember.displayname])
-        {
-            // Display room member matrix id
-            self.roomMemberNameLabel.text = self.mxRoomMember.userId;
-        }
-        else
-        {
-            // Restore display name
-            self.roomMemberNameLabel.text = self.mxRoomMember.displayname;
-        }
-    }
-    else if (view == memberTitleView.memberAvatarMask || view == self.roomMemberAvatarMask)
+    if (view == memberTitleView.memberAvatarMask || view == self.roomMemberAvatarMask)
     {
         MXWeakify(self);
         
diff --git a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.xib b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.xib
index 999ddf2fc..2db05b047 100644
--- a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.xib
+++ b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.xib
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<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="14490.49"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -18,11 +17,12 @@
                 <outlet property="roomMemberAvatarHeaderBackground" destination="ouj-VM-zdT" id="YeD-zt-8y5"/>
                 <outlet property="roomMemberAvatarHeaderBackgroundHeightConstraint" destination="dBL-G6-Yec" id="QXZ-ZP-0Rn"/>
                 <outlet property="roomMemberAvatarMask" destination="MAS-3M-3cg" id="nLI-7d-5Hu"/>
-                <outlet property="roomMemberNameLabel" destination="92g-hC-6jB" id="gcP-wz-8FT"/>
-                <outlet property="roomMemberNameLabelMask" destination="wEo-Mk-SgZ" id="uEv-LU-eEI"/>
+                <outlet property="roomMemberNameContainerView" destination="QHN-zr-wtC" id="T3p-iz-nIk"/>
+                <outlet property="roomMemberNameLabel" destination="i1p-3D-PhB" id="NRi-dr-RPt"/>
                 <outlet property="roomMemberPowerLevelContainerView" destination="Flu-1i-oqi" id="mdj-h2-evz"/>
                 <outlet property="roomMemberPowerLevelLabel" destination="lbh-ZN-XUO" id="DXV-T0-yKs"/>
-                <outlet property="roomMemberStatusLabel" destination="5le-5e-Vml" id="ODo-tG-ewy"/>
+                <outlet property="roomMemberStatusLabel" destination="aBz-2v-ij6" id="eLJ-zY-ZEp"/>
+                <outlet property="roomMemberUserIdLabel" destination="9qc-7W-xzu" id="EZA-rX-xxA"/>
                 <outlet property="tableView" destination="R6u-PR-DcU" id="Cm1-1y-meQ"/>
                 <outlet property="view" destination="gX8-mM-6Ig" id="R3w-s7-1CY"/>
             </connections>
@@ -33,7 +33,7 @@
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YXr-As-Mqh">
-                    <rect key="frame" x="0.0" y="0.0" width="375" height="241"/>
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="343"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ouj-VM-zdT">
                             <rect key="frame" x="0.0" y="0.0" width="375" height="117"/>
@@ -44,19 +44,19 @@
                             </constraints>
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MAS-3M-3cg">
-                            <rect key="frame" x="137.5" y="0.0" width="100" height="125"/>
+                            <rect key="frame" x="135.5" y="0.0" width="104" height="104"/>
                             <subviews>
                                 <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GQ1-rP-ckr" customClass="MXKImageView">
-                                    <rect key="frame" x="8" y="31" width="84" height="84"/>
+                                    <rect key="frame" x="10" y="10" width="84" height="84"/>
                                     <color key="backgroundColor" red="0.6886889638" green="1" blue="0.74383144840000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <accessibility key="accessibilityConfiguration" identifier="MemberAvatar"/>
                                     <constraints>
-                                        <constraint firstAttribute="width" constant="84" id="HfP-Pj-zLa"/>
                                         <constraint firstAttribute="width" secondItem="GQ1-rP-ckr" secondAttribute="height" multiplier="1:1" id="a1T-Y0-Iic"/>
+                                        <constraint firstAttribute="width" constant="84" id="kqX-QV-pvk"/>
                                     </constraints>
                                 </view>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="jHh-A3-In3">
-                                    <rect key="frame" x="68" y="91" width="24" height="24"/>
+                                    <rect key="frame" x="70" y="70" width="24" height="24"/>
                                     <constraints>
                                         <constraint firstAttribute="width" secondItem="jHh-A3-In3" secondAttribute="height" multiplier="1:1" id="fvP-Hk-apc"/>
                                         <constraint firstAttribute="width" constant="24" id="xga-bi-rLY"/>
@@ -68,46 +68,79 @@
                             <constraints>
                                 <constraint firstAttribute="bottom" secondItem="GQ1-rP-ckr" secondAttribute="bottom" constant="10" id="3pC-So-WvO"/>
                                 <constraint firstItem="jHh-A3-In3" firstAttribute="bottom" secondItem="GQ1-rP-ckr" secondAttribute="bottom" id="6Gg-lp-pJw"/>
+                                <constraint firstAttribute="trailing" secondItem="GQ1-rP-ckr" secondAttribute="trailing" constant="10" id="89D-wS-nJA"/>
+                                <constraint firstItem="GQ1-rP-ckr" firstAttribute="top" secondItem="MAS-3M-3cg" secondAttribute="top" constant="10" id="Mcw-V3-4fA"/>
                                 <constraint firstItem="jHh-A3-In3" firstAttribute="trailing" secondItem="GQ1-rP-ckr" secondAttribute="trailing" id="TbA-vY-3Ef"/>
-                                <constraint firstItem="GQ1-rP-ckr" firstAttribute="centerX" secondItem="MAS-3M-3cg" secondAttribute="centerX" id="ZGI-nR-gGx"/>
-                                <constraint firstAttribute="width" constant="100" id="fwv-qE-IV1"/>
+                                <constraint firstItem="GQ1-rP-ckr" firstAttribute="leading" secondItem="MAS-3M-3cg" secondAttribute="leading" constant="10" id="eSa-mP-j83"/>
                             </constraints>
                         </view>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="92g-hC-6jB">
-                            <rect key="frame" x="165" y="125" width="45" height="21"/>
-                            <accessibility key="accessibilityConfiguration" identifier="RoomMemberDetailsVCNameLabel"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="21" id="WyU-2u-Lek"/>
-                            </constraints>
-                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
-                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wEo-Mk-SgZ">
-                            <rect key="frame" x="0.0" y="119" width="375" height="33"/>
-                            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
-                            <accessibility key="accessibilityConfiguration" identifier="RoomMemberDetailsVCNameLabelMask"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="33" id="qhK-10-7AW"/>
-                            </constraints>
-                        </view>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5le-5e-Vml">
-                            <rect key="frame" x="168" y="153" width="39" height="21"/>
-                            <accessibility key="accessibilityConfiguration" identifier="RoomMemberDetailsVCStatusLabel"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="21" id="7lY-ku-cPk"/>
-                            </constraints>
-                            <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="15"/>
-                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                        <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="hSH-1t-jnC">
-                            <rect key="frame" x="0.0" y="181" width="375" height="50"/>
+                        <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="7" translatesAutoresizingMaskIntoConstraints="NO" id="hSH-1t-jnC">
+                            <rect key="frame" x="0.0" y="112" width="375" height="221"/>
                             <subviews>
-                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Flu-1i-oqi">
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QHN-zr-wtC">
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
                                     <subviews>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lbh-ZN-XUO">
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="Display name" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i1p-3D-PhB" userLabel="Display name" customClass="CopyableLabel" customModule="Riot" customModuleProvider="target">
+                                            <rect key="frame" x="20" y="0.0" width="335" height="50"/>
+                                            <accessibility key="accessibilityConfiguration" identifier="RoomMemberDetailsVCStatusLabel"/>
+                                            <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="15"/>
+                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                    </subviews>
+                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <constraints>
+                                        <constraint firstAttribute="trailing" secondItem="i1p-3D-PhB" secondAttribute="trailing" constant="20" id="XfU-OS-0s4"/>
+                                        <constraint firstItem="i1p-3D-PhB" firstAttribute="leading" secondItem="QHN-zr-wtC" secondAttribute="leading" constant="20" id="c8p-6h-5f3"/>
+                                        <constraint firstAttribute="bottom" secondItem="i1p-3D-PhB" secondAttribute="bottom" id="opt-ku-nZK"/>
+                                        <constraint firstItem="i1p-3D-PhB" firstAttribute="top" secondItem="QHN-zr-wtC" secondAttribute="top" id="prC-iD-bnr"/>
+                                        <constraint firstAttribute="height" priority="250" id="spl-iu-Mj1"/>
+                                    </constraints>
+                                </view>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dtL-Kk-RjD">
+                                    <rect key="frame" x="0.0" y="57" width="375" height="50"/>
+                                    <subviews>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Matrix ID" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9qc-7W-xzu" customClass="CopyableLabel" customModule="Riot" customModuleProvider="target">
+                                            <rect key="frame" x="20" y="0.0" width="335" height="50"/>
+                                            <accessibility key="accessibilityConfiguration" identifier="RoomMemberDetailsVCStatusLabel"/>
+                                            <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="15"/>
+                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                    </subviews>
+                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <constraints>
+                                        <constraint firstAttribute="bottom" secondItem="9qc-7W-xzu" secondAttribute="bottom" id="3zr-VV-1Xj"/>
+                                        <constraint firstItem="9qc-7W-xzu" firstAttribute="leading" secondItem="dtL-Kk-RjD" secondAttribute="leading" constant="20" id="9ai-xl-rJw"/>
+                                        <constraint firstItem="9qc-7W-xzu" firstAttribute="top" secondItem="dtL-Kk-RjD" secondAttribute="top" id="dtv-La-iU0"/>
+                                        <constraint firstAttribute="height" priority="250" id="fY4-Tr-GPF"/>
+                                        <constraint firstAttribute="trailing" secondItem="9qc-7W-xzu" secondAttribute="trailing" constant="20" id="yse-Ty-mfU"/>
+                                    </constraints>
+                                </view>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gbf-sy-gsc">
+                                    <rect key="frame" x="0.0" y="114" width="375" height="50"/>
+                                    <subviews>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Status" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aBz-2v-ij6">
+                                            <rect key="frame" x="20" y="0.0" width="335" height="50"/>
+                                            <accessibility key="accessibilityConfiguration" identifier="RoomMemberDetailsVCStatusLabel"/>
+                                            <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="15"/>
+                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                    </subviews>
+                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <constraints>
+                                        <constraint firstItem="aBz-2v-ij6" firstAttribute="leading" secondItem="gbf-sy-gsc" secondAttribute="leading" constant="20" id="Hnt-NR-O6s"/>
+                                        <constraint firstItem="aBz-2v-ij6" firstAttribute="top" secondItem="gbf-sy-gsc" secondAttribute="top" id="XJG-ub-Ybx"/>
+                                        <constraint firstAttribute="height" priority="250" id="aUZ-qS-Fx6"/>
+                                        <constraint firstAttribute="bottom" secondItem="aBz-2v-ij6" secondAttribute="bottom" id="dE7-Lg-OIb"/>
+                                        <constraint firstAttribute="trailing" secondItem="aBz-2v-ij6" secondAttribute="trailing" constant="20" id="kne-1B-Dlg"/>
+                                    </constraints>
+                                </view>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Flu-1i-oqi">
+                                    <rect key="frame" x="0.0" y="171" width="375" height="50"/>
+                                    <subviews>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Power level" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lbh-ZN-XUO">
                                             <rect key="frame" x="20" y="0.0" width="335" height="50"/>
                                             <accessibility key="accessibilityConfiguration" identifier="RoomMemberDetailsVCStatusLabel"/>
                                             <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="15"/>
@@ -125,34 +158,18 @@
                                     </constraints>
                                 </view>
                             </subviews>
-                            <constraints>
-                                <constraint firstItem="Flu-1i-oqi" firstAttribute="width" secondItem="hSH-1t-jnC" secondAttribute="width" id="oyq-sY-NBr"/>
-                            </constraints>
                         </stackView>
                     </subviews>
                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <accessibility key="accessibilityConfiguration" identifier="RoomMemberDetailsVCHeaderView"/>
                     <constraints>
-                        <constraint firstItem="wEo-Mk-SgZ" firstAttribute="centerY" secondItem="92g-hC-6jB" secondAttribute="centerY" id="3Zt-MD-sZK"/>
-                        <constraint firstItem="5le-5e-Vml" firstAttribute="top" secondItem="92g-hC-6jB" secondAttribute="bottom" constant="7" id="5zX-1T-n38"/>
-                        <constraint firstItem="92g-hC-6jB" firstAttribute="centerX" secondItem="YXr-As-Mqh" secondAttribute="centerX" id="7Is-d0-FZp"/>
-                        <constraint firstItem="hSH-1t-jnC" firstAttribute="top" secondItem="5le-5e-Vml" secondAttribute="bottom" constant="7" id="EB4-IF-sT6"/>
-                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="92g-hC-6jB" secondAttribute="trailing" constant="32" id="Eyx-UF-fYc"/>
+                        <constraint firstItem="hSH-1t-jnC" firstAttribute="top" secondItem="MAS-3M-3cg" secondAttribute="bottom" constant="8" id="BWn-Ie-nKk"/>
                         <constraint firstAttribute="trailing" secondItem="ouj-VM-zdT" secondAttribute="trailing" id="FRy-TL-gS2"/>
-                        <constraint firstItem="wEo-Mk-SgZ" firstAttribute="centerX" secondItem="92g-hC-6jB" secondAttribute="centerX" id="K1f-RX-kpp"/>
-                        <constraint firstItem="wEo-Mk-SgZ" firstAttribute="width" secondItem="YXr-As-Mqh" secondAttribute="width" id="P5e-q6-OIS"/>
-                        <constraint firstItem="92g-hC-6jB" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="YXr-As-Mqh" secondAttribute="leading" constant="32" id="QZB-ue-Sih"/>
                         <constraint firstItem="hSH-1t-jnC" firstAttribute="leading" secondItem="YXr-As-Mqh" secondAttribute="leading" id="Z0t-iC-uTc"/>
                         <constraint firstAttribute="bottom" secondItem="hSH-1t-jnC" secondAttribute="bottom" constant="10" id="Z9m-Up-f4r"/>
-                        <constraint firstItem="5le-5e-Vml" firstAttribute="centerX" secondItem="YXr-As-Mqh" secondAttribute="centerX" id="bmA-Fq-uxO"/>
-                        <constraint firstItem="5le-5e-Vml" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="YXr-As-Mqh" secondAttribute="leading" constant="42" id="ioz-jk-jrE"/>
-                        <constraint firstItem="MAS-3M-3cg" firstAttribute="top" secondItem="YXr-As-Mqh" secondAttribute="top" id="jJp-cP-Vgp"/>
-                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="5le-5e-Vml" secondAttribute="trailing" constant="42" id="mad-qx-tHe"/>
                         <constraint firstAttribute="trailing" secondItem="hSH-1t-jnC" secondAttribute="trailing" id="nJW-bQ-zVq"/>
-                        <constraint firstItem="92g-hC-6jB" firstAttribute="top" secondItem="ouj-VM-zdT" secondAttribute="bottom" constant="8" id="rKl-Gw-ajI"/>
                         <constraint firstItem="ouj-VM-zdT" firstAttribute="leading" secondItem="YXr-As-Mqh" secondAttribute="leading" id="rWQ-Ru-7Ej"/>
-                        <constraint firstItem="MAS-3M-3cg" firstAttribute="bottom" secondItem="92g-hC-6jB" secondAttribute="top" id="rgU-C1-YMW"/>
-                        <constraint firstItem="ouj-VM-zdT" firstAttribute="top" secondItem="YXr-As-Mqh" secondAttribute="top" id="srY-tD-AhJ"/>
+                        <constraint firstItem="hSH-1t-jnC" firstAttribute="width" secondItem="YXr-As-Mqh" secondAttribute="width" id="srS-ma-V2U"/>
                         <constraint firstItem="MAS-3M-3cg" firstAttribute="centerX" secondItem="YXr-As-Mqh" secondAttribute="centerX" id="vNM-7Z-K2b"/>
                     </constraints>
                 </view>
@@ -171,7 +188,7 @@
                     </constraints>
                 </imageView>
                 <tableView clipsSubviews="YES" contentMode="scaleToFill" style="grouped" separatorStyle="default" rowHeight="46" sectionHeaderHeight="28" sectionFooterHeight="8" translatesAutoresizingMaskIntoConstraints="NO" id="R6u-PR-DcU">
-                    <rect key="frame" x="0.0" y="241" width="375" height="426"/>
+                    <rect key="frame" x="0.0" y="343" width="375" height="324"/>
                     <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="string" keyPath="accessibilityIdentifier" value="RoomMemberDetailsVCTableView"/>
@@ -182,6 +199,7 @@
                     </connections>
                 </tableView>
             </subviews>
+            <viewLayoutGuide key="safeArea" id="wdI-9L-Ozp"/>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <accessibility key="accessibilityConfiguration" identifier="RoomMemberDetailsVC"/>
             <constraints>
@@ -192,11 +210,13 @@
                 <constraint firstItem="RBF-EK-dhz" firstAttribute="trailing" secondItem="7Dc-jk-9sT" secondAttribute="trailing" id="RTr-1M-aeU"/>
                 <constraint firstItem="R6u-PR-DcU" firstAttribute="top" secondItem="YXr-As-Mqh" secondAttribute="bottom" id="VW4-0P-ALX"/>
                 <constraint firstAttribute="bottom" secondItem="R6u-PR-DcU" secondAttribute="bottom" id="X1a-xq-1Aa"/>
+                <constraint firstItem="MAS-3M-3cg" firstAttribute="top" secondItem="wdI-9L-Ozp" secondAttribute="top" id="a9L-QI-eJb"/>
                 <constraint firstAttribute="trailing" secondItem="R6u-PR-DcU" secondAttribute="trailing" id="aMA-vf-GrY"/>
                 <constraint firstItem="RBF-EK-dhz" firstAttribute="leading" secondItem="7Dc-jk-9sT" secondAttribute="leading" id="dHb-9z-eww"/>
                 <constraint firstItem="YXr-As-Mqh" firstAttribute="top" secondItem="gX8-mM-6Ig" secondAttribute="top" id="l7z-od-LJm"/>
                 <constraint firstItem="7Dc-jk-9sT" firstAttribute="leading" secondItem="gX8-mM-6Ig" secondAttribute="leading" id="rNt-rC-Pxv"/>
                 <constraint firstItem="R6u-PR-DcU" firstAttribute="leading" secondItem="gX8-mM-6Ig" secondAttribute="leading" id="rbT-O1-m3d"/>
+                <constraint firstItem="ouj-VM-zdT" firstAttribute="top" secondItem="wdI-9L-Ozp" secondAttribute="top" id="v9S-Vu-m6M"/>
                 <constraint firstAttribute="bottom" secondItem="7Dc-jk-9sT" secondAttribute="bottom" id="yKK-K2-ebi"/>
             </constraints>
             <point key="canvasLocation" x="53.600000000000001" y="26.53673163418291"/>
diff --git a/Riot/Modules/Room/Members/Detail/Views/RoomMemberTitleView.h b/Riot/Modules/Room/Members/Detail/Views/RoomMemberTitleView.h
index 6111b6939..16f216ac3 100644
--- a/Riot/Modules/Room/Members/Detail/Views/RoomMemberTitleView.h
+++ b/Riot/Modules/Room/Members/Detail/Views/RoomMemberTitleView.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 // We add here a protocol to handle title view layout update.
 @class RoomMemberTitleView;
diff --git a/Riot/Modules/Room/Members/RoomParticipantsViewController.h b/Riot/Modules/Room/Members/RoomParticipantsViewController.h
index 757bb2fca..e3bb56543 100644
--- a/Riot/Modules/Room/Members/RoomParticipantsViewController.h
+++ b/Riot/Modules/Room/Members/RoomParticipantsViewController.h
@@ -92,6 +92,11 @@
  */
 @property (nonatomic, weak) id<RoomParticipantsViewControllerDelegate> delegate;
 
+/**
+ The screen timer used for analytics if they've been enabled. The default value is nil.
+ */
+@property (nonatomic) AnalyticsScreenTimer *screenTimer;
+
 /**
  Returns the `UINib` object initialized for a `RoomParticipantsViewController`.
  
diff --git a/Riot/Modules/Room/Members/RoomParticipantsViewController.m b/Riot/Modules/Room/Members/RoomParticipantsViewController.m
index 7858ab241..5df03b91e 100644
--- a/Riot/Modules/Room/Members/RoomParticipantsViewController.m
+++ b/Riot/Modules/Room/Members/RoomParticipantsViewController.m
@@ -19,7 +19,7 @@
 
 #import "RoomMemberDetailsViewController.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "Contact.h"
 
@@ -29,7 +29,7 @@
 
 #import "RageShakeManager.h"
 
-@interface RoomParticipantsViewController ()
+@interface RoomParticipantsViewController () <UITableViewDelegate, UITableViewDataSource, UISearchBarDelegate, UIGestureRecognizerDelegate, MXKRoomMemberDetailsViewControllerDelegate, ContactsTableViewControllerDelegate>
 {
     // Search result
     NSString *currentSearchText;
@@ -245,9 +245,6 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"RoomParticipants"];
     
     // Refresh display
     [self refreshTableView];
@@ -268,6 +265,8 @@
         [contactsPickerViewController destroy];
         contactsPickerViewController = nil;
     }
+    
+    [self.screenTimer start];
 }
 
 - (void)viewWillDisappear:(BOOL)animated
@@ -284,6 +283,12 @@
     [self searchBarCancelButtonClicked:_searchBarView];
 }
 
+- (void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear:animated];
+    [self.screenTimer stop];
+}
+
 - (void)withdrawViewControllerAnimated:(BOOL)animated completion:(void (^)(void))completion
 {
     // Check whether the current view controller is displayed inside a segmented view controller in order to withdraw the right item
diff --git a/Riot/Modules/Room/ReactionHistory/ReactionHistoryViewModel.swift b/Riot/Modules/Room/ReactionHistory/ReactionHistoryViewModel.swift
index b98ec19c5..69042ee5f 100644
--- a/Riot/Modules/Room/ReactionHistory/ReactionHistoryViewModel.swift
+++ b/Riot/Modules/Room/ReactionHistory/ReactionHistoryViewModel.swift
@@ -108,7 +108,7 @@ final class ReactionHistoryViewModel: ReactionHistoryViewModelType {
         
         self.update(viewState: .loading)
         
-        self.operation = self.aggregations.reactionsEvents(forEvent: self.eventId, inRoom: self.roomId, from: self.nextBatch, limit: Pagination.count, success: { [weak self] (response) in
+        self.operation = self.aggregations.reactionsEvents(forEvent: self.eventId, inRoom: self.roomId, from: self.nextBatch, limit: Int(Pagination.count), success: { [weak self] (response) in
             guard let self = self else {
                 return
             }
diff --git a/Riot/Modules/Room/ReadReceiptsDetail/ReadReceiptsViewController.h b/Riot/Modules/Room/ReadReceiptsDetail/ReadReceiptsViewController.h
index eca67c3ce..09e38b13e 100644
--- a/Riot/Modules/Room/ReadReceiptsDetail/ReadReceiptsViewController.h
+++ b/Riot/Modules/Room/ReadReceiptsDetail/ReadReceiptsViewController.h
@@ -15,7 +15,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @interface ReadReceiptsViewController : MXKViewController
 
diff --git a/Riot/Modules/Room/ReadReceiptsDetail/ReadReceiptsViewController.m b/Riot/Modules/Room/ReadReceiptsDetail/ReadReceiptsViewController.m
index d69f8f936..bf7daf16d 100644
--- a/Riot/Modules/Room/ReadReceiptsDetail/ReadReceiptsViewController.m
+++ b/Riot/Modules/Room/ReadReceiptsDetail/ReadReceiptsViewController.m
@@ -16,11 +16,10 @@
  */
 
 #import "ReadReceiptsViewController.h"
-#import <MatrixKit/MatrixKit.h>
 
 #import "RageShakeManager.h"
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface ReadReceiptsViewController () <UITableViewDataSource, UITableViewDelegate>
 {
diff --git a/Riot/Modules/Room/RoomCoordinator.swift b/Riot/Modules/Room/RoomCoordinator.swift
index 4764e03e9..7f860168f 100644
--- a/Riot/Modules/Room/RoomCoordinator.swift
+++ b/Riot/Modules/Room/RoomCoordinator.swift
@@ -29,6 +29,8 @@ final class RoomCoordinator: NSObject, RoomCoordinatorProtocol {
     private let roomViewController: RoomViewController
     private let activityIndicatorPresenter: ActivityIndicatorPresenterType
     private var selectedEventId: String?
+    
+    private var pollEditFormCoordinator: PollEditFormCoordinator?
 
     private var roomDataSourceManager: MXKRoomDataSourceManager {
         return MXKRoomDataSourceManager.sharedManager(forMatrixSession: self.parameters.session)
@@ -75,6 +77,10 @@ final class RoomCoordinator: NSObject, RoomCoordinatorProtocol {
         self.roomViewController = RoomViewController.instantiate()
         self.activityIndicatorPresenter = ActivityIndicatorPresenter()
         
+        if #available(iOS 14, *) {
+            PollTimelineProvider.shared.session = parameters.session
+        }
+        
         super.init()
     }
     
@@ -97,7 +103,9 @@ final class RoomCoordinator: NSObject, RoomCoordinatorProtocol {
         // FIXME: Find a better way to manage modal dismiss. This makes the `roomViewController` to never be released
         // self.roomViewController.presentationController?.delegate = self
         
-        if let eventId = self.selectedEventId {
+        if let previewData = self.parameters.previewData {
+            self.loadRoomPreview(withData: previewData, completion: completion)
+        } else if let eventId = self.selectedEventId {
             self.loadRoom(withId: self.parameters.roomId, and: eventId, completion: completion)
         } else {
             self.loadRoom(withId: self.parameters.roomId, completion: completion)
@@ -183,6 +191,13 @@ final class RoomCoordinator: NSObject, RoomCoordinatorProtocol {
             completion?()
         }
     }
+    
+    private func loadRoomPreview(withData previewData: RoomPreviewData, completion: (() -> Void)?) {
+        
+        self.roomViewController.displayRoomPreview(previewData)
+        
+        completion?()
+    }
 }
 
 // MARK: - RoomIdentifiable
@@ -240,4 +255,31 @@ extension RoomCoordinator: RoomViewControllerDelegate {
     func roomViewController(_ roomViewController: RoomViewController, handleUniversalLinkWith parameters: UniversalLinkParameters) -> Bool {
         return AppDelegate.theDelegate().handleUniversalLink(with: parameters)
     }
+    
+    func roomViewControllerDidRequestPollCreationFormPresentation(_ roomViewController: RoomViewController) {
+        guard #available(iOS 14.0, *) else {
+            return
+        }
+        
+        let parameters = PollEditFormCoordinatorParameters(navigationRouter: self.navigationRouter, room: roomViewController.roomDataSource.room)
+        pollEditFormCoordinator = PollEditFormCoordinator(parameters: parameters)
+        
+        pollEditFormCoordinator?.start()
+    }
+    
+    func roomViewController(_ roomViewController: RoomViewController, canEndPollWithEventIdentifier eventIdentifier: String) -> Bool {
+        guard #available(iOS 14.0, *) else {
+            return false
+        }
+        
+        return PollTimelineProvider.shared.pollTimelineCoordinatorForEventIdentifier(eventIdentifier)?.canEndPoll() ?? false
+    }
+    
+    func roomViewController(_ roomViewController: RoomViewController, endPollWithEventIdentifier eventIdentifier: String) {
+        guard #available(iOS 14.0, *) else {
+            return
+        }
+        
+        PollTimelineProvider.shared.pollTimelineCoordinatorForEventIdentifier(eventIdentifier)?.endPoll()
+    }
 }
diff --git a/Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift b/Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift
index ccfe76a7e..4eaf2328d 100644
--- a/Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift
+++ b/Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift
@@ -39,9 +39,11 @@ final class RoomInfoCoordinator: NSObject, RoomInfoCoordinatorType {
         participants.enableMention = true
         participants.mxRoom = self.room
         participants.delegate = self
+        participants.screenTimer = AnalyticsScreenTimer(screen: .roomMembers)
         
         let files = RoomFilesViewController()
         files.finalizeInit()
+        files.screenTimer = AnalyticsScreenTimer(screen: .roomUploads)
         MXKRoomDataSource.load(withRoomId: self.room.roomId, andMatrixSession: self.session) { (dataSource) in
             guard let dataSource = dataSource as? MXKRoomDataSource else { return }
             dataSource.filterMessagesWithURL = true
@@ -52,6 +54,7 @@ final class RoomInfoCoordinator: NSObject, RoomInfoCoordinatorType {
         
         let settings = RoomSettingsViewController()
         settings.finalizeInit()
+        settings.screenTimer = AnalyticsScreenTimer(screen: .roomSettings)
         settings.initWith(self.session, andRoomId: self.room.roomId)
         
         if self.room.isDirect {
diff --git a/Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift b/Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
index 3590b5526..78b5af425 100644
--- a/Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
+++ b/Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
@@ -40,6 +40,7 @@ final class RoomInfoListViewController: UIViewController {
     private var errorPresenter: MXKErrorPresentation!
     private var activityPresenter: ActivityIndicatorPresenter!
     private var isRoomDirect: Bool = false
+    private var screenTimer = AnalyticsScreenTimer(screen: .roomDetails)
     
     private lazy var closeButton: CloseButton = {
         let button = CloseButton()
@@ -128,12 +129,22 @@ final class RoomInfoListViewController: UIViewController {
         return self.theme.statusBarStyle
     }
     
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        screenTimer.start()
+    }
+    
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
         
         mainTableView.vc_relayoutHeaderView()
     }
     
+    override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        screenTimer.stop()
+    }
+    
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
         coordinator.animate(alongsideTransition: {_ in
             self.basicInfoView.updateTrimmingOnTopic()
diff --git a/Riot/Modules/Room/RoomInfo/RoomInfoList/Views/RoomInfoBasicViewData.swift b/Riot/Modules/Room/RoomInfo/RoomInfoList/Views/RoomInfoBasicViewData.swift
index 085f0e2ae..b96ce90fd 100644
--- a/Riot/Modules/Room/RoomInfo/RoomInfoList/Views/RoomInfoBasicViewData.swift
+++ b/Riot/Modules/Room/RoomInfo/RoomInfoList/Views/RoomInfoBasicViewData.swift
@@ -15,7 +15,6 @@
 //
 
 import Foundation
-import MatrixKit
 
 struct RoomInfoBasicViewData {
     let avatarUrl: String?
diff --git a/Riot/Modules/Room/RoomViewController.h b/Riot/Modules/Room/RoomViewController.h
index 5016dec0f..74941c31e 100644
--- a/Riot/Modules/Room/RoomViewController.h
+++ b/Riot/Modules/Room/RoomViewController.h
@@ -15,7 +15,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 #import "RoomTitleView.h"
 
@@ -176,6 +176,19 @@ extern NSNotificationName const RoomGroupCallTileTappedNotification;
 - (BOOL)roomViewController:(RoomViewController *)roomViewController
 handleUniversalLinkWithParameters:(UniversalLinkParameters*)parameters;
 
+/**
+ Ask the coordinator to invoke the poll creation form coordinator.
+ 
+ @param roomViewController the `RoomViewController` instance.
+ */
+- (void)roomViewControllerDidRequestPollCreationFormPresentation:(RoomViewController *)roomViewController;
+
+- (BOOL)roomViewController:(RoomViewController *)roomViewController
+canEndPollWithEventIdentifier:(NSString *)eventIdentifier;
+
+- (void)roomViewController:(RoomViewController *)roomViewController
+endPollWithEventIdentifier:(NSString *)eventIdentifier;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 6d989d669..ac57d3a78 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -122,7 +122,6 @@
 #import "StickerPickerViewController.h"
 
 #import "EventFormatter.h"
-#import <MatrixKit/MXKSlashCommands.h>
 
 #import "SettingsViewController.h"
 #import "SecurityViewController.h"
@@ -131,7 +130,7 @@
 
 #import "MXSDKOptions.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNotification";
 NSNotificationName const RoomGroupCallTileTappedNotification = @"RoomGroupCallTileTappedNotification";
@@ -257,6 +256,8 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
 @property (nonatomic, strong) UserSuggestionCoordinatorBridge *userSuggestionCoordinator;
 @property (nonatomic, weak) IBOutlet UIView *userSuggestionContainerView;
 
+@property (nonatomic) AnalyticsScreenTimer *screenTimer;
+
 @end
 
 @implementation RoomViewController
@@ -339,6 +340,8 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
     
     _voiceMessageController = [[VoiceMessageController alloc] initWithThemeService:ThemeService.shared mediaServiceProvider:VoiceMessageMediaServiceProvider.sharedProvider];
     self.voiceMessageController.delegate = self;
+    
+    self.screenTimer = [[AnalyticsScreenTimer alloc] initWithScreen:AnalyticsScreenRoom];
 }
 
 - (void)viewDidLoad
@@ -416,6 +419,10 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
     [self.bubblesTableView registerClass:VoiceMessageWithoutSenderInfoBubbleCell.class forCellReuseIdentifier:VoiceMessageWithoutSenderInfoBubbleCell.defaultReuseIdentifier];
     [self.bubblesTableView registerClass:VoiceMessageWithPaginationTitleBubbleCell.class forCellReuseIdentifier:VoiceMessageWithPaginationTitleBubbleCell.defaultReuseIdentifier];
     
+    [self.bubblesTableView registerClass:PollBubbleCell.class forCellReuseIdentifier:PollBubbleCell.defaultReuseIdentifier];
+    [self.bubblesTableView registerClass:PollWithoutSenderInfoBubbleCell.class forCellReuseIdentifier:PollWithoutSenderInfoBubbleCell.defaultReuseIdentifier];
+    [self.bubblesTableView registerClass:PollWithPaginationTitleBubbleCell.class forCellReuseIdentifier:PollWithPaginationTitleBubbleCell.defaultReuseIdentifier];
+    
     [self vc_removeBackTitle];
     
     // Display leftBarButtonItems or leftBarButtonItem to the right of the Back button
@@ -564,9 +571,6 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
 {
     [super viewWillAppear:animated];
     
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"ChatRoom"];
-    
     // Refresh the room title view
     [self refreshRoomTitle];
     
@@ -607,8 +611,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         [self.roomDataSource reload];
         [LegacyAppDelegate theDelegate].lastNavigatedRoomIdFromPush = nil;
         
-        notificationTaskProfile = [MXSDKOptions.sharedInstance.profiler startMeasuringTaskWithName:AnalyticsNoficationsTimeToDisplayContent
-                                                                                          category:AnalyticsNoficationsCategory];
+        notificationTaskProfile = [MXSDKOptions.sharedInstance.profiler startMeasuringTaskWithName:MXTaskProfileNameNotificationsOpenEvent];
     }
 }
 
@@ -704,6 +707,9 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         hasJitsiCall = NO;
         [self reloadBubblesTable:YES];
     }
+    
+    // Screen tracking
+    [self.screenTimer start];
 }
 
 - (void)viewDidDisappear:(BOOL)animated
@@ -739,6 +745,8 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         hasJitsiCall = YES;
         [self reloadBubblesTable:YES];
     }
+    
+    [self.screenTimer stop];
 }
 
 - (void)viewDidLayoutSubviews
@@ -1098,16 +1106,12 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         
         if (self.roomDataSource)
         {
-            // Restore tool bar view and room activities view if none
-            if (!self.inputToolbarView)
-            {
-                [self updateRoomInputToolbarViewClassIfNeeded];
-                
-                [self refreshRoomInputToolbar];
-                
-                self.inputToolbarView.hidden = (self.roomDataSource.state != MXKDataSourceStateReady);
-            }
+            // Update the input toolbar class and update the layout
+            [self updateRoomInputToolbarViewClassIfNeeded];
             
+            self.inputToolbarView.hidden = (self.roomDataSource.state != MXKDataSourceStateReady);
+            
+            // Restore room activities view if none
             if (!self.activitiesView)
             {
                 // And the extra area
@@ -1192,6 +1196,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         }
         
         [self updateInputToolBarViewHeight];
+        [self refreshRoomInputToolbar];
     }
 }
 
@@ -1987,16 +1992,6 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
     RoomInputToolbarView *roomInputView = ((RoomInputToolbarView *) self.inputToolbarView);
     MXWeakify(self);
     NSMutableArray *actionItems = [NSMutableArray new];
-    if (RiotSettings.shared.roomScreenAllowCameraAction)
-    {
-        [actionItems addObject:[[RoomActionItem alloc] initWithImage:[UIImage imageNamed:@"action_camera"] andAction:^{
-            MXStrongifyAndReturnIfNil(self);
-            if ([self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
-                ((RoomInputToolbarView *) self.inputToolbarView).actionMenuOpened = NO;
-            }
-            [self showCameraControllerAnimated:YES];
-        }]];
-    }
     if (RiotSettings.shared.roomScreenAllowMediaLibraryAction)
     {
         [actionItems addObject:[[RoomActionItem alloc] initWithImage:[UIImage imageNamed:@"action_media_library"] andAction:^{
@@ -2027,9 +2022,34 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
             [self roomInputToolbarViewDidTapFileUpload];
         }]];
     }
+    if (RiotSettings.shared.roomScreenAllowPollsAction)
+    {
+        [actionItems addObject:[[RoomActionItem alloc] initWithImage:[UIImage imageNamed:@"action_poll"] andAction:^{
+            MXStrongifyAndReturnIfNil(self);
+            if ([self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
+                ((RoomInputToolbarView *) self.inputToolbarView).actionMenuOpened = NO;
+            }
+            [self.delegate roomViewControllerDidRequestPollCreationFormPresentation:self];
+        }]];
+    }
+    if (RiotSettings.shared.roomScreenAllowCameraAction)
+    {
+        [actionItems addObject:[[RoomActionItem alloc] initWithImage:[UIImage imageNamed:@"action_camera"] andAction:^{
+            MXStrongifyAndReturnIfNil(self);
+            if ([self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
+                ((RoomInputToolbarView *) self.inputToolbarView).actionMenuOpened = NO;
+            }
+            [self showCameraControllerAnimated:YES];
+        }]];
+    }
     roomInputView.actionsBar.actionItems = actionItems;
 }
 
+- (NSString *)textInputContextIdentifier
+{
+    return self.roomDataSource.roomId;
+}
+
 - (void)roomInputToolbarViewPresentStickerPicker
 {
     // Search for the sticker picker widget in the user account
@@ -2062,20 +2082,22 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
                                   [VectorL10n widgetStickerPickerNoStickerpacksAlert],
                                   [VectorL10n widgetStickerPickerNoStickerpacksAlertAddNow]];
                                    
-        currentAlert = [UIAlertController alertControllerWithTitle:nil message:alertMessage preferredStyle:UIAlertControllerStyleAlert];
+        UIAlertController *installPrompt = [UIAlertController alertControllerWithTitle:nil
+                                                                               message:alertMessage
+                                                                        preferredStyle:UIAlertControllerStyleAlert];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n no]
-                                                         style:UIAlertActionStyleCancel
-                                                       handler:^(UIAlertAction * action)
+        [installPrompt addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n no]
+                                                          style:UIAlertActionStyleCancel
+                                                        handler:^(UIAlertAction * action)
                                  {
             MXStrongifyAndReturnIfNil(self);
             self->currentAlert = nil;
             
         }]];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n yes]
-                                                         style:UIAlertActionStyleDefault
-                                                       handler:^(UIAlertAction * action)
+        [installPrompt addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n yes]
+                                                          style:UIAlertActionStyleDefault
+                                                        handler:^(UIAlertAction * action)
                                  {
             MXStrongifyAndReturnIfNil(self);
             self->currentAlert = nil;
@@ -2090,8 +2112,9 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
             [self presentViewController:modularVC animated:NO completion:nil];
         }]];
         
-        [currentAlert mxk_setAccessibilityIdentifier:@"RoomVCStickerPickerAlert"];
-        [self presentViewController:currentAlert animated:YES completion:nil];
+        [installPrompt mxk_setAccessibilityIdentifier:@"RoomVCStickerPickerAlert"];
+        [self presentViewController:installPrompt animated:YES completion:nil];
+        currentAlert = installPrompt;
     }
 }
 
@@ -2601,193 +2624,210 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
     BOOL showEncryptionBadge = NO;
     
     // Sanity check
-    if ([cellData conformsToProtocol:@protocol(MXKRoomBubbleCellDataStoring)])
+    if (![cellData conformsToProtocol:@protocol(MXKRoomBubbleCellDataStoring)])
     {
-        id<MXKRoomBubbleCellDataStoring> bubbleData = (id<MXKRoomBubbleCellDataStoring>)cellData;
+        return nil;
+    }
         
-        MXKRoomBubbleCellData *roomBubbleCellData;
-        
-        if ([bubbleData isKindOfClass:MXKRoomBubbleCellData.class])
+    id<MXKRoomBubbleCellDataStoring> bubbleData = (id<MXKRoomBubbleCellDataStoring>)cellData;
+    
+    MXKRoomBubbleCellData *roomBubbleCellData;
+    
+    if ([bubbleData isKindOfClass:MXKRoomBubbleCellData.class])
+    {
+        roomBubbleCellData = (MXKRoomBubbleCellData*)bubbleData;
+        showEncryptionBadge = roomBubbleCellData.containsBubbleComponentWithEncryptionBadge;
+    }
+    
+    // Select the suitable table view cell class, by considering first the empty bubble cell.
+    if (bubbleData.hasNoDisplay)
+    {
+        cellViewClass = RoomEmptyBubbleCell.class;
+    }
+    else if (bubbleData.tag == RoomBubbleCellDataTagRoomCreationIntro)
+    {
+        cellViewClass = RoomCreationIntroCell.class;
+    }
+    else if (bubbleData.tag == RoomBubbleCellDataTagRoomCreateWithPredecessor)
+    {
+        cellViewClass = RoomPredecessorBubbleCell.class;
+    }
+    else if (bubbleData.tag == RoomBubbleCellDataTagKeyVerificationRequestIncomingApproval)
+    {
+        cellViewClass = bubbleData.isPaginationFirstBubble ? KeyVerificationIncomingRequestApprovalWithPaginationTitleBubbleCell.class : KeyVerificationIncomingRequestApprovalBubbleCell.class;
+    }
+    else if (bubbleData.tag == RoomBubbleCellDataTagKeyVerificationRequest)
+    {
+        cellViewClass = bubbleData.isPaginationFirstBubble ? KeyVerificationRequestStatusWithPaginationTitleBubbleCell.class : KeyVerificationRequestStatusBubbleCell.class;
+    }
+    else if (bubbleData.tag == RoomBubbleCellDataTagKeyVerificationConclusion)
+    {
+        cellViewClass = bubbleData.isPaginationFirstBubble ? KeyVerificationConclusionWithPaginationTitleBubbleCell.class : KeyVerificationConclusionBubbleCell.class;
+    }
+    else if (bubbleData.tag == RoomBubbleCellDataTagMembership)
+    {
+        if (bubbleData.collapsed)
         {
-            roomBubbleCellData = (MXKRoomBubbleCellData*)bubbleData;
-            showEncryptionBadge = roomBubbleCellData.containsBubbleComponentWithEncryptionBadge;
-        }
-        
-        // Select the suitable table view cell class, by considering first the empty bubble cell.
-        if (bubbleData.hasNoDisplay)
-        {
-            cellViewClass = RoomEmptyBubbleCell.class;
-        }
-        else if (bubbleData.tag == RoomBubbleCellDataTagRoomCreationIntro)
-        {
-            cellViewClass = RoomCreationIntroCell.class;
-        }
-        else if (bubbleData.tag == RoomBubbleCellDataTagRoomCreateWithPredecessor)
-        {
-            cellViewClass = RoomPredecessorBubbleCell.class;
-        }
-        else if (bubbleData.tag == RoomBubbleCellDataTagKeyVerificationRequestIncomingApproval)
-        {
-            cellViewClass = bubbleData.isPaginationFirstBubble ? KeyVerificationIncomingRequestApprovalWithPaginationTitleBubbleCell.class : KeyVerificationIncomingRequestApprovalBubbleCell.class;
-        }
-        else if (bubbleData.tag == RoomBubbleCellDataTagKeyVerificationRequest)
-        {
-            cellViewClass = bubbleData.isPaginationFirstBubble ? KeyVerificationRequestStatusWithPaginationTitleBubbleCell.class : KeyVerificationRequestStatusBubbleCell.class;
-        }
-        else if (bubbleData.tag == RoomBubbleCellDataTagKeyVerificationConclusion)
-        {
-            cellViewClass = bubbleData.isPaginationFirstBubble ? KeyVerificationConclusionWithPaginationTitleBubbleCell.class : KeyVerificationConclusionBubbleCell.class;
-        }
-        else if (bubbleData.tag == RoomBubbleCellDataTagMembership)
-        {
-            if (bubbleData.collapsed)
+            if (bubbleData.nextCollapsableCellData)
             {
-                if (bubbleData.nextCollapsableCellData)
-                {
-                    cellViewClass = bubbleData.isPaginationFirstBubble ? RoomMembershipCollapsedWithPaginationTitleBubbleCell.class : RoomMembershipCollapsedBubbleCell.class;
-                }
-                else
-                {
-                    // Use a normal membership cell for a single membership event
-                    cellViewClass = bubbleData.isPaginationFirstBubble ? RoomMembershipWithPaginationTitleBubbleCell.class : RoomMembershipBubbleCell.class;
-                }
-            }
-            else if (bubbleData.collapsedAttributedTextMessage)
-            {
-                // The cell (and its series) is not collapsed but this cell is the first
-                // of the series. So, use the cell with the "collapse" button.
-                cellViewClass = bubbleData.isPaginationFirstBubble ? RoomMembershipExpandedWithPaginationTitleBubbleCell.class : RoomMembershipExpandedBubbleCell.class;
+                cellViewClass = bubbleData.isPaginationFirstBubble ? RoomMembershipCollapsedWithPaginationTitleBubbleCell.class : RoomMembershipCollapsedBubbleCell.class;
             }
             else
             {
+                // Use a normal membership cell for a single membership event
                 cellViewClass = bubbleData.isPaginationFirstBubble ? RoomMembershipWithPaginationTitleBubbleCell.class : RoomMembershipBubbleCell.class;
             }
         }
-        else if (bubbleData.tag == RoomBubbleCellDataTagRoomCreateConfiguration)
+        else if (bubbleData.collapsedAttributedTextMessage)
         {
-            cellViewClass = bubbleData.isPaginationFirstBubble ? RoomCreationWithPaginationCollapsedBubbleCell.class : RoomCreationCollapsedBubbleCell.class;
+            // The cell (and its series) is not collapsed but this cell is the first
+            // of the series. So, use the cell with the "collapse" button.
+            cellViewClass = bubbleData.isPaginationFirstBubble ? RoomMembershipExpandedWithPaginationTitleBubbleCell.class : RoomMembershipExpandedBubbleCell.class;
         }
-        else if (bubbleData.tag == RoomBubbleCellDataTagCall)
+        else
         {
-            cellViewClass = RoomDirectCallStatusBubbleCell.class;
+            cellViewClass = bubbleData.isPaginationFirstBubble ? RoomMembershipWithPaginationTitleBubbleCell.class : RoomMembershipBubbleCell.class;
         }
-        else if (bubbleData.tag == RoomBubbleCellDataTagGroupCall)
+    }
+    else if (bubbleData.tag == RoomBubbleCellDataTagRoomCreateConfiguration)
+    {
+        cellViewClass = bubbleData.isPaginationFirstBubble ? RoomCreationWithPaginationCollapsedBubbleCell.class : RoomCreationCollapsedBubbleCell.class;
+    }
+    else if (bubbleData.tag == RoomBubbleCellDataTagCall)
+    {
+        cellViewClass = RoomDirectCallStatusBubbleCell.class;
+    }
+    else if (bubbleData.tag == RoomBubbleCellDataTagGroupCall)
+    {
+        cellViewClass = RoomGroupCallStatusBubbleCell.class;
+    }
+    else if (bubbleData.attachment.type == MXKAttachmentTypeVoiceMessage || bubbleData.attachment.type == MXKAttachmentTypeAudio)
+    {
+        if (bubbleData.isPaginationFirstBubble)
         {
-            cellViewClass = RoomGroupCallStatusBubbleCell.class;
+            cellViewClass = VoiceMessageWithPaginationTitleBubbleCell.class;
         }
-        else if (bubbleData.attachment.type == MXKAttachmentTypeVoiceMessage)
+        else if (bubbleData.shouldHideSenderInformation)
         {
-            if (bubbleData.isPaginationFirstBubble)
+            cellViewClass = VoiceMessageWithoutSenderInfoBubbleCell.class;
+        }
+        else
+        {
+            cellViewClass = VoiceMessageBubbleCell.class;
+        }
+    }
+    else if (bubbleData.tag == RoomBubbleCellDataTagPoll)
+    {
+        if (bubbleData.isPaginationFirstBubble)
+        {
+            cellViewClass = PollWithPaginationTitleBubbleCell.class;
+        }
+        else if (bubbleData.shouldHideSenderInformation)
+        {
+            cellViewClass = PollWithoutSenderInfoBubbleCell.class;
+        }
+        else
+        {
+            cellViewClass = PollBubbleCell.class;
+        }
+    }
+    else if (bubbleData.isIncoming)
+    {
+        if (bubbleData.isAttachmentWithThumbnail)
+        {
+            // Check whether the provided celldata corresponds to a selected sticker
+            if (customizedRoomDataSource.selectedEventId && (bubbleData.attachment.type == MXKAttachmentTypeSticker) && [bubbleData.attachment.eventId isEqualToString:customizedRoomDataSource.selectedEventId])
             {
-                cellViewClass = VoiceMessageWithPaginationTitleBubbleCell.class;
+                cellViewClass = RoomSelectedStickerBubbleCell.class;
+            }
+            else if (bubbleData.isPaginationFirstBubble)
+            {
+                cellViewClass = showEncryptionBadge ? RoomIncomingEncryptedAttachmentWithPaginationTitleBubbleCell.class : RoomIncomingAttachmentWithPaginationTitleBubbleCell.class;
             }
             else if (bubbleData.shouldHideSenderInformation)
             {
-                cellViewClass = VoiceMessageWithoutSenderInfoBubbleCell.class;
+                cellViewClass = showEncryptionBadge ? RoomIncomingEncryptedAttachmentWithoutSenderInfoBubbleCell.class : RoomIncomingAttachmentWithoutSenderInfoBubbleCell.class;
             }
             else
             {
-                cellViewClass = VoiceMessageBubbleCell.class;
-            }
-        }
-        else if (bubbleData.isIncoming)
-        {
-            if (bubbleData.isAttachmentWithThumbnail)
-            {
-                // Check whether the provided celldata corresponds to a selected sticker
-                if (customizedRoomDataSource.selectedEventId && (bubbleData.attachment.type == MXKAttachmentTypeSticker) && [bubbleData.attachment.eventId isEqualToString:customizedRoomDataSource.selectedEventId])
-                {
-                    cellViewClass = RoomSelectedStickerBubbleCell.class;
-                }
-                else if (bubbleData.isPaginationFirstBubble)
-                {
-                    cellViewClass = showEncryptionBadge ? RoomIncomingEncryptedAttachmentWithPaginationTitleBubbleCell.class : RoomIncomingAttachmentWithPaginationTitleBubbleCell.class;
-                }
-                else if (bubbleData.shouldHideSenderInformation)
-                {
-                    cellViewClass = showEncryptionBadge ? RoomIncomingEncryptedAttachmentWithoutSenderInfoBubbleCell.class : RoomIncomingAttachmentWithoutSenderInfoBubbleCell.class;
-                }
-                else
-                {
-                    cellViewClass = showEncryptionBadge ? RoomIncomingEncryptedAttachmentBubbleCell.class : RoomIncomingAttachmentBubbleCell.class;
-                }
-            }
-            else
-            {
-                if (bubbleData.isPaginationFirstBubble)
-                {
-                    if (bubbleData.shouldHideSenderName)
-                    {
-                        cellViewClass = showEncryptionBadge ? RoomIncomingEncryptedTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.class : RoomIncomingTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.class;
-                    }
-                    else
-                    {
-                        cellViewClass = showEncryptionBadge ? RoomIncomingEncryptedTextMsgWithPaginationTitleBubbleCell.class : RoomIncomingTextMsgWithPaginationTitleBubbleCell.class;
-                    }
-                }
-                else if (bubbleData.shouldHideSenderInformation)
-                {
-                    cellViewClass = showEncryptionBadge ? RoomIncomingEncryptedTextMsgWithoutSenderInfoBubbleCell.class : RoomIncomingTextMsgWithoutSenderInfoBubbleCell.class;
-                }
-                else if (bubbleData.shouldHideSenderName)
-                {
-                    cellViewClass = showEncryptionBadge ? RoomIncomingEncryptedTextMsgWithoutSenderNameBubbleCell.class : RoomIncomingTextMsgWithoutSenderNameBubbleCell.class;
-                }
-                else
-                {
-                    cellViewClass = showEncryptionBadge ? RoomIncomingEncryptedTextMsgBubbleCell.class : RoomIncomingTextMsgBubbleCell.class;
-                }
+                cellViewClass = showEncryptionBadge ? RoomIncomingEncryptedAttachmentBubbleCell.class : RoomIncomingAttachmentBubbleCell.class;
             }
         }
         else
         {
-            // Handle here outgoing bubbles
-            if (bubbleData.isAttachmentWithThumbnail)
+            if (bubbleData.isPaginationFirstBubble)
             {
-                // Check whether the provided celldata corresponds to a selected sticker
-                if (customizedRoomDataSource.selectedEventId && (bubbleData.attachment.type == MXKAttachmentTypeSticker) && [bubbleData.attachment.eventId isEqualToString:customizedRoomDataSource.selectedEventId])
+                if (bubbleData.shouldHideSenderName)
                 {
-                    cellViewClass = RoomSelectedStickerBubbleCell.class;
-                }
-                else if (bubbleData.isPaginationFirstBubble)
-                {
-                    cellViewClass = showEncryptionBadge ? RoomOutgoingEncryptedAttachmentWithPaginationTitleBubbleCell.class :RoomOutgoingAttachmentWithPaginationTitleBubbleCell.class;
-                }
-                else if (bubbleData.shouldHideSenderInformation)
-                {
-                    cellViewClass = showEncryptionBadge ? RoomOutgoingEncryptedAttachmentWithoutSenderInfoBubbleCell.class : RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.class;
+                    cellViewClass = showEncryptionBadge ? RoomIncomingEncryptedTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.class : RoomIncomingTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.class;
                 }
                 else
                 {
-                    cellViewClass = showEncryptionBadge ? RoomOutgoingEncryptedAttachmentBubbleCell.class : RoomOutgoingAttachmentBubbleCell.class;
+                    cellViewClass = showEncryptionBadge ? RoomIncomingEncryptedTextMsgWithPaginationTitleBubbleCell.class : RoomIncomingTextMsgWithPaginationTitleBubbleCell.class;
                 }
             }
+            else if (bubbleData.shouldHideSenderInformation)
+            {
+                cellViewClass = showEncryptionBadge ? RoomIncomingEncryptedTextMsgWithoutSenderInfoBubbleCell.class : RoomIncomingTextMsgWithoutSenderInfoBubbleCell.class;
+            }
+            else if (bubbleData.shouldHideSenderName)
+            {
+                cellViewClass = showEncryptionBadge ? RoomIncomingEncryptedTextMsgWithoutSenderNameBubbleCell.class : RoomIncomingTextMsgWithoutSenderNameBubbleCell.class;
+            }
             else
             {
-                if (bubbleData.isPaginationFirstBubble)
+                cellViewClass = showEncryptionBadge ? RoomIncomingEncryptedTextMsgBubbleCell.class : RoomIncomingTextMsgBubbleCell.class;
+            }
+        }
+    }
+    else
+    {
+        // Handle here outgoing bubbles
+        if (bubbleData.isAttachmentWithThumbnail)
+        {
+            // Check whether the provided celldata corresponds to a selected sticker
+            if (customizedRoomDataSource.selectedEventId && (bubbleData.attachment.type == MXKAttachmentTypeSticker) && [bubbleData.attachment.eventId isEqualToString:customizedRoomDataSource.selectedEventId])
+            {
+                cellViewClass = RoomSelectedStickerBubbleCell.class;
+            }
+            else if (bubbleData.isPaginationFirstBubble)
+            {
+                cellViewClass = showEncryptionBadge ? RoomOutgoingEncryptedAttachmentWithPaginationTitleBubbleCell.class :RoomOutgoingAttachmentWithPaginationTitleBubbleCell.class;
+            }
+            else if (bubbleData.shouldHideSenderInformation)
+            {
+                cellViewClass = showEncryptionBadge ? RoomOutgoingEncryptedAttachmentWithoutSenderInfoBubbleCell.class : RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.class;
+            }
+            else
+            {
+                cellViewClass = showEncryptionBadge ? RoomOutgoingEncryptedAttachmentBubbleCell.class : RoomOutgoingAttachmentBubbleCell.class;
+            }
+        }
+        else
+        {
+            if (bubbleData.isPaginationFirstBubble)
+            {
+                if (bubbleData.shouldHideSenderName)
                 {
-                    if (bubbleData.shouldHideSenderName)
-                    {
-                        cellViewClass = showEncryptionBadge ? RoomOutgoingEncryptedTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.class : RoomOutgoingTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.class;
-                    }
-                    else
-                    {
-                        cellViewClass = showEncryptionBadge ? RoomOutgoingEncryptedTextMsgWithPaginationTitleBubbleCell.class : RoomOutgoingTextMsgWithPaginationTitleBubbleCell.class;
-                    }
-                }
-                else if (bubbleData.shouldHideSenderInformation)
-                {
-                    cellViewClass = showEncryptionBadge ? RoomOutgoingEncryptedTextMsgWithoutSenderInfoBubbleCell.class :RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.class;
-                }
-                else if (bubbleData.shouldHideSenderName)
-                {
-                    cellViewClass = showEncryptionBadge ? RoomOutgoingEncryptedTextMsgWithoutSenderNameBubbleCell.class : RoomOutgoingTextMsgWithoutSenderNameBubbleCell.class;
+                    cellViewClass = showEncryptionBadge ? RoomOutgoingEncryptedTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.class : RoomOutgoingTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.class;
                 }
                 else
                 {
-                    cellViewClass = showEncryptionBadge ? RoomOutgoingEncryptedTextMsgBubbleCell.class : RoomOutgoingTextMsgBubbleCell.class;
+                    cellViewClass = showEncryptionBadge ? RoomOutgoingEncryptedTextMsgWithPaginationTitleBubbleCell.class : RoomOutgoingTextMsgWithPaginationTitleBubbleCell.class;
                 }
             }
+            else if (bubbleData.shouldHideSenderInformation)
+            {
+                cellViewClass = showEncryptionBadge ? RoomOutgoingEncryptedTextMsgWithoutSenderInfoBubbleCell.class :RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.class;
+            }
+            else if (bubbleData.shouldHideSenderName)
+            {
+                cellViewClass = showEncryptionBadge ? RoomOutgoingEncryptedTextMsgWithoutSenderNameBubbleCell.class : RoomOutgoingTextMsgWithoutSenderNameBubbleCell.class;
+            }
+            else
+            {
+                cellViewClass = showEncryptionBadge ? RoomOutgoingEncryptedTextMsgBubbleCell.class : RoomOutgoingTextMsgBubbleCell.class;
+            }
         }
     }
     
@@ -3144,41 +3184,31 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         currentAlert = nil;
     }
     
-    __weak __typeof(self) weakSelf = self;
-    currentAlert = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+    MXWeakify(self);
+    UIAlertController *actionsMenu = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
     
     // Add actions for a failed event
     if (selectedEvent.sentState == MXEventSentStateFailed)
     {
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n retry]
-                                                         style:UIAlertActionStyleDefault
-                                                       handler:^(UIAlertAction * action) {
+        [actionsMenu addAction:[UIAlertAction actionWithTitle:[VectorL10n retry]
+                                                        style:UIAlertActionStyleDefault
+                                                      handler:^(UIAlertAction * action) {
+            MXStrongifyAndReturnIfNil(self);
             
-            if (weakSelf)
-            {
-                typeof(self) self = weakSelf;
-                
-                [self cancelEventSelection];
-                
-                // Let the datasource resend. It will manage local echo, etc.
-                [self.roomDataSource resendEventWithEventId:selectedEvent.eventId success:nil failure:nil];
-            }
+            [self cancelEventSelection];
             
+            // Let the datasource resend. It will manage local echo, etc.
+            [self.roomDataSource resendEventWithEventId:selectedEvent.eventId success:nil failure:nil];
         }]];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionDelete]
-                                                         style:UIAlertActionStyleDefault
-                                                       handler:^(UIAlertAction * action) {
+        [actionsMenu addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionDelete]
+                                                        style:UIAlertActionStyleDefault
+                                                      handler:^(UIAlertAction * action) {
+            MXStrongifyAndReturnIfNil(self);
             
-            if (weakSelf)
-            {
-                typeof(self) self = weakSelf;
-                
-                [self cancelEventSelection];
-                
-                [self.roomDataSource removeEventWithEventId:selectedEvent.eventId];
-            }
+            [self cancelEventSelection];
             
+            [self.roomDataSource removeEventWithEventId:selectedEvent.eventId];
         }]];
     }
     
@@ -3203,116 +3233,84 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
             selectedEvent.sentState == MXEventSentStateEncrypting ||
             selectedEvent.sentState == MXEventSentStateSending)
         {
-            [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionCancelSend]
-                                                             style:UIAlertActionStyleDefault
-                                                           handler:^(UIAlertAction * action)
-                                     {
-                if (weakSelf)
-                {
-                    typeof(self) self = weakSelf;
-                    
-                    self->currentAlert = nil;
-                    
-                    // Cancel and remove the outgoing message
-                    [self.roomDataSource.room cancelSendingOperation:selectedEvent.eventId];
-                    [self.roomDataSource removeEventWithEventId:selectedEvent.eventId];
-                    
-                    [self cancelEventSelection];
-                }
-                
-            }]];
-        }
-        
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionForward]
-                                                         style:UIAlertActionStyleDefault
-                                                       handler:^(UIAlertAction * action) {
-            self.shareManager = [[ShareManager alloc] initWithShareItemProvider:[[SimpleShareItemProvider alloc] initWithTextMessage:selectedComponent.textMessage]
-                                                                           type:ShareManagerTypeForward];
-            
-            MXWeakify(self);
-            [self.shareManager setCompletionCallback:^(ShareManagerResult result) {
+            [actionsMenu addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionCancelSend]
+                                                            style:UIAlertActionStyleDefault
+                                                          handler:^(UIAlertAction * action) {
                 MXStrongifyAndReturnIfNil(self);
-                [attachment onShareEnded];
-                [self dismissViewControllerAnimated:YES completion:nil];
-                self.shareManager = nil;
-            }];
-            
-            [self presentViewController:self.shareManager.mainViewController animated:YES completion:nil];
-        }]];
-        
-        if (!isJitsiCallEvent)
-        {
-            [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionQuote]
-                                                             style:UIAlertActionStyleDefault
-                                                           handler:^(UIAlertAction * action) {
                 
-                if (weakSelf)
-                {
-                    typeof(self) self = weakSelf;
-                    
-                    [self cancelEventSelection];
-                    
-                    // Quote the message a la Markdown into the input toolbar composer
-                    self.inputToolbarView.textMessage = [NSString stringWithFormat:@"%@\n>%@\n\n", self.inputToolbarView.textMessage, selectedComponent.textMessage];
-                    
-                    // And display the keyboard
-                    [self.inputToolbarView becomeFirstResponder];
-                }
+                self->currentAlert = nil;
                 
+                // Cancel and remove the outgoing message
+                [self.roomDataSource.room cancelSendingOperation:selectedEvent.eventId];
+                [self.roomDataSource removeEventWithEventId:selectedEvent.eventId];
+                
+                [self cancelEventSelection];
             }]];
         }
         
-        if (!isJitsiCallEvent && BuildSettings.messageDetailsAllowShare)
+        if (selectedEvent.sentState == MXEventSentStateSent && selectedEvent.eventType != MXEventTypePollStart)
         {
-            [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionShare]
-                                                             style:UIAlertActionStyleDefault
-                                                           handler:^(UIAlertAction * action) {
+            [actionsMenu addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionForward]
+                                                            style:UIAlertActionStyleDefault
+                                                          handler:^(UIAlertAction * action) {
+                MXStrongifyAndReturnIfNil(self);
+                [self presentEventForwardingDialogForSelectedEvent:selectedEvent];
+            }]];
+        }
+        
+        if (!isJitsiCallEvent && selectedEvent.eventType != MXEventTypePollStart)
+        {
+            [actionsMenu addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionQuote]
+                                                            style:UIAlertActionStyleDefault
+                                                          handler:^(UIAlertAction * action) {
+                MXStrongifyAndReturnIfNil(self);
                 
-                if (weakSelf)
+                [self cancelEventSelection];
+                
+                // Quote the message a la Markdown into the input toolbar composer
+                self.inputToolbarView.textMessage = [NSString stringWithFormat:@"%@\n>%@\n\n", self.inputToolbarView.textMessage, selectedComponent.textMessage];
+                
+                // And display the keyboard
+                [self.inputToolbarView becomeFirstResponder];
+            }]];
+        }
+        
+        if (!isJitsiCallEvent && BuildSettings.messageDetailsAllowShare && selectedEvent.eventType != MXEventTypePollStart)
+        {
+            [actionsMenu addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionShare]
+                                                            style:UIAlertActionStyleDefault
+                                                          handler:^(UIAlertAction * action) {
+                MXStrongifyAndReturnIfNil(self);
+                
+                [self cancelEventSelection];
+                
+                NSArray *activityItems = @[selectedComponent.textMessage];
+                
+                UIActivityViewController *activityViewController = [[UIActivityViewController alloc] initWithActivityItems:activityItems applicationActivities:nil];
+                
+                if (activityViewController)
                 {
-                    typeof(self) self = weakSelf;
+                    activityViewController.modalTransitionStyle = UIModalTransitionStyleCoverVertical;
+                    activityViewController.popoverPresentationController.sourceView = roomBubbleTableViewCell;
+                    activityViewController.popoverPresentationController.sourceRect = roomBubbleTableViewCell.bounds;
                     
-                    [self cancelEventSelection];
-                    
-                    NSArray *activityItems = @[selectedComponent.textMessage];
-                    
-                    UIActivityViewController *activityViewController = [[UIActivityViewController alloc] initWithActivityItems:activityItems applicationActivities:nil];
-                    
-                    if (activityViewController)
-                    {
-                        activityViewController.modalTransitionStyle = UIModalTransitionStyleCoverVertical;
-                        activityViewController.popoverPresentationController.sourceView = roomBubbleTableViewCell;
-                        activityViewController.popoverPresentationController.sourceRect = roomBubbleTableViewCell.bounds;
-                        
-                        [self presentViewController:activityViewController animated:YES completion:nil];
-                    }
+                    [self presentViewController:activityViewController animated:YES completion:nil];
                 }
-                
             }]];
         }
     }
     else // Add action for attachment
     {
-        if (attachment.type == MXKAttachmentTypeFile ||
-            attachment.type == MXKAttachmentTypeImage ||
-            attachment.type == MXKAttachmentTypeVideo ||
-            attachment.type == MXKAttachmentTypeVoiceMessage) {
-            
-            [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionForward]
-                                                             style:UIAlertActionStyleDefault
-                                                           handler:^(UIAlertAction * action) {
-                self.shareManager = [[ShareManager alloc] initWithShareItemProvider:[[SimpleShareItemProvider alloc] initWithAttachment:attachment]
-                                                                               type:ShareManagerTypeForward];
-                
-                MXWeakify(self);
-                [self.shareManager setCompletionCallback:^(ShareManagerResult result) {
-                    MXStrongifyAndReturnIfNil(self);
-                    [attachment onShareEnded];
-                    [self dismissViewControllerAnimated:YES completion:nil];
-                    self.shareManager = nil;
-                }];
-                
-                [self presentViewController:self.shareManager.mainViewController animated:YES completion:nil];
+        // Forwarding for already sent attachments
+        if (selectedEvent.sentState == MXEventSentStateSent && (attachment.type == MXKAttachmentTypeFile ||
+                                                                attachment.type == MXKAttachmentTypeImage ||
+                                                                attachment.type == MXKAttachmentTypeVideo ||
+                                                                attachment.type == MXKAttachmentTypeVoiceMessage)) {
+            [actionsMenu addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionForward]
+                                                            style:UIAlertActionStyleDefault
+                                                          handler:^(UIAlertAction * action) {
+                MXStrongifyAndReturnIfNil(self);
+                [self presentEventForwardingDialogForSelectedEvent:selectedEvent];
             }]];
         }
         
@@ -3320,37 +3318,29 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         {
             if (attachment.type == MXKAttachmentTypeImage || attachment.type == MXKAttachmentTypeVideo)
             {
-                [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionSave]
-                                                                 style:UIAlertActionStyleDefault
-                                                               handler:^(UIAlertAction * action) {
+                [actionsMenu addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionSave]
+                                                                style:UIAlertActionStyleDefault
+                                                              handler:^(UIAlertAction * action) {
+                    MXStrongifyAndReturnIfNil(self);
                     
-                    if (weakSelf)
-                    {
-                        typeof(self) self = weakSelf;
-                        
-                        [self cancelEventSelection];
-                        
-                        [self startActivityIndicator];
-                        
-                        [attachment save:^{
-                            
-                            __strong __typeof(weakSelf)self = weakSelf;
-                            [self stopActivityIndicator];
-                            
-                        } failure:^(NSError *error) {
-                            
-                            __strong __typeof(weakSelf)self = weakSelf;
-                            [self stopActivityIndicator];
-                            
-                            //Alert user
-                            [self showError:error];
-                            
-                        }];
-                        
-                        // Start animation in case of download during attachment preparing
-                        [roomBubbleTableViewCell startProgressUI];
-                    }
+                    [self cancelEventSelection];
                     
+                    [self startActivityIndicator];
+                    
+                    MXWeakify(self);
+                    [attachment save:^{
+                        MXStrongifyAndReturnIfNil(self);
+                        [self stopActivityIndicator];
+                    } failure:^(NSError *error) {
+                        MXStrongifyAndReturnIfNil(self);
+                        [self stopActivityIndicator];
+                        
+                        //Alert user
+                        [self showError:error];
+                    }];
+                    
+                    // Start animation in case of download during attachment preparing
+                    [roomBubbleTableViewCell startProgressUI];
                 }]];
             }
         }
@@ -3365,9 +3355,11 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
             NSString *uploadId = roomBubbleTableViewCell.bubbleData.attachment.contentURL;
             if ([MXMediaManager existingUploaderWithId:uploadId])
             {
-                [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionCancelSend]
-                                                                 style:UIAlertActionStyleDefault
-                                                               handler:^(UIAlertAction * action) {
+                [actionsMenu addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionCancelSend]
+                                                                style:UIAlertActionStyleDefault
+                                                              handler:^(UIAlertAction * action) {
+                    
+                    MXStrongifyAndReturnIfNil(self);
                     
                     // Get again the loader
                     MXMediaLoader *loader = [MXMediaManager existingUploaderWithId:uploadId];
@@ -3378,23 +3370,17 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
                     // Hide the progress animation
                     roomBubbleTableViewCell.progressView.hidden = YES;
                     
-                    if (weakSelf)
-                    {
-                        typeof(self) self = weakSelf;
-                        
-                        self->currentAlert = nil;
-                        
-                        // Remove the outgoing message and its related cached file.
-                        [[NSFileManager defaultManager] removeItemAtPath:roomBubbleTableViewCell.bubbleData.attachment.cacheFilePath error:nil];
-                        [[NSFileManager defaultManager] removeItemAtPath:roomBubbleTableViewCell.bubbleData.attachment.thumbnailCachePath error:nil];
-                        
-                        // Cancel and remove the outgoing message
-                        [self.roomDataSource.room cancelSendingOperation:selectedEvent.eventId];
-                        [self.roomDataSource removeEventWithEventId:selectedEvent.eventId];
-                        
-                        [self cancelEventSelection];
-                    }
+                    self->currentAlert = nil;
                     
+                    // Remove the outgoing message and its related cached file.
+                    [[NSFileManager defaultManager] removeItemAtPath:roomBubbleTableViewCell.bubbleData.attachment.cacheFilePath error:nil];
+                    [[NSFileManager defaultManager] removeItemAtPath:roomBubbleTableViewCell.bubbleData.attachment.thumbnailCachePath error:nil];
+                    
+                    // Cancel and remove the outgoing message
+                    [self.roomDataSource.room cancelSendingOperation:selectedEvent.eventId];
+                    [self.roomDataSource removeEventWithEventId:selectedEvent.eventId];
+                    
+                    [self cancelEventSelection];
                 }]];
             }
         }
@@ -3403,42 +3389,39 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         {
             if (BuildSettings.messageDetailsAllowShare)
             {
-                [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionShare]
-                                                                 style:UIAlertActionStyleDefault
-                                                               handler:^(UIAlertAction * action) {
+                [actionsMenu addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionShare]
+                                                                style:UIAlertActionStyleDefault
+                                                              handler:^(UIAlertAction * action) {
+                    MXStrongifyAndReturnIfNil(self);
                     
-                    if (weakSelf)
-                    {
-                        typeof(self) self = weakSelf;
-                        
-                        [self cancelEventSelection];
-                        
-                        [self startActivityIndicator];
-                        
-                        [attachment prepareShare:^(NSURL *fileURL) {
-                            [self stopActivityIndicator];
-                            
-                            __strong __typeof(weakSelf)self = weakSelf;
-                            self->documentInteractionController = [UIDocumentInteractionController interactionControllerWithURL:fileURL];
-                            [self->documentInteractionController setDelegate:self];
-                            self->currentSharedAttachment = attachment;
-                            
-                            if (![self->documentInteractionController presentOptionsMenuFromRect:self.view.frame inView:self.view animated:YES])
-                            {
-                                self->documentInteractionController = nil;
-                                [attachment onShareEnded];
-                                self->currentSharedAttachment = nil;
-                            }
-                            
-                        } failure:^(NSError *error) {
-                            [self showError:error];
-                            [self stopActivityIndicator];
-                        }];
-                        
-                        // Start animation in case of download during attachment preparing
-                        [roomBubbleTableViewCell startProgressUI];
-                    }
+                    [self cancelEventSelection];
                     
+                    [self startActivityIndicator];
+                    
+                    MXWeakify(self);
+                    [attachment prepareShare:^(NSURL *fileURL) {
+                        MXStrongifyAndReturnIfNil(self);
+                        
+                        [self stopActivityIndicator];
+                        
+                        self->documentInteractionController = [UIDocumentInteractionController interactionControllerWithURL:fileURL];
+                        [self->documentInteractionController setDelegate:self];
+                        self->currentSharedAttachment = attachment;
+                        
+                        if (![self->documentInteractionController presentOptionsMenuFromRect:self.view.frame inView:self.view animated:YES])
+                        {
+                            self->documentInteractionController = nil;
+                            [attachment onShareEnded];
+                            self->currentSharedAttachment = nil;
+                        }
+                        
+                    } failure:^(NSError *error) {
+                        [self showError:error];
+                        [self stopActivityIndicator];
+                    }];
+                    
+                    // Start animation in case of download during attachment preparing
+                    [roomBubbleTableViewCell startProgressUI];
                 }]];
             }
         }
@@ -3453,26 +3436,21 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
             NSString *downloadId = roomBubbleTableViewCell.bubbleData.attachment.downloadId;
             if ([MXMediaManager existingDownloaderWithIdentifier:downloadId])
             {
-                [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionCancelDownload]
-                                                                 style:UIAlertActionStyleDefault
-                                                               handler:^(UIAlertAction * action) {
+                [actionsMenu addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionCancelDownload]
+                                                                style:UIAlertActionStyleDefault
+                                                              handler:^(UIAlertAction * action) {
+                    MXStrongifyAndReturnIfNil(self);
                     
-                    if (weakSelf)
+                    [self cancelEventSelection];
+                    
+                    // Get again the loader
+                    MXMediaLoader *loader = [MXMediaManager existingDownloaderWithIdentifier:downloadId];
+                    if (loader)
                     {
-                        typeof(self) self = weakSelf;
-                        
-                        [self cancelEventSelection];
-                        
-                        // Get again the loader
-                        MXMediaLoader *loader = [MXMediaManager existingDownloaderWithIdentifier:downloadId];
-                        if (loader)
-                        {
-                            [loader cancel];
-                        }
-                        // Hide the progress animation
-                        roomBubbleTableViewCell.progressView.hidden = YES;
+                        [loader cancel];
                     }
-                    
+                    // Hide the progress animation
+                    roomBubbleTableViewCell.progressView.hidden = YES;
                 }]];
             }
         }
@@ -3481,72 +3459,92 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         // because it breaks everything
         if (selectedEvent.eventType != MXEventTypeRoomEncryption)
         {
-            [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionRedact]
-                                                             style:UIAlertActionStyleDefault
-                                                           handler:^(UIAlertAction * action) {
+            NSString *title;
+            if (selectedEvent.eventType == MXEventTypePollStart)
+            {
+                title = [VectorL10n roomEventActionRemovePoll];
+            }
+            else
+            {
+                title = [VectorL10n roomEventActionRedact];
+            }
+            
+            [actionsMenu addAction:[UIAlertAction actionWithTitle:title
+                                                            style:UIAlertActionStyleDefault
+                                                          handler:^(UIAlertAction * action) {
+                MXStrongifyAndReturnIfNil(self);
                 
-                if (weakSelf)
-                {
-                    typeof(self) self = weakSelf;
-                    
-                    [self cancelEventSelection];
-                    
-                    [self startActivityIndicator];
-                    
-                    [self.roomDataSource.room redactEvent:selectedEvent.eventId reason:nil success:^{
-                        
-                        __strong __typeof(weakSelf)self = weakSelf;
-                        [self stopActivityIndicator];
-                        
-                    } failure:^(NSError *error) {
-                        
-                        __strong __typeof(weakSelf)self = weakSelf;
-                        [self stopActivityIndicator];
-                        
-                        MXLogDebug(@"[RoomVC] Redact event (%@) failed", selectedEvent.eventId);
-                        //Alert user
-                        [self showError:error];
-                        
-                    }];
-                }
+                [self cancelEventSelection];
                 
+                [self startActivityIndicator];
+                
+                MXWeakify(self);
+                [self.roomDataSource.room redactEvent:selectedEvent.eventId reason:nil success:^{
+                    MXStrongifyAndReturnIfNil(self);
+                    [self stopActivityIndicator];
+                } failure:^(NSError *error) {
+                    MXStrongifyAndReturnIfNil(self);
+                    [self stopActivityIndicator];
+                    
+                    MXLogDebug(@"[RoomVC] Redact event (%@) failed", selectedEvent.eventId);
+                    //Alert user
+                    [self showError:error];
+                }];
             }]];
         }
         
+        if (selectedEvent.eventType == MXEventTypePollStart && [selectedEvent.sender isEqualToString:self.mainSession.myUser.userId]) {
+            if ([self.delegate roomViewController:self canEndPollWithEventIdentifier:selectedEvent.eventId]) {
+                [actionsMenu addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionEndPoll]
+                                                                style:UIAlertActionStyleDefault
+                                                              handler:^(UIAlertAction * action) {
+                    MXStrongifyAndReturnIfNil(self);
+                    
+                    [self.delegate roomViewController:self endPollWithEventIdentifier:selectedEvent.eventId];
+                    
+                    [self hideContextualMenuAnimated:YES];
+                }]];
+            }
+        }
+        
+        [actionsMenu addAction:[UIAlertAction actionWithTitle:[VectorL10n cancel]
+                                                        style:UIAlertActionStyleCancel
+                                                      handler:^(UIAlertAction * action) {
+            MXStrongifyAndReturnIfNil(self);
+            
+            [self hideContextualMenuAnimated:YES];
+        }]];
+        
         if (BuildSettings.messageDetailsAllowPermalink)
         {
-            [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionPermalink]
-                                                             style:UIAlertActionStyleDefault
-                                                           handler:^(UIAlertAction * action) {
+            [actionsMenu addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionPermalink]
+                                                            style:UIAlertActionStyleDefault
+                                                          handler:^(UIAlertAction * action) {
+                MXStrongifyAndReturnIfNil(self);
                 
-                if (weakSelf)
+                [self cancelEventSelection];
+                
+                // Create a matrix.to permalink that is common to all matrix clients
+                NSString *permalink = [MXTools permalinkToEvent:selectedEvent.eventId inRoom:selectedEvent.roomId];
+                
+                if (permalink)
                 {
-                    typeof(self) self = weakSelf;
-                    
-                    [self cancelEventSelection];
-                    
-                    // Create a matrix.to permalink that is common to all matrix clients
-                    NSString *permalink = [MXTools permalinkToEvent:selectedEvent.eventId inRoom:selectedEvent.roomId];
-                    
-                    if (permalink)
-                    {
-                        MXKPasteboardManager.shared.pasteboard.string = permalink;
-                    }
-                    else
-                    {
-                        MXLogDebug(@"[RoomViewController] Contextual menu permalink action failed. Permalink is nil room id/event id: %@/%@", selectedEvent.roomId, selectedEvent.eventId);
-                    }
+                    MXKPasteboardManager.shared.pasteboard.string = permalink;
+                }
+                else
+                {
+                    MXLogDebug(@"[RoomViewController] Contextual menu permalink action failed. Permalink is nil room id/event id: %@/%@", selectedEvent.roomId, selectedEvent.eventId);
                 }
-                
             }]];
         }
         
         // Add reaction history if event contains reactions
         if (roomBubbleTableViewCell.bubbleData.reactions[selectedEvent.eventId].aggregatedReactionsWithNonZeroCount)
         {
-            [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionReactionHistory]
-                                                             style:UIAlertActionStyleDefault
-                                                           handler:^(UIAlertAction * action) {
+            [actionsMenu addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionReactionHistory]
+                                                            style:UIAlertActionStyleDefault
+                                                          handler:^(UIAlertAction * action) {
+                MXStrongifyAndReturnIfNil(self);
                 
                 [self cancelEventSelection];
                 
@@ -3557,203 +3555,176 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         
         if (BuildSettings.messageDetailsAllowViewSource)
         {
-            [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionViewSource]
-                                                             style:UIAlertActionStyleDefault
-                                                           handler:^(UIAlertAction * action) {
+            [actionsMenu addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionViewSource]
+                                                            style:UIAlertActionStyleDefault
+                                                          handler:^(UIAlertAction * action) {
+                MXStrongifyAndReturnIfNil(self);
                 
-                if (weakSelf)
-                {
-                    typeof(self) self = weakSelf;
-                    
-                    [self cancelEventSelection];
-                    
-                    // Display event details
-                    [self showEventDetails:selectedEvent];
-                }
+                [self cancelEventSelection];
                 
+                // Display event details
+                [self showEventDetails:selectedEvent];
             }]];
             
             
             // Add "View Decrypted Source" for e2ee event we can decrypt
             if (selectedEvent.isEncrypted && selectedEvent.clearEvent)
             {
-                [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionViewDecryptedSource]
-                                                                 style:UIAlertActionStyleDefault
-                                                               handler:^(UIAlertAction * action) {
+                [actionsMenu addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionViewDecryptedSource]
+                                                                style:UIAlertActionStyleDefault
+                                                              handler:^(UIAlertAction * action) {
+                    MXStrongifyAndReturnIfNil(self);
                     
-                    if (weakSelf)
-                    {
-                        typeof(self) self = weakSelf;
-                        
-                        [self cancelEventSelection];
-                        
-                        // Display clear event details
-                        [self showEventDetails:selectedEvent.clearEvent];
-                    }
+                    [self cancelEventSelection];
                     
+                    // Display clear event details
+                    [self showEventDetails:selectedEvent.clearEvent];
                 }]];
             }
         }
         
         if (![selectedEvent.sender isEqualToString:self.mainSession.myUser.userId] && RiotSettings.shared.roomContextualMenuShowReportContentOption)
         {
-            [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionReport]
-                                                             style:UIAlertActionStyleDefault
-                                                           handler:^(UIAlertAction * action) {
+            [actionsMenu addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionReport]
+                                                            style:UIAlertActionStyleDefault
+                                                          handler:^(UIAlertAction * action) {
+                MXStrongifyAndReturnIfNil(self);
                 
-                if (weakSelf)
-                {
-                    typeof(self) self = weakSelf;
+                [self cancelEventSelection];
+                
+                // Prompt user to enter a description of the problem content.
+                UIAlertController *reportReasonAlert = [UIAlertController alertControllerWithTitle:[VectorL10n roomEventActionReportPromptReason]
+                                                                                           message:nil
+                                                                                    preferredStyle:UIAlertControllerStyleAlert];
+                
+                [reportReasonAlert addTextFieldWithConfigurationHandler:^(UITextField *textField) {
+                    textField.secureTextEntry = NO;
+                    textField.placeholder = nil;
+                    textField.keyboardType = UIKeyboardTypeDefault;
+                }];
+                
+                MXWeakify(self);
+                [reportReasonAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+                    MXStrongifyAndReturnIfNil(self);
                     
-                    [self cancelEventSelection];
+                    NSString *text = [self->currentAlert textFields].firstObject.text;
+                    self->currentAlert = nil;
                     
-                    // Prompt user to enter a description of the problem content.
-                    self->currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n roomEventActionReportPromptReason]  message:nil preferredStyle:UIAlertControllerStyleAlert];
+                    [self startActivityIndicator];
                     
-                    [self->currentAlert addTextFieldWithConfigurationHandler:^(UITextField *textField) {
-                        textField.secureTextEntry = NO;
-                        textField.placeholder = nil;
-                        textField.keyboardType = UIKeyboardTypeDefault;
-                    }];
-                    
-                    [self->currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+                    MXWeakify(self);
+                    [self.roomDataSource.room reportEvent:selectedEvent.eventId score:-100 reason:text success:^{
+                        MXStrongifyAndReturnIfNil(self);
                         
-                        if (weakSelf)
-                        {
-                            typeof(self) self = weakSelf;
-                            NSString *text = [self->currentAlert textFields].firstObject.text;
+                        [self stopActivityIndicator];
+                        
+                        // Prompt user to ignore content from this user
+                        UIAlertController *ignoreUserAlert = [UIAlertController alertControllerWithTitle:[VectorL10n roomEventActionReportPromptIgnoreUser]
+                                                                                                 message:nil
+                                                                                          preferredStyle:UIAlertControllerStyleAlert];
+                        
+                        MXWeakify(self);
+                        [ignoreUserAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n yes] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+                            
+                            MXStrongifyAndReturnIfNil(self);
                             self->currentAlert = nil;
                             
                             [self startActivityIndicator];
                             
-                            [self.roomDataSource.room reportEvent:selectedEvent.eventId score:-100 reason:text success:^{
-                                
-                                __strong __typeof(weakSelf)self = weakSelf;
+                            MXWeakify(self);
+                            // Add the user to the blacklist: ignored users
+                            [self.mainSession ignoreUsers:@[selectedEvent.sender] success:^{
+                                MXStrongifyAndReturnIfNil(self);
                                 [self stopActivityIndicator];
-                                
-                                // Prompt user to ignore content from this user
-                                self->currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n roomEventActionReportPromptIgnoreUser]  message:nil preferredStyle:UIAlertControllerStyleAlert];
-                                
-                                [self->currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n yes] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
-                                    
-                                    if (weakSelf)
-                                    {
-                                        typeof(self) self = weakSelf;
-                                        self->currentAlert = nil;
-                                        
-                                        [self startActivityIndicator];
-                                        
-                                        // Add the user to the blacklist: ignored users
-                                        [self.mainSession ignoreUsers:@[selectedEvent.sender] success:^{
-                                            
-                                            __strong __typeof(weakSelf)self = weakSelf;
-                                            [self stopActivityIndicator];
-                                            
-                                        } failure:^(NSError *error) {
-                                            
-                                            __strong __typeof(weakSelf)self = weakSelf;
-                                            [self stopActivityIndicator];
-                                            
-                                            MXLogDebug(@"[RoomVC] Ignore user (%@) failed", selectedEvent.sender);
-                                            //Alert user
-                                            [self showError:error];
-                                            
-                                        }];
-                                    }
-                                    
-                                }]];
-                                
-                                [self->currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n no] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
-                                    
-                                    if (weakSelf)
-                                    {
-                                        typeof(self) self = weakSelf;
-                                        self->currentAlert = nil;
-                                    }
-                                    
-                                }]];
-                                
-                                [self presentViewController:self->currentAlert animated:YES completion:nil];
-                                
                             } failure:^(NSError *error) {
-                                
-                                __strong __typeof(weakSelf)self = weakSelf;
+                                MXStrongifyAndReturnIfNil(self);
                                 [self stopActivityIndicator];
                                 
-                                MXLogDebug(@"[RoomVC] Report event (%@) failed", selectedEvent.eventId);
+                                MXLogDebug(@"[RoomVC] Ignore user (%@) failed", selectedEvent.sender);
                                 //Alert user
                                 [self showError:error];
-                                
                             }];
-                        }
+                        }]];
                         
-                    }]];
-                    
-                    [self->currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel] style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) {
-                        
-                        if (weakSelf)
-                        {
-                            typeof(self) self = weakSelf;
+                        [ignoreUserAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n no] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+                            MXStrongifyAndReturnIfNil(self);
                             self->currentAlert = nil;
-                        }
+                        }]];
                         
-                    }]];
-                    
-                    [self presentViewController:self->currentAlert animated:YES completion:nil];
-                }
+                        [self presentViewController:ignoreUserAlert animated:YES completion:nil];
+                        self->currentAlert = ignoreUserAlert;
+                        
+                    } failure:^(NSError *error) {
+                        MXStrongifyAndReturnIfNil(self);
+                        [self stopActivityIndicator];
+                        
+                        MXLogDebug(@"[RoomVC] Report event (%@) failed", selectedEvent.eventId);
+                        //Alert user
+                        [self showError:error];
+                        
+                    }];
+                }]];
                 
+                [reportReasonAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel] style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) {
+                    MXStrongifyAndReturnIfNil(self);
+                    self->currentAlert = nil;
+                }]];
+                
+                [self presentViewController:reportReasonAlert animated:YES completion:nil];
+                self->currentAlert = reportReasonAlert;
             }]];
         }
         
         if (!isJitsiCallEvent && self.roomDataSource.room.summary.isEncrypted)
         {
-            [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionViewEncryption]
-                                                             style:UIAlertActionStyleDefault
-                                                           handler:^(UIAlertAction * action) {
+            [actionsMenu addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionViewEncryption]
+                                                            style:UIAlertActionStyleDefault
+                                                          handler:^(UIAlertAction * action) {
+                MXStrongifyAndReturnIfNil(self);
                 
-                if (weakSelf)
-                {
-                    typeof(self) self = weakSelf;
-                    [self cancelEventSelection];
-                    
-                    // Display encryption details
-                    [self showEncryptionInformation:selectedEvent];
-                }
+                [self cancelEventSelection];
                 
+                // Display encryption details
+                [self showEncryptionInformation:selectedEvent];
             }]];
         }
+        
     }
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n cancel]
-                                                     style:UIAlertActionStyleCancel
-                                                   handler:^(UIAlertAction * action) {
-        
-        if (weakSelf)
-        {
-            typeof(self) self = weakSelf;
-            [self hideContextualMenuAnimated:YES];
-        }
-        
-    }]];
-    
     // Do not display empty action sheet
-    if (currentAlert.actions.count > 1)
+    if (actionsMenu.actions.count > 1)
     {
         NSInteger bubbleComponentIndex = [roomBubbleTableViewCell.bubbleData bubbleComponentIndexForEventId:selectedEvent.eventId];
         
         CGRect sourceRect = [roomBubbleTableViewCell componentFrameInContentViewForIndex:bubbleComponentIndex];
         
-        [currentAlert mxk_setAccessibilityIdentifier:@"RoomVCEventMenuAlert"];
-        [currentAlert popoverPresentationController].sourceView = roomBubbleTableViewCell;
-        [currentAlert popoverPresentationController].sourceRect = sourceRect;
-        [self presentViewController:currentAlert animated:animated completion:nil];
-    }
-    else
-    {
-        currentAlert = nil;
+        [actionsMenu mxk_setAccessibilityIdentifier:@"RoomVCEventMenuAlert"];
+        [actionsMenu popoverPresentationController].sourceView = roomBubbleTableViewCell;
+        [actionsMenu popoverPresentationController].sourceRect = sourceRect;
+        [self presentViewController:actionsMenu animated:animated completion:nil];
+        currentAlert = actionsMenu;
     }
 }
 
+- (void)presentEventForwardingDialogForSelectedEvent:(MXEvent *)selectedEvent
+{
+    ForwardingShareItemSender *shareItemSender = [[ForwardingShareItemSender alloc] initWithEvent:selectedEvent];
+    self.shareManager = [[ShareManager alloc] initWithShareItemSender:shareItemSender
+                                                                 type:ShareManagerTypeForward];
+    
+    MXWeakify(self);
+    [self.shareManager setCompletionCallback:^(ShareManagerResult result) {
+        MXStrongifyAndReturnIfNil(self);
+        if ([self.presentedViewController isEqual:self.shareManager.mainViewController])
+        {
+            [self dismissViewControllerAnimated:YES completion:nil];
+        }
+        self.shareManager = nil;
+    }];
+    
+    [self presentViewController:self.shareManager.mainViewController animated:YES completion:nil];
+}
+
 - (BOOL)dataSource:(MXKDataSource *)dataSource shouldDoAction:(NSString *)actionIdentifier inCell:(id<MXKCellRendering>)cell userInfo:(NSDictionary *)userInfo defaultValue:(BOOL)defaultValue
 {
     BOOL shouldDoAction = defaultValue;
@@ -4123,14 +4094,14 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
 - (void)showVoiceCallActionSheet
 {
     // Ask the user the kind of the call: voice or dialpad?
-    currentAlert = [UIAlertController alertControllerWithTitle:nil
-                                                       message:nil
-                                                preferredStyle:UIAlertControllerStyleActionSheet];
+    UIAlertController *callActionSheet = [UIAlertController alertControllerWithTitle:nil
+                                                                             message:nil
+                                                                      preferredStyle:UIAlertControllerStyleActionSheet];
     
     __weak typeof(self) weakSelf = self;
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomPlaceVoiceCall]
-                                                     style:UIAlertActionStyleDefault
-                                                   handler:^(UIAlertAction * action) {
+    [callActionSheet addAction:[UIAlertAction actionWithTitle:[VectorL10n roomPlaceVoiceCall]
+                                                        style:UIAlertActionStyleDefault
+                                                      handler:^(UIAlertAction * action) {
         
         if (weakSelf)
         {
@@ -4142,9 +4113,9 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         
     }]];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomOpenDialpad]
-                                                     style:UIAlertActionStyleDefault
-                                                   handler:^(UIAlertAction * action) {
+    [callActionSheet addAction:[UIAlertAction actionWithTitle:[VectorL10n roomOpenDialpad]
+                                                        style:UIAlertActionStyleDefault
+                                                      handler:^(UIAlertAction * action) {
         
         if (weakSelf)
         {
@@ -4156,9 +4127,9 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         
     }]];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
-                                                     style:UIAlertActionStyleCancel
-                                                   handler:^(UIAlertAction * action) {
+    [callActionSheet addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+                                                        style:UIAlertActionStyleCancel
+                                                      handler:^(UIAlertAction * action) {
         
         if (weakSelf)
         {
@@ -4168,9 +4139,10 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         
     }]];
     
-    [currentAlert popoverPresentationController].barButtonItem = self.navigationItem.rightBarButtonItems.firstObject;
-    [currentAlert popoverPresentationController].permittedArrowDirections = UIPopoverArrowDirectionUp;
-    [self presentViewController:currentAlert animated:YES completion:nil];
+    [callActionSheet popoverPresentationController].barButtonItem = self.navigationItem.rightBarButtonItems.firstObject;
+    [callActionSheet popoverPresentationController].permittedArrowDirections = UIPopoverArrowDirectionUp;
+    [self presentViewController:callActionSheet animated:YES completion:nil];
+    currentAlert = callActionSheet;
 }
 
 - (void)placeCallWithVideo2:(BOOL)video
@@ -4222,20 +4194,21 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
                 MXWeakify(self);
                 [currentAlert dismissViewControllerAnimated:NO completion:nil];
                 
-                currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n roomNoPrivilegesToCreateGroupCall]
-                                                                   message:nil
-                                                            preferredStyle:UIAlertControllerStyleAlert];
+                UIAlertController *unprivilegedAlert = [UIAlertController alertControllerWithTitle:[VectorL10n roomNoPrivilegesToCreateGroupCall]
+                                                                                           message:nil
+                                                                                    preferredStyle:UIAlertControllerStyleAlert];
                 
-                [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
-                                                                 style:UIAlertActionStyleDefault
-                                                               handler:^(UIAlertAction * action)
+                [unprivilegedAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
+                                                                      style:UIAlertActionStyleDefault
+                                                                    handler:^(UIAlertAction * action)
                                          {
                     MXStrongifyAndReturnIfNil(self);
                     self->currentAlert = nil;
                 }]];
                 
-                [currentAlert mxk_setAccessibilityIdentifier:@"RoomVCCallAlert"];
-                [self presentViewController:currentAlert animated:YES completion:nil];
+                [unprivilegedAlert mxk_setAccessibilityIdentifier:@"RoomVCCallAlert"];
+                [self presentViewController:unprivilegedAlert animated:YES completion:nil];
+                currentAlert = unprivilegedAlert;
             }
         }
     }
@@ -5163,6 +5136,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
             [VectorL10n roomUnsentMessagesUnknownDevicesNotification] :
             [VectorL10n roomUnsentMessagesNotification];
             
+            MXWeakify(self);
             RoomActivitiesView *roomActivitiesView = (RoomActivitiesView*) self.activitiesView;
             self.activitiesViewExpanded = YES;
             [roomActivitiesView displayUnsentMessagesNotification:notification withResendLink:^{
@@ -5174,57 +5148,53 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
                 [self cancelAllUnsentMessages];
                 
             } andIconTapGesture:^{
+                MXStrongifyAndReturnIfNil(self);
                 
-                if (currentAlert)
+                if (self->currentAlert)
                 {
-                    [currentAlert dismissViewControllerAnimated:NO completion:nil];
+                    [self->currentAlert dismissViewControllerAnimated:NO completion:nil];
                 }
                 
-                __weak __typeof(self) weakSelf = self;
-                currentAlert = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+                MXWeakify(self);
+                UIAlertController *resendAlert = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
                 
-                [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomResendUnsentMessages]
-                                                                 style:UIAlertActionStyleDefault
-                                                               handler:^(UIAlertAction * action) {
+                [resendAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomResendUnsentMessages]
+                                                                style:UIAlertActionStyleDefault
+                                                              handler:^(UIAlertAction * action) {
                     
-                    if (weakSelf)
-                    {
-                        typeof(self) self = weakSelf;
-                        [self resendAllUnsentMessages];
-                        self->currentAlert = nil;
-                    }
+                    MXStrongifyAndReturnIfNil(self);
+                    
+                    [self resendAllUnsentMessages];
+                    self->currentAlert = nil;
                     
                 }]];
                 
-                [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomDeleteUnsentMessages]
-                                                                 style:UIAlertActionStyleDefault
-                                                               handler:^(UIAlertAction * action) {
+                [resendAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomDeleteUnsentMessages]
+                                                                style:UIAlertActionStyleDefault
+                                                              handler:^(UIAlertAction * action) {
                     
-                    if (weakSelf)
-                    {
-                        typeof(self) self = weakSelf;
-                        [self cancelAllUnsentMessages];
-                        self->currentAlert = nil;
-                    }
+                    MXStrongifyAndReturnIfNil(self);
+                    
+                    [self cancelAllUnsentMessages];
+                    self->currentAlert = nil;
                     
                 }]];
                 
-                [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n cancel]
-                                                                 style:UIAlertActionStyleCancel
-                                                               handler:^(UIAlertAction * action) {
+                [resendAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n cancel]
+                                                                style:UIAlertActionStyleCancel
+                                                              handler:^(UIAlertAction * action) {
                     
-                    if (weakSelf)
-                    {
-                        typeof(self) self = weakSelf;
-                        self->currentAlert = nil;
-                    }
+                    MXStrongifyAndReturnIfNil(self);
+                    
+                    self->currentAlert = nil;
                     
                 }]];
                 
-                [currentAlert mxk_setAccessibilityIdentifier:@"RoomVCUnsentMessagesMenuAlert"];
-                [currentAlert popoverPresentationController].sourceView = roomActivitiesView;
-                [currentAlert popoverPresentationController].sourceRect = roomActivitiesView.bounds;
-                [self presentViewController:currentAlert animated:YES completion:nil];
+                [resendAlert mxk_setAccessibilityIdentifier:@"RoomVCUnsentMessagesMenuAlert"];
+                [resendAlert popoverPresentationController].sourceView = roomActivitiesView;
+                [resendAlert popoverPresentationController].sourceRect = roomActivitiesView.bounds;
+                [self presentViewController:resendAlert animated:YES completion:nil];
+                self->currentAlert = resendAlert;
                 
             }];
         }
@@ -5264,13 +5234,13 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
             }
         }
         
-        currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n unknownDevicesAlertTitle]
-                                                           message:[VectorL10n unknownDevicesAlert]
-                                                    preferredStyle:UIAlertControllerStyleAlert];
+        UIAlertController *unknownDevicesAlert = [UIAlertController alertControllerWithTitle:[VectorL10n unknownDevicesAlertTitle]
+                                                                                     message:[VectorL10n unknownDevicesAlert]
+                                                                              preferredStyle:UIAlertControllerStyleAlert];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n unknownDevicesVerify]
-                                                         style:UIAlertActionStyleDefault
-                                                       handler:^(UIAlertAction * action) {
+        [unknownDevicesAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n unknownDevicesVerify]
+                                                                style:UIAlertActionStyleDefault
+                                                              handler:^(UIAlertAction * action) {
             
             if (weakSelf)
             {
@@ -5282,9 +5252,9 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
             
         }]];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n unknownDevicesSendAnyway]
-                                                         style:UIAlertActionStyleDefault
-                                                       handler:^(UIAlertAction * action) {
+        [unknownDevicesAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n unknownDevicesSendAnyway]
+                                                                style:UIAlertActionStyleDefault
+                                                              handler:^(UIAlertAction * action) {
             
             if (weakSelf)
             {
@@ -5305,8 +5275,9 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
             
         }]];
         
-        [currentAlert mxk_setAccessibilityIdentifier:@"RoomVCUnknownDevicesAlert"];
-        [self presentViewController:currentAlert animated:YES completion:nil];
+        [unknownDevicesAlert mxk_setAccessibilityIdentifier:@"RoomVCUnknownDevicesAlert"];
+        [self presentViewController:unknownDevicesAlert animated:YES completion:nil];
+        currentAlert = unknownDevicesAlert;
     }
 }
 
@@ -5368,15 +5339,17 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
 
 - (void)cancelAllUnsentMessages
 {
-    currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n roomUnsentMessagesCancelTitle] message:[VectorL10n roomUnsentMessagesCancelMessage] preferredStyle:UIAlertControllerStyleAlert];
+    UIAlertController *cancelAlert = [UIAlertController alertControllerWithTitle:[VectorL10n roomUnsentMessagesCancelTitle]
+                                                                         message:[VectorL10n roomUnsentMessagesCancelMessage]
+                                                                  preferredStyle:UIAlertControllerStyleAlert];
     
     MXWeakify(self);
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel] style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) {
+    [cancelAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel] style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) {
         MXStrongifyAndReturnIfNil(self);
         self->currentAlert = nil;
     }]];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n delete] style:UIAlertActionStyleDestructive handler:^(UIAlertAction * action) {
+    [cancelAlert 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;)
@@ -5393,9 +5366,11 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         }
         
         [self refreshActivitiesViewDisplay];
+        self->currentAlert = nil;
     }]];
     
-    [self presentViewController:currentAlert animated:YES completion:nil];
+    [self presentViewController:cancelAlert animated:YES completion:nil];
+    currentAlert = cancelAlert;
 }
 
 # pragma mark - Encryption Information view
@@ -5624,11 +5599,11 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
     
     // Invite ?
     NSString *promptMsg = [VectorL10n roomParticipantsInvitePromptMsg:contact.displayName];
-    currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n roomParticipantsInvitePromptTitle]
-                                                       message:promptMsg
-                                                preferredStyle:UIAlertControllerStyleAlert];
+    UIAlertController *invitePrompt = [UIAlertController alertControllerWithTitle:[VectorL10n roomParticipantsInvitePromptTitle]
+                                                                         message:promptMsg
+                                                                  preferredStyle:UIAlertControllerStyleAlert];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+    [invitePrompt addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                      style:UIAlertActionStyleCancel
                                                    handler:^(UIAlertAction * action) {
         
@@ -5640,7 +5615,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         
     }]];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n invite]
+    [invitePrompt addAction:[UIAlertAction actionWithTitle:[VectorL10n invite]
                                                      style:UIAlertActionStyleDefault
                                                    handler:^(UIAlertAction * action) {
         
@@ -5735,8 +5710,9 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         
     }]];
     
-    [currentAlert mxk_setAccessibilityIdentifier:@"RoomVCInviteAlert"];
-    [self presentViewController:currentAlert animated:YES completion:nil];
+    [invitePrompt mxk_setAccessibilityIdentifier:@"RoomVCInviteAlert"];
+    [self presentViewController:invitePrompt animated:YES completion:nil];
+    currentAlert = invitePrompt;
 }
 
 #pragma mark - Re-request encryption keys
@@ -5780,8 +5756,6 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
     alert = [UIAlertController alertControllerWithTitle:VectorL10n.rerequestKeysAlertTitle
                                                 message:[VectorL10n e2eRoomKeyRequestMessage:AppInfo.current.displayName]
                                          preferredStyle:UIAlertControllerStyleAlert];
-    currentAlert = alert;
-    
     
     [alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                               style:UIAlertActionStyleDefault
@@ -5795,7 +5769,8 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         self->currentAlert = nil;
     }]];
     
-    [self presentViewController:currentAlert animated:YES completion:nil];
+    [self presentViewController:alert animated:YES completion:nil];
+    currentAlert = alert;
 }
 
 - (void)presentReviewUnverifiedSessionsAlert
@@ -6069,18 +6044,19 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         [self hideContextualMenuAnimated:YES cancelEventSelection:YES completion:^{
             MXStrongifyAndReturnIfNil(self);
             
-            self->currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n roomEventActionDeleteConfirmationTitle]
-                                                                     message:[VectorL10n roomEventActionDeleteConfirmationMessage]
-                                                              preferredStyle:UIAlertControllerStyleAlert];
+            UIAlertController *deleteConfirmation = [UIAlertController alertControllerWithTitle:[VectorL10n roomEventActionDeleteConfirmationTitle]
+                                                                                        message:[VectorL10n roomEventActionDeleteConfirmationMessage]
+                                                                                 preferredStyle:UIAlertControllerStyleAlert];
             
-            [self->currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+            [deleteConfirmation addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
             }]];
             
-            [self->currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n delete] style:UIAlertActionStyleDestructive handler:^(UIAlertAction * action) {
+            [deleteConfirmation addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n delete] style:UIAlertActionStyleDestructive handler:^(UIAlertAction * action) {
                 [self.roomDataSource removeEventWithEventId:event.eventId];
             }]];
             
-            [self presentViewController:self->currentAlert animated:YES completion:nil];
+            [self presentViewController:deleteConfirmation animated:YES completion:nil];
+            self->currentAlert = deleteConfirmation;
         }];
     };
     
@@ -6113,7 +6089,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
     
     MXWeakify(self);
     
-    BOOL isCopyActionEnabled = !attachment || attachment.type != MXKAttachmentTypeSticker;
+    BOOL isCopyActionEnabled = (event.eventType != MXEventTypePollStart && (!attachment || attachment.type != MXKAttachmentTypeSticker));
     
     if (attachment && !BuildSettings.messageDetailsAllowCopyMedia)
     {
diff --git a/Riot/Modules/Room/Search/DataSources/RoomSearchDataSource.h b/Riot/Modules/Room/Search/DataSources/RoomSearchDataSource.h
index 4b1b9a6be..341226ef2 100644
--- a/Riot/Modules/Room/Search/DataSources/RoomSearchDataSource.h
+++ b/Riot/Modules/Room/Search/DataSources/RoomSearchDataSource.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `RoomSearchDataSource` overrides `MXKSearchDataSource` to render search results
diff --git a/Riot/Modules/Room/Search/DataSources/RoomSearchDataSource.m b/Riot/Modules/Room/Search/DataSources/RoomSearchDataSource.m
index 3ff3145d6..f35ac5c7f 100644
--- a/Riot/Modules/Room/Search/DataSources/RoomSearchDataSource.m
+++ b/Riot/Modules/Room/Search/DataSources/RoomSearchDataSource.m
@@ -20,7 +20,7 @@
 #import "RoomBubbleCellData.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "MXKRoomBubbleTableViewCell+Riot.h"
 
diff --git a/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.h b/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.h
index 3e2061098..a01848797 100644
--- a/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.h
+++ b/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @interface RoomFilesSearchViewController : MXKSearchViewController
 
diff --git a/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.m b/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.m
index 78a7bfbf9..c063cc7b9 100644
--- a/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.m
+++ b/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.m
@@ -24,7 +24,7 @@
 #import "FilesSearchCellData.h"
 #import "FilesSearchTableViewCell.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface RoomFilesSearchViewController ()
 {
@@ -109,9 +109,6 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"RoomFilesSearch"];
     
     // Observe kAppDelegateDidTapStatusBarNotificationObserver.
     kAppDelegateDidTapStatusBarNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kAppDelegateDidTapStatusBarNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
diff --git a/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.h b/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.h
index bff2f4439..b8d0d6d51 100644
--- a/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.h
+++ b/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.h
@@ -14,7 +14,9 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import <MatrixSDK/MatrixSDK.h>
+
+#import "MatrixKit.h"
 
 @interface RoomMessagesSearchViewController : MXKSearchViewController
 
diff --git a/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.m b/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.m
index a674af70d..6848a1665 100644
--- a/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.m
+++ b/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.m
@@ -26,7 +26,7 @@
 #import "RoomIncomingAttachmentBubbleCell.h"
 #import "RoomIncomingTextMsgBubbleCell.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface RoomMessagesSearchViewController ()
 {
@@ -111,9 +111,6 @@
 {
     [super viewWillAppear:animated];
 
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"RoomMessagesSearch"];
-
     // Observe kAppDelegateDidTapStatusBarNotificationObserver.
     kAppDelegateDidTapStatusBarNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kAppDelegateDidTapStatusBarNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
         
diff --git a/Riot/Modules/Room/Search/RoomSearchViewController.h b/Riot/Modules/Room/Search/RoomSearchViewController.h
index 14c1460b5..7d72226b5 100644
--- a/Riot/Modules/Room/Search/RoomSearchViewController.h
+++ b/Riot/Modules/Room/Search/RoomSearchViewController.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 #import "SegmentedViewController.h"
 
diff --git a/Riot/Modules/Room/Search/RoomSearchViewController.m b/Riot/Modules/Room/Search/RoomSearchViewController.m
index 08374baea..e6f576fe8 100644
--- a/Riot/Modules/Room/Search/RoomSearchViewController.m
+++ b/Riot/Modules/Room/Search/RoomSearchViewController.m
@@ -22,7 +22,7 @@
 #import "RoomFilesSearchViewController.h"
 #import "FilesSearchCellData.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface RoomSearchViewController ()
 {
@@ -33,6 +33,8 @@
     MXKSearchDataSource *filesSearchDataSource;
 }
 
+@property (nonatomic) AnalyticsScreenTimer *screenTimer;
+
 @end
 
 @implementation RoomSearchViewController
@@ -49,6 +51,8 @@
     [super finalizeInit];
     
     // The navigation bar tint color and the rageShake Manager are handled by super (see SegmentedViewController).
+    
+    self.screenTimer = [[AnalyticsScreenTimer alloc] initWithScreen:AnalyticsScreenRoomSearch];
 }
 
 - (void)viewDidLoad
@@ -106,9 +110,6 @@
         [self.activityIndicator stopAnimating];
         self.activityIndicator = nil;
     }
-
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"RoomsSearch"];
     
     // Enable the search field by default at the screen opening
     if (self.searchBarHidden)
@@ -124,6 +125,8 @@
     // Refresh the search results.
     // Note: We wait for 'viewDidAppear' call to consider the actual view size during this update.
     [self updateSearch];
+    
+    [self.screenTimer start];
 }
 
 - (void)viewWillDisappear:(BOOL)animated
@@ -138,6 +141,12 @@
     [super viewWillDisappear:animated];
 }
 
+- (void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear:animated];
+    [self.screenTimer stop];
+}
+
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
     return ThemeService.shared.theme.statusBarStyle;
diff --git a/Riot/Modules/Room/Settings/RoomSettingsViewController.h b/Riot/Modules/Room/Settings/RoomSettingsViewController.h
index 950f9c6d7..1882a38cb 100644
--- a/Riot/Modules/Room/Settings/RoomSettingsViewController.h
+++ b/Riot/Modules/Room/Settings/RoomSettingsViewController.h
@@ -14,11 +14,13 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 #import "MediaPickerViewController.h"
 #import "TableViewCellWithCheckBoxes.h"
 
+@class AnalyticsScreenTimer;
+
 /**
  List the settings fields. Used to preselect/edit a field
  */
@@ -52,5 +54,10 @@ typedef enum : NSUInteger {
  */
 @property (nonatomic) RoomSettingsViewControllerField selectedRoomSettingsField;
 
+/**
+ The screen timer used for analytics if they've been enabled. The default value is nil.
+ */
+@property (nonatomic) AnalyticsScreenTimer *screenTimer;
+
 @end
 
diff --git a/Riot/Modules/Room/Settings/RoomSettingsViewController.m b/Riot/Modules/Room/Settings/RoomSettingsViewController.m
index bf1e96655..47c14e013 100644
--- a/Riot/Modules/Room/Settings/RoomSettingsViewController.m
+++ b/Riot/Modules/Room/Settings/RoomSettingsViewController.m
@@ -28,7 +28,7 @@
 #import "MXRoom+Riot.h"
 #import "MXRoomSummary+Riot.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "RoomMemberDetailsViewController.h"
 
@@ -311,9 +311,6 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"RoomSettings"];
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didUpdateRules:) name:kMXNotificationCenterDidUpdateRules object:nil];
     
@@ -334,6 +331,8 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
     {
         self.selectedRoomSettingsField = _selectedRoomSettingsField;
     }
+    
+    [self.screenTimer start];
 }
 
 - (void)viewWillDisappear:(BOOL)animated
@@ -351,6 +350,12 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
     }
 }
 
+- (void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear:animated];
+    [self.screenTimer stop];
+}
+
 // Those methods are called when the viewcontroller is added or removed from a container view controller.
 - (void)willMoveToParentViewController:(nullable UIViewController *)parent
 {
diff --git a/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxAndLabel.h b/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxAndLabel.h
index d22b79ff2..11d0c6f6a 100644
--- a/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxAndLabel.h
+++ b/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxAndLabel.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @interface TableViewCellWithCheckBoxAndLabel : MXKTableViewCell
 
diff --git a/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxAndLabel.m b/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxAndLabel.m
index 088f72b19..b623ffc7d 100644
--- a/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxAndLabel.m
+++ b/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxAndLabel.m
@@ -18,7 +18,7 @@
 #import "TableViewCellWithCheckBoxAndLabel.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @implementation TableViewCellWithCheckBoxAndLabel
 
diff --git a/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxes.h b/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxes.h
index 407c9bc6c..a3b690e9e 100644
--- a/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxes.h
+++ b/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxes.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @class TableViewCellWithCheckBoxes;
 
diff --git a/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxes.m b/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxes.m
index 0b588bbdc..9504214a1 100644
--- a/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxes.m
+++ b/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxes.m
@@ -17,7 +17,7 @@
 
 #import "TableViewCellWithCheckBoxes.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 // The space between 2 check boxes
 #define TABLEVIEWCELLWITHCHECKBOXES_MARGIN 8
diff --git a/Riot/Modules/Room/Settings/Views/TableViewCellWithLabelAndLargeTextView.h b/Riot/Modules/Room/Settings/Views/TableViewCellWithLabelAndLargeTextView.h
index d786b1881..a8a671c49 100644
--- a/Riot/Modules/Room/Settings/Views/TableViewCellWithLabelAndLargeTextView.h
+++ b/Riot/Modules/Room/Settings/Views/TableViewCellWithLabelAndLargeTextView.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @interface TableViewCellWithLabelAndLargeTextView : MXKTableViewCell <UITextViewDelegate>
 
diff --git a/Riot/Modules/Room/Settings/Views/TableViewCellWithLabelAndLargeTextView.m b/Riot/Modules/Room/Settings/Views/TableViewCellWithLabelAndLargeTextView.m
index deecdd99e..641aff31a 100644
--- a/Riot/Modules/Room/Settings/Views/TableViewCellWithLabelAndLargeTextView.m
+++ b/Riot/Modules/Room/Settings/Views/TableViewCellWithLabelAndLargeTextView.m
@@ -18,7 +18,7 @@
 #import "TableViewCellWithLabelAndLargeTextView.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @implementation TableViewCellWithLabelAndLargeTextView
 
diff --git a/Riot/Modules/Room/Views/Activities/RoomActivitiesView.h b/Riot/Modules/Room/Views/Activities/RoomActivitiesView.h
index b66c61a5f..c48a01d45 100644
--- a/Riot/Modules/Room/Views/Activities/RoomActivitiesView.h
+++ b/Riot/Modules/Room/Views/Activities/RoomActivitiesView.h
@@ -15,7 +15,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 
 /**
diff --git a/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m b/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m
index 6c272a6d9..cb15df862 100644
--- a/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m
+++ b/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m
@@ -19,7 +19,7 @@
 #import "RoomActivitiesView.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import <objc/runtime.h>
 
diff --git a/Riot/Modules/Room/Views/BubbleCells/BaseBubbleCell/BaseBubbleCell.swift b/Riot/Modules/Room/Views/BubbleCells/BaseBubbleCell/BaseBubbleCell.swift
index 51b47e9a3..6c0db2280 100644
--- a/Riot/Modules/Room/Views/BubbleCells/BaseBubbleCell/BaseBubbleCell.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/BaseBubbleCell/BaseBubbleCell.swift
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 import UIKit
-import MatrixKit
 
 @objc protocol BaseBubbleCellType: Themable {
     var bubbleCellContentView: BubbleCellContentView? { get }
diff --git a/Riot/Modules/Room/Views/BubbleCells/BaseBubbleCell/BubbleCellContentView.xib b/Riot/Modules/Room/Views/BubbleCells/BaseBubbleCell/BubbleCellContentView.xib
index 47244effb..56c26c56c 100644
--- a/Riot/Modules/Room/Views/BubbleCells/BaseBubbleCell/BubbleCellContentView.xib
+++ b/Riot/Modules/Room/Views/BubbleCells/BaseBubbleCell/BubbleCellContentView.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -17,7 +17,7 @@
                     <rect key="frame" x="0.0" y="0.0" width="595" height="97"/>
                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
-                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="5GX-gn-bK1">
+                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" translatesAutoresizingMaskIntoConstraints="NO" id="5GX-gn-bK1">
                     <rect key="frame" x="0.0" y="0.0" width="595" height="97"/>
                     <subviews>
                         <view hidden="YES" contentMode="scaleToFill" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="u1e-Q2-PhY">
@@ -74,11 +74,11 @@
                                     </constraints>
                                 </view>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ohU-Sc-mgb">
-                                    <rect key="frame" x="46" y="4" width="484" height="30"/>
+                                    <rect key="frame" x="46" y="4" width="534" height="30"/>
                                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 </view>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="User name:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="8" translatesAutoresizingMaskIntoConstraints="NO" id="meG-P8-61b">
-                                    <rect key="frame" x="56" y="10" width="474" height="18"/>
+                                    <rect key="frame" x="56" y="10" width="524" height="18"/>
                                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                     <accessibility key="accessibilityConfiguration" identifier="UserNameLabel"/>
                                     <constraints>
@@ -105,10 +105,10 @@
                             <rect key="frame" x="0.0" y="0.0" width="595" height="97"/>
                             <subviews>
                                 <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4d4-XQ-ido">
-                                    <rect key="frame" x="41" y="0.0" width="0.0" height="97"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="0.0" height="97"/>
                                     <subviews>
                                         <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uHE-o7-sCe">
-                                            <rect key="frame" x="0.0" y="0.0" width="16" height="97"/>
+                                            <rect key="frame" x="0.0" y="16" width="16" height="97"/>
                                             <subviews>
                                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="encryption_warning" translatesAutoresizingMaskIntoConstraints="NO" id="Ujc-3c-e5B">
                                                     <rect key="frame" x="0.0" y="3" width="16" height="16"/>
@@ -125,37 +125,35 @@
                                                 <constraint firstItem="Ujc-3c-e5B" firstAttribute="centerX" secondItem="uHE-o7-sCe" secondAttribute="centerX" id="z4k-EX-K17"/>
                                             </constraints>
                                         </view>
+                                        <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7Y6-Py-paB">
+                                            <rect key="frame" x="0.0" y="16" width="50" height="97"/>
+                                            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <accessibility key="accessibilityConfiguration" identifier="BubbleInfoContainer"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" constant="50" id="LtA-zk-OCc"/>
+                                            </constraints>
+                                        </view>
                                     </subviews>
                                     <constraints>
                                         <constraint firstItem="uHE-o7-sCe" firstAttribute="height" secondItem="4d4-XQ-ido" secondAttribute="height" id="DhB-EC-rCE"/>
+                                        <constraint firstItem="7Y6-Py-paB" firstAttribute="top" secondItem="4d4-XQ-ido" secondAttribute="top" constant="16" id="Wx9-0o-vzm"/>
                                     </constraints>
                                 </stackView>
                                 <view clipsSubviews="YES" contentMode="scaleAspectFit" translatesAutoresizingMaskIntoConstraints="NO" id="oeI-eO-mFK">
-                                    <rect key="frame" x="56" y="3" width="474" height="91"/>
+                                    <rect key="frame" x="56" y="3" width="524" height="91"/>
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 </view>
-                                <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7Y6-Py-paB">
-                                    <rect key="frame" x="530" y="3" width="50" height="91"/>
-                                    <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
-                                    <accessibility key="accessibilityConfiguration" identifier="BubbleInfoContainer"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="50" id="LtA-zk-OCc"/>
-                                    </constraints>
-                                </view>
                             </subviews>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
                                 <constraint firstItem="oeI-eO-mFK" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="vcq-cR-uBc" secondAttribute="leading" constant="56" id="0Fr-0L-9tU"/>
-                                <constraint firstItem="7Y6-Py-paB" firstAttribute="top" secondItem="vcq-cR-uBc" secondAttribute="top" constant="3" id="16j-F9-tL8"/>
                                 <constraint firstAttribute="bottom" secondItem="oeI-eO-mFK" secondAttribute="bottom" constant="3" id="8M5-uW-82s"/>
                                 <constraint firstItem="oeI-eO-mFK" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="4d4-XQ-ido" secondAttribute="trailing" constant="6" id="9By-U1-wTY"/>
-                                <constraint firstItem="7Y6-Py-paB" firstAttribute="leading" secondItem="oeI-eO-mFK" secondAttribute="trailing" id="9V6-A8-9i0"/>
+                                <constraint firstAttribute="trailing" secondItem="oeI-eO-mFK" secondAttribute="trailing" constant="15" id="Pbe-4d-q6Y"/>
                                 <constraint firstAttribute="bottom" secondItem="4d4-XQ-ido" secondAttribute="bottom" id="Tkw-p1-CYF"/>
-                                <constraint firstItem="4d4-XQ-ido" firstAttribute="leading" secondItem="vcq-cR-uBc" secondAttribute="leading" constant="41" id="cbh-iX-gKz"/>
+                                <constraint firstItem="4d4-XQ-ido" firstAttribute="leading" secondItem="vcq-cR-uBc" secondAttribute="leading" id="cbh-iX-gKz"/>
                                 <constraint firstItem="4d4-XQ-ido" firstAttribute="top" secondItem="vcq-cR-uBc" secondAttribute="top" id="hOM-gq-1au"/>
                                 <constraint firstAttribute="height" priority="250" id="lRu-Kd-3JZ"/>
-                                <constraint firstAttribute="bottom" secondItem="7Y6-Py-paB" secondAttribute="bottom" constant="3" id="lee-yN-381"/>
-                                <constraint firstAttribute="trailing" secondItem="7Y6-Py-paB" secondAttribute="trailing" constant="15" id="rG0-0L-I4O"/>
                                 <constraint firstItem="oeI-eO-mFK" firstAttribute="top" secondItem="vcq-cR-uBc" secondAttribute="top" constant="3" id="uZZ-I6-Xtq"/>
                                 <constraint firstItem="oeI-eO-mFK" firstAttribute="leading" secondItem="vcq-cR-uBc" secondAttribute="leading" priority="750" id="vsh-pW-S46"/>
                             </constraints>
@@ -227,7 +225,7 @@
             <connections>
                 <outlet property="avatarImageView" destination="yXz-Za-4yR" id="f56-93-gxa"/>
                 <outlet property="bubbleInfoContainer" destination="7Y6-Py-paB" id="uLv-MM-HIL"/>
-                <outlet property="bubbleInfoContainerTopConstraint" destination="16j-F9-tL8" id="zxd-pd-SSx"/>
+                <outlet property="bubbleInfoContainerTopConstraint" destination="Wx9-0o-vzm" id="nLG-nC-lwV"/>
                 <outlet property="bubbleOverlayContainer" destination="XQw-Mj-NZY" id="6d1-EN-LPY"/>
                 <outlet property="encryptionImageView" destination="Ujc-3c-e5B" id="7zc-Y7-1jT"/>
                 <outlet property="encryptionStatusContainerView" destination="uHE-o7-sCe" id="Dl7-QS-WKl"/>
@@ -247,6 +245,6 @@
         </view>
     </objects>
     <resources>
-        <image name="encryption_warning" width="16" height="16"/>
+        <image name="encryption_warning" width="12" height="12"/>
     </resources>
 </document>
diff --git a/Riot/Modules/Room/Views/BubbleCells/Encryption/RoomEncryptedDataBubbleCell.h b/Riot/Modules/Room/Views/BubbleCells/Encryption/RoomEncryptedDataBubbleCell.h
index 31d5ccaa9..77613aa9a 100644
--- a/Riot/Modules/Room/Views/BubbleCells/Encryption/RoomEncryptedDataBubbleCell.h
+++ b/Riot/Modules/Room/Views/BubbleCells/Encryption/RoomEncryptedDataBubbleCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  Action identifier used when the user tapped on the marker displayed in front of an encrypted event.
diff --git a/Riot/Modules/Room/Views/BubbleCells/Poll/PollBubbleCell.swift b/Riot/Modules/Room/Views/BubbleCells/Poll/PollBubbleCell.swift
new file mode 100644
index 000000000..4d3d42e28
--- /dev/null
+++ b/Riot/Modules/Room/Views/BubbleCells/Poll/PollBubbleCell.swift
@@ -0,0 +1,59 @@
+// 
+// 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
+
+class PollBubbleCell: SizableBaseBubbleCell, BubbleCellReactionsDisplayable {
+    
+    private var pollView: UIView?
+    private var event: MXEvent?
+    
+    override func render(_ cellData: MXKCellData!) {
+        super.render(cellData)
+        
+        guard #available(iOS 14.0, *),
+              let contentView = bubbleCellContentView?.innerContentView,
+              let bubbleData = cellData as? RoomBubbleCellData,
+              let event = bubbleData.events.last,
+              event.eventType == __MXEventType.pollStart,
+              let view = PollTimelineProvider.shared.buildPollTimelineViewForEvent(event) else {
+            return
+        }
+        
+        self.event = event
+        
+        pollView?.removeFromSuperview()
+        contentView.vc_addSubViewMatchingParent(view)
+        pollView = view
+    }
+    
+    override func setupViews() {
+        super.setupViews()
+        
+        bubbleCellContentView?.backgroundColor = .clear
+        bubbleCellContentView?.showSenderInfo = true
+        bubbleCellContentView?.showPaginationTitle = false
+    }
+    
+    // The normal flow for tapping on cell content views doesn't work for bubbles without attributed strings
+    func onContentViewTap(_ sender: UITapGestureRecognizer) {
+        guard let event = self.event else {
+            return
+        }
+        
+        delegate.cell(self, didRecognizeAction: kMXKRoomBubbleCellTapOnContentView, userInfo: [kMXKRoomBubbleCellEventKey: event])
+    }
+}
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Coordinator/TemplateUserProfileCoordinatorParameters.swift b/Riot/Modules/Room/Views/BubbleCells/Poll/PollWithPaginationTitleBubbleCell.swift
similarity index 75%
rename from RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Coordinator/TemplateUserProfileCoordinatorParameters.swift
rename to Riot/Modules/Room/Views/BubbleCells/Poll/PollWithPaginationTitleBubbleCell.swift
index 7f162ce38..de6e92041 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Coordinator/TemplateUserProfileCoordinatorParameters.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/Poll/PollWithPaginationTitleBubbleCell.swift
@@ -16,6 +16,12 @@
 
 import Foundation
 
-struct TemplateUserProfileCoordinatorParameters {
-    let session: MXSession
+class PollWithPaginationTitleBubbleCell: PollBubbleCell {
+    
+    override func setupViews() {
+        super.setupViews()
+        
+        bubbleCellContentView?.showPaginationTitle = true
+    }
+    
 }
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileViewAction.swift b/Riot/Modules/Room/Views/BubbleCells/Poll/PollWithoutSenderInfoBubbleCell.swift
similarity index 75%
rename from RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileViewAction.swift
rename to Riot/Modules/Room/Views/BubbleCells/Poll/PollWithoutSenderInfoBubbleCell.swift
index 69d45742f..880ef0cd4 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileViewAction.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/Poll/PollWithoutSenderInfoBubbleCell.swift
@@ -16,9 +16,12 @@
 
 import Foundation
 
-enum TemplateUserProfileViewAction {
-    case incrementCount
-    case decrementCount
-    case cancel
-    case done
+class PollWithoutSenderInfoBubbleCell: PollBubbleCell {
+    
+    override func setupViews() {
+        super.setupViews()
+        
+        bubbleCellContentView?.showSenderInfo = false
+    }
+    
 }
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomCreationCollapsedBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomCreationCollapsedBubbleCell.m
index ae52d67fb..c06b34016 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomCreationCollapsedBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomCreationCollapsedBubbleCell.m
@@ -17,7 +17,7 @@
 #import "RoomCreationCollapsedBubbleCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "RoomBubbleCellData.h"
 
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomCreationWithPaginationCollapsedBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomCreationWithPaginationCollapsedBubbleCell.m
index c568691b7..7f2a00c48 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomCreationWithPaginationCollapsedBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomCreationWithPaginationCollapsedBubbleCell.m
@@ -17,7 +17,7 @@
 #import "RoomCreationWithPaginationCollapsedBubbleCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "RoomBubbleCellData.h"
 
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomEmptyBubbleCell.h b/Riot/Modules/Room/Views/BubbleCells/RoomEmptyBubbleCell.h
index 5ce42873c..ce1289131 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomEmptyBubbleCell.h
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomEmptyBubbleCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `RoomEmptyBubbleCell` displays empty bubbles.
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentBubbleCell.h b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentBubbleCell.h
index 23157a7e5..5ebb2edbf 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentBubbleCell.h
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentBubbleCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `RoomIncomingAttachmentBubbleCell` displays incoming attachment bubbles with sender's information.
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentBubbleCell.m
index 2f7e4d80a..3dd06a1d8 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentBubbleCell.m
@@ -18,7 +18,7 @@
 #import "RoomIncomingAttachmentBubbleCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 #import "MXKRoomBubbleTableViewCell+Riot.h"
 
 @implementation RoomIncomingAttachmentBubbleCell
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentWithPaginationTitleBubbleCell.h b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentWithPaginationTitleBubbleCell.h
index 72273f706..ffea85ea4 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentWithPaginationTitleBubbleCell.h
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentWithPaginationTitleBubbleCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `RoomIncomingAttachmentWithPaginationTitleBubbleCell` displays incoming attachment bubbles with sender's information and a pagination title.
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentWithPaginationTitleBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentWithPaginationTitleBubbleCell.m
index 16a614a46..2a7a96788 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentWithPaginationTitleBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentWithPaginationTitleBubbleCell.m
@@ -18,7 +18,7 @@
 #import "RoomIncomingAttachmentWithPaginationTitleBubbleCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 #import "MXKRoomBubbleTableViewCell+Riot.h"
 
 @implementation RoomIncomingAttachmentWithPaginationTitleBubbleCell
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentWithoutSenderInfoBubbleCell.h b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentWithoutSenderInfoBubbleCell.h
index 2c865f742..31d79802e 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentWithoutSenderInfoBubbleCell.h
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentWithoutSenderInfoBubbleCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `RoomIncomingAttachmentWithoutSenderInfoBubbleCell` displays incoming message bubbles without sender's information.
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentWithoutSenderInfoBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentWithoutSenderInfoBubbleCell.m
index 5d63baf00..30b096e91 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentWithoutSenderInfoBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentWithoutSenderInfoBubbleCell.m
@@ -19,7 +19,7 @@
 #import "MXKRoomBubbleTableViewCell+Riot.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @implementation RoomIncomingAttachmentWithoutSenderInfoBubbleCell
 
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgBubbleCell.h b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgBubbleCell.h
index e10ae971d..a00448824 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgBubbleCell.h
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgBubbleCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `RoomIncomingTextMsgBubbleCell` displays incoming message bubbles with sender's information.
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgBubbleCell.m
index d308fcfea..28bbdb19c 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgBubbleCell.m
@@ -18,7 +18,7 @@
 #import "RoomIncomingTextMsgBubbleCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 #import "MXKRoomBubbleTableViewCell+Riot.h"
 
 @implementation RoomIncomingTextMsgBubbleCell
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithPaginationTitleBubbleCell.h b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithPaginationTitleBubbleCell.h
index 146ad5f53..436dc3173 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithPaginationTitleBubbleCell.h
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithPaginationTitleBubbleCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `RoomIncomingTextMsgWithPaginationTitleBubbleCell` displays incoming message bubbles with sender's information.
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithPaginationTitleBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithPaginationTitleBubbleCell.m
index 2e8bdeb34..c66531dce 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithPaginationTitleBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithPaginationTitleBubbleCell.m
@@ -18,7 +18,7 @@
 #import "RoomIncomingTextMsgWithPaginationTitleBubbleCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 #import "MXKRoomBubbleTableViewCell+Riot.h"
 
 @implementation RoomIncomingTextMsgWithPaginationTitleBubbleCell
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.m
index 5078a9405..ae4126049 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.m
@@ -18,7 +18,7 @@
 #import "RoomIncomingTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @implementation RoomIncomingTextMsgWithPaginationTitleWithoutSenderNameBubbleCell
 
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithoutSenderInfoBubbleCell.h b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithoutSenderInfoBubbleCell.h
index bd3d2172f..a38e18655 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithoutSenderInfoBubbleCell.h
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithoutSenderInfoBubbleCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `RoomIncomingTextMsgWithoutSenderInfoBubbleCell` displays incoming message bubbles without sender's information.
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithoutSenderInfoBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithoutSenderInfoBubbleCell.m
index 56b0db94c..db4370dc5 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithoutSenderInfoBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithoutSenderInfoBubbleCell.m
@@ -18,7 +18,7 @@
 #import "RoomIncomingTextMsgWithoutSenderInfoBubbleCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @implementation RoomIncomingTextMsgWithoutSenderInfoBubbleCell
 
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithoutSenderNameBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithoutSenderNameBubbleCell.m
index 15ab0389e..8678dd894 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithoutSenderNameBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithoutSenderNameBubbleCell.m
@@ -18,7 +18,7 @@
 #import "RoomIncomingTextMsgWithoutSenderNameBubbleCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @implementation RoomIncomingTextMsgWithoutSenderNameBubbleCell
 
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomMembershipBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomMembershipBubbleCell.m
index a15817d01..2fe69ff5f 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomMembershipBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomMembershipBubbleCell.m
@@ -17,7 +17,7 @@
 #import "RoomMembershipBubbleCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "RoomBubbleCellData.h"
 
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomMembershipCollapsedBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomMembershipCollapsedBubbleCell.m
index c19773bf9..8302d4081 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomMembershipCollapsedBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomMembershipCollapsedBubbleCell.m
@@ -18,7 +18,7 @@
 #import "RoomMembershipCollapsedBubbleCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "RoomBubbleCellData.h"
 
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomMembershipCollapsedWithPaginationTitleBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomMembershipCollapsedWithPaginationTitleBubbleCell.m
index b93c8be3a..1b78be112 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomMembershipCollapsedWithPaginationTitleBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomMembershipCollapsedWithPaginationTitleBubbleCell.m
@@ -17,7 +17,7 @@
 #import "RoomMembershipCollapsedWithPaginationTitleBubbleCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "RoomBubbleCellData.h"
 
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomMembershipExpandedBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomMembershipExpandedBubbleCell.m
index 56c0ca6c8..226528894 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomMembershipExpandedBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomMembershipExpandedBubbleCell.m
@@ -17,7 +17,7 @@
 #import "RoomMembershipExpandedBubbleCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "RoomBubbleCellData.h"
 
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomMembershipExpandedWithPaginationTitleBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomMembershipExpandedWithPaginationTitleBubbleCell.m
index 63262f645..4378cd927 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomMembershipExpandedWithPaginationTitleBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomMembershipExpandedWithPaginationTitleBubbleCell.m
@@ -17,7 +17,7 @@
 #import "RoomMembershipExpandedWithPaginationTitleBubbleCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "RoomBubbleCellData.h"
 
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomMembershipWithPaginationTitleBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomMembershipWithPaginationTitleBubbleCell.m
index 4ebebc70d..f7394c4a6 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomMembershipWithPaginationTitleBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomMembershipWithPaginationTitleBubbleCell.m
@@ -17,7 +17,7 @@
 #import "RoomMembershipWithPaginationTitleBubbleCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "RoomBubbleCellData.h"
 
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingAttachmentBubbleCell.h b/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingAttachmentBubbleCell.h
index ab94b9832..57809990a 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingAttachmentBubbleCell.h
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingAttachmentBubbleCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `RoomOutgoingAttachmentBubbleCell` displays outgoing attachment bubbles.
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingAttachmentBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingAttachmentBubbleCell.m
index e6417201b..456305e9c 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingAttachmentBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingAttachmentBubbleCell.m
@@ -18,7 +18,7 @@
 #import "RoomOutgoingAttachmentBubbleCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 #import "MXKRoomBubbleTableViewCell+Riot.h"
 
 @implementation RoomOutgoingAttachmentBubbleCell
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingAttachmentWithPaginationTitleBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingAttachmentWithPaginationTitleBubbleCell.m
index bd4df0000..d78362a65 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingAttachmentWithPaginationTitleBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingAttachmentWithPaginationTitleBubbleCell.m
@@ -18,7 +18,7 @@
 #import "RoomOutgoingAttachmentWithPaginationTitleBubbleCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 #import "MXKRoomBubbleTableViewCell+Riot.h"
 
 @implementation RoomOutgoingAttachmentWithPaginationTitleBubbleCell
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.h b/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.h
index e7b30e50c..90fab30c2 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.h
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 #import "RoomOutgoingAttachmentBubbleCell.h"
 
 /**
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.m
index 30a50ae2d..7021df5f6 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.m
@@ -18,7 +18,7 @@
 #import "RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 #import "RoomBubbleCellData.h"
 #import "MXKRoomBubbleTableViewCell+Riot.h"
 
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgBubbleCell.h b/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgBubbleCell.h
index 14074912c..08cab9b9f 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgBubbleCell.h
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgBubbleCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `RoomOutgoingTextMsgBubbleCell` displays outgoing message bubbles with user's picture and name.
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgBubbleCell.m
index 374ed6da0..a31a52029 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgBubbleCell.m
@@ -18,7 +18,7 @@
 #import "RoomOutgoingTextMsgBubbleCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 #import "MXKRoomBubbleTableViewCell+Riot.h"
 
 @implementation RoomOutgoingTextMsgBubbleCell
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgWithPaginationTitleBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgWithPaginationTitleBubbleCell.m
index 85d4afb55..4c0125e4e 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgWithPaginationTitleBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgWithPaginationTitleBubbleCell.m
@@ -18,7 +18,7 @@
 #import "RoomOutgoingTextMsgWithPaginationTitleBubbleCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @implementation RoomOutgoingTextMsgWithPaginationTitleBubbleCell
 
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h b/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h
index 46879d91f..6fac9533d 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `RoomOutgoingTextMsgWithoutSenderInfoBubbleCell` displays outgoing message bubbles without user's name.
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.m
index 1e0ffeb61..0bc9f1de3 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.m
@@ -18,7 +18,7 @@
 #import "RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @implementation RoomOutgoingTextMsgWithoutSenderInfoBubbleCell
 
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomPredecessorBubbleCell.h b/Riot/Modules/Room/Views/BubbleCells/RoomPredecessorBubbleCell.h
index 7e026f5a1..192499066 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomPredecessorBubbleCell.h
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomPredecessorBubbleCell.h
@@ -16,7 +16,8 @@
 
 
 @import UIKit;
-@import MatrixKit;
+
+#import "MatrixKit.h"
 
 @interface RoomPredecessorBubbleCell : MXKRoomBubbleTableViewCell
 
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomPredecessorBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomPredecessorBubbleCell.m
index 9099d6815..0b852bc20 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomPredecessorBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomPredecessorBubbleCell.m
@@ -18,7 +18,7 @@
 #import "RoomPredecessorBubbleCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #pragma mark - Defines & Constants
 
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomSelectedStickerBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomSelectedStickerBubbleCell.m
index b1e6d9477..d5f48404a 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomSelectedStickerBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomSelectedStickerBubbleCell.m
@@ -25,7 +25,7 @@
 #import "RoomIncomingEncryptedAttachmentWithoutSenderInfoBubbleCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @implementation RoomSelectedStickerBubbleCell
 
diff --git a/Riot/Modules/Room/Views/BubbleCells/VoiceMessage/VoiceMessageBubbleCell.swift b/Riot/Modules/Room/Views/BubbleCells/VoiceMessage/VoiceMessageBubbleCell.swift
index 397fc9fe7..a389e3eb2 100644
--- a/Riot/Modules/Room/Views/BubbleCells/VoiceMessage/VoiceMessageBubbleCell.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/VoiceMessage/VoiceMessageBubbleCell.swift
@@ -27,7 +27,7 @@ class VoiceMessageBubbleCell: SizableBaseBubbleCell, BubbleCellReactionsDisplaya
             return
         }
         
-        guard data.attachment.type == MXKAttachmentTypeVoiceMessage else {
+        guard data.attachment.type == MXKAttachmentTypeVoiceMessage || data.attachment.type == MXKAttachmentTypeAudio else {
             fatalError("Invalid attachment type passed to a voice message cell.")
         }
         
diff --git a/Riot/Modules/Room/Views/Event/EventDetailsView.h b/Riot/Modules/Room/Views/Event/EventDetailsView.h
index 382bd9d02..35ae67034 100644
--- a/Riot/Modules/Room/Views/Event/EventDetailsView.h
+++ b/Riot/Modules/Room/Views/Event/EventDetailsView.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @interface EventDetailsView : MXKEventDetailsView
 
diff --git a/Riot/Modules/Room/Views/Event/EventDetailsView.m b/Riot/Modules/Room/Views/Event/EventDetailsView.m
index 3f30e3987..bce9bf665 100644
--- a/Riot/Modules/Room/Views/Event/EventDetailsView.m
+++ b/Riot/Modules/Room/Views/Event/EventDetailsView.m
@@ -17,7 +17,7 @@
 #import "EventDetailsView.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @implementation EventDetailsView
 
diff --git a/Riot/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.h b/Riot/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.h
index 0e3880d9e..5736fa60a 100644
--- a/Riot/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.h
+++ b/Riot/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `DisabledRoomInputToolbarView` instance is an input toolbar to show to the end user
diff --git a/Riot/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.m b/Riot/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.m
index 3c10a800f..c3337e887 100644
--- a/Riot/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.m
+++ b/Riot/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.m
@@ -17,7 +17,7 @@
 #import "DisabledRoomInputToolbarView.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @implementation DisabledRoomInputToolbarView
 
diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.h b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.h
index d126ba22f..282687128 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.h
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 #import "MediaPickerViewController.h"
 
diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
index bf1bda55c..cffe8fe1b 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
@@ -17,7 +17,8 @@
 
 #import "RoomInputToolbarView.h"
 
-#import "Riot-Swift.h"
+#import "ThemeService.h"
+#import "GeneratedInterface-Swift.h"
 #import "GBDeviceInfo_iOS.h"
 
 static const CGFloat kContextBarHeight = 24;
diff --git a/Riot/Modules/Room/Views/Title/Avatar/RoomAvatarTitleView.h b/Riot/Modules/Room/Views/Title/Avatar/RoomAvatarTitleView.h
index 923e23c02..ac41ab8f8 100644
--- a/Riot/Modules/Room/Views/Title/Avatar/RoomAvatarTitleView.h
+++ b/Riot/Modules/Room/Views/Title/Avatar/RoomAvatarTitleView.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @interface RoomAvatarTitleView : MXKRoomTitleView
 
diff --git a/Riot/Modules/Room/Views/Title/Expanded/ExpandedRoomTitleView.m b/Riot/Modules/Room/Views/Title/Expanded/ExpandedRoomTitleView.m
index f64f8fd6a..931d8437e 100644
--- a/Riot/Modules/Room/Views/Title/Expanded/ExpandedRoomTitleView.m
+++ b/Riot/Modules/Room/Views/Title/Expanded/ExpandedRoomTitleView.m
@@ -18,7 +18,7 @@
 #import "ExpandedRoomTitleView.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "MXRoomSummary+Riot.h"
 
diff --git a/Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m b/Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m
index c0948422b..81a128564 100644
--- a/Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m
+++ b/Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m
@@ -19,7 +19,7 @@
 #import "PreviewRoomTitleView.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "MXRoomSummary+Riot.h"
 
diff --git a/Riot/Modules/Room/Views/Title/RoomTitleView.h b/Riot/Modules/Room/Views/Title/RoomTitleView.h
index 92aaed306..b59191205 100644
--- a/Riot/Modules/Room/Views/Title/RoomTitleView.h
+++ b/Riot/Modules/Room/Views/Title/RoomTitleView.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 #import "RoomPreviewData.h"
 
diff --git a/Riot/Modules/Room/Views/Title/RoomTitleView.m b/Riot/Modules/Room/Views/Title/RoomTitleView.m
index 6f7d38edf..a34543c28 100644
--- a/Riot/Modules/Room/Views/Title/RoomTitleView.m
+++ b/Riot/Modules/Room/Views/Title/RoomTitleView.m
@@ -18,7 +18,7 @@
 #import "RoomTitleView.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @implementation RoomTitleView
 
diff --git a/Riot/Modules/Room/Views/Title/Simple/SimpleRoomTitleView.h b/Riot/Modules/Room/Views/Title/Simple/SimpleRoomTitleView.h
index dc62aa734..67d095c69 100644
--- a/Riot/Modules/Room/Views/Title/Simple/SimpleRoomTitleView.h
+++ b/Riot/Modules/Room/Views/Title/Simple/SimpleRoomTitleView.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  This title view display the room display name only.
@@ -24,4 +24,4 @@
 
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *displayNameCenterXConstraint;
 
-@end
\ No newline at end of file
+@end
diff --git a/Riot/Modules/Room/VoiceMessages/VoiceMessageAttachmentCacheManager.swift b/Riot/Modules/Room/VoiceMessages/VoiceMessageAttachmentCacheManager.swift
index 48b9be9f8..14d466af6 100644
--- a/Riot/Modules/Room/VoiceMessages/VoiceMessageAttachmentCacheManager.swift
+++ b/Riot/Modules/Room/VoiceMessages/VoiceMessageAttachmentCacheManager.swift
@@ -85,7 +85,7 @@ class VoiceMessageAttachmentCacheManager {
     }
     
     func loadAttachment(_ attachment: MXKAttachment, numberOfSamples: Int, completion: @escaping (Result<VoiceMessageAttachmentCacheManagerLoadResult, Error>) -> Void) {
-        guard attachment.type == MXKAttachmentTypeVoiceMessage else {
+        guard attachment.type == MXKAttachmentTypeVoiceMessage || attachment.type == MXKAttachmentTypeAudio else {
             completion(Result.failure(VoiceMessageAttachmentCacheManagerError.invalidAttachmentType))
             MXLog.error("[VoiceMessageAttachmentCacheManager] Invalid attachment type, ignoring request.")
             return
@@ -208,9 +208,9 @@ class VoiceMessageAttachmentCacheManager {
             return
         }
         
-        let newURL = temporaryFilesFolderURL.appendingPathComponent(ProcessInfo().globallyUniqueString).appendingPathExtension("m4a")
+        let newURL = temporaryFilesFolderURL.appendingPathComponent(identifier).appendingPathExtension("m4a")
         
-        VoiceMessageAudioConverter.convertToMPEG4AAC(sourceURL: URL(fileURLWithPath: filePath), destinationURL: newURL) { result in
+        let conversionCompletion: (Result<Void, VoiceMessageAudioConverterError>) -> Void = { result in
             self.workQueue.async {
                 switch result {
                 case .success:
@@ -245,6 +245,12 @@ class VoiceMessageAttachmentCacheManager {
                 }
             }
         }
+        
+        if FileManager.default.fileExists(atPath: newURL.path) {
+            conversionCompletion(Result.success(()))
+        } else {
+            VoiceMessageAudioConverter.convertToMPEG4AAC(sourceURL: URL(fileURLWithPath: filePath), destinationURL: newURL, completion: conversionCompletion)
+        }
     }
     
     private func sampleFileAtURL(_ url: URL, duration: TimeInterval, numberOfSamples: Int, identifier: String, semaphore: DispatchSemaphore) {
diff --git a/Riot/Modules/RoomKeyRequest/RoomKeyRequestViewController.h b/Riot/Modules/RoomKeyRequest/RoomKeyRequestViewController.h
index 92358b5a8..be19d7b71 100644
--- a/Riot/Modules/RoomKeyRequest/RoomKeyRequestViewController.h
+++ b/Riot/Modules/RoomKeyRequest/RoomKeyRequestViewController.h
@@ -17,7 +17,6 @@
 #import <UIKit/UIKit.h>
 
 #import <MatrixSDK/MatrixSDK.h>
-#import <MatrixKit/MatrixKit.h>
 
 /**
  The `RoomKeyRequestViewController` display a modal dialog at the top of the
diff --git a/Riot/Modules/RoomKeyRequest/RoomKeyRequestViewController.m b/Riot/Modules/RoomKeyRequest/RoomKeyRequestViewController.m
index f6141d9cf..a5bf789d6 100644
--- a/Riot/Modules/RoomKeyRequest/RoomKeyRequestViewController.m
+++ b/Riot/Modules/RoomKeyRequest/RoomKeyRequestViewController.m
@@ -16,7 +16,7 @@
 
 #import "RoomKeyRequestViewController.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface RoomKeyRequestViewController () <KeyVerificationCoordinatorBridgePresenterDelegate>
 {
diff --git a/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.h b/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.h
index e4f3edbe4..cde40f6a4 100644
--- a/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.h
+++ b/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.h
@@ -16,7 +16,7 @@
 
 #import <UIKit/UIKit.h>
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @interface DirectoryServerPickerViewController : MXKTableViewController <MXKDataSourceDelegate, UITableViewDelegate>
 
diff --git a/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.m b/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.m
index e31c5fb43..5064dcb15 100644
--- a/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.m
+++ b/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.m
@@ -18,7 +18,7 @@
 #import "DirectoryServerTableViewCell.h"
 #import "DirectoryServerDetailTableViewCell.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface DirectoryServerPickerViewController ()
 {
@@ -38,6 +38,9 @@
     // Observe kThemeServiceDidChangeThemeNotification to handle user interface theme change.
     id kThemeServiceDidChangeThemeNotificationObserver;
 }
+
+@property (nonatomic) AnalyticsScreenTimer *screenTimer;
+
 @end
 
 @implementation DirectoryServerPickerViewController
@@ -49,6 +52,8 @@
     // Setup `MXKViewControllerHandling` properties
     self.enableBarTintColorStatusChange = NO;
     self.rageShakeManager = [RageShakeManager sharedManager];
+    
+    self.screenTimer = [[AnalyticsScreenTimer alloc] initWithScreen:AnalyticsScreenSwitchDirectory];
 }
 
 - (void)destroy
@@ -145,9 +150,6 @@
 {
     [super viewWillAppear:animated];
 
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"DirectoryServerPicker"];
-
     // Observe kAppDelegateDidTapStatusBarNotificationObserver.
     kAppDelegateDidTapStatusBarNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kAppDelegateDidTapStatusBarNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
 
@@ -158,6 +160,12 @@
     [dataSource loadData];
 }
 
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    [self.screenTimer start];
+}
+
 - (void)viewWillDisappear:(BOOL)animated
 {
     if (kAppDelegateDidTapStatusBarNotificationObserver)
@@ -169,6 +177,12 @@
     [super viewWillDisappear:animated];
 }
 
+- (void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear:animated];
+    [self.screenTimer stop];
+}
+
 - (void)displayWithDataSource:(MXKDirectoryServersDataSource*)theDataSource
                    onComplete:(void (^)(id<MXKDirectoryServerCellDataStoring> cellData))onComplete;
 {
diff --git a/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerDetailTableViewCell.m b/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerDetailTableViewCell.m
index a43ee7b39..f604f7e6c 100644
--- a/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerDetailTableViewCell.m
+++ b/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerDetailTableViewCell.m
@@ -17,7 +17,7 @@
 #import "DirectoryServerDetailTableViewCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @implementation DirectoryServerDetailTableViewCell
 
diff --git a/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerTableViewCell.h b/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerTableViewCell.h
index e145ef51f..8c68d5409 100644
--- a/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerTableViewCell.h
+++ b/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerTableViewCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  The `DirectoryServerTableViewCell` cell displays a server .
diff --git a/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerTableViewCell.m b/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerTableViewCell.m
index 3c1ceeabe..fed334510 100644
--- a/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerTableViewCell.m
+++ b/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerTableViewCell.m
@@ -19,7 +19,7 @@
 
 #import "AvatarGenerator.h"
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @implementation DirectoryServerTableViewCell
 
diff --git a/Riot/Modules/Rooms/RoomsViewController.m b/Riot/Modules/Rooms/RoomsViewController.m
index 0fb4105eb..183db0046 100644
--- a/Riot/Modules/Rooms/RoomsViewController.m
+++ b/Riot/Modules/Rooms/RoomsViewController.m
@@ -18,7 +18,7 @@
 
 #import "RecentsDataSource.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface RoomsViewController ()
 {
@@ -40,7 +40,7 @@
 {
     [super finalizeInit];
     
-    self.screenName = @"Rooms";
+    self.screenTimer = [[AnalyticsScreenTimer alloc] initWithScreen:AnalyticsScreenRooms];
 }
 
 - (void)viewDidLoad
diff --git a/Riot/Modules/Rooms/ShowDirectory/ShowDirectoryCoordinator.swift b/Riot/Modules/Rooms/ShowDirectory/ShowDirectoryCoordinator.swift
index 75a8365a7..6ab5e2517 100644
--- a/Riot/Modules/Rooms/ShowDirectory/ShowDirectoryCoordinator.swift
+++ b/Riot/Modules/Rooms/ShowDirectory/ShowDirectoryCoordinator.swift
@@ -63,6 +63,7 @@ final class ShowDirectoryCoordinator: ShowDirectoryCoordinatorType {
     
     private func createDirectoryServerPickerViewController() -> DirectoryServerPickerViewController {
         let controller = DirectoryServerPickerViewController()
+        controller.finalizeInit()
         let dataSource: MXKDirectoryServersDataSource = MXKDirectoryServersDataSource(matrixSession: session)
         dataSource.finalizeInitialization()
         dataSource.roomDirectoryServers = BuildSettings.publicRoomsDirectoryServers
diff --git a/Riot/Modules/Rooms/ShowDirectory/ShowDirectoryViewController.swift b/Riot/Modules/Rooms/ShowDirectory/ShowDirectoryViewController.swift
index 1e2cf5daf..ce22a3440 100644
--- a/Riot/Modules/Rooms/ShowDirectory/ShowDirectoryViewController.swift
+++ b/Riot/Modules/Rooms/ShowDirectory/ShowDirectoryViewController.swift
@@ -68,6 +68,8 @@ final class ShowDirectoryViewController: UIViewController {
     }()
     
     private var sections: [ShowDirectorySection] = []
+    
+    private let screenTimer = AnalyticsScreenTimer(screen: .roomDirectory)
 
     // MARK: - Setup
     
@@ -104,10 +106,17 @@ final class ShowDirectoryViewController: UIViewController {
         self.keyboardAvoider?.startAvoiding()
     }
     
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        screenTimer.start()
+    }
+    
     override func viewDidDisappear(_ animated: Bool) {
         super.viewDidDisappear(animated)
         
         self.keyboardAvoider?.stopAvoiding()
+        
+        screenTimer.stop()
     }
     
     override var preferredStatusBarStyle: UIStatusBarStyle {
diff --git a/Riot/Modules/ServiceTerms/Modal/ServiceTermsModalCoordinator.swift b/Riot/Modules/ServiceTerms/Modal/ServiceTermsModalCoordinator.swift
index 4b05e230c..b4c04c610 100644
--- a/Riot/Modules/ServiceTerms/Modal/ServiceTermsModalCoordinator.swift
+++ b/Riot/Modules/ServiceTerms/Modal/ServiceTermsModalCoordinator.swift
@@ -107,7 +107,7 @@ extension ServiceTermsModalCoordinator: ServiceTermsModalScreenCoordinatorDelega
 
     func serviceTermsModalScreenCoordinatorDidAccept(_ coordinator: ServiceTermsModalScreenCoordinatorType) {
         if serviceTerms.serviceType == MXServiceTypeIdentityService {
-            Analytics.sharedInstance().trackValue(1, category: MXKAnalyticsCategory.contacts.rawValue, name: AnalyticsContactsIdentityServerAccepted)
+            Analytics.shared.trackIdentityServerAccepted(true)
         }
         
         self.delegate?.serviceTermsModalCoordinatorDidAccept(self)
@@ -119,7 +119,7 @@ extension ServiceTermsModalCoordinator: ServiceTermsModalScreenCoordinatorDelega
 
     func serviceTermsModalScreenCoordinatorDidDecline(_ coordinator: ServiceTermsModalScreenCoordinatorType) {
         if serviceTerms.serviceType == MXServiceTypeIdentityService {
-            Analytics.sharedInstance().trackValue(1, category: MXKAnalyticsCategory.contacts.rawValue, name: AnalyticsContactsIdentityServerAccepted)
+            Analytics.shared.trackIdentityServerAccepted(false)
             disableIdentityServer()
         }
         
@@ -131,7 +131,7 @@ extension ServiceTermsModalCoordinator: ServiceTermsModalScreenCoordinatorDelega
 extension ServiceTermsModalCoordinator: UIAdaptivePresentationControllerDelegate {
     func presentationControllerDidDismiss(_ presentationController: UIPresentationController) {
         if serviceTerms.serviceType == MXServiceTypeIdentityService {
-            Analytics.sharedInstance().trackValue(0, category: MXKAnalyticsCategory.contacts.rawValue, name: AnalyticsContactsIdentityServerAccepted)
+            Analytics.shared.trackIdentityServerAccepted(false)
         }
         
         self.delegate?.serviceTermsModalCoordinatorDidDismissInteractively(self)
diff --git a/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.h b/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.h
index 4d403aa40..8916e0fa0 100644
--- a/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.h
+++ b/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.h
@@ -15,7 +15,8 @@
  */
 
 @import UIKit;
-@import MatrixKit;
+
+#import "MatrixKit.h"
 
 #pragma mark - Types
 
diff --git a/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m b/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
index 67b66479e..0efbe7bdc 100644
--- a/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
+++ b/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
@@ -17,7 +17,7 @@
 #import "DeactivateAccountViewController.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #pragma mark - Defines & Constants
 
@@ -47,6 +47,8 @@ static CGFloat const kTextFontSize = 15.0;
 
 @property (weak, nonatomic) id <NSObject> themeDidChangeNotificationObserver;
 
+@property (nonatomic) AnalyticsScreenTimer *screenTimer;
+
 @end
 
 #pragma mark - Implementation
@@ -62,6 +64,12 @@ static CGFloat const kTextFontSize = 15.0;
     return viewController;
 }
 
+- (void)finalizeInit
+{
+    [super finalizeInit];
+    self.screenTimer = [[AnalyticsScreenTimer alloc] initWithScreen:AnalyticsScreenDeactivateAccount];
+}
+
 - (void)destroy
 {
     id<NSObject> notificationObserver = self.themeDidChangeNotificationObserver;
@@ -95,9 +103,12 @@ static CGFloat const kTextFontSize = 15.0;
     [super viewWillAppear:animated];
 
     [self userInterfaceThemeDidChange];
-    
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"DeactivateAccount"];
+}
+
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    [self.screenTimer start];
 }
 
 - (void)viewDidLayoutSubviews
@@ -107,6 +118,12 @@ static CGFloat const kTextFontSize = 15.0;
     [self.deactivateAcccountButton.layer setCornerRadius:kButtonCornerRadius];
 }
 
+- (void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear:animated];
+    [self.screenTimer stop];
+}
+
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
     return ThemeService.shared.theme.statusBarStyle;
diff --git a/Riot/Modules/Settings/Language/LanguagePickerViewController.h b/Riot/Modules/Settings/Language/LanguagePickerViewController.h
index 0e65d0494..e4311bf08 100644
--- a/Riot/Modules/Settings/Language/LanguagePickerViewController.h
+++ b/Riot/Modules/Settings/Language/LanguagePickerViewController.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @interface LanguagePickerViewController : MXKLanguagePickerViewController
 
diff --git a/Riot/Modules/Settings/Language/LanguagePickerViewController.m b/Riot/Modules/Settings/Language/LanguagePickerViewController.m
index b97da63e8..7c4c69055 100644
--- a/Riot/Modules/Settings/Language/LanguagePickerViewController.m
+++ b/Riot/Modules/Settings/Language/LanguagePickerViewController.m
@@ -16,7 +16,7 @@
 
 #import "LanguagePickerViewController.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface LanguagePickerViewController ()
 {
@@ -106,14 +106,6 @@
     }
 }
 
-- (void)viewWillAppear:(BOOL)animated
-{
-    [super viewWillAppear:animated];
-
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"CountryPicker"];
-}
-
 - (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath;
 {
     cell.textLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
diff --git a/Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.h b/Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.h
index e77f6e66c..fe4bafe13 100644
--- a/Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.h
+++ b/Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @interface CountryPickerViewController : MXKCountryPickerViewController
 
diff --git a/Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.m b/Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.m
index f34817db0..bdbc14ee1 100644
--- a/Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.m
+++ b/Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.m
@@ -16,7 +16,7 @@
 
 #import "CountryPickerViewController.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface CountryPickerViewController ()
 {
@@ -95,14 +95,6 @@
     return ThemeService.shared.theme.statusBarStyle;
 }
 
-- (void)viewWillAppear:(BOOL)animated
-{
-    [super viewWillAppear:animated];
-
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"CountryPicker"];
-}
-
 - (void)destroy
 {
     [super destroy];
diff --git a/Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.h b/Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.h
index c61242f7a..12a3d0b1a 100644
--- a/Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.h
+++ b/Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 
 @interface ManageSessionViewController : MXKTableViewController
diff --git a/Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m b/Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m
index 930ab5899..42920094f 100644
--- a/Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m
+++ b/Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m
@@ -16,15 +16,13 @@
 
 #import "ManageSessionViewController.h"
 
-#import <MatrixKit/MatrixKit.h>
-
 #import <OLMKit/OLMKit.h>
 
 #import "AvatarGenerator.h"
 
 #import "ThemeService.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 
 enum
@@ -163,9 +161,6 @@ enum {
 {
     [super viewWillAppear:animated];
 
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"ManageSession"];
-
     // Release the potential pushed view controller
     [self releasePushedViewController];
 
diff --git a/Riot/Modules/Settings/Security/SecurityViewController.h b/Riot/Modules/Settings/Security/SecurityViewController.h
index 1452f3144..dd5d7001c 100644
--- a/Riot/Modules/Settings/Security/SecurityViewController.h
+++ b/Riot/Modules/Settings/Security/SecurityViewController.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @interface SecurityViewController : MXKTableViewController
 
diff --git a/Riot/Modules/Settings/Security/SecurityViewController.m b/Riot/Modules/Settings/Security/SecurityViewController.m
index fce6d5c9b..99b7f7c93 100644
--- a/Riot/Modules/Settings/Security/SecurityViewController.m
+++ b/Riot/Modules/Settings/Security/SecurityViewController.m
@@ -18,15 +18,13 @@
 
 #import "ManageSessionViewController.h"
 
-#import <MatrixKit/MatrixKit.h>
-
 #import <OLMKit/OLMKit.h>
 
 #import "AvatarGenerator.h"
 
 #import "ThemeService.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 // Dev flag to have more options
 //#define CROSS_SIGNING_AND_BACKUP_DEV
@@ -121,6 +119,8 @@ TableViewSectionsDelegate>
 @property (nonatomic, strong) SetPinCoordinatorBridgePresenter *setPinCoordinatorBridgePresenter;
 @property (nonatomic, strong) CrossSigningSetupCoordinatorBridgePresenter *crossSigningSetupCoordinatorBridgePresenter;
 
+@property (nonatomic) AnalyticsScreenTimer *screenTimer;
+
 @end
 
 @implementation SecurityViewController
@@ -144,6 +144,8 @@ TableViewSectionsDelegate>
     // Setup `MXKViewControllerHandling` properties
     self.enableBarTintColorStatusChange = NO;
     self.rageShakeManager = [RageShakeManager sharedManager];
+    
+    self.screenTimer = [[AnalyticsScreenTimer alloc] initWithScreen:AnalyticsScreenSettingsSecurity];
 }
 
 - (void)viewDidLoad
@@ -169,9 +171,8 @@ TableViewSectionsDelegate>
 
     if (self.mainSession.crypto.backup)
     {
-        MXDeviceInfo *deviceInfo = [self.mainSession.crypto.deviceList storedDevice:self.mainSession.matrixRestClient.credentials.userId
-                                                                           deviceId:self.mainSession.matrixRestClient.credentials.deviceId];
-
+        MXDeviceInfo *deviceInfo = [self.mainSession.crypto deviceWithDeviceId:self.mainSession.myDeviceId ofUser:self.mainSession.myUserId];
+        
         if (deviceInfo)
         {
             secureBackupSection = [[SettingsSecureBackupTableViewSection alloc] initWithRecoveryService:self.mainSession.crypto.recoveryService keyBackup:self.mainSession.crypto.backup userDevice:deviceInfo];
@@ -253,9 +254,6 @@ TableViewSectionsDelegate>
 {
     [super viewWillAppear:animated];
 
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"Security"];
-
     // Release the potential pushed view controller
     [self releasePushedViewController];
 
@@ -271,6 +269,12 @@ TableViewSectionsDelegate>
     [self loadCrossSigning];
 }
 
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    [self.screenTimer start];
+}
+
 - (void)viewWillDisappear:(BOOL)animated
 {
     [super viewWillDisappear:animated];
@@ -282,6 +286,12 @@ TableViewSectionsDelegate>
     }
 }
 
+- (void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear:animated];
+    [self.screenTimer stop];
+}
+
 #pragma mark - Internal methods
 
 - (void)updateSections
diff --git a/Riot/Modules/Settings/SettingsViewController.h b/Riot/Modules/Settings/SettingsViewController.h
index 6d17449b1..dfe764538 100644
--- a/Riot/Modules/Settings/SettingsViewController.h
+++ b/Riot/Modules/Settings/SettingsViewController.h
@@ -14,11 +14,9 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
-#import "MediaPickerViewController.h"
-
-@interface SettingsViewController : MXKTableViewController<UITextFieldDelegate, MXKCountryPickerViewControllerDelegate, MXKLanguagePickerViewControllerDelegate, MXKDataSourceDelegate>
+@interface SettingsViewController : MXKTableViewController
 
 + (instancetype)instantiate;
 
diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m
index 7ecfcb533..9aeaa77b7 100644
--- a/Riot/Modules/Settings/SettingsViewController.m
+++ b/Riot/Modules/Settings/SettingsViewController.m
@@ -18,8 +18,6 @@
 
 #import "SettingsViewController.h"
 
-#import <MatrixKit/MatrixKit.h>
-
 #import <OLMKit/OLMKit.h>
 
 #import "AvatarGenerator.h"
@@ -43,7 +41,9 @@
 
 #import "GBDeviceInfo_iOS.h"
 
-#import "Riot-Swift.h"
+#import "MediaPickerViewController.h"
+
+#import "GeneratedInterface-Swift.h"
 
 NSString* const kSettingsViewControllerPhoneBookCountryCellId = @"kSettingsViewControllerPhoneBookCountryCellId";
 
@@ -153,9 +153,10 @@ enum
     ABOUT_THIRD_PARTY_INDEX,
 };
 
-enum
+typedef NS_ENUM(NSUInteger, LABS_ENABLE)
 {
-    LABS_ENABLE_RINGING_FOR_GROUP_CALLS_INDEX = 0
+    LABS_ENABLE_RINGING_FOR_GROUP_CALLS_INDEX,
+    LABS_ENABLE_POLLS
 };
 
 enum
@@ -167,7 +168,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)(void);
 
 #pragma mark - SettingsViewController
 
-@interface SettingsViewController () <DeactivateAccountViewControllerDelegate,
+@interface SettingsViewController () <UITextFieldDelegate, MXKCountryPickerViewControllerDelegate, MXKLanguagePickerViewControllerDelegate, MXKDataSourceDelegate, DeactivateAccountViewControllerDelegate,
 NotificationSettingsCoordinatorBridgePresenterDelegate,
 SecureBackupSetupCoordinatorBridgePresenterDelegate,
 SignOutAlertPresenterDelegate,
@@ -282,6 +283,8 @@ TableViewSectionsDelegate>
 @property (nonatomic) BOOL isPreparingIdentityService;
 @property (nonatomic, strong) ServiceTermsModalCoordinatorBridgePresenter *serviceTermsModalCoordinatorBridgePresenter;
 
+@property (nonatomic) AnalyticsScreenTimer *screenTimer;
+
 @end
 
 @implementation SettingsViewController
@@ -314,6 +317,8 @@ TableViewSectionsDelegate>
     isSavingInProgress = NO;
     isResetPwdInProgress = NO;
     is3PIDBindingInProgress = NO;
+    
+    self.screenTimer = [[AnalyticsScreenTimer alloc] initWithScreen:AnalyticsScreenSettings];
 }
 
 - (void)updateSections
@@ -541,13 +546,8 @@ TableViewSectionsDelegate>
     sectionAbout.headerTitle = VectorL10n.settingsAbout;
 
     if (BuildSettings.settingsScreenShowAdvancedSettings)
-    {
-        sectionAbout.footerTitle = [NSString stringWithFormat:@"Element %@ (%@) / Olm %@\n%@\n%@",
-                                    AppInfo.current.appVersion.bundleShortVersion,
-                                    AppInfo.current.appVersion.bundleVersion,
-                                    [OLMKit versionString],
-                                    [MatrixKitL10n settingsConfigUserId:account.mxCredentials.userId],
-                                    [MatrixKitL10n settingsConfigHomeServer:account.mxCredentials.homeServer]];
+    {        
+        sectionAbout.footerTitle = [self buildAboutSectionFooterTitleWithAccount:account];
     }
     
     [tmpSections addObject:sectionAbout];
@@ -556,6 +556,8 @@ TableViewSectionsDelegate>
     {
         Section *sectionLabs = [Section sectionWithTag:SECTION_TAG_LABS];
         [sectionLabs addRowWithTag:LABS_ENABLE_RINGING_FOR_GROUP_CALLS_INDEX];
+        [sectionLabs addRowWithTag:LABS_ENABLE_POLLS];
+        
         sectionLabs.headerTitle = [VectorL10n settingsLabs];
         if (sectionLabs.hasAnyRows)
         {
@@ -778,9 +780,6 @@ TableViewSectionsDelegate>
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"Settings"];
     
     // Refresh display
     [self refreshSettings];
@@ -810,6 +809,8 @@ TableViewSectionsDelegate>
     [self releasePushedViewController];
     
     [self.settingsDiscoveryTableViewSection reload];
+    
+    [self.screenTimer start];
 }
 
 - (void)viewWillDisappear:(BOOL)animated
@@ -853,6 +854,12 @@ TableViewSectionsDelegate>
     }
 }
 
+- (void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear:animated];
+    [self.screenTimer stop];
+}
+
 #pragma mark - Internal methods
 
 - (void)pushViewController:(UIViewController*)viewController
@@ -991,9 +998,11 @@ TableViewSectionsDelegate>
 {
     MXWeakify(self);
     [currentAlert dismissViewControllerAnimated:NO completion:nil];
-    currentAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n accountEmailValidationTitle] message:message preferredStyle:UIAlertControllerStyleAlert];
+    UIAlertController *validationAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n accountEmailValidationTitle]
+                                                                             message:message
+                                                                      preferredStyle:UIAlertControllerStyleAlert];
 
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+    [validationAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
         MXStrongifyAndReturnIfNil(self);
         self->currentAlert = nil;
         [self stopActivityIndicator];
@@ -1002,14 +1011,15 @@ TableViewSectionsDelegate>
         self.newEmailEditingEnabled = NO;
     }]];
 
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n continue] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+    [validationAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n continue] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
         MXStrongifyAndReturnIfNil(self);
         [self tryFinaliseAddEmailSession:threePidAddSession withAuthenticationParameters:authenticationParameters
                       threePidAddManager:threePidAddManager];
     }]];
 
-    [currentAlert mxk_setAccessibilityIdentifier:@"SettingsVCEmailValidationAlert"];
-    [self presentViewController:currentAlert animated:YES completion:nil];
+    [validationAlert mxk_setAccessibilityIdentifier:@"SettingsVCEmailValidationAlert"];
+    [self presentViewController:validationAlert animated:YES completion:nil];
+    currentAlert = validationAlert;
 }
 
 - (void)tryFinaliseAddEmailSession:(MX3PidAddSession*)threePidAddSession withAuthenticationParameters:(NSDictionary*)authParams threePidAddManager:(MX3PidAddManager*)threePidAddManager
@@ -1049,11 +1059,13 @@ TableViewSectionsDelegate>
             MXLogDebug(@"[SettingsViewController] tryFinaliseAddEmailSession: Wrong credentials");
 
             // Ask password again
-            self->currentAlert = [UIAlertController alertControllerWithTitle:nil
-                                                                     message:[VectorL10n settingsAdd3pidInvalidPasswordMessage]
-                                                              preferredStyle:UIAlertControllerStyleAlert];
+            UIAlertController *passwordPrompt = [UIAlertController alertControllerWithTitle:nil
+                                                                                    message:[VectorL10n settingsAdd3pidInvalidPasswordMessage]
+                                                                             preferredStyle:UIAlertControllerStyleAlert];
 
-            [self->currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n retry] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+            MXWeakify(self);
+            [passwordPrompt addAction:[UIAlertAction actionWithTitle:[VectorL10n retry] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+                MXStrongifyAndReturnIfNil(self);
                 self->currentAlert = nil;
                 
                 [self showAuthenticationIfNeededForAdding:kMX3PIDMediumEmail withSession:self.mainSession completion:^(NSDictionary *authParams) {
@@ -1061,7 +1073,8 @@ TableViewSectionsDelegate>
                 }];
             }]];
 
-            [self presentViewController:self->currentAlert animated:YES completion:nil];
+            [self presentViewController:passwordPrompt animated:YES completion:nil];
+            self->currentAlert = passwordPrompt;
 
             return;
         }
@@ -1102,9 +1115,11 @@ TableViewSectionsDelegate>
     MXWeakify(self);
     
     [currentAlert dismissViewControllerAnimated:NO completion:nil];
-    currentAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n accountMsisdnValidationTitle] message:message preferredStyle:UIAlertControllerStyleAlert];
+    UIAlertController *validationAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n accountMsisdnValidationTitle]
+                                                                             message:message
+                                                                      preferredStyle:UIAlertControllerStyleAlert];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+    [validationAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
         MXStrongifyAndReturnIfNil(self);
 
         self->currentAlert = nil;
@@ -1115,13 +1130,13 @@ TableViewSectionsDelegate>
         self.newPhoneEditingEnabled = NO;
     }]];
 
-    [currentAlert addTextFieldWithConfigurationHandler:^(UITextField *textField) {
+    [validationAlert addTextFieldWithConfigurationHandler:^(UITextField *textField) {
         textField.secureTextEntry = NO;
         textField.placeholder = nil;
         textField.keyboardType = UIKeyboardTypeDecimalPad;
     }];
     
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n submit] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+    [validationAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n submit] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
 
         MXStrongifyAndReturnIfNil(self);
 
@@ -1140,8 +1155,9 @@ TableViewSectionsDelegate>
         }
     }]];
     
-    [currentAlert mxk_setAccessibilityIdentifier: @"SettingsVCMsisdnValidationAlert"];
-    [self presentViewController:currentAlert animated:YES completion:nil];
+    [validationAlert mxk_setAccessibilityIdentifier: @"SettingsVCMsisdnValidationAlert"];
+    [self presentViewController:validationAlert animated:YES completion:nil];
+    currentAlert = validationAlert;
 }
 
 - (void)finaliseAddPhoneNumberSession:(MX3PidAddSession*)threePidAddSession withToken:(NSString*)token andAuthenticationParameters:(NSDictionary*)authParams message:(NSString*)message threePidAddManager:(MX3PidAddManager*)threePidAddManager
@@ -1180,11 +1196,13 @@ TableViewSectionsDelegate>
             MXLogDebug(@"[SettingsViewController] finaliseAddPhoneNumberSession: Wrong authentication credentials");
 
             // Ask password again
-            self->currentAlert = [UIAlertController alertControllerWithTitle:nil
-                                                                     message:[VectorL10n settingsAdd3pidInvalidPasswordMessage]
-                                                              preferredStyle:UIAlertControllerStyleAlert];
+            UIAlertController *passwordPrompt = [UIAlertController alertControllerWithTitle:nil
+                                                                                    message:[VectorL10n settingsAdd3pidInvalidPasswordMessage]
+                                                                             preferredStyle:UIAlertControllerStyleAlert];
 
-            [self->currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n retry] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+            MXWeakify(self);
+            [passwordPrompt addAction:[UIAlertAction actionWithTitle:[VectorL10n retry] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+                MXStrongifyAndReturnIfNil(self);
                 self->currentAlert = nil;
                 
                 [self showAuthenticationIfNeededForAdding:kMX3PIDMediumMSISDN withSession:self.mainSession completion:^(NSDictionary *authParams) {
@@ -1192,7 +1210,8 @@ TableViewSectionsDelegate>
                 }];
             }]];
 
-            [self presentViewController:self->currentAlert animated:YES completion:nil];
+            [self presentViewController:passwordPrompt animated:YES completion:nil];
+            self->currentAlert = passwordPrompt;
 
             return;
         }
@@ -1232,17 +1251,20 @@ TableViewSectionsDelegate>
             }
 
 
-            self->currentAlert = [UIAlertController alertControllerWithTitle:title message:msg preferredStyle:UIAlertControllerStyleAlert];
+            UIAlertController *errorAlert = [UIAlertController alertControllerWithTitle:title message:msg preferredStyle:UIAlertControllerStyleAlert];
 
-            [self->currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+            MXWeakify(self);
+            [errorAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+                MXStrongifyAndReturnIfNil(self);
                 self->currentAlert = nil;
 
                 // Ask again the sms token
                 [self showValidationMsisdnDialogWithMessage:message for3PidAddSession:threePidAddSession threePidAddManager:threePidAddManager authenticationParameters:authParams];
             }]];
 
-            [self->currentAlert mxk_setAccessibilityIdentifier: @"SettingsVCErrorAlert"];
-            [self presentViewController:self->currentAlert animated:YES completion:nil];
+            [errorAlert mxk_setAccessibilityIdentifier: @"SettingsVCErrorAlert"];
+            [self presentViewController:errorAlert animated:YES completion:nil];
+            self->currentAlert = errorAlert;
         }
     }];
 }
@@ -1410,6 +1432,35 @@ TableViewSectionsDelegate>
     }
 }
 
+- (NSString*)buildAboutSectionFooterTitleWithAccount:(MXKAccount*)account
+{    
+    NSMutableString *footerText = [NSMutableString new];
+    
+    AppInfo *appInfo = AppInfo.current;
+    
+    NSString *appName = appInfo.displayName;
+    NSString *appVersion = appInfo.appVersion.bundleShortVersion;
+    NSString *buildVersion = appInfo.appVersion.bundleVersion;
+    
+    NSString *appVersionInfo = [NSString stringWithFormat:@"%@ %@ (%@)", appName, appVersion, buildVersion];
+ 
+    NSString *loggedUserInfo = [MatrixKitL10n settingsConfigUserId:account.mxCredentials.userId];
+    
+    NSString *homeserverInfo = [MatrixKitL10n settingsConfigHomeServer:account.mxCredentials.homeServer];       
+    
+    NSString *sdkVersionInfo = [NSString stringWithFormat:@"Matrix SDK %@", MatrixSDKVersion];
+    
+    NSString *olmVersionInfo = [NSString stringWithFormat:@"OLM %@", [OLMKit versionString]];    
+    
+    [footerText appendFormat:@"%@\n", loggedUserInfo];
+    [footerText appendFormat:@"%@\n", homeserverInfo];
+    [footerText appendFormat:@"%@\n", appVersionInfo];
+    [footerText appendFormat:@"%@\n", sdkVersionInfo];
+    [footerText appendFormat:@"%@", olmVersionInfo];
+    
+    return [footerText copy];
+}
+
 #pragma mark - 3Pid Add
 
 - (void)showAuthenticationIfNeededForAdding:(MX3PIDMedium)medium withSession:(MXSession*)session completion:(void (^)(NSDictionary* authParams))completion
@@ -2209,11 +2260,11 @@ TableViewSectionsDelegate>
         {
             MXKTableViewCellWithLabelAndSwitch* sendCrashReportCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
             
-            sendCrashReportCell.mxkLabel.text = [VectorL10n settingsSendCrashReport];
-            sendCrashReportCell.mxkSwitch.on = RiotSettings.shared.enableCrashReport;
+            sendCrashReportCell.mxkLabel.text = VectorL10n.settingsAnalyticsAndCrashData;
+            sendCrashReportCell.mxkSwitch.on = RiotSettings.shared.enableAnalytics;
             sendCrashReportCell.mxkSwitch.onTintColor = ThemeService.shared.theme.tintColor;
             sendCrashReportCell.mxkSwitch.enabled = YES;
-            [sendCrashReportCell.mxkSwitch addTarget:self action:@selector(toggleSendCrashReport:) forControlEvents:UIControlEventTouchUpInside];
+            [sendCrashReportCell.mxkSwitch addTarget:self action:@selector(toggleAnalytics:) forControlEvents:UIControlEventTouchUpInside];
             
             cell = sendCrashReportCell;
         }
@@ -2362,6 +2413,19 @@ TableViewSectionsDelegate>
             
             cell = labelAndSwitchCell;
         }
+        
+        if (row == LABS_ENABLE_POLLS && BuildSettings.pollsEnabled)
+        {
+            MXKTableViewCellWithLabelAndSwitch *labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
+            
+            labelAndSwitchCell.mxkLabel.text = [VectorL10n settingsLabsEnabledPolls];
+            labelAndSwitchCell.mxkSwitch.on = RiotSettings.shared.roomScreenAllowPollsAction;
+            labelAndSwitchCell.mxkSwitch.onTintColor = ThemeService.shared.theme.tintColor;
+            
+            [labelAndSwitchCell.mxkSwitch addTarget:self action:@selector(toggleEnablePolls:) forControlEvents:UIControlEventValueChanged];
+            
+            cell = labelAndSwitchCell;
+        }
     }
     else if (section == SECTION_TAG_FLAIR)
     {
@@ -2606,11 +2670,11 @@ TableViewSectionsDelegate>
 
                 __weak typeof(self) weakSelf = self;
                 
-                currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n settingsUnignoreUser:ignoredUserId] message:nil preferredStyle:UIAlertControllerStyleAlert];
+                UIAlertController *unignorePrompt = [UIAlertController alertControllerWithTitle:[VectorL10n settingsUnignoreUser:ignoredUserId] message:nil preferredStyle:UIAlertControllerStyleAlert];
 
-                [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n yes]
-                                                                 style:UIAlertActionStyleDefault
-                                                               handler:^(UIAlertAction * action) {
+                [unignorePrompt addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n yes]
+                                                                   style:UIAlertActionStyleDefault
+                                                                 handler:^(UIAlertAction * action) {
                                                                    
                                                                    if (weakSelf)
                                                                    {
@@ -2639,9 +2703,9 @@ TableViewSectionsDelegate>
                                                                    
                                                                }]];
                 
-                [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n no]
-                                                                 style:UIAlertActionStyleDefault
-                                                               handler:^(UIAlertAction * action) {
+                [unignorePrompt addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n no]
+                                                                   style:UIAlertActionStyleDefault
+                                                                 handler:^(UIAlertAction * action) {
                                                                    
                                                                    if (weakSelf)
                                                                    {
@@ -2651,8 +2715,9 @@ TableViewSectionsDelegate>
                                                                    
                                                                }]];
                 
-                [currentAlert mxk_setAccessibilityIdentifier: @"SettingsVCUnignoreAlert"];
-                [self presentViewController:currentAlert animated:YES completion:nil];
+                [unignorePrompt mxk_setAccessibilityIdentifier: @"SettingsVCUnignoreAlert"];
+                [self presentViewController:unignorePrompt animated:YES completion:nil];
+                currentAlert = unignorePrompt;
             }
         }
         else if (section == SECTION_TAG_ABOUT)
@@ -2838,9 +2903,9 @@ TableViewSectionsDelegate>
             }
             
             // Remove ?
-            currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n settingsRemovePromptTitle] message:promptMsg preferredStyle:UIAlertControllerStyleAlert];
+            UIAlertController *removePrompt = [UIAlertController alertControllerWithTitle:[VectorL10n settingsRemovePromptTitle] message:promptMsg preferredStyle:UIAlertControllerStyleAlert];
             
-            [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+            [removePrompt addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                              style:UIAlertActionStyleCancel
                                                            handler:^(UIAlertAction * action) {
                                                                
@@ -2852,7 +2917,7 @@ TableViewSectionsDelegate>
                                                                
                                                            }]];
             
-            [currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n remove]
+            [removePrompt addAction:[UIAlertAction actionWithTitle:[VectorL10n remove]
                                                              style:UIAlertActionStyleDefault
                                                            handler:^(UIAlertAction * action) {
                                                                
@@ -2892,8 +2957,9 @@ TableViewSectionsDelegate>
                                                                
                                                            }]];
             
-            [currentAlert mxk_setAccessibilityIdentifier: @"SettingsVCRemove3PIDAlert"];
-            [self presentViewController:currentAlert animated:YES completion:nil];
+            [removePrompt mxk_setAccessibilityIdentifier: @"SettingsVCRemove3PIDAlert"];
+            [self presentViewController:removePrompt animated:YES completion:nil];
+            currentAlert = removePrompt;
         }
     }
 }
@@ -2915,9 +2981,9 @@ TableViewSectionsDelegate>
         NSString *title = [VectorL10n settingsNotificationsDisabledAlertTitle];
         NSString *message = [VectorL10n settingsNotificationsDisabledAlertMessage];
         
-        currentAlert = [UIAlertController alertControllerWithTitle:title message:message preferredStyle:UIAlertControllerStyleAlert];
+        UIAlertController *showSettingsPrompt = [UIAlertController alertControllerWithTitle:title message:message preferredStyle:UIAlertControllerStyleAlert];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+        [showSettingsPrompt addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
                                                          style:UIAlertActionStyleCancel
                                                        handler:^(UIAlertAction * action) {
                                                            
@@ -2941,13 +3007,14 @@ TableViewSectionsDelegate>
                                                             }
                                                         }];
         
-        [currentAlert addAction:settingsAction];
-        currentAlert.preferredAction = settingsAction;
+        [showSettingsPrompt addAction:settingsAction];
+        showSettingsPrompt.preferredAction = settingsAction;
         
-        [currentAlert mxk_setAccessibilityIdentifier: @"SettingsVCPushNotificationsAlert"];
-        [self presentViewController:currentAlert animated:YES completion:nil];
+        [showSettingsPrompt mxk_setAccessibilityIdentifier: @"SettingsVCPushNotificationsAlert"];
+        [self presentViewController:showSettingsPrompt animated:YES completion:nil];
+        currentAlert = showSettingsPrompt;
         
-        // Keep off the switch
+        // Keep the the switch off.
         sender.on = NO;
     }
     else if ([MXKAccountManager sharedManager].activeAccounts.count)
@@ -3057,27 +3124,20 @@ TableViewSectionsDelegate>
     [[MXKRoomDataSourceManager sharedManagerForMatrixSession:self.mainSession] reset];
 }
 
-- (void)toggleSendCrashReport:(id)sender
+- (void)toggleAnalytics:(UISwitch *)sender
 {
-    BOOL enable = RiotSettings.shared.enableCrashReport;
-    if (enable)
+    if (sender.isOn)
     {
-        MXLogDebug(@"[SettingsViewController] disable automatic crash report and analytics sending");
-        
-        RiotSettings.shared.enableCrashReport = NO;
-        
-        [[Analytics sharedInstance] stop];
-        
-        // Remove potential crash file.
-        [MXLogger deleteCrashLog];
+        MXLogDebug(@"[SettingsViewController] enable automatic crash report and analytics sending");
+        [Analytics.shared optInWith:self.mainSession];
     }
     else
     {
-        MXLogDebug(@"[SettingsViewController] enable automatic crash report and analytics sending");
+        MXLogDebug(@"[SettingsViewController] disable automatic crash report and analytics sending");
+        [Analytics.shared optOut];
         
-        RiotSettings.shared.enableCrashReport = YES;
-        
-        [[Analytics sharedInstance] start];
+        // Remove potential crash file.
+        [MXLogger deleteCrashLog];
     }
 }
 
@@ -3093,6 +3153,11 @@ TableViewSectionsDelegate>
     RiotSettings.shared.enableRingingForGroupCalls = sender.isOn;
 }
 
+- (void)toggleEnablePolls:(UISwitch *)sender
+{
+    RiotSettings.shared.roomScreenAllowPollsAction = sender.isOn;
+}
+
 - (void)togglePinRoomsWithMissedNotif:(UISwitch *)sender
 {
     RiotSettings.shared.pinRoomsWithMissedNotificationsOnHome = sender.isOn;
@@ -3336,11 +3401,11 @@ TableViewSectionsDelegate>
         
         [currentAlert dismissViewControllerAnimated:NO completion:nil];
         
-        currentAlert = [UIAlertController alertControllerWithTitle:title message:msg preferredStyle:UIAlertControllerStyleAlert];
+        UIAlertController *errorAlert = [UIAlertController alertControllerWithTitle:title message:msg preferredStyle:UIAlertControllerStyleAlert];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
-                                                         style:UIAlertActionStyleDefault
-                                                       handler:^(UIAlertAction * action) {
+        [errorAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+                                                       style:UIAlertActionStyleDefault
+                                                     handler:^(UIAlertAction * action) {
                                                            
                                                            if (weakSelf)
                                                            {
@@ -3361,9 +3426,9 @@ TableViewSectionsDelegate>
                                                            
                                                        }]];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n retry]
-                                                         style:UIAlertActionStyleDefault
-                                                       handler:^(UIAlertAction * action) {
+        [errorAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n retry]
+                                                       style:UIAlertActionStyleDefault
+                                                     handler:^(UIAlertAction * action) {
                                                            
                                                            if (weakSelf)
                                                            {
@@ -3377,8 +3442,9 @@ TableViewSectionsDelegate>
                                                            
                                                        }]];
         
-        [currentAlert mxk_setAccessibilityIdentifier: @"SettingsVCSaveChangesFailedAlert"];
-        [rootViewController presentViewController:currentAlert animated:YES completion:nil];
+        [errorAlert mxk_setAccessibilityIdentifier: @"SettingsVCSaveChangesFailedAlert"];
+        [rootViewController presentViewController:errorAlert animated:YES completion:nil];
+        currentAlert = errorAlert;
     }
 }
 
@@ -3399,13 +3465,13 @@ TableViewSectionsDelegate>
         
         [currentAlert dismissViewControllerAnimated:NO completion:nil];
         
-        currentAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n accountErrorEmailWrongTitle]
-                                                           message:[MatrixKitL10n accountErrorEmailWrongDescription]
-                                                    preferredStyle:UIAlertControllerStyleAlert];
+        UIAlertController *errorAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n accountErrorEmailWrongTitle]
+                                                                            message:[MatrixKitL10n accountErrorEmailWrongDescription]
+                                                                     preferredStyle:UIAlertControllerStyleAlert];
         
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
-                                                         style:UIAlertActionStyleDefault
-                                                       handler:^(UIAlertAction * action) {
+        [errorAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
+                                                       style:UIAlertActionStyleDefault
+                                                     handler:^(UIAlertAction * action) {
                                                            
                                                            if (weakSelf)
                                                            {
@@ -3416,8 +3482,9 @@ TableViewSectionsDelegate>
                                                            
                                                        }]];
         
-        [currentAlert mxk_setAccessibilityIdentifier: @"SettingsVCAddEmailAlert"];
-        [self presentViewController:currentAlert animated:YES completion:nil];
+        [errorAlert mxk_setAccessibilityIdentifier: @"SettingsVCAddEmailAlert"];
+        [self presentViewController:errorAlert animated:YES completion:nil];
+        currentAlert = errorAlert;
 
         return;
     }
@@ -3509,11 +3576,11 @@ TableViewSectionsDelegate>
         [currentAlert dismissViewControllerAnimated:NO completion:nil];
         __weak typeof(self) weakSelf = self;
 
-        currentAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n accountErrorMsisdnWrongTitle]
-                                                           message:[MatrixKitL10n accountErrorMsisdnWrongDescription]
-                                                    preferredStyle:UIAlertControllerStyleAlert];
+        UIAlertController *errorAlert = [UIAlertController alertControllerWithTitle:[MatrixKitL10n accountErrorMsisdnWrongTitle]
+                                                                            message:[MatrixKitL10n accountErrorMsisdnWrongDescription]
+                                                                     preferredStyle:UIAlertControllerStyleAlert];
 
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
+        [errorAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                                          style:UIAlertActionStyleDefault
                                                        handler:^(UIAlertAction * action) {
 
@@ -3525,8 +3592,9 @@ TableViewSectionsDelegate>
 
                                                        }]];
 
-        [currentAlert mxk_setAccessibilityIdentifier: @"SettingsVCAddMsisdnAlert"];
-        [self presentViewController:currentAlert animated:YES completion:nil];
+        [errorAlert mxk_setAccessibilityIdentifier: @"SettingsVCAddMsisdnAlert"];
+        [self presentViewController:errorAlert animated:YES completion:nil];
+        currentAlert = errorAlert;
 
         return;
     }
@@ -3882,9 +3950,9 @@ TableViewSectionsDelegate>
                         {
                             [self->currentAlert dismissViewControllerAnimated:NO completion:nil];
                             
-                            self->currentAlert = [UIAlertController alertControllerWithTitle:nil message:[VectorL10n settingsPasswordUpdated] preferredStyle:UIAlertControllerStyleAlert];
+                            UIAlertController *successAlert = [UIAlertController alertControllerWithTitle:nil message:[VectorL10n settingsPasswordUpdated] preferredStyle:UIAlertControllerStyleAlert];
                             
-                            [self->currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
+                            [successAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                                                              style:UIAlertActionStyleDefault
                                                                            handler:^(UIAlertAction * action) {
                                                                                
@@ -3904,8 +3972,9 @@ TableViewSectionsDelegate>
                                                                                
                                                                            }]];
                             
-                            [self->currentAlert mxk_setAccessibilityIdentifier:@"SettingsVCOnPasswordUpdatedAlert"];
-                            [self presentViewController:self->currentAlert animated:YES completion:nil];
+                            [successAlert mxk_setAccessibilityIdentifier:@"SettingsVCOnPasswordUpdatedAlert"];
+                            [self presentViewController:successAlert animated:YES completion:nil];
+                            self->currentAlert = successAlert;
                         }
                         else
                         {
@@ -3930,9 +3999,9 @@ TableViewSectionsDelegate>
                         {
                             [self->currentAlert dismissViewControllerAnimated:NO completion:nil];
                             
-                            self->currentAlert = [UIAlertController alertControllerWithTitle:nil message:[VectorL10n settingsFailToUpdatePassword] preferredStyle:UIAlertControllerStyleAlert];
+                            UIAlertController *errorAlert = [UIAlertController alertControllerWithTitle:nil message:[VectorL10n settingsFailToUpdatePassword] preferredStyle:UIAlertControllerStyleAlert];
                             
-                            [self->currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
+                            [errorAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
                                                                                    style:UIAlertActionStyleDefault
                                                                                  handler:^(UIAlertAction * action) {
                                                                                      
@@ -3953,8 +4022,9 @@ TableViewSectionsDelegate>
                                                                                      
                                                                                  }]];
                             
-                            [self->currentAlert mxk_setAccessibilityIdentifier:@"SettingsVCPasswordChangeFailedAlert"];
-                            [rootViewController presentViewController:self->currentAlert animated:YES completion:nil];
+                            [errorAlert mxk_setAccessibilityIdentifier:@"SettingsVCPasswordChangeFailedAlert"];
+                            [rootViewController presentViewController:errorAlert animated:YES completion:nil];
+                            self->currentAlert = errorAlert;
                         }
                     }
                     
diff --git a/Riot/Modules/Settings/Views/DeviceView.h b/Riot/Modules/Settings/Views/DeviceView.h
index e3e309e4a..6df0cf86e 100644
--- a/Riot/Modules/Settings/Views/DeviceView.h
+++ b/Riot/Modules/Settings/Views/DeviceView.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 
 @interface DeviceView : MXKDeviceView
diff --git a/Riot/Modules/Settings/Views/DeviceView.m b/Riot/Modules/Settings/Views/DeviceView.m
index 7f1325990..dc8ed4578 100644
--- a/Riot/Modules/Settings/Views/DeviceView.m
+++ b/Riot/Modules/Settings/Views/DeviceView.m
@@ -18,7 +18,7 @@
 #import "DeviceView.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @implementation DeviceView
 
diff --git a/Riot/Modules/Settings/Views/TableViewCellWithPhoneNumberTextField.h b/Riot/Modules/Settings/Views/TableViewCellWithPhoneNumberTextField.h
index e237f5f31..f2b43da4f 100644
--- a/Riot/Modules/Settings/Views/TableViewCellWithPhoneNumberTextField.h
+++ b/Riot/Modules/Settings/Views/TableViewCellWithPhoneNumberTextField.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  'TableViewCellWithPhoneNumberTextField' inherits 'MXKTableViewCellWithLabelAndTextField' class.
diff --git a/Riot/Modules/Settings/Views/TableViewCellWithPhoneNumberTextField.m b/Riot/Modules/Settings/Views/TableViewCellWithPhoneNumberTextField.m
index 5c03e1fd3..4cfc489a3 100644
--- a/Riot/Modules/Settings/Views/TableViewCellWithPhoneNumberTextField.m
+++ b/Riot/Modules/Settings/Views/TableViewCellWithPhoneNumberTextField.m
@@ -17,7 +17,7 @@
 #import "TableViewCellWithPhoneNumberTextField.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "NBPhoneNumberUtil.h"
 
diff --git a/Riot/Modules/SideMenu/SideMenuViewController.swift b/Riot/Modules/SideMenu/SideMenuViewController.swift
index f7fecb60c..cec36f497 100644
--- a/Riot/Modules/SideMenu/SideMenuViewController.swift
+++ b/Riot/Modules/SideMenu/SideMenuViewController.swift
@@ -48,6 +48,7 @@ final class SideMenuViewController: UIViewController {
     private var keyboardAvoider: KeyboardAvoider?
     private var errorPresenter: MXKErrorPresentation!
     private var activityPresenter: ActivityIndicatorPresenter!
+    private var screenTimer = AnalyticsScreenTimer(screen: .sidebar)
     
     private var sideMenuActionViews: [SideMenuActionView] = []
     private weak var sideMenuVersionView: SideMenuVersionView?
@@ -86,8 +87,14 @@ final class SideMenuViewController: UIViewController {
         navigationController?.setNavigationBarHidden(true, animated: animated)
     }
     
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        screenTimer.start()
+    }
+    
     override func viewDidDisappear(_ animated: Bool) {
         super.viewDidDisappear(animated)
+        screenTimer.stop()
     }
     
     override var preferredStatusBarStyle: UIStatusBarStyle {
diff --git a/Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift b/Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift
index 3f9924531..62770e05e 100644
--- a/Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift
+++ b/Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift
@@ -131,6 +131,9 @@ final class SpaceListViewModel: SpaceListViewModelType {
     
     private func loadData() {
         guard let session = self.userSessionsService.mainUserSession?.matrixSession else {
+            // If there is no main session, reset current selection and give an empty section list
+            // It can happen when the user make a clear cache or logout 
+            self.resetList()
             return
         }
 
@@ -243,4 +246,15 @@ final class SpaceListViewModel: SpaceListViewModelType {
             return spaceViewData.spaceId
         }
     }
+    
+    private func resetList() {
+        self.sections = []
+        
+        let selectedIndexPath = IndexPath(row: 0, section: 0)
+        
+        self.selectedIndexPath = selectedIndexPath
+        self.homeIndexPath = selectedIndexPath
+        
+        self.update(viewState: .loaded([]))
+    }
 }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleImageContent.swift b/Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/PaginationLoadingViewCell.swift
similarity index 61%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleImageContent.swift
rename to Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/PaginationLoadingViewCell.swift
index 2a9eda6f8..94917b973 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleImageContent.swift
+++ b/Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/PaginationLoadingViewCell.swift
@@ -15,10 +15,18 @@
 //
 
 import UIKit
+import Reusable
 
-/// An image sent as a message.
-struct TemplateRoomChatMessageImageContent {
-    var image: UIImage
+class PaginationLoadingViewCell: UITableViewCell, NibReusable, Themable {
+    
+    // MARK: - Properties
+    
+    @IBOutlet var activityIndicator: UIActivityIndicatorView!
+    
+    // MARK: - Public
+    
+    func update(theme: Theme) {
+        self.activityIndicator.tintColor = theme.colors.tertiaryContent
+        self.activityIndicator.startAnimating()
+    }
 }
-
-extension TemplateRoomChatMessageImageContent: Equatable { }
diff --git a/Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/PaginationLoadingViewCell.xib b/Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/PaginationLoadingViewCell.xib
new file mode 100644
index 000000000..28533154f
--- /dev/null
+++ b/Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/PaginationLoadingViewCell.xib
@@ -0,0 +1,37 @@
+<?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">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="68" id="gUf-SL-Ia7" customClass="PaginationLoadingViewCell" customModule="Riot" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="68"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gUf-SL-Ia7" id="YoL-49-1Hj">
+                <rect key="frame" x="0.0" y="0.0" width="320" height="68"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" animating="YES" style="large" translatesAutoresizingMaskIntoConstraints="NO" id="Tld-uY-uDU">
+                        <rect key="frame" x="141.5" y="17" width="37" height="34"/>
+                    </activityIndicatorView>
+                </subviews>
+                <constraints>
+                    <constraint firstAttribute="bottom" secondItem="Tld-uY-uDU" secondAttribute="bottom" constant="17" id="cib-oa-sGv"/>
+                    <constraint firstItem="Tld-uY-uDU" firstAttribute="top" secondItem="YoL-49-1Hj" secondAttribute="top" constant="17" id="fuX-uS-ylN"/>
+                    <constraint firstItem="Tld-uY-uDU" firstAttribute="centerX" secondItem="YoL-49-1Hj" secondAttribute="centerX" id="ots-Sg-fHU"/>
+                </constraints>
+            </tableViewCellContentView>
+            <viewLayoutGuide key="safeArea" id="wBe-er-msB"/>
+            <connections>
+                <outlet property="activityIndicator" destination="Tld-uY-uDU" id="mq3-lG-y9D"/>
+            </connections>
+            <point key="canvasLocation" x="137.68115942028987" y="107.14285714285714"/>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift b/Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
index 664493c2e..fc04d7473 100644
--- a/Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
+++ b/Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
@@ -41,10 +41,11 @@ final class SpaceExploreRoomViewController: UIViewController {
     private var titleView: MainTitleView!
     private var emptyView: RootTabEmptyView!
     private var plusButtonImageView: UIImageView!
+    private var hasMore: Bool = false
     
     private var itemDataList: [SpaceExploreRoomListItemViewData] = [] {
         didSet {
-            tableView.reloadData()
+            self.tableView.reloadData()
         }
     }
     
@@ -168,6 +169,7 @@ final class SpaceExploreRoomViewController: UIViewController {
         self.tableView.allowsSelection = true
         self.tableView.register(cellType: SpaceChildViewCell.self)
         self.tableView.register(cellType: SpaceChildSpaceViewCell.self)
+        self.tableView.register(cellType: PaginationLoadingViewCell.self)
         self.tableView.tableFooterView = UIView()
     }
 
@@ -177,7 +179,8 @@ final class SpaceExploreRoomViewController: UIViewController {
             self.renderLoading()
         case .spaceNameFound(let spaceName):
             self.titleView.subtitleLabel.text = spaceName
-        case .loaded(let children):
+        case .loaded(let children, let hasMore):
+            self.hasMore = hasMore
             self.renderLoaded(children: children)
         case .emptySpace:
             self.renderEmptySpace()
@@ -240,10 +243,16 @@ extension SpaceExploreRoomViewController: UITableViewDataSource {
     }
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return self.itemDataList.count
+        return self.itemDataList.count + (self.hasMore ? 1 : 0)
     }
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        guard indexPath.row < self.itemDataList.count else {
+            let cell = tableView.dequeueReusableCell(for: indexPath, cellType: PaginationLoadingViewCell.self)
+            cell.update(theme: self.theme)
+            return cell
+        }
+        
         let viewData = self.itemDataList[indexPath.row]
         
         let cell = viewData.childInfo.roomType == .space ? tableView.dequeueReusableCell(for: indexPath, cellType: SpaceChildSpaceViewCell.self) : tableView.dequeueReusableCell(for: indexPath, cellType: SpaceChildViewCell.self)
@@ -262,6 +271,12 @@ extension SpaceExploreRoomViewController: UITableViewDelegate {
         tableView.deselectRow(at: indexPath, animated: true)
         self.viewModel.process(viewAction: .complete(self.itemDataList[indexPath.row], tableView.cellForRow(at: indexPath)))
     }
+    
+    func tableView(_ tableView: UITableView, willDisplay cell: UITableViewCell, forRowAt indexPath: IndexPath) {
+        if self.hasMore && indexPath.row >= self.itemDataList.count {
+            self.viewModel.process(viewAction: .loadData)
+        }
+    }
 }
 
 // MARK: - SpaceExploreRoomViewModelViewDelegate
diff --git a/Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewModel.swift b/Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewModel.swift
index 349530bb9..c9f54491c 100644
--- a/Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewModel.swift
+++ b/Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewModel.swift
@@ -29,13 +29,15 @@ final class SpaceExploreRoomViewModel: SpaceExploreRoomViewModelType {
     private let spaceName: String?
 
     private var currentOperation: MXHTTPOperation?
+    private var nextBatch: String?
+    private var rootSpaceChildInfo: MXSpaceChildInfo?
     
     private var itemDataList: [SpaceExploreRoomListItemViewData] = [] {
         didSet {
             self.updateFilteredItemList()
         }
     }
-    private var searchKeyword: String? = nil {
+    private var searchKeyword: String? {
         didSet {
             self.updateFilteredItemList()
         }
@@ -49,7 +51,7 @@ final class SpaceExploreRoomViewModel: SpaceExploreRoomViewModelType {
                     self.update(viewState: .emptyFilterResult)
                 }
             } else {
-                self.update(viewState: .loaded(self.filteredItemDataList))
+                self.update(viewState: .loaded(self.filteredItemDataList, self.nextBatch != nil && (self.searchKeyword ?? "").isEmpty))
             }
         }
     }
@@ -90,32 +92,51 @@ final class SpaceExploreRoomViewModel: SpaceExploreRoomViewModelType {
     // MARK: - Private
     
     private func loadData() {
+        guard self.currentOperation == nil else {
+            return
+        }
+        
         if let spaceName = self.spaceName {
             self.update(viewState: .spaceNameFound(spaceName))
         }
 
-        self.update(viewState: .loading)
+        if self.nextBatch == nil {
+            self.update(viewState: .loading)
+        }
         
-        self.currentOperation = self.session.spaceService.getSpaceChildrenForSpace(withId: self.spaceId, suggestedOnly: false, limit: nil, completion: { [weak self] response in
+        self.currentOperation = self.session.spaceService.getSpaceChildrenForSpace(withId: self.spaceId, suggestedOnly: false, limit: nil, maxDepth: 1, paginationToken: self.nextBatch, completion: { [weak self] response in
             guard let self = self else {
                 return
             }
             
             switch response {
             case .success(let spaceSummary):
-                self.itemDataList = spaceSummary.childInfos.compactMap({ childInfo in
-                    guard childInfo.parentIds.contains(self.spaceId) else {
+                self.nextBatch = spaceSummary.nextBatch
+                // The MXSpaceChildInfo of the root space is available only in the first batch
+                if let rootSpaceInfo = spaceSummary.spaceInfo {
+                    self.rootSpaceChildInfo = rootSpaceInfo
+                }
+                
+                let batchedItemDataList: [SpaceExploreRoomListItemViewData] = spaceSummary.childInfos.compactMap({ childInfo in
+                    guard let rootSpaceInfo = self.rootSpaceChildInfo, rootSpaceInfo.childrenIds.contains(childInfo.childRoomId) else {
                         return nil
                     }
                     
-                    let avatarViewData = AvatarViewData(matrixItemId: childInfo.childRoomId, displayName: childInfo.displayName, avatarUrl: childInfo.avatarUrl, mediaManager: self.session.mediaManager, fallbackImage: .matrixItem(childInfo.childRoomId, childInfo.name))
+                    let avatarViewData = AvatarViewData(matrixItemId: childInfo.childRoomId,
+                                                        displayName: childInfo.displayName,
+                                                        avatarUrl: childInfo.avatarUrl,
+                                                        mediaManager: self.session.mediaManager,
+                                                        fallbackImage: .matrixItem(childInfo.childRoomId, childInfo.name))
                     return SpaceExploreRoomListItemViewData(childInfo: childInfo, avatarViewData: avatarViewData)
                 }).sorted(by: { item1, item2 in
                     return !item2.childInfo.suggested || item1.childInfo.suggested
                 })
+                self.itemDataList.append(contentsOf: batchedItemDataList)
             case .failure(let error):
                 self.update(viewState: .error(error))
             }
+            
+            self.currentOperation = nil
         })
     }
     
diff --git a/Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewState.swift b/Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewState.swift
index c7c8ae50e..52203c190 100644
--- a/Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewState.swift
+++ b/Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewState.swift
@@ -22,7 +22,7 @@ import Foundation
 enum SpaceExploreRoomViewState {
     case loading
     case spaceNameFound(_ spaceName: String)
-    case loaded(_ children: [SpaceExploreRoomListItemViewData])
+    case loaded(_ children: [SpaceExploreRoomListItemViewData], _ hasMore: Bool)
     case emptySpace
     case emptyFilterResult
     case error(Error)
diff --git a/Riot/Modules/SplitView/SplitViewCoordinator.swift b/Riot/Modules/SplitView/SplitViewCoordinator.swift
index 479ebf702..ee1ad5af7 100644
--- a/Riot/Modules/SplitView/SplitViewCoordinator.swift
+++ b/Riot/Modules/SplitView/SplitViewCoordinator.swift
@@ -125,20 +125,20 @@ final class SplitViewCoordinator: NSObject, SplitViewCoordinatorType {
     }
             
     // TODO: Do not expose publicly this method
-    func restorePlaceholderDetails() {                
+    func resetDetails(animated: Bool) {                
         // Be sure that the primary is then visible too.
         if splitViewController.displayMode == .primaryHidden {
             splitViewController.preferredDisplayMode = .allVisible
         }
         
-        self.resetDetailNavigationControllerWithPlaceholder(animated: false)
+        self.resetDetailNavigationController(animated: animated)
 
         // Release the current selected item (room/contact/group...).
         self.tabBarCoordinator?.releaseSelectedItems()
-    }
+    }   
     
     func popToHome(animated: Bool, completion: (() -> Void)?) {
-        self.resetDetailNavigationControllerWithPlaceholder(animated: animated)
+        self.resetDetails(animated: animated)
 
         // Force back to the main screen if this is not the one that is displayed
         self.tabBarCoordinator?.popToHome(animated: animated, completion: completion)
@@ -172,6 +172,17 @@ final class SplitViewCoordinator: NSObject, SplitViewCoordinatorType {
         // Set placeholder screen as root controller of detail navigation controller
         let placeholderDetailsVC = self.createPlaceholderDetailsViewController()
         detailNavigationRouter.setRootModule(placeholderDetailsVC, hideNavigationBar: false, animated: animated, popCompletion: nil)
+    }         
+    
+    private func resetDetailNavigationController(animated: Bool) {
+        
+        if self.splitViewController.isCollapsed {
+            if let topMostNavigationController = self.selectedNavigationRouter?.modules.last as? UINavigationController, topMostNavigationController == self.detailNavigationController {                
+                self.selectedNavigationRouter?.popModule(animated: animated)
+            }            
+        } else {
+            self.resetDetailNavigationControllerWithPlaceholder(animated: animated)
+        }                
     }
     
     private func isPlaceholderShown(from secondaryViewController: UIViewController) -> Bool {
@@ -270,7 +281,7 @@ extension SplitViewCoordinator: UISplitViewControllerDelegate {
         }
         
         // Restore detail navigation controller with placeholder as root
-        self.resetDetailNavigationControllerWithPlaceholder(animated: false)
+        self.resetDetailNavigationController(animated: false)
         
         // Return up to date detail navigation controller
         // In any cases `detailNavigationController` will be used as secondary view of the split view controller.
@@ -353,6 +364,6 @@ extension SplitViewCoordinator: SplitViewMasterPresentableDelegate {
     }
     
     func splitViewMasterPresentableWantsToResetDetail(_ presentable: Presentable) {
-        self.resetDetailNavigationControllerWithPlaceholder(animated: false)
+        self.resetDetails(animated: false)
     }
 }
diff --git a/Riot/Modules/SplitView/SplitViewCoordinatorType.swift b/Riot/Modules/SplitView/SplitViewCoordinatorType.swift
index e49a54879..4fd2cfef6 100644
--- a/Riot/Modules/SplitView/SplitViewCoordinatorType.swift
+++ b/Riot/Modules/SplitView/SplitViewCoordinatorType.swift
@@ -30,8 +30,10 @@ protocol SplitViewCoordinatorType: Coordinator, Presentable {
     /// - Parameter spaceId: The id of the Space to use.
     func start(with spaceId: String?)
     
+    /// Restore navigation stack and show home screen
     func popToHome(animated: Bool, completion: (() -> Void)?)
-    
+        
     // TODO: Do not expose publicly this method
-    func restorePlaceholderDetails()
+    /// Remove detail screens and display placeholder if needed 
+    func resetDetails(animated: Bool)
 }
diff --git a/Riot/Modules/StartChat/StartChatViewController.m b/Riot/Modules/StartChat/StartChatViewController.m
index 3ee8985ec..4f2d71dc1 100644
--- a/Riot/Modules/StartChat/StartChatViewController.m
+++ b/Riot/Modules/StartChat/StartChatViewController.m
@@ -17,7 +17,7 @@
 
 #import "StartChatViewController.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 #import "MXSession+Riot.h"
 
 @interface StartChatViewController () <UITableViewDataSource, UISearchBarDelegate, ContactsTableViewControllerDelegate, InviteFriendsHeaderViewDelegate>
@@ -73,8 +73,6 @@
 {
     [super finalizeInit];
     
-    self.screenName = @"StartChat";
-    
     _isAddParticipantSearchBarEditing = NO;
     
     // Prepare room participants
@@ -82,6 +80,8 @@
     
     // Assign itself as delegate
     self.contactsTableViewControllerDelegate = self;
+    
+    self.screenTimer = [[AnalyticsScreenTimer alloc] initWithScreen:AnalyticsScreenStartChat];
 }
 
 - (void)viewDidLoad
diff --git a/Riot/Modules/TabBar/MasterTabBarController.h b/Riot/Modules/TabBar/MasterTabBarController.h
index 8207629a4..b607c0ea9 100644
--- a/Riot/Modules/TabBar/MasterTabBarController.h
+++ b/Riot/Modules/TabBar/MasterTabBarController.h
@@ -15,8 +15,6 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
-
 #import "AuthenticationViewController.h"
 
 #import "RoomPreviewData.h"
@@ -195,5 +193,6 @@ typedef NS_ENUM(NSUInteger, MasterTabBarIndex) {
 - (void)masterTabBarController:(MasterTabBarController *)masterTabBarController didSelectRoomPreviewWithParameters:(RoomPreviewNavigationParameters*)roomPreviewNavigationParameters completion:(void (^)(void))completion;
 - (void)masterTabBarController:(MasterTabBarController *)masterTabBarController didSelectContact:(MXKContact*)contact withPresentationParameters:(ScreenPresentationParameters*)presentationParameters;
 - (void)masterTabBarController:(MasterTabBarController *)masterTabBarController didSelectGroup:(MXGroup*)group inMatrixSession:(MXSession*)matrixSession presentationParameters:(ScreenPresentationParameters*)presentationParameters;
+- (void)masterTabBarController:(MasterTabBarController *)masterTabBarController shouldPresentAnalyticsPromptForMatrixSession:(MXSession*)matrixSession;
 
 @end
diff --git a/Riot/Modules/TabBar/MasterTabBarController.m b/Riot/Modules/TabBar/MasterTabBarController.m
index 3cca72eb7..6d4e175b8 100644
--- a/Riot/Modules/TabBar/MasterTabBarController.m
+++ b/Riot/Modules/TabBar/MasterTabBarController.m
@@ -27,7 +27,7 @@
 #import "SettingsViewController.h"
 #import "SecurityViewController.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface MasterTabBarController () <AuthenticationViewControllerDelegate, UITabBarControllerDelegate>
 {
@@ -70,6 +70,11 @@
 
 @property(nonatomic) BOOL reviewSessionAlertHasBeenDisplayed;
 
+/**
+ A flag to indicate that the analytics prompt should be shown during `-addMatrixSession:`.
+ */
+@property(nonatomic) BOOL presentAnalyticsPromptOnAddSession;
+
 @end
 
 @implementation MasterTabBarController
@@ -196,11 +201,18 @@
 
     if (!authIsShown)
     {
-        // Check whether the user has been already prompted to send crash reports.
-        // (Check whether 'enableCrashReport' flag has been set once)        
-        if (!RiotSettings.shared.isEnableCrashReportHasBeenSetOnce)
+        // Check whether the user should be prompted to send analytics.
+        if (Analytics.shared.shouldShowAnalyticsPrompt)
         {
-            [self promptUserBeforeUsingAnalytics];
+            MXSession *mxSession = self.mxSessions.firstObject;
+            if (mxSession)
+            {
+                [self promptUserBeforeUsingAnalyticsForSession:mxSession];
+            }
+            else
+            {
+                self.presentAnalyticsPromptOnAddSession = YES;
+            }
         }
         
         [self refreshTabBarBadges];
@@ -405,6 +417,12 @@
         return;
     }
     
+    if (self.presentAnalyticsPromptOnAddSession)
+    {
+        self.presentAnalyticsPromptOnAddSession = NO;
+        [self promptUserBeforeUsingAnalyticsForSession:mxSession];
+    }
+    
     // Check whether the controller'€™s view is loaded into memory.
     if (self.homeViewController)
     {
@@ -921,50 +939,14 @@
 
 #pragma mark -
 
-- (void)promptUserBeforeUsingAnalytics
+- (void)promptUserBeforeUsingAnalyticsForSession:(MXSession *)mxSession
 {
-    MXLogDebug(@"[MasterTabBarController]: Invite the user to send crash reports");
-    
-    __weak typeof(self) weakSelf = self;
-    
-    [currentAlert dismissViewControllerAnimated:NO completion:nil];
-    
-    NSString *appDisplayName = [[NSBundle mainBundle] infoDictionary][@"CFBundleDisplayName"];
-    
-    currentAlert = [UIAlertController alertControllerWithTitle:[VectorL10n googleAnalyticsUsePrompt:appDisplayName] message:nil preferredStyle:UIAlertControllerStyleAlert];
-    
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n no]
-                                                     style:UIAlertActionStyleDefault
-                                                   handler:^(UIAlertAction * action) {
-                                                       
-                                                       RiotSettings.shared.enableCrashReport = NO;
-                                                       
-                                                       if (weakSelf)
-                                                       {
-                                                           typeof(self) self = weakSelf;
-                                                           self->currentAlert = nil;
-                                                       }
-                                                       
-                                                   }]];
-    
-    [currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n yes]
-                                                     style:UIAlertActionStyleDefault
-                                                   handler:^(UIAlertAction * action) {
-                                                                                                              
-                                                       RiotSettings.shared.enableCrashReport = YES;
-                                                       
-                                                       if (weakSelf)
-                                                       {
-                                                           typeof(self) self = weakSelf;
-                                                           self->currentAlert = nil;
-                                                       }
-
-                                                       [[Analytics sharedInstance] start];
-                                                       
-                                                   }]];
-    
-    [currentAlert mxk_setAccessibilityIdentifier: @"HomeVCUseAnalyticsAlert"];
-    [self presentViewController:currentAlert animated:YES completion:nil];
+    // Analytics aren't collected on iOS 12 & 13.
+    if (@available(iOS 14.0, *))
+    {
+        MXLogDebug(@"[MasterTabBarController]: Invite the user to send analytics");
+        [self.masterTabBarDelegate masterTabBarController:self shouldPresentAnalyticsPromptForMatrixSession:mxSession];
+    }
 }
 
 #pragma mark - Review session
@@ -1021,7 +1003,7 @@
         return;
     }
     
-    NSArray<MXDeviceInfo*> *devices = [session.crypto.store devicesForUser:session.myUserId].allValues;
+    NSArray<MXDeviceInfo*> *devices = [session.crypto devicesForUser:session.myUserId].allValues;
     
     BOOL isUserHasOneUnverifiedDevice = NO;
     
diff --git a/Riot/Modules/TabBar/TabBarCoordinator.swift b/Riot/Modules/TabBar/TabBarCoordinator.swift
index 63bf354a2..ac72eb2eb 100644
--- a/Riot/Modules/TabBar/TabBarCoordinator.swift
+++ b/Riot/Modules/TabBar/TabBarCoordinator.swift
@@ -487,6 +487,19 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
         self.splitViewMasterPresentableDelegate?.splitViewMasterPresentableWantsToResetDetail(self)
     }
     
+    @available(iOS 14.0, *)
+    private func presentAnalyticsPrompt(with session: MXSession) {
+        let parameters = AnalyticsPromptCoordinatorParameters(session: session, navigationRouter: navigationRouter)
+        let coordinator = AnalyticsPromptCoordinator(parameters: parameters)
+        coordinator.completion = { [weak self, weak coordinator] in
+            guard let self = self, let coordinator = coordinator else { return }
+            self.remove(childCoordinator: coordinator)
+        }
+        
+        coordinator.start()
+        add(childCoordinator: coordinator)
+    }
+    
     // MARK: UserSessions management
     
     private func registerUserSessionsServiceNotifications() {
@@ -578,6 +591,12 @@ extension TabBarCoordinator: MasterTabBarControllerDelegate {
         
         self.masterTabBarController.navigationItem.leftBarButtonItem = sideMenuBarButtonItem
     }
+    
+    func masterTabBarController(_ masterTabBarController: MasterTabBarController!, shouldPresentAnalyticsPromptForMatrixSession matrixSession: MXSession!) {
+        if #available(iOS 14.0, *) {
+            presentAnalyticsPrompt(with: matrixSession)
+        }
+    }
 }
 
 // MARK: - RoomCoordinatorDelegate
diff --git a/Riot/Modules/UserDevices/UsersDevicesViewController.h b/Riot/Modules/UserDevices/UsersDevicesViewController.h
index 8e63d9968..3fad25b24 100644
--- a/Riot/Modules/UserDevices/UsersDevicesViewController.h
+++ b/Riot/Modules/UserDevices/UsersDevicesViewController.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 #import "DeviceTableViewCell.h"
 
diff --git a/Riot/Modules/UserDevices/UsersDevicesViewController.m b/Riot/Modules/UserDevices/UsersDevicesViewController.m
index 5d6a1f8eb..308f0afcd 100644
--- a/Riot/Modules/UserDevices/UsersDevicesViewController.m
+++ b/Riot/Modules/UserDevices/UsersDevicesViewController.m
@@ -17,7 +17,7 @@
 
 #import "UsersDevicesViewController.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface UsersDevicesViewController () <KeyVerificationCoordinatorBridgePresenterDelegate>
 {
@@ -120,9 +120,6 @@
 {
     [super viewWillAppear:animated];
 
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"UnknowDevices"];
-
     [self.tableView reloadData];
 }
 
diff --git a/Riot/Modules/UserDevices/Views/DeviceTableViewCell.h b/Riot/Modules/UserDevices/Views/DeviceTableViewCell.h
index b51cee2b5..9728603ca 100644
--- a/Riot/Modules/UserDevices/Views/DeviceTableViewCell.h
+++ b/Riot/Modules/UserDevices/Views/DeviceTableViewCell.h
@@ -14,7 +14,9 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import <MatrixSDK/MatrixSDK.h>
+
+#import "MatrixKit.h"
 
 /**
  The `DeviceTableViewCell` cell displays the information on a device.
diff --git a/Riot/Modules/UserDevices/Views/DeviceTableViewCell.m b/Riot/Modules/UserDevices/Views/DeviceTableViewCell.m
index 6ac1a31fa..7fde39ca4 100644
--- a/Riot/Modules/UserDevices/Views/DeviceTableViewCell.m
+++ b/Riot/Modules/UserDevices/Views/DeviceTableViewCell.m
@@ -18,7 +18,7 @@
 #import "DeviceTableViewCell.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "MXRoom+Riot.h"
 
diff --git a/Riot/SupportingFiles/Riot-Bridging-Header.h b/Riot/SupportingFiles/Riot-Bridging-Header.h
index 68dff2986..c5a22e8a7 100644
--- a/Riot/SupportingFiles/Riot-Bridging-Header.h
+++ b/Riot/SupportingFiles/Riot-Bridging-Header.h
@@ -3,7 +3,6 @@
 //
 
 @import MatrixSDK;
-@import MatrixKit;
 @import DTCoreText;
 
 #import "WebViewViewController.h"
@@ -45,3 +44,22 @@
 #import "GroupDetailsViewController.h"
 #import "RoomInputToolbarView.h"
 #import "NSArray+Element.h"
+#import "ShareItemSender.h"
+#import "HTMLFormatter.h"
+
+// MatrixKit common imports, shared with all targets
+#import "MatrixKit-Bridging-Header.h"
+
+// MatrixKit imports for the application target (Riot)
+#import "MXKBarButtonItem.h"
+#import "MXKPieChartView.h"
+#import "MXKErrorAlertPresentation.h"
+#import "MXKErrorPresentation.h"
+#import "MXKErrorViewModel.h"
+#import "MXKEncryptionKeysExportView.h"
+#import "MXKTableViewCellWithLabelAndSwitch.h"
+#import "MXKTableViewCellWithTextView.h"
+#import "MXKTableViewCellWithButton.h"
+#import "MXKRoomDataSourceManager.h"
+#import "MXRoom+Sync.h"
+#import "UIAlertController+MatrixKit.h"
diff --git a/Riot/Utils/AvatarGenerator.h b/Riot/Utils/AvatarGenerator.h
index 1c1625c78..2bd981d99 100644
--- a/Riot/Utils/AvatarGenerator.h
+++ b/Riot/Utils/AvatarGenerator.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import <UIKit/UIKit.h>
 
 /**
  `AvatarGenerator` class generate an avatar image from objects
diff --git a/Riot/Utils/AvatarGenerator.m b/Riot/Utils/AvatarGenerator.m
index efbf42b59..3a08f8165 100644
--- a/Riot/Utils/AvatarGenerator.m
+++ b/Riot/Utils/AvatarGenerator.m
@@ -19,11 +19,7 @@
 
 #import "ThemeService.h"
 
-#ifdef IS_SHARE_EXTENSION
-#import "RiotShareExtension-Swift.h"
-#else
-#import "Riot-Swift.h"
-#endif
+#import "GeneratedInterface-Swift.h"
 
 @implementation AvatarGenerator
 
diff --git a/Riot/Utils/EventFormatter.h b/Riot/Utils/EventFormatter.h
index 4952f1441..3d7a39b1e 100644
--- a/Riot/Utils/EventFormatter.h
+++ b/Riot/Utils/EventFormatter.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  Link string used in attributed strings to mark a keys re-request action.
diff --git a/Riot/Utils/EventFormatter.m b/Riot/Utils/EventFormatter.m
index 248850691..d97386aaa 100644
--- a/Riot/Utils/EventFormatter.m
+++ b/Riot/Utils/EventFormatter.m
@@ -18,7 +18,7 @@
 #import "EventFormatter.h"
 
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #import "WidgetManager.h"
 
@@ -342,6 +342,9 @@ static NSString *const kEventFormatterTimeFormat = @"HH:mm";
                            white-space: pre; \
                            -coretext-fontname: Menlo-Regular; \
                            font-size: small; \
+                           } \
+                           h1,h2 { \
+                           font-size: 1.2em; \
                            }", (unsigned long)bgColor];
         
         self.defaultTextColor = ThemeService.shared.theme.textPrimaryColor;
diff --git a/Riot/Utils/HTMLFormatter.h b/Riot/Utils/HTMLFormatter.h
new file mode 100644
index 000000000..605ee9d08
--- /dev/null
+++ b/Riot/Utils/HTMLFormatter.h
@@ -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/Foundation.h>
+#import <CoreGraphics/CoreGraphics.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface HTMLFormatter : NSObject
+
+/** Builds an attributed string from a string containing html.
+ @param htmlString The html string to use.
+ @param allowedTags The html tags that should be allowed.
+ @param fontSize The default font size to use.
+ 
+ Note: It is recommended to include "p" and "body" tags in
+ `allowedTags` as these are often added when parsing.
+ */
+- (NSAttributedString * _Nonnull)formatHTML:(NSString * _Nonnull)htmlString
+                            withAllowedTags:(NSArray<NSString *> * _Nonnull)allowedTags
+                                   fontSize:(CGFloat)fontSize;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Riot/Utils/HTMLFormatter.m b/Riot/Utils/HTMLFormatter.m
new file mode 100644
index 000000000..260ab83f5
--- /dev/null
+++ b/Riot/Utils/HTMLFormatter.m
@@ -0,0 +1,61 @@
+// 
+// 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 "HTMLFormatter.h"
+#import "GeneratedInterface-Swift.h"
+
+@implementation HTMLFormatter
+
+- (NSAttributedString *)formatHTML:(NSString *)htmlString withAllowedTags:(NSArray<NSString *> *)allowedTags fontSize:(CGFloat)fontSize
+{
+    // TODO: This method should be more general purpose and usable from MXKEventFormatter and GroupHomeViewController
+    // FIXME: The implementation is currently in Objective-C as there is a crash in the callback when implemented in Swift
+    UIFont *font = [UIFont systemFontOfSize:fontSize];
+    
+    // Do some sanitisation before finalizing the string
+    DTHTMLAttributedStringBuilderWillFlushCallback sanitizeCallback = ^(DTHTMLElement *element) {
+        [element sanitizeWith:allowedTags bodyFont:font imageHandler:nil];
+    };
+
+    NSDictionary *options = @{
+                              DTUseiOS6Attributes: @(YES),              // Enable it to be able to display the attributed string in a UITextView
+                              DTDefaultFontFamily: font.familyName,
+                              DTDefaultFontName: font.fontName,
+                              DTDefaultFontSize: @(font.pointSize),
+                              DTDefaultLinkDecoration: @(NO),
+                              DTWillFlushBlockCallBack: sanitizeCallback
+                              };
+
+    // Do not use the default HTML renderer of NSAttributedString because this method
+    // runs on the UI thread which we want to avoid because renderHTMLString is called
+    // most of the time from a background thread.
+    // Use DTCoreText HTML renderer instead.
+    // Using DTCoreText, which renders static string, helps to avoid code injection attacks
+    // that could happen with the default HTML renderer of NSAttributedString which is a
+    // webview.
+    NSAttributedString *string = [[NSAttributedString alloc] initWithHTMLData:[htmlString dataUsingEncoding:NSUTF8StringEncoding] options:options documentAttributes:NULL];
+        
+    // Apply additional treatments
+    string = [MXKTools removeDTCoreTextArtifacts:string];
+    
+    if (!string) {
+        return [[NSAttributedString alloc] initWithString:htmlString];
+    }
+    
+    return string;
+}
+
+@end
diff --git a/Riot/Utils/HTMLFormatter.swift b/Riot/Utils/HTMLFormatter.swift
new file mode 100644
index 000000000..8319388e1
--- /dev/null
+++ b/Riot/Utils/HTMLFormatter.swift
@@ -0,0 +1,35 @@
+// 
+// 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 HTMLFormatter {
+    /// Builds an attributed string by replacing a `%@` placeholder with the supplied link text and URL.
+    /// - Parameters:
+    ///   - string: The string to be formatted.
+    ///   - link: The link text to be inserted.
+    ///   - url: The URL to be linked to.
+    /// - Returns: An attributed string.
+    func format(_ string: String, with link: String, using url: URL) -> NSAttributedString {
+        let baseString = NSMutableAttributedString(string: string)
+        let attributedLink = NSAttributedString(string: link, attributes: [.link: url])
+        
+        let linkRange = (baseString.string as NSString).range(of: "%@")
+        baseString.replaceCharacters(in: linkRange, with: attributedLink)
+        
+        return baseString
+    }
+}
diff --git a/Riot/Utils/Tools.h b/Riot/Utils/Tools.h
index 2ac18f8bb..2d411a716 100644
--- a/Riot/Utils/Tools.h
+++ b/Riot/Utils/Tools.h
@@ -15,8 +15,7 @@
  */
 
 #import <Foundation/Foundation.h>
-
-#import "MatrixKit/MatrixKit.h"
+#import <MatrixSDK/MatrixSDK.h>
 
 @interface Tools : NSObject
 
diff --git a/Riot/Utils/Tools.m b/Riot/Utils/Tools.m
index 66fe38d0c..f27ab4c33 100644
--- a/Riot/Utils/Tools.m
+++ b/Riot/Utils/Tools.m
@@ -16,7 +16,7 @@
 
 #import "Tools.h"
 
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 @implementation Tools
 
@@ -66,11 +66,11 @@
 {
     BOOL isUniversalLink = NO;
     
-    for (NSString *matrixPermalinkHost in BuildSettings.matrixPermalinkPaths)
+    for (NSString *matrixPermalinkHost in BuildSettings.permalinkSupportedHosts)
     {
         if ([url.host isEqualToString:matrixPermalinkHost])
         {
-            NSArray<NSString*> *hostPaths = BuildSettings.matrixPermalinkPaths[matrixPermalinkHost];
+            NSArray<NSString*> *hostPaths = BuildSettings.permalinkSupportedHosts[matrixPermalinkHost];
             if (hostPaths.count)
             {
                 // iOS Patch: fix urls before using it
diff --git a/Riot/target.yml b/Riot/target.yml
index 0e9f722da..aaac28a9b 100644
--- a/Riot/target.yml
+++ b/Riot/target.yml
@@ -67,6 +67,9 @@ targets:
         - "Modules/Room/EmojiPicker/Data/EmojiMart/EmojiJSONStore.swift"
         - "**/*.strings" # Exclude all strings files
     - path: ../RiotShareExtension/Shared
+    - path: Modules/MatrixKit
+      excludes:
+        - "**/*.md" # excludes all files with the .md extension
 
     # Add separately localizable files
     # Once a language has enough translations (>80%), it must be declared here
@@ -77,10 +80,7 @@ targets:
     - path: Assets/ca.lproj/Localizable.strings
     - path: Assets/ca.lproj/Vector.strings
     - path: Assets/cy.lproj/InfoPlist.strings
-    - path: Assets/cy.lproj/InfoPlist.strings
     - path: Assets/cy.lproj/Localizable.strings
-    - path: Assets/cy.lproj/Localizable.strings
-    - path: Assets/cy.lproj/Vector.strings
     - path: Assets/cy.lproj/Vector.strings
     - path: Assets/de.lproj/InfoPlist.strings
     - path: Assets/de.lproj/Localizable.strings
@@ -113,10 +113,7 @@ targets:
     - path: Assets/it.lproj/Localizable.strings
     - path: Assets/it.lproj/Vector.strings
     - path: Assets/ja.lproj/InfoPlist.strings
-    - path: Assets/ja.lproj/InfoPlist.strings
     - path: Assets/ja.lproj/Localizable.strings
-    - path: Assets/ja.lproj/Localizable.strings
-    - path: Assets/ja.lproj/Vector.strings
     - path: Assets/ja.lproj/Vector.strings
     - path: Assets/kab.lproj/InfoPlist.strings
     - path: Assets/kab.lproj/Localizable.strings
diff --git a/RiotNSE/Common.xcconfig b/RiotNSE/Common.xcconfig
index 5a9db3be7..7ef912fcc 100644
--- a/RiotNSE/Common.xcconfig
+++ b/RiotNSE/Common.xcconfig
@@ -29,3 +29,5 @@ CODE_SIGN_ENTITLEMENTS = RiotNSE/RiotNSE.entitlements
 
 SKIP_INSTALL = YES
 SWIFT_OBJC_BRIDGING_HEADER = $(SRCROOT)/$(PRODUCT_NAME)/SupportingFiles/RiotNSE-Bridging-Header.h
+
+SWIFT_OBJC_INTERFACE_HEADER_NAME = GeneratedInterface-Swift.h
diff --git a/RiotNSE/NotificationService.swift b/RiotNSE/NotificationService.swift
index 0b2ff4758..2dfaec7f3 100644
--- a/RiotNSE/NotificationService.swift
+++ b/RiotNSE/NotificationService.swift
@@ -15,7 +15,6 @@
  */
 
 import UserNotifications
-import MatrixKit
 import MatrixSDK
 
 /// The number of milliseconds in one second.
@@ -53,6 +52,12 @@ class NotificationService: UNNotificationServiceExtension {
     private lazy var configuration: Configurable = {
         return CommonConfiguration()
     }()
+    private lazy var mxRestClient: MXRestClient? = {
+        guard let userAccount = userAccount else {
+            return nil
+        }
+        return MXRestClient(credentials: userAccount.mxCredentials, unrecognizedCertificateHandler: nil)
+    }()
     private static var isLoggerInitialized: Bool = false
     private lazy var pushGatewayRestClient: MXPushGatewayRestClient = {
         let url = URL(string: BuildSettings.serverConfigSygnalAPIUrlString)!
@@ -60,7 +65,7 @@ class NotificationService: UNNotificationServiceExtension {
     }()
     private var pushNotificationStore: PushNotificationStore = PushNotificationStore()
     private let localAuthenticationService = LocalAuthenticationService(pinCodePreferences: .shared)
-    
+    private static let backgroundServiceInitQueue = DispatchQueue(label: "io.element.NotificationService.backgroundServiceInitQueue")
     //  MARK: - Method Overrides
     
     override func didReceive(_ request: UNNotificationRequest, withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) {
@@ -163,14 +168,16 @@ class NotificationService: UNNotificationServiceExtension {
         MXKAccountManager.shared()?.forceReloadAccounts()
         self.userAccount = MXKAccountManager.shared()?.activeAccounts.first
         if let userAccount = userAccount {
-            if NotificationService.backgroundSyncService?.credentials != userAccount.mxCredentials {
-                MXLog.debug("[NotificationService] setup: MXBackgroundSyncService init: BEFORE")
-                self.logMemory()
-                NotificationService.backgroundSyncService = MXBackgroundSyncService(withCredentials: userAccount.mxCredentials)
-                MXLog.debug("[NotificationService] setup: MXBackgroundSyncService init: AFTER")
-                self.logMemory()
+            Self.backgroundServiceInitQueue.sync {
+                if NotificationService.backgroundSyncService?.credentials != userAccount.mxCredentials {
+                    MXLog.debug("[NotificationService] setup: MXBackgroundSyncService init: BEFORE")
+                    self.logMemory()
+                    NotificationService.backgroundSyncService = MXBackgroundSyncService(withCredentials: userAccount.mxCredentials)
+                    MXLog.debug("[NotificationService] setup: MXBackgroundSyncService init: AFTER")
+                    self.logMemory()
+                }
+                completion()
             }
-            completion()
         } else {
             MXLog.debug("[NotificationService] setup: No active accounts")
             fallbackToBestAttemptContent(forEventId: eventId)
@@ -222,7 +229,7 @@ class NotificationService: UNNotificationServiceExtension {
             return
         }
         
-        self.notificationContent(forEvent: event, forAccount: userAccount) { (notificationContent) in
+        self.notificationContent(forEvent: event, forAccount: userAccount) { (notificationContent, ignoreBadgeUpdate) in
             var isUnwantedNotification = false
             
             // Modify the notification content here...
@@ -240,6 +247,10 @@ class NotificationService: UNNotificationServiceExtension {
                 isUnwantedNotification = true
             }
             
+            if ignoreBadgeUpdate {
+                content.badge = nil
+            }
+            
             if self.ongoingVoIPPushRequests[event.eventId] == true {
                 //  modify the best attempt content, to be able to use in the future
                 self.bestAttemptContents[event.eventId] = content
@@ -279,10 +290,10 @@ class NotificationService: UNNotificationServiceExtension {
         MXLog.debug("--------------------------------------------------------------------------------")
     }
     
-    private func notificationContent(forEvent event: MXEvent, forAccount account: MXKAccount, onComplete: @escaping (UNNotificationContent?) -> Void) {
+    private func notificationContent(forEvent event: MXEvent, forAccount account: MXKAccount, onComplete: @escaping (UNNotificationContent?, Bool) -> Void) {
         guard let content = event.content, content.count > 0 else {
             MXLog.debug("[NotificationService] notificationContentForEvent: empty event content")
-            onComplete(nil)
+            onComplete(nil, false)
             return
         }
         
@@ -298,7 +309,7 @@ class NotificationService: UNNotificationServiceExtension {
                     var notificationTitle: String?
                     var notificationBody: String?
                     var additionalUserInfo: [AnyHashable: Any]?
-                    
+                    var ignoreBadgeUpdate = false
                     var threadIdentifier: String? = roomId
                     let currentUserId = account.mxCredentials.userId
                     let roomDisplayName = roomSummary?.displayname
@@ -322,7 +333,25 @@ class NotificationService: UNNotificationServiceExtension {
                             if let callInviteContent = MXCallInviteEventContent(fromJSON: event.content),
                                callInviteContent.lifetime > event.age,
                                (callInviteContent.lifetime - event.age) > UInt(NSE.Constants.timeNeededToSendVoIPPushes * MSEC_PER_SEC) {
+                                NotificationService.backgroundSyncService.roomAccountData(forRoomId: roomId) { response in
+                                    if let accountData = response.value, accountData.virtualRoomInfo.isVirtual {
+                                        self.sendReadReceipt(forEvent: event)
+                                        ignoreBadgeUpdate = true
+                                    }
+                                    self.validateNotificationContentAndComplete(
+                                        notificationTitle: notificationTitle,
+                                        notificationBody: notificationBody,
+                                        additionalUserInfo: additionalUserInfo,
+                                        ignoreBadgeUpdate: ignoreBadgeUpdate,
+                                        threadIdentifier: threadIdentifier,
+                                        currentUserId: currentUserId,
+                                        event: event,
+                                        pushRule: pushRule,
+                                        onComplete: onComplete
+                                    )
+                                }
                                 self.sendVoipPush(forEvent: event)
+                                return
                             } else {
                                 MXLog.debug("[NotificationService] notificationContent: Do not attempt to send a VoIP push, there is not enough time to process it.")
                             }
@@ -351,7 +380,7 @@ class NotificationService: UNNotificationServiceExtension {
                                     #warning("In practice, this only hides the notification's content. An empty notification may be less useful in this instance?")
                                     // Ignore this notif.
                                     MXLog.debug("[NotificationService] notificationContentForEvent: Ignore non highlighted notif in mentions only room")
-                                    onComplete(nil)
+                                    onComplete(nil, false)
                                     return
                                 }
                             }
@@ -471,39 +500,70 @@ class NotificationService: UNNotificationServiceExtension {
                                     additionalUserInfo = [Constants.userInfoKeyPresentNotificationOnForeground: true]
                                 }
                             }
+                        case .pollStart:
+                            notificationTitle = self.messageTitle(for: eventSenderName, in: roomDisplayName)
+                            notificationBody = MXEventContentPollStart(fromJSON: event.content)?.question
                         default:
                             break
                     }
                     
-                    if self.localAuthenticationService.isProtectionSet {
-                        MXLog.debug("[NotificationService] notificationContentForEvent: Resetting title and body because app protection is set")
-                        notificationBody = NSString.localizedUserNotificationString(forKey: "MESSAGE_PROTECTED", arguments: [])
-                        notificationTitle = nil
-                    }
                     
-                    guard notificationBody != nil else {
-                        MXLog.debug("[NotificationService] notificationContentForEvent: notificationBody is nil")
-                        onComplete(nil)
-                        return
-                    }
-                    
-                    let notificationContent = self.notificationContent(withTitle: notificationTitle,
-                                                                       body: notificationBody,
-                                                                       threadIdentifier: threadIdentifier,
-                                                                       userId: currentUserId,
-                                                                       event: event,
-                                                                       pushRule: pushRule,
-                                                                       additionalInfo: additionalUserInfo)
-                    
-                    MXLog.debug("[NotificationService] notificationContentForEvent: Calling onComplete.")
-                    onComplete(notificationContent)
+                    self.validateNotificationContentAndComplete(
+                        notificationTitle: notificationTitle,
+                        notificationBody: notificationBody,
+                        additionalUserInfo: additionalUserInfo,
+                        ignoreBadgeUpdate: ignoreBadgeUpdate,
+                        threadIdentifier: threadIdentifier,
+                        currentUserId: currentUserId,
+                        event: event,
+                        pushRule: pushRule,
+                        onComplete: onComplete
+                    )
                 case .failure(let error):
                     MXLog.debug("[NotificationService] notificationContentForEvent: error: \(error)")
-                    onComplete(nil)
+                    onComplete(nil, false)
             }
         })
     }
     
+    private func validateNotificationContentAndComplete(
+        notificationTitle: String?,
+        notificationBody: String?,
+        additionalUserInfo: [AnyHashable: Any]?,
+        ignoreBadgeUpdate: Bool,
+        threadIdentifier: String?,
+        currentUserId: String?,
+        event: MXEvent,
+        pushRule: MXPushRule?,
+        onComplete: @escaping (UNNotificationContent?, Bool) -> Void
+    ) {
+        
+        var validatedNotificationBody: String? = notificationBody
+        var validatedNotificationTitle: String? = notificationTitle
+        if self.localAuthenticationService.isProtectionSet {
+            MXLog.debug("[NotificationService] validateNotificationContentAndComplete: Resetting title and body because app protection is set")
+            validatedNotificationBody = NSString.localizedUserNotificationString(forKey: "MESSAGE_PROTECTED", arguments: [])
+            validatedNotificationTitle = nil
+        }
+        
+        guard validatedNotificationBody != nil else {
+            MXLog.debug("[NotificationService] validateNotificationContentAndComplete: notificationBody is nil")
+            onComplete(nil, false)
+            return
+        }
+        
+        let notificationContent = self.notificationContent(withTitle: validatedNotificationTitle,
+                                                           body: validatedNotificationBody,
+                                                           threadIdentifier: threadIdentifier,
+                                                           userId: currentUserId,
+                                                           event: event,
+                                                           pushRule: pushRule,
+                                                           additionalInfo: additionalUserInfo)
+        
+        MXLog.debug("[NotificationService] validateNotificationContentAndComplete: Calling onComplete.")
+        onComplete(notificationContent, ignoreBadgeUpdate)
+    }
+    
     /// Returns the default title for message notifications.
     /// - Parameters:
     ///   - eventSenderName: The displayname of the sender.
@@ -710,4 +770,23 @@ class NotificationService: UNNotificationServiceExtension {
         }
     }
     
+    private func sendReadReceipt(forEvent event: MXEvent) {
+        guard let mxRestClient = mxRestClient else {
+            MXLog.error("[NotificationService] sendReadReceipt: Missing mxRestClient for read receipt request.")
+            return
+        }
+        guard let eventId = event.eventId,
+              let roomId = event.roomId else {
+            MXLog.error("[NotificationService] sendReadReceipt: Event information missing for read receipt request.")
+            return
+        }
+        
+        mxRestClient.sendReadReceipt(toRoom: roomId, forEvent: eventId) { response in
+            if response.isSuccess {
+                MXLog.debug("[NotificationService] sendReadReceipt: Read receipt send successfully.")
+            } else if let error = response.error {
+                MXLog.error("[NotificationService] sendReadReceipt: Read receipt send failed with error \(error).")
+            }
+        }
+    }
 }
diff --git a/RiotNSE/SupportingFiles/RiotNSE-Bridging-Header.h b/RiotNSE/SupportingFiles/RiotNSE-Bridging-Header.h
index aa38f8734..41b0ba485 100644
--- a/RiotNSE/SupportingFiles/RiotNSE-Bridging-Header.h
+++ b/RiotNSE/SupportingFiles/RiotNSE-Bridging-Header.h
@@ -19,4 +19,6 @@
 
 #import "WidgetConstants.h"
 
+#import "MatrixKit-Bridging-Header.h"
+
 #endif /* RiotNSE_Bridging_Header_h */
diff --git a/RiotNSE/target.yml b/RiotNSE/target.yml
index 84aa3f64b..f01b619a3 100644
--- a/RiotNSE/target.yml
+++ b/RiotNSE/target.yml
@@ -61,3 +61,7 @@ targets:
     - path: ../Riot/Categories/Character.swift
     - path: ../Riot/Managers/Widgets/WidgetConstants.m
     - path: ../Riot/PropertyWrappers/UserDefaultsBackedPropertyWrapper.swift
+    - path: ../Riot/Modules/MatrixKit
+      excludes:
+        - "**/*.md" # excludes all files with the .md extension
+    - path: ../Riot/Generated/MatrixKitStrings.swift
diff --git a/RiotShareExtension/Common.xcconfig b/RiotShareExtension/Common.xcconfig
index bb52cb93c..f6e43035b 100644
--- a/RiotShareExtension/Common.xcconfig
+++ b/RiotShareExtension/Common.xcconfig
@@ -33,3 +33,5 @@ SKIP_INSTALL = YES
 SWIFT_OBJC_BRIDGING_HEADER = $(SRCROOT)/$(PRODUCT_NAME)/SupportingFiles/RiotShareExtension-Bridging-Header.h
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) IS_SHARE_EXTENSION=1
 LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @executable_path/../../Frameworks
+
+SWIFT_OBJC_INTERFACE_HEADER_NAME = GeneratedInterface-Swift.h
diff --git a/RiotShareExtension/Shared/ForwardingShareItemSender.swift b/RiotShareExtension/Shared/ForwardingShareItemSender.swift
new file mode 100644
index 000000000..84b866b27
--- /dev/null
+++ b/RiotShareExtension/Shared/ForwardingShareItemSender.swift
@@ -0,0 +1,75 @@
+// 
+// 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
+
+@objcMembers
+class ForwardingShareItemSender: NSObject, ShareItemSenderProtocol {
+    
+    static let errorDomain = "ForwardingShareItemSenderErrorDomain"
+
+    enum ErrorCode: Int {
+        case eventNotSentYet
+    }
+    
+    private let event: MXEvent
+    
+    weak var delegate: ShareItemSenderDelegate?
+    
+    @objc public init(withEvent event: MXEvent) {
+        self.event = event
+    }
+    
+    func sendItems(to rooms: [MXRoom], success: @escaping () -> Void, failure: @escaping ([Error]) -> Void) {
+        guard event.sentState == MXEventSentStateSent else {
+            MXLog.error("[ForwardingShareItemSender] Cannot forward unsent event")
+            failure([NSError(domain: Self.errorDomain,
+                            code: ErrorCode.eventNotSentYet.rawValue,
+                            userInfo: nil)])
+            return
+        }
+        
+        self.delegate?.shareItemSenderDidStartSending(self)
+        
+        var errors = [Error]()
+        
+        let dispatchGroup = DispatchGroup()
+        for room in rooms {
+            dispatchGroup.enter()
+            
+            var localEcho: MXEvent?
+            room.sendMessage(withContent: event.content, localEcho: &localEcho) { result in
+                switch result {
+                case .failure(let innerError):
+                    errors.append(innerError)
+                default:
+                    break
+                }
+                
+                dispatchGroup.leave()
+            }
+        }
+        
+        dispatchGroup.notify(queue: DispatchQueue.main) {
+            guard errors.count == 0 else {
+                failure(errors)
+                return
+            }
+            
+            success()
+        }
+    }
+}
diff --git a/RiotShareExtension/Shared/ShareDataSource.h b/RiotShareExtension/Shared/ShareDataSource.h
index d030ec795..9dc36d5f5 100644
--- a/RiotShareExtension/Shared/ShareDataSource.h
+++ b/RiotShareExtension/Shared/ShareDataSource.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @class ShareDataSource;
 
diff --git a/RiotShareExtension/Shared/ShareItemProvider/SimpleShareItemProvider.swift b/RiotShareExtension/Shared/ShareItemProvider/SimpleShareItemProvider.swift
deleted file mode 100644
index e08435aec..000000000
--- a/RiotShareExtension/Shared/ShareItemProvider/SimpleShareItemProvider.swift
+++ /dev/null
@@ -1,109 +0,0 @@
-// 
-// 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
-
-private class SimpleShareItem: ShareItemProtocol {
-    let attachment: MXKAttachment?
-    let textMessage: String?
-    
-    init(withAttachment attachment: MXKAttachment) {
-        self.attachment = attachment
-        self.textMessage = nil
-    }
-    
-    init(withTextMessage textMessage: String) {
-        self.attachment = nil
-        self.textMessage = textMessage
-    }
-    
-    var type: ShareItemType {
-        guard textMessage == nil else {
-            return .text
-        }
-        
-        guard let attachment = attachment else {
-            return .unknown
-        }
-        
-        if attachment.type == MXKAttachmentTypeImage {
-            return .image
-        } else if attachment.type == MXKAttachmentTypeVideo {
-            return .video
-        } else if attachment.type == MXKAttachmentTypeFile {
-            return .fileURL
-        } else if attachment.type == MXKAttachmentTypeVoiceMessage {
-            return .voiceMessage
-        } else {
-            return .unknown
-        }
-    }
-}
-
-@objc class SimpleShareItemProvider: NSObject, ShareItemProviderProtocol {
-    
-    private let attachment: MXKAttachment?
-    private let textMessage: String?
-    
-    let items: [ShareItemProtocol]
-    
-    private override init() {
-        attachment = nil
-        textMessage = nil
-        self.items = []
-    }
-    
-    @objc public init(withAttachment attachment: MXKAttachment) {
-        self.attachment = attachment
-        self.items = [SimpleShareItem(withAttachment: attachment)];
-        self.textMessage = nil
-    }
-    
-    @objc public init(withTextMessage textMessage: String) {
-        self.textMessage = textMessage
-        self.items = [SimpleShareItem(withTextMessage: textMessage)];
-        self.attachment = nil
-    }
-    
-    func loadItem(_ item: ShareItemProtocol, completion: @escaping (Any?, Error?) -> Void) {
-        if let textMessage = self.textMessage {
-            completion(textMessage, nil)
-            return
-        }
-        
-        guard let attachment = attachment else {
-            fatalError("[SimpleShareItemProvider] Invalid item provider state.")
-        }
-        
-        attachment.prepareShare({ url in
-            DispatchQueue.main.async {
-                completion(url, nil)
-            }
-        }, failure: { error in
-            DispatchQueue.main.async {
-                completion(nil, error)
-            }
-        })
-    }
-    
-    func areAllItemsLoaded() -> Bool {
-        return true
-    }
-    
-    func areAllItemsImages() -> Bool {
-        return (attachment != nil && attachment?.type == MXKAttachmentTypeImage)
-    }
-}
diff --git a/RiotShareExtension/Shared/ShareItemSenderProtocol.h b/RiotShareExtension/Shared/ShareItemSenderProtocol.h
new file mode 100644
index 000000000..ff3730a5e
--- /dev/null
+++ b/RiotShareExtension/Shared/ShareItemSenderProtocol.h
@@ -0,0 +1,41 @@
+// 
+// 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.
+//
+
+@protocol ShareItemSenderProtocol;
+
+@class MXRoom;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol ShareItemSenderDelegate
+
+- (void)shareItemSenderDidStartSending:(id<ShareItemSenderProtocol>)shareItemSender;
+
+- (void)shareItemSender:(id<ShareItemSenderProtocol>)shareItemSender didUpdateProgress:(CGFloat)progress;
+
+@end
+
+@protocol ShareItemSenderProtocol <NSObject>
+
+@property (nonatomic, weak) id<ShareItemSenderDelegate> delegate;
+
+- (void)sendItemsToRooms:(NSArray<MXRoom *> *)rooms
+                 success:(void(^)(void))success
+                 failure:(void(^)(NSArray<NSError *> *))failure;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/RiotShareExtension/Shared/ShareManager.h b/RiotShareExtension/Shared/ShareManager.h
index bb7245040..c2b110a05 100644
--- a/RiotShareExtension/Shared/ShareManager.h
+++ b/RiotShareExtension/Shared/ShareManager.h
@@ -14,9 +14,9 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
-@protocol ShareItemProviderProtocol;
+@protocol ShareItemSenderProtocol;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -35,8 +35,8 @@ typedef NS_ENUM(NSUInteger, ShareManagerResult) {
 
 @property (nonatomic, copy) void (^completionCallback)(ShareManagerResult);
 
-- (instancetype)initWithShareItemProvider:(id<ShareItemProviderProtocol>)shareItemProvider
-                                     type:(ShareManagerType)type;
+- (instancetype)initWithShareItemSender:(id<ShareItemSenderProtocol>)itemSender
+                                   type:(ShareManagerType)type;
 
 - (UIViewController *)mainViewController;
 
diff --git a/RiotShareExtension/Shared/ShareManager.m b/RiotShareExtension/Shared/ShareManager.m
index fdec722ed..d955f9da1 100644
--- a/RiotShareExtension/Shared/ShareManager.m
+++ b/RiotShareExtension/Shared/ShareManager.m
@@ -18,83 +18,39 @@
 
 #import <mach/mach.h>
 
-#import <MatrixKit/MatrixKit.h>
-
 #import "ShareManager.h"
 #import "ShareViewController.h"
 #import "ShareDataSource.h"
+#import "ShareItemSenderProtocol.h"
 
-#ifdef IS_SHARE_EXTENSION
-#import "RiotShareExtension-Swift.h"
-#else
-#import "Riot-Swift.h"
-#endif
+#import "GeneratedInterface-Swift.h"
 
-static const CGFloat kLargeImageSizeMaxDimension = 2048.0;
-static const CGSize kThumbnailSize = {800.0, 600.0};
-/// A safe maximum file size for an image to send the original.
-static const NSUInteger kImageMaxFileSize = 20 * 1024 * 1024;
+@interface ShareManager () <ShareViewControllerDelegate, ShareItemSenderDelegate>
 
-typedef NS_ENUM(NSInteger, ImageCompressionMode)
-{
-    ImageCompressionModeNone,
-    ImageCompressionModeSmall,
-    ImageCompressionModeMedium,
-    ImageCompressionModeLarge
-};
+@property (nonatomic, strong, readonly) id<ShareItemSenderProtocol> shareItemSender;
 
-@interface ShareManager () <ShareViewControllerDelegate>
-
-@property (nonatomic, strong, readonly) id<ShareItemProviderProtocol> shareItemProvider;
 @property (nonatomic, strong, readonly) ShareViewController *shareViewController;
 
-@property (nonatomic, strong, readonly) NSMutableArray<NSData *> *pendingImages;
-@property (nonatomic, strong, readonly) NSMutableDictionary<NSString *, NSNumber *> *imageUploadProgresses;
-@property (nonatomic, strong, readonly) id<Configurable> configuration;
-
 @property (nonatomic, strong) MXKAccount *userAccount;
 @property (nonatomic, strong) MXFileStore *fileStore;
 
-@property (nonatomic, assign) ImageCompressionMode imageCompressionMode;
-@property (nonatomic, assign) CGFloat actualLargeSize;
-
 @end
 
 
 @implementation ShareManager
 
-- (instancetype)initWithShareItemProvider:(id<ShareItemProviderProtocol>)shareItemProvider
-                                     type:(ShareManagerType)type
+- (instancetype)initWithShareItemSender:(id<ShareItemSenderProtocol>)itemSender
+                                   type:(ShareManagerType)type
 {
     if (self = [super init])
     {
-        _shareItemProvider = shareItemProvider;
+        _shareItemSender = itemSender;
+        _shareItemSender.delegate = self;
         
-        _pendingImages = [NSMutableArray array];
-        _imageUploadProgresses = [NSMutableDictionary dictionary];
-        
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onMediaLoaderStateDidChange:) name:kMXMediaLoaderStateDidChangeNotification object:nil];
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(checkUserAccount) name:kMXKAccountManagerDidRemoveAccountNotification object:nil];
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(checkUserAccount) name:NSExtensionHostWillEnterForegroundNotification object:nil];
+        [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(checkUserAccount) name:kMXKAccountManagerDidRemoveAccountNotification object:nil];
+        [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(checkUserAccount) name:NSExtensionHostWillEnterForegroundNotification object:nil];
         [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(didReceiveMemoryWarning:) name:UIApplicationDidReceiveMemoryWarningNotification object:nil];
         
-        _configuration = [[CommonConfiguration alloc] init];
-        [_configuration setupSettings];
-        
-        // NSLog -> console.log file when not debugging the app
-        MXLogConfiguration *configuration = [[MXLogConfiguration alloc] init];
-        configuration.logLevel = MXLogLevelVerbose;
-        configuration.logFilesSizeLimit = 0;
-        configuration.maxLogFilesCount = 10;
-        configuration.subLogName = @"share";
-        
-        // Redirect NSLogs to files only if we are not debugging
-        if (!isatty(STDERR_FILENO)) {
-            configuration.redirectLogsToFiles = YES;
-        }
-        
-        [MXLog configure:configuration];
-        
         _shareViewController = [[ShareViewController alloc] initWithType:(type == ShareManagerTypeForward ? ShareViewControllerTypeForward : ShareViewControllerTypeSend)
                                                             currentState:ShareViewControllerAccountStateNotConfigured];
         [_shareViewController setDelegate:self];
@@ -139,9 +95,9 @@ typedef NS_ENUM(NSInteger, ImageCompressionMode)
             }
         }
         
-        [self sendContentToRooms:rooms success:^{
+        [self.shareItemSender sendItemsToRooms:rooms success:^{
             self.completionCallback(ShareManagerResultFinished);
-        } failure:^(NSError *error){
+        } failure:^(NSArray<NSError *> *errors) {
             [self showFailureAlert:[VectorL10n roomEventFailedToSend]];
         }];
         
@@ -155,6 +111,18 @@ typedef NS_ENUM(NSInteger, ImageCompressionMode)
     self.completionCallback(ShareManagerResultCancelled);
 }
 
+#pragma mark - ShareItemSenderDelegate
+
+- (void)shareItemSenderDidStartSending:(id<ShareItemSenderProtocol>)shareItemSender
+{
+    [self.shareViewController showProgressIndicator];
+}
+
+- (void)shareItemSender:(id<ShareItemSenderProtocol>)shareItemSender didUpdateProgress:(CGFloat)progress
+{
+    [self.shareViewController setProgress:progress];
+}
+
 #pragma mark - Private
 
 - (void)showFailureAlert:(NSString *)title
@@ -176,208 +144,6 @@ typedef NS_ENUM(NSInteger, ImageCompressionMode)
     [self.mainViewController presentViewController:alertController animated:YES completion:nil];
 }
 
-- (void)sendContentToRooms:(NSArray<MXRoom *> *)rooms success:(void(^)(void))success failure:(void(^)(NSError *))failure
-{
-    [self resetPendingData];
-    
-    __block NSError *firstRequestError = nil;
-    dispatch_group_t dispatchGroup = dispatch_group_create();
-    
-    void (^requestSuccess)(void) = ^() {
-        dispatch_group_leave(dispatchGroup);
-    };
-    
-    void (^requestFailure)(NSError *) = ^(NSError *requestError) {
-        if (requestError && !firstRequestError)
-        {
-            firstRequestError = requestError;
-        }
-        
-        dispatch_group_leave(dispatchGroup);
-    };
-    
-    MXWeakify(self);
-    for (id<ShareItemProtocol> item in self.shareItemProvider.items)
-    {
-        if (item.type == ShareItemTypeText || item.type == ShareItemTypeURL) {
-            dispatch_group_enter(dispatchGroup);
-            [self.shareItemProvider loadItem:item completion:^(id item, NSError *error) {
-                MXStrongifyAndReturnIfNil(self);
-                
-                if (error)
-                {
-                    requestFailure(error);
-                    return;
-                }
-                
-                NSString *text = nil;
-                if([item isKindOfClass:[NSString class]])
-                {
-                    text = item;
-                }
-                else if([item isKindOfClass:[NSURL class]])
-                {
-                    text = [(NSURL *)item absoluteString];
-                }
-                
-                if(text.length == 0)
-                {
-                    requestFailure(nil);
-                    return;
-                }
-                
-                [self sendText:text toRooms:rooms success:requestSuccess failure:requestFailure];
-            }];
-        }
-        
-        if (item.type == ShareItemTypeFileURL) {
-            dispatch_group_enter(dispatchGroup);
-            [self.shareItemProvider loadItem:item completion:^(NSURL *url, NSError *error) {
-                MXStrongifyAndReturnIfNil(self);
-                
-                if (error)
-                {
-                    requestFailure(error);
-                    return;
-                }
-                
-                [self sendFileWithUrl:url toRooms:rooms success:requestSuccess failure:requestFailure];
-            }];
-        }
-        
-        if (item.type == ShareItemTypeVideo || item.type == ShareItemTypeMovie)
-        {
-            dispatch_group_enter(dispatchGroup);
-            [self.shareItemProvider loadItem:item completion:^(NSURL *videoLocalUrl, NSError *error) {
-                MXStrongifyAndReturnIfNil(self);
-                
-                if (error)
-                {
-                    requestFailure(error);
-                    return;
-                }
-                
-                [self sendVideo:videoLocalUrl toRooms:rooms success:requestSuccess failure:requestFailure];
-            }];
-        }
-        
-        if (item.type == ShareItemTypeVoiceMessage)
-        {
-            dispatch_group_enter(dispatchGroup);
-            [self.shareItemProvider loadItem:item completion:^(NSURL *fileURL, NSError *error) {
-                MXStrongifyAndReturnIfNil(self);
-                
-                if (error)
-                {
-                    requestFailure(error);
-                    return;
-                }
-                
-                [self sendVoiceMessage:fileURL toRooms:rooms success:requestSuccess failure:requestFailure];
-            }];
-        }
-
-        if (item.type == ShareItemTypeImage)
-        {
-            dispatch_group_enter(dispatchGroup);
-            [self.shareItemProvider loadItem:item completion:^(id<NSSecureCoding> itemProviderItem, NSError *error) {
-                MXStrongifyAndReturnIfNil(self);
-                
-                if (error)
-                {
-                    requestFailure(error);
-                    return;
-                }
-                
-                NSData *imageData;
-                if ([(NSObject *)itemProviderItem isKindOfClass:[NSData class]])
-                {
-                    imageData = (NSData*)itemProviderItem;
-                }
-                else if ([(NSObject *)itemProviderItem isKindOfClass:[NSURL class]])
-                {
-                    NSURL *imageURL = (NSURL*)itemProviderItem;
-                    imageData = [NSData dataWithContentsOfURL:imageURL];
-                }
-                else if ([(NSObject *)itemProviderItem isKindOfClass:[UIImage class]])
-                {
-                    // An application can share directly an UIImage.
-                    // The most common case is screenshot sharing without saving to file.
-                    // As screenshot using PNG format when they are saved to file we also use PNG format when saving UIImage to NSData.
-                    UIImage *image = (UIImage*)itemProviderItem;
-                    imageData = UIImagePNGRepresentation(image);
-                }
-                
-                if (!imageData)
-                {
-                    requestFailure(error);
-                    return;
-                }
-                
-                if ([self.shareItemProvider areAllItemsImages])
-                {
-                    // When all items are images, they're processed together from the
-                    // pending list, immediately after the final image has been loaded.
-                    [self.pendingImages addObject:imageData];
-                }
-                else
-                {
-                    // Otherwise, the image is sent as is, without prompting for a resize
-                    // as that wouldn't make much sense with multiple content types.
-                    self.imageCompressionMode = ImageCompressionModeNone;
-                    [self sendImageData:imageData toRooms:rooms success:requestSuccess failure:requestFailure];
-                }
-                
-                // When there are multiple content types the image will have been sent above.
-                // Otherwise, if we have loaded all of the images we can send them all together.
-                if ([self.shareItemProvider areAllItemsImages])
-                {
-                    if ([self.shareItemProvider areAllItemsLoaded])
-                    {
-                        MXWeakify(self);
-                        void (^sendPendingImages)(void) = ^void() {
-                            MXStrongifyAndReturnIfNil(self);
-                            [self sendImageDatas:self.pendingImages.copy toRooms:rooms success:requestSuccess failure:requestFailure];
-                        };
-                        
-                        if (RiotSettings.shared.showMediaCompressionPrompt)
-                        {
-                            // Create a compression prompt which will be nil when the sizes can't be determined or if there are no pending images.
-                            UIAlertController *compressionPrompt = [self compressionPromptForPendingImagesWithShareBlock:sendPendingImages];
-                            if (compressionPrompt)
-                            {
-                                [self presentCompressionPrompt:compressionPrompt];
-                            }
-                        }
-                        else
-                        {
-                            self.imageCompressionMode = ImageCompressionModeNone;
-                            sendPendingImages();
-                        }
-                    }
-                    else
-                    {
-                        dispatch_group_leave(dispatchGroup);
-                    }
-                }
-            }];
-        }
-    }
-    
-    dispatch_group_notify(dispatchGroup, dispatch_get_main_queue(), ^{
-        [self resetPendingData];
-        
-        if (firstRequestError)
-        {
-            failure(firstRequestError);
-        }
-        else
-        {
-            success();
-        }
-    });
-}
-
 - (void)checkUserAccount
 {
     // Force account manager to reload account from the local storage.
@@ -425,220 +191,15 @@ typedef NS_ENUM(NSInteger, ImageCompressionMode)
     }
 }
 
-- (BOOL)roomsContainEncryptedRoom:(NSArray<MXRoom *> *)rooms
-{
-    BOOL foundEncryptedRoom = NO;
-    
-    for (MXRoom *room in rooms)
-    {
-        if (room.summary.isEncrypted)
-        {
-            foundEncryptedRoom = YES;
-            break;
-        }
-    }
-    
-    return foundEncryptedRoom;
-}
-
-- (void)resetPendingData
-{
-    [self.pendingImages removeAllObjects];
-    [self.imageUploadProgresses removeAllObjects];
-}
-
-// TODO: When select multiple images:
-// - Enhance prompt to display sum of all file sizes for each compression.
-// - Find a way to choose compression sizes for all images.
-- (UIAlertController *)compressionPromptForPendingImagesWithShareBlock:(void(^)(void))shareBlock
-{
-    if (!self.pendingImages.count)
-    {
-        return nil;
-    }
-    
-    NSData *firstImageData = self.pendingImages.firstObject;
-    UIImage *firstImage = [UIImage imageWithData:firstImageData];
-    
-    MXKImageCompressionSizes compressionSizes = [MXKTools availableCompressionSizesForImage:firstImage originalFileSize:firstImageData.length];
-    
-    if (compressionSizes.small.fileSize == 0 && compressionSizes.medium.fileSize == 0 && compressionSizes.large.fileSize == 0)
-    {
-        self.imageCompressionMode = ImageCompressionModeNone;
-        MXLogDebug(@"[ShareManager] Bypass compression prompt and send originals for %lu image(s) due to undetermined file sizes", (unsigned long)self.pendingImages.count);
-        
-        shareBlock();
-        
-        return nil;
-    }
-    
-    UIAlertController *compressionPrompt = [UIAlertController alertControllerWithTitle:[MatrixKitL10n attachmentSizePromptTitle]
-                                                                               message:[MatrixKitL10n attachmentSizePromptMessage]
-                                                                        preferredStyle:UIAlertControllerStyleActionSheet];
-    
-    if (compressionSizes.small.fileSize)
-    {
-        NSString *title = [MatrixKitL10n attachmentSmall:[MXTools fileSizeToString:compressionSizes.small.fileSize]];
-        
-        MXWeakify(self);
-        [compressionPrompt addAction:[UIAlertAction actionWithTitle:title style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
-            MXStrongifyAndReturnIfNil(self);
-            
-            self.imageCompressionMode = ImageCompressionModeSmall;
-            [self logCompressionSizeChoice:compressionSizes.small];
-            
-            shareBlock();
-        }]];
-    }
-    
-    if (compressionSizes.medium.fileSize)
-    {
-        NSString *title = [MatrixKitL10n attachmentMedium:[MXTools fileSizeToString:compressionSizes.medium.fileSize]];
-        
-        MXWeakify(self);
-        [compressionPrompt addAction:[UIAlertAction actionWithTitle:title style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
-            MXStrongifyAndReturnIfNil(self);
-            
-            self.imageCompressionMode = ImageCompressionModeMedium;
-            [self logCompressionSizeChoice:compressionSizes.medium];
-            
-            shareBlock();
-        }]];
-    }
-    
-    // Do not offer the possibility to resize an image with a dimension above kLargeImageSizeMaxDimension, to prevent the risk of memory limit exception.
-    // TODO: Remove this condition when issue https://github.com/vector-im/riot-ios/issues/2341 will be fixed.
-    if (compressionSizes.large.fileSize && (MAX(compressionSizes.large.imageSize.width, compressionSizes.large.imageSize.height) <= kLargeImageSizeMaxDimension))
-    {
-        NSString *title = [MatrixKitL10n attachmentLarge:[MXTools fileSizeToString:compressionSizes.large.fileSize]];
-        
-        MXWeakify(self);
-        [compressionPrompt addAction:[UIAlertAction actionWithTitle:title style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
-            MXStrongifyAndReturnIfNil(self);
-            
-            self.imageCompressionMode = ImageCompressionModeLarge;
-            self.actualLargeSize = compressionSizes.actualLargeSize;
-            
-            [self logCompressionSizeChoice:compressionSizes.large];
-            
-            shareBlock();
-        }]];
-    }
-    
-    // To limit memory consumption when encrypting, we suggest the original resolution only if the image size is moderate
-    if (compressionSizes.original.fileSize < kImageMaxFileSize)
-    {
-        NSString *fileSizeString = [MXTools fileSizeToString:compressionSizes.original.fileSize];
-        
-        NSString *title = [MatrixKitL10n attachmentOriginal:fileSizeString];
-        
-        MXWeakify(self);
-        [compressionPrompt addAction:[UIAlertAction actionWithTitle:title style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
-            MXStrongifyAndReturnIfNil(self);
-            
-            self.imageCompressionMode = ImageCompressionModeNone;
-            [self logCompressionSizeChoice:compressionSizes.original];
-            
-            shareBlock();
-        }]];
-    }
-    
-    [compressionPrompt addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
-                                                          style:UIAlertActionStyleCancel
-                                                        handler:nil]];
-    
-    return compressionPrompt;
-}
-
 - (void)didStartSending
 {
     [self.shareViewController showProgressIndicator];
 }
 
-- (NSString*)utiFromImageData:(NSData*)imageData
+- (void)didReceiveMemoryWarning:(NSNotification*)notification
 {
-    CGImageSourceRef imageSource = CGImageSourceCreateWithData((CFDataRef)imageData, NULL);
-    NSString *uti = (NSString*)CGImageSourceGetType(imageSource);
-    CFRelease(imageSource);
-    return uti;
-}
-
-- (NSString*)mimeTypeFromUTI:(NSString*)uti
-{
-    return (__bridge_transfer NSString *) UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)uti, kUTTagClassMIMEType);
-}
-
-- (BOOL)isResizingSupportedForImageData:(NSData*)imageData
-{
-    NSString *imageUTI = [self utiFromImageData:imageData];
-    return [self isResizingSupportedForUTI:imageUTI];
-}
-
-- (BOOL)isResizingSupportedForUTI:(NSString*)imageUTI
-{
-    if ([imageUTI isEqualToString:(__bridge NSString *)kUTTypePNG] || [imageUTI isEqualToString:(__bridge NSString *)kUTTypeJPEG])
-    {
-        return YES;
-    }
-    return NO;
-}
-
-- (CGSize)imageSizeFromImageData:(NSData*)imageData
-{
-    CGFloat width = 0.0f;
-    CGFloat height = 0.0f;
-    
-    CGImageSourceRef imageSource = CGImageSourceCreateWithData((CFDataRef)imageData, NULL);
-    
-    CFDictionaryRef imageProperties = CGImageSourceCopyPropertiesAtIndex(imageSource, 0, NULL);
-    
-    CFRelease(imageSource);
-    
-    if (imageProperties != NULL)
-    {
-        CFNumberRef widthNumber  = CFDictionaryGetValue(imageProperties, kCGImagePropertyPixelWidth);
-        CFNumberRef heightNumber = CFDictionaryGetValue(imageProperties, kCGImagePropertyPixelHeight);
-        CFNumberRef orientationNumber = CFDictionaryGetValue(imageProperties, kCGImagePropertyOrientation);
-        
-        if (widthNumber != NULL)
-        {
-            CFNumberGetValue(widthNumber, kCFNumberCGFloatType, &width);
-        }
-        
-        if (heightNumber != NULL)
-        {
-            CFNumberGetValue(heightNumber, kCFNumberCGFloatType, &height);
-        }
-        
-        // Check orientation and flip size if required
-        if (orientationNumber != NULL)
-        {
-            int orientation;
-            CFNumberGetValue(orientationNumber, kCFNumberIntType, &orientation);
-            
-            // For orientation from kCGImagePropertyOrientationLeftMirrored to kCGImagePropertyOrientationLeft flip size
-            if (orientation >= 5)
-            {
-                CGFloat tempWidth = width;
-                width = height;
-                height = tempWidth;
-            }
-        }
-        
-        CFRelease(imageProperties);
-    }
-    
-    return CGSizeMake(width, height);
-}
-
-- (void)logCompressionSizeChoice:(MXKImageCompressionSize)compressionSize
-{
-    NSString *fileSize = [MXTools fileSizeToString:compressionSize.fileSize round:NO];
-    NSUInteger imageWidth = compressionSize.imageSize.width;
-    NSUInteger imageHeight = compressionSize.imageSize.height;
-    
-    MXLogDebug(@"[ShareManager] User choose image compression with output size %lu x %lu (output file size: %@)", (unsigned long)imageWidth, (unsigned long)imageHeight, fileSize);
-    MXLogDebug(@"[ShareManager] Number of images to send: %lu", (unsigned long)self.pendingImages.count);
+    MXLogDebug(@"[ShareManager] Did receive memory warning");
+    [self logMemoryUsage];
 }
 
 // Log memory usage.
@@ -665,423 +226,4 @@ typedef NS_ENUM(NSInteger, ImageCompressionMode)
     }
 }
 
-- (void)presentCompressionPrompt:(UIAlertController *)compressionPrompt
-{
-    [compressionPrompt popoverPresentationController].sourceView = self.mainViewController.view;
-    [compressionPrompt popoverPresentationController].sourceRect = self.mainViewController.view.frame;
-    [self.mainViewController presentViewController:compressionPrompt animated:YES completion:nil];
-}
-
-#pragma mark - Notifications
-
-- (void)onMediaLoaderStateDidChange:(NSNotification *)notification
-{
-    MXMediaLoader *loader = (MXMediaLoader*)notification.object;
-    // Consider only upload progress
-    switch (loader.state) {
-        case MXMediaLoaderStateUploadInProgress:
-        {
-            self.imageUploadProgresses[loader.uploadId] = (NSNumber *)loader.statisticsDict[kMXMediaLoaderProgressValueKey];
-            
-            const NSInteger totalImagesCount = self.pendingImages.count;
-            CGFloat totalProgress = 0.0;
-            
-            for (NSNumber *progress in self.imageUploadProgresses.allValues)
-            {
-                totalProgress += progress.floatValue/totalImagesCount;
-            }
-            
-            [self.shareViewController setProgress:totalProgress];
-            break;
-        }
-        default:
-            break;
-    }
-}
-
-- (void)didReceiveMemoryWarning:(NSNotification*)notification
-{
-    MXLogDebug(@"[ShareManager] Did receive memory warning");
-    [self logMemoryUsage];
-}
-
-#pragma mark - Sharing
-
-- (void)sendText:(NSString *)text
-         toRooms:(NSArray<MXRoom *> *)rooms
-         success:(dispatch_block_t)success
-         failure:(void(^)(NSError *error))failure
-{
-    [self didStartSending];
-    if (!text)
-    {
-        MXLogError(@"[ShareManager] Invalid text.");
-        failure(nil);
-        return;
-    }
-    
-    __block NSError *error = nil;
-    dispatch_group_t dispatchGroup = dispatch_group_create();
-    for (MXRoom *room in rooms) {
-        dispatch_group_enter(dispatchGroup);
-        [room sendTextMessage:text success:^(NSString *eventId) {
-            dispatch_group_leave(dispatchGroup);
-        } failure:^(NSError *innerError) {
-            MXLogError(@"[ShareManager] sendTextMessage failed with error %@", error);
-            error = innerError;
-            dispatch_group_leave(dispatchGroup);
-        }];
-    }
-    
-    dispatch_group_notify(dispatchGroup, dispatch_get_main_queue(), ^{
-        if(error) {
-            failure(error);
-        } else {
-            success();
-        }
-    });
-}
-
-- (void)sendFileWithUrl:(NSURL *)fileUrl
-                toRooms:(NSArray<MXRoom *> *)rooms
-                success:(dispatch_block_t)success
-                failure:(void(^)(NSError *error))failure
-{
-    [self didStartSending];
-    if (!fileUrl)
-    {
-        MXLogError(@"[ShareManager] Invalid file url.");
-        failure(nil);
-        return;
-    }
-    
-    NSString *mimeType;
-    CFStringRef uti = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, (__bridge CFStringRef)[fileUrl pathExtension] , NULL);
-    mimeType = [self mimeTypeFromUTI:(__bridge NSString *)uti];
-    CFRelease(uti);
-    
-    __block NSError *error = nil;
-    dispatch_group_t dispatchGroup = dispatch_group_create();
-    for (MXRoom *room in rooms) {
-        dispatch_group_enter(dispatchGroup);
-        [room sendFile:fileUrl mimeType:mimeType localEcho:nil success:^(NSString *eventId) {
-            dispatch_group_leave(dispatchGroup);
-        } failure:^(NSError *innerError) {
-            MXLogError(@"[ShareManager] sendFile failed with error %@", innerError);
-            error = innerError;
-            dispatch_group_leave(dispatchGroup);
-        } keepActualFilename:YES];
-    }
-    
-    dispatch_group_notify(dispatchGroup, dispatch_get_main_queue(), ^{
-        if(error) {
-            failure(error);
-        } else {
-            success();
-        }
-    });
-}
-
-- (void)sendVideo:(NSURL *)videoLocalUrl
-          toRooms:(NSArray<MXRoom *> *)rooms
-          success:(dispatch_block_t)success
-          failure:(void(^)(NSError *error))failure
-{
-    AVURLAsset *videoAsset = [[AVURLAsset alloc] initWithURL:videoLocalUrl options:nil];
-    
-    MXWeakify(self);
-    
-    void (^sendVideo)(void) = ^void()  {
-        MXStrongifyAndReturnIfNil(self);
-        
-        [self didStartSending];
-        if (!videoLocalUrl)
-        {
-            MXLogError(@"[ShareManager] Invalid video file url.");
-            failure(nil);
-            return;
-        }
-        
-        // Retrieve the video frame at 1 sec to define the video thumbnail
-        AVAssetImageGenerator *assetImageGenerator = [AVAssetImageGenerator assetImageGeneratorWithAsset:videoAsset];
-        assetImageGenerator.appliesPreferredTrackTransform = YES;
-        CMTime time = CMTimeMake(1, 1);
-        CGImageRef imageRef = [assetImageGenerator copyCGImageAtTime:time actualTime:NULL error:nil];
-        // Finalize video attachment
-        UIImage *videoThumbnail = [[UIImage alloc] initWithCGImage:imageRef];
-        CFRelease(imageRef);
-        
-        __block NSError *error = nil;
-        dispatch_group_t dispatchGroup = dispatch_group_create();
-        for (MXRoom *room in rooms) {
-            dispatch_group_enter(dispatchGroup);
-            [room sendVideoAsset:videoAsset withThumbnail:videoThumbnail localEcho:nil success:^(NSString *eventId) {
-                dispatch_group_leave(dispatchGroup);
-            } failure:^(NSError *innerError) {
-                MXLogError(@"[ShareManager] Failed sending video with error %@", innerError);
-                error = innerError;
-                dispatch_group_leave(dispatchGroup);
-            }];
-        }
-        
-        dispatch_group_notify(dispatchGroup, dispatch_get_main_queue(), ^{
-            if(error) {
-                failure(error);
-            } else {
-                success();
-            }
-        });
-    };
-    
-    BOOL allRoomsAreUnencrypted = ![self roomsContainEncryptedRoom:rooms];
-    
-    // When rooms are unencrypted convert the video according to the user's normal preferences
-    if (allRoomsAreUnencrypted)
-    {
-        if (!RiotSettings.shared.showMediaCompressionPrompt)
-        {
-            [MXSDKOptions sharedInstance].videoConversionPresetName = AVCaptureSessionPreset1920x1080;
-            sendVideo();
-        }
-        else
-        {
-            UIAlertController *compressionPrompt = [MXKTools videoConversionPromptForVideoAsset:videoAsset withCompletion:^(NSString *presetName) {
-                // If the preset name is nil, the user cancelled.
-                if (!presetName)
-                {
-                    return;
-                }
-                
-                // Set the chosen video conversion preset.
-                [MXSDKOptions sharedInstance].videoConversionPresetName = presetName;
-                sendVideo();
-            }];
-            
-            [self presentCompressionPrompt:compressionPrompt];
-        }
-    }
-    else
-    {
-        // When rooms are encrypted we quickly run out of memory encrypting the video
-        // Prompt the user if they're happy to send a low quality video (320p).
-        UIAlertController *lowQualityPrompt = [UIAlertController alertControllerWithTitle:VectorL10n.shareExtensionLowQualityVideoTitle
-                                                                                  message:[VectorL10n shareExtensionLowQualityVideoMessage:AppInfo.current.displayName]
-                                                                           preferredStyle:UIAlertControllerStyleAlert];
-        
-        UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:MatrixKitL10n.cancel style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
-            // Do nothing
-        }];
-        UIAlertAction *sendAction = [UIAlertAction actionWithTitle:VectorL10n.shareExtensionSendNow style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-            [MXSDKOptions sharedInstance].videoConversionPresetName = AVAssetExportPresetMediumQuality;
-            sendVideo();
-        }];
-        
-        [lowQualityPrompt addAction:cancelAction];
-        [lowQualityPrompt addAction:sendAction];
-        [lowQualityPrompt setPreferredAction:sendAction];
-        
-        [self presentCompressionPrompt:lowQualityPrompt];
-    }
-}
-
-- (void)sendVoiceMessage:(NSURL *)fileUrl
-                 toRooms:(NSArray<MXRoom *> *)rooms
-                 success:(dispatch_block_t)success
-                 failure:(void(^)(NSError *error))failure
-{
-    [self didStartSending];
-    if (!fileUrl)
-    {
-        MXLogError(@"[ShareManager] Invalid voice message file url.");
-        failure(nil);
-        return;
-    }
-    
-    __block NSError *error = nil;
-    dispatch_group_t dispatchGroup = dispatch_group_create();
-    for (MXRoom *room in rooms) {
-        dispatch_group_enter(dispatchGroup);
-        [room sendVoiceMessage:fileUrl mimeType:nil duration:0.0 samples:nil localEcho:nil success:^(NSString *eventId) {
-            dispatch_group_leave(dispatchGroup);
-        } failure:^(NSError *innerError) {
-            MXLogError(@"[ShareManager] sendVoiceMessage failed with error %@", error);
-            error = innerError;
-            dispatch_group_leave(dispatchGroup);
-        } keepActualFilename:YES];
-    }
-    
-    dispatch_group_notify(dispatchGroup, dispatch_get_main_queue(), ^{
-        if(error) {
-            failure(error);
-        } else {
-            success();
-        }
-    });
-}
-
-- (void)sendImageDatas:(NSArray<id<ShareItemProtocol>> *)imageDatas
-               toRooms:(NSArray<MXRoom *> *)rooms
-               success:(dispatch_block_t)success
-               failure:(void(^)(NSError *error))failure
-{
-    if (imageDatas.count == 0)
-    {
-        MXLogError(@"[ShareManager] sendImages: no images to send.");
-        failure(nil);
-        return;
-    }
-    
-    [self didStartSending];
-    
-    dispatch_group_t requestsGroup = dispatch_group_create();
-    __block NSError *firstRequestError;
-    
-    NSUInteger index = 0;
-    
-    for (NSData *imageData in imageDatas)
-    {
-        @autoreleasepool
-        {
-            dispatch_group_enter(requestsGroup);
-            [self sendImageData:imageData toRooms:rooms success:^{
-                dispatch_group_leave(requestsGroup);
-            } failure:^(NSError *error) {
-                if (error && !firstRequestError)
-                {
-                    firstRequestError = error;
-                }
-                
-               dispatch_group_leave(requestsGroup);
-            }];
-        }
-        
-        index++;
-    }
-    
-    dispatch_group_notify(requestsGroup, dispatch_get_main_queue(), ^{
-        
-        if (firstRequestError)
-        {
-            failure(firstRequestError);
-        }
-        else
-        {
-            success();
-        }
-    });
-}
-
-- (void)sendImageData:(NSData *)imageData
-              toRooms:(NSArray<MXRoom *> *)rooms
-              success:(dispatch_block_t)success
-              failure:(void(^)(NSError *error))failure
-{
-    [self didStartSending];
-    
-    NSString *imageUTI;
-    NSString *mimeType;
-    
-    if (!mimeType)
-    {
-        imageUTI = [self utiFromImageData:imageData];
-        if (imageUTI)
-        {
-            mimeType = [self mimeTypeFromUTI:imageUTI];
-        }
-    }
-    
-    if (!mimeType)
-    {
-        MXLogError(@"[ShareManager] sendImage failed. Cannot determine MIME type .");
-        if (failure)
-        {
-            failure(nil);
-        }
-        return;
-    }
-    
-    CGSize imageSize;
-    NSData *finalImageData;
-    
-    // Only resize JPEG or PNG files
-    if ([self isResizingSupportedForUTI:imageUTI])
-    {
-        UIImage *convertedImage;
-        CGSize newImageSize;
-        
-        switch (self.imageCompressionMode) {
-            case ImageCompressionModeSmall:
-                newImageSize = CGSizeMake(MXKTOOLS_SMALL_IMAGE_SIZE, MXKTOOLS_SMALL_IMAGE_SIZE);
-                break;
-            case ImageCompressionModeMedium:
-                newImageSize = CGSizeMake(MXKTOOLS_MEDIUM_IMAGE_SIZE, MXKTOOLS_MEDIUM_IMAGE_SIZE);
-                break;
-            case ImageCompressionModeLarge:
-                newImageSize = CGSizeMake(self.actualLargeSize, self.actualLargeSize);
-                break;
-            default:
-                newImageSize = CGSizeZero;
-                break;
-        }
-        
-        if (!CGSizeEqualToSize(newImageSize, CGSizeZero))
-        {
-            // Resize the image and set image in right orientation too
-            convertedImage = [MXKTools resizeImageWithData:imageData toFitInSize:newImageSize];
-        }
-        
-        if (convertedImage)
-        {
-            if ([imageUTI isEqualToString:(__bridge NSString *)kUTTypePNG])
-            {
-                finalImageData = UIImagePNGRepresentation(convertedImage);
-            }
-            else if ([imageUTI isEqualToString:(__bridge NSString *)kUTTypeJPEG])
-            {
-                finalImageData = UIImageJPEGRepresentation(convertedImage, 0.9);
-            }
-            
-            imageSize = convertedImage.size;
-        }
-        else
-        {
-            finalImageData = imageData;
-            imageSize = [self imageSizeFromImageData:imageData];
-        }
-    }
-    else
-    {
-        finalImageData = imageData;
-        imageSize = [self imageSizeFromImageData:imageData];
-    }
-    
-    __block NSError *error = nil;
-    dispatch_group_t dispatchGroup = dispatch_group_create();
-    for (MXRoom *room in rooms) {
-                
-        UIImage *thumbnail = nil;
-        if (room.summary.isEncrypted) // Thumbnail is useful only in case of encrypted room
-        {
-            thumbnail = [MXKTools resizeImageWithData:imageData toFitInSize:kThumbnailSize];
-        }
-        
-        dispatch_group_enter(dispatchGroup);
-        [room sendImage:finalImageData withImageSize:imageSize mimeType:mimeType andThumbnail:thumbnail localEcho:nil success:^(NSString *eventId) {
-            dispatch_group_leave(dispatchGroup);
-        } failure:^(NSError *innerError) {
-            MXLogError(@"[ShareManager] sendImage failed with error %@", error);
-            error = innerError;
-            dispatch_group_leave(dispatchGroup);
-        }];
-    }
-    
-    dispatch_group_notify(dispatchGroup, dispatch_get_main_queue(), ^{
-        if(error) {
-            failure(error);
-        } else {
-            success();
-        }
-    });
-}
-
 @end
diff --git a/RiotShareExtension/Shared/View/FallbackViewController.m b/RiotShareExtension/Shared/View/FallbackViewController.m
index 57412f705..beafbca25 100644
--- a/RiotShareExtension/Shared/View/FallbackViewController.m
+++ b/RiotShareExtension/Shared/View/FallbackViewController.m
@@ -17,11 +17,7 @@
 #import "FallbackViewController.h"
 #import "ThemeService.h"
 
-#ifdef IS_SHARE_EXTENSION
-#import "RiotShareExtension-Swift.h"
-#else
-#import "Riot-Swift.h"
-#endif
+#import "GeneratedInterface-Swift.h"
 
 @interface FallbackViewController ()
 
diff --git a/RiotShareExtension/Shared/View/RecentRoomTableViewCell.h b/RiotShareExtension/Shared/View/RecentRoomTableViewCell.h
index 63eb213f7..34a7123e5 100644
--- a/RiotShareExtension/Shared/View/RecentRoomTableViewCell.h
+++ b/RiotShareExtension/Shared/View/RecentRoomTableViewCell.h
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @interface RecentRoomTableViewCell : MXKRecentTableViewCell
 
diff --git a/RiotShareExtension/Shared/View/RecentRoomTableViewCell.m b/RiotShareExtension/Shared/View/RecentRoomTableViewCell.m
index ed7eb32a8..d5f277193 100644
--- a/RiotShareExtension/Shared/View/RecentRoomTableViewCell.m
+++ b/RiotShareExtension/Shared/View/RecentRoomTableViewCell.m
@@ -19,11 +19,7 @@
 #import "MXRoomSummary+Riot.h"
 #import "ThemeService.h"
 
-#ifdef IS_SHARE_EXTENSION
-#import "RiotShareExtension-Swift.h"
-#else
-#import "Riot-Swift.h"
-#endif
+#import "GeneratedInterface-Swift.h"
 
 @interface RecentRoomTableViewCell ()
 
@@ -48,6 +44,7 @@
     {
         return [UINib nibWithNibName:NSStringFromClass([self class]) bundle:mainBundle];
     }
+    
     return nil;
 }
 
diff --git a/RiotShareExtension/Shared/View/RoomsListViewController.m b/RiotShareExtension/Shared/View/RoomsListViewController.m
index 414e0364a..ca4102564 100644
--- a/RiotShareExtension/Shared/View/RoomsListViewController.m
+++ b/RiotShareExtension/Shared/View/RoomsListViewController.m
@@ -14,19 +14,13 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
-
 #import "RoomsListViewController.h"
 #import "RecentRoomTableViewCell.h"
 #import "ShareDataSource.h"
 #import "RecentCellData.h"
 #import "ThemeService.h"
 
-#ifdef IS_SHARE_EXTENSION
-#import "RiotShareExtension-Swift.h"
-#else
-#import "Riot-Swift.h"
-#endif
+#import "GeneratedInterface-Swift.h"
 
 @interface RoomsListViewController ()
 
diff --git a/RiotShareExtension/Shared/View/ShareViewController.m b/RiotShareExtension/Shared/View/ShareViewController.m
index cfe4f2a87..dc2c8ff24 100644
--- a/RiotShareExtension/Shared/View/ShareViewController.m
+++ b/RiotShareExtension/Shared/View/ShareViewController.m
@@ -21,13 +21,9 @@
 
 #import "ThemeService.h"
 
-#ifdef IS_SHARE_EXTENSION
-#import "RiotShareExtension-Swift.h"
-#else
-#import "Riot-Swift.h"
-#endif
+#import "GeneratedInterface-Swift.h"
 
-@interface ShareViewController () <MXKRecentListViewControllerDelegate, ShareDataSourceDelegate>
+@interface ShareViewController () <ShareDataSourceDelegate>
 
 @property (nonatomic, assign, readonly) ShareViewControllerType type;
 
diff --git a/RiotShareExtension/Sources/ShareExtensionRootViewController.m b/RiotShareExtension/Sources/ShareExtensionRootViewController.m
index aee019949..90b5006e8 100644
--- a/RiotShareExtension/Sources/ShareExtensionRootViewController.m
+++ b/RiotShareExtension/Sources/ShareExtensionRootViewController.m
@@ -17,15 +17,14 @@
 #import "ShareExtensionRootViewController.h"
 #import "ShareManager.h"
 #import "ThemeService.h"
+#import "ShareItemSender.h"
 
-#ifdef IS_SHARE_EXTENSION
-#import "RiotShareExtension-Swift.h"
-#else
-#import "Riot-Swift.h"
-#endif
+#import "GeneratedInterface-Swift.h"
 
 @interface ShareExtensionRootViewController ()
 
+@property (nonatomic, strong, readonly) id<Configurable> configuration;
+
 @property (nonatomic, strong, readonly) ShareManager *shareManager;
 
 @end
@@ -36,10 +35,32 @@
 {
     [super viewDidLoad];
     
+    _configuration = [[CommonConfiguration alloc] init];
+    [_configuration setupSettings];
+    
+    // NSLog -> console.log file when not debugging the app
+    MXLogConfiguration *configuration = [[MXLogConfiguration alloc] init];
+    configuration.logLevel = MXLogLevelVerbose;
+    configuration.logFilesSizeLimit = 0;
+    configuration.maxLogFilesCount = 10;
+    configuration.subLogName = @"share";
+    
+    // Redirect NSLogs to files only if we are not debugging
+    if (!isatty(STDERR_FILENO)) {
+        configuration.redirectLogsToFiles = YES;
+    }
+    
+    [MXLog configure:configuration];
+
+    
     [ThemeService.shared setThemeId:RiotSettings.shared.userInterfaceTheme];
     
-    ShareExtensionShareItemProvider *provider = [[ShareExtensionShareItemProvider alloc] initWithExtensionContext:self.extensionContext];
-    _shareManager = [[ShareManager alloc] initWithShareItemProvider:provider type:ShareManagerTypeSend];
+    ShareExtensionShareItemProvider *shareItemProvider = [[ShareExtensionShareItemProvider alloc] initWithExtensionContext:self.extensionContext];
+    ShareItemSender *shareItemSender = [[ShareItemSender alloc] initWithRootViewController:self
+                                                                         shareItemProvider:shareItemProvider];
+    
+    _shareManager = [[ShareManager alloc] initWithShareItemSender:shareItemSender
+                                                             type:ShareManagerTypeSend];
     
     MXWeakify(self);
     [_shareManager setCompletionCallback:^(ShareManagerResult result) {
diff --git a/RiotShareExtension/Sources/ShareExtensionShareItemProvider.swift b/RiotShareExtension/Sources/ShareExtensionShareItemProvider.swift
index 6a83e25c5..1ef2f4bbf 100644
--- a/RiotShareExtension/Sources/ShareExtensionShareItemProvider.swift
+++ b/RiotShareExtension/Sources/ShareExtensionShareItemProvider.swift
@@ -16,7 +16,6 @@
 
 import Foundation
 import MobileCoreServices
-import MatrixKit
 
 private class ShareExtensionItem: ShareItemProtocol {
     let itemProvider: NSItemProvider
@@ -47,7 +46,7 @@ private class ShareExtensionItem: ShareItemProtocol {
 }
 
 @objcMembers
-class ShareExtensionShareItemProvider: NSObject, ShareItemProviderProtocol	 {
+public class ShareExtensionShareItemProvider: NSObject	 {
     
     public let items: [ShareItemProtocol]
     
@@ -66,7 +65,7 @@ class ShareExtensionShareItemProvider: NSObject, ShareItemProviderProtocol	 {
         self.items = items
     }
     
-    func areAllItemsLoaded() -> Bool {
+    public func areAllItemsLoaded() -> Bool {
         for case let item as ShareExtensionItem in self.items {
             if !item.loaded {
                 return false
@@ -121,8 +120,6 @@ class ShareExtensionShareItemProvider: NSObject, ShareItemProviderProtocol	 {
             return MXKUTI.video.rawValue
         case .movie:
             return MXKUTI.movie.rawValue
-        case .voiceMessage:
-            return MXKUTI.fileUrl.rawValue
         default:
             return ""
         }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItemContent.swift b/RiotShareExtension/Sources/ShareItemProtocol.swift
similarity index 77%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItemContent.swift
rename to RiotShareExtension/Sources/ShareItemProtocol.swift
index 17c05ab54..b47987463 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItemContent.swift
+++ b/RiotShareExtension/Sources/ShareItemProtocol.swift
@@ -16,8 +16,10 @@
 
 import Foundation
 
-enum TemplateRoomChatBubbleItemContent {
-    case message(TemplateRoomChatMessageContent)
+@objc public enum ShareItemType: UInt {
+    case fileURL, text, URL, image, video, movie, unknown
 }
 
-extension TemplateRoomChatBubbleItemContent: Equatable { }
+@objc public protocol ShareItemProtocol {
+    var type: ShareItemType { get }
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItem.swift b/RiotShareExtension/Sources/ShareItemSender.h
similarity index 60%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItem.swift
rename to RiotShareExtension/Sources/ShareItemSender.h
index 9d8809917..19670cead 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItem.swift
+++ b/RiotShareExtension/Sources/ShareItemSender.h
@@ -14,15 +14,19 @@
 // limitations under the License.
 //
 
-import UIKit
+#import <UIKit/UIKit.h>
 
-/// 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
-    var content: TemplateRoomChatBubbleItemContent
-}
+#import "ShareItemSenderProtocol.h"
 
-extension TemplateRoomChatBubbleItem: Identifiable, Equatable { }
+@class ShareExtensionShareItemProvider;
 
+NS_ASSUME_NONNULL_BEGIN
 
+@interface ShareItemSender : NSObject <ShareItemSenderProtocol>
+
+- (instancetype)initWithRootViewController:(UIViewController *)rootViewController
+                         shareItemProvider:(ShareExtensionShareItemProvider *)shareItemProvider;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/RiotShareExtension/Sources/ShareItemSender.m b/RiotShareExtension/Sources/ShareItemSender.m
new file mode 100644
index 000000000..e1cd1add6
--- /dev/null
+++ b/RiotShareExtension/Sources/ShareItemSender.m
@@ -0,0 +1,888 @@
+// 
+// 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 MobileCoreServices;
+
+#import "ShareItemSender.h"
+
+#import "GeneratedInterface-Swift.h"
+
+static const CGFloat kLargeImageSizeMaxDimension = 2048.0;
+static const CGSize kThumbnailSize = {800.0, 600.0};
+/// A safe maximum file size for an image to send the original.
+static const NSUInteger kImageMaxFileSize = 20 * 1024 * 1024;
+
+typedef NS_ENUM(NSInteger, ImageCompressionMode)
+{
+    ImageCompressionModeNone,
+    ImageCompressionModeSmall,
+    ImageCompressionModeMedium,
+    ImageCompressionModeLarge
+};
+
+@interface ShareItemSender ()
+
+@property (nonatomic, strong, readonly) UIViewController *rootViewController;
+@property (nonatomic, strong, readonly) ShareExtensionShareItemProvider *shareItemProvider;
+
+@property (nonatomic, strong, readonly) NSMutableArray<NSData *> *pendingImages;
+@property (nonatomic, strong, readonly) NSMutableDictionary<NSString *, NSNumber *> *imageUploadProgresses;
+
+@property (nonatomic, assign) ImageCompressionMode imageCompressionMode;
+@property (nonatomic, assign) CGFloat actualLargeSize;
+
+@end
+
+@implementation ShareItemSender
+@synthesize delegate;
+
+- (instancetype)initWithRootViewController:(UIViewController *)rootViewController
+                         shareItemProvider:(ShareExtensionShareItemProvider *)shareItemProvider
+{
+    if (self = [super init]) {
+        _rootViewController = rootViewController;
+        _shareItemProvider = shareItemProvider;
+        
+        _pendingImages = [NSMutableArray array];
+        _imageUploadProgresses = [NSMutableDictionary dictionary];
+        
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onMediaLoaderStateDidChange:) name:kMXMediaLoaderStateDidChangeNotification object:nil];
+    }
+    
+    return self;
+}
+
+- (void)didStartSending
+{
+    [self.delegate shareItemSenderDidStartSending:self];
+}
+
+- (void)presentCompressionPrompt:(UIAlertController *)compressionPrompt
+{
+    [compressionPrompt popoverPresentationController].sourceView = self.rootViewController.view;
+    [compressionPrompt popoverPresentationController].sourceRect = self.rootViewController.view.frame;
+    [self.rootViewController.presentedViewController presentViewController:compressionPrompt animated:YES completion:nil];
+}
+
+- (BOOL)roomsContainEncryptedRoom:(NSArray<MXRoom *> *)rooms
+{
+    BOOL foundEncryptedRoom = NO;
+    
+    for (MXRoom *room in rooms)
+    {
+        if (room.summary.isEncrypted)
+        {
+            foundEncryptedRoom = YES;
+            break;
+        }
+    }
+    
+    return foundEncryptedRoom;
+}
+
+- (void)resetPendingData
+{
+    [self.pendingImages removeAllObjects];
+    [self.imageUploadProgresses removeAllObjects];
+}
+
+- (void)sendItemsToRooms:(NSArray<MXRoom *> *)rooms success:(void (^)(void))success failure:(void (^)(NSArray<NSError *> *))failure
+{
+    [self resetPendingData];
+    
+    __block NSMutableArray<NSError *> *errors;
+    dispatch_group_t dispatchGroup = dispatch_group_create();
+    
+    void (^requestSuccess)(void) = ^() {
+        dispatch_group_leave(dispatchGroup);
+    };
+    
+    void (^requestFailure)(NSError *) = ^(NSError *requestError) {
+        if (errors == nil)
+        {
+            errors = [NSMutableArray array];
+        }
+        
+        if(requestError)
+        {
+            [errors addObject:requestError];
+        }
+        
+        dispatch_group_leave(dispatchGroup);
+    };
+    
+    MXWeakify(self);
+    for (id<ShareItemProtocol> item in self.shareItemProvider.items)
+    {
+        if (item.type == ShareItemTypeText || item.type == ShareItemTypeURL) {
+            dispatch_group_enter(dispatchGroup);
+            [self.shareItemProvider loadItem:item completion:^(id item, NSError *error) {
+                MXStrongifyAndReturnIfNil(self);
+                
+                if (error)
+                {
+                    requestFailure(error);
+                    return;
+                }
+                
+                NSString *text = nil;
+                if([item isKindOfClass:[NSString class]])
+                {
+                    text = item;
+                }
+                else if([item isKindOfClass:[NSURL class]])
+                {
+                    text = [(NSURL *)item absoluteString];
+                }
+                
+                if(text.length == 0)
+                {
+                    requestFailure(nil);
+                    return;
+                }
+                
+                [self sendText:text toRooms:rooms success:requestSuccess failure:requestFailure];
+            }];
+        }
+        
+        if (item.type == ShareItemTypeFileURL) {
+            dispatch_group_enter(dispatchGroup);
+            [self.shareItemProvider loadItem:item completion:^(NSURL *url, NSError *error) {
+                MXStrongifyAndReturnIfNil(self);
+                
+                if (error)
+                {
+                    requestFailure(error);
+                    return;
+                }
+                
+                [self sendFileWithUrl:url toRooms:rooms success:requestSuccess failure:requestFailure];
+            }];
+        }
+        
+        if (item.type == ShareItemTypeVideo || item.type == ShareItemTypeMovie)
+        {
+            dispatch_group_enter(dispatchGroup);
+            [self.shareItemProvider loadItem:item completion:^(NSURL *videoLocalUrl, NSError *error) {
+                MXStrongifyAndReturnIfNil(self);
+                
+                if (error)
+                {
+                    requestFailure(error);
+                    return;
+                }
+                
+                [self sendVideo:videoLocalUrl toRooms:rooms success:requestSuccess failure:requestFailure];
+            }];
+        }
+        
+        if (item.type == ShareItemTypeImage)
+        {
+            dispatch_group_enter(dispatchGroup);
+            [self.shareItemProvider loadItem:item completion:^(id<NSSecureCoding> itemProviderItem, NSError *error) {
+                MXStrongifyAndReturnIfNil(self);
+                
+                if (error)
+                {
+                    requestFailure(error);
+                    return;
+                }
+                
+                NSData *imageData;
+                if ([(NSObject *)itemProviderItem isKindOfClass:[NSData class]])
+                {
+                    imageData = (NSData*)itemProviderItem;
+                }
+                else if ([(NSObject *)itemProviderItem isKindOfClass:[NSURL class]])
+                {
+                    NSURL *imageURL = (NSURL*)itemProviderItem;
+                    imageData = [NSData dataWithContentsOfURL:imageURL];
+                }
+                else if ([(NSObject *)itemProviderItem isKindOfClass:[UIImage class]])
+                {
+                    // An application can share directly an UIImage.
+                    // The most common case is screenshot sharing without saving to file.
+                    // As screenshot using PNG format when they are saved to file we also use PNG format when saving UIImage to NSData.
+                    UIImage *image = (UIImage*)itemProviderItem;
+                    imageData = UIImagePNGRepresentation(image);
+                }
+                
+                if (!imageData)
+                {
+                    requestFailure(error);
+                    return;
+                }
+                
+                if ([self.shareItemProvider areAllItemsImages])
+                {
+                    // When all items are images, they're processed together from the
+                    // pending list, immediately after the final image has been loaded.
+                    [self.pendingImages addObject:imageData];
+                }
+                else
+                {
+                    // Otherwise, the image is sent as is, without prompting for a resize
+                    // as that wouldn't make much sense with multiple content types.
+                    self.imageCompressionMode = ImageCompressionModeNone;
+                    [self sendImageData:imageData toRooms:rooms success:requestSuccess failure:requestFailure];
+                }
+                
+                // When there are multiple content types the image will have been sent above.
+                // Otherwise, if we have loaded all of the images we can send them all together.
+                if ([self.shareItemProvider areAllItemsImages])
+                {
+                    if ([self.shareItemProvider areAllItemsLoaded])
+                    {
+                        MXWeakify(self);
+                        void (^sendPendingImages)(void) = ^void() {
+                            MXStrongifyAndReturnIfNil(self);
+                            [self sendImageDatas:self.pendingImages.copy toRooms:rooms success:requestSuccess failure:requestFailure];
+                        };
+                        
+                        if (RiotSettings.shared.showMediaCompressionPrompt)
+                        {
+                            // Create a compression prompt which will be nil when the sizes can't be determined or if there are no pending images.
+                            UIAlertController *compressionPrompt = [self compressionPromptForPendingImagesWithShareBlock:sendPendingImages];
+                            if (compressionPrompt)
+                            {
+                                [self presentCompressionPrompt:compressionPrompt];
+                            }
+                        }
+                        else
+                        {
+                            self.imageCompressionMode = ImageCompressionModeNone;
+                            sendPendingImages();
+                        }
+                    }
+                    else
+                    {
+                        dispatch_group_leave(dispatchGroup);
+                    }
+                }
+            }];
+        }
+    }
+    
+    dispatch_group_notify(dispatchGroup, dispatch_get_main_queue(), ^{
+        [self resetPendingData];
+        
+        if (errors)
+        {
+            failure(errors);
+        }
+        else
+        {
+            success();
+        }
+    });
+}
+
+// TODO: When select multiple images:
+// - Enhance prompt to display sum of all file sizes for each compression.
+// - Find a way to choose compression sizes for all images.
+- (UIAlertController *)compressionPromptForPendingImagesWithShareBlock:(void(^)(void))shareBlock
+{
+    if (!self.pendingImages.count)
+    {
+        return nil;
+    }
+    
+    NSData *firstImageData = self.pendingImages.firstObject;
+    UIImage *firstImage = [UIImage imageWithData:firstImageData];
+    
+    MXKImageCompressionSizes compressionSizes = [MXKTools availableCompressionSizesForImage:firstImage originalFileSize:firstImageData.length];
+    
+    if (compressionSizes.small.fileSize == 0 && compressionSizes.medium.fileSize == 0 && compressionSizes.large.fileSize == 0)
+    {
+        self.imageCompressionMode = ImageCompressionModeNone;
+        MXLogDebug(@"[ShareManager] Bypass compression prompt and send originals for %lu image(s) due to undetermined file sizes", (unsigned long)self.pendingImages.count);
+        
+        shareBlock();
+        
+        return nil;
+    }
+    
+    UIAlertController *compressionPrompt = [UIAlertController alertControllerWithTitle:[MatrixKitL10n attachmentSizePromptTitle]
+                                                                               message:[MatrixKitL10n attachmentSizePromptMessage]
+                                                                        preferredStyle:UIAlertControllerStyleActionSheet];
+    
+    if (compressionSizes.small.fileSize)
+    {
+        NSString *title = [MatrixKitL10n attachmentSmall:[MXTools fileSizeToString:compressionSizes.small.fileSize]];
+        
+        MXWeakify(self);
+        [compressionPrompt addAction:[UIAlertAction actionWithTitle:title style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+            MXStrongifyAndReturnIfNil(self);
+            
+            self.imageCompressionMode = ImageCompressionModeSmall;
+            [self logCompressionSizeChoice:compressionSizes.small];
+            
+            shareBlock();
+        }]];
+    }
+    
+    if (compressionSizes.medium.fileSize)
+    {
+        NSString *title = [MatrixKitL10n attachmentMedium:[MXTools fileSizeToString:compressionSizes.medium.fileSize]];
+        
+        MXWeakify(self);
+        [compressionPrompt addAction:[UIAlertAction actionWithTitle:title style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+            MXStrongifyAndReturnIfNil(self);
+            
+            self.imageCompressionMode = ImageCompressionModeMedium;
+            [self logCompressionSizeChoice:compressionSizes.medium];
+            
+            shareBlock();
+        }]];
+    }
+    
+    // Do not offer the possibility to resize an image with a dimension above kLargeImageSizeMaxDimension, to prevent the risk of memory limit exception.
+    // TODO: Remove this condition when issue https://github.com/vector-im/riot-ios/issues/2341 will be fixed.
+    if (compressionSizes.large.fileSize && (MAX(compressionSizes.large.imageSize.width, compressionSizes.large.imageSize.height) <= kLargeImageSizeMaxDimension))
+    {
+        NSString *title = [MatrixKitL10n attachmentLarge:[MXTools fileSizeToString:compressionSizes.large.fileSize]];
+        
+        MXWeakify(self);
+        [compressionPrompt addAction:[UIAlertAction actionWithTitle:title style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+            MXStrongifyAndReturnIfNil(self);
+            
+            self.imageCompressionMode = ImageCompressionModeLarge;
+            self.actualLargeSize = compressionSizes.actualLargeSize;
+            
+            [self logCompressionSizeChoice:compressionSizes.large];
+            
+            shareBlock();
+        }]];
+    }
+    
+    // To limit memory consumption when encrypting, we suggest the original resolution only if the image size is moderate
+    if (compressionSizes.original.fileSize < kImageMaxFileSize)
+    {
+        NSString *fileSizeString = [MXTools fileSizeToString:compressionSizes.original.fileSize];
+        
+        NSString *title = [MatrixKitL10n attachmentOriginal:fileSizeString];
+        
+        MXWeakify(self);
+        [compressionPrompt addAction:[UIAlertAction actionWithTitle:title style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+            MXStrongifyAndReturnIfNil(self);
+            
+            self.imageCompressionMode = ImageCompressionModeNone;
+            [self logCompressionSizeChoice:compressionSizes.original];
+            
+            shareBlock();
+        }]];
+    }
+    
+    [compressionPrompt addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
+                                                          style:UIAlertActionStyleCancel
+                                                        handler:nil]];
+    
+    return compressionPrompt;
+}
+
+- (NSString*)utiFromImageData:(NSData*)imageData
+{
+    CGImageSourceRef imageSource = CGImageSourceCreateWithData((CFDataRef)imageData, NULL);
+    NSString *uti = (NSString*)CGImageSourceGetType(imageSource);
+    CFRelease(imageSource);
+    return uti;
+}
+
+- (NSString*)mimeTypeFromUTI:(NSString*)uti
+{
+    return (__bridge_transfer NSString *) UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)uti, kUTTagClassMIMEType);
+}
+
+- (BOOL)isResizingSupportedForImageData:(NSData*)imageData
+{
+    NSString *imageUTI = [self utiFromImageData:imageData];
+    return [self isResizingSupportedForUTI:imageUTI];
+}
+
+- (BOOL)isResizingSupportedForUTI:(NSString*)imageUTI
+{
+    if ([imageUTI isEqualToString:(__bridge NSString *)kUTTypePNG] || [imageUTI isEqualToString:(__bridge NSString *)kUTTypeJPEG])
+    {
+        return YES;
+    }
+    return NO;
+}
+
+- (CGSize)imageSizeFromImageData:(NSData*)imageData
+{
+    CGFloat width = 0.0f;
+    CGFloat height = 0.0f;
+    
+    CGImageSourceRef imageSource = CGImageSourceCreateWithData((CFDataRef)imageData, NULL);
+    
+    CFDictionaryRef imageProperties = CGImageSourceCopyPropertiesAtIndex(imageSource, 0, NULL);
+    
+    CFRelease(imageSource);
+    
+    if (imageProperties != NULL)
+    {
+        CFNumberRef widthNumber  = CFDictionaryGetValue(imageProperties, kCGImagePropertyPixelWidth);
+        CFNumberRef heightNumber = CFDictionaryGetValue(imageProperties, kCGImagePropertyPixelHeight);
+        CFNumberRef orientationNumber = CFDictionaryGetValue(imageProperties, kCGImagePropertyOrientation);
+        
+        if (widthNumber != NULL)
+        {
+            CFNumberGetValue(widthNumber, kCFNumberCGFloatType, &width);
+        }
+        
+        if (heightNumber != NULL)
+        {
+            CFNumberGetValue(heightNumber, kCFNumberCGFloatType, &height);
+        }
+        
+        // Check orientation and flip size if required
+        if (orientationNumber != NULL)
+        {
+            int orientation;
+            CFNumberGetValue(orientationNumber, kCFNumberIntType, &orientation);
+            
+            // For orientation from kCGImagePropertyOrientationLeftMirrored to kCGImagePropertyOrientationLeft flip size
+            if (orientation >= 5)
+            {
+                CGFloat tempWidth = width;
+                width = height;
+                height = tempWidth;
+            }
+        }
+        
+        CFRelease(imageProperties);
+    }
+    
+    return CGSizeMake(width, height);
+}
+
+- (void)logCompressionSizeChoice:(MXKImageCompressionSize)compressionSize
+{
+    NSString *fileSize = [MXTools fileSizeToString:compressionSize.fileSize round:NO];
+    NSUInteger imageWidth = compressionSize.imageSize.width;
+    NSUInteger imageHeight = compressionSize.imageSize.height;
+    
+    MXLogDebug(@"[ShareItemSender] User choose image compression with output size %lu x %lu (output file size: %@)", (unsigned long)imageWidth, (unsigned long)imageHeight, fileSize);
+    MXLogDebug(@"[ShareItemSender] Number of images to send: %lu", (unsigned long)self.pendingImages.count);
+}
+
+#pragma mark - Notifications
+
+- (void)onMediaLoaderStateDidChange:(NSNotification *)notification
+{
+    MXMediaLoader *loader = (MXMediaLoader*)notification.object;
+    // Consider only upload progress
+    switch (loader.state) {
+        case MXMediaLoaderStateUploadInProgress:
+        {
+            self.imageUploadProgresses[loader.uploadId] = (NSNumber *)loader.statisticsDict[kMXMediaLoaderProgressValueKey];
+            
+            const NSInteger totalImagesCount = self.pendingImages.count;
+            CGFloat totalProgress = 0.0;
+            
+            for (NSNumber *progress in self.imageUploadProgresses.allValues)
+            {
+                totalProgress += progress.floatValue/totalImagesCount;
+            }
+            
+            [self.delegate shareItemSender:self didUpdateProgress:totalProgress];
+            break;
+        }
+        default:
+            break;
+    }
+}
+
+#pragma mark - Sharing
+
+- (void)sendText:(NSString *)text
+         toRooms:(NSArray<MXRoom *> *)rooms
+         success:(dispatch_block_t)success
+         failure:(void(^)(NSError *error))failure
+{
+    [self didStartSending];
+    if (!text)
+    {
+        MXLogError(@"[ShareItemSender] Invalid text.");
+        failure(nil);
+        return;
+    }
+    
+    __block NSError *error = nil;
+    dispatch_group_t dispatchGroup = dispatch_group_create();
+    for (MXRoom *room in rooms) {
+        dispatch_group_enter(dispatchGroup);
+        [room sendTextMessage:text success:^(NSString *eventId) {
+            dispatch_group_leave(dispatchGroup);
+        } failure:^(NSError *innerError) {
+            MXLogError(@"[ShareItemSender] sendTextMessage failed with error %@", error);
+            error = innerError;
+            dispatch_group_leave(dispatchGroup);
+        }];
+    }
+    
+    dispatch_group_notify(dispatchGroup, dispatch_get_main_queue(), ^{
+        if(error) {
+            failure(error);
+        } else {
+            success();
+        }
+    });
+}
+
+- (void)sendFileWithUrl:(NSURL *)fileUrl
+                toRooms:(NSArray<MXRoom *> *)rooms
+                success:(dispatch_block_t)success
+                failure:(void(^)(NSError *error))failure
+{
+    [self didStartSending];
+    if (!fileUrl)
+    {
+        MXLogError(@"[ShareItemSender] Invalid file url.");
+        failure(nil);
+        return;
+    }
+    
+    NSString *mimeType;
+    CFStringRef uti = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, (__bridge CFStringRef)[fileUrl pathExtension] , NULL);
+    mimeType = [self mimeTypeFromUTI:(__bridge NSString *)uti];
+    CFRelease(uti);
+    
+    __block NSError *error = nil;
+    dispatch_group_t dispatchGroup = dispatch_group_create();
+    for (MXRoom *room in rooms) {
+        dispatch_group_enter(dispatchGroup);
+        [room sendFile:fileUrl mimeType:mimeType localEcho:nil success:^(NSString *eventId) {
+            dispatch_group_leave(dispatchGroup);
+        } failure:^(NSError *innerError) {
+            MXLogError(@"[ShareItemSender] sendFile failed with error %@", innerError);
+            error = innerError;
+            dispatch_group_leave(dispatchGroup);
+        } keepActualFilename:YES];
+    }
+    
+    dispatch_group_notify(dispatchGroup, dispatch_get_main_queue(), ^{
+        if(error) {
+            failure(error);
+        } else {
+            success();
+        }
+    });
+}
+
+- (void)sendVideo:(NSURL *)videoLocalUrl
+          toRooms:(NSArray<MXRoom *> *)rooms
+          success:(dispatch_block_t)success
+          failure:(void(^)(NSError *error))failure
+{
+    AVURLAsset *videoAsset = [[AVURLAsset alloc] initWithURL:videoLocalUrl options:nil];
+    
+    MXWeakify(self);
+    
+    void (^sendVideo)(void) = ^void()  {
+        MXStrongifyAndReturnIfNil(self);
+        
+        [self didStartSending];
+        if (!videoLocalUrl)
+        {
+            MXLogError(@"[ShareManager] Invalid video file url.");
+            failure(nil);
+            return;
+        }
+        
+        // Retrieve the video frame at 1 sec to define the video thumbnail
+        AVAssetImageGenerator *assetImageGenerator = [AVAssetImageGenerator assetImageGeneratorWithAsset:videoAsset];
+        assetImageGenerator.appliesPreferredTrackTransform = YES;
+        CMTime time = CMTimeMake(1, 1);
+        CGImageRef imageRef = [assetImageGenerator copyCGImageAtTime:time actualTime:NULL error:nil];
+        // Finalize video attachment
+        UIImage *videoThumbnail = [[UIImage alloc] initWithCGImage:imageRef];
+        CFRelease(imageRef);
+        
+        __block NSError *error = nil;
+        dispatch_group_t dispatchGroup = dispatch_group_create();
+        for (MXRoom *room in rooms) {
+            dispatch_group_enter(dispatchGroup);
+            [room sendVideoAsset:videoAsset withThumbnail:videoThumbnail localEcho:nil success:^(NSString *eventId) {
+                dispatch_group_leave(dispatchGroup);
+            } failure:^(NSError *innerError) {
+                MXLogError(@"[ShareManager] Failed sending video with error %@", innerError);
+                error = innerError;
+                dispatch_group_leave(dispatchGroup);
+            }];
+        }
+        
+        dispatch_group_notify(dispatchGroup, dispatch_get_main_queue(), ^{
+            if(error) {
+                failure(error);
+            } else {
+                success();
+            }
+        });
+    };
+    
+    BOOL allRoomsAreUnencrypted = ![self roomsContainEncryptedRoom:rooms];
+    
+    // When rooms are unencrypted convert the video according to the user's normal preferences
+    if (allRoomsAreUnencrypted)
+    {
+        if (!RiotSettings.shared.showMediaCompressionPrompt)
+        {
+            [MXSDKOptions sharedInstance].videoConversionPresetName = AVCaptureSessionPreset1920x1080;
+            sendVideo();
+        }
+        else
+        {
+            UIAlertController *compressionPrompt = [MXKTools videoConversionPromptForVideoAsset:videoAsset withCompletion:^(NSString *presetName) {
+                // If the preset name is nil, the user cancelled.
+                if (!presetName)
+                {
+                    return;
+                }
+                
+                // Set the chosen video conversion preset.
+                [MXSDKOptions sharedInstance].videoConversionPresetName = presetName;
+                sendVideo();
+            }];
+            
+            [self presentCompressionPrompt:compressionPrompt];
+        }
+    }
+    else
+    {
+        // When rooms are encrypted we quickly run out of memory encrypting the video
+        // Prompt the user if they're happy to send a low quality video (320p).
+        UIAlertController *lowQualityPrompt = [UIAlertController alertControllerWithTitle:VectorL10n.shareExtensionLowQualityVideoTitle
+                                                                                  message:[VectorL10n shareExtensionLowQualityVideoMessage:AppInfo.current.displayName]
+                                                                           preferredStyle:UIAlertControllerStyleAlert];
+        
+        UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:MatrixKitL10n.cancel style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
+            // Do nothing
+        }];
+        UIAlertAction *sendAction = [UIAlertAction actionWithTitle:VectorL10n.shareExtensionSendNow style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+            [MXSDKOptions sharedInstance].videoConversionPresetName = AVAssetExportPresetMediumQuality;
+            sendVideo();
+        }];
+        
+        [lowQualityPrompt addAction:cancelAction];
+        [lowQualityPrompt addAction:sendAction];
+        [lowQualityPrompt setPreferredAction:sendAction];
+        
+        [self presentCompressionPrompt:lowQualityPrompt];
+    }
+}
+
+- (void)sendVoiceMessage:(NSURL *)fileUrl
+                 toRooms:(NSArray<MXRoom *> *)rooms
+                 success:(dispatch_block_t)success
+                 failure:(void(^)(NSError *error))failure
+{
+    [self didStartSending];
+    if (!fileUrl)
+    {
+        MXLogError(@"[ShareItemSender] Invalid voice message file url.");
+        failure(nil);
+        return;
+    }
+    
+    __block NSError *error = nil;
+    dispatch_group_t dispatchGroup = dispatch_group_create();
+    for (MXRoom *room in rooms) {
+        dispatch_group_enter(dispatchGroup);
+        [room sendVoiceMessage:fileUrl mimeType:nil duration:0.0 samples:nil localEcho:nil success:^(NSString *eventId) {
+            dispatch_group_leave(dispatchGroup);
+        } failure:^(NSError *innerError) {
+            MXLogError(@"[ShareItemSender] sendVoiceMessage failed with error %@", error);
+            error = innerError;
+            dispatch_group_leave(dispatchGroup);
+        } keepActualFilename:YES];
+    }
+    
+    dispatch_group_notify(dispatchGroup, dispatch_get_main_queue(), ^{
+        if(error) {
+            failure(error);
+        } else {
+            success();
+        }
+    });
+}
+
+- (void)sendImageDatas:(NSArray<id<ShareItemProtocol>> *)imageDatas
+               toRooms:(NSArray<MXRoom *> *)rooms
+               success:(dispatch_block_t)success
+               failure:(void(^)(NSError *error))failure
+{
+    if (imageDatas.count == 0)
+    {
+        MXLogError(@"[ShareManager] sendImages: no images to send.");
+        failure(nil);
+        return;
+    }
+    
+    [self didStartSending];
+    
+    dispatch_group_t requestsGroup = dispatch_group_create();
+    __block NSError *firstRequestError;
+    
+    NSUInteger index = 0;
+    
+    for (NSData *imageData in imageDatas)
+    {
+        @autoreleasepool
+        {
+            dispatch_group_enter(requestsGroup);
+            [self sendImageData:imageData toRooms:rooms success:^{
+                dispatch_group_leave(requestsGroup);
+            } failure:^(NSError *error) {
+                if (error && !firstRequestError)
+                {
+                    firstRequestError = error;
+                }
+                
+               dispatch_group_leave(requestsGroup);
+            }];
+        }
+        
+        index++;
+    }
+    
+    dispatch_group_notify(requestsGroup, dispatch_get_main_queue(), ^{
+        
+        if (firstRequestError)
+        {
+            failure(firstRequestError);
+        }
+        else
+        {
+            success();
+        }
+    });
+}
+
+- (void)sendImageData:(NSData *)imageData
+              toRooms:(NSArray<MXRoom *> *)rooms
+              success:(dispatch_block_t)success
+              failure:(void(^)(NSError *error))failure
+{
+    [self didStartSending];
+    
+    NSString *imageUTI;
+    NSString *mimeType;
+    
+    if (!mimeType)
+    {
+        imageUTI = [self utiFromImageData:imageData];
+        if (imageUTI)
+        {
+            mimeType = [self mimeTypeFromUTI:imageUTI];
+        }
+    }
+    
+    if (!mimeType)
+    {
+        MXLogError(@"[ShareManager] sendImage failed. Cannot determine MIME type .");
+        if (failure)
+        {
+            failure(nil);
+        }
+        return;
+    }
+    
+    CGSize imageSize;
+    NSData *finalImageData;
+    
+    // Only resize JPEG or PNG files
+    if ([self isResizingSupportedForUTI:imageUTI])
+    {
+        UIImage *convertedImage;
+        CGSize newImageSize;
+        
+        switch (self.imageCompressionMode) {
+            case ImageCompressionModeSmall:
+                newImageSize = CGSizeMake(MXKTOOLS_SMALL_IMAGE_SIZE, MXKTOOLS_SMALL_IMAGE_SIZE);
+                break;
+            case ImageCompressionModeMedium:
+                newImageSize = CGSizeMake(MXKTOOLS_MEDIUM_IMAGE_SIZE, MXKTOOLS_MEDIUM_IMAGE_SIZE);
+                break;
+            case ImageCompressionModeLarge:
+                newImageSize = CGSizeMake(self.actualLargeSize, self.actualLargeSize);
+                break;
+            default:
+                newImageSize = CGSizeZero;
+                break;
+        }
+        
+        if (!CGSizeEqualToSize(newImageSize, CGSizeZero))
+        {
+            // Resize the image and set image in right orientation too
+            convertedImage = [MXKTools resizeImageWithData:imageData toFitInSize:newImageSize];
+        }
+        
+        if (convertedImage)
+        {
+            if ([imageUTI isEqualToString:(__bridge NSString *)kUTTypePNG])
+            {
+                finalImageData = UIImagePNGRepresentation(convertedImage);
+            }
+            else if ([imageUTI isEqualToString:(__bridge NSString *)kUTTypeJPEG])
+            {
+                finalImageData = UIImageJPEGRepresentation(convertedImage, 0.9);
+            }
+            
+            imageSize = convertedImage.size;
+        }
+        else
+        {
+            finalImageData = imageData;
+            imageSize = [self imageSizeFromImageData:imageData];
+        }
+    }
+    else
+    {
+        finalImageData = imageData;
+        imageSize = [self imageSizeFromImageData:imageData];
+    }
+    
+    __block NSError *error = nil;
+    dispatch_group_t dispatchGroup = dispatch_group_create();
+    for (MXRoom *room in rooms) {
+                
+        UIImage *thumbnail = nil;
+        if (room.summary.isEncrypted) // Thumbnail is useful only in case of encrypted room
+        {
+            thumbnail = [MXKTools resizeImageWithData:imageData toFitInSize:kThumbnailSize];
+        }
+        
+        dispatch_group_enter(dispatchGroup);
+        [room sendImage:finalImageData withImageSize:imageSize mimeType:mimeType andThumbnail:thumbnail localEcho:nil success:^(NSString *eventId) {
+            dispatch_group_leave(dispatchGroup);
+        } failure:^(NSError *innerError) {
+            MXLogError(@"[ShareManager] sendImage failed with error %@", error);
+            error = innerError;
+            dispatch_group_leave(dispatchGroup);
+        }];
+    }
+    
+    dispatch_group_notify(dispatchGroup, dispatch_get_main_queue(), ^{
+        if(error) {
+            failure(error);
+        } else {
+            success();
+        }
+    });
+}
+
+@end
diff --git a/RiotShareExtension/SupportingFiles/RiotShareExtension-Bridging-Header.h b/RiotShareExtension/SupportingFiles/RiotShareExtension-Bridging-Header.h
index 9d1bfc7d9..9a7cf3af1 100644
--- a/RiotShareExtension/SupportingFiles/RiotShareExtension-Bridging-Header.h
+++ b/RiotShareExtension/SupportingFiles/RiotShareExtension-Bridging-Header.h
@@ -5,3 +5,7 @@
 #import "ThemeService.h"
 #import "AvatarGenerator.h"
 #import "BuildInfo.h"
+#import "ShareItemSender.h"
+
+// MatrixKit imports
+#import "MatrixKit-Bridging-Header.h"
diff --git a/RiotShareExtension/target.yml b/RiotShareExtension/target.yml
index a02fc10ca..7f32196f4 100644
--- a/RiotShareExtension/target.yml
+++ b/RiotShareExtension/target.yml
@@ -68,3 +68,7 @@ targets:
       buildPhase: resources
     - path: ../Riot/Assets/SharedImages.xcassets
       buildPhase: resources
+    - path: ../Riot/Modules/MatrixKit
+      excludes:
+        - "**/*.md" # excludes all files with the .md extension
+    - path: ../Riot/Generated/MatrixKitStrings.swift
diff --git a/RiotSwiftUI/Common.xcconfig b/RiotSwiftUI/Common.xcconfig
index e7cb586cf..9c6902651 100644
--- a/RiotSwiftUI/Common.xcconfig
+++ b/RiotSwiftUI/Common.xcconfig
@@ -26,3 +26,5 @@ PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER).riotswiftui
 INFOPLIST_FILE = RiotSwiftUI/Info.plist
 
 SKIP_INSTALL = YES
+
+SWIFT_OBJC_INTERFACE_HEADER_NAME = GeneratedInterface-Swift.h
diff --git a/RiotSwiftUI/Debug.xcconfig b/RiotSwiftUI/Debug.xcconfig
index 11a7288a4..d890f7e35 100644
--- a/RiotSwiftUI/Debug.xcconfig
+++ b/RiotSwiftUI/Debug.xcconfig
@@ -18,3 +18,4 @@
 // https://help.apple.com/xcode/#/dev745c5c974
 
 #include "Common.xcconfig"
+#include "Pods/Target Support Files/Pods-RiotPods-RiotSwiftUI/Pods-RiotPods-RiotSwiftUI.debug.xcconfig"
diff --git a/RiotSwiftUI/Modules/AnalyticsPrompt/AnalyticsPromptModels.swift b/RiotSwiftUI/Modules/AnalyticsPrompt/AnalyticsPromptModels.swift
new file mode 100644
index 000000000..add81e84b
--- /dev/null
+++ b/RiotSwiftUI/Modules/AnalyticsPrompt/AnalyticsPromptModels.swift
@@ -0,0 +1,128 @@
+// File created from SimpleUserProfileExample
+// $ createScreen.sh AnalyticsPrompt AnalyticsPrompt
+// 
+// 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 state is never modified so this is unnecessary.
+enum AnalyticsPromptStateAction { }
+
+enum AnalyticsPromptViewAction {
+    /// Enable analytics.
+    case enable
+    /// Disable analytics.
+    case disable
+    /// Open the service terms link.
+    case openTermsURL
+}
+
+enum AnalyticsPromptViewModelResult {
+    /// Enable analytics.
+    case enable
+    /// Disable analytics.
+    case disable
+}
+
+struct AnalyticsPromptViewState: BindableState {
+    /// The type of prompt to display.
+    let promptType: AnalyticsPromptType
+    /// Localized attributed strings created in the coordinator.
+    let strings: AnalyticsPromptStringsProtocol
+}
+
+/// A collection of strings for the UI that need to be created in
+/// the coordinator or mocked in the RiotSwiftUI target.
+protocol AnalyticsPromptStringsProtocol {
+    var appDisplayName: String { get }
+    
+    var point1: NSAttributedString { get }
+    var point2: NSAttributedString { get }
+    
+    var termsNewUser: NSAttributedString { get }
+    var termsUpgrade: NSAttributedString { get }
+}
+
+enum AnalyticsPromptType {
+    case newUser(termsString: NSAttributedString)
+    case upgrade(termsString: NSAttributedString)
+}
+
+extension AnalyticsPromptType {
+    /// The main description string that should be displayed.
+    var message: String {
+        switch self {
+        case .newUser:
+            return VectorL10n.analyticsPromptMessageNewUser
+        case .upgrade:
+            return VectorL10n.analyticsPromptMessageUpgrade
+        }
+    }
+    
+    /// The terms string that should be displayed.
+    var termsStrings: NSAttributedString {
+        switch self {
+        case .newUser(let termsString), .upgrade(let termsString):
+            return termsString
+        }
+    }
+    
+    /// The title for the enable button.
+    var enableButtonTitle: String {
+        switch self {
+        case .newUser:
+            return VectorL10n.enable
+        case .upgrade:
+            return VectorL10n.analyticsPromptYes
+        }
+    }
+    
+    /// The title for the disable button.
+    var disableButtonTitle: String {
+        switch self {
+        case .newUser:
+            return VectorL10n.analyticsPromptNotNow
+        case .upgrade:
+            return VectorL10n.analyticsPromptStop
+        }
+    }
+}
+
+extension AnalyticsPromptType: CaseIterable {
+    static var allCases: [AnalyticsPromptType] {
+        let strings = MockAnalyticsPromptStrings()
+        return [
+            .newUser(termsString: strings.termsNewUser),
+            .upgrade(termsString: strings.termsUpgrade)
+        ]
+    }
+}
+
+extension AnalyticsPromptType: Identifiable {
+    var id: String {
+        switch self {
+        case .newUser:
+            return "newUser"
+        case .upgrade:
+            return "upgrade"
+        }
+    }
+}
+
+// For the RiotSwiftUI target presentation.
+extension AnalyticsPromptType: CustomStringConvertible {
+    var description: String { id }
+}
diff --git a/RiotSwiftUI/Modules/AnalyticsPrompt/AnalyticsPromptViewModel.swift b/RiotSwiftUI/Modules/AnalyticsPrompt/AnalyticsPromptViewModel.swift
new file mode 100644
index 000000000..999e2a95f
--- /dev/null
+++ b/RiotSwiftUI/Modules/AnalyticsPrompt/AnalyticsPromptViewModel.swift
@@ -0,0 +1,78 @@
+// File created from SimpleUserProfileExample
+// $ createScreen.sh AnalyticsPrompt AnalyticsPrompt
+//
+// 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, *)
+typealias AnalyticsPromptViewModelType = StateStoreViewModel<AnalyticsPromptViewState,
+                                                             AnalyticsPromptStateAction,
+                                                             AnalyticsPromptViewAction>
+@available(iOS 14, *)
+class AnalyticsPromptViewModel: AnalyticsPromptViewModelType {
+
+    // MARK: - Properties
+
+    // MARK: Private
+    
+    let termsURL: URL
+
+    // MARK: Public
+
+    var completion: ((AnalyticsPromptViewModelResult) -> Void)?
+
+    // MARK: - Setup
+    
+    /// Initialize a view model with the specified prompt type and app display name.
+    init(promptType: AnalyticsPromptType, strings: AnalyticsPromptStringsProtocol, termsURL: URL) {
+        self.termsURL = termsURL
+        super.init(initialViewState: AnalyticsPromptViewState(promptType: promptType, strings: strings))
+    }
+
+    // MARK: - Public
+    
+    override func process(viewAction: AnalyticsPromptViewAction) {
+        switch viewAction {
+        case .enable:
+            enable()
+        case .disable:
+            disable()
+        case .openTermsURL:
+            openTermsURL()
+        }
+    }
+
+    override class func reducer(state: inout AnalyticsPromptViewState, action: AnalyticsPromptStateAction) {
+        // There is no mutable state to reduce :)
+    }
+    
+    /// Enable analytics. The call to the Analytics class is made in the completion.
+    private func enable() {
+        completion?(.enable)
+    }
+
+    /// Disable analytics. The call to the Analytics class is made in the completion.
+    private func disable() {
+        completion?(.disable)
+    }
+    
+    /// Open the service terms link.
+    private func openTermsURL() {
+        UIApplication.shared.open(termsURL)
+    }
+}
diff --git a/RiotSwiftUI/Modules/AnalyticsPrompt/Coordinator/AnalyticsPromptCoordinator.swift b/RiotSwiftUI/Modules/AnalyticsPrompt/Coordinator/AnalyticsPromptCoordinator.swift
new file mode 100644
index 000000000..208b289d7
--- /dev/null
+++ b/RiotSwiftUI/Modules/AnalyticsPrompt/Coordinator/AnalyticsPromptCoordinator.swift
@@ -0,0 +1,104 @@
+// File created from SimpleUserProfileExample
+// $ createScreen.sh AnalyticsPrompt AnalyticsPrompt
+/*
+ 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
+
+struct AnalyticsPromptCoordinatorParameters {
+    /// The session to use if analytics are enabled.
+    let session: MXSession
+    /// The navigation router used to display the prompt.
+    let navigationRouter: NavigationRouterType
+}
+
+final class AnalyticsPromptCoordinator: Coordinator {
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    private let parameters: AnalyticsPromptCoordinatorParameters
+    private let analyticsPromptHostingController: UIViewController
+    private var _analyticsPromptViewModel: Any? = nil
+    
+    @available(iOS 14.0, *)
+    fileprivate var analyticsPromptViewModel: AnalyticsPromptViewModel {
+        return _analyticsPromptViewModel as! AnalyticsPromptViewModel
+    }
+    
+    // MARK: Public
+
+    // Must be used only internally
+    var childCoordinators: [Coordinator] = []
+    var completion: (() -> Void)?
+    
+    // MARK: - Setup
+    
+    @available(iOS 14.0, *)
+    init(parameters: AnalyticsPromptCoordinatorParameters) {
+        self.parameters = parameters
+        
+        let strings = AnalyticsPromptStrings()
+        let promptType: AnalyticsPromptType
+        
+        if Analytics.shared.promptShouldDisplayUpgradeMessage {
+            promptType = .upgrade(termsString: strings.termsUpgrade)
+        } else {
+            promptType = .newUser(termsString: strings.termsNewUser)
+        }
+        
+        let viewModel = AnalyticsPromptViewModel(promptType: promptType, strings: strings, termsURL: BuildSettings.analyticsTermsURL)
+        
+        let view = AnalyticsPrompt(viewModel: viewModel.context)
+        _analyticsPromptViewModel = viewModel
+        analyticsPromptHostingController = VectorHostingController(rootView: view)
+    }
+    
+    // MARK: - Public
+    
+    func start() {
+        guard #available(iOS 14.0, *) else {
+            MXLog.debug("[AnalyticsPromptCoordinator] start: Invalid iOS version, returning.")
+            return
+        }
+        
+        MXLog.debug("[AnalyticsPromptCoordinator] did start.")
+        
+        parameters.navigationRouter.present(toPresentable(), animated: true)
+        
+        analyticsPromptViewModel.completion = { [weak self] result in
+            MXLog.debug("[AnalyticsPromptCoordinator] AnalyticsPromptViewModel did complete with result: \(result).")
+            
+            guard let self = self else { return }
+            
+            switch result {
+            case .enable:
+                Analytics.shared.optIn(with: self.parameters.session)
+                self.parameters.navigationRouter.dismissModule(animated: true, completion: nil)
+                self.completion?()
+            case .disable:
+                Analytics.shared.optOut()
+                self.parameters.navigationRouter.dismissModule(animated: true, completion: nil)
+                self.completion?()
+            }
+        }
+    }
+    
+    func toPresentable() -> UIViewController {
+        return self.analyticsPromptHostingController
+    }
+}
diff --git a/RiotSwiftUI/Modules/AnalyticsPrompt/Coordinator/AnalyticsPromptStrings.swift b/RiotSwiftUI/Modules/AnalyticsPrompt/Coordinator/AnalyticsPromptStrings.swift
new file mode 100644
index 000000000..4ce8ab20d
--- /dev/null
+++ b/RiotSwiftUI/Modules/AnalyticsPrompt/Coordinator/AnalyticsPromptStrings.swift
@@ -0,0 +1,33 @@
+// 
+// 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
+
+@available(iOS 14.0, *)
+struct AnalyticsPromptStrings: AnalyticsPromptStringsProtocol {
+    let appDisplayName = AppInfo.current.displayName
+    
+    let point1 = HTMLFormatter().formatHTML(VectorL10n.analyticsPromptPoint1, withAllowedTags: ["b", "p"], fontSize: UIFont.systemFontSize)
+    let point2 = HTMLFormatter().formatHTML(VectorL10n.analyticsPromptPoint2, withAllowedTags: ["b", "p"], fontSize: UIFont.systemFontSize)
+    
+    let termsNewUser = HTMLFormatter().format(VectorL10n.analyticsPromptTermsNewUser("%@"),
+                                              with: VectorL10n.analyticsPromptTermsLinkNewUser,
+                                              using: BuildSettings.analyticsTermsURL)
+    let termsUpgrade = HTMLFormatter().format(VectorL10n.analyticsPromptTermsUpgrade("%@"),
+                                              with: VectorL10n.analyticsPromptTermsLinkUpgrade,
+                                              using: BuildSettings.analyticsTermsURL)
+}
+
diff --git a/RiotSwiftUI/Modules/AnalyticsPrompt/MockAnalyticsPromptScreenState.swift b/RiotSwiftUI/Modules/AnalyticsPrompt/MockAnalyticsPromptScreenState.swift
new file mode 100644
index 000000000..9c303bbbe
--- /dev/null
+++ b/RiotSwiftUI/Modules/AnalyticsPrompt/MockAnalyticsPromptScreenState.swift
@@ -0,0 +1,56 @@
+// File created from SimpleUserProfileExample
+// $ createScreen.sh AnalyticsPrompt AnalyticsPrompt
+// 
+// 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 MockAnalyticsPromptScreenState: MockScreenState, CaseIterable {
+    /// The type of prompt to display.
+    case promptType(AnalyticsPromptType)
+    
+    /// The associated screen
+    var screenType: Any.Type {
+        AnalyticsPrompt.self
+    }
+    
+    /// A list of screen state definitions
+    static var allCases: [MockAnalyticsPromptScreenState] {
+        AnalyticsPromptType.allCases.map { MockAnalyticsPromptScreenState.promptType($0) }
+    }
+    
+    /// Generate the view struct for the screen state.
+    var screenView: ([Any], AnyView) {
+        let promptType: AnalyticsPromptType
+        switch self {
+        case .promptType(let analyticsPromptType):
+            promptType = analyticsPromptType
+        }
+        let viewModel = AnalyticsPromptViewModel(promptType: promptType,
+                                                 strings: MockAnalyticsPromptStrings(),
+                                                 termsURL: URL(string: "https://element.io/cookie-policy")!)
+        
+        return (
+            [promptType, viewModel],
+            AnyView(AnalyticsPrompt(viewModel: viewModel.context)
+                .addDependency(MockAvatarService.example))
+        )
+    }
+}
diff --git a/RiotSwiftUI/Modules/AnalyticsPrompt/MockAnalyticsPromptStrings.swift b/RiotSwiftUI/Modules/AnalyticsPrompt/MockAnalyticsPromptStrings.swift
new file mode 100644
index 000000000..ee0e59ed0
--- /dev/null
+++ b/RiotSwiftUI/Modules/AnalyticsPrompt/MockAnalyticsPromptStrings.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 UIKit
+
+struct MockAnalyticsPromptStrings: AnalyticsPromptStringsProtocol {
+    var appDisplayName = "Element"
+    
+    let point1: NSAttributedString
+    let point2: NSAttributedString
+    
+    let termsNewUser: NSAttributedString
+    let termsUpgrade: NSAttributedString
+    
+    let shortString = NSAttributedString(string: "This is a short string.")
+    let longString = NSAttributedString(string: "This is a very long string that will be used to test the layout over multiple lines of text to ensure everything is correct.")
+    
+    init() {
+        let point1 = NSMutableAttributedString(string: "We ")
+        point1.append(NSAttributedString(string: "don't", attributes: [.font: UIFont.boldSystemFont(ofSize: UIFont.systemFontSize)]))
+        point1.append(NSAttributedString(string: " record or profile any account data"))
+        self.point1 = point1
+        
+        let point2 = NSMutableAttributedString(string: "We ")
+        point2.append(NSAttributedString(string: "don't", attributes: [.font: UIFont.boldSystemFont(ofSize: UIFont.systemFontSize)]))
+        point2.append(NSAttributedString(string: " share information with third parties"))
+        self.point2 = point2
+        
+        let termsNewUser = NSMutableAttributedString(string: "You can read all our terms ")
+        termsNewUser.append(NSAttributedString(string: "here", attributes: [.link: URL(string: "https://element.io/cookie-policy")!]))
+        termsNewUser.append(NSAttributedString(string: "."))
+        self.termsNewUser = termsNewUser
+        
+        let termsUpgrade = NSMutableAttributedString(string: "Read all our terms ")
+        termsUpgrade.append(NSAttributedString(string: "here", attributes: [.link: URL(string: "https://element.io/cookie-policy")!]))
+        termsUpgrade.append(NSAttributedString(string: ". Is that OK?"))
+        self.termsUpgrade = termsUpgrade
+    }
+}
diff --git a/RiotSwiftUI/Modules/AnalyticsPrompt/Test/UI/AnalyticsPromptUITests.swift b/RiotSwiftUI/Modules/AnalyticsPrompt/Test/UI/AnalyticsPromptUITests.swift
new file mode 100644
index 000000000..ada017da6
--- /dev/null
+++ b/RiotSwiftUI/Modules/AnalyticsPrompt/Test/UI/AnalyticsPromptUITests.swift
@@ -0,0 +1,65 @@
+// File created from SimpleUserProfileExample
+// $ createScreen.sh AnalyticsPrompt AnalyticsPrompt
+//
+// 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 AnalyticsPromptUITests: MockScreenTest {
+
+    override class var screenType: MockScreenState.Type {
+        return MockAnalyticsPromptScreenState.self
+    }
+
+    override class func createTest() -> MockScreenTest {
+        return AnalyticsPromptUITests(selector: #selector(verifyAnalyticsPromptScreen))
+    }
+
+    func verifyAnalyticsPromptScreen() throws {
+        guard let screenState = screenState as? MockAnalyticsPromptScreenState else { fatalError("no screen") }
+        switch screenState {
+        case .promptType(let promptType):
+            verifyAnalyticsPromptType(promptType)
+        }
+    }
+    
+    /// Verify that the prompt is displayed correctly for new users compared to upgrading from Matomo
+    func verifyAnalyticsPromptType(_ promptType: AnalyticsPromptType) {
+        let enableButton = app.buttons["enableButton"]
+        let disableButton = app.buttons["disableButton"]
+        
+        XCTAssert(enableButton.exists)
+        XCTAssert(disableButton.exists)
+        
+        switch promptType {
+        case .newUser:
+            XCTAssertEqual(enableButton.label, VectorL10n.enable)
+            XCTAssertEqual(disableButton.label, VectorL10n.cancel)
+        case .upgrade:
+            XCTAssertEqual(enableButton.label, VectorL10n.analyticsPromptYes)
+            XCTAssertEqual(disableButton.label, VectorL10n.analyticsPromptStop)
+        }
+    }
+
+    func verifyAnalyticsPromptLongName(name: String) {
+        let displayNameText = app.staticTexts["displayNameText"]
+        XCTAssert(displayNameText.exists)
+        XCTAssertEqual(displayNameText.label, name)
+    }
+
+}
diff --git a/RiotSwiftUI/Modules/AnalyticsPrompt/View/AnalyticsPrompt.swift b/RiotSwiftUI/Modules/AnalyticsPrompt/View/AnalyticsPrompt.swift
new file mode 100644
index 000000000..8f7acf49d
--- /dev/null
+++ b/RiotSwiftUI/Modules/AnalyticsPrompt/View/AnalyticsPrompt.swift
@@ -0,0 +1,142 @@
+// File created from SimpleUserProfileExample
+// $ createScreen.sh AnalyticsPrompt AnalyticsPrompt
+// 
+// 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, *)
+/// A prompt that asks the user whether they would like to enable Analytics or not.
+struct AnalyticsPrompt: View {
+
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    @Environment(\.theme) private var theme
+    @Environment(\.horizontalSizeClass) private var horizontalSizeClass
+    
+    private var horizontalPadding: CGFloat {
+        horizontalSizeClass == .regular ? 50 : 16
+    }
+    
+    // MARK: Public
+    
+    @ObservedObject var viewModel: AnalyticsPromptViewModel.Context
+    
+    // MARK: Views
+    
+    /// The text that explains what analytics will do.
+    private var messageText: some View {
+        VStack {
+            Text("\(viewModel.viewState.promptType.message)\n")
+            
+            AnalyticsPromptTermsText(attributedString: viewModel.viewState.promptType.termsStrings)
+                .accessibilityLabel(Text(viewModel.viewState.promptType.termsStrings.string))
+                .accessibilityValue(Text(VectorL10n.accessibilityButtonLabel))
+                .onTapGesture {
+                    viewModel.send(viewAction: .openTermsURL)
+                }
+        }
+    }
+    
+    /// The list of re-assurances about analytics.
+    private var checkmarkList: some View {
+        VStack(alignment: .leading) {
+            AnalyticsPromptCheckmarkItem(attributedString: viewModel.viewState.strings.point1)
+                .accessibilityLabel(Text(viewModel.viewState.strings.point1.string))
+            
+            AnalyticsPromptCheckmarkItem(attributedString: viewModel.viewState.strings.point2)
+                .accessibilityLabel(Text(viewModel.viewState.strings.point2.string))
+            
+            AnalyticsPromptCheckmarkItem(string: VectorL10n.analyticsPromptPoint3)
+        }
+        .font(theme.fonts.body)
+        .frame(maxWidth: .infinity)
+    }
+    
+    private var mainContent: some View {
+        VStack {
+            Image(uiImage: Asset.Images.analyticsLogo.image)
+                .padding(.bottom, 25)
+            
+            Text(VectorL10n.analyticsPromptTitle(viewModel.viewState.strings.appDisplayName))
+                .font(theme.fonts.title2B)
+                .foregroundColor(theme.colors.primaryContent)
+                .padding(.bottom, 2)
+            
+            messageText
+                .font(theme.fonts.body)
+                .foregroundColor(theme.colors.secondaryContent)
+                .multilineTextAlignment(.center)
+            
+            Divider()
+                .background(theme.colors.quinaryContent)
+                .padding(.vertical, 28)
+            
+            checkmarkList
+                .foregroundColor(theme.colors.secondaryContent)
+                .padding(.bottom, 16)
+        }
+    }
+    
+    /// The stack of enable/disable buttons.
+    private var buttons: some View {
+        VStack {
+            Button { viewModel.send(viewAction: .enable) } label: {
+                Text(viewModel.viewState.promptType.enableButtonTitle)
+                    .font(theme.fonts.bodySB)
+            }
+            .buttonStyle(PrimaryActionButtonStyle())
+            .accessibilityIdentifier("enableButton")
+            
+            Button { viewModel.send(viewAction: .disable) } label: {
+                Text(viewModel.viewState.promptType.disableButtonTitle)
+                    .font(theme.fonts.bodySB)
+                    .foregroundColor(theme.colors.accent)
+                    .padding(12)
+            }
+            .accessibilityIdentifier("disableButton")
+        }
+    }
+    
+    var body: some View {
+        GeometryReader { geometry in
+            VStack {
+                ScrollView(showsIndicators: false) {
+                    mainContent
+                        .padding(.top, 50)
+                        .padding(.horizontal, horizontalPadding)
+                }
+                
+                buttons
+                    .padding(.horizontal, horizontalPadding)
+                    .padding(.bottom, geometry.safeAreaInsets.bottom > 0 ? 0 : 16)
+            }
+            .background(theme.colors.background.ignoresSafeArea())
+        }
+    }
+}
+
+// MARK: - Previews
+
+@available(iOS 14.0, *)
+struct AnalyticsPrompt_Previews: PreviewProvider {
+    static let stateRenderer = MockAnalyticsPromptScreenState.stateRenderer
+    static var previews: some View {
+        stateRenderer.screenGroup()
+    }
+}
diff --git a/RiotSwiftUI/Modules/AnalyticsPrompt/View/AnalyticsPromptCheckmarkItem.swift b/RiotSwiftUI/Modules/AnalyticsPrompt/View/AnalyticsPromptCheckmarkItem.swift
new file mode 100644
index 000000000..9019e9033
--- /dev/null
+++ b/RiotSwiftUI/Modules/AnalyticsPrompt/View/AnalyticsPromptCheckmarkItem.swift
@@ -0,0 +1,92 @@
+// 
+// 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 AnalyticsPromptCheckmarkItem: View {
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    @Environment(\.theme) private var theme
+    
+    /// A string with a bold property.
+    private struct StringComponent {
+        let string: String
+        let isBold: Bool
+    }
+    
+    /// Internal representation of the string as composable parts.
+    private let components: [StringComponent]
+    
+    // MARK: - Setup
+    
+    init(attributedString: NSAttributedString) {
+        var components = [StringComponent]()
+        let range = NSRange(location: 0, length: attributedString.length)
+        let string = attributedString.string as NSString
+        
+        attributedString.enumerateAttributes(in: range, options: []) { attributes, range, stop in
+            var isBold = false
+            
+            if let font = attributes[.font] as? UIFont {
+                isBold = font.fontDescriptor.symbolicTraits.contains(.traitBold)
+            }
+            
+            components.append(StringComponent(string: string.substring(with: range), isBold: isBold))
+        }
+        
+        self.components = components
+    }
+    
+    init(string: String) {
+        self.components = [StringComponent(string: string, isBold: false)]
+    }
+    
+    // MARK: - Views
+    
+    var label: Text {
+        components.reduce(Text("")) {
+            $0 + Text($1.string).font($1.isBold ? theme.fonts.bodySB : theme.fonts.body)
+        }
+    }
+    
+    var body: some View {
+        Label { label } icon: {
+            Image(uiImage: Asset.Images.analyticsCheckmark.image)
+        }
+    }
+}
+
+// MARK: - Previews
+
+@available(iOS 14.0, *)
+struct AnalyticsPromptCheckmarkItem_Previews: PreviewProvider {
+    
+    static let strings = MockAnalyticsPromptStrings()
+    
+    static var previews: some View {
+        VStack(alignment:.leading) {
+            AnalyticsPromptCheckmarkItem(attributedString: strings.point1)
+            AnalyticsPromptCheckmarkItem(attributedString: strings.point2)
+            AnalyticsPromptCheckmarkItem(attributedString: strings.longString)
+            AnalyticsPromptCheckmarkItem(attributedString: strings.shortString)
+        }
+        .padding()
+    }
+}
diff --git a/RiotSwiftUI/Modules/AnalyticsPrompt/View/AnalyticsPromptTermsText.swift b/RiotSwiftUI/Modules/AnalyticsPrompt/View/AnalyticsPromptTermsText.swift
new file mode 100644
index 000000000..7616e1084
--- /dev/null
+++ b/RiotSwiftUI/Modules/AnalyticsPrompt/View/AnalyticsPromptTermsText.swift
@@ -0,0 +1,74 @@
+// 
+// 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, *)
+/// The last line of text in the description with highlighting on the link string.
+struct AnalyticsPromptTermsText: View {
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    @Environment(\.theme) private var theme
+    
+    /// A string with a link attribute.
+    private struct StringComponent {
+        let string: String
+        let isLink: Bool
+    }
+    
+    /// Internal representation of the string as composable parts.
+    private let components: [StringComponent]
+    
+    // MARK: - Setup
+    
+    init(attributedString: NSAttributedString) {
+        var components = [StringComponent]()
+        let range = NSRange(location: 0, length: attributedString.length)
+        let string = attributedString.string as NSString
+        
+        attributedString.enumerateAttributes(in: range, options: []) { attributes, range, stop in
+            let isLink = attributes.keys.contains(.link)
+            components.append(StringComponent(string: string.substring(with: range), isLink: isLink))
+        }
+        
+        self.components = components
+    }
+    
+    // MARK: - Views
+    
+    var body: some View {
+        components.reduce(Text("")) {
+            $0 + Text($1.string).foregroundColor($1.isLink ? theme.colors.accent : nil)
+        }
+    }
+}
+
+// MARK: - Previews
+@available(iOS 14.0, *)
+struct AnalyticsPromptTermsText_Previews: PreviewProvider {
+    
+    static let strings = MockAnalyticsPromptStrings()
+    
+    static var previews: some View {
+        VStack(spacing: 8) {
+            AnalyticsPromptTermsText(attributedString: strings.termsNewUser)
+            AnalyticsPromptTermsText(attributedString: strings.termsUpgrade)
+        }
+    }
+}
diff --git a/RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift b/RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
index 1195cd4ff..2a11753a6 100644
--- a/RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
+++ b/RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
@@ -20,10 +20,13 @@ import Foundation
 @available(iOS 14.0, *)
 enum MockAppScreens {
     static let appScreens: [MockScreenState.Type] = [
+        MockAnalyticsPromptScreenState.self,
+        MockUserSuggestionScreenState.self,
+        MockPollEditFormScreenState.self,
+        MockPollTimelineScreenState.self,
         MockTemplateUserProfileScreenState.self,
         MockTemplateRoomListScreenState.self,
-        MockTemplateRoomChatScreenState.self,
-        MockUserSuggestionScreenState.self
+        MockTemplateRoomChatScreenState.self
     ]
 }
 
diff --git a/RiotSwiftUI/Modules/Common/Mock/MockScreenState.swift b/RiotSwiftUI/Modules/Common/Mock/MockScreenState.swift
index 4bf0df19d..d4ac2a9e7 100644
--- a/RiotSwiftUI/Modules/Common/Mock/MockScreenState.swift
+++ b/RiotSwiftUI/Modules/Common/Mock/MockScreenState.swift
@@ -22,7 +22,6 @@ protocol MockScreenState {
     static var screenStates: [MockScreenState] { get }
     var screenType: Any.Type { get }
     var screenView: ([Any], AnyView) { get }
-    var stateTitle: String { get }
 }
 
 @available(iOS 14.0, *)
@@ -33,44 +32,32 @@ extension MockScreenState {
         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)
+        let titles = screenStates.map(\.title)
         
         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))
+            let screenTitle = titles[i]
+            states.append(ScreenStateInfo(dependencies: dep, view: view, screenTitle: screenTitle))
         }
         
         return StateRenderer(states: states)
     }
     
-    /// A unique key to identify each screen state.
-    static var screenStateKeys: [String] {
-        return screenStates.enumerated().map { (index, state) in
-            state.screenName + String(index)
-        }
+    /// All available screen state keys
+    static var screenNames: [String] {
+        screenStates.map { $0.title }
     }
     
     /// A title to represent the screen and it's screen state
-    var screenName: String {
-        "\(String(describing: screenType.self))"
+    var title: String {
+        "\(simpleTypeName(screenType.self)): \(simpleTypeName(self))"
     }
     
-    /// A title to represent this screen state
-    var stateTitle: String {
-        String(describing: self)
+    private func simpleTypeName(_ type: Any) -> String {
+        String(describing: type).components(separatedBy: .punctuationCharacters).filter { $0.count > 0}.last!
     }
-    
-    /// 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 ce9f09f35..5e29d179b 100644
--- a/RiotSwiftUI/Modules/Common/Mock/ScreenList.swift
+++ b/RiotSwiftUI/Modules/Common/Mock/ScreenList.swift
@@ -33,8 +33,7 @@ struct ScreenList: View {
                 ForEach(0..<allStates.count) { i in
                     let state = allStates[i]
                     NavigationLink(destination: state.view) {
-                        Text(state.fullScreenTitle)
-                            .accessibilityIdentifier(state.stateKey)
+                        Text(state.screenTitle)
                     }
                 }
             }
diff --git a/RiotSwiftUI/Modules/Common/Mock/ScreenStateInfo.swift b/RiotSwiftUI/Modules/Common/Mock/ScreenStateInfo.swift
index 5aa3d5909..4ebd1232e 100644
--- a/RiotSwiftUI/Modules/Common/Mock/ScreenStateInfo.swift
+++ b/RiotSwiftUI/Modules/Common/Mock/ScreenStateInfo.swift
@@ -21,7 +21,5 @@ import SwiftUI
 struct ScreenStateInfo {
     var dependencies: [Any]
     var view: AnyView
-    var stateTitle: String
-    var fullScreenTitle: String
-    var stateKey: String
+    var screenTitle: String
 }
diff --git a/RiotSwiftUI/Modules/Common/Mock/StateRenderer.swift b/RiotSwiftUI/Modules/Common/Mock/StateRenderer.swift
index f5beed2ed..c833550ae 100644
--- a/RiotSwiftUI/Modules/Common/Mock/StateRenderer.swift
+++ b/RiotSwiftUI/Modules/Common/Mock/StateRenderer.swift
@@ -39,7 +39,7 @@ class StateRenderer {
             ForEach(0..<states.count) { i in
                 let state = self.states[i]
                 Self.wrapWithNavigation(addNavigation, view: state.view)
-                    .previewDisplayName(state.stateTitle)
+                    .previewDisplayName(state.screenTitle)
             }
         }
     }
diff --git a/RiotSwiftUI/Modules/Common/Test/UI/MockScreenTest.swift b/RiotSwiftUI/Modules/Common/Test/UI/MockScreenTest.swift
index 672f97290..9803b0f22 100644
--- a/RiotSwiftUI/Modules/Common/Test/UI/MockScreenTest.swift
+++ b/RiotSwiftUI/Modules/Common/Test/UI/MockScreenTest.swift
@@ -45,9 +45,10 @@ class MockScreenTest: XCTestCase {
         guard let screenType = screenType else {
             return testSuite
         }
+        
         // Create a test case for each screen state
         screenType.screenStates.enumerated().forEach { index, screenState in
-            let key = screenType.screenStateKeys[index]
+            let key = screenType.screenNames[index]
             addTestFor(screenState: screenState, screenStateKey: key, toTestSuite: testSuite)
         }
         return testSuite
@@ -64,12 +65,8 @@ class MockScreenTest: XCTestCase {
         // For every test case launch the app and go to the relevant screen
         continueAfterFailure = false
         app.launch()
-        goToScreen()
-    }
-    
-    private func goToScreen() {
+        
         guard let screenKey = screenStateKey else { fatalError("no screen") }
-        let link = app.buttons[screenKey]
-        link.tap()
+        app.goToScreenWithIdentifier(screenKey)
     }
 }
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileViewModelResult.swift b/RiotSwiftUI/Modules/Common/Test/UI/XCUIApplication+Riot.swift
similarity index 68%
rename from RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileViewModelResult.swift
rename to RiotSwiftUI/Modules/Common/Test/UI/XCUIApplication+Riot.swift
index 2c2965f5b..0986d0af2 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileViewModelResult.swift
+++ b/RiotSwiftUI/Modules/Common/Test/UI/XCUIApplication+Riot.swift
@@ -15,8 +15,16 @@
 //
 
 import Foundation
+import XCTest
 
-enum TemplateUserProfileViewModelResult {
-    case cancel
-    case done
+extension XCUIApplication {
+    func goToScreenWithIdentifier(_ identifier: String) {
+        let button = self.buttons[identifier]
+        
+        while !button.isHittable {
+            self.tables.firstMatch.swipeUp()
+        }
+        
+        button.tap()
+    }
 }
diff --git a/RiotSwiftUI/Modules/Settings/Notifications/View/BorderedInputFieldStyle.swift b/RiotSwiftUI/Modules/Common/Util/BorderedInputFieldStyle.swift
similarity index 81%
rename from RiotSwiftUI/Modules/Settings/Notifications/View/BorderedInputFieldStyle.swift
rename to RiotSwiftUI/Modules/Common/Util/BorderedInputFieldStyle.swift
index 89e4349fd..5fbcac5e6 100644
--- a/RiotSwiftUI/Modules/Settings/Notifications/View/BorderedInputFieldStyle.swift
+++ b/RiotSwiftUI/Modules/Common/Util/BorderedInputFieldStyle.swift
@@ -16,6 +16,7 @@
 
 import Foundation
 import SwiftUI
+import Introspect
 
 @available(iOS 14.0, *)
 /// A bordered style of text input
@@ -49,10 +50,11 @@ struct BorderedInputFieldStyle: TextFieldStyle {
     }
     
     private var textColor: Color {
-        if !isEnabled {
-            return theme.colors.quarterlyContent
+        if (theme.identifier == ThemeIdentifier.dark) {
+            return (isEnabled ? theme.colors.primaryContent : theme.colors.tertiaryContent)
+        } else {
+            return (isEnabled ? theme.colors.primaryContent : theme.colors.quarterlyContent)
         }
-        return theme.colors.primaryContent
     }
     
     private var backgroundColor: Color {
@@ -62,21 +64,31 @@ struct BorderedInputFieldStyle: TextFieldStyle {
         return theme.colors.background
     }
     
+    private var placeholderColor: Color {
+        return theme.colors.tertiaryContent
+    }
+        
     private var borderWidth: CGFloat {
-        return isEditing || isError ? 2 : 1.5
+        return isEditing || isError ? 2.0 : 1.5
     }
     
     func _body(configuration: TextField<_Label>) -> some View {
-        let rect = RoundedRectangle(cornerRadius: 8)
+        let rect = RoundedRectangle(cornerRadius: 8.0)
         return configuration
             .font(theme.fonts.callout)
             .foregroundColor(textColor)
             .accentColor(accentColor)
-            .frame(height: 48)
-            .padding(.horizontal, 8)
+            .frame(height: 48.0)
+            .padding(.horizontal, 8.0)
             .background(backgroundColor)
             .clipShape(rect)
             .overlay(rect.stroke(borderColor, lineWidth: borderWidth))
+            .introspectTextField { textField in
+                textField.returnKeyType = .done
+                textField.clearButtonMode = .whileEditing
+                textField.attributedPlaceholder = NSAttributedString(string: textField.placeholder ?? "",
+                                                                     attributes: [NSAttributedString.Key.foregroundColor: UIColor(placeholderColor)])
+            }
     }
 }
 
@@ -118,6 +130,5 @@ struct BorderedInputFieldStyle_Previews: PreviewProvider {
             .padding()
             .theme(ThemeIdentifier.dark)
         }
-
     }
 }
diff --git a/RiotSwiftUI/Modules/Common/Util/MultilineTextField.swift b/RiotSwiftUI/Modules/Common/Util/MultilineTextField.swift
new file mode 100644
index 000000000..dd710f70e
--- /dev/null
+++ b/RiotSwiftUI/Modules/Common/Util/MultilineTextField.swift
@@ -0,0 +1,207 @@
+// 
+// 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 MultilineTextField: View {
+    
+    @Environment(\.theme) private var theme: ThemeSwiftUI
+
+    @Binding private var text: String
+    @State private var dynamicHeight: CGFloat = 100
+    @State private var isEditing = false
+    
+    private var placeholder: String = ""
+    
+    private var showingPlaceholder: Bool {
+        text.isEmpty
+    }
+
+    init(_ placeholder: String, text: Binding<String>) {
+        self.placeholder = placeholder
+        self._text = text
+    }
+    
+    private var textColor: Color {
+        if (theme.identifier == ThemeIdentifier.dark) {
+            return theme.colors.primaryContent
+        } else {
+            return theme.colors.primaryContent
+        }
+    }
+    
+    private var backgroundColor: Color {
+        return theme.colors.background
+    }
+    
+    private var placeholderColor: Color {
+        return theme.colors.tertiaryContent
+    }
+    
+    private var borderColor: Color {
+        if isEditing {
+            return theme.colors.accent
+        }
+        
+        return theme.colors.quarterlyContent
+    }
+    
+    private var borderWidth: CGFloat {
+        return isEditing ? 2.0 : 1.5
+    }
+    
+    var body: some View {
+        let rect = RoundedRectangle(cornerRadius: 8.0)
+        return UITextViewWrapper(text: $text, calculatedHeight: $dynamicHeight, isEditing: $isEditing)
+            .frame(minHeight: dynamicHeight, maxHeight: dynamicHeight)
+            .padding(4.0)
+            .background(placeholderView, alignment: .topLeading)
+            .animation(.none)
+            .background(backgroundColor)
+            .clipShape(rect)
+            .overlay(rect.stroke(borderColor, lineWidth: borderWidth))
+            .introspectTextView { textView in
+                textView.textColor = UIColor(textColor)
+                textView.font = theme.fonts.uiFonts.callout
+            }
+    }
+
+    @ViewBuilder
+    private var placeholderView: some View {
+        if showingPlaceholder {
+            Text(placeholder)
+                .foregroundColor(placeholderColor)
+                .font(theme.fonts.callout)
+                .padding(.leading, 8.0)
+                .padding(.top, 12.0)
+        }
+    }
+}
+
+@available(iOS 14.0, *)
+fileprivate struct UITextViewWrapper: UIViewRepresentable {
+    typealias UIViewType = UITextView
+
+    @Binding var text: String
+    @Binding var calculatedHeight: CGFloat
+    @Binding var isEditing: Bool
+
+    func makeUIView(context: UIViewRepresentableContext<UITextViewWrapper>) -> UITextView {
+        let textView = UITextView()
+        textView.delegate = context.coordinator
+
+        textView.isEditable = true
+        textView.font = UIFont.preferredFont(forTextStyle: .body)
+        textView.isSelectable = true
+        textView.isUserInteractionEnabled = true
+        textView.isScrollEnabled = false
+        textView.backgroundColor = UIColor.clear
+        textView.returnKeyType = .done
+
+        textView.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
+        return textView
+    }
+
+    func updateUIView(_ uiView: UITextView, context: UIViewRepresentableContext<UITextViewWrapper>) {
+        if uiView.text != self.text {
+            uiView.text = self.text
+        }
+
+        UITextViewWrapper.recalculateHeight(view: uiView, result: $calculatedHeight)
+    }
+
+    fileprivate static func recalculateHeight(view: UIView, result: Binding<CGFloat>) {
+        let newSize = view.sizeThatFits(CGSize(width: view.frame.size.width, height: CGFloat.greatestFiniteMagnitude))
+        if result.wrappedValue != newSize.height {
+            DispatchQueue.main.async {
+                result.wrappedValue = newSize.height // !! must be called asynchronously
+            }
+        }
+    }
+
+    func makeCoordinator() -> Coordinator {
+        return Coordinator(text: $text, height: $calculatedHeight, isEditing: $isEditing)
+    }
+
+    final class Coordinator: NSObject, UITextViewDelegate {
+        var text: Binding<String>
+        var calculatedHeight: Binding<CGFloat>
+        var isEditing: Binding<Bool>
+
+        init(text: Binding<String>, height: Binding<CGFloat>, isEditing: Binding<Bool>) {
+            self.text = text
+            self.calculatedHeight = height
+            self.isEditing = isEditing
+        }
+
+        func textViewDidChange(_ uiView: UITextView) {
+            text.wrappedValue = uiView.text
+            UITextViewWrapper.recalculateHeight(view: uiView, result: calculatedHeight)
+        }
+        
+        func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {
+            if text == "\n" {
+                textView.resignFirstResponder()
+                return false
+            }
+            
+            return true
+        }
+        
+        func textViewDidBeginEditing(_ textView: UITextView) {
+            isEditing.wrappedValue = true
+        }
+        
+        func textViewDidEndEditing(_ textView: UITextView) {
+            isEditing.wrappedValue = false
+        }
+    }
+}
+
+@available(iOS 14.0, *)
+struct MultilineTextField_Previews: PreviewProvider {
+    
+    static var previews: some View {
+        return Group {
+            VStack {
+                PreviewWrapper()
+                PlaceholderPreviewWrapper()
+                PreviewWrapper()
+                    .theme(ThemeIdentifier.dark)
+                PlaceholderPreviewWrapper()
+                    .theme(ThemeIdentifier.dark)
+            }
+        }
+        .padding()
+    }
+    
+    struct PreviewWrapper: View {
+        @State(initialValue: "123") var text: String
+
+        var body: some View {
+            MultilineTextField("Placeholder", text: $text)
+        }
+    }
+    
+    struct PlaceholderPreviewWrapper: View {
+        @State(initialValue: "") var text: String
+
+        var body: some View {
+            MultilineTextField("Placeholder", text: $text)
+        }
+    }
+}
diff --git a/RiotSwiftUI/Modules/Common/Util/PrimaryActionButtonStyle.swift b/RiotSwiftUI/Modules/Common/Util/PrimaryActionButtonStyle.swift
new file mode 100644
index 000000000..5824cbc85
--- /dev/null
+++ b/RiotSwiftUI/Modules/Common/Util/PrimaryActionButtonStyle.swift
@@ -0,0 +1,70 @@
+// 
+// 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 PrimaryActionButtonStyle: ButtonStyle {
+    @Environment(\.theme) private var theme
+    @Environment(\.isEnabled) private var isEnabled
+    
+    var customColor: Color? = nil
+    
+    func makeBody(configuration: Self.Configuration) -> some View {
+        configuration.label
+            .padding(12.0)
+            .frame(maxWidth: .infinity)
+            .foregroundColor(.white)
+            .font(theme.fonts.body)
+            .background(backgroundColor(configuration.isPressed))
+            .opacity(isEnabled ? 1.0 : 0.6)
+            .cornerRadius(8.0)
+    }
+    
+    func backgroundColor(_ isPressed: Bool) -> Color {
+        if let customColor = customColor {
+            return customColor
+        }
+        
+        return isPressed ? theme.colors.accent.opacity(0.6) : theme.colors.accent
+    }
+}
+
+@available(iOS 14.0, *)
+struct PrimaryActionButtonStyle_Previews: PreviewProvider {
+    static var previews: some View {
+        Group {
+            VStack {
+                Button("Enabled") { }
+                    .buttonStyle(PrimaryActionButtonStyle())
+                
+                Button("Disabled") { }
+                    .buttonStyle(PrimaryActionButtonStyle())
+                    .disabled(true)
+                
+                Button { } label: {
+                    Text("Clear BG")
+                        .foregroundColor(.red)
+                }
+                .buttonStyle(PrimaryActionButtonStyle(customColor: .clear))
+                
+                Button("Red BG") { }
+                .buttonStyle(PrimaryActionButtonStyle(customColor: .red))
+            }
+            .padding()
+        }
+    }
+}
diff --git a/RiotSwiftUI/Modules/Common/Util/SafeBindingCollectionEnumerator.swift b/RiotSwiftUI/Modules/Common/Util/SafeBindingCollectionEnumerator.swift
new file mode 100644
index 000000000..45ea51855
--- /dev/null
+++ b/RiotSwiftUI/Modules/Common/Util/SafeBindingCollectionEnumerator.swift
@@ -0,0 +1,40 @@
+// 
+// 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
+
+/**
+ Used to avoid crashes when enumerating through bindings in the AnswerOptions ForEach
+ https://stackoverflow.com/q/65375372
+ Replace with Swift 5.5 bindings enumerator later.
+ */
+@available(iOS 14.0, *)
+struct SafeBindingCollectionEnumerator<T: RandomAccessCollection & MutableCollection, C: View>: View {
+    
+    typealias BoundElement = Binding<T.Element>
+    private let binding: BoundElement
+    private let content: (BoundElement) -> C
+    
+    init(_ binding: Binding<T>, index: T.Index, @ViewBuilder content: @escaping (BoundElement) -> C) {
+        self.content = content
+        self.binding = .init(get: { binding.wrappedValue[index] },
+                             set: { binding.wrappedValue[index] = $0 })
+    }
+    
+    var body: some View {
+        content(binding)
+    }
+}
diff --git a/RiotSwiftUI/Modules/Room/PollEditForm/Coordinator/PollEditFormCoordinator.swift b/RiotSwiftUI/Modules/Room/PollEditForm/Coordinator/PollEditFormCoordinator.swift
new file mode 100644
index 000000000..da63d7098
--- /dev/null
+++ b/RiotSwiftUI/Modules/Room/PollEditForm/Coordinator/PollEditFormCoordinator.swift
@@ -0,0 +1,102 @@
+// File created from SimpleUserProfileExample
+// $ createScreen.sh Room/PollEditForm PollEditForm
+/*
+ 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
+
+struct PollEditFormCoordinatorParameters {
+    let navigationRouter: NavigationRouterType?
+    let room: MXRoom
+}
+
+final class PollEditFormCoordinator: Coordinator {
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    private let parameters: PollEditFormCoordinatorParameters
+    private let pollEditFormHostingController: UIViewController
+    private var _pollEditFormViewModel: Any? = nil
+    
+    @available(iOS 14.0, *)
+    fileprivate var pollEditFormViewModel: PollEditFormViewModel {
+        return _pollEditFormViewModel as! PollEditFormViewModel
+    }
+    
+    // MARK: Public
+
+    // Must be used only internally
+    var childCoordinators: [Coordinator] = []
+    
+    // MARK: - Setup
+    
+    @available(iOS 14.0, *)
+    init(parameters: PollEditFormCoordinatorParameters) {
+        self.parameters = parameters
+        
+        let viewModel = PollEditFormViewModel()
+        let view = PollEditForm(viewModel: viewModel.context)
+            
+        _pollEditFormViewModel = viewModel
+        pollEditFormHostingController = VectorHostingController(rootView: view)
+    }
+    
+    // MARK: - Public
+    func start() {
+        guard #available(iOS 14.0, *) else {
+            MXLog.error("[PollEditFormCoordinator] start: Invalid iOS version, returning.")
+            return
+        }
+        
+        parameters.navigationRouter?.present(pollEditFormHostingController, animated: true)
+        
+        pollEditFormViewModel.completion = { [weak self] result in
+            guard let self = self else { return }
+            switch result {
+            case .cancel:
+                self.parameters.navigationRouter?.dismissModule(animated: true, completion: nil)
+            case .create(let question, let answerOptions):
+                var options = [MXEventContentPollStartAnswerOption]()
+                for answerOption in answerOptions {
+                    options.append(MXEventContentPollStartAnswerOption(uuid: UUID().uuidString, text: answerOption))
+                }
+                
+                let pollStartContent = MXEventContentPollStart(question: question,
+                                                               kind: kMXMessageContentKeyExtensiblePollKindDisclosed,
+                                                               maxSelections: 1,
+                                                               answerOptions: options)
+                
+                self.pollEditFormViewModel.dispatch(action: .startLoading)
+                
+                self.parameters.room.sendPollStart(withContent: pollStartContent, localEcho: nil) { [weak self] result in
+                    guard let self = self else { return }
+                    
+                    self.parameters.navigationRouter?.dismissModule(animated: true, completion: nil)
+                    self.pollEditFormViewModel.dispatch(action: .stopLoading(nil))
+                } failure: { [weak self] error in
+                    guard let self = self else { return }
+                    
+                    MXLog.error("Failed creating poll with error: \(String(describing: error))")
+                    self.pollEditFormViewModel.dispatch(action: .stopLoading(error))
+                }
+            }
+        }
+    }
+}
diff --git a/RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormModels.swift b/RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormModels.swift
new file mode 100644
index 000000000..9c7d856c8
--- /dev/null
+++ b/RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormModels.swift
@@ -0,0 +1,83 @@
+// File created from SimpleUserProfileExample
+// $ createScreen.sh Room/PollEditForm PollEditForm
+// 
+// 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
+
+enum PollEditFormStateAction {
+    case viewAction(PollEditFormViewAction)
+    case startLoading
+    case stopLoading(Error?)
+}
+
+enum PollEditFormViewAction {
+    case addAnswerOption
+    case deleteAnswerOption(PollEditFormAnswerOption)
+    case cancel
+    case create
+}
+
+enum PollEditFormViewModelResult {
+    case cancel
+    case create(String, [String])
+}
+
+struct PollEditFormQuestion {
+    var text: String {
+        didSet {
+            text = String(text.prefix(maxLength))
+        }
+    }
+    
+    let maxLength: Int
+}
+
+struct PollEditFormAnswerOption: Identifiable, Equatable {
+    let id = UUID()
+
+    var text: String {
+        didSet {
+            text = String(text.prefix(maxLength))
+        }
+    }
+    
+    let maxLength: Int
+}
+
+struct PollEditFormViewState: BindableState {
+    var maxAnswerOptionsCount: Int
+    var bindings: PollEditFormViewStateBindings
+    
+    var confirmationButtonEnabled: Bool {
+        !bindings.question.text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty &&
+            bindings.answerOptions.filter({ !$0.text.isEmpty }).count >= 2
+    }
+    
+    var addAnswerOptionButtonEnabled: Bool {
+        bindings.answerOptions.count < maxAnswerOptionsCount
+    }
+    
+    var showLoadingIndicator: Bool = false
+}
+
+struct PollEditFormViewStateBindings {
+    var question: PollEditFormQuestion
+    var answerOptions: [PollEditFormAnswerOption]
+    
+    var showsFailureAlert: Bool = false
+}
diff --git a/RiotShareExtension/Shared/ShareItemProvider/ShareItemProviderProtocol.swift b/RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormScreenState.swift
similarity index 56%
rename from RiotShareExtension/Shared/ShareItemProvider/ShareItemProviderProtocol.swift
rename to RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormScreenState.swift
index 417fea577..2e545a9d4 100644
--- a/RiotShareExtension/Shared/ShareItemProvider/ShareItemProviderProtocol.swift
+++ b/RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormScreenState.swift
@@ -1,3 +1,5 @@
+// File created from SimpleUserProfileExample
+// $ createScreen.sh Room/UserSuggestion UserSuggestion
 // 
 // Copyright 2021 New Vector Ltd
 //
@@ -15,21 +17,18 @@
 //
 
 import Foundation
+import SwiftUI
 
-@objc public enum ShareItemType: UInt {
-    case fileURL, text, URL, image, video, movie, voiceMessage, unknown
-}
-
-@objc public protocol ShareItemProtocol {
-    var type: ShareItemType { get }
-}
-
-@objc public protocol ShareItemProviderProtocol {
-    var items: [ShareItemProtocol] { get }
+@available(iOS 14.0, *)
+enum MockPollEditFormScreenState: MockScreenState, CaseIterable {
+    case standard
     
-    func areAllItemsImages() -> Bool
+    var screenType: Any.Type {
+        MockPollEditFormScreenState.self
+    }
     
-    func areAllItemsLoaded() -> Bool
-    
-    func loadItem(_ item: ShareItemProtocol, completion: @escaping (Any?, Error?) -> Void)
+    var screenView: ([Any], AnyView)  {
+        let viewModel = PollEditFormViewModel()
+        return ([viewModel], AnyView(PollEditForm(viewModel: viewModel.context)))
+    }
 }
diff --git a/RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormViewModel.swift b/RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormViewModel.swift
new file mode 100644
index 000000000..f38ac9fc9
--- /dev/null
+++ b/RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormViewModel.swift
@@ -0,0 +1,101 @@
+// File created from SimpleUserProfileExample
+// $ createScreen.sh Room/PollEditForm PollEditForm
+//
+// 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, *)
+typealias PollEditFormViewModelType = StateStoreViewModel< PollEditFormViewState,
+                                                           PollEditFormStateAction,
+                                                           PollEditFormViewAction >
+@available(iOS 14, *)
+class PollEditFormViewModel: PollEditFormViewModelType {
+    
+    private struct Constants {
+        static let maxAnswerOptionsCount = 20
+        static let maxQuestionLength = 340
+        static let maxAnswerOptionLength = 340
+    }
+
+    // MARK: - Properties
+
+    // MARK: Private
+    
+    // MARK: Public
+    
+    var completion: ((PollEditFormViewModelResult) -> Void)?
+    
+    // MARK: - Setup
+    
+    init() {
+        super.init(initialViewState: Self.defaultState())
+    }
+    
+    private static func defaultState() -> PollEditFormViewState {
+        return PollEditFormViewState(
+            maxAnswerOptionsCount: Constants.maxAnswerOptionsCount,
+            bindings: PollEditFormViewStateBindings(
+                question: PollEditFormQuestion(text: "", maxLength: Constants.maxQuestionLength),
+                answerOptions: [PollEditFormAnswerOption(text: "", maxLength: Constants.maxAnswerOptionLength),
+                                PollEditFormAnswerOption(text: "", maxLength: Constants.maxAnswerOptionLength)
+                ]
+            )
+        )
+    }
+    
+    // MARK: - Public
+    
+    override func process(viewAction: PollEditFormViewAction) {
+        switch viewAction {
+        case .cancel:
+            completion?(.cancel)
+        case .create:
+            completion?(.create(state.bindings.question.text.trimmingCharacters(in: .whitespacesAndNewlines),
+                                state.bindings.answerOptions.compactMap({ answerOption in
+                                    let text = answerOption.text.trimmingCharacters(in: .whitespacesAndNewlines)
+                                    return text.isEmpty ? nil : text
+                                })))
+        default:
+            dispatch(action: .viewAction(viewAction))
+        }
+    }
+
+    override class func reducer(state: inout PollEditFormViewState, action: PollEditFormStateAction) {
+        switch action {
+        case .viewAction(let viewAction):
+            switch viewAction {
+            case .deleteAnswerOption(let answerOption):
+                state.bindings.answerOptions.removeAll { $0 == answerOption }
+            case .addAnswerOption:
+                state.bindings.answerOptions.append(PollEditFormAnswerOption(text: "", maxLength: Constants.maxAnswerOptionLength))
+            default:
+                break
+            }
+        case .startLoading:
+            state.showLoadingIndicator = true
+            break
+        case .stopLoading(let error):
+            state.showLoadingIndicator = false
+            
+            if error != nil {
+                state.bindings.showsFailureAlert = true
+            }
+            break
+        }
+    }
+}
diff --git a/RiotSwiftUI/Modules/Room/PollEditForm/Test/UI/PollEditFormUITests.swift b/RiotSwiftUI/Modules/Room/PollEditForm/Test/UI/PollEditFormUITests.swift
new file mode 100644
index 000000000..2780739cd
--- /dev/null
+++ b/RiotSwiftUI/Modules/Room/PollEditForm/Test/UI/PollEditFormUITests.swift
@@ -0,0 +1,82 @@
+// File created from SimpleUserProfileExample
+// $ createScreen.sh Room/PollEditForm PollEditForm
+//
+// 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 PollEditFormUITests: XCTestCase {
+    
+    private var app: XCUIApplication!
+    
+    override func setUp() {
+        continueAfterFailure = false
+                
+        app = XCUIApplication()
+        app.launch()
+        app.goToScreenWithIdentifier(MockPollEditFormScreenState.standard.title)
+    }
+    
+    func testInitialStateComponents() {
+        
+        XCTAssert(app.scrollViews.firstMatch.exists)
+        
+        XCTAssert(app.staticTexts["Create poll"].exists)
+        XCTAssert(app.staticTexts["Poll question or topic"].exists)
+        XCTAssert(app.staticTexts["Question or topic"].exists)
+        XCTAssert(app.staticTexts["Create options"].exists)
+        
+        XCTAssert(app.textViews.count == 1)
+        
+        XCTAssert(app.textFields.count == 2)
+        XCTAssert(app.staticTexts["Option 1"].exists)
+        XCTAssert(app.staticTexts["Option 2"].exists)
+        
+        let cancelButton = app.buttons["Cancel"]
+        XCTAssert(cancelButton.exists)
+        XCTAssertTrue(cancelButton.isEnabled)
+        
+        let addOptionButton = app.buttons["Add option"]
+        XCTAssert(addOptionButton.exists)
+        XCTAssertTrue(addOptionButton.isEnabled)
+        
+        let createPollButton = app.buttons["Create poll"]
+        XCTAssert(createPollButton.exists)
+        XCTAssertFalse(createPollButton.isEnabled)
+    }
+    
+    func testRemoveAddAnswerOptions() {
+        
+        let deleteAnswerOptionButton = app.buttons["Delete answer option"].firstMatch
+        
+        XCTAssert(deleteAnswerOptionButton.waitForExistence(timeout: 2.0))
+        deleteAnswerOptionButton.tap()
+        
+        XCTAssert(deleteAnswerOptionButton.waitForExistence(timeout: 2.0))
+        deleteAnswerOptionButton.tap()
+        
+        let addOptionButton = app.buttons["Add option"]
+        XCTAssert(addOptionButton.waitForExistence(timeout: 2.0))
+        XCTAssertTrue(addOptionButton.isEnabled)
+        
+        for i in 1...3 {
+            addOptionButton.tap()
+            XCTAssert(app.staticTexts["Option \(i)"].waitForExistence(timeout: 2.0))
+        }
+    }
+}
diff --git a/RiotSwiftUI/Modules/Room/PollEditForm/Test/Unit/PollEditFormViewModelTests.swift b/RiotSwiftUI/Modules/Room/PollEditForm/Test/Unit/PollEditFormViewModelTests.swift
new file mode 100644
index 000000000..739361197
--- /dev/null
+++ b/RiotSwiftUI/Modules/Room/PollEditForm/Test/Unit/PollEditFormViewModelTests.swift
@@ -0,0 +1,123 @@
+// File created from SimpleUserProfileExample
+// $ createScreen.sh Room/PollEditForm PollEditForm
+// 
+// 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 PollEditFormViewModelTests: XCTestCase {
+    var viewModel: PollEditFormViewModel!
+    var context: PollEditFormViewModelType.Context!
+    var cancellables = Set<AnyCancellable>()
+    
+    override func setUpWithError() throws {
+        viewModel = PollEditFormViewModel()
+        context = viewModel.context
+    }
+
+    func testInitialState() {
+        XCTAssertTrue(context.question.text.isEmpty)
+        XCTAssertFalse(context.viewState.confirmationButtonEnabled)
+        XCTAssertTrue(context.viewState.addAnswerOptionButtonEnabled)
+        
+        XCTAssertEqual(context.answerOptions.count, 2)
+        for answerOption in context.answerOptions {
+            XCTAssertTrue(answerOption.text.isEmpty)
+        }
+    }
+    
+    func testDeleteAllAnswerOptions() {
+        while !context.answerOptions.isEmpty {
+            context.send(viewAction: .deleteAnswerOption(context.answerOptions.first!))
+        }
+        
+        XCTAssertEqual(context.answerOptions.count, 0)
+        XCTAssertFalse(context.viewState.confirmationButtonEnabled)
+        XCTAssertTrue(context.viewState.addAnswerOptionButtonEnabled)
+    }
+    
+    func testAddRemoveAnswerOption() {
+        context.send(viewAction: .addAnswerOption)
+        
+        XCTAssertEqual(context.answerOptions.count, 3)
+        
+        context.send(viewAction: .deleteAnswerOption(context.answerOptions.first!))
+        
+        XCTAssertEqual(context.answerOptions.count, 2)
+    }
+    
+    func testCreateEnabled() {
+        context.question.text = "Some question"
+        context.answerOptions[0].text = "First answer"
+        context.answerOptions[1].text = "Second answer"
+        
+        XCTAssertTrue(context.viewState.confirmationButtonEnabled)
+    }
+    
+    func testReachedMaxAnswerOptions() {
+        for _ in 0...context.viewState.maxAnswerOptionsCount {
+            context.send(viewAction: .addAnswerOption)
+        }
+        
+        XCTAssertFalse(context.viewState.addAnswerOptionButtonEnabled)
+    }
+    
+    func testQuestionMaxLength() {
+        let question = String(repeating: "S", count: context.question.maxLength + 100)
+        context.question.text = question
+        
+        XCTAssertEqual(context.question.text.count, context.question.maxLength)
+    }
+    
+    func testAnswerOptionMaxLength() {
+        let answerOption = String(repeating: "S", count: context.answerOptions[0].maxLength + 100)
+        context.answerOptions[0].text = answerOption
+        
+        XCTAssertEqual(context.answerOptions[0].text.count, context.answerOptions[0].maxLength)
+    }
+    
+    func testFormCompletion() {
+        let question = "Some question     "
+        let firstAnswer = "First answer   "
+        let secondAnswer = "Second answer "
+        let thirdAnswer = "        "
+        
+        viewModel.completion = { result in
+            if case PollEditFormViewModelResult.create(let resultQuestion, let resultAnswerOptions) = result {
+                XCTAssertEqual(question.trimmingCharacters(in: .whitespacesAndNewlines), resultQuestion)
+                
+                // The last answer option should be automatically dropped as it's empty
+                XCTAssertEqual(resultAnswerOptions.count, 2)
+                
+                XCTAssertEqual(resultAnswerOptions[0], firstAnswer.trimmingCharacters(in: .whitespacesAndNewlines))
+                XCTAssertEqual(resultAnswerOptions[1], secondAnswer.trimmingCharacters(in: .whitespacesAndNewlines))
+            }
+        }
+        
+        context.question.text = question
+        context.answerOptions[0].text = firstAnswer
+        context.answerOptions[1].text = secondAnswer
+        
+        context.send(viewAction: .addAnswerOption)
+        context.answerOptions[2].text = thirdAnswer
+        
+        context.send(viewAction: .create)
+    }
+}
diff --git a/RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditForm.swift b/RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditForm.swift
new file mode 100644
index 000000000..9e81488a5
--- /dev/null
+++ b/RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditForm.swift
@@ -0,0 +1,156 @@
+// File created from SimpleUserProfileExample
+// $ createScreen.sh Room/PollEditForm PollEditForm
+// 
+// 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 PollEditForm: View {
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    @Environment(\.theme) private var theme: ThemeSwiftUI
+    
+    // MARK: Public
+    
+    @ObservedObject var viewModel: PollEditFormViewModel.Context
+    
+    var body: some View {
+        NavigationView {
+            GeometryReader { proxy in
+                ScrollView {
+                    VStack(alignment: .leading, spacing: 32.0) {
+                        
+                        VStack(alignment: .leading, spacing: 16.0) {
+                            Text(VectorL10n.pollEditFormPollQuestionOrTopic)
+                                .font(theme.fonts.title3SB)
+                                .foregroundColor(theme.colors.primaryContent)
+                            
+                            VStack(alignment: .leading, spacing: 8.0) {
+                                Text(VectorL10n.pollEditFormQuestionOrTopic)
+                                    .font(theme.fonts.subheadline)
+                                    .foregroundColor(theme.colors.primaryContent)
+                                
+                                MultilineTextField(VectorL10n.pollEditFormInputPlaceholder, text: $viewModel.question.text)
+                            }
+                        }
+                        
+                        VStack(alignment: .leading, spacing: 16.0) {
+                            Text(VectorL10n.pollEditFormCreateOptions)
+                                .font(theme.fonts.title3SB)
+                                .foregroundColor(theme.colors.primaryContent)
+                            
+                            ForEach(0..<viewModel.answerOptions.count, id: \.self) { index in
+                                SafeBindingCollectionEnumerator($viewModel.answerOptions, index: index) { binding in
+                                    AnswerOptionGroup(text: binding.text, index: index) {
+                                        withAnimation(.easeInOut(duration: 0.2)) {
+                                            viewModel.send(viewAction: .deleteAnswerOption(viewModel.answerOptions[index]))
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        
+                        Button(VectorL10n.pollEditFormAddOption) {
+                            withAnimation(.easeInOut(duration: 0.2)) {
+                                viewModel.send(viewAction: .addAnswerOption)
+                            }
+                        }
+                        .disabled(!viewModel.viewState.addAnswerOptionButtonEnabled)
+                        
+                        Spacer()
+                        
+                        Button(VectorL10n.pollEditFormCreatePoll) {
+                            viewModel.send(viewAction: .create)
+                        }
+                        .buttonStyle(PrimaryActionButtonStyle())
+                        .disabled(!viewModel.viewState.confirmationButtonEnabled)
+                    }
+                    .padding()
+                    .activityIndicator(show: viewModel.viewState.showLoadingIndicator)
+                    .alert(isPresented: $viewModel.showsFailureAlert) {
+                        Alert(title: Text(VectorL10n.pollEditFormPostFailureTitle),
+                              message: Text(VectorL10n.pollEditFormPostFailureSubtitle),
+                              dismissButton: .default(Text(VectorL10n.pollEditFormPostFailureAction)))
+                    }
+                    .frame(minHeight: proxy.size.height) // Make the VStack fill the ScrollView's parent
+                    .toolbar {
+                        ToolbarItem(placement: .navigationBarLeading) {
+                            Button(VectorL10n.cancel, action: {
+                                viewModel.send(viewAction: .cancel)
+                            })
+                        }
+                        ToolbarItem(placement: .principal) {
+                            Text(VectorL10n.pollEditFormCreatePoll)
+                                .font(.headline)
+                                .foregroundColor(theme.colors.primaryContent)
+                        }
+                    }
+                    .navigationBarTitleDisplayMode(.inline)
+                }
+            }
+        }
+        .accentColor(theme.colors.accent)
+        .navigationViewStyle(StackNavigationViewStyle())
+    }
+}
+
+@available(iOS 14.0, *)
+private struct AnswerOptionGroup: View {
+    
+    @Environment(\.theme) private var theme: ThemeSwiftUI
+    
+    @State private var focused = false
+    
+    @Binding var text: String
+    
+    let index: Int
+    let onDelete: () -> Void
+    
+    var body: some View {
+        VStack(alignment: .leading, spacing: 8.0) {
+            Text(VectorL10n.pollEditFormOptionNumber(index + 1))
+                .font(theme.fonts.subheadline)
+                .foregroundColor(theme.colors.primaryContent)
+            
+            HStack(spacing: 16.0) {
+                TextField(VectorL10n.pollEditFormInputPlaceholder, text: $text, onEditingChanged: { edit in
+                    self.focused = edit
+                })
+                .textFieldStyle(BorderedInputFieldStyle(theme: _theme, isEditing: focused))
+                Button {
+                    onDelete()
+                } label: {
+                    Image(uiImage:Asset.Images.pollDeleteOptionIcon.image)
+                }
+                .accessibilityIdentifier("Delete answer option")
+            }
+        }
+    }
+}
+
+// MARK: - Previews
+
+@available(iOS 14.0, *)
+struct PollEditForm_Previews: PreviewProvider {
+    static let stateRenderer = MockPollEditFormScreenState.stateRenderer
+    static var previews: some View {
+        stateRenderer.screenGroup()
+    }
+}
diff --git a/RiotSwiftUI/Modules/Room/PollTimeline/Coordinator/PollTimelineCoordinator.swift b/RiotSwiftUI/Modules/Room/PollTimeline/Coordinator/PollTimelineCoordinator.swift
new file mode 100644
index 000000000..8d201264f
--- /dev/null
+++ b/RiotSwiftUI/Modules/Room/PollTimeline/Coordinator/PollTimelineCoordinator.swift
@@ -0,0 +1,143 @@
+// File created from SimpleUserProfileExample
+// $ createScreen.sh Room/PollTimeline PollTimeline
+/*
+ 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 MatrixSDK
+import Combine
+
+struct PollTimelineCoordinatorParameters {
+    let session: MXSession
+    let room: MXRoom
+    let pollStartEvent: MXEvent
+}
+
+@available(iOS 14.0, *)
+final class PollTimelineCoordinator: Coordinator, PollAggregatorDelegate {
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    private let parameters: PollTimelineCoordinatorParameters
+    private let selectedAnswerIdentifiersSubject = PassthroughSubject<[String], Never>()
+    
+    private var pollAggregator: PollAggregator
+    private var pollTimelineViewModel: PollTimelineViewModel!
+    private var cancellables = Set<AnyCancellable>()
+    
+    // MARK: Public
+
+    // Must be used only internally
+    var childCoordinators: [Coordinator] = []
+    
+    // MARK: - Setup
+    
+    @available(iOS 14.0, *)
+    init(parameters: PollTimelineCoordinatorParameters) throws {
+        self.parameters = parameters
+        
+        try pollAggregator = PollAggregator(session: parameters.session, room: parameters.room, pollStartEvent: parameters.pollStartEvent)
+        pollAggregator.delegate = self
+        
+        pollTimelineViewModel = PollTimelineViewModel(timelinePoll: buildTimelinePollFrom(pollAggregator.poll))
+        pollTimelineViewModel.callback = { [weak self] result in
+            guard let self = self else { return }
+            
+            switch result {
+            case .selectedAnswerOptionsWithIdentifiers(let identifiers):
+                self.selectedAnswerIdentifiersSubject.send(identifiers)
+            }
+        }
+        
+        selectedAnswerIdentifiersSubject
+            .debounce(for: 1.0, scheduler: RunLoop.main)
+            .removeDuplicates()
+            .sink { [weak self] identifiers in
+                guard let self = self else { return }
+
+                self.parameters.room.sendPollResponse(for: parameters.pollStartEvent,
+                                                      withAnswerIdentifiers: identifiers,
+                                                      localEcho: nil, success: nil) { [weak self] error in
+                    guard let self = self else { return }
+                    
+                    MXLog.error("[PollTimelineCoordinator]] Failed submitting response with error \(String(describing: error))")
+                    
+                    self.pollTimelineViewModel.dispatch(action: .showAnsweringFailure)
+                }
+            }
+            .store(in: &cancellables)
+    }
+    
+    // MARK: - Public
+    func start() {
+        
+    }
+    
+    func toPresentable() -> UIViewController {
+        return VectorHostingController(rootView: PollTimelineView(viewModel: pollTimelineViewModel.context))
+    }
+    
+    func canEndPoll() -> Bool {
+        return pollAggregator.poll.isClosed == false
+    }
+    
+    func endPoll() {
+        parameters.room.sendPollEnd(for: parameters.pollStartEvent, localEcho: nil, success: nil) { [weak self] error in
+            self?.pollTimelineViewModel.dispatch(action: .showClosingFailure)
+        }
+    }
+    
+    // MARK: - PollAggregatorDelegate
+    
+    func pollAggregatorDidUpdateData(_ aggregator: PollAggregator) {
+        pollTimelineViewModel.dispatch(action: .updateWithPoll(buildTimelinePollFrom(aggregator.poll)))
+    }
+    
+    func pollAggregatorDidStartLoading(_ aggregator: PollAggregator) {
+        
+    }
+    
+    func pollAggregatorDidEndLoading(_ aggregator: PollAggregator) {
+        
+    }
+    
+    func pollAggregator(_ aggregator: PollAggregator, didFailWithError: Error) {
+        
+    }
+    
+    // MARK: - Private
+    
+    // PollProtocol is intentionally not available in the SwiftUI target as we don't want
+    // to add the SDK as a dependency to it. We need to translate from one to the other on this level.
+    func buildTimelinePollFrom(_ poll: PollProtocol) -> TimelinePoll {
+        let answerOptions = poll.answerOptions.map { pollAnswerOption in
+            TimelineAnswerOption(id: pollAnswerOption.id,
+                                 text: pollAnswerOption.text,
+                                 count: pollAnswerOption.count,
+                                 winner: pollAnswerOption.isWinner,
+                                 selected: pollAnswerOption.isCurrentUserSelection)
+        }
+        
+        return TimelinePoll(question: poll.text,
+                            answerOptions: answerOptions,
+                            closed: poll.isClosed,
+                            totalAnswerCount: poll.totalAnswerCount,
+                            type: (poll.kind == .disclosed ? .disclosed : .undisclosed),
+                            maxAllowedSelections: poll.maxAllowedSelections)
+    }
+}
diff --git a/RiotSwiftUI/Modules/Room/PollTimeline/Coordinator/PollTimelineProvider.swift b/RiotSwiftUI/Modules/Room/PollTimeline/Coordinator/PollTimelineProvider.swift
new file mode 100644
index 000000000..d778cbedf
--- /dev/null
+++ b/RiotSwiftUI/Modules/Room/PollTimeline/Coordinator/PollTimelineProvider.swift
@@ -0,0 +1,55 @@
+// 
+// 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
+
+@available(iOS 14, *)
+class PollTimelineProvider {
+    static let shared = PollTimelineProvider()
+    
+    var session: MXSession?
+    var coordinatorsForEventIdentifiers = [String: PollTimelineCoordinator]()
+    
+    private init() {
+        
+    }
+    
+    /// Create or retrieve the poll timeline coordinator for this event and return
+    /// a view to be displayed in the timeline
+    func buildPollTimelineViewForEvent(_ event: MXEvent) -> UIView? {
+        guard let session = session, let room = session.room(withRoomId: event.roomId) else {
+            return nil
+        }
+        
+        if let coordinator = coordinatorsForEventIdentifiers[event.eventId] {
+            return coordinator.toPresentable().view
+        }
+        
+        let parameters = PollTimelineCoordinatorParameters(session: session, room: room, pollStartEvent: event)
+        guard let coordinator = try? PollTimelineCoordinator(parameters: parameters) else {
+            return nil
+        }
+        
+        coordinatorsForEventIdentifiers[event.eventId] = coordinator
+        
+        return coordinator.toPresentable().view
+    }
+    
+    /// Retrieve the poll timeline coordinator for the given event or nil if it hasn't been created yet
+    func pollTimelineCoordinatorForEventIdentifier(_ eventIdentifier: String) -> PollTimelineCoordinator? {
+        return coordinatorsForEventIdentifiers[eventIdentifier]
+    }
+}
diff --git a/RiotSwiftUI/Modules/Room/PollTimeline/PollTimelineModels.swift b/RiotSwiftUI/Modules/Room/PollTimeline/PollTimelineModels.swift
new file mode 100644
index 000000000..d01eaf864
--- /dev/null
+++ b/RiotSwiftUI/Modules/Room/PollTimeline/PollTimelineModels.swift
@@ -0,0 +1,91 @@
+// File created from SimpleUserProfileExample
+// $ createScreen.sh Room/PollTimeline PollTimeline
+// 
+// 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
+
+typealias PollTimelineViewModelCallback = ((PollTimelineViewModelResult) -> Void)
+
+enum PollTimelineStateAction {
+    case viewAction(PollTimelineViewAction, PollTimelineViewModelCallback?)
+    case updateWithPoll(TimelinePoll)
+    case showAnsweringFailure
+    case showClosingFailure
+}
+
+enum PollTimelineViewAction {
+    case selectAnswerOptionWithIdentifier(String)
+}
+
+enum PollTimelineViewModelResult {
+    case selectedAnswerOptionsWithIdentifiers([String])
+}
+
+enum TimelinePollType {
+    case disclosed
+    case undisclosed
+}
+
+class TimelineAnswerOption: Identifiable {
+    var id: String
+    var text: String
+    var count: UInt
+    var winner: Bool
+    var selected: Bool
+    
+    init(id: String, text: String, count: UInt, winner: Bool, selected: Bool) {
+        self.id = id
+        self.text = text
+        self.count = count
+        self.winner = winner
+        self.selected = selected
+    }
+}
+
+class TimelinePoll {
+    var question: String
+    var answerOptions: [TimelineAnswerOption]
+    var closed: Bool
+    var totalAnswerCount: UInt
+    var type: TimelinePollType
+    var maxAllowedSelections: UInt
+    
+    init(question: String, answerOptions: [TimelineAnswerOption], closed: Bool, totalAnswerCount: UInt, type: TimelinePollType, maxAllowedSelections: UInt) {
+        self.question = question
+        self.answerOptions = answerOptions
+        self.closed = closed
+        self.totalAnswerCount = totalAnswerCount
+        self.type = type
+        self.maxAllowedSelections = maxAllowedSelections
+    }
+    
+    var hasCurrentUserVoted: Bool {
+        answerOptions.filter { $0.selected == true}.count > 0
+    }
+}
+
+struct PollTimelineViewState: BindableState {
+    var poll: TimelinePoll
+    var bindings: PollTimelineViewStateBindings
+}
+
+struct PollTimelineViewStateBindings {
+    var showsAnsweringFailureAlert: Bool = false
+    var showsClosingFailureAlert: Bool = false
+}
+
diff --git a/RiotSwiftUI/Modules/Room/PollTimeline/PollTimelineScreenState.swift b/RiotSwiftUI/Modules/Room/PollTimeline/PollTimelineScreenState.swift
new file mode 100644
index 000000000..b7752acf5
--- /dev/null
+++ b/RiotSwiftUI/Modules/Room/PollTimeline/PollTimelineScreenState.swift
@@ -0,0 +1,47 @@
+// File created from SimpleUserProfileExample
+// $ createScreen.sh Room/UserSuggestion UserSuggestion
+// 
+// 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, *)
+enum MockPollTimelineScreenState: MockScreenState, CaseIterable {
+    case open
+    case closed
+    
+    var screenType: Any.Type {
+        MockPollTimelineScreenState.self
+    }
+    
+    var screenView: ([Any], AnyView)  {
+        let answerOptions = [TimelineAnswerOption(id: "1", text: "First", count: 10, winner: false, selected: false),
+        TimelineAnswerOption(id: "2", text: "Second", count: 5, winner: false, selected: true),
+        TimelineAnswerOption(id: "3", text: "Third", count: 15, winner: true, selected: false)]
+        
+        let poll = TimelinePoll(question: "Question",
+        answerOptions: answerOptions,
+        closed: (self == .closed ? true : false),
+        totalAnswerCount: 20,
+        type: .disclosed,
+        maxAllowedSelections: 1)
+        
+        let viewModel = PollTimelineViewModel(timelinePoll: poll)
+        
+        return ([viewModel], AnyView(PollTimelineView(viewModel: viewModel.context)))
+    }
+}
diff --git a/RiotSwiftUI/Modules/Room/PollTimeline/PollTimelineViewModel.swift b/RiotSwiftUI/Modules/Room/PollTimeline/PollTimelineViewModel.swift
new file mode 100644
index 000000000..eb802509b
--- /dev/null
+++ b/RiotSwiftUI/Modules/Room/PollTimeline/PollTimelineViewModel.swift
@@ -0,0 +1,132 @@
+// File created from SimpleUserProfileExample
+// $ createScreen.sh Room/PollTimeline PollTimeline
+//
+// 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, *)
+typealias PollTimelineViewModelType = StateStoreViewModel<PollTimelineViewState,
+                                                          PollTimelineStateAction,
+                                                          PollTimelineViewAction>
+@available(iOS 14, *)
+class PollTimelineViewModel: PollTimelineViewModelType {
+    
+    // MARK: - Properties
+
+    // MARK: Private
+    
+    // MARK: Public
+    
+    var callback: PollTimelineViewModelCallback?
+    
+    // MARK: - Setup
+    
+    init(timelinePoll: TimelinePoll) {
+        super.init(initialViewState: PollTimelineViewState(poll: timelinePoll, bindings: PollTimelineViewStateBindings()))
+    }
+    
+    // MARK: - Public
+    
+    override func process(viewAction: PollTimelineViewAction) {
+        switch viewAction {
+        case .selectAnswerOptionWithIdentifier(_):
+            dispatch(action: .viewAction(viewAction, callback))
+        }
+    }
+    
+    override class func reducer(state: inout PollTimelineViewState, action: PollTimelineStateAction) {
+        switch action {
+        case .viewAction(let viewAction, let callback):
+            switch viewAction {
+            
+            // Update local state. An update will be pushed from the coordinator once sent.
+            case .selectAnswerOptionWithIdentifier(let identifier):
+                guard !state.poll.closed else {
+                    return
+                }
+                
+                if (state.poll.maxAllowedSelections == 1) {
+                    updateSingleSelectPollLocalState(&state, selectedAnswerIdentifier: identifier, callback: callback)
+                } else {
+                    updateMultiSelectPollLocalState(&state, selectedAnswerIdentifier: identifier, callback: callback)
+                }
+            }
+        case .updateWithPoll(let poll):
+            state.poll = poll
+        case .showAnsweringFailure:
+            state.bindings.showsAnsweringFailureAlert = true
+        case .showClosingFailure:
+            state.bindings.showsClosingFailureAlert = true
+        }
+    }
+    
+    // MARK: - Private
+    
+    static func updateSingleSelectPollLocalState(_ state: inout PollTimelineViewState, selectedAnswerIdentifier: String, callback: PollTimelineViewModelCallback?) {
+        for answerOption in state.poll.answerOptions {
+            if answerOption.selected {
+                answerOption.selected = false
+                
+                if(answerOption.count > 0) {
+                    answerOption.count = answerOption.count - 1
+                    state.poll.totalAnswerCount -= 1
+                }
+            }
+            
+            if answerOption.id == selectedAnswerIdentifier {
+                answerOption.selected = true
+                answerOption.count += 1
+                state.poll.totalAnswerCount += 1
+            }
+        }
+        
+        informCoordinatorOfSelectionUpdate(state: state, callback: callback)
+    }
+    
+    static func updateMultiSelectPollLocalState(_ state: inout PollTimelineViewState, selectedAnswerIdentifier: String, callback: PollTimelineViewModelCallback?) {
+        let selectedAnswerOptions = state.poll.answerOptions.filter { $0.selected == true }
+        
+        let isDeselecting = selectedAnswerOptions.filter { $0.id == selectedAnswerIdentifier }.count > 0
+        
+        if !isDeselecting && selectedAnswerOptions.count >= state.poll.maxAllowedSelections {
+            return
+        }
+        
+        for answerOption in state.poll.answerOptions where answerOption.id == selectedAnswerIdentifier {
+            if answerOption.selected {
+                answerOption.selected = false
+                answerOption.count -= 1
+                state.poll.totalAnswerCount -= 1
+            } else {
+                answerOption.selected = true
+                answerOption.count += 1
+                state.poll.totalAnswerCount += 1
+            }
+        }
+        
+        informCoordinatorOfSelectionUpdate(state: state, callback: callback)
+    }
+    
+    static func informCoordinatorOfSelectionUpdate(state: PollTimelineViewState, callback: PollTimelineViewModelCallback?) {
+        let selectedIdentifiers = state.poll.answerOptions.compactMap { answerOption in
+            answerOption.selected ? answerOption.id : nil
+        }
+        
+        callback?(.selectedAnswerOptionsWithIdentifiers(selectedIdentifiers))
+    }
+}
diff --git a/RiotSwiftUI/Modules/Room/PollTimeline/Test/UI/PollTimelineUITests.swift b/RiotSwiftUI/Modules/Room/PollTimeline/Test/UI/PollTimelineUITests.swift
new file mode 100644
index 000000000..f36660e54
--- /dev/null
+++ b/RiotSwiftUI/Modules/Room/PollTimeline/Test/UI/PollTimelineUITests.swift
@@ -0,0 +1,98 @@
+// File created from SimpleUserProfileExample
+// $ createScreen.sh Room/PollTimeline PollTimeline
+//
+// 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 PollTimelineUITests: XCTestCase {
+    
+    private var app: XCUIApplication!
+    
+    override func setUp() {
+        continueAfterFailure = false
+                
+        app = XCUIApplication()
+        app.launch()
+    }
+    
+    func testOpenPoll() {
+        app.goToScreenWithIdentifier(MockPollTimelineScreenState.open.title)
+        
+        XCTAssert(app.staticTexts["Question"].exists)
+        XCTAssert(app.staticTexts["20 votes cast"].exists)
+        
+        XCTAssert(app.buttons["First, 10 votes"].exists)
+        XCTAssertEqual(app.buttons["First, 10 votes"].value as! String, "50%")
+        
+        XCTAssert(app.buttons["Second, 5 votes"].exists)
+        XCTAssertEqual(app.buttons["Second, 5 votes"].value as! String, "25%")
+        
+        XCTAssert(app.buttons["Third, 15 votes"].exists)
+        XCTAssertEqual(app.buttons["Third, 15 votes"].value as! String, "75%")
+        
+        app.buttons["First, 10 votes"].tap()
+        
+        XCTAssert(app.buttons["First, 11 votes"].exists)
+        XCTAssertEqual(app.buttons["First, 11 votes"].value as! String, "55%")
+        
+        XCTAssert(app.buttons["Second, 4 votes"].exists)
+        XCTAssertEqual(app.buttons["Second, 4 votes"].value as! String, "20%")
+        
+        XCTAssert(app.buttons["Third, 15 votes"].exists)
+        XCTAssertEqual(app.buttons["Third, 15 votes"].value as! String, "75%")
+        
+        app.buttons["Third, 15 votes"].tap()
+        
+        XCTAssert(app.buttons["First, 10 votes"].exists)
+        XCTAssertEqual(app.buttons["First, 10 votes"].value as! String, "50%")
+        
+        XCTAssert(app.buttons["Second, 4 votes"].exists)
+        XCTAssertEqual(app.buttons["Second, 4 votes"].value as! String, "20%")
+        
+        XCTAssert(app.buttons["Third, 16 votes"].exists)
+        XCTAssertEqual(app.buttons["Third, 16 votes"].value as! String, "80%")
+    }
+    
+    func testClosedPoll() {
+        app.goToScreenWithIdentifier(MockPollTimelineScreenState.closed.title)
+        
+        XCTAssert(app.staticTexts["Question"].exists)
+        XCTAssert(app.staticTexts["Final results based on 20 votes"].exists)
+        
+        XCTAssert(app.buttons["First, 10 votes"].exists)
+        XCTAssertEqual(app.buttons["First, 10 votes"].value as! String, "50%")
+        
+        XCTAssert(app.buttons["Second, 5 votes"].exists)
+        XCTAssertEqual(app.buttons["Second, 5 votes"].value as! String, "25%")
+        
+        XCTAssert(app.buttons["Third, 15 votes"].exists)
+        XCTAssertEqual(app.buttons["Third, 15 votes"].value as! String, "75%")
+        
+        app.buttons["First, 10 votes"].tap()
+        
+        XCTAssert(app.buttons["First, 10 votes"].exists)
+        XCTAssertEqual(app.buttons["First, 10 votes"].value as! String, "50%")
+        
+        XCTAssert(app.buttons["Second, 5 votes"].exists)
+        XCTAssertEqual(app.buttons["Second, 5 votes"].value as! String, "25%")
+        
+        XCTAssert(app.buttons["Third, 15 votes"].exists)
+        XCTAssertEqual(app.buttons["Third, 15 votes"].value as! String, "75%")
+    }
+}
diff --git a/RiotSwiftUI/Modules/Room/PollTimeline/Test/Unit/PollTimelineViewModelTests.swift b/RiotSwiftUI/Modules/Room/PollTimeline/Test/Unit/PollTimelineViewModelTests.swift
new file mode 100644
index 000000000..9ad80e5b9
--- /dev/null
+++ b/RiotSwiftUI/Modules/Room/PollTimeline/Test/Unit/PollTimelineViewModelTests.swift
@@ -0,0 +1,149 @@
+// File created from SimpleUserProfileExample
+// $ createScreen.sh Room/PollTimeline PollTimeline
+// 
+// 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 PollTimelineViewModelTests: XCTestCase {
+    var viewModel: PollTimelineViewModel!
+    var context: PollTimelineViewModelType.Context!
+    var cancellables = Set<AnyCancellable>()
+    
+    override func setUpWithError() throws {
+        let answerOptions = [TimelineAnswerOption(id: "1", text: "1", count: 1, winner: false, selected: false),
+                             TimelineAnswerOption(id: "2", text: "2", count: 1, winner: false, selected: false),
+                             TimelineAnswerOption(id: "3", text: "3", count: 1, winner: false, selected: false)]
+        
+        let timelinePoll = TimelinePoll(question: "Question",
+                                        answerOptions: answerOptions,
+                                        closed: false,
+                                        totalAnswerCount: 3,
+                                        type: .disclosed,
+                                        maxAllowedSelections: 1)
+        
+        viewModel = PollTimelineViewModel(timelinePoll: timelinePoll)
+        context = viewModel.context
+    }
+    
+    func testInitialState() {
+        XCTAssertEqual(context.viewState.poll.answerOptions.count, 3)
+        XCTAssertFalse(context.viewState.poll.closed)
+        XCTAssertEqual(context.viewState.poll.type, .disclosed)
+    }
+    
+    func testSingleSelectionOnMax1Allowed() {
+        context.send(viewAction: .selectAnswerOptionWithIdentifier("1"))
+        
+        XCTAssertTrue(context.viewState.poll.answerOptions[0].selected)
+        XCTAssertFalse(context.viewState.poll.answerOptions[1].selected)
+        XCTAssertFalse(context.viewState.poll.answerOptions[2].selected)
+    }
+    
+    func testSingleReselectionOnMax1Allowed() {
+        context.send(viewAction: .selectAnswerOptionWithIdentifier("1"))
+        context.send(viewAction: .selectAnswerOptionWithIdentifier("1"))
+        
+        XCTAssertTrue(context.viewState.poll.answerOptions[0].selected)
+        XCTAssertFalse(context.viewState.poll.answerOptions[1].selected)
+        XCTAssertFalse(context.viewState.poll.answerOptions[2].selected)
+    }
+    
+    func testMultipleSelectionOnMax1Allowed() {
+        context.send(viewAction: .selectAnswerOptionWithIdentifier("1"))
+        context.send(viewAction: .selectAnswerOptionWithIdentifier("3"))
+        
+        XCTAssertFalse(context.viewState.poll.answerOptions[0].selected)
+        XCTAssertFalse(context.viewState.poll.answerOptions[1].selected)
+        XCTAssertTrue(context.viewState.poll.answerOptions[2].selected)
+    }
+    
+    func testMultipleReselectionOnMax1Allowed() {
+        context.send(viewAction: .selectAnswerOptionWithIdentifier("1"))
+        context.send(viewAction: .selectAnswerOptionWithIdentifier("3"))
+        context.send(viewAction: .selectAnswerOptionWithIdentifier("3"))
+        
+        XCTAssertFalse(context.viewState.poll.answerOptions[0].selected)
+        XCTAssertFalse(context.viewState.poll.answerOptions[1].selected)
+        XCTAssertTrue(context.viewState.poll.answerOptions[2].selected)
+    }
+
+    func testClosedSelection() {
+        context.viewState.poll.closed = true
+
+        context.send(viewAction: .selectAnswerOptionWithIdentifier("1"))
+        context.send(viewAction: .selectAnswerOptionWithIdentifier("3"))
+        
+        XCTAssertFalse(context.viewState.poll.answerOptions[0].selected)
+        XCTAssertFalse(context.viewState.poll.answerOptions[1].selected)
+        XCTAssertFalse(context.viewState.poll.answerOptions[2].selected)
+    }
+
+    func testSingleSelectionOnMax2Allowed() {
+        context.viewState.poll.maxAllowedSelections = 2
+        
+        context.send(viewAction: .selectAnswerOptionWithIdentifier("1"))
+        
+        XCTAssertTrue(context.viewState.poll.answerOptions[0].selected)
+        XCTAssertFalse(context.viewState.poll.answerOptions[1].selected)
+        XCTAssertFalse(context.viewState.poll.answerOptions[2].selected)
+    }
+    
+    func testSingleReselectionOnMax2Allowed() {
+        context.viewState.poll.maxAllowedSelections = 2
+        
+        context.send(viewAction: .selectAnswerOptionWithIdentifier("1"))
+        context.send(viewAction: .selectAnswerOptionWithIdentifier("1"))
+        
+        XCTAssertFalse(context.viewState.poll.answerOptions[0].selected)
+        XCTAssertFalse(context.viewState.poll.answerOptions[1].selected)
+        XCTAssertFalse(context.viewState.poll.answerOptions[2].selected)
+    }
+    
+    func testMultipleSelectionOnMax2Allowed() {
+        context.viewState.poll.maxAllowedSelections = 2
+        
+        context.send(viewAction: .selectAnswerOptionWithIdentifier("1"))
+        context.send(viewAction: .selectAnswerOptionWithIdentifier("3"))
+        context.send(viewAction: .selectAnswerOptionWithIdentifier("2"))
+        
+        XCTAssertTrue(context.viewState.poll.answerOptions[0].selected)
+        XCTAssertFalse(context.viewState.poll.answerOptions[1].selected)
+        XCTAssertTrue(context.viewState.poll.answerOptions[2].selected)
+        
+        context.send(viewAction: .selectAnswerOptionWithIdentifier("1"))
+        
+        XCTAssertFalse(context.viewState.poll.answerOptions[0].selected)
+        XCTAssertFalse(context.viewState.poll.answerOptions[1].selected)
+        XCTAssertTrue(context.viewState.poll.answerOptions[2].selected)
+        
+        context.send(viewAction: .selectAnswerOptionWithIdentifier("2"))
+        
+        XCTAssertFalse(context.viewState.poll.answerOptions[0].selected)
+        XCTAssertTrue(context.viewState.poll.answerOptions[1].selected)
+        XCTAssertTrue(context.viewState.poll.answerOptions[2].selected)
+        
+        context.send(viewAction: .selectAnswerOptionWithIdentifier("3"))
+        
+        XCTAssertFalse(context.viewState.poll.answerOptions[0].selected)
+        XCTAssertTrue(context.viewState.poll.answerOptions[1].selected)
+        XCTAssertFalse(context.viewState.poll.answerOptions[2].selected)
+    }
+}
diff --git a/RiotSwiftUI/Modules/Room/PollTimeline/View/PollTimelineAnswerOptionButton.swift b/RiotSwiftUI/Modules/Room/PollTimeline/View/PollTimelineAnswerOptionButton.swift
new file mode 100644
index 000000000..e5daad842
--- /dev/null
+++ b/RiotSwiftUI/Modules/Room/PollTimeline/View/PollTimelineAnswerOptionButton.swift
@@ -0,0 +1,155 @@
+// 
+// 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 PollTimelineAnswerOptionButton: View {
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    @Environment(\.theme) private var theme: ThemeSwiftUI
+    
+    let answerOption: TimelineAnswerOption
+    let pollClosed: Bool
+    let showResults: Bool
+    let totalAnswerCount: UInt
+    let action: () -> Void
+    
+    // MARK: Public
+    
+    var body: some View {
+        Button(action: action) {
+            let rect = RoundedRectangle(cornerRadius: 4.0)
+            answerOptionLabel
+                .padding(.horizontal, 8.0)
+                .padding(.top, 12.0)
+                .padding(.bottom, 4.0)
+                .clipShape(rect)
+                .overlay(rect.stroke(borderAccentColor, lineWidth: 1.0))
+                .accentColor(progressViewAccentColor)
+        }
+    }
+    
+    var answerOptionLabel: some View {
+        VStack(alignment: .leading, spacing: 12.0) {
+            HStack(alignment: .top, spacing: 8.0) {
+                
+                if !pollClosed {
+                    Image(uiImage: answerOption.selected ? Asset.Images.pollCheckboxSelected.image : Asset.Images.pollCheckboxDefault.image)
+                }
+                
+                Text(answerOption.text)
+                    .font(theme.fonts.body)
+                    .foregroundColor(theme.colors.primaryContent)
+                
+                if pollClosed && answerOption.winner {
+                    Spacer()
+                    Image(uiImage: Asset.Images.pollWinnerIcon.image)
+                }
+            }
+            
+            HStack {
+                ProgressView(value: Double(showResults ? answerOption.count : 0),
+                             total: Double(totalAnswerCount))
+                    .progressViewStyle(LinearProgressViewStyle())
+                    .scaleEffect(x: 1.0, y: 1.2, anchor: .center)
+                    .padding(.vertical, 8.0)
+                
+                if (showResults) {
+                    Text(answerOption.count == 1 ? VectorL10n.pollTimelineOneVote : VectorL10n.pollTimelineVotesCount(Int(answerOption.count)))
+                        .font(theme.fonts.footnote)
+                        .foregroundColor(pollClosed && answerOption.winner ? theme.colors.accent : theme.colors.secondaryContent)
+                }
+            }
+        }
+    }
+    
+    var borderAccentColor: Color {
+        guard !pollClosed else {
+            return (answerOption.winner ? theme.colors.accent : theme.colors.quinaryContent)
+        }
+        
+        return answerOption.selected ? theme.colors.accent : theme.colors.quinaryContent
+    }
+    
+    var progressViewAccentColor: Color {
+        guard !pollClosed else {
+            return (answerOption.winner ? theme.colors.accent : theme.colors.quarterlyContent)
+        }
+        
+        return answerOption.selected ? theme.colors.accent : theme.colors.quarterlyContent
+    }
+}
+
+@available(iOS 14.0, *)
+struct PollTimelineAnswerOptionButton_Previews: PreviewProvider {
+    static let stateRenderer = MockPollTimelineScreenState.stateRenderer
+    static var previews: some View {
+        
+        Group {
+            VStack {
+                PollTimelineAnswerOptionButton(answerOption: TimelineAnswerOption(id: "", text: "Test", count: 5, winner: false, selected: false),
+                                               pollClosed: false, showResults: true, totalAnswerCount: 100, action: {})
+                
+                PollTimelineAnswerOptionButton(answerOption: TimelineAnswerOption(id: "", text: "Test", count: 5, winner: false, selected: false),
+                                               pollClosed: false, showResults: false, totalAnswerCount: 100, action: {})
+                
+                PollTimelineAnswerOptionButton(answerOption: TimelineAnswerOption(id: "", text: "Test", count: 8, winner: false, selected: true),
+                                               pollClosed: false, showResults: true, totalAnswerCount: 100, action: {})
+                
+                PollTimelineAnswerOptionButton(answerOption: TimelineAnswerOption(id: "", text: "Test", count: 8, winner: false, selected: true),
+                                               pollClosed: false, showResults: false, totalAnswerCount: 100, action: {})
+                
+                PollTimelineAnswerOptionButton(answerOption: TimelineAnswerOption(id: "",
+                                                                                  text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.",
+                                                                                  count: 200, winner: false, selected: false),
+                                               pollClosed: false, showResults: true, totalAnswerCount: 1000, action: {})
+                
+                PollTimelineAnswerOptionButton(answerOption: TimelineAnswerOption(id: "",
+                                                                                  text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.",
+                                                                                  count: 200, winner: false, selected: false),
+                                               pollClosed: false, showResults: false, totalAnswerCount: 1000, action: {})
+            }
+            
+            VStack {
+                PollTimelineAnswerOptionButton(answerOption: TimelineAnswerOption(id: "", text: "Test", count: 5, winner: false, selected: false),
+                                               pollClosed: true, showResults: true, totalAnswerCount: 100, action: {})
+                
+                PollTimelineAnswerOptionButton(answerOption: TimelineAnswerOption(id: "", text: "Test", count: 5, winner: true, selected: false),
+                                               pollClosed: true, showResults: true, totalAnswerCount: 100, action: {})
+                
+                PollTimelineAnswerOptionButton(answerOption: TimelineAnswerOption(id: "", text: "Test", count: 8, winner: false, selected: true),
+                                               pollClosed: true, showResults: true, totalAnswerCount: 100, action: {})
+                
+                PollTimelineAnswerOptionButton(answerOption: TimelineAnswerOption(id: "", text: "Test", count: 8, winner: true, selected: true),
+                                               pollClosed: true, showResults: true, totalAnswerCount: 100, action: {})
+                
+                PollTimelineAnswerOptionButton(answerOption: TimelineAnswerOption(id: "",
+                                                                                  text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.",
+                                                                                  count: 200, winner: false, selected: false),
+                                               pollClosed: true, showResults: true, totalAnswerCount: 1000, action: {})
+                
+                PollTimelineAnswerOptionButton(answerOption: TimelineAnswerOption(id: "",
+                                                                                  text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.",
+                                                                                  count: 200, winner: true, selected: false),
+                                               pollClosed: true, showResults: true, totalAnswerCount: 1000, action: {})
+            }
+        }
+    }
+}
diff --git a/RiotSwiftUI/Modules/Room/PollTimeline/View/PollTimelineView.swift b/RiotSwiftUI/Modules/Room/PollTimeline/View/PollTimelineView.swift
new file mode 100644
index 000000000..22a94bb68
--- /dev/null
+++ b/RiotSwiftUI/Modules/Room/PollTimeline/View/PollTimelineView.swift
@@ -0,0 +1,116 @@
+// File created from SimpleUserProfileExample
+// $ createScreen.sh Room/PollEditForm PollEditForm
+// 
+// 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 PollTimelineView: View {
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    @Environment(\.theme) private var theme: ThemeSwiftUI
+    
+    // MARK: Public
+    
+    @ObservedObject var viewModel: PollTimelineViewModel.Context
+    
+    var body: some View {
+        let poll = viewModel.viewState.poll
+        
+        VStack(alignment: .leading, spacing: 16.0) {
+            Text(poll.question)
+                .font(theme.fonts.bodySB)
+            
+            VStack(spacing: 24.0) {
+                ForEach(poll.answerOptions) { answerOption in
+                    PollTimelineAnswerOptionButton(answerOption: answerOption,
+                                                   pollClosed: poll.closed,
+                                                   showResults: shouldDiscloseResults,
+                                                   totalAnswerCount: poll.totalAnswerCount) {
+                        viewModel.send(viewAction: .selectAnswerOptionWithIdentifier(answerOption.id))
+                    }
+                }
+                .alert(isPresented: $viewModel.showsClosingFailureAlert) {
+                    Alert(title: Text(VectorL10n.pollTimelineNotClosedTitle),
+                          message: Text(VectorL10n.pollTimelineNotClosedSubtitle),
+                          dismissButton: .default(Text(VectorL10n.pollTimelineNotClosedAction)))
+                }
+            }
+            .disabled(poll.closed)
+            .fixedSize(horizontal: false, vertical: true)
+            
+            Text(totalVotesString)
+                .font(theme.fonts.footnote)
+                .foregroundColor(theme.colors.tertiaryContent)
+                .alert(isPresented: $viewModel.showsAnsweringFailureAlert) {
+                    Alert(title: Text(VectorL10n.pollTimelineVoteNotRegisteredTitle),
+                          message: Text(VectorL10n.pollTimelineVoteNotRegisteredSubtitle),
+                          dismissButton: .default(Text(VectorL10n.pollTimelineVoteNotRegisteredAction)))
+                }
+        }
+        .padding([.horizontal, .top], 2.0)
+        .padding([.bottom])
+    }
+    
+    private var totalVotesString: String {
+        let poll = viewModel.viewState.poll
+        
+        if poll.closed {
+            if poll.totalAnswerCount == 1 {
+                return VectorL10n.pollTimelineTotalFinalResultsOneVote
+            } else {
+                return VectorL10n.pollTimelineTotalFinalResults(Int(poll.totalAnswerCount))
+            }
+        }
+        
+        switch poll.totalAnswerCount {
+        case 0:
+            return VectorL10n.pollTimelineTotalNoVotes
+        case 1:
+            return (poll.hasCurrentUserVoted ?
+                        VectorL10n.pollTimelineTotalOneVote :
+                        VectorL10n.pollTimelineTotalOneVoteNotVoted)
+        default:
+            return (poll.hasCurrentUserVoted ?
+                        VectorL10n.pollTimelineTotalVotes(Int(poll.totalAnswerCount)) :
+                        VectorL10n.pollTimelineTotalVotesNotVoted(Int(poll.totalAnswerCount)))
+        }
+    }
+    
+    private var shouldDiscloseResults: Bool {
+        let poll = viewModel.viewState.poll
+        
+        if poll.closed {
+            return poll.totalAnswerCount > 0
+        } else {
+            return poll.type == .disclosed && poll.totalAnswerCount > 0 && poll.hasCurrentUserVoted
+        }
+    }
+}
+
+// MARK: - Previews
+
+@available(iOS 14.0, *)
+struct PollTimelineView_Previews: PreviewProvider {
+    static let stateRenderer = MockPollTimelineScreenState.stateRenderer
+    static var previews: some View {
+        stateRenderer.screenGroup()
+    }
+}
diff --git a/RiotSwiftUI/Modules/Room/UserSuggestion/Service/UserSuggestionService.swift b/RiotSwiftUI/Modules/Room/UserSuggestion/Service/UserSuggestionService.swift
index 6e4fab347..1491aa579 100644
--- a/RiotSwiftUI/Modules/Room/UserSuggestion/Service/UserSuggestionService.swift
+++ b/RiotSwiftUI/Modules/Room/UserSuggestion/Service/UserSuggestionService.swift
@@ -61,14 +61,20 @@ class UserSuggestionService: UserSuggestionServiceProtocol {
     
     // MARK: - Setup
     
-    init(roomMemberProvider: RoomMembersProviderProtocol) {
+    init(roomMemberProvider: RoomMembersProviderProtocol, shouldDebounce: Bool = true) {
         self.roomMemberProvider = roomMemberProvider
         
-        currentTextTriggerSubject
-            .debounce(for: 0.5, scheduler: RunLoop.main)
-            .removeDuplicates()
-            .sink { [weak self] in self?.fetchAndFilterMembersForTextTrigger($0) }
-            .store(in: &cancellables)
+        if (shouldDebounce) {
+            currentTextTriggerSubject
+                .debounce(for: 0.5, scheduler: RunLoop.main)
+                .removeDuplicates()
+                .sink { [weak self] in self?.fetchAndFilterMembersForTextTrigger($0) }
+                .store(in: &cancellables)
+        } else {
+            currentTextTriggerSubject
+                .sink { [weak self] in self?.fetchAndFilterMembersForTextTrigger($0) }
+                .store(in: &cancellables)
+        }
     }
     
     // MARK: - UserSuggestionServiceProtocol
diff --git a/RiotSwiftUI/Modules/Room/UserSuggestion/Test/Unit/UserSuggestionServiceTests.swift b/RiotSwiftUI/Modules/Room/UserSuggestion/Test/Unit/UserSuggestionServiceTests.swift
index 1c34f7eb3..fce852059 100644
--- a/RiotSwiftUI/Modules/Room/UserSuggestion/Test/Unit/UserSuggestionServiceTests.swift
+++ b/RiotSwiftUI/Modules/Room/UserSuggestion/Test/Unit/UserSuggestionServiceTests.swift
@@ -27,7 +27,7 @@ class UserSuggestionServiceTests: XCTestCase {
     var service: UserSuggestionService?
     
     override func setUp() {
-        service = UserSuggestionService(roomMembersProvider: self)
+        service = UserSuggestionService(roomMemberProvider: self, shouldDebounce: false)
     }
     
     func testAlice() {
@@ -116,7 +116,7 @@ extension UserSuggestionServiceTests: RoomMembersProviderProtocol {
                      ("Bob", "@bob:matrix.org")]
         
         members(users.map({ user in
-            RoomMembersProviderMember(identifier: user.1, displayName: user.0, avatarURL: "")
+            RoomMembersProviderMember(userId: user.1, displayName: user.0, avatarUrl: "")
         }))
     }
 }
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Coordinator/TemplateUserProfileCoordinator.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Coordinator/TemplateUserProfileCoordinator.swift
index 02874dee9..3eb01bbdd 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Coordinator/TemplateUserProfileCoordinator.swift
+++ b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Coordinator/TemplateUserProfileCoordinator.swift
@@ -1,23 +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.
- */
+//
+// 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
 
+struct TemplateUserProfileCoordinatorParameters {
+    let session: MXSession
+}
+
 final class TemplateUserProfileCoordinator: Coordinator {
     
     // MARK: - Properties
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Service/Mock/MockTemplateUserProfileScreenState.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/MockTemplateUserProfileScreenState.swift
similarity index 100%
rename from RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Service/Mock/MockTemplateUserProfileScreenState.swift
rename to RiotSwiftUI/Modules/Template/SimpleUserProfileExample/MockTemplateUserProfileScreenState.swift
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileStateAction.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileStateAction.swift
deleted file mode 100644
index f0695826b..000000000
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileStateAction.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-// 
-// 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 TemplateUserProfileStateAction {
-    case viewAction(TemplateUserProfileViewAction)
-    case updatePresence(TemplateUserProfilePresence)
-}
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileViewState.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileViewState.swift
deleted file mode 100644
index 7f78fc8d5..000000000
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileViewState.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-// 
-// 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 TemplateUserProfileViewState: BindableState {
-    let avatar: AvatarInputProtocol?
-    let displayName: String?
-    var presence: TemplateUserProfilePresence
-    var count: Int
-}
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfilePresence.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/TemplateUserProfileModels.swift
similarity index 60%
rename from RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfilePresence.swift
rename to RiotSwiftUI/Modules/Template/SimpleUserProfileExample/TemplateUserProfileModels.swift
index c2d61aaea..62e4c895c 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfilePresence.swift
+++ b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/TemplateUserProfileModels.swift
@@ -16,13 +16,17 @@
 
 import Foundation
 
+// MARK: - Coordinator
+
 enum TemplateUserProfilePresence {
     case online
     case idle
     case offline
 }
 
-extension TemplateUserProfilePresence {
+extension TemplateUserProfilePresence: Identifiable, CaseIterable {
+    var id: Self { self }
+    
     var title: String {
         switch self {
         case .online:
@@ -35,8 +39,30 @@ extension TemplateUserProfilePresence {
     }
 }
 
-extension TemplateUserProfilePresence: CaseIterable { }
+// MARK: View model
 
-extension TemplateUserProfilePresence: Identifiable {
-    var id: Self { self }
+enum TemplateUserProfileStateAction {
+    case viewAction(TemplateUserProfileViewAction)
+    case updatePresence(TemplateUserProfilePresence)
+}
+
+enum TemplateUserProfileViewModelResult {
+    case cancel
+    case done
+}
+
+// MARK: View
+
+struct TemplateUserProfileViewState: BindableState {
+    let avatar: AvatarInputProtocol?
+    let displayName: String?
+    var presence: TemplateUserProfilePresence
+    var count: Int
+}
+
+enum TemplateUserProfileViewAction {
+    case incrementCount
+    case decrementCount
+    case cancel
+    case done
 }
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModel.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/TemplateUserProfileViewModel.swift
similarity index 99%
rename from RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModel.swift
rename to RiotSwiftUI/Modules/Template/SimpleUserProfileExample/TemplateUserProfileViewModel.swift
index 604665f3c..e476b467e 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModel.swift
+++ b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/TemplateUserProfileViewModel.swift
@@ -17,8 +17,6 @@
 import SwiftUI
 import Combine
 
-
-
 @available(iOS 14, *)
 typealias TemplateUserProfileViewModelType = StateStoreViewModel<TemplateUserProfileViewState,
                                                                  TemplateUserProfileStateAction,
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModelProtocol.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/TemplateUserProfileViewModelProtocol.swift
similarity index 100%
rename from RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModelProtocol.swift
rename to RiotSwiftUI/Modules/Template/SimpleUserProfileExample/TemplateUserProfileViewModelProtocol.swift
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinator.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinator.swift
index 33f27e14a..a4a75ef88 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinator.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinator.swift
@@ -1,23 +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.
- */
+//
+// 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
 
+struct TemplateRoomChatCoordinatorParameters {
+    let room: MXRoom
+}
+
 final class TemplateRoomChatCoordinator: Coordinator, Presentable {
     
     // MARK: - Properties
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatScreenState.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/MockTemplateRoomChatScreenState.swift
similarity index 99%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatScreenState.swift
rename to RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/MockTemplateRoomChatScreenState.swift
index 3a3fad18d..925c5c614 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatScreenState.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/MockTemplateRoomChatScreenState.swift
@@ -17,7 +17,6 @@
 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, *)
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubble.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubble.swift
deleted file mode 100644
index ed9b4b5f1..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubble.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-// 
-// 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, Equatable { }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageContent.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageContent.swift
deleted file mode 100644
index c7e54a7d0..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageContent.swift
+++ /dev/null
@@ -1,25 +0,0 @@
-// 
-// 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)
-}
-
-extension TemplateRoomChatMessageContent: Equatable { }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatRoomInitializationStatus.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatRoomInitializationStatus.swift
deleted file mode 100644
index 6469eefe1..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatRoomInitializationStatus.swift
+++ /dev/null
@@ -1,23 +0,0 @@
-// 
-// 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
deleted file mode 100644
index 7c0b510c5..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatStateAction.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-// 
-// 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 to be performed on the `ViewModel` State
-enum TemplateRoomChatStateAction {
-    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
deleted file mode 100644
index 76f0abfea..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewAction.swift
+++ /dev/null
@@ -1,23 +0,0 @@
-// 
-// 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 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
deleted file mode 100644
index 603480035..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelAction.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-// 
-// 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/TemplateRoomChatViewModelBindings.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelBindings.swift
deleted file mode 100644
index 9137b6ca0..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelBindings.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-// 
-// 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
-
-/// State bound directly to SwiftUI elements.
-struct TemplateRoomChatViewModelBindings {
-    var messageInput: String
-}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/TemplateRoomChatModels.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/TemplateRoomChatModels.swift
new file mode 100644
index 000000000..de30950e2
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/TemplateRoomChatModels.swift
@@ -0,0 +1,122 @@
+// 
+// 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
+
+// MARK: - Coordinator
+
+/// An image sent as a message.
+struct TemplateRoomChatMessageImageContent: Equatable {
+    var image: UIImage
+}
+
+/// The text content of a message sent by a user.
+struct TemplateRoomChatMessageTextContent: Equatable {
+    var body: String
+}
+
+/// The type of message a long with it's content.
+enum TemplateRoomChatMessageContent: Equatable {
+    case text(TemplateRoomChatMessageTextContent)
+    case image(TemplateRoomChatMessageImageContent)
+}
+
+enum TemplateRoomChatBubbleItemContent: Equatable {
+    case message(TemplateRoomChatMessageContent)
+}
+
+/// 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: Identifiable, Equatable {
+    let id: String
+    var timestamp: Date
+    var content: TemplateRoomChatBubbleItemContent
+}
+
+/// A user who is a member of the room.
+struct TemplateRoomChatMember: Identifiable, Equatable, Avatarable {
+    let id: String
+    let avatarUrl: String?
+    let displayName: String?
+    
+    var mxContentUri: String? {
+        avatarUrl
+    }
+    
+    var matrixItemId: String {
+        id
+    }
+}
+
+/// Represents a grouped bubble in the View(For example multiple message of different time sent close together).
+struct TemplateRoomChatBubble: Identifiable, Equatable {
+    let id: String
+    let sender: TemplateRoomChatMember
+    var items: [TemplateRoomChatBubbleItem]
+}
+
+/// A chat message send to the timeline within a room.
+struct TemplateRoomChatMessage: Identifiable {
+    let id: String
+    let content: TemplateRoomChatMessageContent
+    let sender: TemplateRoomChatMember
+    let timestamp: Date
+}
+
+// MARK: - View model
+
+enum TemplateRoomChatRoomInitializationStatus {
+    case notInitialized
+    case initialized
+    case failedToInitialize
+}
+
+/// Actions to be performed on the `ViewModel` State
+enum TemplateRoomChatStateAction {
+    case updateRoomInitializationStatus(TemplateRoomChatRoomInitializationStatus)
+    case updateBubbles([TemplateRoomChatBubble])
+    case clearMessageInput
+}
+
+/// Actions sent by the `ViewModel` to the `Coordinator`
+enum TemplateRoomChatViewModelAction {
+    case done
+}
+
+
+// MARK: - View
+
+/// Actions send from the `View` to the `ViewModel`.
+enum TemplateRoomChatViewAction {
+    case sendMessage
+    case done
+}
+
+/// State managed by the `ViewModel` delivered to the `View`.
+struct TemplateRoomChatViewState: BindableState {
+    var roomInitializationStatus: TemplateRoomChatRoomInitializationStatus
+    let roomName: String?
+    var bubbles: [TemplateRoomChatBubble]
+    var bindings: TemplateRoomChatViewModelBindings
+    
+    var sendButtonEnabled: Bool {
+        !bindings.messageInput.isEmpty
+    }
+}
+
+/// State bound directly to SwiftUI elements.
+struct TemplateRoomChatViewModelBindings {
+    var messageInput: String
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/TemplateRoomChatViewModel.swift
similarity index 100%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
rename to RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/TemplateRoomChatViewModel.swift
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModelProtocol.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/TemplateRoomChatViewModelProtocol.swift
similarity index 100%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModelProtocol.swift
rename to RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/TemplateRoomChatViewModelProtocol.swift
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinator.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinator.swift
index 99636eb73..6c7cfd36f 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinator.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinator.swift
@@ -1,23 +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.
- */
+//
+// 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
 
+struct TemplateRoomListCoordinatorParameters {
+    let session: MXSession
+}
+
 final class TemplateRoomListCoordinator: Coordinator, Presentable {
     
     // MARK: - Properties
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinatorParamaters.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinatorParamaters.swift
deleted file mode 100644
index 986bca4f6..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinatorParamaters.swift
+++ /dev/null
@@ -1,21 +0,0 @@
-// 
-// 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/Service/Mock/MockTemplateRoomListScreenState.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/MockTemplateRoomListScreenState.swift
similarity index 100%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/Mock/MockTemplateRoomListScreenState.swift
rename to RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/MockTemplateRoomListScreenState.swift
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListCoordinatorAction.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListCoordinatorAction.swift
deleted file mode 100644
index 9228e33a9..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListCoordinatorAction.swift
+++ /dev/null
@@ -1,23 +0,0 @@
-// 
-// 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 returned by the coordinator callback
-enum TemplateRoomListCoordinatorAction {
-    case didSelectRoom(String)
-    case done
-}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListRoom.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListRoom.swift
deleted file mode 100644
index 9db425230..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListRoom.swift
+++ /dev/null
@@ -1,25 +0,0 @@
-// 
-// 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: AvatarInput
-    let displayName: String?
-}
-
-extension TemplateRoomListRoom: Identifiable, Equatable {}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListStateAction.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListStateAction.swift
deleted file mode 100644
index 95a3e19f0..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListStateAction.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-// 
-// 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 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
deleted file mode 100644
index baae86649..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewAction.swift
+++ /dev/null
@@ -1,23 +0,0 @@
-// 
-// 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 send from the `View` to the `ViewModel`.
-enum TemplateRoomListViewAction {
-    case done
-    case didSelectRoom(String)
-}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewModelAction.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewModelAction.swift
deleted file mode 100644
index f21fdfa32..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewModelAction.swift
+++ /dev/null
@@ -1,23 +0,0 @@
-// 
-// 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 TemplateRoomListViewModelAction {
-    case didSelectRoom(String)
-    case done
-}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewState.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/TemplateRoomListModels.swift
similarity index 50%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewState.swift
rename to RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/TemplateRoomListModels.swift
index 9c5728786..6adb43c0c 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewState.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/TemplateRoomListModels.swift
@@ -16,7 +16,42 @@
 
 import Foundation
 
+// MARK: - Coordinator
+
+struct TemplateRoomListRoom: Identifiable, Equatable {
+    let id: String
+    let avatar: AvatarInput
+    let displayName: String?
+}
+
+/// Actions returned by the coordinator callback
+enum TemplateRoomListCoordinatorAction {
+    case didSelectRoom(String)
+    case done
+}
+
+// MARK: - View model
+
+/// Actions to be performed on the `ViewModel` State
+enum TemplateRoomListStateAction {
+    case updateRooms([TemplateRoomListRoom])
+}
+
+/// Actions sent by the`ViewModel` to the `Coordinator`.
+enum TemplateRoomListViewModelAction {
+    case didSelectRoom(String)
+    case done
+}
+
+// MARK: - View
+
 /// State managed by the `ViewModel` delivered to the `View`.
 struct TemplateRoomListViewState: BindableState {
     var rooms: [TemplateRoomListRoom]
 }
+
+/// Actions send from the `View` to the `ViewModel`.
+enum TemplateRoomListViewAction {
+    case done
+    case didSelectRoom(String)
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/TemplateRoomListViewModel.swift
similarity index 100%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift
rename to RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/TemplateRoomListViewModel.swift
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModelProtocol.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/TemplateRoomListViewModelProtocol.swift
similarity index 100%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModelProtocol.swift
rename to RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/TemplateRoomListViewModelProtocol.swift
diff --git a/RiotSwiftUI/Release.xcconfig b/RiotSwiftUI/Release.xcconfig
index 11a7288a4..561518704 100644
--- a/RiotSwiftUI/Release.xcconfig
+++ b/RiotSwiftUI/Release.xcconfig
@@ -18,3 +18,4 @@
 // https://help.apple.com/xcode/#/dev745c5c974
 
 #include "Common.xcconfig"
+#include "Pods/Target Support Files/Pods-RiotPods-RiotSwiftUI/Pods-RiotPods-RiotSwiftUI.release.xcconfig"
diff --git a/RiotSwiftUI/RiotSwiftUIApp.swift b/RiotSwiftUI/RiotSwiftUIApp.swift
index 63dbece0d..902f7327d 100644
--- a/RiotSwiftUI/RiotSwiftUIApp.swift
+++ b/RiotSwiftUI/RiotSwiftUIApp.swift
@@ -21,6 +21,14 @@ import SwiftUI
 struct RiotSwiftUIApp: App {
     init() {
         UILog.configure(logger: PrintLogger.self)
+        
+        switch UITraitCollection.current.userInterfaceStyle {
+        case .dark:
+            ThemePublisher.configure(themeId: .dark)
+        default:
+            ThemePublisher.configure(themeId: .light)
+        }
+        
     }
     var body: some Scene {
         WindowGroup {
diff --git a/RiotTests/AnalyticsTests.swift b/RiotTests/AnalyticsTests.swift
new file mode 100644
index 000000000..5e15bf523
--- /dev/null
+++ b/RiotTests/AnalyticsTests.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 XCTest
+@testable import Riot
+
+class AnalyticsTests: XCTestCase {
+    func testAnalyticsPromptNewUser() {
+        // Given a fresh install of the app (with neither PostHog nor Matomo analytics having been set).
+        RiotSettings.defaults.removeObject(forKey: RiotSettings.UserDefaultsKeys.enableAnalytics)
+        RiotSettings.defaults.removeObject(forKey: RiotSettings.UserDefaultsKeys.matomoAnalytics)
+        
+        // When the user is prompted for analytics.
+        let showPrompt = Analytics.shared.shouldShowAnalyticsPrompt
+        let displayUpgradeMessage = Analytics.shared.promptShouldDisplayUpgradeMessage
+        
+        // Then the regular prompt should be shown.
+        XCTAssertTrue(showPrompt, "A prompt should be shown for a new user.")
+        XCTAssertFalse(displayUpgradeMessage, "The prompt should not ask about upgrading from Matomo.")
+    }
+    
+    func testAnalyticsPromptUpgradeFromMatomo() {
+        // Given an existing install of the app where the user previously accepted Matomo analytics
+        RiotSettings.defaults.removeObject(forKey: RiotSettings.UserDefaultsKeys.enableAnalytics)
+        RiotSettings.defaults.set(true, forKey: RiotSettings.UserDefaultsKeys.matomoAnalytics)
+        
+        // When the user is prompted for analytics
+        let showPrompt = Analytics.shared.shouldShowAnalyticsPrompt
+        let displayUpgradeMessage = Analytics.shared.promptShouldDisplayUpgradeMessage
+        
+        // Then an upgrade prompt should be shown.
+        XCTAssertTrue(showPrompt, "A prompt should be shown to the user.")
+        XCTAssertTrue(displayUpgradeMessage, "The prompt should ask about upgrading from Matomo.")
+    }
+    
+    func testAnalyticsPromptUserDeclinedMatomo() {
+        // Given an existing install of the app where the user previously declined Matomo analytics
+        RiotSettings.defaults.removeObject(forKey: RiotSettings.UserDefaultsKeys.enableAnalytics)
+        RiotSettings.defaults.set(false, forKey: RiotSettings.UserDefaultsKeys.matomoAnalytics)
+        
+        // When the user is prompted for analytics
+        let showPrompt = Analytics.shared.shouldShowAnalyticsPrompt
+        let displayUpgradeMessage = Analytics.shared.promptShouldDisplayUpgradeMessage
+        
+        // Then the regular prompt should be shown.
+        XCTAssertTrue(showPrompt, "A prompt should be shown to the user.")
+        XCTAssertFalse(displayUpgradeMessage, "The prompt should not ask about upgrading from Matomo.")
+    }
+    
+    func testAnalyticsPromptUserAcceptedPostHog() {
+        // Given an existing install of the app where the user previously accepted PostHog
+        RiotSettings.defaults.set(true, forKey: RiotSettings.UserDefaultsKeys.enableAnalytics)
+        
+        // When the user is prompted for analytics
+        let showPrompt = Analytics.shared.shouldShowAnalyticsPrompt
+        
+        // Then no prompt should be shown.
+        XCTAssertFalse(showPrompt, "A prompt should not be shown any more.")
+    }
+}
diff --git a/RiotTests/Debug.xcconfig b/RiotTests/Debug.xcconfig
index be053c75b..6db535791 100644
--- a/RiotTests/Debug.xcconfig
+++ b/RiotTests/Debug.xcconfig
@@ -18,3 +18,5 @@
 // https://help.apple.com/xcode/#/dev745c5c974
 
 #include "Pods/Target Support Files/Pods-RiotTests/Pods-RiotTests.debug.xcconfig"
+
+SWIFT_OBJC_INTERFACE_HEADER_NAME = GeneratedInterface-Swift.h
diff --git a/RiotTests/MatrixKitTests/Assets/test.png b/RiotTests/MatrixKitTests/Assets/test.png
new file mode 100644
index 000000000..886158d3a
Binary files /dev/null and b/RiotTests/MatrixKitTests/Assets/test.png differ
diff --git a/RiotTests/MatrixKitTests/EncryptedAttachmentsTest.m b/RiotTests/MatrixKitTests/EncryptedAttachmentsTest.m
new file mode 100644
index 000000000..411257fb9
--- /dev/null
+++ b/RiotTests/MatrixKitTests/EncryptedAttachmentsTest.m
@@ -0,0 +1,114 @@
+/*
+ Copyright 2016 OpenMarket 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/XCTest.h>
+
+#import "MXEncryptedAttachments.h"
+#import "MXEncryptedContentFile.h"
+#import "MXBase64Tools.h"
+
+@interface EncryptedAttachmentsTest : XCTestCase
+
+@end
+
+
+@implementation EncryptedAttachmentsTest
+
+- (void)setUp {
+    [super setUp];
+}
+
+- (void)tearDown {
+    [super tearDown];
+}
+
+- (void)testDecrypt {
+    NSArray *testVectors =
+        @[
+             @[@"", @{
+                 @"v": @"v1",
+                 @"hashes": @{
+                     @"sha256": @"47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU"
+                 },
+                 @"key": @{
+                     @"alg": @"A256CTR",
+                     @"k": @"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                     @"key_ops": @[@"encrypt", @"decrypt"],
+                     @"kty": @"oct"
+                 },
+                 @"iv": @"AAAAAAAAAAAAAAAAAAAAAA"
+             }, @""],
+             @[@"5xJZTt5cQicm+9f4", @{
+                 @"v": @"v1",
+                 @"hashes": @{
+                     @"sha256": @"YzF08lARDdOCzJpzuSwsjTNlQc4pHxpdHcXiD/wpK6k"
+                 }, @"key": @{
+                     @"alg": @"A256CTR",
+                     @"k": @"__________________________________________8",
+                     @"key_ops": @[@"encrypt", @"decrypt"],
+                     @"kty": @"oct"
+                 }, @"iv": @"//////////8AAAAAAAAAAA"
+             }, @"SGVsbG8sIFdvcmxk"],
+             @[@"zhtFStAeFx0s+9L/sSQO+WQMtldqYEHqTxMduJrCIpnkyer09kxJJuA4K+adQE4w+7jZe/vR9kIcqj9rOhDR8Q", @{
+                @"v": @"v2",
+                @"hashes": @{
+                        @"sha256": @"IOq7/dHHB+mfHfxlRY5XMeCWEwTPmlf4cJcgrkf6fVU"
+                        },
+                @"key": @{
+                        @"kty": @"oct",
+                        @"key_ops": @[@"encrypt",@"decrypt"],
+                        @"k": @"__________________________________________8",
+                        @"alg": @"A256CTR"
+                        },
+                @"iv": @"//////////8AAAAAAAAAAA"
+                }, @"YWxwaGFudW1lcmljYWxseWFscGhhbnVtZXJpY2FsbHlhbHBoYW51bWVyaWNhbGx5YWxwaGFudW1lcmljYWxseQ"],
+             @[@"tJVNBVJ/vl36UQt4Y5e5m84bRUrQHhcdLPvS/7EkDvlkDLZXamBB6k8THbiawiKZ5Mnq9PZMSSbgOCvmnUBOMA", @{
+                   @"v": @"v1",
+                   @"hashes": @{
+                           @"sha256": @"LYG/orOViuFwovJpv2YMLSsmVKwLt7pY3f8SYM7KU5E"
+                   },
+                   @"key": @{
+                           @"kty": @"oct",
+                           @"key_ops": @[@"encrypt",@"decrypt"],
+                           @"k": @"__________________________________________8",
+                           @"alg": @"A256CTR"
+                   },
+                   @"iv": @"/////////////////////w"
+             }, @"YWxwaGFudW1lcmljYWxseWFscGhhbnVtZXJpY2FsbHlhbHBoYW51bWVyaWNhbGx5YWxwaGFudW1lcmljYWxseQ"]
+        ];
+    
+    for (NSArray *vector in testVectors) {
+        NSString *inputCiphertext = vector[0];
+        MXEncryptedContentFile *inputInfo = [MXEncryptedContentFile modelFromJSON:vector[1]];
+        NSString *want = vector[2];
+        
+        NSData *ctData = [[NSData alloc] initWithBase64EncodedString:[MXBase64Tools padBase64:inputCiphertext] options:0];
+        NSInputStream *inputStream = [NSInputStream inputStreamWithData:ctData];
+        NSOutputStream *outputStream = [NSOutputStream outputStreamToMemory];
+        
+        [MXEncryptedAttachments decryptAttachment:inputInfo inputStream:inputStream outputStream:outputStream success:^{
+            NSData *gotData = [outputStream propertyForKey:NSStreamDataWrittenToMemoryStreamKey];
+            
+            NSData *wantData = [[NSData alloc] initWithBase64EncodedString:[MXBase64Tools padBase64:want] options:0];
+            
+            XCTAssertEqualObjects(wantData, gotData, "Decrypted data did not match expectation.");
+        } failure:^(NSError *error) {
+            XCTFail();
+        }];
+    }
+}
+
+@end
diff --git a/RiotTests/MatrixKitTests/MXKEventFormatter+Tests.h b/RiotTests/MatrixKitTests/MXKEventFormatter+Tests.h
new file mode 100644
index 000000000..8aa5a9c1e
--- /dev/null
+++ b/RiotTests/MatrixKitTests/MXKEventFormatter+Tests.h
@@ -0,0 +1,24 @@
+/*
+ Copyright 2021 The Matrix.org Foundation C.I.C
+
+ 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 "MXKEventFormatter.h"
+
+@interface MXKEventFormatter (Tests)
+
+- (NSString*)userDisplayNameFromContentInEvent:(MXEvent*)event withMembershipFilter:(NSString *)filter;
+- (NSString*)userAvatarUrlFromContentInEvent:(MXEvent*)event withMembershipFilter:(NSString *)filter;
+
+@end
diff --git a/RiotTests/MatrixKitTests/MXKEventFormatterTests.m b/RiotTests/MatrixKitTests/MXKEventFormatterTests.m
new file mode 100644
index 000000000..fb3e28af7
--- /dev/null
+++ b/RiotTests/MatrixKitTests/MXKEventFormatterTests.m
@@ -0,0 +1,435 @@
+/*
+ Copyright 2016 OpenMarket 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/XCTest.h>
+
+#import "MatrixKit.h"
+#import "MXKEventFormatter+Tests.h"
+
+@import DTCoreText;
+
+@interface MXEventFormatterTests : XCTestCase
+{
+    MXKEventFormatter *eventFormatter;
+    MXEvent *anEvent;
+    CGFloat maxHeaderSize;
+}
+
+@end
+
+@implementation MXEventFormatterTests
+
+- (void)setUp
+{
+    [super setUp];
+
+    // Create a minimal event formatter
+    // Note: it may not be enough for testing all MXKEventFormatter methods
+    eventFormatter = [[MXKEventFormatter alloc] initWithMatrixSession:nil];
+
+    eventFormatter.treatMatrixUserIdAsLink = YES;
+    eventFormatter.treatMatrixRoomIdAsLink = YES;
+    eventFormatter.treatMatrixRoomAliasAsLink = YES;
+    eventFormatter.treatMatrixEventIdAsLink = YES;
+    
+    anEvent = [[MXEvent alloc] init];
+    anEvent.roomId = @"aRoomId";
+    anEvent.eventId = @"anEventId";
+    anEvent.wireType = kMXEventTypeStringRoomMessage;
+    anEvent.originServerTs = (uint64_t) ([[NSDate date] timeIntervalSince1970] * 1000);
+    anEvent.wireContent = @{
+                            @"msgtype": kMXMessageTypeText,
+                            @"body": @"deded",
+                            };
+    
+    maxHeaderSize = ceil(eventFormatter.defaultTextFont.pointSize * 1.2);
+}
+
+- (void)tearDown
+{
+    [super tearDown];
+}
+
+- (void)testRenderHTMLStringWithHeaders
+{
+    // Given HTML strings with h1/h2/h3 tags
+    NSString *h1HTML = @"<h1>Large Heading</h1>";
+    NSString *h2HTML = @"<h2>Smaller Heading</h2>";
+    NSString *h3HTML = @"<h3>Acceptable Heading</h3>";
+    
+    // When rendering these strings as attributed strings
+    NSAttributedString *h1AttributedString = [eventFormatter renderHTMLString:h1HTML forEvent:anEvent withRoomState:nil];
+    NSAttributedString *h2AttributedString = [eventFormatter renderHTMLString:h2HTML forEvent:anEvent withRoomState:nil];
+    NSAttributedString *h3AttributedString = [eventFormatter renderHTMLString:h3HTML forEvent:anEvent withRoomState:nil];
+    
+    // Then the h1/h2 fonts should be reduced in size to match h3.
+    XCTAssertEqualObjects(h1AttributedString.string, @"Large Heading", @"The text from an H1 tag should be preserved when removing formatting.");
+    XCTAssertEqualObjects(h2AttributedString.string, @"Smaller Heading", @"The text from an H2 tag should be preserved when removing formatting.");
+    XCTAssertEqualObjects(h3AttributedString.string, @"Acceptable Heading", @"The text from an H3 tag should not change.");
+    
+    [h1AttributedString enumerateAttributesInRange:NSMakeRange(0, h1AttributedString.length)
+                                         options:0
+                                      usingBlock:^(NSDictionary<NSAttributedStringKey,id> * _Nonnull attributes, NSRange range, BOOL * _Nonnull stop) {
+        UIFont *font = attributes[NSFontAttributeName];
+        XCTAssertGreaterThan(font.pointSize, eventFormatter.defaultTextFont.pointSize, @"H1 tags should be larger than the default body size.");
+        XCTAssertLessThanOrEqual(font.pointSize, maxHeaderSize, @"H1 tags shouldn't exceed the max header size.");
+    }];
+    
+    [h2AttributedString enumerateAttributesInRange:NSMakeRange(0, h2AttributedString.length)
+                                         options:0
+                                      usingBlock:^(NSDictionary<NSAttributedStringKey,id> * _Nonnull attributes, NSRange range, BOOL * _Nonnull stop) {
+        UIFont *font = attributes[NSFontAttributeName];
+        XCTAssertGreaterThan(font.pointSize, eventFormatter.defaultTextFont.pointSize, @"H2 tags should be larger than the default body size.");
+        XCTAssertLessThanOrEqual(font.pointSize, maxHeaderSize, @"H2 tags shouldn't exceed the max header size.");
+    }];
+    
+    [h3AttributedString enumerateAttributesInRange:NSMakeRange(0, h3AttributedString.length)
+                                         options:0
+                                      usingBlock:^(NSDictionary<NSAttributedStringKey,id> * _Nonnull attributes, NSRange range, BOOL * _Nonnull stop) {
+        UIFont *font = attributes[NSFontAttributeName];
+        XCTAssertGreaterThan(font.pointSize, eventFormatter.defaultTextFont.pointSize, @"H3 tags should be included and be larger than the default body size.");
+        XCTAssertLessThanOrEqual(font.pointSize, maxHeaderSize, @"H3 tags shouldn't exceed the max header size.");
+    }];
+}
+
+- (void)testRenderHTMLStringWithPreCode
+{
+    NSString *html = @"<pre><code>1\n2\n3\n4\n</code></pre>";
+    NSAttributedString *as = [eventFormatter renderHTMLString:html forEvent:anEvent withRoomState:nil];
+
+    NSString *a = as.string;
+
+    // \R : any newlines
+    NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:@"\\R" options:0 error:0];
+    XCTAssertEqual(3, [regex numberOfMatchesInString:a options:0 range:NSMakeRange(0, a.length)], "renderHTMLString must keep line break in <pre> and <code> blocks");
+
+    [as enumerateAttributesInRange:NSMakeRange(0, as.length) options:(0) usingBlock:^(NSDictionary<NSString *,id> * _Nonnull attrs, NSRange range, BOOL * _Nonnull stop) {
+
+        UIFont *font = attrs[NSFontAttributeName];
+        XCTAssertEqualObjects(font.fontName, @"Menlo-Regular", "The font for <pre> and <code> should be monospace");
+    }];
+}
+
+- (void)testRenderHTMLStringWithLink
+{
+    // Given an HTML string with a link inside of it.
+    NSString *html = @"This text contains a <a href=\"https://www.matrix.org/\">link</a>.";
+    
+    // When rendering this string as an attributed string.
+    NSAttributedString *attributedString = [eventFormatter renderHTMLString:html forEvent:anEvent withRoomState:nil];
+    
+    // Then the attributed string should contain all of the text,
+    XCTAssertEqualObjects(attributedString.string, @"This text contains a link.", @"The text should be preserved when adding a link.");
+    
+    // and the link should be added as an attachment.
+    __block BOOL didFindLink = NO;
+    [attributedString enumerateAttribute:NSLinkAttributeName
+                                 inRange:NSMakeRange(0, attributedString.length)
+                                 options:0
+                              usingBlock:^(id _Nullable value, NSRange range, BOOL * _Nonnull stop) {
+        if ([value isKindOfClass:NSURL.class])
+        {
+            NSURL *url = (NSURL *)value;
+            XCTAssertEqualObjects(url, [NSURL URLWithString:@"https://www.matrix.org/"], @"href links should be included in the text.");
+            didFindLink = YES;
+        }
+    }];
+    
+    XCTAssertTrue(didFindLink, @"There should be a link in the attributed string.");
+}
+
+- (void)testRenderHTMLStringWithLinkInHeader
+{
+    // Given HTML strings with links contained within h1/h2 tags.
+    NSString *h1HTML = @"<h1><a href=\"https://www.matrix.org/\">Matrix.org</a></h1>";
+    NSString *h3HTML = @"<h3><a href=\"https://www.matrix.org/\">Matrix.org</a></h3>";
+    
+    // When rendering these strings as attributed strings.
+    NSAttributedString *h1AttributedString = [eventFormatter renderHTMLString:h1HTML forEvent:anEvent withRoomState:nil];
+    NSAttributedString *h3AttributedString = [eventFormatter renderHTMLString:h3HTML forEvent:anEvent withRoomState:nil];
+    
+    // Then the attributed string should contain all of the text,
+    XCTAssertEqualObjects(h1AttributedString.string, @"Matrix.org", @"The text from an H1 tag should be preserved when removing formatting.");
+    XCTAssertEqualObjects(h3AttributedString.string, @"Matrix.org", @"The text from an H3 tag should not change.");
+    
+    // and be formatted as a header with the link added as an attachment.
+    __block BOOL didFindH1Link = NO;
+    [h1AttributedString enumerateAttributesInRange:NSMakeRange(0, h1AttributedString.length)
+                                         options:0
+                                      usingBlock:^(NSDictionary<NSAttributedStringKey,id> * _Nonnull attributes, NSRange range, BOOL * _Nonnull stop) {
+        UIFont *font = attributes[NSFontAttributeName];
+        NSURL *url = attributes[NSLinkAttributeName];
+        
+        if (font)
+        {
+            XCTAssertGreaterThan(font.pointSize, eventFormatter.defaultTextFont.pointSize, @"H1 tags should be larger than the default body size.");
+            XCTAssertLessThanOrEqual(font.pointSize, maxHeaderSize, @"H1 tags shouldn't exceed the max header size.");
+        }
+        
+        if (url)
+        {
+            XCTAssertEqualObjects(url, [NSURL URLWithString:@"https://www.matrix.org/"], @"href links should be included in the text.");
+            didFindH1Link = YES;
+        }
+    }];
+    
+    __block BOOL didFindH3Link = NO;
+    [h3AttributedString enumerateAttributesInRange:NSMakeRange(0, h3AttributedString.length)
+                                         options:0
+                                      usingBlock:^(NSDictionary<NSAttributedStringKey,id> * _Nonnull attributes, NSRange range, BOOL * _Nonnull stop) {
+        UIFont *font = attributes[NSFontAttributeName];
+        NSURL *url = attributes[NSLinkAttributeName];
+        
+        if (font)
+        {
+            XCTAssertGreaterThan(font.pointSize, eventFormatter.defaultTextFont.pointSize, @"H3 tags should be included and be larger than the default.");
+        }
+        
+        if (url)
+        {
+            XCTAssertEqualObjects(url, [NSURL URLWithString:@"https://www.matrix.org/"], @"href links should be included in the text.");
+            didFindH3Link = YES;
+        }
+    }];
+    
+    XCTAssertTrue(didFindH1Link, @"There should be a link in the sanitised attributed string.");
+    XCTAssertTrue(didFindH3Link, @"There should be a link in the attributed string.");
+}
+
+- (void)testRenderHTMLStringWithIFrame
+{
+    // Given an HTML string containing an unsupported iframe.
+    NSString *html = @"<iframe src=\"https://www.matrix.org/\"></iframe>";
+    
+    // When rendering this string as an attributed string.
+    NSAttributedString *attributedString = [eventFormatter renderHTMLString:html forEvent:anEvent withRoomState:nil];
+    
+    // Then the attributed string should have the iframe stripped and not include any attachments.
+    BOOL hasAttachment = [attributedString containsAttachmentsInRange:NSMakeRange(0, attributedString.length)];
+    XCTAssertFalse(hasAttachment, @"iFrame attachments should be removed as they're not included in the allowedHTMLTags array.");
+}
+
+- (void)testRenderHTMLStringWithMXReply
+{
+    // Given an HTML string representing a matrix reply.
+    NSString *html = @"<mx-reply><blockquote><a href=\"https://matrix.to/#/someroom/someevent\">In reply to</a> <a href=\"https://matrix.to/#/@alice:matrix.org\">@alice:matrix.org</a><br>Original message.</blockquote></mx-reply>This is a reply.";
+    
+    // When rendering this string as an attributed string.
+    NSAttributedString *attributedString = [eventFormatter renderHTMLString:html forEvent:anEvent withRoomState:nil];
+    
+    // Then the attributed string should contain all of the text,
+    NSString *plainString = [attributedString.string stringByReplacingOccurrencesOfString:@"\U00002028" withString:@"\n"];
+    XCTAssertEqualObjects(plainString, @"In reply to @alice:matrix.org\nOriginal message.\nThis is a reply.",
+                          @"The reply string should include who the original message was from, what they said, and the reply itself.");
+    
+    // and format the author and original message inside of a quotation block.
+    __block BOOL didTestReplyText = NO;
+    __block BOOL didTestQuoteBlock = NO;
+    [attributedString enumerateAttributesInRange:NSMakeRange(0, attributedString.length)
+                                         options:0
+                                      usingBlock:^(NSDictionary<NSAttributedStringKey,id> * _Nonnull attributes, NSRange range, BOOL * _Nonnull stop) {
+        NSString *substring = [attributedString attributedSubstringFromRange:range].string;
+        
+        if ([substring isEqualToString:@"This is a reply."])
+        {
+            XCTAssertNil(attributes[DTTextBlocksAttribute], @"The reply text should not appear within a block");
+            didTestReplyText = YES;
+        }
+        else
+        {
+            XCTAssertNotNil(attributes[DTTextBlocksAttribute], @"The rest of the string should be within a block");
+            didTestQuoteBlock = YES;
+        }
+    }];
+    
+    XCTAssertTrue(didTestReplyText && didTestQuoteBlock, @"Both a quote and a reply should be in the attributed string.");
+}
+
+- (void)testRenderHTMLStringWithMXReplyQuotingInvalidMessage
+{
+    // Given an HTML string representing a matrix reply where the original message has invalid HTML.
+    NSString *html = @"<mx-reply><blockquote><a href=\"https://matrix.to/#/someroom/someevent\">In reply to</a> <a href=\"https://matrix.to/#/@alice:matrix.org\">@alice:matrix.org</a><br><h1>Heading with <badtag>invalid</badtag> content</h1></blockquote></mx-reply>This is a reply.";
+    
+    // When rendering this string as an attributed string.
+    NSAttributedString *attributedString = [eventFormatter renderHTMLString:html forEvent:anEvent withRoomState:nil];
+    
+    // Then the attributed string should contain all of the text,
+    NSString *plainString = [attributedString.string stringByReplacingOccurrencesOfString:@"\U00002028" withString:@"\n"];
+    XCTAssertEqualObjects(plainString, @"In reply to @alice:matrix.org\nHeading with invalid content\nThis is a reply.",
+                          @"The reply string should include who the original message was from, what they said, and the reply itself.");
+    
+    // and format the author and original message inside of a quotation block. This check
+    // is to catch any incorrectness in the sanitizing where the original message becomes
+    // indented but is missing the block quote mark attribute.
+    __block BOOL didTestReplyText = NO;
+    __block BOOL didTestQuoteBlock = NO;
+    [attributedString enumerateAttributesInRange:NSMakeRange(0, attributedString.length)
+                                         options:0
+                                      usingBlock:^(NSDictionary<NSAttributedStringKey,id> * _Nonnull attributes, NSRange range, BOOL * _Nonnull stop) {
+        
+        NSString *substring = [attributedString attributedSubstringFromRange:range].string;
+        
+        if ([substring isEqualToString:@"This is a reply."])
+        {
+            XCTAssertNil(attributes[DTTextBlocksAttribute], @"The reply text should not appear within a block");
+            didTestReplyText = YES;
+        }
+        else
+        {
+            XCTAssertNotNil(attributes[DTTextBlocksAttribute], @"The rest of the string should be within a block");
+            XCTAssertNotNil(attributes[kMXKToolsBlockquoteMarkAttribute], @"The block should have the blockquote style applied");
+            didTestQuoteBlock = YES;
+        }
+    }];
+    
+    XCTAssertTrue(didTestReplyText && didTestQuoteBlock, @"Both a quote and a reply should be in the attributed string.");
+}
+
+- (void)testRenderHTMLStringWithImageHandler
+{
+    MXWeakify(self);
+    
+    // Given an HTML string that contains an image tag inline.
+    NSURL *imageURL = [NSURL URLWithString:@"https://matrix.org/images/matrix-logo.svg"];
+    NSString *html = [NSString stringWithFormat:@"Look at this logo: <img src=\"%@\"> Very nice.", imageURL.absoluteString];
+    
+    // When rendering this string as an attributed string using an appropriate image handler block.
+    eventFormatter.allowedHTMLTags = [eventFormatter.allowedHTMLTags arrayByAddingObject:@"img"];
+    eventFormatter.htmlImageHandler = ^NSURL *(NSString *sourceURL, CGFloat width, CGFloat height) {
+        MXStrongifyAndReturnValueIfNil(self, nil);
+        
+        // Replace the image URL with one from the tests bundle
+        NSBundle *bundle = [NSBundle bundleForClass:self.class];;
+        return [bundle URLForResource:@"test" withExtension:@"png"];
+    };
+    NSAttributedString *attributedString = [eventFormatter renderHTMLString:html forEvent:anEvent withRoomState:nil];
+    
+    // Then the attributed string should contain all of the text,
+    NSString *plainString = [attributedString.string stringByReplacingOccurrencesOfString:@"\U0000fffc" withString:@""];
+    XCTAssertEqualObjects(plainString, @"Look at this logo:  Very nice.", @"The string should include the original text.");
+    
+    // and have the image included as an attachment.
+    __block BOOL hasImageAttachment = NO;
+    [attributedString enumerateAttribute:NSAttachmentAttributeName
+                                 inRange:NSMakeRange(0, attributedString.length)
+                                 options:0
+                              usingBlock:^(id value, NSRange range, BOOL *stop) {
+        if ([value image])
+        {
+            hasImageAttachment = YES;
+        }
+    }];
+    
+    XCTAssertTrue(hasImageAttachment, @"There should be an attachment that contains the image.");
+}
+    
+- (void)testMarkdownFormatting
+{
+    NSString *html = [eventFormatter htmlStringFromMarkdownString:@"Line One.\nLine Two."];
+    
+    BOOL hardBreakExists =      [html rangeOfString:@"<br />"].location != NSNotFound;
+    BOOL openParagraphExists =  [html rangeOfString:@"<p>"].location != NSNotFound;
+    BOOL closeParagraphExists = [html rangeOfString:@"</p>"].location != NSNotFound;
+    
+    // Check for some known error cases
+    XCTAssert(hardBreakExists, "The soft break (\\n) must be converted to a hard break (<br />).");
+    XCTAssert(!openParagraphExists && !closeParagraphExists, "The html must not contain any opening or closing paragraph tags.");
+}
+
+#pragma mark - Links
+
+- (void)testRoomAliasLink
+{
+    NSString *s = @"Matrix HQ room is at #matrix:matrix.org.";
+    NSAttributedString *as = [eventFormatter renderString:s forEvent:anEvent];
+
+    NSRange linkRange = [s rangeOfString:@"#matrix:matrix.org"];
+
+    __block NSUInteger ranges = 0;
+    __block BOOL linkCreated = NO;
+
+    [as enumerateAttributesInRange:NSMakeRange(0, as.length) options:(0) usingBlock:^(NSDictionary<NSString *,id> * _Nonnull attrs, NSRange range, BOOL * _Nonnull stop) {
+
+        ranges++;
+
+        if (NSEqualRanges(linkRange, range))
+        {
+            linkCreated = (attrs[NSLinkAttributeName] != nil);
+        }
+    }];
+
+    XCTAssertEqual(ranges, 3, @"A sub-component must have been found");
+    XCTAssert(linkCreated, @"Link not created as expected: %@", as);
+}
+
+- (void)testLinkWithRoomAliasLink
+{
+    NSString *s = @"Matrix HQ room is at https://matrix.to/#/room/#matrix:matrix.org.";
+    NSAttributedString *as = [eventFormatter renderString:s forEvent:anEvent];
+
+    __block NSUInteger ranges = 0;
+
+    [as enumerateAttributesInRange:NSMakeRange(0, as.length) options:(0) usingBlock:^(NSDictionary<NSString *,id> * _Nonnull attrs, NSRange range, BOOL * _Nonnull stop) {
+
+        ranges++;
+    }];
+
+    XCTAssertEqual(ranges, 1, @"There should be no link in this case. We let the UI manage the link");
+}
+
+#pragma mark - Event sender/target info
+
+- (void)testUserDisplayNameFromEventContent {
+    MXEvent *event = [self eventFromJSON:@"{\"sender\":\"@alice:matrix.org\",\"content\":{\"displayname\":\"bob\",\"membership\":\"invite\"},\"origin_server_ts\":1616488993287,\"state_key\":\"@bob:matrix.org\",\"room_id\":\"!foofoofoofoofoofoo:matrix.org\",\"event_id\":\"$lGK3budX5w009ErtQwE9ZFhwyUUAV9DqEN5yb2fI4Do\",\"type\":\"m.room.member\",\"unsigned\":{}}"];
+    XCTAssertEqualObjects([eventFormatter userDisplayNameFromContentInEvent:event withMembershipFilter:nil], @"bob");
+    XCTAssertEqualObjects([eventFormatter userDisplayNameFromContentInEvent:event withMembershipFilter:@"invite"], @"bob");
+    XCTAssertEqualObjects([eventFormatter userDisplayNameFromContentInEvent:event withMembershipFilter:@"join"], nil);
+}
+
+- (void)testUserDisplayNameFromNonMembershipEventContent {
+    MXEvent *event = [self eventFromJSON:@"{\"sender\":\"@alice:matrix.org\",\"content\":{\"ciphertext\":\"foo\",\"sender_key\":\"bar\",\"device_id\":\"foobar\",\"algorithm\":\"m.megolm.v1.aes-sha2\"}},\"origin_server_ts\":1616488993287,\"state_key\":\"@bob:matrix.org\",\"room_id\":\"!foofoofoofoofoofoo:matrix.org\",\"event_id\":\"$lGK3budX5w009ErtQwE9ZFhwyUUAV9DqEN5yb2fI4Do\",\"type\":\"m.room.encrypted\",\"unsigned\":{}}"];
+    XCTAssertEqualObjects([eventFormatter userDisplayNameFromContentInEvent:event withMembershipFilter:nil], nil);
+    XCTAssertEqualObjects([eventFormatter userDisplayNameFromContentInEvent:event withMembershipFilter:@"join"], nil);
+}
+
+- (void)testUserAvatarUrlFromEventContent {
+    MXEvent *event = [self eventFromJSON:@"{\"sender\":\"@alice:matrix.org\",\"content\":{\"displayname\":\"bob\",\"avatar_url\":\"mxc://foo.bar\",\"membership\":\"join\"},\"origin_server_ts\":1616488993287,\"state_key\":\"@bob:matrix.org\",\"room_id\":\"!foofoofoofoofoofoo:matrix.org\",\"event_id\":\"$lGK3budX5w009ErtQwE9ZFhwyUUAV9DqEN5yb2fI4Do\",\"type\":\"m.room.member\",\"unsigned\":{}}"];
+    XCTAssertEqualObjects([eventFormatter userAvatarUrlFromContentInEvent:event withMembershipFilter:nil], @"mxc://foo.bar");
+    XCTAssertEqualObjects([eventFormatter userAvatarUrlFromContentInEvent:event withMembershipFilter:@"invite"], nil);
+    XCTAssertEqualObjects([eventFormatter userAvatarUrlFromContentInEvent:event withMembershipFilter:@"join"], @"mxc://foo.bar");
+}
+
+- (void)testUserAvatarUrlFromEventWithNonMXCAvatarUrlContent {
+    MXEvent *event = [self eventFromJSON:@"{\"sender\":\"@alice:matrix.org\",\"content\":{\"displayname\":\"bob\",\"avatar_url\":\"http://foo.bar\",\"membership\":\"join\"},\"origin_server_ts\":1616488993287,\"state_key\":\"@bob:matrix.org\",\"room_id\":\"!foofoofoofoofoofoo:matrix.org\",\"event_id\":\"$lGK3budX5w009ErtQwE9ZFhwyUUAV9DqEN5yb2fI4Do\",\"type\":\"m.room.member\",\"unsigned\":{}}"];
+    XCTAssertEqualObjects([eventFormatter userAvatarUrlFromContentInEvent:event withMembershipFilter:nil], nil);
+    XCTAssertEqualObjects([eventFormatter userAvatarUrlFromContentInEvent:event withMembershipFilter:@"invite"], nil);
+    XCTAssertEqualObjects([eventFormatter userAvatarUrlFromContentInEvent:event withMembershipFilter:@"join"], nil);
+}
+
+- (void)testUserAvatarUrlFromNonMembershipEventContent {
+    MXEvent *event = [self eventFromJSON:@"{\"sender\":\"@alice:matrix.org\",\"content\":{\"ciphertext\":\"foo\",\"sender_key\":\"bar\",\"device_id\":\"foobar\",\"algorithm\":\"m.megolm.v1.aes-sha2\"}},\"origin_server_ts\":1616488993287,\"state_key\":\"@bob:matrix.org\",\"room_id\":\"!foofoofoofoofoofoo:matrix.org\",\"event_id\":\"$lGK3budX5w009ErtQwE9ZFhwyUUAV9DqEN5yb2fI4Do\",\"type\":\"m.room.encrypted\",\"unsigned\":{}}"];
+    XCTAssertEqualObjects([eventFormatter userAvatarUrlFromContentInEvent:event withMembershipFilter:nil], nil);
+    XCTAssertEqualObjects([eventFormatter userAvatarUrlFromContentInEvent:event withMembershipFilter:@"join"], nil);
+}
+
+- (MXEvent *)eventFromJSON:(NSString *)json {
+    NSData *data = [json dataUsingEncoding:NSUTF8StringEncoding];
+    NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
+    return [MXEvent modelFromJSON:dict];
+}
+
+@end
diff --git a/RiotTests/MatrixKitTests/MXKRoomDataSource+Tests.h b/RiotTests/MatrixKitTests/MXKRoomDataSource+Tests.h
new file mode 100644
index 000000000..a90ee2fac
--- /dev/null
+++ b/RiotTests/MatrixKitTests/MXKRoomDataSource+Tests.h
@@ -0,0 +1,27 @@
+/*
+ Copyright 2021 The Matrix.org Foundation C.I.C
+
+ 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 "MXKRoomDataSource.h"
+
+@interface MXKRoomDataSource (Tests)
+
+- (NSArray<id<MXKRoomBubbleCellDataStoring>> *)getBubbles;
+- (void)replaceBubbles:(NSArray<id<MXKRoomBubbleCellDataStoring>> *)newBubbles;
+
+- (void)queueEventForProcessing:(MXEvent*)event withRoomState:(MXRoomState*)roomState direction:(MXTimelineDirection)direction;
+- (void)processQueuedEvents:(void (^)(NSUInteger addedHistoryCellNb, NSUInteger addedLiveCellNb))onComplete;
+
+@end
diff --git a/RiotTests/MatrixKitTests/MXKRoomDataSource+Tests.m b/RiotTests/MatrixKitTests/MXKRoomDataSource+Tests.m
new file mode 100644
index 000000000..07f5fea57
--- /dev/null
+++ b/RiotTests/MatrixKitTests/MXKRoomDataSource+Tests.m
@@ -0,0 +1,29 @@
+/*
+ Copyright 2021 The Matrix.org Foundation C.I.C
+
+ 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 "MXKRoomDataSource+Tests.h"
+
+@implementation MXKRoomDataSource (Tests)
+
+- (NSArray<id<MXKRoomBubbleCellDataStoring>> *)getBubbles {
+    return bubbles;
+}
+
+- (void)replaceBubbles:(NSArray<id<MXKRoomBubbleCellDataStoring>> *)newBubbles {
+    bubbles = [NSMutableArray arrayWithArray:newBubbles];
+}
+
+@end
diff --git a/RiotTests/MatrixKitTests/MXKRoomDataSourceTests.swift b/RiotTests/MatrixKitTests/MXKRoomDataSourceTests.swift
new file mode 100644
index 000000000..ed8d0f0d1
--- /dev/null
+++ b/RiotTests/MatrixKitTests/MXKRoomDataSourceTests.swift
@@ -0,0 +1,155 @@
+/*
+ Copyright 2021 The Matrix.org Foundation C.I.C
+
+ 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 XCTest
+
+@testable import Riot
+
+class MXKRoomDataSourceTests: XCTestCase {
+
+    // MARK: - Destruction tests
+
+    func testDestroyRemovesAllBubbles() {
+        let dataSource = StubMXKRoomDataSource()
+        dataSource.destroy()
+        XCTAssert(dataSource.getBubbles()?.isEmpty != false)
+    }
+
+    func testDestroyDeallocatesAllBubbles() throws {
+        let dataSource = StubMXKRoomDataSource()
+        weak var first = try XCTUnwrap(dataSource.getBubbles()?.first)
+        weak var last = try XCTUnwrap(dataSource.getBubbles()?.last)
+        dataSource.destroy()
+        XCTAssertNil(first)
+        XCTAssertNil(last)
+    }
+
+    // MARK: - Collapsing tests
+
+    func testCollapseBubblesWhenProcessingTogether() throws {
+        let dataSource = try FakeMXKRoomDataSource.make()
+        try dataSource.queueEvent1()
+        try dataSource.queueEvent2()
+        awaitEventProcessing(for: dataSource)
+        dataSource.verifyCollapsedEvents(2)
+    }
+
+    func testCollapseBubblesWhenProcessingAlone() throws {
+        let dataSource = try FakeMXKRoomDataSource.make()
+        try dataSource.queueEvent1()
+        awaitEventProcessing(for: dataSource)
+        try dataSource.queueEvent2()
+        awaitEventProcessing(for: dataSource)
+        dataSource.verifyCollapsedEvents(2)
+    }
+
+    private func awaitEventProcessing(for dataSource: MXKRoomDataSource) {
+        let e = expectation(description: "The wai-ai-ting is the hardest part")
+        dataSource.processQueuedEvents { _, _ in
+            e.fulfill()
+        }
+        waitForExpectations(timeout: 2) { error in
+            XCTAssertNil(error)
+        }
+    }
+
+}
+
+// MARK: - Test doubles
+
+private final class StubMXKRoomDataSource: MXKRoomDataSource {
+
+    override init() {
+        super.init()
+
+        let data1 = MXKRoomBubbleCellData()
+        let data2 = MXKRoomBubbleCellData()
+        let data3 = MXKRoomBubbleCellData()
+
+        data1.nextCollapsableCellData = data2
+        data2.prevCollapsableCellData = data1
+        data2.nextCollapsableCellData = data3
+        data3.prevCollapsableCellData = data2
+
+        replaceBubbles([data1, data2, data3])
+    }
+
+}
+
+private final class FakeMXKRoomDataSource: MXKRoomDataSource {
+
+    class func make() throws -> FakeMXKRoomDataSource {
+        let dataSource = try XCTUnwrap(FakeMXKRoomDataSource(roomId: "!foofoofoofoofoofoo:matrix.org", andMatrixSession: nil))
+        dataSource.registerCellDataClass(CollapsibleBubbleCellData.self, forCellIdentifier: kMXKRoomBubbleCellDataIdentifier)
+        dataSource.eventFormatter = CountingEventFormatter(matrixSession: nil)
+        return dataSource
+    }
+
+    override var state: MXKDataSourceState {
+        MXKDataSourceStateReady
+    }
+
+    override var roomState: MXRoomState! {
+        nil
+    }
+
+    func queueEvent1() throws {
+        try queueEvent(json: #"{"sender":"@alice:matrix.org","content":{"displayname":"bob","membership":"invite"},"origin_server_ts":1616488993287,"state_key":"@bob:matrix.org","room_id":"!foofoofoofoofoofoo:matrix.org","event_id":"$lGK3budX5w009ErtQwE9ZFhwyUUAV9DqEN5yb2fI4Do","type":"m.room.member","unsigned":{"age":1204610,"prev_sender":"@alice:matrix.org","prev_content":{"membership":"leave"},"replaces_state":"$9mQ6RtscXqHCxWqOElI-eP_kwpkuPd2Czm3UHviGoyE"}}"#)
+    }
+
+    func queueEvent2() throws {
+        try queueEvent(json: #"{"sender":"@alice:matrix.org","content":{"displayname":"john","membership":"invite"},"origin_server_ts":1616488967295,"state_key":"@john:matrix.org","room_id":"!foofoofoofoofoofoo:matrix.org","event_id":"$-00slfAluxVTP2VWytgDThTmh3nLd0WJD6gzBo2scJM","type":"m.room.member","unsigned":{"age":1712006,"prev_sender":"@alice:matrix.org","prev_content":{"membership":"leave"},"replaces_state":"$NRNkCMKeKK5NtTfWkMfTlMr5Ygw60Q2CQYnJNkbzyrs"}}"#)
+    }
+
+    private func queueEvent(json: String) throws {
+        let data = try XCTUnwrap(json.data(using: .utf8))
+        let dict = try XCTUnwrap((try JSONSerialization.jsonObject(with: data, options: [])) as? [AnyHashable: Any])
+        let event = MXEvent(fromJSON: dict)
+        queueEvent(forProcessing: event, with: nil, direction: __MXTimelineDirectionForwards)
+    }
+
+    func verifyCollapsedEvents(_ number: Int) {
+        let message = getBubbles()?.first?.collapsedAttributedTextMessage.string
+        XCTAssertEqual(message, "\(number)")
+    }
+
+}
+
+private final class CollapsibleBubbleCellData: MXKRoomBubbleCellData {
+
+    override init() {
+        super.init()
+    }
+
+    required init!(event: MXEvent!, andRoomState roomState: MXRoomState!, andRoomDataSource roomDataSource: MXKRoomDataSource!) {
+        super.init(event: event, andRoomState: roomState, andRoomDataSource: roomDataSource)
+        collapsable = true
+    }
+
+    override func collapse(with cellData: MXKRoomBubbleCellDataStoring!) -> Bool {
+        true
+    }
+
+}
+
+private final class CountingEventFormatter: MXKEventFormatter {
+
+    override func attributedString(from events: [MXEvent]!, with roomState: MXRoomState!, error: UnsafeMutablePointer<MXKEventFormatterError>!) -> NSAttributedString! {
+        NSAttributedString(string: "\(events.count)")
+    }
+
+}
diff --git a/RiotTests/MatrixKitTests/MatrixKitTests-Bridging-Header.h b/RiotTests/MatrixKitTests/MatrixKitTests-Bridging-Header.h
new file mode 100644
index 000000000..b3d959c69
--- /dev/null
+++ b/RiotTests/MatrixKitTests/MatrixKitTests-Bridging-Header.h
@@ -0,0 +1,5 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+
+#import "MXKRoomDataSource+Tests.h"
diff --git a/RiotTests/MatrixKitTests/UTI/Files/Text.txt b/RiotTests/MatrixKitTests/UTI/Files/Text.txt
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/RiotTests/MatrixKitTests/UTI/Files/Text.txt
@@ -0,0 +1 @@
+
diff --git a/RiotTests/MatrixKitTests/UTI/MXKUTITests.swift b/RiotTests/MatrixKitTests/UTI/MXKUTITests.swift
new file mode 100644
index 000000000..fc9d053b2
--- /dev/null
+++ b/RiotTests/MatrixKitTests/UTI/MXKUTITests.swift
@@ -0,0 +1,99 @@
+/*
+ Copyright 2019 The Matrix.org Foundation C.I.C
+ 
+ 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
+
+@testable import Riot
+
+import MobileCoreServices
+
+class MXKUTITests: XCTestCase {
+
+    override func setUp() {
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+
+    override func tearDown() {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+    }
+
+    func testUTIFromMimeType() {
+        guard let uti = MXKUTI(mimeType: "application/pdf") else {
+            XCTFail("uti should not be nil")
+            return
+        }
+        
+        let fileExtension = uti.fileExtension?.lowercased() ?? ""
+        
+        XCTAssertTrue(uti.isFile)
+        XCTAssertEqual(fileExtension, "pdf")
+    }
+    
+    func testUTIFromFileExtension() {
+        let uti = MXKUTI(fileExtension: "pdf")
+        
+        let fileExtension = uti.fileExtension?.lowercased() ?? ""
+        let mimeType = uti.mimeType ?? ""
+        
+        XCTAssertTrue(uti.isFile)
+        XCTAssertEqual(fileExtension, "pdf")
+        XCTAssertEqual(mimeType, "application/pdf")
+    }
+    
+    func testUTIFromLocalFileURLLoadingResourceValues() {
+        
+        let bundle = Bundle(for: type(of: self))
+        
+        guard let localFileURL = bundle.url(forResource: "Text", withExtension: "txt") else {
+            XCTFail("localFileURL should not be nil")
+            return
+        }
+        
+        guard let uti = MXKUTI(localFileURL: localFileURL) else {
+            XCTFail("uti should not be nil")
+            return
+        }
+        
+        let fileExtension = uti.fileExtension?.lowercased() ?? ""
+        let mimeType = uti.mimeType ?? ""
+        
+        XCTAssertTrue(uti.isFile)
+        XCTAssertEqual(fileExtension, "txt")
+        XCTAssertEqual(mimeType, "text/plain")
+    }
+    
+    func testUTIFromLocalFileURL() {
+        
+        let bundle = Bundle(for: type(of: self))
+        
+        guard let localFileURL = bundle.url(forResource: "Text", withExtension: "txt") else {
+            XCTFail("localFileURL should not be nil")
+            return
+        }
+        
+        guard let uti = MXKUTI(localFileURL: localFileURL, loadResourceValues: false) else {
+            XCTFail("uti should not be nil")
+            return
+        }
+        
+        let fileExtension = uti.fileExtension?.lowercased() ?? ""
+        let mimeType = uti.mimeType ?? ""
+        
+        XCTAssertTrue(uti.isFile)
+        XCTAssertEqual(fileExtension, "txt")
+        XCTAssertEqual(mimeType, "text/plain")
+    }
+}
diff --git a/RiotTests/Release.xcconfig b/RiotTests/Release.xcconfig
index 5a62ed9cd..f9e061251 100644
--- a/RiotTests/Release.xcconfig
+++ b/RiotTests/Release.xcconfig
@@ -18,3 +18,5 @@
 // https://help.apple.com/xcode/#/dev745c5c974
 
 #include "Pods/Target Support Files/Pods-RiotTests/Pods-RiotTests.release.xcconfig"
+
+SWIFT_OBJC_INTERFACE_HEADER_NAME = GeneratedInterface-Swift.h
diff --git a/RiotTests/RiotTests-Bridging-Header.h b/RiotTests/RiotTests-Bridging-Header.h
index d552618e7..96b1212d8 100644
--- a/RiotTests/RiotTests-Bridging-Header.h
+++ b/RiotTests/RiotTests-Bridging-Header.h
@@ -3,3 +3,4 @@
 //
 
 #import "Riot-Bridging-Header.h"
+#import "MatrixKitTests-Bridging-Header.h"
diff --git a/SiriIntents/Common.xcconfig b/SiriIntents/Common.xcconfig
index 957ae3881..13f54f302 100644
--- a/SiriIntents/Common.xcconfig
+++ b/SiriIntents/Common.xcconfig
@@ -20,7 +20,7 @@
 #include "Config/AppIdentifiers.xcconfig"
 #include "Config/AppVersion.xcconfig"
 
-PRODUCT_NAME=  SiriIntents
+PRODUCT_NAME = SiriIntents
 PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER).SiriIntents
 
 INFOPLIST_FILE = SiriIntents/Info.plist
@@ -29,3 +29,7 @@ CODE_SIGN_ENTITLEMENTS = SiriIntents/SiriIntents.entitlements
 
 LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @executable_path/../../Frameworks    
 SKIP_INSTALL = YES
+
+SWIFT_OBJC_BRIDGING_HEADER = $(SRCROOT)/$(PRODUCT_NAME)/SupportingFiles/SiriIntents-Bridging-Header.h
+
+SWIFT_OBJC_INTERFACE_HEADER_NAME = GeneratedInterface-Swift.h
diff --git a/SiriIntents/IntentHandler.m b/SiriIntents/IntentHandler.m
index dead5b239..99f9910fc 100644
--- a/SiriIntents/IntentHandler.m
+++ b/SiriIntents/IntentHandler.m
@@ -16,9 +16,7 @@
 
 #import "IntentHandler.h"
 
-#import <MatrixKit/MatrixKit.h>
-
-#import "SiriIntents-Swift.h"
+#import "GeneratedInterface-Swift.h"
 
 #if __has_include(<MatrixSDK/MXJingleCallStack.h>)
 #define CALL_STACK_JINGLE
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinatorParamaters.swift b/SiriIntents/SupportingFiles/SiriIntents-Bridging-Header.h
similarity index 87%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinatorParamaters.swift
rename to SiriIntents/SupportingFiles/SiriIntents-Bridging-Header.h
index ed6db9cb0..306e2e582 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinatorParamaters.swift
+++ b/SiriIntents/SupportingFiles/SiriIntents-Bridging-Header.h
@@ -14,8 +14,4 @@
 // limitations under the License.
 //
 
-import Foundation
-
-struct TemplateRoomChatCoordinatorParameters {
- let room: MXRoom
-}
+#import "MatrixKit-Bridging-Header.h"
diff --git a/SiriIntents/target.yml b/SiriIntents/target.yml
index 01b844632..05aea0ea9 100644
--- a/SiriIntents/target.yml
+++ b/SiriIntents/target.yml
@@ -48,3 +48,9 @@ targets:
     - path: ../Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
     - path: ../Riot/Managers/KeyValueStorage
     - path: ../Riot/PropertyWrappers/UserDefaultsBackedPropertyWrapper.swift
+    - path: ../Riot/Managers/Locale/LocaleProviderType.swift
+    - path: ../Riot/Managers/Locale/LocaleProvider.swift
+    - path: ../Riot/Modules/MatrixKit
+      excludes:
+        - "**/*.md" # excludes all files with the .md extension
+    - path: ../Riot/Generated/MatrixKitStrings.swift
diff --git a/Tools/Release/buildRelease.sh b/Tools/Release/buildRelease.sh
index 6ac02d462..583b00b62 100755
--- a/Tools/Release/buildRelease.sh
+++ b/Tools/Release/buildRelease.sh
@@ -21,6 +21,8 @@ TAG=$1
 BUILD_DIR="build"/$TAG
 BUILD_NUMBER=$( date +%Y%m%d%H%M%S )
 
+# Enable this flag to build the ipa from the current local source code. Not git clone
+# LOCAL_SOURCE=true
 
 if [ -e $BUILD_DIR ]; then
     echo "Error: Folder ${BUILD_DIR} already exists"
@@ -32,7 +34,17 @@ mkdir -p $BUILD_DIR
 cd $BUILD_DIR
 REPO_URL=$(git ls-remote --get-url origin)
 REPO_NAME=$(basename -s .git $REPO_URL)
+
+if [ "$LOCAL_SOURCE" = true ]; then
+echo "Reuse source code of the local copy..." 
+rm -rf /tmp/$REPO_NAME
+cp -R ../../../.. /tmp/$REPO_NAME
+mv /tmp/$REPO_NAME .
+else
+echo "Git clone $REPO_URL with branch/tag $TAG..." 
 git clone $REPO_URL --depth=1 --branch $TAG
+fi
+
 cd $REPO_NAME
 
 # Fastlane update
@@ -44,7 +56,9 @@ bundle update
 bundle exec fastlane update_plugins
 
 # Use appropriated dependencies according to the current branch
+if [ "$LOCAL_SOURCE" != true ]; then
 bundle exec fastlane point_dependencies_to_same_feature
+fi
 
 # Build
 bundle exec fastlane app_store build_number:$BUILD_NUMBER git_tag:$TAG
diff --git a/Tools/SwiftGen/Templates/Strings/matrixkit-flat-swift4-vector.stencil b/Tools/SwiftGen/Templates/Strings/matrixkit-flat-swift4-vector.stencil
new file mode 100644
index 000000000..9c5f75cfe
--- /dev/null
+++ b/Tools/SwiftGen/Templates/Strings/matrixkit-flat-swift4-vector.stencil
@@ -0,0 +1,75 @@
+// swiftlint:disable all
+// Generated using SwiftGen, by O.Halligon — https://github.com/SwiftGen/SwiftGen
+
+{% if tables.count > 0 %}
+{% set accessModifier %}{% if param.publicAccess %}public{% else %}internal{% endif %}{% endset %}
+import Foundation
+
+// swiftlint:disable superfluous_disable_command
+// swiftlint:disable file_length
+
+// MARK: - Strings
+
+{% macro parametersBlock types %}{% filter removeNewlines:"leading" %}
+  {% for type in types %}
+    _ p{{forloop.counter}}: {{type}}{{ ", " if not forloop.last }}
+  {% endfor %}
+{% endfilter %}{% endmacro %}
+{% macro argumentsBlock types %}{% filter removeNewlines:"leading" %}
+  {% for type in types %}
+    {% if type == "UnsafeRawPointer" %}
+    Int(bitPattern: p{{forloop.counter}})
+    {% else %}
+    p{{forloop.counter}}
+    {% endif %}
+    {{ ", " if not forloop.last }}
+  {% endfor %}
+{% endfilter %}{% endmacro %}
+{% macro recursiveBlock table item %}
+  {% for string in item.strings %}
+  {% if not param.noComments %}
+  /// {{string.translation}}
+  {% endif %}
+  {% if string.types %}
+  {{accessModifier}} static func {{string.key|swiftIdentifier:"pretty"|lowerFirstWord|escapeReservedKeywords}}({% call parametersBlock string.types %}) -> String {
+    return {{className}}.tr("{{string.key}}", {% call argumentsBlock string.types %})
+  }
+  {% else %}
+  {{accessModifier}} static var {{string.key|swiftIdentifier:"pretty"|lowerFirstWord|escapeReservedKeywords}}: String { 
+    return {{className}}.tr("{{string.key}}") 
+  }
+  {% endif %}
+  {% endfor %}
+  {% for child in item.children %}
+  {% call recursiveBlock table child %}
+  {% endfor %}
+{% endmacro %}
+// swiftlint:disable function_parameter_count identifier_name line_length type_body_length
+{% set className %}{{param.className|default:"L10n"}}{% endset %}
+@objcMembers
+{{accessModifier}} class {{className}}: NSObject {
+  {% if tables.count > 1 %}
+  {% for table in tables %}
+  {{accessModifier}} class {{table.name|swiftIdentifier:"pretty"|escapeReservedKeywords}} {
+    {% filter indent:2 %}{% call recursiveBlock table.name table.levels %}{% endfilter %}
+  }
+  {% endfor %}
+  {% else %}
+  {% call recursiveBlock tables.first.name tables.first.levels %}
+  {% endif %}
+}
+// swiftlint:enable function_parameter_count identifier_name line_length type_body_length
+
+// MARK: - Implementation Details
+
+extension {{className}} {
+  static func tr(_ key: String, _ args: CVarArg...) -> String {
+      let format = Bundle.mxk_localizedString(forKey: key)!
+      return String(format: format, arguments: args)
+    }
+}
+
+private final class BundleToken {}
+{% else %}
+// No string found
+{% endif %}
diff --git a/Tools/SwiftGen/swiftgen-config.yml b/Tools/SwiftGen/swiftgen-config.yml
index 2a4015052..3d1cd6693 100755
--- a/Tools/SwiftGen/swiftgen-config.yml
+++ b/Tools/SwiftGen/swiftgen-config.yml
@@ -9,13 +9,20 @@ ib:
     templateName: scenes-swift4
     output: Storyboards.swift
 strings:
-  inputs: Assets/en.lproj/Vector.strings
-  outputs:
-    templatePath: Templates/Strings/flat-swift4-vector.stencil
-    output: Strings.swift
-    params:
-      className: VectorL10n
-      publicAccess: true
+  - inputs: Assets/en.lproj/Vector.strings
+    outputs:
+      templatePath: Templates/Strings/flat-swift4-vector.stencil
+      output: Strings.swift
+      params:
+        className: VectorL10n
+        publicAccess: true
+  - inputs: Modules/MatrixKit/Assets/MatrixKitAssets.bundle/en.lproj/MatrixKit.strings
+    outputs:
+      templatePath: Templates/Strings/matrixkit-flat-swift4-vector.stencil
+      output: MatrixKitStrings.swift
+      params:
+        className: MatrixKitL10n
+        publicAccess: true
 xcassets:  
   inputs:
     - Assets/Images.xcassets
diff --git a/Tools/Templates/createSwiftUISingleScreen.sh b/Tools/Templates/createSwiftUISingleScreen.sh
index 52729ead1..d5a0f567c 100755
--- a/Tools/Templates/createSwiftUISingleScreen.sh
+++ b/Tools/Templates/createSwiftUISingleScreen.sh
@@ -27,8 +27,5 @@ do
   perl -p -i -e "s/TemplateUserProfile/"$SCREEN_NAME"/g" $file
   perl -p -i -e "s/templateUserProfile/"$SCREEN_VAR_NAME"/g" $file
 
-  echo "// $ createScreen.sh $@" | cat - ${file} > /tmp/$$ && mv /tmp/$$ ${file}
-  echo '// File created from SimpleUserProfileExample' | cat - ${file} > /tmp/$$ && mv /tmp/$$ ${file}
-
   mv ${file} ${file/TemplateUserProfile/$SCREEN_NAME}
 done
diff --git a/Tools/Templates/createSwiftUITwoScreen.sh b/Tools/Templates/createSwiftUITwoScreen.sh
index e82027fc1..5d822d42e 100755
--- a/Tools/Templates/createSwiftUITwoScreen.sh
+++ b/Tools/Templates/createSwiftUITwoScreen.sh
@@ -53,9 +53,3 @@ do
     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
diff --git a/changelog.d/4815.change b/changelog.d/4815.change
deleted file mode 100644
index 757ff6d22..000000000
--- a/changelog.d/4815.change
+++ /dev/null
@@ -1 +0,0 @@
-Share Extension: Remove the image compression prompt when the showMediaSizeSelection setting is disabled.
\ No newline at end of file
diff --git a/changelog.d/4976.change b/changelog.d/4976.change
deleted file mode 100644
index 7c52865d3..000000000
--- a/changelog.d/4976.change
+++ /dev/null
@@ -1 +0,0 @@
-Replaced GrowingTextView with simpler, custom implementation.  Cleaned up the RoomInputToolbar header.
\ No newline at end of file
diff --git a/changelog.d/4987.misc b/changelog.d/4987.misc
deleted file mode 100644
index ac7a294f3..000000000
--- a/changelog.d/4987.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve wording around rageshakes in the defect issue template.
diff --git a/changelog.d/5035.change b/changelog.d/5035.change
new file mode 100644
index 000000000..6be81ff04
--- /dev/null
+++ b/changelog.d/5035.change
@@ -0,0 +1 @@
+Analytics: Replace Matomo with PostHog.
\ No newline at end of file
diff --git a/changelog.d/5041.bugfix b/changelog.d/5041.bugfix
deleted file mode 100644
index 07882c073..000000000
--- a/changelog.d/5041.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed share extension and message forwarding room list accessory view icon.
\ No newline at end of file
diff --git a/changelog.d/5042.bugfix b/changelog.d/5042.bugfix
deleted file mode 100644
index 481c4c053..000000000
--- a/changelog.d/5042.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed message composer not following keyboard when swiping to dismiss.
\ No newline at end of file
diff --git a/changelog.d/5055.bugfix b/changelog.d/5055.bugfix
deleted file mode 100644
index a969f4fef..000000000
--- a/changelog.d/5055.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-RoomVC: Fix retain cycles that prevents `RoomViewController` to be deallocated.
\ No newline at end of file
diff --git a/changelog.d/5057.bugfix b/changelog.d/5057.bugfix
deleted file mode 100644
index b3f2b9744..000000000
--- a/changelog.d/5057.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Share Extension: Fix missing avatars and don't list spaces as rooms.
\ No newline at end of file
diff --git a/changelog.d/5058.bugfix b/changelog.d/5058.bugfix
deleted file mode 100644
index 1e8112a36..000000000
--- a/changelog.d/5058.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix retain cycles that prevents deallocation in several classes.
\ No newline at end of file
diff --git a/changelog.d/5063.bugfix b/changelog.d/5063.bugfix
deleted file mode 100644
index d1ee811c1..000000000
--- a/changelog.d/5063.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed retain cycles between the user suggestion coordinator and the suggestion service, and in the suggestion service currentTextTrigger subject sink.
\ No newline at end of file
diff --git a/changelog.d/5311.bugfix b/changelog.d/5311.bugfix
new file mode 100644
index 000000000..cfd5998e5
--- /dev/null
+++ b/changelog.d/5311.bugfix
@@ -0,0 +1 @@
+RoomVC: Fix left room reason label memory management.
\ No newline at end of file
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index a361cf79e..56f36052b 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -97,7 +97,7 @@ platform :ios do
   end
 
 
-  desc "Point MatrixKit and MatrixSDK to the related branches if such ones exist"
+  desc "Point MatrixSDK to the related branches if such ones exist"
   lane :point_dependencies_to_related_branches do
     current_branch = mx_git_branch
     UI.message("Current branch: #{current_branch}")
@@ -108,12 +108,12 @@ platform :ios do
     end
   end
 
-  desc "Point MatrixKit and MatrixSDK to their respective release/*/release branch if they exist, master otherwise"
+  desc "Point MatrixSDK to release/*/release branch if it exists, master otherwise"
   lane :point_dependencies_to_pending_releases do
     edit_podfile(branch_pattern: "release/*/release", default_branch: "master")
   end
 
-  desc "Point MatrixKit and MatrixSDK to the branch with the same name as the current branch if such one exist, develop otherwise"
+  desc "Point MatrixSDK to the branch with the same name as the current branch if such one exist, develop otherwise"
   lane :point_dependencies_to_same_feature do
     edit_podfile(branch_pattern: mx_git_branch) unless mx_git_branch.to_s.empty?
   end
@@ -151,6 +151,17 @@ platform :ios do
     xcodegen(spec: "project.yml")
     cocoapods
 
+    run_tests(
+      workspace: "Riot.xcworkspace",
+      scheme: "RiotSwiftUI",
+      code_coverage: true,
+      # Test result configuration
+      result_bundle: true,
+      output_directory: "./build/test",
+      output_files: "riot.swiftui.unit.test.html,riot.swiftui.unit.test.report.junit.xml",
+      open_report: !is_ci?
+    )
+
     run_tests(
       workspace: "Riot.xcworkspace",
       scheme: "Riot",
@@ -158,6 +169,7 @@ platform :ios do
       # Test result configuration
       result_bundle: true,
       output_directory: "./build/test",
+      output_files: "riot.unit.test.html,riot.unit.test.report.junit.xml",
       open_report: !is_ci?
     )
   end
@@ -383,34 +395,21 @@ platform :ios do
     preprocessor_definitions
   end
 
-  desc "Edit the Podfile in order to point MatrixKit and MatrixSDK to the appropriate branches."
+  desc "Edit the Podfile in order to point MatrixSDK to the appropriate branches."
   private_lane :edit_podfile do |options|
     require 'net/http'
 
     branch_pattern = options[:branch_pattern]
-    kit_slug = "matrix-org/matrix-ios-kit"
     sdk_slug = "matrix-org/matrix-ios-sdk"
 
-    default_branch = options[:default_branch] || 'develop'
-    kit_branch = find_branch(kit_slug, branch_pattern) || default_branch
+    default_branch = options[:default_branch] || 'develop'    
     sdk_branch = find_branch(sdk_slug, branch_pattern) || default_branch
+    
+    sdk_spec = { git: 'https://github.com/matrix-org/matrix-ios-sdk.git', branch: sdk_branch }    
 
-    kit_spec = { git: 'https://github.com/matrix-org/matrix-ios-kit.git', branch: kit_branch }
-    kit_podspec = { podspec: 'MatrixKit.edited.podspec' }
-    sdk_spec = { git: 'https://github.com/matrix-org/matrix-ios-sdk.git', branch: sdk_branch }
-
-    UI.message("✏️ Making a local copy of MatrixKit.podspec from the \`#{kit_branch}\` branch...")
-    podspec_content = Net::HTTP.get(URI("https://raw.githubusercontent.com/#{kit_slug}/#{kit_branch}/MatrixKit.podspec"))
-
-    UI.message "✏️ Editing local MatrixKit podspec to remove version constaint on 'MatrixSDK*' dependencies..."
-    podspec_content.gsub!(%r{(\.dependency\s+(['"])MatrixSDK(\/[^'"]+)?\2).*$}, '\1')
-    podspec_content.gsub!(%r{(\.source\s*=\s*).*$}, "\\1#{kit_spec}")
-    File.write('../MatrixKit.edited.podspec', podspec_content) # current dir is 'fastlane/' hence the '../'
-    UI.command_output("Content of MatrixKit.edited.podspec:\n" + podspec_content)
-
-    UI.message "✏️ Modify Podfile to point MatrixKit to local podspec and `MatrixSDK/*` to \`#{sdk_branch}\` branch..."
+    UI.message "✏️ Modify Podfile to point `MatrixSDK/*` to \`#{sdk_branch}\` branch..."
     podfile_content = File.read('../Podfile') # current dir is 'fastlane/' hence the '../'
-    podfile_content.gsub!(%r{^\$matrixKitVersion\s*=\s*.*$}, "$matrixKitVersion = { #{kit_podspec} => #{sdk_spec} }")
+    podfile_content.gsub!(%r{^\$matrixSDKVersion\s*=\s*.*$}, "$matrixSDKVersion = { :specHash => #{sdk_spec} }")
     File.write('../Podfile', podfile_content)
     UI.command_output("Content of modified Podfile:\n" + podfile_content)
   end